diff --git a/resources/assets/scripts/router.js b/resources/assets/scripts/router.js index d03c6b47a..27b964c14 100644 --- a/resources/assets/scripts/router.js +++ b/resources/assets/scripts/router.js @@ -1,8 +1,6 @@ import VueRouter from 'vue-router'; import store from './store/index'; -import compareDate from 'date-fns/compare_asc' -import addHours from 'date-fns/add_hours' -import dateParse from 'date-fns/parse' + const route = require('./../../../vendor/tightenco/ziggy/src/js/route').default; // Base Vuejs Templates @@ -13,22 +11,22 @@ import ResetPassword from './components/auth/ResetPassword'; import User from './models/user'; const routes = [ - { name: 'login', path: '/auth/login', component: Login }, - { name: 'forgot-password', path: '/auth/password', component: Login }, - { name: 'checkpoint', path: '/auth/checkpoint', component: Login }, + {name: 'login', path: '/auth/login', component: Login}, + {name: 'forgot-password', path: '/auth/password', component: Login}, + {name: 'checkpoint', path: '/auth/checkpoint', component: Login}, { name: 'reset-password', path: '/auth/password/reset/:token', component: ResetPassword, props: function (route) { - return { token: route.params.token, email: route.query.email || '' }; + return {token: route.params.token, email: route.query.email || ''}; } }, - { name : 'dashboard', path: '/', component: Dashboard }, - { name : 'account', path: '/account', component: Account }, - { name : 'account.api', path: '/account/api', component: Account }, - { name : 'account.security', path: '/account/security', component: Account }, + {name: 'dashboard', path: '/', component: Dashboard}, + {name: 'account', path: '/account', component: Account}, + {name: 'account.api', path: '/account/api', component: Account}, + {name: 'account.security', path: '/account/security', component: Account}, { name: 'server', @@ -48,6 +46,7 @@ const router = new VueRouter({ // have no JWT or the JWT is expired and wouldn't be accepted by the Panel. router.beforeEach((to, from, next) => { if (to.path === route('auth.logout')) { + console.log('logging out'); return window.location = route('auth.logout'); } @@ -55,11 +54,13 @@ router.beforeEach((to, from, next) => { // Check that if we're accessing a non-auth route that a user exists on the page. if (!to.path.startsWith('/auth') && !(user instanceof User)) { + console.log('logging out 2'); store.commit('auth/logout'); return window.location = route('auth.logout'); } // Continue on through the pipeline. + console.log('continuing'); return next(); }); diff --git a/resources/assets/scripts/store/index.js b/resources/assets/scripts/store/index.js index 1725169b7..ba41fef54 100644 --- a/resources/assets/scripts/store/index.js +++ b/resources/assets/scripts/store/index.js @@ -7,16 +7,16 @@ Vue.use(Vuex); const store = new Vuex.Store({ strict: process.env.NODE_ENV !== 'production', - modules: { auth, server }, + modules: { auth }, }); if (module.hot) { module.hot.accept(['./modules/auth'], () => { const newAuthModule = require('./modules/auth').default; - const newServerModule = require('./modules/server').default; + // const newServerModule = require('./modules/server').default; store.hotUpdate({ - modules: { newAuthModule, newServerModule }, + modules: { newAuthModule }, }); }); }