From 0a5e6cb24940028983273294bd58e78fab4b8e8f Mon Sep 17 00:00:00 2001
From: vhaudiquet <vhaudiquet343@hotmail.fr>
Date: Thu, 5 Dec 2024 13:21:17 +0100
Subject: [PATCH] Refactor NavBar

---
 frontend/components/nav/Bar.vue       | 19 +++++++++++++++++++
 frontend/components/nav/BottomBar.vue |  2 +-
 frontend/components/nav/SideBar.vue   | 21 +++++++++++++++------
 frontend/pages/champion/[alias].vue   |  6 +-----
 4 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 frontend/components/nav/Bar.vue

diff --git a/frontend/components/nav/Bar.vue b/frontend/components/nav/Bar.vue
new file mode 100644
index 0000000..6835ee5
--- /dev/null
+++ b/frontend/components/nav/Bar.vue
@@ -0,0 +1,19 @@
+<script lang="ts" setup>
+defineProps<{
+    championName?: string
+    championLanes?: Array<LaneData>
+}>()
+const emit = defineEmits<{
+    stateChange: [state: string, lane: number]
+}>()
+
+</script>
+
+<template>
+    <NavSideBar :champion-name="championName" 
+        :champion-lanes="championLanes" 
+        @state-change="(s, l) => emit('stateChange', s, l)"/>
+    <NavBottomBar :champion-name="championName" 
+        :champion-lanes="championLanes" 
+        @state-change="(s, l) => emit('stateChange', s, l)"/>
+</template>
\ No newline at end of file
diff --git a/frontend/components/nav/BottomBar.vue b/frontend/components/nav/BottomBar.vue
index 2bf8bc7..ecfd5ac 100644
--- a/frontend/components/nav/BottomBar.vue
+++ b/frontend/components/nav/BottomBar.vue
@@ -2,7 +2,7 @@
 import { LANE_IMAGES, lanePositionToIndex, POSITIONS_STR } from '~/utils/cdragon';
 
 defineProps<{
-    championName: string
+    championName?: string
     championLanes?: Array<LaneData>
 }>()
 const emit = defineEmits<{
diff --git a/frontend/components/nav/SideBar.vue b/frontend/components/nav/SideBar.vue
index edb4bf3..9e95cbe 100644
--- a/frontend/components/nav/SideBar.vue
+++ b/frontend/components/nav/SideBar.vue
@@ -20,6 +20,9 @@ function handleStateChange(newState : string, newLane: number) {
 </script>
 
 <template>
+    <!-- To make content have a 300px margin -->
+    <div class="sidebar-margin" />
+
     <div class="sidebar-container">
         <Logo font-size="2.6rem" img-width="60" style="padding-left: 15px; padding-right: 15px; margin-top: 30px;"/>
 
@@ -49,13 +52,16 @@ function handleStateChange(newState : string, newLane: number) {
 .sidebar-container {
     background-color: #2B2826;
     width: 300px;
-    /* height: 100%; */
-    flex-shrink: 0;
 
-    margin: 0px;
-    /* position: absolute;
-    top: 0px;
-    left: 0px; */
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    z-index: 10;
+}
+.sidebar-margin {
+    width: 300px; 
+    flex-shrink: 0;
 }
 .sidebar-link {
     user-select: none;
@@ -77,5 +83,8 @@ function handleStateChange(newState : string, newLane: number) {
     .sidebar-container {
         display: none;
     }
+    .sidebar-margin {
+        display: none;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/frontend/pages/champion/[alias].vue b/frontend/pages/champion/[alias].vue
index 8fed985..5bd1262 100644
--- a/frontend/pages/champion/[alias].vue
+++ b/frontend/pages/champion/[alias].vue
@@ -28,13 +28,9 @@ function updateState(newState : string, newLane : number) {
         <Title>{{ championData.name }}</Title>
     </Head>
 
-    <NavBottomBar :champion-name="championData.name" 
-        :champion-lanes="championData.lanes" 
-        @state-change="updateState"/>
-
     <div id="alias-content-wrapper">
 
-    <NavSideBar :champion-name="championData.name" 
+    <NavBar :champion-name="championData.name" 
         :champion-lanes="championData.lanes" 
         @state-change="updateState"/>