X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=68148959f7a19f55da384fa974d043e55211c7a1;hb=786e0065dcafc0f190aa0b541e635fbf5844ed2a;hp=89bdf738a952337809fd8e66765677163294825f;hpb=a7f9f050e44080e8caf888e3b230660abffa2400;p=vchess.git

diff --git a/client/src/router.js b/client/src/router.js
index 89bdf738..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: "/",
@@ -32,41 +32,26 @@ export default new Router({
       path: "/authenticate/:token",
       name: "authenticate",
       beforeEnter: (to, from, next) => {
-        console.log("ajax call authenticate");
         ajax(
           "/authenticate",
           "GET",
           {token: to.params["token"]},
           (res) => {
-            console.log(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();
           }
         );
       },
-      redirect: "/",
-    },
-    {
-      path: "/logout",
-      name: "logout",
-      beforeEnter: (to, from, next) => {
-        ajax(
-          "/logout",
-          "GET",
-          () => {
-            store.state.user.id = 0;
-            store.state.user.name = "";
-            store.state.user.email = "";
-            store.state.user.notify = false;
-            next();
-          }
-        );
-      },
-      redirect: "/",
+      component: Hall,
+      //redirect: "/", //problem: redirection before end of AJAX request
     },
 //    {
 //      path: "/about",
@@ -82,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;