From 9e7d4de169ffee9077c3d30b2193c8ec07ee3bb0 Mon Sep 17 00:00:00 2001
From: Lucas Patenaude <LUPA7501@colorado.edu>
Date: Wed, 24 Apr 2024 03:44:48 -0600
Subject: [PATCH] Fixes to login container linking

---
 .../css/login-and-registration/login.css      |  6 ++++++
 .../login_and_registration.css                |  1 +
 .../login-and-registration/registration.css   |  3 +++
 .../resources/css/navigation-bar/login.css    |  6 ------
 .../css/navigation-bar/navigation-bar.css     | 16 ++++++++--------
 .../css/navigation-bar/registration.css       |  3 ---
 .../resources/js/navigation-bar/user/login.js | 13 ++++++-------
 .../js/navigation-bar/user/register.js        |  4 ++--
 ProjectSourceCode/src/views/partials/head.hbs |  4 ++--
 .../navigation-bar/account-screen.hbs         |  4 ++--
 .../src/views/partials/navigation-bar/nav.hbs | 19 ++++++-------------
 11 files changed, 36 insertions(+), 43 deletions(-)
 create mode 100644 ProjectSourceCode/src/resources/css/login-and-registration/login.css
 create mode 100644 ProjectSourceCode/src/resources/css/login-and-registration/registration.css
 delete mode 100644 ProjectSourceCode/src/resources/css/navigation-bar/login.css
 delete mode 100644 ProjectSourceCode/src/resources/css/navigation-bar/registration.css

diff --git a/ProjectSourceCode/src/resources/css/login-and-registration/login.css b/ProjectSourceCode/src/resources/css/login-and-registration/login.css
new file mode 100644
index 0000000..7392897
--- /dev/null
+++ b/ProjectSourceCode/src/resources/css/login-and-registration/login.css
@@ -0,0 +1,6 @@
+#login-screen-container {
+    display: none;
+}
+
+
+  
\ No newline at end of file
diff --git a/ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css b/ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css
index f79cb66..6894a6e 100644
--- a/ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css
+++ b/ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css
@@ -10,6 +10,7 @@
     border: 1px solid gray;
 }
 
+
 .form-container {
     width: 70%; /* Adjust width as needed */
     margin: 0 auto; /* Center horizontally */
diff --git a/ProjectSourceCode/src/resources/css/login-and-registration/registration.css b/ProjectSourceCode/src/resources/css/login-and-registration/registration.css
new file mode 100644
index 0000000..26ba982
--- /dev/null
+++ b/ProjectSourceCode/src/resources/css/login-and-registration/registration.css
@@ -0,0 +1,3 @@
+#register-screen-container {
+    display: none;
+}
diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/login.css b/ProjectSourceCode/src/resources/css/navigation-bar/login.css
deleted file mode 100644
index 5451e5d..0000000
--- a/ProjectSourceCode/src/resources/css/navigation-bar/login.css
+++ /dev/null
@@ -1,6 +0,0 @@
-#login-container {
-    display: none;
-}
-
-
-  
\ No newline at end of file
diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css b/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
index 891912b..75c4877 100644
--- a/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
+++ b/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
@@ -1,8 +1,4 @@
-/* Add logo font face */
-@font-face {
-    font-family: 'Scottsdale-Italic';
-    src: url('../../fonts/Scottsdale-Italic.ttf') format('truetype');
-}
+
 
 .sticky {
     position: fixed;
@@ -55,14 +51,18 @@
     }
 }
 
-#user {
+#user-profile-button {
     width: 25px;
     cursor: pointer;
     transition: width 0.3s ease; /* Adding transition for smooth effect */
 }
 
-#user:hover {
+#user-profile-button:hover {
     width: 30px;
 }
 
