From 7702b88083865d7896e1a0e658f4b69725e554e0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 12 Oct 2022 16:59:51 +0200
Subject: [PATCH 1/4] add link computation to auth nav bar

---
 frontend/src/components/Auth/AuthNavbar.vue      | 14 ++++++++++++--
 frontend/src/components/Auth/AuthNavbarSmall.vue | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index 73602c48a..0ff10cb78 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -18,9 +18,9 @@
       <b-img class="sheet-img position-absolute d-block d-lg-none zindex1000" :src="sheet"></b-img>
       <b-collapse id="nav-collapse" is-nav class="ml-5">
         <b-navbar-nav class="ml-auto d-none d-lg-flex" right>
-          <b-nav-item to="/register" class="authNavbar ml-lg-5">{{ $t('signup') }}</b-nav-item>
+          <b-nav-item :to="register" class="authNavbar ml-lg-5">{{ $t('signup') }}</b-nav-item>
           <span class="d-none d-lg-block mt-1">{{ $t('math.pipe') }}</span>
-          <b-nav-item to="/login" class="authNavbar">{{ $t('signin') }}</b-nav-item>
+          <b-nav-item :to="login" class="authNavbar">{{ $t('signin') }}</b-nav-item>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
@@ -36,6 +36,16 @@ export default {
       sheet: '/img/template/Blaetter.png',
     }
   },
+  computed: {
+    login() {
+      if (this.$route.params.code) return '/login/' + this.$route.params.code
+      return '/login'
+    },
+    register() {
+      if (this.$route.params.code) return '/register/' + this.$route.params.code
+      return '/register'
+    },
+  },
 }
 </script>
 
diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue
index cc0087560..0500a9dc6 100644
--- a/frontend/src/components/Auth/AuthNavbarSmall.vue
+++ b/frontend/src/components/Auth/AuthNavbarSmall.vue
@@ -2,9 +2,9 @@
   <div class="navbar-small">
     <b-navbar class="navi">
       <b-navbar-nav>
-        <b-nav-item to="/register" class="authNavbar">{{ $t('signup') }}</b-nav-item>
+        <b-nav-item :to="register" class="authNavbar">{{ $t('signup') }}</b-nav-item>
         <span class="mt-1">{{ $t('math.pipe') }}</span>
-        <b-nav-item to="/login" class="authNavbar">{{ $t('signin') }}</b-nav-item>
+        <b-nav-item :to="login" class="authNavbar">{{ $t('signin') }}</b-nav-item>
       </b-navbar-nav>
     </b-navbar>
   </div>
@@ -13,6 +13,16 @@
 <script>
 export default {
   name: 'AuthNavbarSmall',
+  computed: {
+    login() {
+      if (this.$route.params.code) return '/login/' + this.$route.params.code
+      return '/login'
+    },
+    register() {
+      if (this.$route.params.code) return '/register/' + this.$route.params.code
+      return '/register'
+    },
+  },
 }
 </script>
 <style scoped>

From 70e11b8e491b0604cda41d7a03aeb67d032f5f32 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 12 Oct 2022 18:16:02 +0200
Subject: [PATCH 2/4] use computed auth links from mixins

---
 frontend/src/components/Auth/AuthNavbar.vue         | 13 +++----------
 frontend/src/components/Auth/AuthNavbarSmall.vue    | 13 +++----------
 .../components/LinkInformations/RedeemLoggedOut.vue | 10 ++--------
 frontend/src/mixins/authLinks.js                    | 12 ++++++++++++
 4 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100644 frontend/src/mixins/authLinks.js

diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index 0ff10cb78..e3c260fa0 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -28,24 +28,17 @@
 </template>
 
 <script>
+import { authLinks } from '../../mixins/authLinks'
+
 export default {
   name: 'AuthNavbar',
+  mixins: [authLinks],
   data() {
     return {
       logo: '/img/brand/green.png',
       sheet: '/img/template/Blaetter.png',
     }
   },
-  computed: {
-    login() {
-      if (this.$route.params.code) return '/login/' + this.$route.params.code
-      return '/login'
-    },
-    register() {
-      if (this.$route.params.code) return '/register/' + this.$route.params.code
-      return '/register'
-    },
-  },
 }
 </script>
 
diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue
index 0500a9dc6..c7076b3e0 100644
--- a/frontend/src/components/Auth/AuthNavbarSmall.vue
+++ b/frontend/src/components/Auth/AuthNavbarSmall.vue
@@ -11,18 +11,11 @@
 </template>
 
 <script>
