From 2cf4cc4a1825f3de1c7adb966ac9506d4a9b34fd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 08:51:03 +0200
Subject: [PATCH 1/8] refactor set and reset passwort component for new style

---
 frontend/src/components/Auth/MobileStart.vue | 13 ++++++++-----
 frontend/src/components/Auth/Navbar.vue      |  6 +++---
 frontend/src/layouts/AuthLayout.vue          |  8 ++++----
 frontend/src/pages/ResetPassword.vue         |  7 +------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/Auth/MobileStart.vue b/frontend/src/components/Auth/MobileStart.vue
index b6bfcbc2d..494adf9d7 100644
--- a/frontend/src/components/Auth/MobileStart.vue
+++ b/frontend/src/components/Auth/MobileStart.vue
@@ -9,32 +9,32 @@
       {{ $t('auth.left.newCurrency') }}
     </div>
     <img
-      src="img/template/Blaetter.png"
+      src="/img/template/Blaetter.png"
       class="sheet-img position-absolute d-block d-lg-none zindex1000"
     />
     <b-img
       id="img0"
       class="position-absolute zindex1000"
-      src="img/template/logo-header.png"
+      src="/img/template/logo-header.png"
       alt="start background image"
     ></b-img>
     <b-img
       fluid
       id="img1"
       class="position-absolute h-100 w-100 overflow-hidden zindex100"
-      src="img/template/gold_03.png"
+      src="/img/template/gold_03.png"
       alt="start background image"
     ></b-img>
     <b-img
       id="img2"
       class="position-absolute zindex100"
-      src="img/template/gradido_background_header.png"
+      src="/img/template/gradido_background_header.png"
       alt="start background image"
     ></b-img>
     <b-img
       id="img3"
       class="position-relative zindex10"
-      src="img/template/Foto_01.jpg"
+      src="/img/template/Foto_01.jpg"
       alt="start background image"
     ></b-img>
     <div class="mobil-start-box-text position-fixed w-100 text-center zindex1000">
@@ -58,6 +58,9 @@
 <script>
 export default {
   name: 'AuthMobileStart',
+  props: {
+    mobileStart: { type: Boolean, default: false },
+  },
 }
 </script>
 
diff --git a/frontend/src/components/Auth/Navbar.vue b/frontend/src/components/Auth/Navbar.vue
index ffef864fe..7b3eed0e3 100644
--- a/frontend/src/components/Auth/Navbar.vue
+++ b/frontend/src/components/Auth/Navbar.vue
@@ -10,7 +10,7 @@
         />
         <b-img
           class="imgLogoBack mt--3 ml--3"
-          src="img/template/gradido_background_header.png"
+          src="/img/template/gradido_background_header.png"
           width="230"
           alt="start background image"
         ></b-img>
@@ -37,8 +37,8 @@ export default {
   name: 'AuthNavbar',
   data() {
     return {
-      logo: 'img/brand/green.png',
-      sheet: 'img/template/Blaetter.png',
+      logo: '/img/brand/green.png',
+      sheet: '/img/template/Blaetter.png',
     }
   },
 }
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 1cc4923d1..e66f19fc3 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -34,7 +34,7 @@
                 <div class="mb-0">{{ $t('1000thanks') }}</div>
               </b-col>
               <b-col cols="3" class="text-right d-none d-sm-none d-md-inline">
-                <b-avatar src="img/brand/gradido_coin●.png" size="6rem"></b-avatar>
+                <b-avatar src="/img/brand/gradido_coin●.png" size="6rem"></b-avatar>
               </b-col>
             </b-row>
             <b-card no-body ref="pageFontSize" class="border-0 mt-4 gradido-custom-background">
@@ -44,7 +44,7 @@
                 </b-col>
                 <b-col cols="2" class="text-right">
                   <div id="popover-target-1" class="pointer">
-                    <b-img src="img/svg/type.svg" width="19" class="svgType"></b-img>
+                    <b-img src="/img/svg/type.svg" width="19" class="svgType"></b-img>
                   </div>
                   <b-popover
                     target="popover-target-1"
@@ -64,7 +64,7 @@
               </b-row>
               <b-row class="d-inline d-sm-inline d-md-none d-lg-none mb-3">
                 <b-col class="text-center">
