X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=380ccc6cd2575301da919dd85be5a487d7fa20a9;hb=92a523d1a74cbabcfd7d6ade45f25fa622815f0b;hp=68148959f7a19f55da384fa974d043e55211c7a1;hpb=786e0065dcafc0f190aa0b541e635fbf5844ed2a;p=vchess.git diff --git a/client/src/router.js b/client/src/router.js index 68148959..380ccc6c 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -46,32 +46,38 @@ const router = new Router({ localStorage["myname"] = res.name; localStorage["myid"] = res.id; } - next(); + next("/"); } ); }, component: Hall, //redirect: "/", //problem: redirection before end of AJAX request }, -// { -// 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: "/game/:id", + name: "game", + component: loadView("Game"), + }, + { + 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;