diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f60ba12..d454a17 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e6689a53921c2eadba51", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=acbe8c10a31846bdc8b8", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=94429941425a4eb87c1c", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=34c46189b5553855b1a7", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=cabc618a854d22491559" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=174e67dd5b3265ec4f59", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=958182d4186ccca0ef7a", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=84430d42277381f1d901", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=a362835fbf858c04432d", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=1cc164742fa011cb2c67" } diff --git a/resources/js/Global/services/errorHandler.services.js b/resources/js/Global/services/errorHandler.services.js index 79ed356..ef1974e 100644 --- a/resources/js/Global/services/errorHandler.services.js +++ b/resources/js/Global/services/errorHandler.services.js @@ -20,7 +20,7 @@ function errorResponseHandler(error) { TokenService.removeToken(); ApiService.removeAuthHeader(); store.commit('auth/logout', {}, {root: true}) - window.location.href = commonRoute.login; + window.location.href = commonRoute.login(); } } } diff --git a/resources/js/Global/utils/common/routes.js b/resources/js/Global/utils/common/routes.js index a3d19f8..b1a5877 100644 --- a/resources/js/Global/utils/common/routes.js +++ b/resources/js/Global/utils/common/routes.js @@ -1,8 +1,8 @@ export default { - login: () => { + login() { return process.env.MIX_PUSHER_APP_ROUTE_LOGIN || "/WE-Login"; }, - main: () => { + main() { return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/Main/Home"; } } diff --git a/resources/js/Home/router/index.js b/resources/js/Home/router/index.js index a08430b..9b76e8c 100644 --- a/resources/js/Home/router/index.js +++ b/resources/js/Home/router/index.js @@ -66,12 +66,12 @@ router.beforeEach((to, from, next) => { const loggedIn = !!TokenService.getToken(); if (!isPublic && !loggedIn) { - return window.location.href = commonRoute.login + '?redirect='+to.fullPath; + return window.location.href = commonRoute.login() + '?redirect='+to.fullPath; } // Do not allow user to visit login page or register page if they are logged in if (loggedIn && onlyWhenLoggedOut && policy) { - return window.location.href = commonRoute.main; + return window.location.href = commonRoute.main(); } next();