diff --git a/controllers/authController.go b/controllers/authController.go index 052c677..5d2661a 100644 --- a/controllers/authController.go +++ b/controllers/authController.go @@ -141,7 +141,12 @@ func Login(c *fiber.Ctx) error { } var user models.User - err := userCollection.FindOne(ctx, bson.M{"username": username}).Decode(&user) + err := userCollection.FindOne(ctx, bson.M{ + "$or": []bson.M{ + {"email": username}, + {"username": username}, + }, + }).Decode(&user) defer cancel() if err != nil { @@ -166,7 +171,12 @@ func Login(c *fiber.Ctx) error { _, updateErr := userCollection.UpdateOne( ctx, - bson.M{"username": username}, + bson.M{ + "$or": []bson.M{ + {"email": username}, + {"username": username}, + }, + }, update, ) if updateErr != nil { diff --git a/controllers/viewsController.go b/controllers/viewsController.go index b326826..63c7322 100644 --- a/controllers/viewsController.go +++ b/controllers/viewsController.go @@ -54,8 +54,11 @@ func DashboardPage(c *fiber.Ctx) error { } return c.Status(fiber.StatusAccepted).Render("dashboard", fiber.Map{ - "msg": "", - "errorMsg": "", - "user": user, + "msg": "", + "errorMsg": "", + "username": user.Username, + "email": user.Email, + "firstname": user.Firstname, + "lastname": user.Lastname, }) } diff --git a/public/styles/register.css b/public/styles/register.css index 55a0cda..aaecd6b 100644 --- a/public/styles/register.css +++ b/public/styles/register.css @@ -47,6 +47,9 @@ h1, h2, h3, h4, h5, h6{ font-weight: 400; text-transform: capitalize; } +#signup:hover { + cursor: pointer; +} .text{ margin: 0.6rem 0; opacity: 0.8; diff --git a/views/index.html b/views/index.html index 3dd9936..91bef33 100644 --- a/views/index.html +++ b/views/index.html @@ -61,7 +61,7 @@

BugBeGone, Bug Tracking Software

-

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

+

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

diff --git a/views/login.html b/views/login.html index 786120f..0ba511c 100644 --- a/views/login.html +++ b/views/login.html @@ -4,8 +4,79 @@ Login - BugBeGone + + +
+ +
+

Login

+
+
+
+
+
    +
  1. Username
    2. +
  2. Password
    3. +
+
+
+
    +
  1. + + +
    2. +
  2. + + + + +
    3. +

  3. + Login

    +
    4. +
+
+
{{ .errorMsg }}
+
+

One moment...

+ + \ No newline at end of file