From 3f316e18e7bc2ffd76c7a8dd68b79a280075b80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolphe=20Br=C3=A9ard?= <v.code.ngyvz7vf@what.tf>
Date: Fri, 29 Sep 2023 18:37:25 +0200
Subject: [PATCH] Display the nav bar on every view except first account
 creation

---
 CHANGELOG.md                     | 1 +
 src/views/AboutView.vue          | 2 ++
 src/views/AddAccountView.vue     | 2 ++
 src/views/ConfigView.vue         | 2 ++
 src/views/DeleteAccountView.vue  | 2 ++
 src/views/ManageAccountsView.vue | 2 ++
 6 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d513d12..5f44704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - If the browser uses a dark theme, the default theme is also set to dark
+- Display the navigation bar on every view, except the creation of the first account
 
 ### Fixed
 - The account deletion view is now emphasized the same way it was before
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index 1ca27e2..827e386 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -4,6 +4,7 @@ import { version } from '../../package.json';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
 import ExternalLinkComponent from '../components/ExternalLinkComponent.vue';
+import NavBarComponent from '../components/NavBarComponent.vue';
 
 const router = useRouter();
 const repoUrl = 'https://git.what.tf/rodolphe/sake-app';
@@ -14,6 +15,7 @@ const toMainView = () => {
 </script>
 
 <template>
+	<NavBarComponent />
 	<LayoutComponent>
 		<h1>{{ $t("about.title") }}</h1>
 		<h4>{{ $t("about.name") }}</h4>
diff --git a/src/views/AddAccountView.vue b/src/views/AddAccountView.vue
index e9f1af9..0f23765 100644
--- a/src/views/AddAccountView.vue
+++ b/src/views/AddAccountView.vue
@@ -8,6 +8,7 @@ import { Modal } from 'bootstrap';
 import base32Encode from 'base32-encode';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
+import NavBarComponent from '../components/NavBarComponent.vue';
 import wasmFile from "../../node_modules/@sec-ant/zxing-wasm/dist/reader/zxing_reader.wasm?url";
 
 const accounts = useStorage('sake-accounts', []);
@@ -175,6 +176,7 @@ const resetErrorMessage = () => {
 </script>
 
 <template>
+	<NavBarComponent v-if="!cancellDisabled" />
 	<LayoutComponent>
 		<h1>{{ $t("addAccount.title") }}</h1>
 
diff --git a/src/views/ConfigView.vue b/src/views/ConfigView.vue
index 15ff2f1..41d8c33 100644
--- a/src/views/ConfigView.vue
+++ b/src/views/ConfigView.vue
@@ -6,6 +6,7 @@ import { useI18n } from 'vue-i18n';
 import { useStorage } from '@vueuse/core';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
+import NavBarComponent from '../components/NavBarComponent.vue';
 
 const router = useRouter();
 const stored_locale = useStorage('sake-locale', '');
@@ -28,6 +29,7 @@ watch(colorMode, async (newColorMode) => {
 </script>
 
 <template>
+	<NavBarComponent />
 	<LayoutComponent>
 		<h1>{{ $t("config.title") }}</h1>
 
diff --git a/src/views/DeleteAccountView.vue b/src/views/DeleteAccountView.vue
index d4aa6dc..3bbe2d8 100644
--- a/src/views/DeleteAccountView.vue
+++ b/src/views/DeleteAccountView.vue
@@ -3,6 +3,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useStorage } from '@vueuse/core';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
+import NavBarComponent from '../components/NavBarComponent.vue';
 
 const accounts = useStorage('sake-accounts', []);
 const router = useRouter();
@@ -19,6 +20,7 @@ const toMainView = () => {
 </script>
 
 <template>
+	<NavBarComponent />
 	<LayoutComponent>
 		<h1>{{ $t("deleteAccount.title") }}</h1>
 
diff --git a/src/views/ManageAccountsView.vue b/src/views/ManageAccountsView.vue
index 4c82de4..3c932a6 100644
--- a/src/views/ManageAccountsView.vue
+++ b/src/views/ManageAccountsView.vue
@@ -5,6 +5,7 @@ import { RouterLink, useRouter } from 'vue-router';
 import { useStorage } from '@vueuse/core';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
+import NavBarComponent from '../components/NavBarComponent.vue';
 
 const router = useRouter();
 const accounts = useStorage('sake-accounts', []);
@@ -25,6 +26,7 @@ const toMainView = () => {
 </script>
 
 <template>
+	<NavBarComponent />
 	<LayoutComponent>
 		<h1>{{ $t("manageAccounts.title") }}</h1>