Refactor router

js/src/views/User/Login.vue

@@ -53,7 +53,6 @@
 </template>
 
 <script lang="ts">
-import Gravatar from "vue-gravatar";
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { LOGIN } from "@/graphql/auth";
 import { validateEmailField, validateRequiredField } from "@/utils/validators";
@@ -61,12 +60,9 @@ import { saveUserData } from "@/utils/auth";
 import { ILogin } from "@/types/login.model";
 import { UPDATE_CURRENT_USER_CLIENT } from "@/graphql/user";
 import { onLogin } from "@/vue-apollo";
+import { RouteName } from '@/router'
 
-@Component({
-  components: {
-    "v-gravatar": Gravatar
-  }
-})
+@Component
 export default class Login extends Vue {
   @Prop({ type: String, required: false, default: "" }) email!: string;
   @Prop({ type: String, required: false, default: "" }) password!: string;
@@ -85,7 +81,7 @@ export default class Login extends Vue {
 
   beforeCreate() {
     if (this.user) {
-      this.$router.push("/");
+      this.$router.push('/');
     }
   }
 
@@ -119,7 +115,7 @@ export default class Login extends Vue {
 
       onLogin(this.$apollo);
 
-      this.$router.push({ name: "Home" });
+      this.$router.push({ name: RouteName.HOME });
     } catch (err) {
       console.error(err);
       err.graphQLErrors.forEach(({ message }) => {
@@ -127,11 +123,5 @@ export default class Login extends Vue {
       });
     }
   }
-
-  validEmail() {
-    return this.rules.email(this.credentials.email) === true
-      ? "v-gravatar"
-      : "avatar";
-  }
 }
 </script>

js/src/views/User/PasswordReset.vue

@@ -40,6 +40,7 @@ import { validateRequiredField } from "@/utils/validators";
 import { RESET_PASSWORD } from "@/graphql/auth";
 import { saveUserData } from "@/utils/auth";
 import { ILogin } from "@/types/login.model";
+import { RouteName } from '@/router'
 
 @Component
 export default class PasswordReset extends Vue {
@@ -79,7 +80,7 @@ export default class PasswordReset extends Vue {
       });
 
       saveUserData(result.data.resetPassword);
-      this.$router.push({ name: "Home" });
+      this.$router.push({ name: RouteName.HOME });
     } catch (err) {
       console.error(err);
       err.graphQLErrors.forEach(({ message }) => {

js/src/views/User/Register.vue

@@ -108,15 +108,11 @@
 </template>
 
 <script lang="ts">
-import Gravatar from "vue-gravatar";
 import { CREATE_USER } from "@/graphql/user";
 import { Component, Prop, Vue } from "vue-property-decorator";
+import { UserRouteName } from '@/router/user'
 
-@Component({
-  components: {
-    "v-gravatar": Gravatar
-  }
-})
+@Component
 export default class Register extends Vue {
   @Prop({ type: String, required: false, default: "" }) email!: string;
   @Prop({ type: String, required: false, default: "" }) password!: string;
@@ -124,29 +120,25 @@ export default class Register extends Vue {
   credentials = {
     email: this.email,
     password: this.password
-  } as { email: string; password: string };
+  }
   errors: object = {};
   sendingValidation: boolean = false;
   validationSent: boolean = false;
-  showGravatar: boolean = false;
-
-  validEmail() {
-    return this.credentials.email.includes("@") === true
-      ? "v-gravatar"
-      : "avatar";
-  }
 
   async submit() {
     try {
       this.sendingValidation = true;
       this.errors = {};
+
       await this.$apollo.mutate({
         mutation: CREATE_USER,
         variables: this.credentials
       });
+
       this.validationSent = true;
+
       this.$router.push({
-        name: "RegisterProfile",
+        name: UserRouteName.REGISTER_PROFILE,
         params: { email: this.credentials.email }
       });
     } catch (error) {

js/src/views/User/Validate.vue

@@ -20,6 +20,8 @@
 import { VALIDATE_USER } from "@/graphql/user";
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { AUTH_TOKEN, AUTH_USER_ID } from "@/constants";
+import { RouteName } from '@/router'
+import { UserRouteName } from '@/router/user'
 
 @Component
 export default class Validate extends Vue {
@@ -46,9 +48,9 @@ export default class Validate extends Vue {
       const user = data.validateUser.user;
       console.log(user);
       if (user.defaultActor) {
-        this.$router.push({name: "Home"});
+        this.$router.push({ name: RouteName.HOME });
       } else { // If the user didn't register any profile yet, let's create one for them
-        this.$router.push({ name: 'RegisterProfile', params: {email: user.email, userAlreadyActivated: 'true'} });
+        this.$router.push({ name: UserRouteName.REGISTER_PROFILE, params: { email: user.email, userAlreadyActivated: 'true' } });
       }
     } catch (err) {
       console.error(err);