X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=68148959f7a19f55da384fa974d043e55211c7a1;hb=786e0065dcafc0f190aa0b541e635fbf5844ed2a;hp=0f0384976481dfcbe590c547e1ac0b077e304622;hpb=deca03e8aeb7cac9c19b0d43b4642b27299695b5;p=vchess.git diff --git a/client/src/router.js b/client/src/router.js index 0f038497..68148959 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -11,7 +11,7 @@ function loadView(view) { import { ajax } from "@/utils/ajax"; import { store } from "@/store"; -export default new Router({ +const router = new Router({ routes: [ { path: "/", @@ -37,11 +37,15 @@ export default new Router({ "GET", {token: to.params["token"]}, (res) => { - store.state.user.id = res.id; - store.state.user.name = res.name; - store.state.user.email = res.email; - store.state.user.notify = res.notify; - // NOTE: mysid isn't cleared (required for potential game continuation) + if (!res.errmsg) //if not already logged in + { + store.state.user.id = res.id; + store.state.user.name = res.name; + store.state.user.email = res.email; + store.state.user.notify = res.notify; + localStorage["myname"] = res.name; + localStorage["myid"] = res.id; + } next(); } ); @@ -63,3 +67,11 @@ export default new Router({ // TODO: gameRef, problemId: https://router.vuejs.org/guide/essentials/dynamic-matching.html ] }); + +router.beforeEach((to, from, next) => { + window.scrollTo(0, 0); //TODO: check if a live game is running; if yes, call next('/game') + //https://router.vuejs.org/guide/advanced/navigation-guards.html#global-before-guards + next(); +}); + +export default router;