refactored root route based on Frank's feedback.
This commit is contained in:
parent
df2ed6eb67
commit
e5f11854b0
1 changed files with 5 additions and 10 deletions
|
|
@ -12,18 +12,13 @@ const routes = [
|
||||||
async beforeEnter(to, from, next) {
|
async beforeEnter(to, from, next) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
let issPage = to.query.issPage;
|
to.query.issPage = to.query.issPage === undefined ? issPageValues.WELCOME_PAGE : to.query.issPage;
|
||||||
|
|
||||||
if(issPage === undefined)
|
if (router.hasRoute(to.query.issPage)) {
|
||||||
{
|
return next({ name: to.query.issPage, query: to.query, params: to.params });
|
||||||
issPage = issPageValues.WELCOME_PAGE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (router.hasRoute(issPage)) {
|
const routeData = await GetRouteInfoFromPageName(to.query.issPage);
|
||||||
return next({ name: issPage, query: to.query, params: to.params });
|
|
||||||
}
|
|
||||||
|
|
||||||
const routeData = await GetRouteInfoFromPageName(issPage);
|
|
||||||
|
|
||||||
if(routeData[0].name.toLowerCase() === "error")
|
if(routeData[0].name.toLowerCase() === "error")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue