From: Adam Dullage <redacted>
Date: Sat, 27 Apr 2024 15:42:13 +0000 (+0100)
Subject: Move NavBar to App
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=870483197914579fc64fe8fb812e9c3bfb6e0119;p=flatnotes.git

Move NavBar to App
---

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