Rename analyze --> analyse (UK spelling?)

[vchess.git] / client / src / router.js

diff --git a/client/src/router.js b/client/src/router.js
index ae298a7..daa9619 100644 (file)
--- 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,39 +31,44 @@ export default 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;
-            }
-            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"),
     },
-//    {
-//      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;