From 3cf131ef6f9588dc41a5c0abed2d8112b9922fd3 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Sat, 26 Dec 2020 20:59:41 +0100 Subject: [PATCH] Reinstated old code (works with new method) --- client/src/routes.js | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/client/src/routes.js b/client/src/routes.js index 12668aa..a659ed1 100644 --- a/client/src/routes.js +++ b/client/src/routes.js @@ -1,21 +1,21 @@ import VueRouter from 'vue-router' -// import store from './store' +import store from './store' // Pages import Index from "~/pages/index-page" -import Spells from "~/pages/spells/spells-page" -import SpellSingle from "~/pages/spells/single-spell-page" + import Spells from "~/pages/spells/spells-page" + import SpellSingle from "~/pages/spells/single-spell-page" -import Schools from "./pages/schools/schools-page" -import SchoolSingle from "~/pages/schools/single-school-page" + import Schools from "./pages/schools/schools-page" + import SchoolSingle from "~/pages/schools/single-school-page" -import Timeline from "./pages/timelines/timeline-page" - -import Login from "~/pages/user/login-page" -import Register from "~/pages/user/register-page" -import Profile from "~/pages/user/profile-page" + import Timeline from "./pages/timelines/timeline-page" + + import Profile from "~/pages/user/profile-page" + import Login from "~/pages/user/login-page" + import Register from "~/pages/user/register-page" // Routes const routes = [ @@ -80,23 +80,23 @@ const router = new VueRouter({ linkExactActiveClass: "active", }) -// router.beforeEach((to, from, next) => { -// if (to.matched.some(record => record.meta.loginFilter)) { -// if (store.getters.getUserProfile) { -// next({ -// path: '/', -// }); -// } -// next(); -// } else if (to.matched.some(record => record.meta.logoutFilter)) { -// if (!store.getters.getUserProfile) { -// next({ -// path: '/connexion', -// }); -// } -// next(); -// } -// next(); -// }) +router.beforeEach((to, from, next) => { + if (to.matched.some(record => record.meta.loginFilter)) { + if (store.getters.getUserProfile) { + next({ + path: '/', + }); + } + next(); + } else if (to.matched.some(record => record.meta.logoutFilter)) { + if (!store.getters.getUserProfile) { + next({ + path: '/connexion', + }); + } + next(); + } + next(); +}) export default router; \ No newline at end of file