X-Git-Url: https://git.auder.net/assets/icon_close.svg?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=5879a1e8c733638b870ea0b1ddf080a1409f84cb;hb=f7121527579a543e01449e752d630ecf2452ec80;hp=0f0384976481dfcbe590c547e1ac0b077e304622;hpb=deca03e8aeb7cac9c19b0d43b4642b27299695b5;p=vchess.git

diff --git a/client/src/router.js b/client/src/router.js
index 0f038497..5879a1e8 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();
           }
         );
@@ -49,6 +53,11 @@ export default new Router({
       component: Hall,
       //redirect: "/", //problem: redirection before end of AJAX request
     },
+    {
+      path: "/game/:id",
+      name: "game",
+      component: loadView("Game"),
+    },
 //    {
 //      path: "/about",
 //      name: "about",
@@ -63,3 +72,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;