From 29745204b21a55c10d45cb23750b95354c23d381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Apr 2022 09:47:03 +0200
Subject: [PATCH 01/31] Create Message component

---
 .../src/components/Message/Message.spec.js    | 101 ++++++++++++++++++
 frontend/src/components/Message/Message.vue   |  72 +++++++++++++
 frontend/src/pages/ForgotPassword.vue         |   5 +
 3 files changed, 178 insertions(+)
 create mode 100644 frontend/src/components/Message/Message.spec.js
 create mode 100644 frontend/src/components/Message/Message.vue

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
new file mode 100644
index 000000000..9d65e792c
--- /dev/null
+++ b/frontend/src/components/Message/Message.spec.js
@@ -0,0 +1,101 @@
+import { mount } from '@vue/test-utils'
+import Thx from './Message'
+
+const localVue = global.localVue
+
+const createMockObject = (comingFrom) => {
+  return {
+    $t: jest.fn((t) => t),
+    $route: {
+      params: {
+        comingFrom,
+      },
+    },
+  }
+}
+
+describe('Message', () => {
+  let wrapper
+
+  const Wrapper = (mocks) => {
+    return mount(Thx, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('forgotPassword'))
+    })
+
+    it('renders the thx page', () => {
+      expect(wrapper.find('div.header').exists()).toBeTruthy()
+    })
+
+    it('renders the title', () => {
+      expect(wrapper.find('p.h1').text()).toBe('site.thx.title')
+    })
+  })
+
+  describe('coming from /forgot-password', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('forgotPassword'))
+    })
+
+    it('renders the thanks text', () => {
+      expect(wrapper.find('p.h4').text()).toBe('site.thx.email')
+    })
+
+    it('renders the thanks redirect button', () => {
+      expect(wrapper.find('a.btn').text()).toBe('login')
+    })
+
+    it('links the redirect button to /login', () => {
+      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+    })
+  })
+
+  describe('coming from /reset-password', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('resetPassword'))
+    })
+
+    it('renders the thanks text', () => {
+      expect(wrapper.find('p.h4').text()).toBe('site.thx.reset')
+    })
+
+    it('renders the thanks redirect button', () => {
+      expect(wrapper.find('a.btn').text()).toBe('login')
+    })
+
+    it('links the redirect button to /login', () => {
+      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+    })
+  })
+
+  describe('coming from /register', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('register'))
+    })
+
+    it('renders the thanks text', () => {
+      expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
+    })
+  })
+
+  describe('coming from /login', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('login'))
+    })
+
+    it('renders the thanks text', () => {
+      expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail')
+    })
+
+    it('renders the thanks redirect button', () => {
+      expect(wrapper.find('a.btn').text()).toBe('settings.password.reset')
+    })
+
+    it('links the redirect button to /forgot-password', () => {
+      expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password')
+    })
+  })
+})
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
new file mode 100644
index 000000000..26468f9e3
--- /dev/null
+++ b/frontend/src/components/Message/Message.vue
@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <!-- Header -->
+    <div class="header py-7 py-lg-8 pt-lg-9">
+      <b-container>
+        <div class="header-body text-center mb-7">
+          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+          <p class="h1">{{ $t(displaySetup.headline) }}</p>
+          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <hr />
+          <b-button v-if="$route.params.code" :to="`/login/${$route.params.code}`">
+            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+            {{ $t(displaySetup.button) }}
+          </b-button>
+          <b-button v-else-if="displaySetup.linkTo" :to="displaySetup.linkTo">
+            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+            {{ $t(displaySetup.button) }}
+          </b-button>
+        </div>
+      </b-container>
+    </div>
+    <!-- Page content -->
+  </div>
+</template>
+
+<script>
+const textFields = {
+  forgotPassword: {
+    headline: 'site.thx.title',
+    subtitle: 'site.thx.email',
+    button: 'login',
+    linkTo: '/login',
+  },
+  resetPassword: {
+    headline: 'site.thx.title',
+    subtitle: 'site.thx.reset',
+    button: 'login',
+    linkTo: '/login',
+  },
+  register: {
+    headline: 'site.thx.title',
+    subtitle: 'site.thx.register',
+    button: 'site.login.signin',
+    // linkTo: '/login',
+  },
+  checkEmail: {
+    headline: 'site.thx.title',
+    subtitle: 'site.thx.checkEmail',
+    button: 'login',
+    linkTo: '/login',
+  },
+  login: {
+    headline: 'site.thx.errorTitle',
+    subtitle: 'site.thx.activateEmail',
+    button: 'settings.password.reset',
+    linkTo: '/forgot-password',
+  },
+}
+
+export default {
+  name: 'Message',
+  props: {
+    kind: { type: String, required: true },
+  },
+  data() {
+    return {
+      displaySetup: textFields[this.kind]
+    }
+  },
+}
+</script>
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 580a0ed97..e357652c8 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -36,16 +36,21 @@
         <router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
       </div>
     </b-container>
+    <b-container class="mt--8 p-1">
+      <message kind="forgotPassword" />
+    </b-container>
   </div>
 </template>
 <script>
 import { forgotPassword } from '@/graphql/mutations'
 import InputEmail from '@/components/Inputs/InputEmail'
+import Message from '@/components/Message/Message'
 
 export default {
   name: 'ForgotPassword',
   components: {
     InputEmail,
+    Message,
   },
   data() {
     return {

From b65cd0fd038ba38eeda28e011cb1a8811326f45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Apr 2022 12:47:01 +0200
Subject: [PATCH 02/31] Refactor PasswordForgotten site

---
 frontend/src/components/Message/Message.vue | 32 +++++++++----
 frontend/src/pages/ForgotPassword.spec.js   | 52 ++++++++++++---------
 frontend/src/pages/ForgotPassword.vue       | 18 ++++---
 3 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 26468f9e3..2b2f7792b 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -1,19 +1,27 @@
 <template>
   <div>
     <!-- Header -->
-    <div class="header py-7 py-lg-8 pt-lg-9">
+    <div class="header py-lg-6">
       <b-container>
         <div class="header-body text-center mb-7">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h1">{{ $t(displaySetup.headline) }}</p>
+          <p class="h1 test-message-headline">{{ $t(displaySetup.headline) }}</p>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
+          <p class="h4 test-message-subtitle">{{ $t(displaySetup.subtitle) }}</p>
           <hr />
-          <b-button v-if="$route.params.code" :to="`/login/${$route.params.code}`">
+          <b-button
+            v-if="$route.params.code"
+            class="test-message-button"
+            :to="`/login/${$route.params.code}`"
+          >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ $t(displaySetup.button) }}
           </b-button>
-          <b-button v-else-if="displaySetup.linkTo" :to="displaySetup.linkTo">
+          <b-button
+            v-else-if="displaySetup.linkTo"
+            class="test-message-button"
+            :to="displaySetup.linkTo"
+          >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ $t(displaySetup.button) }}
           </b-button>