-                  <b-avatar src="img/brand/gradido_coin●.png" size="6rem"></b-avatar>
+                  <b-avatar src="/img/brand/gradido_coin●.png" size="6rem"></b-avatar>
                   <b-row>
                     <b-col class="zindex1000 d-flex justify-content-center">
                       <navbar-small />
@@ -73,7 +73,7 @@
                 </b-col>
               </b-row>
               <b-card-body class="">
-                <router-view></router-view>
+                <router-view @is-mobile-start="setMobileStart"></router-view>
               </b-card-body>
             </b-card>
           </div>
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index a8b21da65..24bf92564 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -12,12 +12,6 @@
         </div>
       </b-form>
     </validation-observer>
-
-    <b-row v-if="displaySetup.linkTo">
-      <b-col class="text-center py-lg-4">
-        <router-link :to="displaySetup.linkTo" class="mt-3">{{ $t('back') }}</router-link>
-      </b-col>
-    </b-row>
   </div>
 </template>
 
@@ -116,6 +110,7 @@ export default {
     },
   },
   created() {
+    this.$emit('is-mobile-start', false)
     this.setDisplaySetup()
   },
 }

From 0c928ceeb051ded25cae5144349b5e82c5ba39fc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 08:59:25 +0200
Subject: [PATCH 2/8] fixed tests

---
 frontend/src/pages/ResetPassword.spec.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index ac944e29a..aee6f50b1 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -79,16 +79,6 @@ describe('ResetPassword', () => {
         expect(wrapper.find('div.resetpwd-form').exists()).toBeTruthy()
       })
 
-      describe('links', () => {
-        it('has a link "Back"', async () => {
-          expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual('back')
-        })
-
-        it('links to /login when clicking "Back"', async () => {
-          expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/login')
-        })
-      })
-
       describe('reset password form', () => {
         it('has a register form', async () => {
           expect(wrapper.find('form').exists()).toBeTruthy()

From cf9f7a42945df758cfec72df9d28a719aa95c97c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 10:12:48 +0200
Subject: [PATCH 3/8] remove old  textFields for login, because is unused

---
 frontend/src/pages/ResetPassword.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 24bf92564..4a42faa08 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -33,10 +33,6 @@ const textFields = {
     button: 'settings.password.set',
     linkTo: '/login',
   },
-  login: {
-    headline: 'site.thx.errorTitle',
-    subtitle: 'site.thx.activateEmail',
-  },
 }
 
 export default {

From 79d0eb5d035c59b780594893d35aac9187852b37 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 10:33:22 +0200
Subject: [PATCH 4/8] chenage event name from is-mobile-start to
 set-mobile-start

---
 frontend/src/layouts/AuthLayout.vue  | 4 ++--
 frontend/src/pages/ResetPassword.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index e66f19fc3..42b232e88 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -3,7 +3,7 @@
     <mobile-start
       v-if="mobileStart"
       class="d-inline d-lg-none zindex10000"
-      @is-mobile-start="setMobileStart"
+      @set-mobile-start="setMobileStart"
     />
     <div class="h-100 align-middle">
       <navbar class="zindex10" />
@@ -73,7 +73,7 @@
                 </b-col>
               </b-row>
               <b-card-body class="">
-                <router-view @is-mobile-start="setMobileStart"></router-view>
+                <router-view @set-mobile-start="setMobileStart"></router-view>
               </b-card-body>
             </b-card>
           </div>
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 4a42faa08..61a5621e3 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -106,7 +106,7 @@ export default {
     },
   },
   created() {
-    this.$emit('is-mobile-start', false)
+    this.$emit('set-mobile-start', false)
     this.setDisplaySetup()
   },
 }

From b9be7ca5b74eb7ab828f719f6cd75be394a5d0ff Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 10:35:28 +0200
Subject: [PATCH 5/8] chenage event name from is-mobile-start to
 set-mobile-start

---
 frontend/src/components/Auth/MobileStart.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Auth/MobileStart.vue b/frontend/src/components/Auth/MobileStart.vue
index 494adf9d7..7b11df0f3 100644
--- a/frontend/src/components/Auth/MobileStart.vue
+++ b/frontend/src/components/Auth/MobileStart.vue
@@ -38,7 +38,7 @@
       alt="start background image"
     ></b-img>
     <div class="mobil-start-box-text position-fixed w-100 text-center zindex1000">
-      <b-button variant="gradido" to="/register" @click="$emit('is-mobile-start', false)">
+      <b-button variant="gradido" to="/register" @click="$emit('set-mobile-start', false)">
         {{ $t('signup') }}
       </b-button>
       <div class="mt-3 h3 text-white">
@@ -46,7 +46,7 @@
         <b-link
           to="/login"
           class="text-gradido gradido-global-color-blue"
-          @click="$emit('is-mobile-start', false)"
+          @click="$emit('set-mobile-start', false)"
         >
           {{ $t('auth.left.hereLogin') }}
         </b-link>

From a49949d6ff7c867ea81ebf95a89ee425144ff99e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 13:00:47 +0200
Subject: [PATCH 6/8] change buton variant from primary to gradido

---
 frontend/src/pages/ResetPassword.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 61a5621e3..88cfeede2 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -5,7 +5,7 @@
       <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
         <input-password-confirmation v-model="form" />
         <div class="text-center">
-          <b-button type="submit" variant="primary" class="mt-4">
+          <b-button type="submit" variant="gradido" class="mt-4">
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ $t(displaySetup.button) }}
           </b-button>

