X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=49f777d00ea463388aee84a18a110b85392a5c32;hb=9330b976e02148bb89e11819070d5d818e82e522;hp=0f0384976481dfcbe590c547e1ac0b077e304622;hpb=deca03e8aeb7cac9c19b0d43b4642b27299695b5;p=vchess.git

diff --git a/client/src/router.js b/client/src/router.js
index 0f038497..49f777d0 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,17 @@ 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;
+            }
+						// TODO: I don't like these 2 lines, "next('/')" should be enough
+						window.location = "/";
             next();
           }
         );
@@ -49,17 +55,31 @@ export default new Router({
       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);
+  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;