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] 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>