FOrmat and disable server store temporarily
This commit is contained in:
parent
d0348a4505
commit
8b3713e3ff
|
@ -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
|
||||
|
@ -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();
|
||||
});
|
||||
|
||||
|
|
|
@ -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 },
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue