Rename analyze --> analyse (UK spelling?)
[vchess.git] / client / src / router.js
index 49f777d..daa9619 100644 (file)
@@ -5,7 +5,7 @@ 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";
@@ -31,41 +31,33 @@ const router = new Router({
     {
       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: "/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"),
     },
-    // TODO: myGames, problemId: https://router.vuejs.org/guide/essentials/dynamic-matching.html
   ]
 });
 
@@ -77,9 +69,6 @@ router.beforeEach((to, from, next) => {
     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;