X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=071af8c5257a7c5cac68a966ee394e833ddfcb94;hb=89021f181ac0689bbc785ce0ebd9a910e66352b0;hp=2030397a8dc95c5a09fc0b3d8b24d7977267d6ed;hpb=1aeed627be63a298d3a093797c3728e3de30b464;p=vchess.git

diff --git a/client/src/router.js b/client/src/router.js
index 2030397a..071af8c5 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,47 +31,39 @@ export default new Router({
     {
       path: "/authenticate/:token",
       name: "authenticate",
-      beforeEnter: (to, from, next) => {
-        ajax(
-          "/authenticate",
-          "GET",
-          {token: to.params["token"]},
-          (res) => {
-            store.state.user.id = res.id;
-            store.state.user.name = res.name;
-          }
-        );
-        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 = ""; //TODO: localStorage myId myname mysid ?
-          }
-        );
-        next();
-      },
-      redirect: "/",
+      component: loadView("Logout"),
+    },
+    {
+      path: "/problems",
+      name: "myproblems",
+      component: loadView("Problems"),
+    },
+    {
+      path: "/mygames",
+      name: "mygames",
+      component: loadView("MyGames"),
+    },
+    {
+      path: "/game/:id([a-zA-Z0-9]+)",
+      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
   ]
 });
+
+export default router;