summaryrefslogtreecommitdiffstats
path: root/webapp/src/router.js
diff options
context:
space:
mode:
authorUdo Walter2018-08-04 05:45:18 +0200
committerUdo Walter2018-08-04 05:45:18 +0200
commit00d8421e8d7517c58a8aa5906c1273408c37a4fe (patch)
treea1bdcc7f46d4073fe3b7ff300ec6bde44eab1290 /webapp/src/router.js
parent[webapp/groups] bugfix + route to create group/client (diff)
downloadbas-00d8421e8d7517c58a8aa5906c1273408c37a4fe.tar.gz
bas-00d8421e8d7517c58a8aa5906c1273408c37a4fe.tar.xz
bas-00d8421e8d7517c58a8aa5906c1273408c37a4fe.zip
[webapp] login now redirect to the requested route
Diffstat (limited to 'webapp/src/router.js')
-rw-r--r--webapp/src/router.js31
1 files changed, 17 insertions, 14 deletions
diff --git a/webapp/src/router.js b/webapp/src/router.js
index 24e2348..9b432e5 100644
--- a/webapp/src/router.js
+++ b/webapp/src/router.js
@@ -21,12 +21,12 @@ var router = new Router({
routes: [
{
path: '/login',
- name: 'LoginPage',
+ name: 'login',
component: LoginPage
},
{
path: '/dashboard',
- name: 'Dashboard',
+ name: 'dashboard',
component: DashboardPage,
children: setChildren(dashboardModules.concat(DashboardPage.routes()), DashboardPage)
},
@@ -37,16 +37,19 @@ var router = new Router({
]
})
-router.beforeEach((to, from, next) => {
- var loggedIn = document.cookie.indexOf('jwt_hp') >= 0
- if (to.path === '/login') {
- if (loggedIn) next('/dashboard')
- else next()
- } else if (!loggedIn) {
- next('/login')
- } else {
- next()
- }
-})
+const registerRouterGuards = function (store) {
+ router.beforeEach((to, from, next) => {
+ const loggedIn = document.cookie.indexOf('jwt_hp') >= 0
+ if (to.name === 'login') {
+ if (loggedIn) next({ name: 'dashboard' })
+ else next()
+ } else if (!loggedIn) {
+ store.commit('setLoginRedirect', to.fullPath)
+ next({ name: 'login' })
+ } else {
+ next()
+ }
+ })
+}
-export default router
+export { router, registerRouterGuards }