From 76c77088295eddeca31b5af84e8ff0c2602c2d8c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 01:40:29 +0200
Subject: [PATCH 1/4] Thx page shows content dependent of route from

---
 frontend/src/locales/de.json               |  4 +-
 frontend/src/locales/en.json               |  4 +-
 frontend/src/routes/routes.js              |  8 ++++
 frontend/src/views/Pages/ResetPassword.vue |  4 ++
 frontend/src/views/Pages/thx.vue           | 46 +++++++++++++++++++++-
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index be4574e6d..558de7813 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -85,7 +85,9 @@
     },
     "thx": {
       "title": "Danke!",
-      "subtitle": "Wir haben dir eine eMail gesendet."
+      "email": "Wir haben dir eine eMail gesendet.",
+      "reset": "Dein Passwort wurde geändert",
+      "register": "Du bist jetzt regisriert"      
     },
     "overview":{
       "account_overview":"Kontoübersicht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d9a3d278b..2daa1696f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -85,7 +85,9 @@
     },
     "thx": {
       "title": "Thank you!",
-      "subtitle": "We have sent you an email."
+      "email": "We have sent you an email.",
+      "reset": "Your password has been changed",
+      "register": "You are registred now"      
     },
     "overview":{
       "account_overview":"Account overview",
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index e9bcf38c8..0021aa1ed 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -49,6 +49,14 @@ const routes = [
   {
     path: '/thx',
     component: () => import('../views/Pages/thx.vue'),
+    beforeEnter: (to, from, next) => {
+      const validFrom = ['/password', '/reset', '/register']
+      if (!validFrom.includes(from.path)) {
+        next({ path: '/login' })
+      } else {
+        next()
+      }
+    },
   },
   {
     path: '/password',
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index de5f256d6..c24a33257 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -107,6 +107,10 @@ export default {
       const result = await loginAPI.changePassword(this.sessionId, this.email, this.password)
       if (result.success) {
         this.password = ''
+        this.$store.dispatch('login', {
+          sessionId: result.result.data.session_id,
+          email: result.result.data.user.email,
+        })
         this.$router.push('/thx')
       } else {
         alert(result.result.message)
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index db0b967d6..53db302a9 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -5,12 +5,54 @@
       <b-container>
         <div class="header-body text-center mb-7">
           <p class="h1">{{ $t('site.thx.title') }}</p>
-          <p class="h4">{{ $t('site.thx.subtitle') }}</p>
+          <p class="h4">{{ $t(displaySetup.subtitle) }}</p>
           <hr />
-          <b-button to="/login">{{ $t('login') }}</b-button>
+          <b-button :to="displaySetup.linkTo">{{ $t(displaySetup.button) }}</b-button>
         </div>
       </b-container>
     </div>
     <!-- Page content -->
   </div>
 </template>
+<script>
+const textFields = {
+  '/password': {
+    subtitle: 'site.thx.email',
+    button: 'login',
+    linkTo: '/login',
+  },
+  '/reset': {
+    subtitle: 'site.thx.reset',
+    button: 'site.login.signin',
+    linkTo: '/overview',
+  },
+  '/register': {
+    subtitle: 'site.thx.register',
+    button: 'site.login.signin',
+    linkTo: '/overview',
+  },
+}
+
+export default {
+  name: 'Thx',
+  data() {
+    return {
+      comingFrom: null,
+      displaySetup: {},
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      vm.comingFrom = from.path
+    })
+  },
+  methods: {
+    setupDisplay() {
+      this.displaySetup = textFields[this.comingFrom]
+    },
+  },
+  created() {
+    this.setupDisplay()
+  },
+}
+</script>

From 77ec0877758affaa8819f276da16b4e058f6bd9b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 16:54:34 +0200
Subject: [PATCH 2/4] thx pages works without errors

---
 frontend/src/routes/routes.js               |  6 +++---
 frontend/src/views/Pages/ForgotPassword.vue |  2 +-
 frontend/src/views/Pages/Register.vue       |  2 +-
 frontend/src/views/Pages/ResetPassword.vue  | 12 ++++++-----
 frontend/src/views/Pages/thx.vue            | 22 ++++++++-------------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0021aa1ed..e32aa6eee 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -47,11 +47,11 @@ const routes = [
     component: () => import('../views/Pages/Login.vue'),
   },
   {
-    path: '/thx',
+    path: '/thx/:comingFrom',
     component: () => import('../views/Pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['/password', '/reset', '/register']
-      if (!validFrom.includes(from.path)) {
+      const validFrom = ['password', 'reset', 'register']
+      if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {
         next()
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index 484b50629..32331d080 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -62,7 +62,7 @@ export default {
     async onSubmit() {
       const result = await loginAPI.sendEmail(this.form.email)
       if (result.success) {
-        this.$router.push({ path: '/thx', params: { id: 'resetmail' } })
+        this.$router.push('/thx/password')
       } else {
         alert(result.result)
       }
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 30ab578a2..d7b9ab8f0 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -192,7 +192,7 @@ export default {
         this.model.firstname = ''
         this.model.lastname = ''
         this.password = ''
-        this.$router.push('/thx')
+        this.$router.push('/thx/register')
       } else {
         this.showError = true
         this.messageError = result.result.message
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index c24a33257..99892612c 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -107,11 +107,13 @@ export default {
       const result = await loginAPI.changePassword(this.sessionId, this.email, this.password)
       if (result.success) {
         this.password = ''
-        this.$store.dispatch('login', {
-          sessionId: result.result.data.session_id,
-          email: result.result.data.user.email,
-        })
-        this.$router.push('/thx')
+        /*
+         this.$store.dispatch('login', {
+           sessionId: result.result.data.session_id,
+           email: result.result.data.user.email,
+         })
+         */
+        this.$router.push('/thx/reset')
       } else {
         alert(result.result.message)
       }
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index 53db302a9..a4a31ff41 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -16,17 +16,17 @@
 </template>
 <script>
 const textFields = {
-  '/password': {
+  password: {
     subtitle: 'site.thx.email',
     button: 'login',
     linkTo: '/login',
   },
-  '/reset': {
+  reset: {
     subtitle: 'site.thx.reset',
-    button: 'site.login.signin',
-    linkTo: '/overview',
+    button: 'login',
+    linkTo: '/login',
   },
-  '/register': {
+  register: {
     subtitle: 'site.thx.register',
     button: 'site.login.signin',
     linkTo: '/overview',
@@ -37,22 +37,16 @@ export default {
   name: 'Thx',
   data() {
     return {
-      comingFrom: null,
       displaySetup: {},
     }
   },
-  beforeRouteEnter(to, from, next) {
-    next((vm) => {
-      vm.comingFrom = from.path
-    })
-  },
   methods: {
-    setupDisplay() {
-      this.displaySetup = textFields[this.comingFrom]
+    setDisplaySetup(from) {
+      this.displaySetup = textFields[this.$route.params.comingFrom]
     },
   },
   created() {
-    this.setupDisplay()
+    this.setDisplaySetup()
   },
 }
 </script>

From e9b6138a097b60f8a6aecfbd7c202cba3aeac84f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 17:36:59 +0200
Subject: [PATCH 3/4] added period at the end of phrases

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

diff --git a/frontend/src/locales/.#de.json b/frontend/src/locales/.#de.json
new file mode 120000
index 000000000..9f47defcf
--- /dev/null
+++ b/frontend/src/locales/.#de.json
@@ -0,0 +1 @@
+moriz@bluestar.2378:1620885678
\ No newline at end of file
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4a7a8b09f..eb9a9874d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -85,8 +85,8 @@
     "thx": {
       "title": "Thank you!",
       "email": "We have sent you an email.",
-      "reset": "Your password has been changed",
-      "register": "You are registred now"      
+      "reset": "Your password has been changed.",
+      "register": "You are registred now."      
     },
     "overview":{
       "account_overview":"Account overview",

From d1245e98fe384cc3f24adfb6b4602967d0daf5fa Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 19 May 2021 17:37:36 +0200
Subject: [PATCH 4/4] added period at the end of phrases

---
 frontend/src/locales/.#de.json | 1 -
 frontend/src/locales/de.json   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 120000 frontend/src/locales/.#de.json

diff --git a/frontend/src/locales/.#de.json b/frontend/src/locales/.#de.json
deleted file mode 120000
index 9f47defcf..000000000
--- a/frontend/src/locales/.#de.json
+++ /dev/null
@@ -1 +0,0 @@
-moriz@bluestar.2378:1620885678
\ No newline at end of file
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b840fc34b..74e32c1bb 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -85,8 +85,8 @@
     "thx": {
       "title": "Danke!",
       "email": "Wir haben dir eine eMail gesendet.",
-      "reset": "Dein Passwort wurde geändert",
-      "register": "Du bist jetzt regisriert"      
+      "reset": "Dein Passwort wurde geändert.",
+      "register": "Du bist jetzt regisriert."      
     },
     "overview":{
       "account_overview":"Kontoübersicht",