From 35131b514d06f8211edc4faed138c8b7be8d408d Mon Sep 17 00:00:00 2001
From: Tyler Chen <tyler@noreply.git.bubblev.org>
Date: Thu, 23 Jul 2020 13:52:33 +0000
Subject: [PATCH] Fixed weird routing (#26)

fix: weird routing

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement actual pages

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: api integration for register page

fix: messages

feat: api integration for forget-password page

fix: login title and password placeholder

feat: disable button until get response

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: integrate api for new login page

feat: implement responsive header

feat: implement checkbox

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

fix: checkbox event issue

feat: implement register page

feat: implement registration page

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement UI for forgot-password

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement new login page

feat: implement input shared component

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement auth header

Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

capitalize filename

fix: webpack config to add output default url

Merge branch 'master' into feat/ui-layout

Merge branch 'master' into feat/ui-layout

feat: integrate lazy loading and new page structure

feat: use different layout for new Pages

Co-authored-by: Tyler <everdev0923@gmail.com>
Co-authored-by: Jonathan Cobb <jonathan@kyuss.org>
Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org>
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/26
---
 src/_router/index.js | 61 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/_router/index.js b/src/_router/index.js
index 857e92f..af9e04c 100644
--- a/src/_router/index.js
+++ b/src/_router/index.js
@@ -89,36 +89,6 @@ export const router = new Router({
       ],
     },
 
-    {
-      path: '',
-      component: () => import('~/_pages/Layout'),
-      children: [
-        {
-          path: '',
-          component: () => import('~/_pages/auth/Layout'),
-          children: [
-            {
-              path: 'login',
-              component: () => import('~/_pages/auth/Login'),
-            },
-            {
-              path: 'forgotPassword',
-              component: () => import('~/_pages/auth/ForgotPassword'),
-            },
-            {
-              path: 'register',
-              component: () => import('~/_pages/auth/Register'),
-            },
-          ],
-        },
-        {
-          path: '',
-          component: () => import('~/_pages/main/Layout'),
-          children: [],
-        },
-      ],
-    },
-
     // existing pages
     { path: '', component: DashboardPage },
     { path: '/', component: DashboardPage },
@@ -203,6 +173,37 @@ export const router = new Router({
     },
     { path: '/admin/model', component: ModelSetupPage },
 
+    // new route
+    {
+      path: '',
+      component: () => import('~/_pages/Layout'),
+      children: [
+        {
+          path: '',
+          component: () => import('~/_pages/auth/Layout'),
+          children: [
+            {
+              path: 'login',
+              component: () => import('~/_pages/auth/Login'),
+            },
+            {
+              path: 'forgotPassword',
+              component: () => import('~/_pages/auth/ForgotPassword'),
+            },
+            {
+              path: 'register',
+              component: () => import('~/_pages/auth/Register'),
+            },
+          ],
+        },
+        {
+          path: '',
+          component: () => import('~/_pages/main/Layout'),
+          children: [],
+        },
+      ],
+    },
+
     // otherwise redirect to dashboard
     { path: '*', redirect: '/' },
   ],