From 21c56da0fe3bd805c36d2e75e3a5038aa827d7fd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 May 2022 11:07:11 +0200
Subject: [PATCH 7/8] rename files from auth folder, rule vue name = name files

---
 .../Auth/{Carousel.vue => AuthCarousel.vue}   |  0
 .../Auth/{Footer.vue => AuthFooter.vue}       |  0
 .../{MobileStart.vue => AuthMobileStart.vue}  |  0
 .../Auth/{Navbar.vue => AuthNavbar.vue}       |  0
 .../{NavbarSmall.vue => AuthNavbarSmall.vue}  |  2 +-
 frontend/src/layouts/AuthLayout.spec.js       |  4 +++
 frontend/src/layouts/AuthLayout.vue           | 28 +++++++++----------
 7 files changed, 19 insertions(+), 15 deletions(-)
 rename frontend/src/components/Auth/{Carousel.vue => AuthCarousel.vue} (100%)
 rename frontend/src/components/Auth/{Footer.vue => AuthFooter.vue} (100%)
 rename frontend/src/components/Auth/{MobileStart.vue => AuthMobileStart.vue} (100%)
 rename frontend/src/components/Auth/{Navbar.vue => AuthNavbar.vue} (100%)
 rename frontend/src/components/Auth/{NavbarSmall.vue => AuthNavbarSmall.vue} (93%)

diff --git a/frontend/src/components/Auth/Carousel.vue b/frontend/src/components/Auth/AuthCarousel.vue
similarity index 100%
rename from frontend/src/components/Auth/Carousel.vue
rename to frontend/src/components/Auth/AuthCarousel.vue
diff --git a/frontend/src/components/Auth/Footer.vue b/frontend/src/components/Auth/AuthFooter.vue
similarity index 100%
rename from frontend/src/components/Auth/Footer.vue
rename to frontend/src/components/Auth/AuthFooter.vue
diff --git a/frontend/src/components/Auth/MobileStart.vue b/frontend/src/components/Auth/AuthMobileStart.vue
similarity index 100%
rename from frontend/src/components/Auth/MobileStart.vue
rename to frontend/src/components/Auth/AuthMobileStart.vue
diff --git a/frontend/src/components/Auth/Navbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
similarity index 100%
rename from frontend/src/components/Auth/Navbar.vue
rename to frontend/src/components/Auth/AuthNavbar.vue
diff --git a/frontend/src/components/Auth/NavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue
similarity index 93%
rename from frontend/src/components/Auth/NavbarSmall.vue
rename to frontend/src/components/Auth/AuthNavbarSmall.vue
index 1bb06b481..836e72aeb 100644
--- a/frontend/src/components/Auth/NavbarSmall.vue
+++ b/frontend/src/components/Auth/AuthNavbarSmall.vue
@@ -12,6 +12,6 @@
 
 <script>
 export default {
-  name: 'NavbarSmall',
+  name: 'AuthNavbarSmall',
 }
 </script>
