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

diff --git a/client/src/router.js b/client/src/router.js
index 49f777d0..8590c334 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -1,85 +1,76 @@
 import Vue from "vue";
 import Router from "vue-router";
-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";
-
 const router = new Router({
   routes: [
     {
       path: "/",
       name: "hall",
-      component: Hall,
+      component: loadView("Hall")
     },
     {
       path: "/variants",
       name: "variants",
-      component: loadView("Variants"),
+      component: loadView("Variants")
+    },
+    {
+      path: "/variants/list",
+      name: "variantlist",
+      component: loadView("VariantList")
     },
     {
       path: "/variants/:vname([a-zA-Z0-9]+)",
       name: "rules",
-      component: loadView("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
+      component: loadView("Auth")
+    },
+    {
+      path: "/logout",
+      name: "logout",
+      component: loadView("Logout")
+    },
+    {
+      path: "/problems",
+      name: "myproblems",
+      component: loadView("Problems")
     },
     {
-      path: "/game/:id",
+      path: "/mygames",
+      name: "mygames",
+      component: loadView("MyGames")
+    },
+    {
+      path: "/game/:id([a-zA-Z0-9]+)",
       name: "game",
-      component: loadView("Game"),
+      component: loadView("Game")
+    },
+    {
+      path: "/analyse/:vname([a-zA-Z0-9]+)",
+      name: "analyse",
+      component: loadView("Analyse")
     },
     {
       path: "/about",
       name: "about",
-      component: loadView("About"),
+      component: loadView("About")
     },
-    // TODO: myGames, problemId: https://router.vuejs.org/guide/essentials/dynamic-matching.html
+    {
+      path: "/faq",
+      name: "faq",
+      component: loadView("Faq")
+    }
   ]
 });
 
-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;