From de76c90f3c504c042a189807e192824ae3e00e0c Mon Sep 17 00:00:00 2001 From: Ivan Reshetnikov Date: Sat, 22 Jul 2023 15:24:01 +0500 Subject: [PATCH] Rename 'backend' module to 'database' --- {backend => database}/admins.go | 2 +- {backend => database}/db.go | 2 +- {backend => database}/groups.go | 2 +- {backend => database}/links.go | 2 +- main.go | 4 ++-- views/auth.go | 6 +++--- views/groups.go | 8 ++++---- views/index.go | 6 +++--- views/links.go | 8 ++++---- views/settings.go | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) rename {backend => database}/admins.go (98%) rename {backend => database}/db.go (95%) rename {backend => database}/groups.go (89%) rename {backend => database}/links.go (90%) diff --git a/backend/admins.go b/database/admins.go similarity index 98% rename from backend/admins.go rename to database/admins.go index 1f29056..b23e4ec 100644 --- a/backend/admins.go +++ b/database/admins.go @@ -1,4 +1,4 @@ -package backend +package database import ( "golang.org/x/crypto/bcrypt" diff --git a/backend/db.go b/database/db.go similarity index 95% rename from backend/db.go rename to database/db.go index 31870e6..51303d5 100644 --- a/backend/db.go +++ b/database/db.go @@ -1,4 +1,4 @@ -package backend +package database import ( "github.com/ordinary-dev/phoenix/config" diff --git a/backend/groups.go b/database/groups.go similarity index 89% rename from backend/groups.go rename to database/groups.go index c6cd484..cdeae45 100644 --- a/backend/groups.go +++ b/database/groups.go @@ -1,4 +1,4 @@ -package backend +package database type Group struct { ID uint64 `gorm:"primaryKey"` diff --git a/backend/links.go b/database/links.go similarity index 90% rename from backend/links.go rename to database/links.go index fb9348e..15de1a3 100644 --- a/backend/links.go +++ b/database/links.go @@ -1,4 +1,4 @@ -package backend +package database type Link struct { ID uint64 `gorm:"primaryKey"` diff --git a/main.go b/main.go index de2f00a..64c2d5f 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/ordinary-dev/phoenix/backend" "github.com/ordinary-dev/phoenix/config" + "github.com/ordinary-dev/phoenix/database" "github.com/ordinary-dev/phoenix/views" "github.com/sirupsen/logrus" ) @@ -25,7 +25,7 @@ func main() { logrus.Infof("Setting log level to %v", logLevel) // Connect to the database - db, err := backend.GetDatabaseConnection(cfg) + db, err := database.GetDatabaseConnection(cfg) if err != nil { logrus.Fatalf("%v", err) } diff --git a/views/auth.go b/views/auth.go index 5019447..9efa656 100644 --- a/views/auth.go +++ b/views/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" - "github.com/ordinary-dev/phoenix/backend" "github.com/ordinary-dev/phoenix/config" + "github.com/ordinary-dev/phoenix/database" "gorm.io/gorm" "net/http" "time" @@ -92,7 +92,7 @@ func CreateUser(c *gin.Context, db *gorm.DB, cfg *config.Config) { // Try to create a user. username := c.PostForm("username") password := c.PostForm("password") - _, err := backend.CreateAdmin(db, username, password) + _, err := database.CreateAdmin(db, username, password) if err != nil { ShowError(c, err) return @@ -114,7 +114,7 @@ func AuthorizeUser(c *gin.Context, db *gorm.DB, cfg *config.Config) { // Check credentials. username := c.PostForm("username") password := c.PostForm("password") - _, err := backend.AuthorizeAdmin(db, username, password) + _, err := database.AuthorizeAdmin(db, username, password) if err != nil { ShowError(c, err) return diff --git a/views/groups.go b/views/groups.go index eb0137e..e498f01 100644 --- a/views/groups.go +++ b/views/groups.go @@ -2,7 +2,7 @@ package views import ( "github.com/gin-gonic/gin" - "github.com/ordinary-dev/phoenix/backend" + "github.com/ordinary-dev/phoenix/database" "gorm.io/gorm" "net/http" "strconv" @@ -10,7 +10,7 @@ import ( func CreateGroup(c *gin.Context, db *gorm.DB) { // Save new group to the database. - group := backend.Group{ + group := database.Group{ Name: c.PostForm("groupName"), } if result := db.Create(&group); result.Error != nil { @@ -29,7 +29,7 @@ func UpdateGroup(c *gin.Context, db *gorm.DB) { return } - var group backend.Group + var group database.Group if result := db.First(&group, id); result.Error != nil { ShowError(c, result.Error) return @@ -52,7 +52,7 @@ func DeleteGroup(c *gin.Context, db *gorm.DB) { return } - if result := db.Delete(&backend.Group{}, id); result.Error != nil { + if result := db.Delete(&database.Group{}, id); result.Error != nil { ShowError(c, result.Error) return } diff --git a/views/index.go b/views/index.go index ae0fad6..52d63bf 100644 --- a/views/index.go +++ b/views/index.go @@ -2,16 +2,16 @@ package views import ( "github.com/gin-gonic/gin" - "github.com/ordinary-dev/phoenix/backend" + "github.com/ordinary-dev/phoenix/database" "gorm.io/gorm" "net/http" ) func ShowMainPage(c *gin.Context, db *gorm.DB) { // Get a list of groups with links - var groups []backend.Group + var groups []database.Group result := db. - Model(&backend.Group{}). + Model(&database.Group{}). Preload("Links"). Find(&groups) diff --git a/views/links.go b/views/links.go index 960a4a7..e8b7247 100644 --- a/views/links.go +++ b/views/links.go @@ -2,7 +2,7 @@ package views import ( "github.com/gin-gonic/gin" - "github.com/ordinary-dev/phoenix/backend" + "github.com/ordinary-dev/phoenix/database" "gorm.io/gorm" "net/http" "strconv" @@ -15,7 +15,7 @@ func CreateLink(c *gin.Context, db *gorm.DB) { return } - link := backend.Link{ + link := database.Link{ Name: c.PostForm("linkName"), Href: c.PostForm("href"), GroupID: groupID, @@ -36,7 +36,7 @@ func UpdateLink(c *gin.Context, db *gorm.DB) { return } - var link backend.Link + var link database.Link if result := db.First(&link, id); result.Error != nil { ShowError(c, err) return @@ -60,7 +60,7 @@ func DeleteLink(c *gin.Context, db *gorm.DB) { return } - if result := db.Delete(&backend.Link{}, id); result.Error != nil { + if result := db.Delete(&database.Link{}, id); result.Error != nil { ShowError(c, result.Error) return } diff --git a/views/settings.go b/views/settings.go index 955224e..8c65e59 100644 --- a/views/settings.go +++ b/views/settings.go @@ -2,16 +2,16 @@ package views import ( "github.com/gin-gonic/gin" - "github.com/ordinary-dev/phoenix/backend" + "github.com/ordinary-dev/phoenix/database" "gorm.io/gorm" "net/http" ) func ShowSettings(c *gin.Context, db *gorm.DB) { // Get a list of groups with links - var groups []backend.Group + var groups []database.Group result := db. - Model(&backend.Group{}). + Model(&database.Group{}). Preload("Links"). Find(&groups)