From e5f11854b0b175d21649831235aeebb96aec75d2 Mon Sep 17 00:00:00 2001
From: Jason Wheeler <jason.wheeler@safelite.com>
Date: Thu, 22 Sep 2022 12:26:26 -0400
Subject: [PATCH] refactored root route based on Frank's feedback.

---
 src/router/index.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 7f0910a9..a71749ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,18 +12,13 @@ const routes = [
         async beforeEnter(to, from, next) {
             try {
 
-                let issPage = to.query.issPage;
-                
-                if(issPage === undefined)
-                {
-                    issPage = issPageValues.WELCOME_PAGE;
+                to.query.issPage = to.query.issPage === undefined ? issPageValues.WELCOME_PAGE : to.query.issPage;
+
+                if (router.hasRoute(to.query.issPage)) {
+                    return next({ name: to.query.issPage, query: to.query, params: to.params });
                 }
 
-                if (router.hasRoute(issPage)) {
-                    return next({ name: issPage, query: to.query, params: to.params });
-                }
-
-                const routeData = await GetRouteInfoFromPageName(issPage);
+                const routeData = await GetRouteInfoFromPageName(to.query.issPage);
 
                 if(routeData[0].name.toLowerCase() === "error")
                 {