From 28c98518b23087c05ab67b6d37f51abd6237c665 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Wed, 10 Apr 2024 01:44:44 -0600 Subject: [PATCH] Login page added to user icon in nav bar --- .../resources/css/navigation-bar/login.css | 13 ++++++++ .../resources/js/navigation-bar/user/login.js | 12 +++++++ .../src/views/partials/footer.hbs | 3 +- ProjectSourceCode/src/views/partials/head.hbs | 1 + .../navigation-bar}/login.hbs | 4 +-- .../src/views/partials/navigation-bar/nav.hbs | 33 ++++++++++++++----- 6 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 ProjectSourceCode/src/resources/css/navigation-bar/login.css create mode 100644 ProjectSourceCode/src/resources/js/navigation-bar/user/login.js rename ProjectSourceCode/src/views/{pages => partials/navigation-bar}/login.hbs (90%) diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/login.css b/ProjectSourceCode/src/resources/css/navigation-bar/login.css new file mode 100644 index 0000000..d845822 --- /dev/null +++ b/ProjectSourceCode/src/resources/css/navigation-bar/login.css @@ -0,0 +1,13 @@ +#login-page { + width: 400px; + height: fit-content; + position: absolute; + top: 150px; /* Adjust this value as needed */ + right: 20px; /* Adjust this value as needed */ + z-index: 10; + background-color: white; + border: 1px solid gray; + border-radius: 8px; +} + + \ No newline at end of file diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js new file mode 100644 index 0000000..1afd585 --- /dev/null +++ b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js @@ -0,0 +1,12 @@ +// Function to render login.hbs when #user is clicked +function renderLogin() { + // Assuming you're using jQuery + $('#user').on('click', function() { + // Load the login.hbs template content using AJAX + res.render('/login'); + }); + } + + // Call the function to enable rendering login.hbs + renderLogin(); + diff --git a/ProjectSourceCode/src/views/partials/footer.hbs b/ProjectSourceCode/src/views/partials/footer.hbs index eb850b7..8e4b20d 100644 --- a/ProjectSourceCode/src/views/partials/footer.hbs +++ b/ProjectSourceCode/src/views/partials/footer.hbs @@ -3,8 +3,9 @@ © 2024 - CSCI 3308 Group 6

- + + diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs index 5cdaea4..9dd1052 100644 --- a/ProjectSourceCode/src/views/partials/head.hbs +++ b/ProjectSourceCode/src/views/partials/head.hbs @@ -8,6 +8,7 @@ + diff --git a/ProjectSourceCode/src/views/pages/login.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/login.hbs similarity index 90% rename from ProjectSourceCode/src/views/pages/login.hbs rename to ProjectSourceCode/src/views/partials/navigation-bar/login.hbs index 620a884..c671fb1 100644 --- a/ProjectSourceCode/src/views/pages/login.hbs +++ b/ProjectSourceCode/src/views/partials/navigation-bar/login.hbs @@ -1,6 +1,6 @@ -
-
+