From 30331998d2dc8f8eca38fbd24254cf7fc0188755 Mon Sep 17 00:00:00 2001
From: Bubka <858858+Bubka@users.noreply.github.com>
Date: Mon, 28 Mar 2022 17:09:29 +0200
Subject: [PATCH] Fix missing version in vue footer

---
 config/2fauth.php                        | 9 +++++++++
 config/app.php                           | 9 ---------
 resources/js/components/Footer.vue       | 2 +-
 resources/js/routes.js                   | 2 +-
 resources/js/views/settings/WebAuthn.vue | 2 +-
 resources/views/landing.blade.php        | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/2fauth.php b/config/2fauth.php
index 9d3ac2ec..ae325af3 100644
--- a/config/2fauth.php
+++ b/config/2fauth.php
@@ -2,6 +2,15 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Version
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'version' => '3.0.0 beta',
+
     /*
     |--------------------------------------------------------------------------
     | 2FAuth config
diff --git a/config/app.php b/config/app.php
index 6460dc84..3baa2b96 100644
--- a/config/app.php
+++ b/config/app.php
@@ -15,15 +15,6 @@
 
     'name' => env('APP_NAME', '2FAuth'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Version
-    |--------------------------------------------------------------------------
-    |
-    */
-
-    'version' => '2.1.0',
-
     /*
     |--------------------------------------------------------------------------
     | Application Environment
diff --git a/resources/js/components/Footer.vue b/resources/js/components/Footer.vue
index c577168a..5c91c14b 100644
--- a/resources/js/components/Footer.vue
+++ b/resources/js/components/Footer.vue
@@ -7,7 +7,7 @@
                 </div>
             </div>
         </div>
-        <div v-if="$route.name === 'settings'" class="content has-text-centered is-size-6">
+        <div v-if="$route.name.startsWith('settings.')" class="content has-text-centered is-size-6">
             <a class="has-text-grey" href="https://github.com/Bubka/2FAuth"><b>2FAuth</b> <font-awesome-icon :icon="['fab', 'github-alt']" /></a> - v{{ appVersion }}
         </div>
         <div v-else class="content has-text-centered">
diff --git a/resources/js/routes.js b/resources/js/routes.js
index be70b917..f7dd1165 100644
--- a/resources/js/routes.js
+++ b/resources/js/routes.js
@@ -44,7 +44,7 @@ const router = new Router({
         { path: '/settings/options', name: 'settings.options', component: SettingsOptions, meta: { requiresAuth: true } },
         { path: '/settings/account', name: 'settings.account', component: SettingsAccount, meta: { requiresAuth: true } },
         { path: '/settings/oauth', name: 'settings.oauth', component: SettingsOAuth, meta: { requiresAuth: true } },
-        { path: '/settings/webauthn/:credentialId/edit', name: 'editCredential', component: EditCredential, meta: { requiresAuth: true }, props: true },
+        { path: '/settings/webauthn/:credentialId/edit', name: 'settings.webauthn.editCredential', component: EditCredential, meta: { requiresAuth: true }, props: true },
         { path: '/settings/webauthn', name: 'settings.webauthn', component: SettingsWebAuthn, meta: { requiresAuth: true } },
         { path: '/settings/oauth/pat/create', name: 'settings.oauth.generatePAT', component: GeneratePAT, meta: { requiresAuth: true } },
 
diff --git a/resources/js/views/settings/WebAuthn.vue b/resources/js/views/settings/WebAuthn.vue
index 9e337255..70aee0c8 100644
--- a/resources/js/views/settings/WebAuthn.vue
+++ b/resources/js/views/settings/WebAuthn.vue
@@ -155,7 +155,7 @@
 
                 this.axios.post('/webauthn/register', publicKeyCredential).then(response => {
                     this.$notify({ type: 'is-success', text: this.$t('auth.webauthn.device_successfully_registered') })
-                    this.$router.push({ name: 'editCredential', params: { id: publicKeyCredential.id, name: this.$t('auth.webauthn.my_device') } })
+                    this.$router.push({ name: 'settings.webauthn.editCredential', params: { id: publicKeyCredential.id, name: this.$t('auth.webauthn.my_device') } })
                 })
             },
 
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index dfaa907d..53e71c1b 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -24,7 +24,7 @@
     </div>
     <script type="text/javascript">
         var appSettings = {!! $appSettings !!};
-        var appVersion = '{{ config("app.version") }}';
+        var appVersion = '{{ config("2fauth.version") }}';
         var appLocales = {!! $locales !!};
     </script>
     <script src="{{ mix('js/manifest.js') }}"></script>