Merge pull request #344 from sophiemoustard/COM-1043-fix

Com 1043 fix
sophiemoustard · Apr 3, 2020 · 3c83cd9 · 3c83cd9
2 parents f020e92 + 3c10b95
commit 3c83cd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/mixins/logInMixin.js b/src/core/mixins/logInMixin.js
@@ -16,7 +16,7 @@ export const logInMixin = {
       await this.$store.dispatch('main/getLoggedUser', this.$q.cookies.get('user_id'));
 
       if (this.$route.query.from) return this.$router.replace({ path: this.$route.query.from });
-      return this.$router.replace('/');
+      return this.$router.replace('/').catch(e => {});
     },
   },
 }
diff --git a/src/router/index.js b/src/router/index.js
@@ -19,7 +19,7 @@ Vue.use(VueMeta);
 
 const Router = new VueRouter({
   scrollBehavior: () => ({ y: 0 }),
-  routes: [...routes, ...vendorRoutes, ...clientRoutes],
+  routes: [...clientRoutes, ...vendorRoutes, ...routes], // routes needs to be at the end of array cf. /src/router/routes.js
 
   mode: process.env.VUE_ROUTER_MODE,
   base: process.env.VUE_ROUTER_BASE,