X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=ae298a7e1172249a879e5b5f6fd75bf088587392;hb=98f485791e915563996de4f37430b285ffc773ae;hp=1507c8e7b5d8c26551df3d6945a1f0d3b01f8019;hpb=625022fdcf750f0aff8fcd699f7e9b89730e1d10;p=vchess.git diff --git a/client/src/router.js b/client/src/router.js index 1507c8e7..ae298a7e 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -1,6 +1,6 @@ import Vue from "vue"; import Router from "vue-router"; -import Home from "./views/Home.vue"; +import Hall from "./views/Hall.vue"; Vue.use(Router); @@ -8,28 +8,62 @@ function loadView(view) { return () => import(/* webpackChunkName: "view-[request]" */ `@/views/${view}.vue`) } +import { ajax } from "@/utils/ajax"; +import { store } from "@/store"; + export default new Router({ routes: [ { path: "/", - name: "home", - component: Home, + name: "hall", + component: Hall, + }, + { + path: "/variants", + name: "variants", + component: loadView("Variants"), + }, + { + path: "/variants/:vname([a-zA-Z0-9]+)", + name: "rules", + component: loadView("Rules"), }, { - 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"); - //} + 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 }, - { - path: "/test", - name: "test", - component: loadView("Test"), - }, +// { +// 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 ] });