removed crappy test login files
This commit is contained in:
@@ -2,13 +2,11 @@ import Vue from 'vue';
|
||||
import Router from 'vue-router';
|
||||
import Home from './views/Home.vue';
|
||||
import NotFound from './views/NotFound.vue';
|
||||
import LoginPage from './views/LoginPage.vue';
|
||||
|
||||
|
||||
import Survey from '@/components/Survey.vue';
|
||||
import NewSurvey from '@/components/NewSurvey.vue';
|
||||
import Login from '@/components/Login.vue';
|
||||
import store from '@/store'
|
||||
import store from '@/store';
|
||||
|
||||
Vue.use(Router);
|
||||
|
||||
@@ -24,7 +22,7 @@ export const router = new Router({
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
component: LoginPage,
|
||||
component: Login,
|
||||
},
|
||||
{
|
||||
path: '/about',
|
||||
@@ -36,22 +34,22 @@ export const router = new Router({
|
||||
}, {
|
||||
path: '/surveys/:id',
|
||||
name: 'Survey',
|
||||
component: Survey
|
||||
component: Survey,
|
||||
}, {
|
||||
path: '/surveys',
|
||||
name: 'NewSurvey',
|
||||
component: NewSurvey,
|
||||
beforeEnter (to, from, next) {
|
||||
beforeEnter(to, from, next) {
|
||||
if (!store.getters.isAuthenticated) {
|
||||
next('/login')
|
||||
next('/login');
|
||||
} else {
|
||||
next()
|
||||
next();
|
||||
}
|
||||
}
|
||||
},
|
||||
}, {
|
||||
path: '/login',
|
||||
name: 'Login',
|
||||
component: Login
|
||||
component: Login,
|
||||
},
|
||||
{
|
||||
path: '*',
|
||||
@@ -61,15 +59,4 @@ export const router = new Router({
|
||||
],
|
||||
});
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
// redirect to login page if not logged in and trying to access a restricted page
|
||||
const publicPages = ['/login', '/register'];
|
||||
const authRequired = !publicPages.includes(to.path);
|
||||
const loggedIn = localStorage.getItem('user');
|
||||
|
||||
if (authRequired && !loggedIn) {
|
||||
return next('/login');
|
||||
}
|
||||
});
|
||||
|
||||
export default router;
|
||||
|
||||
Reference in New Issue
Block a user