X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=daa9619dcdd0d0aa7ab001b4b28dd40b9080cc60;hb=677fe285f1137d1d3e672dcf2dae3ac6e943be37;hp=599cfcb3dce5672dd2fd74207f491bedcfe7bca3;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34;p=vchess.git diff --git a/client/src/router.js b/client/src/router.js index 599cfcb3..daa9619d 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -31,29 +31,12 @@ 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", @@ -66,9 +49,9 @@ const router = new Router({ component: loadView("Game"), }, { - path: "/analyze/:vname([a-zA-Z0-9]+)", - name: "analyze", - component: loadView("Analyze"), + path: "/analyse/:vname([a-zA-Z0-9]+)", + name: "analyse", + component: loadView("Analyse"), }, { path: "/about",