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

diff --git a/client/src/router.js b/client/src/router.js
index 89bdf738..daa9619d 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -5,13 +5,13 @@ import Hall from "./views/Hall.vue";
 Vue.use(Router);
 
 function loadView(view) {
-	return () => import(/* webpackChunkName: "view-[request]" */ `@/views/${view}.vue`)
+  return () => import(/* webpackChunkName: "view-[request]" */ `@/views/${view}.vue`)
 }
 
 import { ajax } from "@/utils/ajax";
 import { store } from "@/store";
 
-export default new Router({
+const router = new Router({
   routes: [
     {
       path: "/",
@@ -31,54 +31,44 @@ 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)
-            next();
-          }
-        );
-      },
-      redirect: "/",
+      component: loadView("Auth"),
     },
     {
       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: loadView("Logout"),
+    },
+    {
+      path: "/mygames",
+      name: "mygames",
+      component: loadView("MyGames"),
+    },
+    {
+      path: "/game/:id",
+      name: "game",
+      component: loadView("Game"),
+    },
+    {
+      path: "/analyse/:vname([a-zA-Z0-9]+)",
+      name: "analyse",
+      component: loadView("Analyse"),
+    },
+    {
+      path: "/about",
+      name: "about",
+      component: loadView("About"),
     },
-//    {
-//      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
   ]
 });
+
+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();
+});
+
+export default router;