From 41b05064c8789d937fd728f2efdca2b18abf445d Mon Sep 17 00:00:00 2001
From: Thaum Rystra <stefanzermatten@gmail.com>
Date: Fri, 15 May 2020 15:16:59 +0200
Subject: [PATCH] login redirects now carry over to the register page

---
 app/imports/ui/pages/Register.vue | 3 +--
 app/imports/ui/pages/SignIn.vue   | 2 +-
 app/imports/ui/router.js          | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/imports/ui/pages/Register.vue b/app/imports/ui/pages/Register.vue
index 0857a5ac..f703f922 100644
--- a/app/imports/ui/pages/Register.vue
+++ b/app/imports/ui/pages/Register.vue
@@ -78,7 +78,6 @@
 </template>
 
 <script>
-  import router from '/imports/ui/router.js';
   export default{
     data() {
       return {
@@ -116,7 +115,7 @@
             if (error){
               this.error = error.reason;
             } else {
-              router.push('characterList');
+              this.$router.push(this.$route.query.redirect || 'characterList');
             }
           });
         }
diff --git a/app/imports/ui/pages/SignIn.vue b/app/imports/ui/pages/SignIn.vue
index 0c837ec1..aee513be 100644
--- a/app/imports/ui/pages/SignIn.vue
+++ b/app/imports/ui/pages/SignIn.vue
@@ -45,7 +45,7 @@
           </v-btn>
           <v-btn
             color="accent"
-            to="/register"
+            :to="{ name: 'register', query: { redirect: this.$route.query.redirect} }"
           >
             Register
           </v-btn>
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index 44bd3a9a..2aac5a13 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -180,6 +180,7 @@ RouterFactory.configure(factory => {
         title: 'Sign In',
       },
 		},{
+      name: 'register',
 			path: '/register',
       components: {
         default: Register,