-  
+/* Add logo font face */
+@font-face {
+    font-family: 'Scottsdale-Italic';
+    src: url('../../fonts/Scottsdale-Italic.ttf') format('truetype');
+}
\ No newline at end of file
diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/registration.css b/ProjectSourceCode/src/resources/css/navigation-bar/registration.css
deleted file mode 100644
index 1b9c3bc..0000000
--- a/ProjectSourceCode/src/resources/css/navigation-bar/registration.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#register-container {
-    display: none;
-}
diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js
index a1ed99f..5b19749 100644
--- a/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js
+++ b/ProjectSourceCode/src/resources/js/navigation-bar/user/login.js
@@ -1,19 +1,18 @@
 $(document).ready(function() {
 
   // When #user is clicked
-  $('#user').click(function() {
+  $('#user-profile-button').click(function() {
 
-    $('#register-container').hide();
+    $('#register-screen-container').hide();
     // Toggle the visibility of the login container
-    $('#login-container').toggle();
+    $('#login-page').toggle();
   });
 
   $('#register-page-login-button').click(function() {
     event.preventDefault(); // Prevent the default action of following the link
 
-    $('#register-container').hide();
-    $('#login-container').toggle();
+    $('#register-screen-container').hide();
+    $('#login-screen-container').show();
   });
-  
-  
+
 });
diff --git a/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js b/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js
index 7271241..0a32d6c 100644
--- a/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js
+++ b/ProjectSourceCode/src/resources/js/navigation-bar/user/register.js
@@ -4,9 +4,9 @@ $(document).ready(function () {
     $('#register-button').click(function (event) {
       event.preventDefault(); // Prevent the default action of following the link
   
-      $('#login-container').hide();
+      $('#login-screen-container').hide();
       // Show the register container
-      $('#register-container').show();
+      $('#register-screen-container').show();
     });
   });
   
\ No newline at end of file
diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs
index 12dedc7..44953fc 100644
--- a/ProjectSourceCode/src/views/partials/head.hbs
+++ b/ProjectSourceCode/src/views/partials/head.hbs
@@ -11,8 +11,8 @@
 
   <!-- Navigation Bar Stylesheets -->
   <link rel="stylesheet" type="text/css" href="/css/navigation-bar/navigation-bar.css">
-  <link rel="stylesheet" type="text/css" href="/css/navigation-bar/login.css">
-  <link rel="stylesheet" type="text/css" href="/css/navigation-bar/registration.css">
+  <link rel="stylesheet" type="text/css" href="/css/login-and-registration/login.css">
+  <link rel="stylesheet" type="text/css" href="/css/login-and-registration/registration.css">
 
     <!-- Scoreboard Header Stylesheets -->
     <link rel="stylesheet" type="text/css" href="/css/navigation-bar/scoreboard-header/scoreboard.css">
diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
index 01c0f3e..5728899 100644
--- a/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
+++ b/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
@@ -1,9 +1,9 @@
 <!-- Linking forms.css -->
-<div class="login-page account-info-card" id="login-page">
+<div class="account-portal-container" id="login-page">
 
     <div class="form-container" id="login-form">
         <a id="username">Username: {{user.username}}</a>
-        
+
         <a style="text-decoration: underline;">Favorite Teams:</a> <br>
 
         {{#each fav_teams}}
diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
index c18faf5..e7f38b5 100644
--- a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
+++ b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
@@ -14,15 +14,8 @@
     <div class="collapse navbar-collapse" id="navbarToggler">
       <ul class="navbar-nav mr-auto mt-2 mt-lg-0" id="navbar-list">
 
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="/league/2021" id="navbarDropdownPremierLeague" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Premier League
-          </a>
-          <div class="dropdown-menu" aria-labelledby="navbarDropdownPremierLeague">
-            <!-- Dropdown menu items here -->
-            <a class="dropdown-item" href="/league/2021">Premier League</a>
-            <!-- Add more dropdown items if needed -->
-          </div>
+        <li class="nav-item">
+          <a class="nav-link" href="/league/2021">Premier League</a>
         </li>
 
         <li class="nav-item">
@@ -56,7 +49,7 @@
       {{/each}}
     </div>
 
-    <div id="user" class="user-icon">
+    <div id="user-profile-button" class="user-icon">
       <img src="/img/navigation-bar/user.png" alt="Your Image" class="img-fluid">
     </div>
 
@@ -64,15 +57,15 @@
 </nav>
 
 {{#if user.username}}
-<div class="account-portal" id="login-container">
+<div class="account-portal" id="login-screen-container">
   {{> navigation-bar/account-screen}}
 </div>
 {{else}}
-<div class="account-portal" id="login-container">
+<div class="account-portal" id="login-account-container">
   {{> navigation-bar/login}}
 </div>
 {{/if}}
 
-<div class="account-portal" id="register-container">
+<div class="account-portal" id="register-screen-container">
   {{> navigation-bar/register}}
 </div>
\ No newline at end of file