diff --git a/controllers/authController.go b/controllers/authController.go index 076fef2..54839de 100644 --- a/controllers/authController.go +++ b/controllers/authController.go @@ -7,7 +7,6 @@ import ( "github.com/SowinskiBraeden/BugBeGone/database" "github.com/SowinskiBraeden/BugBeGone/models" - "github.com/SowinskiBraeden/gfbmb/messageBox" "github.com/gofiber/fiber/v2" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" @@ -31,7 +30,7 @@ func Register(c *fiber.Ctx) error { if email == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("Missing Email"), + "errorMsg": "Missing Email", "username": username, "email": email, }) @@ -39,7 +38,7 @@ func Register(c *fiber.Ctx) error { if password == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("Please enter your password"), + "errorMsg": "Please enter your password", "username": username, "email": email, }) @@ -47,7 +46,7 @@ func Register(c *fiber.Ctx) error { if username == "" { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("Missing Username"), + "errorMsg": "Missing Username", "username": username, "email": email, }) @@ -63,7 +62,7 @@ func Register(c *fiber.Ctx) error { if err != nil { cancel() return c.Status(fiber.StatusInternalServerError).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("Failed to search database"), + "errorMsg": "Failed to search database", "username": username, "email": email, }) @@ -71,7 +70,7 @@ func Register(c *fiber.Ctx) error { if count > 0 { cancel() return c.Status(fiber.StatusInternalServerError).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("An account already exists with that email or username"), + "errorMsg": "An account already exists with that email or username", "username": username, "email": email, }) @@ -81,7 +80,7 @@ func Register(c *fiber.Ctx) error { if user.CheckPasswordStrength(password) { cancel() return c.Status(fiber.StatusBadRequest).Render("register", fiber.Map{ - "errorMsg": messageBox.NewWarningBox("Your password must contain at least 1 lowercase, 1 uppercase & 1 special character"), + "errorMsg": "Your password must contain at least 1 lowercase, 1 uppercase & 1 special character", "username": username, "email": email, }) diff --git a/controllers/viewsController.go b/controllers/viewsController.go index ccf9b3b..87f9ccb 100644 --- a/controllers/viewsController.go +++ b/controllers/viewsController.go @@ -12,7 +12,7 @@ func MainPage(c *fiber.Ctx) error { func RegisterPage(c *fiber.Ctx) error { return c.Render("register", fiber.Map{ - "errorMsg": messageBox.EmptyMessageBox(), + "errorMsg": "", }) } diff --git a/public/images/header-bg.jpg b/public/images/header-bg.jpg index 7d7febf..7592d91 100644 Binary files a/public/images/header-bg.jpg and b/public/images/header-bg.jpg differ diff --git a/public/images/team-1.jpg b/public/images/team-1.jpg deleted file mode 100644 index c89748b..0000000 Binary files a/public/images/team-1.jpg and /dev/null differ diff --git a/public/images/team-2.jpg b/public/images/team-2.jpg deleted file mode 100644 index 2112f69..0000000 Binary files a/public/images/team-2.jpg and /dev/null differ diff --git a/public/images/team-3.jpg b/public/images/team-3.jpg deleted file mode 100644 index ffe4aad..0000000 Binary files a/public/images/team-3.jpg and /dev/null differ diff --git a/public/images/team-4.jpg b/public/images/team-4.jpg deleted file mode 100644 index 17543bb..0000000 Binary files a/public/images/team-4.jpg and /dev/null differ diff --git a/public/images/team-5.jpg b/public/images/team-5.jpg deleted file mode 100644 index 3b26037..0000000 Binary files a/public/images/team-5.jpg and /dev/null differ diff --git a/public/images/test-1.jpg b/public/images/test-1.jpg deleted file mode 100644 index 0b7839c..0000000 Binary files a/public/images/test-1.jpg and /dev/null differ diff --git a/public/images/test-2.jpg b/public/images/test-2.jpg deleted file mode 100644 index d1de50a..0000000 Binary files a/public/images/test-2.jpg and /dev/null differ diff --git a/public/images/test-3.jpg b/public/images/test-3.jpg deleted file mode 100644 index 6af1906..0000000 Binary files a/public/images/test-3.jpg and /dev/null differ diff --git a/public/images/testimonial-bg.jpg b/public/images/testimonial-bg.jpg deleted file mode 100644 index 8e72d6b..0000000 Binary files a/public/images/testimonial-bg.jpg and /dev/null differ diff --git a/public/images/video-bg.jpg b/public/images/video-bg.jpg deleted file mode 100644 index 4798a96..0000000 Binary files a/public/images/video-bg.jpg and /dev/null differ diff --git a/public/styles/register.css b/public/styles/register.css index e71681f..982b917 100644 --- a/public/styles/register.css +++ b/public/styles/register.css @@ -1,3 +1,10 @@ +:root{ + --mount-meadow: #1bbc9c; + --white-smoke: #f0f0f0; + --night-rider: #343434; + --black: #191b17; + --transition: all 0.5s ease-in-out; +} * { margin: 0; padding: 0; @@ -13,6 +20,62 @@ body { font-weight: 100; text-align: center; } +#signup:hover { + cursor: pointer; +} +.container2{ + max-width: 1320px; + margin: 0 auto; + padding: 0 1rem; +} +.navbar{ + position: fixed; + top: 0; + left: 0; + width: 100%; + z-index: 999; +} +.brand-and-toggler{ + font-size: 1.65rem; + padding: 0.8rem 0; + display: flex; + justify-content: space-between; + align-items: center; +} +.navbar-brand{ + font-weight: 500; + color: var(--night-rider); + text-decoration: none; +} +.navbar-brand span{ + color: var(--mount-meadow); +} +.navbar-toggler{ + border: none; + color: var(--mount-meadow); +} +.navbar-nav{ + margin: 0.2rem 0 0.6rem 0; +} +.nav-item{ + padding: 0.6rem 0; + list-style: none; +} +.nav-link{ + text-transform: uppercase; + font-size: 0.95rem; + letter-spacing: 1.5px; + font-weight: 400; + opacity: 0.65; + transition: var(--transition); + text-decoration: none; +} +.nav-link:hover{ + color: var(--mount-meadow)!important; +} +.navbar-collapse{ + display: none; +} .container { background: #B7BED8; color: #6A79A6; @@ -20,6 +83,10 @@ body { padding: 0em 2em; margin: 6em auto; box-shadow: 0 50px 50px rgba(0,0,0,0.2); + position: absolute; + top: 25%; + left: 50%; + transform: translate(-50%, -25%); } .container .navigation { text-align: left; @@ -190,3 +257,50 @@ body { transform: translateY(0); } } + +@media screen and (min-width: 992px){ + .navbar{ + background: transparent; + margin-top: 1.4rem; + } + .navbar .container2{ + display: flex; + align-items: center; + justify-content: space-between; + } + .navbar-brand{ + color: var(--white-smoke); + font-size: 2rem; + } + .navbar-toggler{ + display: none; + } + .navbar-collapse{ + display: block!important; + } + .navbar-nav{ + display: flex; + margin: 0; + } + .nav-item{ + margin-left: 1.8rem; + } + .nav-link{ + color: var(--white-smoke); + } + + /* navbar change */ + .cng-navbar{ + -webkit-box-shadow: 0 2px 5px 0 rgba(207, 205, 207, 0.3); + -moz-box-shadow: 0 2px 5px 0 rgba(207, 205, 207, 0.3); + box-shadow: 0 2px 5px 0 rgba(207, 205, 207, 0.3); + margin-top: 0; + background: #fff; + } + .cng-navbar .navbar-brand{ + color: var(--night-rider); + } + .cng-navbar .nav-link{ + color: var(--night-rider); + } +} \ No newline at end of file diff --git a/public/styles/style.css b/public/styles/style.css index f63db72..649d5bc 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -568,9 +568,6 @@ section{ .pricing .row{ grid-template-columns: repeat(3, 1fr); } - .testimonial-item p{ - width: 60%; - } .contact .row{ column-gap: 4rem; } diff --git a/views/index.html b/views/index.html index e1c04fd..6b7b571 100644 --- a/views/index.html +++ b/views/index.html @@ -14,6 +14,7 @@ + @@ -59,12 +60,12 @@
-

we make your website stand out

-

The best way to connect people with your brand.

+

BugBeGone, Bug Tracking Software

+

The best way to track, and solve bugs as a team.

- - + +
@@ -82,11 +83,20 @@
- +

Quick Responce

Our staff works quick to respond to your questoins over email or in our Discord!

+ + +
+ +

Join Our Discord

+
+

For quick communication between staff and other users, join our Discord!

+
+ @@ -139,9 +149,6 @@
team-ceo
- - - diff --git a/views/register.html b/views/register.html index be1b727..21b3531 100644 --- a/views/register.html +++ b/views/register.html @@ -8,6 +8,44 @@ +
    @@ -17,7 +55,7 @@
  1. Password
-
+
  1. @@ -42,11 +80,11 @@

  2. - sign up

    + sign up

-
{{ unescape .errorMsg }}
+
{{ .errorMsg }}

Thank you