diff --git a/frontend/src/layouts/AuthLayout.spec.js b/frontend/src/layouts/AuthLayout.spec.js
index dd2d2cab3..2246793d5 100644
--- a/frontend/src/layouts/AuthLayout.spec.js
+++ b/frontend/src/layouts/AuthLayout.spec.js
@@ -43,6 +43,10 @@ describe('AuthLayout', () => {
       it('has Component AuthMobileStart', () => {
         expect(wrapper.findComponent({ name: 'AuthMobileStart' }).exists()).toBe(true)
       })
+
+      it('has Component AuthNavbarSmall', () => {
+        expect(wrapper.findComponent({ name: 'AuthNavbarSmall' }).exists()).toBe(true)
+      })
     })
 
     describe('Desktop Version Start', () => {
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 42b232e88..34c681536 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="auth-template">
-    <mobile-start
+    <auth-mobile-start
       v-if="mobileStart"
       class="d-inline d-lg-none zindex10000"
       @set-mobile-start="setMobileStart"
     />
     <div class="h-100 align-middle">
-      <navbar class="zindex10" />
+      <auth-navbar class="zindex10" />
 
       <div class="left-content-box position-fixed d-none d-lg-block">
         <div class="bg-img-box position-absolute w-100">
-          <carousel class="carousel" />
+          <auth-carousel class="carousel" />
         </div>
         <div class="bg-txt-box position-relative d-none d-lg-block text-center align-self-center">
           <div class="h0 text-white">{{ $t('auth.left.gratitude') }}</div>
@@ -24,7 +24,7 @@
           <div class="right-content-box ml-3 ml-sm-4 mr-3 mr-sm-4">
             <b-row class="d-none d-md-block d-lg-none">
               <b-col class="mb--4 d-flex justify-content-end">
-                <navbar-small />
+                <auth-navbar-small />
               </b-col>
             </b-row>
             <b-row class="mt-5 pl-2 pl-md-0 pl-lg-0">
@@ -67,7 +67,7 @@
                   <b-avatar src="/img/brand/gradido_coin●.png" size="6rem"></b-avatar>
                   <b-row>
                     <b-col class="zindex1000 d-flex justify-content-center">
-                      <navbar-small />
+                      <auth-navbar-small />
                     </b-col>
                   </b-row>
                 </b-col>
@@ -86,21 +86,21 @@
 </template>
 
 <script>
-import MobileStart from '@/components/Auth/MobileStart.vue'
-import Navbar from '@/components/Auth/Navbar.vue'
-import NavbarSmall from '@/components/Auth/NavbarSmall.vue'
-import Carousel from '@/components/Auth/Carousel.vue'
+import AuthMobileStart from '@/components/Auth/AuthMobileStart.vue'
+import AuthNavbar from '@/components/Auth/AuthNavbar.vue'
+import AuthNavbarSmall from '@/components/Auth/AuthNavbarSmall.vue'
+import AuthCarousel from '@/components/Auth/AuthCarousel.vue'
 import LanguageSwitch from '@/components/LanguageSwitch2'
-import AuthFooter from '@/components/Auth/Footer.vue'
+import AuthFooter from '@/components/Auth/AuthFooter.vue'
 import CONFIG from '@/config'
 
 export default {
   name: 'AuthLayout',
   components: {
-    MobileStart,
-    Navbar,
-    NavbarSmall,
-    Carousel,
+    AuthMobileStart,
+    AuthNavbar,
+    AuthNavbarSmall,
+    AuthCarousel,
     LanguageSwitch,
     AuthFooter,
   },

From 8bca6ddd96b06d6db1b3a0caefe95549876e4a98 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 29 May 2022 10:35:06 +0200
Subject: [PATCH 8/8] carousel interval from 3000 to 13000

---
 frontend/src/components/Auth/AuthCarousel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Auth/AuthCarousel.vue b/frontend/src/components/Auth/AuthCarousel.vue
index d46352c59..ff5157f62 100644
--- a/frontend/src/components/Auth/AuthCarousel.vue
+++ b/frontend/src/components/Auth/AuthCarousel.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <b-carousel :interval="3000">
+    <b-carousel :interval="13000">
       <b-carousel-slide img-src="/img/template/Foto_01_2400_small.jpg"></b-carousel-slide>
       <b-carousel-slide img-src="/img/template/Foto_02_2400_small.jpg"></b-carousel-slide>
       <b-carousel-slide img-src="/img/template/Foto_03_2400_small.jpg"></b-carousel-slide>