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

diff --git a/client/src/router.js b/client/src/router.js
index 08bbf88b..49f777d0 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -1,6 +1,6 @@
 import Vue from "vue";
 import Router from "vue-router";
-import Home from "./views/Home.vue";
+import Hall from "./views/Hall.vue";
 
 Vue.use(Router);
 
@@ -8,29 +8,78 @@ function loadView(view) {
 	return () => import(/* webpackChunkName: "view-[request]" */ `@/views/${view}.vue`)
 }
 
-export default new Router({
+import { ajax } from "@/utils/ajax";
+import { store } from "@/store";
+
+const router = new Router({
   routes: [
     {
       path: "/",
-      name: "home",
-      component: Home,
+      name: "hall",
+      component: Hall,
+    },
+    {
+      path: "/variants",
+      name: "variants",
+      component: loadView("Variants"),
+    },
+    {
+      path: "/variants/:vname([a-zA-Z0-9]+)",
+      name: "rules",
+      component: loadView("Rules"),
+    },
+    {
+      path: "/authenticate/:token",
+      name: "authenticate",
+      beforeEnter: (to, from, next) => {
+        ajax(
+          "/authenticate",
+          "GET",
+          {token: to.params["token"]},
+          (res) => {
+            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();
+          }
+        );
+      },
+      component: Hall,
+      //redirect: "/", //problem: redirection before end of AJAX request
+    },
+    {
+      path: "/game/:id",
+      name: "game",
+      component: loadView("Game"),
     },
     {
       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");
-				//}
+      component: loadView("About"),
     },
-		{
-			path: "/test",
-			name: "test",
-			component: loadView("Test"),
-		},
-    // TODO: gameRef, problemId: https://router.vuejs.org/guide/essentials/dynamic-matching.html
+    // 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;