diff --git a/controllers/authController.go b/controllers/authController.go index 35bf696..340dd6d 100644 --- a/controllers/authController.go +++ b/controllers/authController.go @@ -11,7 +11,7 @@ import ( "github.com/SowinskiBraeden/BugBeGone/database" "github.com/SowinskiBraeden/BugBeGone/models" - "github.com/SowinskiBraeden/BugBeGone/render" + "github.com/SowinskiBraeden/gfbmb/messageBox" "github.com/gofiber/fiber/v2" "github.com/google/uuid" "go.mongodb.org/mongo-driver/bson" @@ -38,7 +38,7 @@ func Register(c *fiber.Ctx) error { if email == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Missing Email"), + "errorMsg": messageBox.NewWarningBox("Missing Email"), "username": username, "email": email, }) @@ -46,7 +46,7 @@ func Register(c *fiber.Ctx) error { if pass1 == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Missing Password"), + "errorMsg": messageBox.NewWarningBox("Missing Password"), "username": username, "email": email, }) @@ -54,7 +54,7 @@ func Register(c *fiber.Ctx) error { if pass2 == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Please retype your password"), + "errorMsg": messageBox.NewWarningBox("Please retype your password"), "username": username, "email": email, }) @@ -62,7 +62,7 @@ func Register(c *fiber.Ctx) error { if username == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Missing Username"), + "errorMsg": messageBox.NewWarningBox("Missing Username"), "username": username, "email": email, }) @@ -78,7 +78,7 @@ func Register(c *fiber.Ctx) error { if err != nil { cancel() return c.Status(fiber.StatusInternalServerError).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Failed to search database"), + "errorMsg": messageBox.NewWarningBox("Failed to search database"), "username": username, "email": email, }) @@ -86,7 +86,7 @@ func Register(c *fiber.Ctx) error { if count > 0 { cancel() return c.Status(fiber.StatusInternalServerError).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("An account already exists with that email or username"), + "errorMsg": messageBox.NewWarningBox("An account already exists with that email or username"), "username": username, "email": email, }) @@ -95,7 +95,7 @@ func Register(c *fiber.Ctx) error { if pass1 != pass2 { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("The passwords don't match"), + "errorMsg": messageBox.NewWarningBox("The passwords don't match"), "username": username, "email": email, }) @@ -105,7 +105,7 @@ func Register(c *fiber.Ctx) error { if user.CheckPasswordStrength(pass1) { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("Your password must contain at least 1 lowercase, 1 uppercase & 1 special character"), + "errorMsg": messageBox.NewWarningBox("Your password must contain at least 1 lowercase, 1 uppercase & 1 special character"), "username": username, "email": email, }) @@ -115,7 +115,7 @@ func Register(c *fiber.Ctx) error { if accountType != "T" && accountType != "R" && accountType != "A" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": render.NewWarningBox("There appears to be an error with your account type, please try again"), + "errorMsg": messageBox.NewWarningBox("There appears to be an error with your account type, please try again"), "username": username, "email": email, }) diff --git a/controllers/viewsController.go b/controllers/viewsController.go index 1a23422..ccf9b3b 100644 --- a/controllers/viewsController.go +++ b/controllers/viewsController.go @@ -1,6 +1,9 @@ package controllers -import "github.com/gofiber/fiber/v2" +import ( + "github.com/SowinskiBraeden/gfbmb/messageBox" + "github.com/gofiber/fiber/v2" +) // Render Index func MainPage(c *fiber.Ctx) error { @@ -9,17 +12,12 @@ func MainPage(c *fiber.Ctx) error { func RegisterPage(c *fiber.Ctx) error { return c.Render("register", fiber.Map{ - "errorMsg": "
", + "errorMsg": messageBox.EmptyMessageBox(), }) } func LoginPage(c *fiber.Ctx) error { return c.Render("login", fiber.Map{ - "errorMsg": ``, + "errorMsg": messageBox.EmptyMessageBox(), }) } diff --git a/go.mod b/go.mod index a1d65e3..695b920 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/SowinskiBraeden/BugBeGone go 1.17 require ( - github.com/gofiber/fiber/v2 v2.30.0 - github.com/gofiber/template v1.6.25 + github.com/gofiber/fiber/v2 v2.31.0 + github.com/gofiber/template v1.6.26 github.com/google/uuid v1.1.2 github.com/joho/godotenv v1.4.0 go.mongodb.org/mongo-driver v1.8.4 @@ -12,6 +12,7 @@ require ( ) require ( + github.com/SowinskiBraeden/gfbmb v0.0.0-20220411232833-d7374a8d6af0 github.com/andybalholm/brotli v1.0.4 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/golang/snappy v0.0.3 // indirect diff --git a/go.sum b/go.sum index b4294bb..0fcf2c4 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/SowinskiBraeden/gfbmb v0.0.0-20220411232833-d7374a8d6af0 h1:2bxOMciaau/pWgzkH4ZXXHVTdUW/0GBvJ4Z0QW0eymU= +github.com/SowinskiBraeden/gfbmb v0.0.0-20220411232833-d7374a8d6af0/go.mod h1:0qAOkswfp8zWWtmsRdP29foVySFrN2dlHWiTblpH7JA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -128,11 +130,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofiber/fiber/v2 v2.29.0/go.mod h1:1Ega6O199a3Y7yDGuM9FyXDPYQfv+7/y48wl6WCwUF4= -github.com/gofiber/fiber/v2 v2.30.0 h1:R928kgJICQkcfIzAjMIQ+U0uOpa0+vTCZLLODeo4M14= github.com/gofiber/fiber/v2 v2.30.0/go.mod h1:1Ega6O199a3Y7yDGuM9FyXDPYQfv+7/y48wl6WCwUF4= -github.com/gofiber/template v1.6.25 h1:wAh92yCfP2XQvxBRK8VchbjAJnNz/y+p4uD94WBs1MI= -github.com/gofiber/template v1.6.25/go.mod h1:/hE+mSK1VTEK9YVX1ySE2ix12xOXdgi28nrsVaRq2u4= +github.com/gofiber/fiber/v2 v2.31.0 h1:M2rWPQbD5fDVAjcoOLjKRXTIlHesI5Eq7I5FEQPt4Ow= +github.com/gofiber/fiber/v2 v2.31.0/go.mod h1:1Ega6O199a3Y7yDGuM9FyXDPYQfv+7/y48wl6WCwUF4= +github.com/gofiber/template v1.6.26 h1:wtbXFY1XzniCImYSBX++jVwM2aoShj8Bf7XNHojc5aQ= +github.com/gofiber/template v1.6.26/go.mod h1:Vf2XJ97b9LhBxfKbIDjk2iTxHGFCSf3TB3LcP0NDsHY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= diff --git a/render/messageBox.go b/render/messageBox.go deleted file mode 100644 index 08f4ca4..0000000 --- a/render/messageBox.go +++ /dev/null @@ -1,33 +0,0 @@ -package render - -func NewWarningBox(message string) string { - return ` - ` -} - -func NewErrorBox(message string) string { - return ` - - ` -} - -func NewSuccessBox(message string) string { - return ` - - ` -}