From 542a7d47151a0c538663ce3f0f91a74fd9c22cf8 Mon Sep 17 00:00:00 2001
From: philwing100 <philwing100@gmail.com>
Date: Tue, 11 Jun 2024 12:13:41 -0500
Subject: [PATCH] Working colors from single file and routing fixed

---
 src/App.vue                                  |  2 +-
 src/assets/colors.json                       |  2 +-
 src/components/SidebarComponents/SideBar.vue | 94 +++++++-------------
 3 files changed, 32 insertions(+), 66 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7851bbb..27d6c6c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <SideBar :colors="colors"/>
+  <SideBar />
   <div class="everythingElse">
   </div>
 </template>
diff --git a/src/assets/colors.json b/src/assets/colors.json
index 8adc860..c847586 100644
--- a/src/assets/colors.json
+++ b/src/assets/colors.json
@@ -6,5 +6,5 @@
     "hover": "#383444",
     "text": "white",
     "background": "#343541",
-    "sideBar": "black"
+    "sideBar": "black "
   }
\ No newline at end of file
diff --git a/src/components/SidebarComponents/SideBar.vue b/src/components/SidebarComponents/SideBar.vue
index de01ce0..e07ebc7 100644
--- a/src/components/SidebarComponents/SideBar.vue
+++ b/src/components/SidebarComponents/SideBar.vue
@@ -1,93 +1,59 @@
 <template>
-  <div :style="{ width: sidebarWidth + 'px', backgroundColor: colors.sideBar }" class="sidebar">
+  <div :style="{ width: sidebarWidth + 'px', 'background-color': colors.sideBar }" class="sidebar">
     <div @click="toggleWidth" class="collapse-icon" :class="{ 'rotate-180': !toggleBar }">></div>
     <nav class="needPadding">
       <router-link v-if="!toggleBar" to="/Dashboard" class="sidebarItem"
-        :class="{ 'active': $route.path === '/Dashboard' }" @click="setActiveItem('/Dashboard')">
-        Dashboard
+        :class="{ 'active': $route.path === '/Dashboard' }" @click="setActiveItem('/Dashboard')"> Dashboard
       </router-link>
       <router-link v-if="!toggleBar" to="/Lists" class="sidebarItem" :class="{ 'active': $route.path === '/Lists' }"
-        @click="setActiveItem('/Lists')">
-        Lists
-      </router-link>
+        @click="setActiveItem('/Lists')"> Lists </router-link>
       <router-link v-if="!toggleBar" to="/Learn" class="sidebarItem" :class="{ 'active': $route.path === '/Learn' }"
-        @click="setActiveItem('/Learn')">
-        Learn
-      </router-link>
+        @click="setActiveItem('/Learn')"> Learn </router-link>
       <router-link v-if="!toggleBar" to="/Type" class="sidebarItem" :class="{ 'active': $route.path === '/Type' }"
-        @click="setActiveItem('/Type')">
-        Type
+        @click="setActiveItem('/Type')"> Type
       </router-link>
       <router-link v-if="!toggleBar" to="/" class="sidebarItem" :class="{ 'active': $route.path === '/' }"
-        @click="setActiveItem('/')">
-        About Me
-      </router-link>
+        @click="setActiveItem('/')"> About Me </router-link>
       <router-link v-if="!toggleBar" to="/Settings" class="sidebarItem"
-        :class="{ 'active': $route.path === '/Settings' }" @click="setActiveItem('/Settings')">
-        Settings
-      </router-link>
+        :class="{ 'active': $route.path === '/Settings' }" @click="setActiveItem('/Settings')"> Settings </router-link>
       <router-link v-if="!toggleBar" to="/Login" class="sidebarItem" :class="{ 'active': $route.path === '/Login' }"
-        @click="setActiveItem('/Login')">
-        Login
+        @click="setActiveItem('/Login')"> Login
       </router-link>
     </nav>
-  </div>
+  </div> <router-view :class="{ 'paddingWithSidebar': !toggleBar, 'paddingWithoutSidebar': toggleBar }"> </router-view>
 </template>
-
-<script>
-import { ref, onMounted, onUnmounted, computed, inject } from 'vue';
-
-export default {
-  name: 'SideBar',
-  setup() {
+<script>import { ref, onMounted, onUnmounted, inject } from 'vue'; 
+import colors from '@/assets/colors.json'; export default {
+  name: 'SideBar', setup() {
     const colors = inject('colors');
     const toggleBar = ref(false);
     const sidebarWidth = ref(180);
     const activeItem = ref(null);
-
     const toggleWidth = () => {
       toggleBar.value = !toggleBar.value;
       sidebarWidth.value = toggleBar.value ? 30 : 180;
     };
-
-    const setActiveItem = (item) => {
-      activeItem.value = item;
-    };
-
-    const handleEscapeKey = (event) => {
-      if (event.key === 'Escape') {
-        toggleWidth();
-      }
-    };
-
-    onMounted(() => {
-      // Add event listener when the component is mounted
-      document.addEventListener('keyup', handleEscapeKey);
-    });
-
+    const setActiveItem = (item) => { activeItem.value = item; };
+    const handleEscapeKey = (event) => { if (event.key === 'Escape') { toggleWidth(); } };
+    onMounted(() => { document.addEventListener('keyup', handleEscapeKey); 
+     });
+     
     onUnmounted(() => {
-      // Remove event listener when the component is unmounted
+      // Remove event listener when the component is unmounted 
       document.removeEventListener('keyup', handleEscapeKey);
-    });
-
-    return {
-      toggleBar,
-      sidebarWidth,
-      toggleWidth,
-      activeItem,
-      setActiveItem,
-      colors
+    }); return { 
+      toggleBar, 
+      sidebarWidth, 
+      toggleWidth, 
+      activeItem, 
+      setActiveItem, 
+      colors: colors, 
     };
+  }, beforeRouteUpdate(to, from, next) {
+    // Update the activeItem when the route changes 
+    this.setActiveItem(to.path); next();
   },
-
-  beforeRouteUpdate(to, from, next) {
-    // Update the activeItem when the route changes
-    this.setActiveItem(to.path);
-    next();
-  },
-};
-</script>
-
+}; </script>
 <style>
 .sidebar {
   height: 100%;
@@ -153,4 +119,4 @@ export default {
 .rotate-180 {
   transform: rotate(180deg);
 }
-</style>
+</style>
\ No newline at end of file