diff --git a/src/resources/vue/js/routes.js b/src/resources/vue/js/routes.js index 5c45685e..8d5d00dd 100644 --- a/src/resources/vue/js/routes.js +++ b/src/resources/vue/js/routes.js @@ -1,57 +1,59 @@ import Vue from 'vue' import VueRouter from 'vue-router' Vue.use(VueRouter) import DashboardComponent from '../components/DashboardComponent' import LoginComponent from '../components/LoginComponent' import LogoutComponent from '../components/LogoutComponent' import store from './store' const routes = [ { path: '/', redirect: { name: 'login' } }, { path: '/dashboard', name: 'dashboard', component: DashboardComponent, meta: { requiresAuth: true } }, { path: '/login', name: 'login', component: LoginComponent }, { path: '/logout', name: 'logout', component: LogoutComponent } ] const router = new VueRouter({ + history: true, + mode: 'history', routes }) router.beforeEach((to, from, next) => { // check if the route requires authentication and user is not logged in if (to.matched.some(route => route.meta.requiresAuth) && !store.state.isLoggedIn) { // redirect to login page next({ name: 'login' }) return } // if logged in redirect to dashboard if(to.path === '/login' && store.state.isLoggedIn) { next({ name: 'dashboard' }) return } next() }) export default router diff --git a/src/routes/api.php b/src/routes/api.php index 146175b9..4a9c4e2e 100644 --- a/src/routes/api.php +++ b/src/routes/api.php @@ -1,41 +1,40 @@ 'api', 'prefix' => 'auth' ], function ($router) { Route::get('info', 'API\UsersController@info'); Route::post('login', 'API\UsersController@login'); Route::post('logout', 'API\UsersController@logout'); Route::post('refresh', 'API\UsersController@refresh'); Route::post('register', 'API\UsersController@register'); } ); Route::group( [ 'middleware' => 'auth:api', 'prefix' => 'v4' ], function () { Route::apiResource('entitlements', API\EntitlementsController::class); Route::apiResource('users', API\UsersController::class); Route::apiResource('wallets', API\WalletsController::class); } ); - diff --git a/src/routes/web.php b/src/routes/web.php index 30bb3d59..fd657263 100644 --- a/src/routes/web.php +++ b/src/routes/web.php @@ -1,19 +1,17 @@ where('any', '^(login|register)$');