From c92fa6e9e0ca1cc92e4aa74d7f1de5cf60b0a879 Mon Sep 17 00:00:00 2001 From: Ivan Reshetnikov Date: Thu, 6 Apr 2023 10:37:48 +0500 Subject: [PATCH] Format code with `go fmt` --- backend/admins.go | 6 +- backend/groups.go | 32 ++++----- backend/links.go | 54 +++++++-------- main.go | 172 +++++++++++++++++++++++----------------------- views/auth.go | 4 +- 5 files changed, 134 insertions(+), 134 deletions(-) diff --git a/backend/admins.go b/backend/admins.go index 7bb9aaa..414dadc 100644 --- a/backend/admins.go +++ b/backend/admins.go @@ -11,16 +11,16 @@ import ( ) type Admin struct { - ID uint64 `gorm:"primaryKey"` + ID uint64 `gorm:"primaryKey"` Username string `gorm:"unique;notNull"` Bcrypt string `gorm:"notNull"` AccessTokens []AccessToken } type AccessToken struct { - ID uint64 `gorm:"primaryKey"` + ID uint64 `gorm:"primaryKey"` Value string `gorm:"notNull"` - AdminID uint64 `gorm:"notNull"` + AdminID uint64 `gorm:"notNull"` ValidUntil time.Time `gorm:"NotNull"` } diff --git a/backend/groups.go b/backend/groups.go index c30c2ef..9818a5b 100644 --- a/backend/groups.go +++ b/backend/groups.go @@ -1,32 +1,32 @@ package backend import ( - "gorm.io/gorm" + "gorm.io/gorm" ) type Group struct { - ID uint64 `gorm:"primaryKey"` + ID uint64 `gorm:"primaryKey"` Name string `gorm:"unique,notNull"` Links []Link } func GetGroups(db *gorm.DB) ([]Group, error) { - var groups []Group - result := db.Model(&Group{}).Preload("Links").Find(&groups) - if result.Error != nil { - return nil, result.Error - } - return groups, nil + var groups []Group + result := db.Model(&Group{}).Preload("Links").Find(&groups) + if result.Error != nil { + return nil, result.Error + } + return groups, nil } func CreateGroup(db *gorm.DB, groupName string) (Group, error) { - group := Group{ - Name: groupName, - } - result := db.Create(&group) - if result.Error != nil { - return Group{}, result.Error - } + group := Group{ + Name: groupName, + } + result := db.Create(&group) + if result.Error != nil { + return Group{}, result.Error + } - return group, nil + return group, nil } diff --git a/backend/links.go b/backend/links.go index 559c59a..17476ff 100644 --- a/backend/links.go +++ b/backend/links.go @@ -1,48 +1,48 @@ package backend import ( - "gorm.io/gorm" + "gorm.io/gorm" ) type Link struct { - ID uint64 `gorm:"primaryKey"` + ID uint64 `gorm:"primaryKey"` Name string `gorm:"notNull"` Href string `gorm:"notNull"` - GroupID uint64 `gorm:"notNull"` + GroupID uint64 `gorm:"notNull"` } func CreateLink(db *gorm.DB, linkName string, href string, groupID uint64) (Link, error) { - link := Link{ - Name: linkName, - Href: href, - GroupID: groupID, - } - result := db.Create(&link) - if result.Error != nil { - return Link{}, result.Error - } + link := Link{ + Name: linkName, + Href: href, + GroupID: groupID, + } + result := db.Create(&link) + if result.Error != nil { + return Link{}, result.Error + } - return link, nil + return link, nil } func UpdateLink(db *gorm.DB, id uint64, linkName string, href string) (Link, error) { - var link Link - db.First(&link, id) + var link Link + db.First(&link, id) - link.Name = linkName - link.Href = href - result := db.Save(&link) - if result.Error != nil { - return Link{}, result.Error - } + link.Name = linkName + link.Href = href + result := db.Save(&link) + if result.Error != nil { + return Link{}, result.Error + } - return link, nil + return link, nil } func DeleteLink(db *gorm.DB, id uint64) error { - result := db.Delete(&Link{}, id) - if result.Error != nil { - return result.Error - } - return nil + result := db.Delete(&Link{}, id) + if result.Error != nil { + return result.Error + } + return nil } diff --git a/main.go b/main.go index 20f58a4..837442b 100644 --- a/main.go +++ b/main.go @@ -1,13 +1,13 @@ package main import ( - "errors" + "errors" "github.com/gin-gonic/gin" "github.com/ordinary-dev/phoenix/backend" "github.com/ordinary-dev/phoenix/views" "log" "net/http" - "strconv" + "strconv" ) func main() { @@ -20,173 +20,173 @@ func main() { r.LoadHTMLGlob("templates/*") r.Static("/assets", "./assets") - // Main page + // Main page r.GET("/", func(c *gin.Context) { views.RequireAuth(c, db) - groups, err := backend.GetGroups(db) - if err != nil { - views.ShowError(c, err) - return - } + groups, err := backend.GetGroups(db) + if err != nil { + views.ShowError(c, err) + return + } c.HTML(http.StatusOK, "index.html.tmpl", gin.H{ - "groups": groups, - }) + "groups": groups, + }) }) - // Settings - r.GET("/settings", func(c *gin.Context) { - views.RequireAuth(c, db) - groups, err := backend.GetGroups(db) - if err != nil { - views.ShowError(c, err) - return - } + // Settings + r.GET("/settings", func(c *gin.Context) { + views.RequireAuth(c, db) + groups, err := backend.GetGroups(db) + if err != nil { + views.ShowError(c, err) + return + } - c.HTML(http.StatusOK, "settings.html.tmpl", gin.H{ - "groups": groups, - }) - }) + c.HTML(http.StatusOK, "settings.html.tmpl", gin.H{ + "groups": groups, + }) + }) - // Create new user + // Create new user r.POST("/users", func(c *gin.Context) { - // If at least 1 administator exists, require authorization - if backend.CountAdmins(db) > 0 { - tokenValue, err := c.Cookie("phoenix-token") + // If at least 1 administator exists, require authorization + if backend.CountAdmins(db) > 0 { + tokenValue, err := c.Cookie("phoenix-token") - // Anonymous visitor - if err != nil { - err = errors.New("At least 1 user exists, you have to sign in first") - views.ShowError(c, err) - return - } + // Anonymous visitor + if err != nil { + err = errors.New("At least 1 user exists, you have to sign in first") + views.ShowError(c, err) + return + } - err = backend.ValidateToken(db, tokenValue) - if err != nil { - views.ShowError(c, err) - return - } - } + err = backend.ValidateToken(db, tokenValue) + if err != nil { + views.ShowError(c, err) + return + } + } - // User is authorized or no user exists. - // Try to create a user. + // User is authorized or no user exists. + // Try to create a user. username := c.PostForm("username") password := c.PostForm("password") admin, err := backend.CreateAdmin(db, username, password) if err != nil { views.ShowError(c, err) - return + return } - // Generate access token. + // Generate access token. token, err := backend.CreateAccessToken(db, admin.ID) if err != nil { views.ShowError(c, err) - return + return } backend.SetTokenCookie(c, token) - // Redirect to homepage. + // Redirect to homepage. c.Redirect(http.StatusFound, "/") }) - - // Create new group + + // Create new group r.POST("/groups", func(c *gin.Context) { - views.RequireAuth(c, db) + views.RequireAuth(c, db) groupName := c.PostForm("groupName") _, err := backend.CreateGroup(db, groupName) if err != nil { views.ShowError(c, err) - return + return } - // Redirect to settings. + // Redirect to settings. c.Redirect(http.StatusFound, "/settings") }) - - // Create new link + + // Create new link r.POST("/links", func(c *gin.Context) { - views.RequireAuth(c, db) + views.RequireAuth(c, db) linkName := c.PostForm("linkName") - href := c.PostForm("href") - groupID, err := strconv.ParseUint(c.PostForm("groupID"), 10, 32) - if err != nil { - views.ShowError(c, err) - return - } + href := c.PostForm("href") + groupID, err := strconv.ParseUint(c.PostForm("groupID"), 10, 32) + if err != nil { + views.ShowError(c, err) + return + } _, err = backend.CreateLink(db, linkName, href, groupID) if err != nil { views.ShowError(c, err) - return + return } - // Redirect to settings. + // Redirect to settings. c.Redirect(http.StatusFound, "/settings") }) - // Update link - r.POST("/links/:id/put", func(c *gin.Context) { - views.RequireAuth(c, db) + // Update link + r.POST("/links/:id/put", func(c *gin.Context) { + views.RequireAuth(c, db) - id, err := strconv.ParseUint(c.Param("id"), 10, 64) - if err != nil { - views.ShowError(c, err) - return - } + id, err := strconv.ParseUint(c.Param("id"), 10, 64) + if err != nil { + views.ShowError(c, err) + return + } linkName := c.PostForm("linkName") - href := c.PostForm("href") + href := c.PostForm("href") _, err = backend.UpdateLink(db, id, linkName, href) if err != nil { views.ShowError(c, err) - return + return } - // Redirect to settings. + // Redirect to settings. c.Redirect(http.StatusFound, "/settings") }) - // Delete link - r.POST("/links/:id/delete", func(c *gin.Context) { - views.RequireAuth(c, db) + // Delete link + r.POST("/links/:id/delete", func(c *gin.Context) { + views.RequireAuth(c, db) - id, err := strconv.ParseUint(c.Param("id"), 10, 64) - if err != nil { - views.ShowError(c, err) - return - } + id, err := strconv.ParseUint(c.Param("id"), 10, 64) + if err != nil { + views.ShowError(c, err) + return + } err = backend.DeleteLink(db, id) if err != nil { views.ShowError(c, err) - return + return } - // Redirect to settings. + // Redirect to settings. c.Redirect(http.StatusFound, "/settings") }) r.POST("/signin", func(c *gin.Context) { - // Check credentials. + // Check credentials. username := c.PostForm("username") password := c.PostForm("password") admin, err := backend.AuthorizeAdmin(db, username, password) if err != nil { views.ShowError(c, err) - return + return } - // Generate an access token. + // Generate an access token. token, err := backend.CreateAccessToken(db, admin.ID) if err != nil { views.ShowError(c, err) - return + return } backend.SetTokenCookie(c, token) - // Redirect to homepage. + // Redirect to homepage. c.Redirect(http.StatusFound, "/") }) diff --git a/views/auth.go b/views/auth.go index 8aa441d..9ffe7a8 100644 --- a/views/auth.go +++ b/views/auth.go @@ -41,12 +41,12 @@ func RequireAuth(c *gin.Context, db *gorm.DB) { // Anonymous visitor if err != nil { ShowLoginForm(c) - return + return } err = backend.ValidateToken(db, tokenValue) if err != nil { ShowError(c, err) - return + return } }