@@ -26,13 +34,19 @@
 
 <script>
 const textFields = {
-  forgotPassword: {
+  'forgot-password-success': {
     headline: 'site.thx.title',
     subtitle: 'site.thx.email',
     button: 'login',
     linkTo: '/login',
   },
-  resetPassword: {
+  'forgot-password-error': {
+    headline: 'site.thx.errorTitle',
+    subtitle: 'error.email-already-sent',
+    button: 'login',
+    linkTo: '/login',
+  },
+  'reset-password': {
     headline: 'site.thx.title',
     subtitle: 'site.thx.reset',
     button: 'login',
@@ -44,7 +58,7 @@ const textFields = {
     button: 'site.login.signin',
     // linkTo: '/login',
   },
-  checkEmail: {
+  'check-email': {
     headline: 'site.thx.title',
     subtitle: 'site.thx.checkEmail',
     button: 'login',
@@ -65,7 +79,7 @@ export default {
   },
   data() {
     return {
-      displaySetup: textFields[this.kind]
+      displaySetup: textFields[this.kind],
     }
   },
 }
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index dd703d7fc..6b4453f99 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -118,20 +118,25 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('toasts a standard error message', () => {
-              expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
+            // Wolle it('toasts a standard error message', () => {
+            //   expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
+            // })
+            it('shows error message', () => {
+              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
+              expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 
-            it('pushes to "/thx/forgotPassword"', () => {
-              expect(mockAPIcall).toBeCalledWith(
-                expect.objectContaining({
-                  variables: {
-                    email: 'user@example.org',
-                  },
-                }),
-              )
-              expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
-            })
+            // Wolle it('pushes to "/thx/forgotPassword"', () => {
+            //   expect(mockAPIcall).toBeCalledWith(
+            //     expect.objectContaining({
+            //       variables: {
+            //         email: 'user@example.org',
+            //       },
+            //     }),
+            //   )
+            //   expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
+            // })
           })
 
           describe('success', () => {
@@ -147,15 +152,20 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('pushes to "/thx/forgotPassword"', () => {
-              expect(mockAPIcall).toBeCalledWith(
-                expect.objectContaining({
-                  variables: {
-                    email: 'user@example.org',
-                  },
-                }),
-              )
-              expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
+            // it('pushes to "/thx/forgotPassword"', () => {
+            //   expect(mockAPIcall).toBeCalledWith(
+            //     expect.objectContaining({
+            //       variables: {
+            //         email: 'user@example.org',
+            //       },
+            //     }),
+            //   )
+            //   expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
+            // })
+            it('shows thx', () => {
+              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+              expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
           })
         })
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index e357652c8..9a1885959 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -13,7 +13,7 @@
         </div>
       </b-container>
     </div>
-    <b-container class="mt--8 p-1">
+    <b-container v-if="!showPageMessage" class="mt--8 p-1">
       <b-row class="justify-content-center">
         <b-col lg="6" md="8">
           <b-card no-body class="border-0 gradido-custom-background">
@@ -36,8 +36,8 @@
         <router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
       </div>
     </b-container>
-    <b-container class="mt--8 p-1">
-      <message kind="forgotPassword" />
+    <b-container v-else class="mt--8 p-1">
+      <message :kind="success ? 'forgot-password-success' : 'forgot-password-error'" />
     </b-container>
   </div>
 </template>
@@ -54,11 +54,13 @@ export default {
   },
   data() {
     return {
-      disable: 'disabled',
+      // Wolle disable: 'disabled',
       form: {
         email: '',
       },
       subtitle: 'settings.password.subtitle',
+      showPageMessage: false,
+      success: null,
     }
   },
   methods: {
@@ -71,15 +73,17 @@ export default {
           },
         })
         .then(() => {
-          this.$router.push('/thx/forgotPassword')
+          this.showPageMessage = true
+          this.success = true
         })
         .catch(() => {
-          this.toastError(this.$t('error.email-already-sent'))
-          this.$router.push('/thx/forgotPassword')
+          this.showPageMessage = true
+          this.success = false
         })
     },
   },
   created() {
+    // Wolle: what shall happen here? change needed?
     if (this.$route.params.comingFrom) {
       this.subtitle = 'settings.password.resend_subtitle'
     }

From 95746a732402b7b8d9427c2a3ef52e9f5a035e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Apr 2022 13:31:50 +0200
Subject: [PATCH 03/31] Refactor Message tests

---
 .../src/components/Message/Message.spec.js    | 148 ++++++++++--------
 frontend/src/components/Message/Message.vue   |  15 +-
 frontend/src/pages/ForgotPassword.spec.js     |  28 +---
 3 files changed, 87 insertions(+), 104 deletions(-)

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index 9d65e792c..276e54cc4 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -1,101 +1,117 @@
 import { mount } from '@vue/test-utils'
-import Thx from './Message'
+import Message from './Message'
 
 const localVue = global.localVue
 
-const createMockObject = (comingFrom) => {
-  return {
-    $t: jest.fn((t) => t),
-    $route: {
-      params: {
-        comingFrom,
-      },
-    },
-  }
+const propsData = {
+  kind: 'forgot-password-success',
+}
+
+// Wolle const createMockObject = () => {
+//   return {
+//     $t: jest.fn((t) => t),
+//     $route: {
+//       params: {
+//         comingFrom,
+//       },
+//     },
+//   }
+// }
+const mocks = {
+  $t: jest.fn((t) => t),
 }
 
 describe('Message', () => {
   let wrapper
 
-  const Wrapper = (mocks) => {
-    return mount(Thx, { localVue, mocks })
+  const Wrapper = () => {
+    return mount(Message, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject('forgotPassword'))
+      wrapper = Wrapper()
     })
 
-    it('renders the thx page', () => {
+    it('renders the component', () => {
       expect(wrapper.find('div.header').exists()).toBeTruthy()
     })
 
-    it('renders the title', () => {
-      expect(wrapper.find('p.h1').text()).toBe('site.thx.title')
-    })
-  })
-
-  describe('coming from /forgot-password', () => {
-    beforeEach(() => {
-      wrapper = Wrapper(createMockObject('forgotPassword'))
-    })
-
-    it('renders the thanks text', () => {
-      expect(wrapper.find('p.h4').text()).toBe('site.thx.email')
-    })
-
-    it('renders the thanks redirect button', () => {
-      expect(wrapper.find('a.btn').text()).toBe('login')
+    it('renders title, subtitle, and button text', () => {
+      expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+      expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+      expect(wrapper.find('.test-message-button').text()).toBe('login')
     })
 
     it('links the redirect button to /login', () => {
+      // Wolle console.log(wrapper.html())
       expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
     })
   })
 
-  describe('coming from /reset-password', () => {
-    beforeEach(() => {
-      wrapper = Wrapper(createMockObject('resetPassword'))
-    })
+  // Wolle: test 'code' prop and have a look if there is other important stuff uncommented below
 
-    it('renders the thanks text', () => {
-      expect(wrapper.find('p.h4').text()).toBe('site.thx.reset')
-    })
+  // Wolle describe('coming from /forgot-password', () => {
+  //   beforeEach(() => {
+  //     wrapper = Wrapper(createMockObject('forgotPassword'))
+  //   })
 
-    it('renders the thanks redirect button', () => {
-      expect(wrapper.find('a.btn').text()).toBe('login')
-    })
+  //   it('renders the thanks text', () => {
+  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.email')
+  //   })
 
-    it('links the redirect button to /login', () => {
-      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
-    })
-  })
+  //   it('renders the thanks redirect button', () => {
+  //     expect(wrapper.find('a.btn').text()).toBe('login')
+  //   })
 
-  describe('coming from /register', () => {
-    beforeEach(() => {
-      wrapper = Wrapper(createMockObject('register'))
-    })
+  //   it('links the redirect button to /login', () => {
+  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+  //   })
+  // })
 
-    it('renders the thanks text', () => {
-      expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
-    })
-  })
+  // describe('coming from /reset-password', () => {
+  //   beforeEach(() => {
+  //     wrapper = Wrapper(createMockObject('resetPassword'))
+  //   })
 
-  describe('coming from /login', () => {
-    beforeEach(() => {
-      wrapper = Wrapper(createMockObject('login'))
-    })
+  //   it('renders the thanks text', () => {
+  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.reset')
+  //   })
 
-    it('renders the thanks text', () => {
-      expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail')
-    })
+  //   it('renders the thanks redirect button', () => {
+  //     expect(wrapper.find('a.btn').text()).toBe('login')
+  //   })
 
-    it('renders the thanks redirect button', () => {
-      expect(wrapper.find('a.btn').text()).toBe('settings.password.reset')
-    })
+  //   it('links the redirect button to /login', () => {
+  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+  //   })
+  // })
 
-    it('links the redirect button to /forgot-password', () => {
-      expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password')
-    })
-  })
+  // describe('coming from /register', () => {
+  //   beforeEach(() => {
+  //     wrapper = Wrapper(createMockObject('register'))
+  //   })
+
+  //   it('renders the thanks text', () => {
+  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
+  //   })
+  // })
+
+  // describe('coming from /login', () => {
+  //   beforeEach(() => {
+  //     wrapper = Wrapper(createMockObject('login'))
+  //   })
+
+  //   it('renders the thanks text', () => {
+  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail')
+  //   })
+
+  //   it('renders the thanks redirect button', () => {
+  //     expect(wrapper.find('a.btn').text()).toBe('settings.password.reset')
+  //   })
+
+  //   it('links the redirect button to /forgot-password', () => {
+  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password')
+  //   })
+  // })
 })
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 2b2f7792b..06dce435b 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -10,17 +10,9 @@
           <p class="h4 test-message-subtitle">{{ $t(displaySetup.subtitle) }}</p>
           <hr />
           <b-button
-            v-if="$route.params.code"
+            v-if="displaySetup.linkTo"
             class="test-message-button"
-            :to="`/login/${$route.params.code}`"
-          >
-            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-            {{ $t(displaySetup.button) }}
-          </b-button>
-          <b-button
-            v-else-if="displaySetup.linkTo"
-            class="test-message-button"
-            :to="displaySetup.linkTo"
+            :to="displaySetup.linkTo + (code ? `/${code}` : '')"
           >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ $t(displaySetup.button) }}
@@ -56,7 +48,7 @@ const textFields = {
     headline: 'site.thx.title',
     subtitle: 'site.thx.register',
     button: 'site.login.signin',
-    // linkTo: '/login',
+    linkTo: '/login',
   },
   'check-email': {
     headline: 'site.thx.title',
@@ -76,6 +68,7 @@ export default {
   name: 'Message',
   props: {
     kind: { type: String, required: true },
+    code: { type: String, default: '' },
   },
   data() {
     return {
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index 6b4453f99..e97eb1018 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -2,8 +2,6 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import ForgotPassword from './ForgotPassword'
 
-import { toastErrorSpy } from '@test/testSetup'
-
 const mockAPIcall = jest.fn()
 
 const localVue = global.localVue
@@ -118,25 +116,11 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            // Wolle it('toasts a standard error message', () => {
-            //   expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
-            // })
             it('shows error message', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
-
-            // Wolle it('pushes to "/thx/forgotPassword"', () => {
-            //   expect(mockAPIcall).toBeCalledWith(
-            //     expect.objectContaining({
-            //       variables: {
-            //         email: 'user@example.org',
-            //       },
-            //     }),
-            //   )
-            //   expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
-            // })
           })
 
           describe('success', () => {
@@ -152,17 +136,7 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            // it('pushes to "/thx/forgotPassword"', () => {
-            //   expect(mockAPIcall).toBeCalledWith(
-            //     expect.objectContaining({
-            //       variables: {
-            //         email: 'user@example.org',
-            //       },
-            //     }),
-            //   )
-            //   expect(mockRouterPush).toHaveBeenCalledWith('/thx/forgotPassword')
-            // })
-            it('shows thx', () => {
+            it('shows thx, email, send, login button', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
               expect(wrapper.find('.test-message-button').text()).toBe('login')

From 0e0b5aef096a72281dce5885369f355d92dfb840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Apr 2022 14:58:54 +0200
Subject: [PATCH 04/31] Refactor Message props

---
 .../src/components/Message/Message.spec.js    | 17 ++----
 frontend/src/components/Message/Message.vue   | 61 +++----------------
 frontend/src/pages/ForgotPassword.spec.js     | 12 +++-
 frontend/src/pages/ForgotPassword.vue         | 17 +++++-
 4 files changed, 41 insertions(+), 66 deletions(-)

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index 276e54cc4..e1253e6c2 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -4,19 +4,12 @@ import Message from './Message'
 const localVue = global.localVue
 
 const propsData = {
-  kind: 'forgot-password-success',
+  headline: 'site.thx.title',
+  subtitle: 'site.thx.email',
+  buttonText: 'login',
+  linkTo: '/login',
 }
 
-// Wolle const createMockObject = () => {
-//   return {
-//     $t: jest.fn((t) => t),
-//     $route: {
-//       params: {
-//         comingFrom,
-//       },
-//     },
-//   }
-// }
 const mocks = {
   $t: jest.fn((t) => t),
 }
@@ -43,7 +36,7 @@ describe('Message', () => {
       expect(wrapper.find('.test-message-button').text()).toBe('login')
     })
 
-    it('links the redirect button to /login', () => {
+    it('button link redirects to /login', () => {
       // Wolle console.log(wrapper.html())
       expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
     })
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 06dce435b..7a2f7bb9c 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -5,17 +5,17 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h1 test-message-headline">{{ $t(displaySetup.headline) }}</p>
+          <p class="h1 test-message-headline">{{ $t(headline) }}</p>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h4 test-message-subtitle">{{ $t(displaySetup.subtitle) }}</p>
+          <p class="h4 test-message-subtitle">{{ $t(subtitle) }}</p>
           <hr />
           <b-button
-            v-if="displaySetup.linkTo"
+            v-if="buttonText"
             class="test-message-button"
-            :to="displaySetup.linkTo + (code ? `/${code}` : '')"
+            :to="linkTo + (code ? `/${code}` : '')"
           >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-            {{ $t(displaySetup.button) }}
+            {{ $t(buttonText) }}
           </b-button>
         </div>
       </b-container>
@@ -25,55 +25,14 @@
 </template>
 
 <script>
-const textFields = {
-  'forgot-password-success': {
-    headline: 'site.thx.title',
-    subtitle: 'site.thx.email',
-    button: 'login',
-    linkTo: '/login',
-  },
-  'forgot-password-error': {
-    headline: 'site.thx.errorTitle',
-    subtitle: 'error.email-already-sent',
-    button: 'login',
-    linkTo: '/login',
-  },
-  'reset-password': {
-    headline: 'site.thx.title',
-    subtitle: 'site.thx.reset',
-    button: 'login',
-    linkTo: '/login',
-  },
-  register: {
-    headline: 'site.thx.title',
-    subtitle: 'site.thx.register',
-    button: 'site.login.signin',
-    linkTo: '/login',
-  },
-  'check-email': {
-    headline: 'site.thx.title',
-    subtitle: 'site.thx.checkEmail',
-    button: 'login',
-    linkTo: '/login',
-  },
-  login: {
-    headline: 'site.thx.errorTitle',
-    subtitle: 'site.thx.activateEmail',
-    button: 'settings.password.reset',
-    linkTo: '/forgot-password',
-  },
-}
-
 export default {
   name: 'Message',
   props: {
-    kind: { type: String, required: true },
-    code: { type: String, default: '' },
-  },
-  data() {
-    return {
-      displaySetup: textFields[this.kind],
-    }
+    headline: { type: String, required: true },
+    subtitle: { type: String, required: true },
+    buttonText: { type: String, required: false, default: null },
+    linkTo: { type: String, required: false, default: null },
+    code: { type: String, required: false, default: null },
   },
 }
 </script>
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index e97eb1018..eaf4558e1 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -116,11 +116,15 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('shows error message', () => {
+            it('shows error title, subtitle, login button', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
+
+            it('button link redirects to /login', () => {
+              expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
+            })
           })
 
           describe('success', () => {
@@ -136,11 +140,15 @@ describe('ForgotPassword', () => {
               await flushPromises()
             })
 
-            it('shows thx, email, send, login button', () => {
+            it('shows success title, subtitle, login button', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
+
+            it('button link redirects to /login', () => {
+              expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
+            })
           })
         })
       })
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 9a1885959..535a7d6d2 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -37,7 +37,22 @@
       </div>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <message :kind="success ? 'forgot-password-success' : 'forgot-password-error'" />
+      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
+      <message
+        v-if="success"
+        :headline="$t('site.thx.title')"
+        :subtitle="$t('site.thx.email')"
+        buttonText="login"
+        linkTo="/login"
+      />
+      <message
+        v-else
+        :headline="$t('site.thx.errorTitle')"
+        :subtitle="$t('error.email-already-sent')"
+        buttonText="login"
+        linkTo="/login"
+      />
+      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
   </div>
 </template>

From ef6b3c78df7ce0c20c082b257b1a8e56b8c41966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 08:46:57 +0200
Subject: [PATCH 05/31] Fix translation of ForgotPassword login button text

---
 frontend/src/pages/ForgotPassword.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 535a7d6d2..85ac6b87d 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -42,14 +42,14 @@
         v-if="success"
         :headline="$t('site.thx.title')"
         :subtitle="$t('site.thx.email')"
-        buttonText="login"
+        :buttonText="$t('login')"
         linkTo="/login"
       />
       <message
         v-else
         :headline="$t('site.thx.errorTitle')"
         :subtitle="$t('error.email-already-sent')"
-        buttonText="login"
+        :buttonText="$t('login')"
         linkTo="/login"
       />
       <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->

From 3dddbabb9918eb6ede352fa0af79f3acfd9bdae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 09:09:54 +0200
Subject: [PATCH 06/31] Fix error after Ulf's hint

---
 frontend/src/components/Message/Message.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 7a2f7bb9c..092f003ce 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -5,9 +5,9 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h1 test-message-headline">{{ $t(headline) }}</p>
+          <p class="h1 test-message-headline">{{ headline }}</p>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <p class="h4 test-message-subtitle">{{ $t(subtitle) }}</p>
+          <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
           <b-button
             v-if="buttonText"
@@ -15,7 +15,7 @@
             :to="linkTo + (code ? `/${code}` : '')"
           >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-            {{ $t(buttonText) }}
+            {{ buttonText }}
           </b-button>
         </div>
       </b-container>

From 13b5e02c241770073dfb4dd40a7dbd35a133ddc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 09:16:07 +0200
Subject: [PATCH 07/31] Removed comment after Ulf's suggestion

---
 frontend/src/pages/ForgotPassword.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 85ac6b87d..46adc20d7 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -98,7 +98,6 @@ export default {
     },
   },
   created() {
-    // Wolle: what shall happen here? change needed?
     if (this.$route.params.comingFrom) {
       this.subtitle = 'settings.password.resend_subtitle'
     }

From 097d33fb9702e6ad92e3a716eba6525eeff9a8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 09:40:34 +0200
Subject: [PATCH 08/31] Refactor Login page

---
 frontend/src/components/Message/Message.vue |  2 +-
 frontend/src/locales/de.json                |  3 +-
 frontend/src/locales/en.json                |  5 ++--
 frontend/src/pages/Login.vue                | 31 +++++++++++++++++++--
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 092f003ce..384bc6d1c 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -2,7 +2,7 @@
   <div>
     <!-- Header -->
     <div class="header py-lg-6">
-      <b-container>
+      <b-container class="w-50">
         <div class="header-body text-center mb-7">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <p class="h1 test-message-headline">{{ headline }}</p>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index df25d837c..d69150f90 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -230,7 +230,8 @@
       "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
       "reset": "Dein Passwort wurde geändert.",
       "resetPassword": "Den Code den Du genutzt hast ist zu alt bitte fordere ein neuen über die Passwort Reset Seite an.",
-      "title": "Danke!"
+      "title": "Danke!",
+      "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu."
     }
   },
   "success": "Erfolg",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4734abf00..5da0a1d6b 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -222,7 +222,7 @@
       "uppercase": "One uppercase letter required."
     },
     "thx": {
-      "activateEmail": "Your account has not been activated yet, please check your emails and click the activation link or order a new activation link over the password reset page.",
+      "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.",
       "checkEmail": "Your email has been successfully verified. You can sign in now.",
       "email": "We have sent you an email.",
       "emailActivated": "Thank you your email has been activated.",
@@ -230,7 +230,8 @@
       "register": "You are registered now, please check your emails and click the activation link.",
       "reset": "Your password has been changed.",
       "resetPassword": "The code you used was to old please order a new on over the password reset page.",
-      "title": "Thank you!"
+      "title": "Thank you!",
+      "unsetPassword": "Your password has not been set yet. Please set it again."
     }
   },
   "success": "Success",
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 79532cb21..a84bfc1ab 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -13,7 +13,7 @@
         </div>
       </b-container>
     </div>
-    <b-container class="mt--8">
+    <b-container v-if="!showPageMessage" class="mt--8 p-1">
       <b-row class="justify-content-center">
         <b-col lg="5" md="7">
           <b-card no-body class="border-0 mb-0 gradido-custom-background">
@@ -57,11 +57,31 @@
         </b-col>
       </b-row>
     </b-container>
+    <b-container v-else class="mt--8 p-1">
+      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
+      <message
+        v-if="errorReason === 'email-unvalidated'"
+        :headline="$t('site.thx.errorTitle')"
+        :subtitle="$t('site.thx.activateEmail')"
+        :buttonText="$t('settings.password.reset')"
+        linkTo="/forgot-password"
+      />
+      <message
+        v-else-if="errorReason === 'password-unset'"
+        :headline="$t('site.thx.errorTitle')"
+        :subtitle="$t('site.thx.unsetPassword')"
+        :buttonText="$t('settings.password.reset')"
+        linkTo="/reset-password/login"
+      />
+      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
+    </b-container>
   </div>
 </template>
+
 <script>
 import InputPassword from '@/components/Inputs/InputPassword'
 import InputEmail from '@/components/Inputs/InputEmail'
+import Message from '@/components/Message/Message'
 import { login } from '@/graphql/queries'
 import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
 
@@ -70,6 +90,7 @@ export default {
   components: {
     InputPassword,
     InputEmail,
+    Message,
   },
   mixins: [getCommunityInfoMixin],
   data() {
@@ -79,6 +100,8 @@ export default {
         password: '',
       },
       passwordVisible: false,
+      showPageMessage: false,
+      errorReason: null,
     }
   },
   methods: {
@@ -111,9 +134,11 @@ export default {
         .catch((error) => {
           this.toastError(this.$t('error.no-account'))
           if (error.message.includes('User email not validated')) {
-            this.$router.push('/thx/login')
+            this.showPageMessage = true
+            this.errorReason = 'email-unvalidated'
           } else if (error.message.includes('User has no password set yet')) {
-            this.$router.push('/reset-password/login')
+            this.showPageMessage = true
+            this.errorReason = 'password-unset'
           }
           loader.hide()
         })

From f245a3703c30590c9f5bcd4fd0f626b5ca331568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 09:51:47 +0200
Subject: [PATCH 09/31] Refactor test for Login page

---
 frontend/src/pages/ForgotPassword.spec.js |  4 +--
 frontend/src/pages/Login.spec.js          | 32 ++++++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index eaf4558e1..0bd4b2728 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -118,11 +118,11 @@ describe('ForgotPassword', () => {
 
             it('shows error title, subtitle, login button', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-              expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('settings.password.reset')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 
-            it('button link redirects to /login', () => {
+            it('button link directs to /login', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
           })
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index e26888d49..3bf66920a 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -285,8 +285,20 @@ describe('Login', () => {
               await flushPromises()
             })
 
-            it('redirects to /thx/login', () => {
-              expect(mockRouterPush).toBeCalledWith('/thx/login')
+            // Wolle: it('redirects to /thx/login', () => {
+            //   expect(mockRouterPush).toBeCalledWith('/thx/login')
+            // })
+
+            it('shows error title, subtitle, login button', () => {
+              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail')
+              expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
+            })
+
+            it('button link directs to /login', () => {
+              expect(wrapper.find('.test-message-button').attributes('href')).toBe(
+                '/forgot-password',
+              )
             })
           })
 
@@ -304,8 +316,20 @@ describe('Login', () => {
               await flushPromises()
             })
 
-            it('redirects to /reset-password/login', () => {
-              expect(mockRouterPush).toBeCalledWith('/reset-password/login')
+            // Wolle: it('redirects to /reset-password/login', () => {
+            //   expect(mockRouterPush).toBeCalledWith('/reset-password/login')
+            // })
+
+            it('shows error title, subtitle, login button', () => {
+              expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword')
+              expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
+            })
+
+            it('button link directs to /login', () => {
+              expect(wrapper.find('.test-message-button').attributes('href')).toBe(
+                '/reset-password/login',
+              )
             })
           })
         })

From 180d8b4e8d38ab55a5ad9d3f52e28ff1b61f04ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 09:56:07 +0200
Subject: [PATCH 10/31] Put faulty deleted toaster in ForgotPassword page back

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

diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 46adc20d7..bdb57ac7b 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -92,6 +92,7 @@ export default {
           this.success = true
         })
         .catch(() => {
+          this.toastError(this.$t('error.email-already-sent'))
           this.showPageMessage = true
           this.success = false
         })

From d63303c75cecbbe56807faa7615f89b64f650e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 10:02:48 +0200
Subject: [PATCH 11/31] Refine error messages a bit more detailed

---
 frontend/src/locales/de.json | 4 ++--
 frontend/src/locales/en.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d69150f90..3299df8d7 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -33,8 +33,8 @@
     "email-already-sent": "Wir haben dir bereits eine E-Mail vor weniger als 10 Minuten geschickt.",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
     "error": "Fehler!",
-    "no-account": "Leider konnten wir keinen Account mit diesen Daten finden.",
-    "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt",
+    "no-account": "Leider konnten wir keinen (aktivierten) Account mit diesen Daten finden.",
+    "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt.",
     "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet."
   },
   "footer": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5da0a1d6b..801bc4ca0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -33,7 +33,7 @@
     "email-already-sent": "We already sent you an email less than 10 minutes ago.",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
     "error": "Error!",
-    "no-account": "Unfortunately we could not find an account to the given data!",
+    "no-account": "Unfortunately we could not find an (activated) account to the given data.",
     "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.",
     "session-expired": "The session was closed for security reasons."
   },

From 4f4d464b5355b56d3737e7ef9c0ec0bbd6860cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Apr 2022 10:19:39 +0200
Subject: [PATCH 12/31] Fix unintentionally destroyed test

---
 frontend/src/pages/ForgotPassword.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index 0bd4b2728..bde83b63c 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -118,7 +118,7 @@ describe('ForgotPassword', () => {
 
             it('shows error title, subtitle, login button', () => {
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-              expect(wrapper.find('.test-message-subtitle').text()).toBe('settings.password.reset')
+              expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 

From 041c82b575e78225ee2590f56cc5262cb5ad415b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Apr 2022 11:56:45 +0200
Subject: [PATCH 13/31] Add skipped redirection tests to be implemented later

---
 frontend/src/pages/ForgotPassword.spec.js | 14 ++++++++++++--
 frontend/src/pages/Login.spec.js          | 22 ++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index bde83b63c..5fba93693 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -122,9 +122,14 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 
-            it('button link directs to /login', () => {
+            it('button link directs to "/login"', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
+
+            // Wolle
+            it.skip('click redirects to "/login"', () => {
+              // expect(mockRouterPush).toBeCalledWith('/login')
+            })
           })
 
           describe('success', () => {
@@ -146,9 +151,14 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').text()).toBe('login')
             })
 
-            it('button link redirects to /login', () => {
+            it('button link redirects to "/login"', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
+
+            // Wolle
+            it.skip('click redirects to "/login"', () => {
+              // expect(mockRouterPush).toBeCalledWith('/login')
+            })
           })
         })
       })
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 62c3b6c0e..347dc91a9 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -239,19 +239,20 @@ describe('Login', () => {
             await flushPromises()
           })
 
-          // Wolle: it('redirects to /thx/login', () => {
-          //   expect(mockRouterPush).toBeCalledWith('/thx/login')
-          // })
-
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 
-          it('button link directs to /login', () => {
+          it('button link directs to "/forgot-password', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
           })
+
+          // Wolle
+          it.skip('click redirects to "/forgot-password"', () => {
+            // expect(mockRouterPush).toBeCalledWith('/thx/login')
+          })
         })
 
         describe('login fails with "User has no password set yet"', () => {
@@ -268,21 +269,22 @@ describe('Login', () => {
             await flushPromises()
           })
 
-          // Wolle: it('redirects to /reset-password/login', () => {
-          //   expect(mockRouterPush).toBeCalledWith('/reset-password/login')
-          // })
-
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 
-          it('button link directs to /login', () => {
+          it('button link directs to "/reset-password/login', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe(
               '/reset-password/login',
             )
           })
+
+          // Wolle
+          it.skip('click redirects to "/reset-password/login"', () => {
+            // expect(mockRouterPush).toBeCalledWith('/reset-password/login')
+          })
         })
       })
     })

From 9b536e8ba6687d082f448e79db13435c4f761c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Apr 2022 11:59:25 +0200
Subject: [PATCH 14/31] Refactor Registration page

---
 frontend/src/components/Message/Message.vue |  8 +--
 frontend/src/locales/de.json                |  7 ++-
 frontend/src/locales/en.json                |  7 ++-
 frontend/src/pages/ForgotPassword.vue       |  1 -
 frontend/src/pages/Register.vue             | 58 ++++++++++++++++++---
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 384bc6d1c..5f519ee18 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -10,9 +10,10 @@
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
           <b-button
-            v-if="buttonText"
+            v-if="buttonText && (linkTo || callback)"
             class="test-message-button"
-            :to="linkTo + (code ? `/${code}` : '')"
+            :to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
+            @click="callback()"
           >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ buttonText }}
@@ -32,7 +33,8 @@ export default {
     subtitle: { type: String, required: true },
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
-    code: { type: String, required: false, default: null },
+    callback: { type: Function, required: false, default: () => {} },
+    code: { type: String, required: false, default: null }, // Wolle: to be removed by adding it directly to the "linkTo"
   },
 }
 </script>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 7cd11d0a7..1b7dc7167 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -35,7 +35,9 @@
     "error": "Fehler!",
     "no-account": "Leider konnten wir keinen (aktivierten) Account mit diesen Daten finden.",
     "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt.",
-    "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet."
+    "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.",
+    "unknown-error": "Unbekanter Fehler: ",
+    "user-already-exists": "Ein Benutzer mit diesen Daten existiert bereits."
   },
   "footer": {
     "app_version": "App version {version}",
@@ -213,6 +215,9 @@
       "new_wallet": "Neues Konto erstellen",
       "signin": "Anmelden"
     },
+    "register": {
+      "message-button-text": "Alles klar"
+    },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 0c51edb0c..aeff775d4 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -35,7 +35,9 @@
     "error": "Error!",
     "no-account": "Unfortunately we could not find an (activated) account to the given data.",
     "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.",
-    "session-expired": "The session was closed for security reasons."
+    "session-expired": "The session was closed for security reasons.",
+    "unknown-error": "Unknown error: ",
+    "user-already-exists": "A user with this data already exists."
   },
   "footer": {
     "app_version": "App version {version}",
@@ -213,6 +215,9 @@
       "new_wallet": "Create new account",
       "signin": "Sign in"
     },
+    "register": {
+      "message-button-text": "Okay"
+    },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index bdb57ac7b..630974c52 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -69,7 +69,6 @@ export default {
   },
   data() {
     return {
-      // Wolle disable: 'disabled',
       form: {
         email: '',
       },
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 94441c636..5ee513aaf 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -15,7 +15,7 @@
     </div>
 
     <!-- Page content -->
-    <b-container class="mt--8 p-1">
+    <b-container v-if="!showPageMessage" class="mt--8 p-1">
       <!-- Table -->
 
       <b-row class="justify-content-center">
@@ -177,6 +177,23 @@
         </b-col>
       </b-row>
     </b-container>
+    <b-container v-else class="mt--8 p-1">
+      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
+      <message
+        v-if="success"
+        :headline="$t('site.thx.title')"
+        :subtitle="$t('site.thx.register')"
+        :buttonText="$t('site.login.signin')"
+      />
+      <message
+        v-else
+        :headline="$t('site.thx.errorTitle')"
+        :subtitle="messageError"
+        :buttonText="$t('site.register.message-button-text')"
+        :callback="solveError"
+      />
+      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
+    </b-container>
     <!--
     <div class="text-center pt-4">
       <router-link class="test-button-another-community" to="/select-community">
@@ -189,13 +206,18 @@
   </div>
 </template>
 <script>
-import InputEmail from '@/components/Inputs/InputEmail.vue'
-import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
 import { createUser } from '@/graphql/mutations'
 import CONFIG from '@/config'
+import InputEmail from '@/components/Inputs/InputEmail.vue'
+import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
+import Message from '@/components/Message/Message'
 
 export default {
-  components: { InputEmail, LanguageSwitchSelect },
+  components: {
+    InputEmail,
+    LanguageSwitchSelect,
+    Message,
+  },
   name: 'Register',
   data() {
     return {
@@ -206,6 +228,7 @@ export default {
         agree: false,
       },
       language: '',
+      showPageMessage: false,
       submitted: false,
       showError: false,
       messageError: '',
@@ -240,13 +263,27 @@ export default {
           },
         })
         .then(() => {
-          this.$router.push('/thx/register')
+          // Wolle: this.$router.push('/thx/register')
+          this.showPageMessage = true
+          this.success = true
         })
         .catch((error) => {
+          this.showPageMessage = true
+          this.success = false
           this.showError = true
-          this.messageError = error.message
+          switch (error.message) {
+            case 'GraphQL error: User already exists.':
+              this.messageError = this.$t('error.user-already-exists')
+              break
+            default:
+              this.messageError = this.$t('error.unknown-error') + error.message
+              break
+          }
+          // Wolle: this.toastError(this.$t('error.email-already-sent'))
+          // Wolle: shall the alert be replaced by a toaster or shall only the page message be shown?
         })
     },
+    // Wolle: remove this?
     closeAlert() {
       this.showError = false
       this.messageError = ''
@@ -254,6 +291,15 @@ export default {
       this.form.firstname = ''
       this.form.lastname = ''
     },
+    solveError() {
+      this.showPageMessage = false
+      this.showError = false
+      this.messageError = ''
+      this.form.email = ''
+      this.form.firstname = ''
+      this.form.lastname = ''
+      this.form.agree = false
+    },
   },
   computed: {
     namesFilled() {

From 4d87c95031e9afda70cb600a873529b789509272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Apr 2022 15:40:34 +0200
Subject: [PATCH 15/31] Implement tests for Registration page

- Refactor little things.
---
 frontend/src/components/Message/Message.vue |  2 +-
 frontend/src/pages/ForgotPassword.spec.js   |  8 ++-
 frontend/src/pages/Login.spec.js            |  6 +-
 frontend/src/pages/Register.spec.js         | 65 +++++++++++++++------
 frontend/src/pages/Register.vue             |  2 +-
 5 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 5f519ee18..769bd99bf 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -33,7 +33,7 @@ export default {
     subtitle: { type: String, required: true },
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
-    callback: { type: Function, required: false, default: () => {} },
+    callback: { type: Function, required: false, default: null },
     code: { type: String, required: false, default: null }, // Wolle: to be removed by adding it directly to the "linkTo"
   },
 }
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index 5fba93693..e9aeed552 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -117,6 +117,7 @@ describe('ForgotPassword', () => {
             })
 
             it('shows error title, subtitle, login button', () => {
+              expect(wrapper.vm.showPageMessage).toBeTruthy()
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
@@ -127,8 +128,10 @@ describe('ForgotPassword', () => {
             })
 
             // Wolle
-            it.skip('click redirects to "/login"', () => {
-              // expect(mockRouterPush).toBeCalledWith('/login')
+            it.skip('click redirects to "/login"', async () => {
+              // wrapper.find('.test-message-button').trigger('click')
+              // await wrapper.vm.$nextTick()
+              expect(mockRouterPush).toBeCalledWith('/login')
             })
           })
 
@@ -146,6 +149,7 @@ describe('ForgotPassword', () => {
             })
 
             it('shows success title, subtitle, login button', () => {
+              expect(wrapper.vm.showPageMessage).toBeTruthy()
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 347dc91a9..c31b4d77d 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -240,12 +240,13 @@ describe('Login', () => {
           })
 
           it('shows error title, subtitle, login button', () => {
+            expect(wrapper.vm.showPageMessage).toBeTruthy()
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 
-          it('button link directs to "/forgot-password', () => {
+          it('button link directs to "/forgot-password"', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
           })
 
@@ -270,12 +271,13 @@ describe('Login', () => {
           })
 
           it('shows error title, subtitle, login button', () => {
+            expect(wrapper.vm.showPageMessage).toBeTruthy()
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
           })
 
-          it('button link directs to "/reset-password/login', () => {
+          it('button link directs to "/reset-password/login"', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe(
               '/reset-password/login',
             )
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 1e791f7d4..55ac36cb9 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -221,41 +221,59 @@ describe('Register', () => {
 
       describe('server sends back error', () => {
         beforeEach(async () => {
-          registerUserMutationMock.mockRejectedValue({ message: 'Ouch!' })
+          registerUserMutationMock.mockRejectedValue({
+            message: 'GraphQL error: User already exists.',
+          })
           await wrapper.find('form').trigger('submit')
           await flushPromises()
         })
 
-        it('shows error message', () => {
-          expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
-          expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
-          expect(wrapper.find('span.alert-text').text()).toContain('error.error')
-          expect(wrapper.find('span.alert-text').text()).toContain('Ouch!')
+        // Wolle: remove?
+        // it('shows error message', () => {
+        //   expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
+        //   expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
+        //   expect(wrapper.find('span.alert-text').text()).toContain('error.error')
+        //   expect(wrapper.find('span.alert-text').text()).toContain('Ouch!')
+        // })
+
+        // it('button to dismisses error message is present', () => {
+        //   expect(wrapper.find('button.close').exists()).toBeTruthy()
+        // })
+
+        // it('dismisses error message', async () => {
+        //   await wrapper.find('button.close').trigger('click')
+        //   await flushPromises()
+        //   expect(wrapper.find('span.alert-text').exists()).not.toBeTruthy()
+        // })
+
+        it('shows success title, subtitle, login button', () => {
+          expect(wrapper.vm.showPageMessage).toBeTruthy()
+          expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+          expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists')
+          expect(wrapper.find('.test-message-button').text()).toBe(
+            'site.register.message-button-text',
+          )
         })
 
-        it('button to dismisses error message is present', () => {
-          expect(wrapper.find('button.close').exists()).toBeTruthy()
-        })
-
-        it('dismisses error message', async () => {
-          await wrapper.find('button.close').trigger('click')
-          await flushPromises()
-          expect(wrapper.find('span.alert-text').exists()).not.toBeTruthy()
+        it('click calls "solveError"', async () => {
+          wrapper.find('.test-message-button').trigger('click')
+          await wrapper.vm.$nextTick()
+          expect(wrapper.vm.showPageMessage).not.toBeTruthy()
         })
       })
 
       describe('server sends back success', () => {
-        beforeEach(() => {
+        beforeEach(async () => {
           registerUserMutationMock.mockResolvedValue({
             data: {
               create: 'success',
             },
           })
-        })
-
-        it('routes to "/thx/register"', async () => {
           await wrapper.find('form').trigger('submit')
           await flushPromises()
+        })
+
+        it('submit sends apollo mutate', () => {
           expect(registerUserMutationMock).toBeCalledWith(
             expect.objectContaining({
               variables: {
@@ -267,7 +285,16 @@ describe('Register', () => {
               },
             }),
           )
-          expect(routerPushMock).toHaveBeenCalledWith('/thx/register')
+        })
+
+        it('shows success title, subtitle', () => {
+          expect(wrapper.vm.showPageMessage).toBeTruthy()
+          expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+          expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.register')
+        })
+
+        it('button is not present', () => {
+          expect(wrapper.find('.test-message-button')).toBeTruthy()
         })
       })
     })
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 5ee513aaf..0a0d080aa 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -105,6 +105,7 @@
                       </b-form-checkbox>
                     </b-col>
                   </b-row>
+                  <!-- Wolle: remove this? or shall the alert or a toaster be shown? -->
                   <b-alert
                     v-if="showError"
                     show
@@ -183,7 +184,6 @@
         v-if="success"
         :headline="$t('site.thx.title')"
         :subtitle="$t('site.thx.register')"
-        :buttonText="$t('site.login.signin')"
       />
       <message
         v-else

From baac1d8dde18f3cb91b6d323094822bc9b6641f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 27 Apr 2022 13:04:51 +0200
Subject: [PATCH 16/31] Fix error with undefined this.callback

---
 frontend/src/components/Message/Message.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 769bd99bf..bf83d7344 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -13,7 +13,7 @@
             v-if="buttonText && (linkTo || callback)"
             class="test-message-button"
             :to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
-            @click="callback()"
+            @click="optionalCallback()"
           >
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ buttonText }}
@@ -36,5 +36,12 @@ export default {
     callback: { type: Function, required: false, default: null },
     code: { type: String, required: false, default: null }, // Wolle: to be removed by adding it directly to the "linkTo"
   },
+  methods: {
+    optionalCallback() {
+      if (this.callback) {
+        this.callback()
+      }
+    },
+  },
 }
 </script>

From 5c89fe545d37f4abd334a49e7bad23bd8947e06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 27 Apr 2022 13:05:37 +0200
Subject: [PATCH 17/31] Change Login page to more general page message

---
 frontend/src/pages/Login.spec.js |  6 ++++--
 frontend/src/pages/Login.vue     | 30 +++++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index c31b4d77d..5b7ccfefe 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -211,7 +211,7 @@ describe('Login', () => {
           await wrapper.find('input[placeholder="form.password"]').setValue('1234')
           await flushPromises()
           apolloQueryMock.mockRejectedValue({
-            message: '..No user with this credentials',
+            message: '...No user with this credentials',
           })
           await wrapper.find('form').trigger('submit')
           await flushPromises()
@@ -222,7 +222,9 @@ describe('Login', () => {
         })
 
         it('toasts an error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('error.no-account')
+          expect(toastErrorSpy).toBeCalledWith(
+            'error.unknown-error...No user with this credentials',
+          )
         })
 
         describe('login fails with "User email not validated"', () => {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index c4f324f1f..935ed9eed 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -60,18 +60,10 @@
     <b-container v-else class="mt--8 p-1">
       <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
-        v-if="errorReason === 'email-unvalidated'"
         :headline="$t('site.thx.errorTitle')"
-        :subtitle="$t('site.thx.activateEmail')"
+        :subtitle="errorSubtitle"
         :buttonText="$t('settings.password.reset')"
-        linkTo="/forgot-password"
-      />
-      <message
-        v-else-if="errorReason === 'password-unset'"
-        :headline="$t('site.thx.errorTitle')"
-        :subtitle="$t('site.thx.unsetPassword')"
-        :buttonText="$t('settings.password.reset')"
-        linkTo="/reset-password/login"
+        :linkTo="errorLinkTo"
       />
       <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
@@ -101,6 +93,8 @@ export default {
       passwordVisible: false,
       showPageMessage: false,
       errorReason: null,
+      errorSubtitle: '',
+      errorLinkTo: '',
       CONFIG,
     }
   },
@@ -132,13 +126,23 @@ export default {
           }
         })
         .catch((error) => {
-          this.toastError(this.$t('error.no-account'))
           if (error.message.includes('User email not validated')) {
+            this.toastError(this.$t('error.no-account'))
             this.showPageMessage = true
-            this.errorReason = 'email-unvalidated'
+            this.errorSubtitle = this.$t('site.thx.activateEmail')
+            this.errorLinkTo = '/forgot-password'
           } else if (error.message.includes('User has no password set yet')) {
+            this.toastError(this.$t('error.no-account'))
             this.showPageMessage = true
-            this.errorReason = 'password-unset'
+            this.errorSubtitle = this.$t('site.thx.unsetPassword')
+            this.errorLinkTo = '/reset-password/login'
+          } else {
+            // appeared errors: 'GraphQL error: No user with this credentials'
+            const errorMessage = this.$t('error.unknown-error') + error.message
+            this.toastError(errorMessage)
+            this.showPageMessage = true
+            this.errorSubtitle = errorMessage
+            this.errorLinkTo = '/forgot-password'
           }
           loader.hide()
         })

From f95c11e29a66a73486d3f26de19ea29c6d11dca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 29 Apr 2022 12:01:03 +0200
Subject: [PATCH 18/31] Cleanup and clarity

---
 .../src/components/Message/Message.spec.js    | 67 -------------------
 frontend/src/components/Message/Message.vue   |  4 --
 frontend/src/pages/ForgotPassword.spec.js     |  2 -
 frontend/src/pages/ForgotPassword.vue         |  2 -
 frontend/src/pages/Login.spec.js              |  2 -
 frontend/src/pages/Login.vue                  |  2 -
 frontend/src/pages/Register.spec.js           | 18 -----
 frontend/src/pages/Register.vue               |  6 +-
 8 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index e1253e6c2..afbef53cd 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -37,74 +37,7 @@ describe('Message', () => {
     })
 
     it('button link redirects to /login', () => {
-      // Wolle console.log(wrapper.html())
       expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
     })
   })
-
-  // Wolle: test 'code' prop and have a look if there is other important stuff uncommented below
-
-  // Wolle describe('coming from /forgot-password', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('forgotPassword'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.email')
-  //   })
-
-  //   it('renders the thanks redirect button', () => {
-  //     expect(wrapper.find('a.btn').text()).toBe('login')
-  //   })
-
-  //   it('links the redirect button to /login', () => {
-  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
-  //   })
-  // })
-
-  // describe('coming from /reset-password', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('resetPassword'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.reset')
-  //   })
-
-  //   it('renders the thanks redirect button', () => {
-  //     expect(wrapper.find('a.btn').text()).toBe('login')
-  //   })
-
-  //   it('links the redirect button to /login', () => {
-  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
-  //   })
-  // })
-
-  // describe('coming from /register', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('register'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
-  //   })
-  // })
-
-  // describe('coming from /login', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('login'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail')
-  //   })
-
-  //   it('renders the thanks redirect button', () => {
-  //     expect(wrapper.find('a.btn').text()).toBe('settings.password.reset')
-  //   })
-
-  //   it('links the redirect button to /forgot-password', () => {
-  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password')
-  //   })
-  // })
 })
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index bf83d7344..d9afbd480 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -4,9 +4,7 @@
     <div class="header py-lg-6">
       <b-container class="w-50">
         <div class="header-body text-center mb-7">
-          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <p class="h1 test-message-headline">{{ headline }}</p>
-          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
           <b-button
@@ -15,7 +13,6 @@
             :to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
             @click="optionalCallback()"
           >
-            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ buttonText }}
           </b-button>
         </div>
@@ -34,7 +31,6 @@ export default {
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
     callback: { type: Function, required: false, default: null },
-    code: { type: String, required: false, default: null }, // Wolle: to be removed by adding it directly to the "linkTo"
   },
   methods: {
     optionalCallback() {
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index e9aeed552..a7b2b5393 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -127,7 +127,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            // Wolle
             it.skip('click redirects to "/login"', async () => {
               // wrapper.find('.test-message-button').trigger('click')
               // await wrapper.vm.$nextTick()
@@ -159,7 +158,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            // Wolle
             it.skip('click redirects to "/login"', () => {
               // expect(mockRouterPush).toBeCalledWith('/login')
             })
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 630974c52..1778c638c 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -37,7 +37,6 @@
       </div>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         v-if="success"
         :headline="$t('site.thx.title')"
@@ -52,7 +51,6 @@
         :buttonText="$t('login')"
         linkTo="/login"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
   </div>
 </template>
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 5b7ccfefe..b03f24fb2 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -252,7 +252,6 @@ describe('Login', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
           })
 
-          // Wolle
           it.skip('click redirects to "/forgot-password"', () => {
             // expect(mockRouterPush).toBeCalledWith('/thx/login')
           })
@@ -285,7 +284,6 @@ describe('Login', () => {
             )
           })
 
-          // Wolle
           it.skip('click redirects to "/reset-password/login"', () => {
             // expect(mockRouterPush).toBeCalledWith('/reset-password/login')
           })
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 935ed9eed..0bbfe6afc 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -58,14 +58,12 @@
       </b-row>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         :headline="$t('site.thx.errorTitle')"
         :subtitle="errorSubtitle"
         :buttonText="$t('settings.password.reset')"
         :linkTo="errorLinkTo"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
   </div>
 </template>
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 55ac36cb9..35ed534c2 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -228,24 +228,6 @@ describe('Register', () => {
           await flushPromises()
         })
 
-        // Wolle: remove?
-        // it('shows error message', () => {
-        //   expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
-        //   expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
-        //   expect(wrapper.find('span.alert-text').text()).toContain('error.error')
-        //   expect(wrapper.find('span.alert-text').text()).toContain('Ouch!')
-        // })
-
-        // it('button to dismisses error message is present', () => {
-        //   expect(wrapper.find('button.close').exists()).toBeTruthy()
-        // })
-
-        // it('dismisses error message', async () => {
-        //   await wrapper.find('button.close').trigger('click')
-        //   await flushPromises()
-        //   expect(wrapper.find('span.alert-text').exists()).not.toBeTruthy()
-        // })
-
         it('shows success title, subtitle, login button', () => {
           expect(wrapper.vm.showPageMessage).toBeTruthy()
           expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 0a0d080aa..52053e6f7 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -179,7 +179,6 @@
       </b-row>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         v-if="success"
         :headline="$t('site.thx.title')"
@@ -192,7 +191,6 @@
         :buttonText="$t('site.register.message-button-text')"
         :callback="solveError"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
     <!--
     <div class="text-center pt-4">
@@ -263,7 +261,6 @@ export default {
           },
         })
         .then(() => {
-          // Wolle: this.$router.push('/thx/register')
           this.showPageMessage = true
           this.success = true
         })
@@ -279,8 +276,7 @@ export default {
               this.messageError = this.$t('error.unknown-error') + error.message
               break
           }
-          // Wolle: this.toastError(this.$t('error.email-already-sent'))
-          // Wolle: shall the alert be replaced by a toaster or shall only the page message be shown?
+          this.toastError(this.messageError)
         })
     },
     // Wolle: remove this?

From a382385a68f331e75ed3fa2b2a2921af4d66b464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 29 Apr 2022 12:39:32 +0200
Subject: [PATCH 19/31] Add testing of toasters and cleanup

---
 frontend/src/components/Message/Message.vue |  2 -
 frontend/src/pages/ForgotPassword.spec.js   |  5 +++
 frontend/src/pages/ForgotPassword.vue       |  2 +-
 frontend/src/pages/Login.spec.js            | 41 ++++++++-------------
 frontend/src/pages/Login.vue                |  6 +--
 frontend/src/pages/Register.spec.js         |  5 +++
 6 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index d9afbd480..cc3bb90a3 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- Header -->
     <div class="header py-lg-6">
       <b-container class="w-50">
         <div class="header-body text-center mb-7">
@@ -18,7 +17,6 @@
         </div>
       </b-container>
     </div>
-    <!-- Page content -->
   </div>
 </template>
 
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index a7b2b5393..c6c798e22 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -1,5 +1,6 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
+import { toastErrorSpy } from '@test/testSetup'
 import ForgotPassword from './ForgotPassword'
 
 const mockAPIcall = jest.fn()
@@ -132,6 +133,10 @@ describe('ForgotPassword', () => {
               // await wrapper.vm.$nextTick()
               expect(mockRouterPush).toBeCalledWith('/login')
             })
+
+            it('toasts a standard error message', () => {
+              expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
+            })
           })
 
           describe('success', () => {
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 1778c638c..eea54427a 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -89,9 +89,9 @@ export default {
           this.success = true
         })
         .catch(() => {
-          this.toastError(this.$t('error.email-already-sent'))
           this.showPageMessage = true
           this.success = false
+          this.toastError(this.$t('error.email-already-sent'))
         })
     },
   },
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index b03f24fb2..36c293451 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -1,8 +1,7 @@
 import { RouterLinkStub, mount } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
-import Login from './Login'
-
 import { toastErrorSpy } from '@test/testSetup'
+import Login from './Login'
 
 const localVue = global.localVue
 
@@ -205,32 +204,10 @@ describe('Login', () => {
       })
 
       describe('login fails', () => {
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
-          await wrapper.find('input[placeholder="form.password"]').setValue('1234')
-          await flushPromises()
-          apolloQueryMock.mockRejectedValue({
-            message: '...No user with this credentials',
-          })
-          await wrapper.find('form').trigger('submit')
-          await flushPromises()
-        })
-
-        it('hides the spinner', () => {
-          expect(spinnerHideMock).toBeCalled()
-        })
-
-        it('toasts an error message', () => {
-          expect(toastErrorSpy).toBeCalledWith(
-            'error.unknown-error...No user with this credentials',
-          )
-        })
-
         describe('login fails with "User email not validated"', () => {
           beforeEach(async () => {
             apolloQueryMock.mockRejectedValue({
-              message: 'User email not validated',
+              message: 'GraphQL error: User email not validated',
             })
             wrapper = Wrapper()
             jest.clearAllMocks()
@@ -241,6 +218,10 @@ describe('Login', () => {
             await flushPromises()
           })
 
+          it('hides the spinner', () => {
+            expect(spinnerHideMock).toBeCalled()
+          })
+
           it('shows error title, subtitle, login button', () => {
             expect(wrapper.vm.showPageMessage).toBeTruthy()
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
@@ -255,12 +236,16 @@ describe('Login', () => {
           it.skip('click redirects to "/forgot-password"', () => {
             // expect(mockRouterPush).toBeCalledWith('/thx/login')
           })
+
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.no-account')
+          })
         })
 
         describe('login fails with "User has no password set yet"', () => {
           beforeEach(async () => {
             apolloQueryMock.mockRejectedValue({
-              message: 'User has no password set yet',
+              message: 'GraphQL error: User has no password set yet',
             })
             wrapper = Wrapper()
             jest.clearAllMocks()
@@ -287,6 +272,10 @@ describe('Login', () => {
           it.skip('click redirects to "/reset-password/login"', () => {
             // expect(mockRouterPush).toBeCalledWith('/reset-password/login')
           })
+
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.no-account')
+          })
         })
       })
     })
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 0bbfe6afc..4cfd62e69 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -125,22 +125,22 @@ export default {
         })
         .catch((error) => {
           if (error.message.includes('User email not validated')) {
-            this.toastError(this.$t('error.no-account'))
             this.showPageMessage = true
             this.errorSubtitle = this.$t('site.thx.activateEmail')
             this.errorLinkTo = '/forgot-password'
-          } else if (error.message.includes('User has no password set yet')) {
             this.toastError(this.$t('error.no-account'))
+          } else if (error.message.includes('User has no password set yet')) {
             this.showPageMessage = true
             this.errorSubtitle = this.$t('site.thx.unsetPassword')
             this.errorLinkTo = '/reset-password/login'
+            this.toastError(this.$t('error.no-account'))
           } else {
             // appeared errors: 'GraphQL error: No user with this credentials'
             const errorMessage = this.$t('error.unknown-error') + error.message
-            this.toastError(errorMessage)
             this.showPageMessage = true
             this.errorSubtitle = errorMessage
             this.errorLinkTo = '/forgot-password'
+            this.toastError(errorMessage)
           }
           loader.hide()
         })
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 35ed534c2..49984c008 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -1,5 +1,6 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
+import { toastErrorSpy } from '@test/testSetup'
 import Register from './Register'
 
 const localVue = global.localVue
@@ -237,6 +238,10 @@ describe('Register', () => {
           )
         })
 
+        it('toasts the error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('error.user-already-exists')
+        })
+
         it('click calls "solveError"', async () => {
           wrapper.find('.test-message-button').trigger('click')
           await wrapper.vm.$nextTick()

From c574e96dc00ab10593795d613c09f8545fa505ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 29 Apr 2022 13:28:36 +0200
Subject: [PATCH 20/31] Remove alert

---
 frontend/src/pages/Register.vue | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 52053e6f7..a41952030 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -105,20 +105,6 @@
                       </b-form-checkbox>
                     </b-col>
                   </b-row>
-                  <!-- Wolle: remove this? or shall the alert or a toaster be shown? -->
-                  <b-alert
-                    v-if="showError"
-                    show
-                    dismissible
-                    variant="danger"
-                    @dismissed="closeAlert"
-                  >
-                    <span class="alert-icon"><i class="ni ni-point"></i></span>
-                    <span class="alert-text">
-                      <strong>{{ $t('error.error') }}</strong>
-                      {{ messageError }}
-                    </span>
-                  </b-alert>
 
                   <b-row v-b-toggle:my-collapse class="text-muted shadow-sm p-3 publisherCollaps">
                     <b-col>{{ $t('publisher.publisherId') }} {{ $store.state.publisherId }}</b-col>
@@ -228,9 +214,7 @@ export default {
       language: '',
       showPageMessage: false,
       submitted: false,
-      showError: false,
       messageError: '',
-      register: true,
       publisherId: this.$store.state.publisherId,
       redeemCode: this.$route.params.code,
       CONFIG,
@@ -267,7 +251,6 @@ export default {
         .catch((error) => {
           this.showPageMessage = true
           this.success = false
-          this.showError = true
           switch (error.message) {
             case 'GraphQL error: User already exists.':
               this.messageError = this.$t('error.user-already-exists')
@@ -279,17 +262,8 @@ export default {
           this.toastError(this.messageError)
         })
     },
-    // Wolle: remove this?
-    closeAlert() {
-      this.showError = false
-      this.messageError = ''
-      this.form.email = ''
-      this.form.firstname = ''
-      this.form.lastname = ''
-    },
     solveError() {
       this.showPageMessage = false
-      this.showError = false
       this.messageError = ''
       this.form.email = ''
       this.form.firstname = ''

From 31dfdc13379acc30dc069775a6bab8e2c5e173d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 May 2022 08:17:03 +0200
Subject: [PATCH 21/31] Fix code coverage in Login.vue test

---
 frontend/src/pages/Login.spec.js | 62 +++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 36c293451..501745b19 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -204,18 +204,22 @@ describe('Login', () => {
       })
 
       describe('login fails', () => {
+        const createError = async (errorMessage) => {
+          apolloQueryMock.mockRejectedValue({
+            message: errorMessage,
+          })
+          wrapper = Wrapper()
+          jest.clearAllMocks()
+          await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+          await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+          await flushPromises()
+          await wrapper.find('form').trigger('submit')
+          await flushPromises()
+        }
+
         describe('login fails with "User email not validated"', () => {
           beforeEach(async () => {
-            apolloQueryMock.mockRejectedValue({
-              message: 'GraphQL error: User email not validated',
-            })
-            wrapper = Wrapper()
-            jest.clearAllMocks()
-            await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
-            await wrapper.find('input[placeholder="form.password"]').setValue('1234')
-            await flushPromises()
-            await wrapper.find('form').trigger('submit')
-            await flushPromises()
+            await createError('GraphQL error: User email not validated')
           })
 
           it('hides the spinner', () => {
@@ -244,16 +248,7 @@ describe('Login', () => {
 
         describe('login fails with "User has no password set yet"', () => {
           beforeEach(async () => {
-            apolloQueryMock.mockRejectedValue({
-              message: 'GraphQL error: User has no password set yet',
-            })
-            wrapper = Wrapper()
-            jest.clearAllMocks()
-            await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
-            await wrapper.find('input[placeholder="form.password"]').setValue('1234')
-            await flushPromises()
-            await wrapper.find('form').trigger('submit')
-            await flushPromises()
+            await createError('GraphQL error: User has no password set yet')
           })
 
           it('shows error title, subtitle, login button', () => {
@@ -277,6 +272,33 @@ describe('Login', () => {
             expect(toastErrorSpy).toBeCalledWith('error.no-account')
           })
         })
+
+        describe('login fails with an unknow error', () => {
+          beforeEach(async () => {
+            await createError(' – Unknow error')
+          })
+
+          it('shows error title, subtitle, login button', () => {
+            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe(
+              'error.unknown-error – Unknow error',
+            )
+            expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
+          })
+
+          it('button link directs to "/forgot-password"', () => {
+            expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
+          })
+
+          it.skip('click redirects to "/forgot-password"', () => {
+            // expect(mockRouterPush).toBeCalledWith('/forgot-password')
+          })
+
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.unknown-error – Unknow error')
+          })
+        })
       })
     })
   })

From 4632e83a47871dfd5d7177572120cbfc45a8f1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 May 2022 08:44:53 +0200
Subject: [PATCH 22/31] Change out commented router test

---
 frontend/src/pages/Login.spec.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 501745b19..891c656d0 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -237,8 +237,11 @@ describe('Login', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
           })
 
-          it.skip('click redirects to "/forgot-password"', () => {
-            // expect(mockRouterPush).toBeCalledWith('/thx/login')
+          it.skip('click redirects to "/forgot-password"', async () => {
+            // wrapper.find('.test-message-button').trigger('click')
+            // await flushPromises()
+            // await wrapper.vm.$nextTick()
+            // expect(mockRouterPush).toBeCalledWith('/forgot-password')
           })
 
           it('toasts the error message', () => {

From d7ae0bc3b887472f76142da76846bf102db1e7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 May 2022 09:39:31 +0200
Subject: [PATCH 23/31] Fix code coverage in Register.vue test

---
 frontend/src/pages/Register.spec.js | 67 +++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 49984c008..ca419069c 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -221,31 +221,64 @@ describe('Register', () => {
       })
 
       describe('server sends back error', () => {
-        beforeEach(async () => {
+        const createError = async (errorMessage) => {
           registerUserMutationMock.mockRejectedValue({
-            message: 'GraphQL error: User already exists.',
+            message: errorMessage,
           })
           await wrapper.find('form').trigger('submit')
           await flushPromises()
+        }
+
+        describe('server sends back error "User already exists."', () => {
+          beforeEach(async () => {
+            await createError('GraphQL error: User already exists.')
+          })
+
+          it('shows success title, subtitle, login button', () => {
+            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists')
+            expect(wrapper.find('.test-message-button').text()).toBe(
+              'site.register.message-button-text',
+            )
+          })
+
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.user-already-exists')
+          })
+
+          it('click calls "solveError"', async () => {
+            wrapper.find('.test-message-button').trigger('click')
+            await wrapper.vm.$nextTick()
+            expect(wrapper.vm.showPageMessage).not.toBeTruthy()
+          })
         })
 
-        it('shows success title, subtitle, login button', () => {
-          expect(wrapper.vm.showPageMessage).toBeTruthy()
-          expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-          expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists')
-          expect(wrapper.find('.test-message-button').text()).toBe(
-            'site.register.message-button-text',
-          )
-        })
+        describe('server sends back error "Unknown error"', () => {
+          beforeEach(async () => {
+            await createError(' – Unknown error.')
+          })
 
-        it('toasts the error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('error.user-already-exists')
-        })
+          it('shows success title, subtitle, login button', () => {
+            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
+            expect(wrapper.find('.test-message-subtitle').text()).toBe(
+              'error.unknown-error – Unknown error.',
+            )
+            expect(wrapper.find('.test-message-button').text()).toBe(
+              'site.register.message-button-text',
+            )
+          })
 
-        it('click calls "solveError"', async () => {
-          wrapper.find('.test-message-button').trigger('click')
-          await wrapper.vm.$nextTick()
-          expect(wrapper.vm.showPageMessage).not.toBeTruthy()
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.unknown-error – Unknown error.')
+          })
+
+          it('click calls "solveError"', async () => {
+            wrapper.find('.test-message-button').trigger('click')
+            await wrapper.vm.$nextTick()
+            expect(wrapper.vm.showPageMessage).not.toBeTruthy()
+          })
         })
       })
 

From f22b391557fe9e7a18f38a212023423ac780efc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 May 2022 10:14:29 +0200
Subject: [PATCH 24/31] Change code after Alex review suggestions

---
 .../src/components/Message/Message.spec.js    |  2 +-
 frontend/src/components/Message/Message.vue   | 11 ++++++--
 frontend/src/pages/ForgotPassword.spec.js     |  8 +++---
 frontend/src/pages/Login.spec.js              | 16 ++++++------
 frontend/src/pages/Register.spec.js           | 26 +++++++++----------
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index afbef53cd..db493b44a 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -27,7 +27,7 @@ describe('Message', () => {
     })
 
     it('renders the component', () => {
-      expect(wrapper.find('div.header').exists()).toBeTruthy()
+      expect(wrapper.find('div.header').exists()).toBe(true)
     })
 
     it('renders title, subtitle, and button text', () => {
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index cc3bb90a3..b09275ae9 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -7,9 +7,9 @@
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
           <b-button
-            v-if="buttonText && (linkTo || callback)"
+            v-if="showButton()"
             class="test-message-button"
-            :to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
+            :to="buttonLinkTo()"
             @click="optionalCallback()"
           >
             {{ buttonText }}
@@ -29,6 +29,7 @@ export default {
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
     callback: { type: Function, required: false, default: null },
+    code: { type: String, required: false, default: null },
   },
   methods: {
     optionalCallback() {
@@ -36,6 +37,12 @@ export default {
         this.callback()
       }
     },
+    showButton() {
+      return this.buttonText && (this.linkTo || this.callback)
+    },
+    buttonLinkTo() {
+      return this.linkTo ? this.linkTo + (this.code ? `/${this.code}` : '') : null
+    },
   },
 }
 </script>
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index c6c798e22..cb22c77be 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -47,7 +47,7 @@ describe('ForgotPassword', () => {
     })
 
     it('renders the component', () => {
-      expect(wrapper.find('div.forgot-password').exists()).toBeTruthy()
+      expect(wrapper.find('div.forgot-password').exists()).toBe(true)
     })
 
     it('has a title', () => {
@@ -84,7 +84,7 @@ describe('ForgotPassword', () => {
       })
 
       it('has a submit button', () => {
-        expect(form.find('button[type="submit"]').exists()).toBeTruthy()
+        expect(form.find('button[type="submit"]').exists()).toBe(true)
       })
 
       describe('invalid Email', () => {
@@ -118,7 +118,7 @@ describe('ForgotPassword', () => {
             })
 
             it('shows error title, subtitle, login button', () => {
-              expect(wrapper.vm.showPageMessage).toBeTruthy()
+              expect(wrapper.vm.showPageMessage).toBe(true)
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
@@ -153,7 +153,7 @@ describe('ForgotPassword', () => {
             })
 
             it('shows success title, subtitle, login button', () => {
-              expect(wrapper.vm.showPageMessage).toBeTruthy()
+              expect(wrapper.vm.showPageMessage).toBe(true)
               expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
               expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
               expect(wrapper.find('.test-message-button').text()).toBe('login')
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 891c656d0..db11a036e 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -59,7 +59,7 @@ describe('Login', () => {
     })
 
     it('renders the Login form', () => {
-      expect(wrapper.find('div.login-form').exists()).toBeTruthy()
+      expect(wrapper.find('div.login-form').exists()).toBe(true)
     })
 
     describe('Login header', () => {
@@ -102,19 +102,19 @@ describe('Login', () => {
 
     describe('Login form', () => {
       it('has a login form', () => {
-        expect(wrapper.find('form').exists()).toBeTruthy()
+        expect(wrapper.find('form').exists()).toBe(true)
       })
 
       it('has an Email input field', () => {
-        expect(wrapper.find('input[placeholder="Email"]').exists()).toBeTruthy()
+        expect(wrapper.find('input[placeholder="Email"]').exists()).toBe(true)
       })
 
       it('has an Password input field', () => {
-        expect(wrapper.find('input[placeholder="form.password"]').exists()).toBeTruthy()
+        expect(wrapper.find('input[placeholder="form.password"]').exists()).toBe(true)
       })
 
       it('has a Submit button', () => {
-        expect(wrapper.find('button[type="submit"]').exists()).toBeTruthy()
+        expect(wrapper.find('button[type="submit"]').exists()).toBe(true)
       })
     })
 
@@ -227,7 +227,7 @@ describe('Login', () => {
           })
 
           it('shows error title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(true)
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
@@ -255,7 +255,7 @@ describe('Login', () => {
           })
 
           it('shows error title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(true)
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword')
             expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
@@ -282,7 +282,7 @@ describe('Login', () => {
           })
 
           it('shows error title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(true)
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe(
               'error.unknown-error – Unknow error',
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index ca419069c..e889f0ca7 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -50,7 +50,7 @@ describe('Register', () => {
     })
 
     it('renders the Register form', () => {
-      expect(wrapper.find('div#registerform').exists()).toBeTruthy()
+      expect(wrapper.find('div#registerform').exists()).toBe(true)
     })
 
     describe('Register header', () => {
@@ -94,22 +94,22 @@ describe('Register', () => {
 
     describe('Register form', () => {
       it('has a register form', () => {
-        expect(wrapper.find('form').exists()).toBeTruthy()
+        expect(wrapper.find('form').exists()).toBe(true)
       })
 
       it('has firstname input fields', () => {
-        expect(wrapper.find('#registerFirstname').exists()).toBeTruthy()
+        expect(wrapper.find('#registerFirstname').exists()).toBe(true)
       })
       it('has lastname input fields', () => {
-        expect(wrapper.find('#registerLastname').exists()).toBeTruthy()
+        expect(wrapper.find('#registerLastname').exists()).toBe(true)
       })
 
       it('has email input fields', () => {
-        expect(wrapper.find('#Email-input-field').exists()).toBeTruthy()
+        expect(wrapper.find('#Email-input-field').exists()).toBe(true)
       })
 
       it('has Language selected field', () => {
-        expect(wrapper.find('.selectedLanguage').exists()).toBeTruthy()
+        expect(wrapper.find('.selectedLanguage').exists()).toBe(true)
       })
 
       it('selects Language value en', async () => {
@@ -118,7 +118,7 @@ describe('Register', () => {
       })
 
       it('has 1 checkbox input fields', () => {
-        expect(wrapper.find('#registerCheckbox').exists()).toBeTruthy()
+        expect(wrapper.find('#registerCheckbox').exists()).toBe(true)
       })
 
       it('has PublisherId input fields', () => {
@@ -235,7 +235,7 @@ describe('Register', () => {
           })
 
           it('shows success title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(true)
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists')
             expect(wrapper.find('.test-message-button').text()).toBe(
@@ -250,7 +250,7 @@ describe('Register', () => {
           it('click calls "solveError"', async () => {
             wrapper.find('.test-message-button').trigger('click')
             await wrapper.vm.$nextTick()
-            expect(wrapper.vm.showPageMessage).not.toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(false)
           })
         })
 
@@ -260,7 +260,7 @@ describe('Register', () => {
           })
 
           it('shows success title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(true)
             expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
             expect(wrapper.find('.test-message-subtitle').text()).toBe(
               'error.unknown-error – Unknown error.',
@@ -277,7 +277,7 @@ describe('Register', () => {
           it('click calls "solveError"', async () => {
             wrapper.find('.test-message-button').trigger('click')
             await wrapper.vm.$nextTick()
-            expect(wrapper.vm.showPageMessage).not.toBeTruthy()
+            expect(wrapper.vm.showPageMessage).toBe(false)
           })
         })
       })
@@ -308,13 +308,13 @@ describe('Register', () => {
         })
 
         it('shows success title, subtitle', () => {
-          expect(wrapper.vm.showPageMessage).toBeTruthy()
+          expect(wrapper.vm.showPageMessage).toBe(true)
           expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
           expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.register')
         })
 
         it('button is not present', () => {
-          expect(wrapper.find('.test-message-button')).toBeTruthy()
+          expect(wrapper.find('.test-message-button').exists()).toBe(false)
         })
       })
     })

From 264904e74109dd3798280ded2e6c8aa0fe30fa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 10:49:16 +0200
Subject: [PATCH 25/31] Avoid negation by changing showPageMessage into
 enterData after Alex suggestion

---
 frontend/src/pages/ForgotPassword.vue | 15 ++++++++++-----
 frontend/src/pages/Login.vue          |  8 +++++++-
 frontend/src/pages/Register.vue       |  5 ++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index eea54427a..182df5bc3 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -13,7 +13,7 @@
         </div>
       </b-container>
     </div>
-    <b-container v-if="!showPageMessage" class="mt--8 p-1">
+    <b-container v-if="enterData" class="mt--8 p-1">
       <b-row class="justify-content-center">
         <b-col lg="6" md="8">
           <b-card no-body class="border-0 gradido-custom-background">
@@ -75,6 +75,11 @@ export default {
       success: null,
     }
   },
+  created() {
+    if (this.$route.params.comingFrom) {
+      this.subtitle = 'settings.password.resend_subtitle'
+    }
+  },
   methods: {
     async onSubmit() {
       this.$apollo
@@ -95,10 +100,10 @@ export default {
         })
     },
   },
-  created() {
-    if (this.$route.params.comingFrom) {
-      this.subtitle = 'settings.password.resend_subtitle'
-    }
+  computed: {
+    enterData() {
+      return !this.showPageMessage
+    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 4cfd62e69..bda36a0d2 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -13,7 +13,7 @@
         </div>
       </b-container>
     </div>
-    <b-container v-if="!showPageMessage" class="mt--8 p-1">
+    <b-container v-if="enterData" class="mt--8 p-1">
       <b-row class="justify-content-center">
         <b-col lg="5" md="7">
           <b-card no-body class="border-0 mb-0 gradido-custom-background">
@@ -136,6 +136,7 @@ export default {
             this.toastError(this.$t('error.no-account'))
           } else {
             // appeared errors: 'GraphQL error: No user with this credentials'
+            // Wolle: avoid this error message! may be avoid in general?
             const errorMessage = this.$t('error.unknown-error') + error.message
             this.showPageMessage = true
             this.errorSubtitle = errorMessage
@@ -146,5 +147,10 @@ export default {
         })
     },
   },
+  computed: {
+    enterData() {
+      return !this.showPageMessage
+    },
+  },
 }
 </script>
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index a41952030..d6b5f9dba 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -15,7 +15,7 @@
     </div>
 
     <!-- Page content -->
-    <b-container v-if="!showPageMessage" class="mt--8 p-1">
+    <b-container v-if="enterData" class="mt--8 p-1">
       <!-- Table -->
 
       <b-row class="justify-content-center">
@@ -286,6 +286,9 @@ export default {
     disabled() {
       return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language)
     },
+    enterData() {
+      return !this.showPageMessage
+    },
   },
 }
 </script>

From 6a1b8f0fd9d6638f7921dd0ae3e687a596da0d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 11:33:07 +0200
Subject: [PATCH 26/31] Avoid on page error message on Login

- Have a translation for 'No user with this credentials'.
---
 frontend/src/locales/de.json     |  1 +
 frontend/src/locales/en.json     |  1 +
 frontend/src/pages/Login.spec.js | 41 +++++++++++++++++++-------------
 frontend/src/pages/Login.vue     | 10 +++-----
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ea288819f..6066ce04a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -35,6 +35,7 @@
     "error": "Fehler!",
     "no-account": "Leider konnten wir keinen (aktivierten) Account mit diesen Daten finden.",
     "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt.",
+    "no-user": "Kein Benutzer mit diesen Anmeldedaten.",
     "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.",
     "unknown-error": "Unbekanter Fehler: ",
     "user-already-exists": "Ein Benutzer mit diesen Daten existiert bereits."
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f5e412086..5a0602098 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -35,6 +35,7 @@
     "error": "Error!",
     "no-account": "Unfortunately we could not find an (activated) account to the given data.",
     "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.",
+    "no-user": "No user with this credentials.",
     "session-expired": "The session was closed for security reasons.",
     "unknown-error": "Unknown error: ",
     "user-already-exists": "A user with this data already exists."
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index db11a036e..478266676 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -219,7 +219,7 @@ describe('Login', () => {
 
         describe('login fails with "User email not validated"', () => {
           beforeEach(async () => {
-            await createError('GraphQL error: User email not validated')
+            await createError('GraphQL error: User email not validated.')
           })
 
           it('hides the spinner', () => {
@@ -251,7 +251,7 @@ describe('Login', () => {
 
         describe('login fails with "User has no password set yet"', () => {
           beforeEach(async () => {
-            await createError('GraphQL error: User has no password set yet')
+            await createError('GraphQL error: User has no password set yet.')
           })
 
           it('shows error title, subtitle, login button', () => {
@@ -276,26 +276,33 @@ describe('Login', () => {
           })
         })
 
+        describe('login fails with "No user with this credentials"', () => {
+          beforeEach(async () => {
+            await createError('GraphQL error: No user with this credentials.')
+          })
+
+          it('shows no error message on the page', () => {
+            expect(wrapper.vm.showPageMessage).toBe(false)
+            expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+            expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+            expect(wrapper.find('.test-message-button').exists()).toBe(false)
+          })
+
+          it('toasts the error message', () => {
+            expect(toastErrorSpy).toBeCalledWith('error.no-user')
+          })
+        })
+
         describe('login fails with an unknow error', () => {
           beforeEach(async () => {
             await createError(' – Unknow error')
           })
 
-          it('shows error title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe(
-              'error.unknown-error – Unknow error',
-            )
-            expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
-          })
-
-          it('button link directs to "/forgot-password"', () => {
-            expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
-          })
-
-          it.skip('click redirects to "/forgot-password"', () => {
-            // expect(mockRouterPush).toBeCalledWith('/forgot-password')
+          it('shows no error message on the page', () => {
+            expect(wrapper.vm.showPageMessage).toBe(false)
+            expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+            expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+            expect(wrapper.find('.test-message-button').exists()).toBe(false)
           })
 
           it('toasts the error message', () => {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index bda36a0d2..7544bdcf7 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -134,14 +134,10 @@ export default {
             this.errorSubtitle = this.$t('site.thx.unsetPassword')
             this.errorLinkTo = '/reset-password/login'
             this.toastError(this.$t('error.no-account'))
+          } else if (error.message.includes('No user with this credentials')) {
+            this.toastError(this.$t('error.no-user'))
           } else {
-            // appeared errors: 'GraphQL error: No user with this credentials'
-            // Wolle: avoid this error message! may be avoid in general?
-            const errorMessage = this.$t('error.unknown-error') + error.message
-            this.showPageMessage = true
-            this.errorSubtitle = errorMessage
-            this.errorLinkTo = '/forgot-password'
-            this.toastError(errorMessage)
+            this.toastError(this.$t('error.unknown-error') + error.message)
           }
           loader.hide()
         })

From 4a64d1aa2013eb561a4e0c01778367bb3fa31ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 12:05:04 +0200
Subject: [PATCH 27/31] Avoid any error messages on the Register page, because
 of boots

---
 frontend/src/locales/de.json        |  3 ---
 frontend/src/locales/en.json        |  3 ---
 frontend/src/pages/Login.spec.js    |  2 ++
 frontend/src/pages/Login.vue        |  2 ++
 frontend/src/pages/Register.spec.js | 40 +++++++++--------------------
 frontend/src/pages/Register.vue     | 33 +++++-------------------
 6 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6066ce04a..0d496bc3f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -216,9 +216,6 @@
       "new_wallet": "Neues Konto erstellen",
       "signin": "Anmelden"
     },
-    "register": {
-      "message-button-text": "Alles klar"
-    },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5a0602098..f5009e04f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -216,9 +216,6 @@
       "new_wallet": "Create new account",
       "signin": "Sign in"
     },
-    "register": {
-      "message-button-text": "Okay"
-    },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 478266676..80177ab2b 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -282,6 +282,7 @@ describe('Login', () => {
           })
 
           it('shows no error message on the page', () => {
+            // don't show any error on the page! against boots
             expect(wrapper.vm.showPageMessage).toBe(false)
             expect(wrapper.find('.test-message-headline').exists()).toBe(false)
             expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
@@ -299,6 +300,7 @@ describe('Login', () => {
           })
 
           it('shows no error message on the page', () => {
+            // don't show any error on the page! against boots
             expect(wrapper.vm.showPageMessage).toBe(false)
             expect(wrapper.find('.test-message-headline').exists()).toBe(false)
             expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 7544bdcf7..10fcca649 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -135,8 +135,10 @@ export default {
             this.errorLinkTo = '/reset-password/login'
             this.toastError(this.$t('error.no-account'))
           } else if (error.message.includes('No user with this credentials')) {
+            // don't show any error on the page! against boots
             this.toastError(this.$t('error.no-user'))
           } else {
+            // don't show any error on the page! against boots
             this.toastError(this.$t('error.unknown-error') + error.message)
           }
           loader.hide()
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index e889f0ca7..f7a6c0ac8 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -234,24 +234,17 @@ describe('Register', () => {
             await createError('GraphQL error: User already exists.')
           })
 
-          it('shows success title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists')
-            expect(wrapper.find('.test-message-button').text()).toBe(
-              'site.register.message-button-text',
-            )
+          it('shows no error message on the page', () => {
+            // don't show any error on the page! against boots
+            expect(wrapper.vm.showPageMessage).toBe(false)
+            expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+            expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+            expect(wrapper.find('.test-message-button').exists()).toBe(false)
           })
 
           it('toasts the error message', () => {
             expect(toastErrorSpy).toBeCalledWith('error.user-already-exists')
           })
-
-          it('click calls "solveError"', async () => {
-            wrapper.find('.test-message-button').trigger('click')
-            await wrapper.vm.$nextTick()
-            expect(wrapper.vm.showPageMessage).toBe(false)
-          })
         })
 
         describe('server sends back error "Unknown error"', () => {
@@ -259,26 +252,17 @@ describe('Register', () => {
             await createError(' – Unknown error.')
           })
 
-          it('shows success title, subtitle, login button', () => {
-            expect(wrapper.vm.showPageMessage).toBe(true)
-            expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
-            expect(wrapper.find('.test-message-subtitle').text()).toBe(
-              'error.unknown-error – Unknown error.',
-            )
-            expect(wrapper.find('.test-message-button').text()).toBe(
-              'site.register.message-button-text',
-            )
+          it('shows no error message on the page', () => {
+            // don't show any error on the page! against boots
+            expect(wrapper.vm.showPageMessage).toBe(false)
+            expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+            expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+            expect(wrapper.find('.test-message-button').exists()).toBe(false)
           })
 
           it('toasts the error message', () => {
             expect(toastErrorSpy).toBeCalledWith('error.unknown-error – Unknown error.')
           })
-
-          it('click calls "solveError"', async () => {
-            wrapper.find('.test-message-button').trigger('click')
-            await wrapper.vm.$nextTick()
-            expect(wrapper.vm.showPageMessage).toBe(false)
-          })
         })
       })
 
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index d6b5f9dba..39230cb1e 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -165,18 +165,7 @@
       </b-row>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <message
-        v-if="success"
-        :headline="$t('site.thx.title')"
-        :subtitle="$t('site.thx.register')"
-      />
-      <message
-        v-else
-        :headline="$t('site.thx.errorTitle')"
-        :subtitle="messageError"
-        :buttonText="$t('site.register.message-button-text')"
-        :callback="solveError"
-      />
+      <message :headline="$t('site.thx.title')" :subtitle="$t('site.thx.register')" />
     </b-container>
     <!--
     <div class="text-center pt-4">
@@ -214,7 +203,6 @@ export default {
       language: '',
       showPageMessage: false,
       submitted: false,
-      messageError: '',
       publisherId: this.$store.state.publisherId,
       redeemCode: this.$route.params.code,
       CONFIG,
@@ -246,30 +234,21 @@ export default {
         })
         .then(() => {
           this.showPageMessage = true
-          this.success = true
         })
         .catch((error) => {
-          this.showPageMessage = true
-          this.success = false
+          // don't show any error on the page! against boots
+          let errorMessage
           switch (error.message) {
             case 'GraphQL error: User already exists.':
-              this.messageError = this.$t('error.user-already-exists')
+              errorMessage = this.$t('error.user-already-exists')
               break
             default:
-              this.messageError = this.$t('error.unknown-error') + error.message
+              errorMessage = this.$t('error.unknown-error') + error.message
               break
           }
-          this.toastError(this.messageError)
+          this.toastError(errorMessage)
         })
     },
-    solveError() {
-      this.showPageMessage = false
-      this.messageError = ''
-      this.form.email = ''
-      this.form.firstname = ''
-      this.form.lastname = ''
-      this.form.agree = false
-    },
   },
   computed: {
     namesFilled() {

From ab10edcf0617968f8a7a1e19ad98326ac57cc605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 12:05:30 +0200
Subject: [PATCH 28/31] Remove callback on Message component

---
 frontend/src/components/Message/Message.vue | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index b09275ae9..4b177abc5 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -6,12 +6,7 @@
           <p class="h1 test-message-headline">{{ headline }}</p>
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
-          <b-button
-            v-if="showButton()"
-            class="test-message-button"
-            :to="buttonLinkTo()"
-            @click="optionalCallback()"
-          >
+          <b-button v-if="showButton()" class="test-message-button" :to="buttonLinkTo()">
             {{ buttonText }}
           </b-button>
         </div>
@@ -28,17 +23,11 @@ export default {
     subtitle: { type: String, required: true },
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
-    callback: { type: Function, required: false, default: null },
     code: { type: String, required: false, default: null },
   },
   methods: {
-    optionalCallback() {
-      if (this.callback) {
-        this.callback()
-      }
-    },
     showButton() {
-      return this.buttonText && (this.linkTo || this.callback)
+      return this.buttonText && this.linkTo
     },
     buttonLinkTo() {
       return this.linkTo ? this.linkTo + (this.code ? `/${this.code}` : '') : null

From 5b0b2994298744553353d217e77d38a56fd0d4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 12:10:29 +0200
Subject: [PATCH 29/31] Remove code in Message component for now

---
 frontend/src/components/Message/Message.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index 4b177abc5..b4a51f675 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -23,14 +23,13 @@ export default {
     subtitle: { type: String, required: true },
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
-    code: { type: String, required: false, default: null },
   },
   methods: {
     showButton() {
       return this.buttonText && this.linkTo
     },
     buttonLinkTo() {
-      return this.linkTo ? this.linkTo + (this.code ? `/${this.code}` : '') : null
+      return this.linkTo ? this.linkTo : null
     },
   },
 }

From e597ef4acc5995a3be593da4e840c864aab820c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 12:13:07 +0200
Subject: [PATCH 30/31] Change to methods to computed in Message component
 after Moriz suggestion

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

diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index b4a51f675..96faf5b9f 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -6,7 +6,7 @@
           <p class="h1 test-message-headline">{{ headline }}</p>
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
-          <b-button v-if="showButton()" class="test-message-button" :to="buttonLinkTo()">
+          <b-button v-if="showButton" class="test-message-button" :to="buttonLinkTo">
             {{ buttonText }}
           </b-button>
         </div>
@@ -24,7 +24,7 @@ export default {
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
   },
-  methods: {
+  computed: {
     showButton() {
       return this.buttonText && this.linkTo
     },

From 4cf7868b43359788f6328624eeaae7f329bb0e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 May 2022 12:38:00 +0200
Subject: [PATCH 31/31] Add test where the button is not shown by Moritz
 suggestion in Message component

---
 .../src/components/Message/Message.spec.js    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index db493b44a..7b28d83fd 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -30,14 +30,34 @@ describe('Message', () => {
       expect(wrapper.find('div.header').exists()).toBe(true)
     })
 
-    it('renders title, subtitle, and button text', () => {
-      expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
-      expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
-      expect(wrapper.find('.test-message-button').text()).toBe('login')
+    describe('with button', () => {
+      it('renders title, subtitle, and button text', () => {
+        expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+        expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+        expect(wrapper.find('.test-message-button').text()).toBe('login')
+      })
+
+      it('button link redirects to /login', () => {
+        expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+      })
     })
 
-    it('button link redirects to /login', () => {
-      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+    describe('without button', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          buttonText: null,
+          linkTo: null,
+        })
+      })
+
+      it('renders title, subtitle, and button text', () => {
+        expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
+        expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
+      })
+
+      it('button is not shown', () => {
+        expect(wrapper.find('.test-message-button').exists()).toBe(false)
+      })
     })
   })
 })