SowinskiBraeden/BugBeGone
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

use gfbmb external package

Browse Source
This commit is contained in:
SowinskiBraeden committed 2022-04-12 15:20:07 -07:00
1 parent 1ee9de601c
commit e87d252934
5 files changed
+25 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/authController.go
+10 -10
View File
@@ -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,
})
controllers/viewsController.go
+6 -8
View File
@@ -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": "<div></div>",
"errorMsg": messageBox.EmptyMessageBox(),
})
}
func LoginPage(c *fiber.Ctx) error {
return c.Render("login", fiber.Map{
"errorMsg": `<div class="alert alert-warning alert-dismissible fade show" role="alert">
test error
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>`,
"errorMsg": messageBox.EmptyMessageBox(),
})
}