diff --git a/.gitignore b/.gitignore index 0da4a08..90fc71f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ *.dll *.so *.dylib - +.DS_Store database.db .env diff --git a/index.go b/index.go index c19a065..bd21981 100644 --- a/index.go +++ b/index.go @@ -87,7 +87,7 @@ func (app *App) SetupRoutes() { app.Router.GET("/login", app.loginGithub) app.Router.GET("/callback", app.githubCallback) app.Router.GET("/logout", app.logout) - app.Router.GET("/dashboard", app.myLinks) + app.Router.GET("/dashboard", app.dashboard) app.Router.DELETE("/dashboard", app.deleteLink) app.Router.PUT("/dashboard", app.updateLink) app.Router.GET("/:shortURL", app.redirectToOriginal) @@ -100,9 +100,9 @@ func (app *App) Run() error { func (app *App) createTable() error { _, err := app.DB.Exec(`CREATE TABLE IF NOT EXISTS links ( - id TEXT PRIMARY KEY, + id TEXT PRIMARY KEY NOT NULL UNIQUE, original_url TEXT NOT NULL, - short_url TEXT NOT NULL, + short_url TEXT NOT NULL UNIQUE, user_id TEXT )`) return err @@ -136,6 +136,10 @@ func (app *App) shortenURL(c *gin.Context) { id, originalURL, shortURL, userID) if err != nil { log.Printf("Error inserting link: %v", err) + if err.Error() == "UNIQUE constraint failed: links.short_url" { + c.JSON(http.StatusBadRequest, gin.H{"error": "Short URL already exists"}) + return + } c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return } @@ -183,7 +187,7 @@ func (app *App) githubCallback(c *gin.Context) { c.Redirect(http.StatusFound, "/") } -func (app *App) myLinks(c *gin.Context) { +func (app *App) dashboard(c *gin.Context) { userID := getUserID(c) if userID == "" { c.Redirect(http.StatusFound, "/") @@ -208,7 +212,7 @@ func (app *App) myLinks(c *gin.Context) { links = append(links, link) } - c.HTML(http.StatusOK, "dashboard.html", gin.H{"links": links}) + c.HTML(http.StatusOK, "dashboard.html", gin.H{"links": links, "userId": userID}) } func (app *App) deleteLink(c *gin.Context) { @@ -247,6 +251,10 @@ func (app *App) updateLink(c *gin.Context) { _, err := app.DB.Exec("UPDATE links SET short_url = ? WHERE id = ? AND user_id = ?", payload.NewName, payload.ID, userID) if err != nil { + if err.Error() == "UNIQUE constraint failed: links.short_url" { + c.JSON(http.StatusBadRequest, gin.H{"error": "Short URL already exists"}) + return + } c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": err.Error()}) return } diff --git a/static/img/logo.svg b/static/img/logo.svg new file mode 100644 index 0000000..595fcbb --- /dev/null +++ b/static/img/logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/templates/dashboard.html b/templates/dashboard.html index 315a73d..07c963b 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -1,64 +1,120 @@ - + - dashboard + + + lksNinja - Dashboard + + + - -

My Links

- - - - - - - {{range .links}} - - - - - - {{end}} -
Original URLShort URLActions
{{.OriginalURL}}{{.ShortURL}} - - - -
- Back to Home - - - + + Links Ninja + +
+

👋 Welcome on your dashboard

+ +
+ + + + + + + + + + {{range .links}} + + + + + + {{end}} + +
Original URLShort URLActions
{{.OriginalURL}} +
+ + + +
+ 		+ +
+
+ +
+ Account ID: {{.userId }} +
+
+ + Return to home + +
+
+ + + + \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index f21f6c9..23b3636 100644 --- a/templates/index.html +++ b/templates/index.html @@ -15,13 +15,14 @@ 'color': '0 0 15px rgba(99, 102, 241, 0.4)' } } - } + } } -

LKS ninja

+ Links Ninja +
@@ -45,19 +46,23 @@
+
{{if .loggedIn}} + class="px-6 py-2 bg-blue-400 text-white rounded-full focus:outline-none focus:ring-2 focus:ring-green-300 transition duration-300 ease-in-out transform hover:scale-105"> Dashboard - + Logout {{else}} + class="px-6 py-2 bg-blue-400 text-white rounded-full focus:outline-none focus:ring-2 focus:ring-blue-300 transition duration-300 ease-in-out transform hover:scale-105"> Login using GitHub {{end}} @@ -65,6 +70,10 @@