X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=49f777d00ea463388aee84a18a110b85392a5c32;hp=5879a1e8c733638b870ea0b1ddf080a1409f84cb;hb=9330b976e02148bb89e11819070d5d818e82e522;hpb=f7121527579a543e01449e752d630ecf2452ec80 diff --git a/client/src/router.js b/client/src/router.js index 5879a1e8..49f777d0 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -46,6 +46,8 @@ const router = new Router({ localStorage["myname"] = res.name; localStorage["myid"] = res.id; } + // TODO: I don't like these 2 lines, "next('/')" should be enough + window.location = "/"; next(); } ); @@ -58,25 +60,26 @@ const router = new Router({ name: "game", component: loadView("Game"), }, -// { -// path: "/about", -// name: "about", -// // route level code-splitting -// // this generates a separate chunk (about.[hash].js) for this route -// // which is lazy-loaded when the route is visited. -// component: loadView('About'), -// //function() { -// // return import(/* webpackChunkName: "about" */ "./views/About.vue"); -// //} -// }, - // TODO: gameRef, problemId: https://router.vuejs.org/guide/essentials/dynamic-matching.html + { + path: "/about", + name: "about", + component: loadView("About"), + }, + // TODO: myGames, 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 + window.scrollTo(0, 0); + if (!!store.state.conn) //uninitialized at first page + { + // Notify WebSockets server (TODO: path or fullPath?) + store.state.conn.send(JSON.stringify({code: "pagechange", page: to.path})); + } next(); + // TODO?: redirect to current game (through GameStorage.getCurrent()) if any? + // (and if the URL doesn't already match it) (use next("/game/GID")) + //https://router.vuejs.org/guide/advanced/navigation-guards.html#global-before-guards }); export default router;