Move NavBar to App

diff --git a/client/App.vue b/client/App.vue
index bdd0fa9883beecf80032b77a5733ae8424a54b0e..cbc0cba80ee4b665645ec00c1607f4179cce730d 100644 (file)
--- a/client/App.vue
+++ b/client/App.vue
@@ -1,17 +1,20 @@
 <template>\r
   <div class="container mx-auto flex h-screen flex-col px-2 py-4">\r
+    <NavBar v-if="showNavBar" :hide-logo="!showNavBarLogo" />\r
     <RouterView />\r
   </div>\r
 </template>\r
 \r
 <script setup>\r
-import { onBeforeMount } from "vue";\r
-import { RouterView } from "vue-router";\r
+import { onBeforeMount, computed } from "vue";\r
+import { RouterView, useRoute } from "vue-router";\r
 \r
+import NavBar from "./partials/NavBar.vue";\r
 import { getConfig } from "./api.js";\r
 import { useGlobalStore } from "./globalStore.js";\r
 \r
 const globalStore = useGlobalStore();\r
+const route = useRoute();\r
 \r
 onBeforeMount(() => {\r
   getConfig()\r
@@ -25,4 +28,12 @@ onBeforeMount(() => {
       }\r
     });\r
 });\r
+\r
+const showNavBar = computed(() => {\r
+  return route.name !== "login";\r
+});\r
+\r
+const showNavBarLogo = computed(() => {\r
+  return route.name !== "home";\r
+});\r
 </script>\r

diff --git a/client/views/Home.vue b/client/views/Home.vue
index fbeea64a6d89aa49e4138ae61d39305972c13181..f3a4d4d5af28efec9a6f1f492e901cf580124272 100644 (file)
--- a/client/views/Home.vue
+++ b/client/views/Home.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="h-full">
-    <NavBar hide-logo />
     <div class="flex h-full flex-col items-center justify-center">
       <Logo class="mb-5" />
       <SearchInput class="shadow-[0_0_20px] shadow-theme-shadow" />
@@ -10,6 +9,5 @@
 
 <script setup>
 import Logo from "../components/Logo.vue";
-import NavBar from "../partials/NavBar.vue";
 import SearchInput from "../partials/SearchInput.vue";
 </script>