+import { authLinks } from '../../mixins/authLinks'
+
 export default {
   name: 'AuthNavbarSmall',
-  computed: {
-    login() {
-      if (this.$route.params.code) return '/login/' + this.$route.params.code
-      return '/login'
-    },
-    register() {
-      if (this.$route.params.code) return '/register/' + this.$route.params.code
-      return '/register'
-    },
-  },
+  mixins: [authLinks],
 }
 </script>
 <style scoped>
diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index 982bfdf08..dedb081a7 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -25,9 +25,11 @@
 </template>
 <script>
 import RedeemInformation from '@/components/LinkInformations/RedeemInformation.vue'
+import { authLinks } from '../../mixins/authLinks'
 
 export default {
   name: 'RedeemLoggedOut',
+  mixins: [authLinks],
   components: {
     RedeemInformation,
   },
@@ -35,13 +37,5 @@ export default {
     linkData: { type: Object, required: true },
     isContributionLink: { type: Boolean, default: false },
   },
-  computed: {
-    login() {
-      return '/login/' + this.$route.params.code
-    },
-    register() {
-      return '/register/' + this.$route.params.code
-    },
-  },
 }
 </script>
diff --git a/frontend/src/mixins/authLinks.js b/frontend/src/mixins/authLinks.js
new file mode 100644
index 000000000..6dedd8612
--- /dev/null
+++ b/frontend/src/mixins/authLinks.js
@@ -0,0 +1,12 @@
+export const authLinks = {
+  computed: {
+    login() {
+      if (this.$route.params.code) return '/login/' + this.$route.params.code
+      return '/login'
+    },
+    register() {
+      if (this.$route.params.code) return '/register/' + this.$route.params.code
+      return '/register'
+    },
+  },
+}

From dc510edf28450d420e056b6bed4af700af7550ec Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 13 Oct 2022 09:43:51 +0200
Subject: [PATCH 3/4] adapt unit tests to changes on auth nav bar component

---
 frontend/src/App.spec.js                | 1 +
 frontend/src/layouts/AuthLayout.spec.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/App.spec.js b/frontend/src/App.spec.js
index 79467e2a8..77adc7084 100644
--- a/frontend/src/App.spec.js
+++ b/frontend/src/App.spec.js
@@ -25,6 +25,7 @@ describe('App', () => {
       meta: {
         requiresAuth: false,
       },
+      params: {},
     },
   }
 
diff --git a/frontend/src/layouts/AuthLayout.spec.js b/frontend/src/layouts/AuthLayout.spec.js
index 4a1d7fef0..8d9411a71 100644
--- a/frontend/src/layouts/AuthLayout.spec.js
+++ b/frontend/src/layouts/AuthLayout.spec.js
@@ -19,6 +19,7 @@ describe('AuthLayout', () => {
       meta: {
         requiresAuth: false,
       },
+      params: {},
     },
   }
 

From 3439bdc67337f0041719a9a3636dec2a5a16d856 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 13 Oct 2022 10:28:29 +0200
Subject: [PATCH 4/4] change import path for auth links mixin

---
 frontend/src/components/Auth/AuthNavbar.vue                  | 2 +-
 frontend/src/components/Auth/AuthNavbarSmall.vue             | 2 +-
 frontend/src/components/LinkInformations/RedeemLoggedOut.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index e3c260fa0..ade6340a6 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { authLinks } from '../../mixins/authLinks'
+import { authLinks } from '@/mixins/authLinks'
 
 export default {
   name: 'AuthNavbar',
diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue
index c7076b3e0..74e88be13 100644
--- a/frontend/src/components/Auth/AuthNavbarSmall.vue
+++ b/frontend/src/components/Auth/AuthNavbarSmall.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { authLinks } from '../../mixins/authLinks'
+import { authLinks } from '@/mixins/authLinks'
 
 export default {
   name: 'AuthNavbarSmall',
diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index dedb081a7..6673b3c5b 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -25,7 +25,7 @@
 </template>
 <script>
 import RedeemInformation from '@/components/LinkInformations/RedeemInformation.vue'
-import { authLinks } from '../../mixins/authLinks'
+import { authLinks } from '@/mixins/authLinks'
 
 export default {
   name: 'RedeemLoggedOut',