From af6f4fbe9fa2337c5aa2f8b29baa958a5eee7c3a Mon Sep 17 00:00:00 2001
From: Lucas Patenaude <LUPA7501@colorado.edu>
Date: Wed, 24 Apr 2024 03:08:57 -0600
Subject: [PATCH] Code and file framework updates

---
 .../src/resources/css/all-pages-style.css           |   5 -----
 .../login_and_registration.css                      |   0
 .../resources/css/navigation-bar/account-screen.css |   0
 .../resources/css/navigation-bar/navigation-bar.css |  11 +----------
 .../resources/{css => }/fonts/Scottsdale-Italic.ttf | Bin
 ProjectSourceCode/src/views/partials/head.hbs       |   5 +----
 .../partials/navigation-bar/account-screen.hbs      |  12 ++++++++++++
 .../views/partials/navigation-bar/accountinfo.hbs   |  12 ------------
 .../src/views/partials/navigation-bar/nav.hbs       |   2 +-
 9 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 ProjectSourceCode/src/resources/css/all-pages-style.css
 rename ProjectSourceCode/src/resources/css/{ => login-and-registration}/login_and_registration.css (100%)
 create mode 100644 ProjectSourceCode/src/resources/css/navigation-bar/account-screen.css
 rename ProjectSourceCode/src/resources/{css => }/fonts/Scottsdale-Italic.ttf (100%)
 create mode 100644 ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
 delete mode 100644 ProjectSourceCode/src/views/partials/navigation-bar/accountinfo.hbs

diff --git a/ProjectSourceCode/src/resources/css/all-pages-style.css b/ProjectSourceCode/src/resources/css/all-pages-style.css
deleted file mode 100644
index ac4d128..0000000
--- a/ProjectSourceCode/src/resources/css/all-pages-style.css
+++ /dev/null
@@ -1,5 +0,0 @@
-body {
-    /* background-image: url('./../img/grass-background.png');  Specify the path to your background image */
-    /* background-repeat: repeat; Set the background image to repeat both horizontally and vertically */
-    /* background-size: 1000px; Set the size of the background image for each repeat */
-}
\ No newline at end of file
diff --git a/ProjectSourceCode/src/resources/css/login_and_registration.css b/ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css
similarity index 100%
rename from ProjectSourceCode/src/resources/css/login_and_registration.css
rename to ProjectSourceCode/src/resources/css/login-and-registration/login_and_registration.css
diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/account-screen.css b/ProjectSourceCode/src/resources/css/navigation-bar/account-screen.css
new file mode 100644
index 0000000..e69de29
diff --git a/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css b/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
index a326f40..891912b 100644
--- a/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
+++ b/ProjectSourceCode/src/resources/css/navigation-bar/navigation-bar.css
@@ -1,7 +1,7 @@
 /* Add logo font face */
 @font-face {
     font-family: 'Scottsdale-Italic';
-    src: url('../fonts/Scottsdale-Italic.ttf') format('truetype');
+    src: url('../../fonts/Scottsdale-Italic.ttf') format('truetype');
 }
 
 .sticky {
@@ -65,13 +65,4 @@
     width: 30px;
 }
 
-
-#line {
-    height: 100%; /* spans the entire height of the navigation bar */
-    width: 10px;
-    background-color: white; /* makes the line white */
-    transform: skewx(-20deg); /* rotates the line by 20 degrees */
-    transform-origin: top left; /* sets the rotation origin to top left */
-    margin-left: 10px; /* Add margin to separate the line from the logo */
-  }
   
diff --git a/ProjectSourceCode/src/resources/css/fonts/Scottsdale-Italic.ttf b/ProjectSourceCode/src/resources/fonts/Scottsdale-Italic.ttf
similarity index 100%
rename from ProjectSourceCode/src/resources/css/fonts/Scottsdale-Italic.ttf
rename to ProjectSourceCode/src/resources/fonts/Scottsdale-Italic.ttf
diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs
index b01fed0..12dedc7 100644
--- a/ProjectSourceCode/src/views/partials/head.hbs
+++ b/ProjectSourceCode/src/views/partials/head.hbs
@@ -6,11 +6,8 @@
 
   <!--------------- CSS Stylesheets ---------------->
 
-  <!-- CSS on All Pages -->
-  <link rel="stylesheet" type="text/css" href="/css/all-pages-style.css">
-
   <!-- Linking forms.css -->
-  <link rel="stylesheet" type="text/css" href="/css/login_and_registration.css">
+  <link rel="stylesheet" type="text/css" href="/css/login-and-registration/login_and_registration.css">
 
   <!-- Navigation Bar Stylesheets -->
   <link rel="stylesheet" type="text/css" href="/css/navigation-bar/navigation-bar.css">
diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
new file mode 100644
index 0000000..c0d55ab
--- /dev/null
+++ b/ProjectSourceCode/src/views/partials/navigation-bar/account-screen.hbs
@@ -0,0 +1,12 @@
+<!-- Linking forms.css -->
+<div class="login-page account-info-card" 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}}
+            <img id="teamlogo" src="{{this.teamlogo}}" alt="teamlogo">
+            <span>{{this.teamname}}</span> <br>
+        {{/each}}
+        <a class="nav-link" href="/logout">Logout</a>
+    </div>
+</div>
diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/accountinfo.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/accountinfo.hbs
deleted file mode 100644
index 95a2e3d..0000000
--- a/ProjectSourceCode/src/views/partials/navigation-bar/accountinfo.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-    <!-- Linking forms.css -->
-    <div class="login-page account-info-card" 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}}
-  <img id="teamlogo" src="{{this.teamlogo}}" alt="teamlogo">
-  <span>{{this.teamname}}</span> <br>
-{{/each}}
-    <a class="nav-link" href = "/logout">Logout</a>
-  </div>
-</div>
\ No newline at end of file
diff --git a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
index 6534c0e..46bbe62 100644
--- a/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
+++ b/ProjectSourceCode/src/views/partials/navigation-bar/nav.hbs
@@ -67,7 +67,7 @@
 
 {{#if user.username}}
 <div class="account-portal" id="login-container">
-  {{> navigation-bar/accountinfo}}
+  {{> navigation-bar/account-screen}}
 </div>
 {{else}}
 <div class="account-portal" id="login-container">