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

diff --git a/client/src/router.js b/client/src/router.js
index 184fede0..8590c334 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -1,87 +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;
-            }
-            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: "/mygames",
+      name: "mygames",
+      component: loadView("MyGames")
     },
     {
-      path: "/game/:id",
+      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")
     },
-//    {
-//      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
+    {
+      path: "/faq",
+      name: "faq",
+      component: loadView("Faq")
+    }
   ]
 });
 
-router.beforeEach((to, from, next) => {
-  window.scrollTo(0, 0); //TODO: check if a live game is running; if yes, call next('/game')
-  //https://router.vuejs.org/guide/advanced/navigation-guards.html#global-before-guards
-  next();
-    //TODO: si une partie en cours dans storage, rediriger vers cette partie
-    //(à condition que l'URL n'y corresponde pas déjà !)
-    // (l'identifiant de l'utilisateur si connecté)
-//    if (!!localStorage["variant"])
-//      location.hash = "#game?id=" + localStorage["gameId"];
-});
-
 export default router;