From 1f757fc7b12bbb7420823205dda08e9c38c14d09 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Fri, 22 Jun 2018 11:33:07 +0800
Subject: [PATCH] make changes in route.js

---
 resources/assets/js/middleware/auth.js    |  8 +++-----
 resources/assets/js/pages/admin/home.vue  |  6 +++---
 resources/assets/js/pages/admin/index.vue | 11 +++--------
 resources/assets/js/router/routes.js      | 10 +++++++++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/middleware/auth.js b/resources/assets/js/middleware/auth.js
index 1302a8b7..e8b37e9e 100644
--- a/resources/assets/js/middleware/auth.js
+++ b/resources/assets/js/middleware/auth.js
@@ -3,11 +3,9 @@ import store from '~/store'
 export default async (to, from, next) => {
   if (!store.getters['auth/check']) {
     next({ name: 'login' })
-  } 
-  else if (store.getters['auth/user'].role == "admin"){
-    next({ name : 'admin.home' })
-  }
-  else {
+  } else if (store.getters['auth/user'].role === 'admin') {
+    next({ name: 'home' })
+  } else {
     next()
   }
 }
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index f5f67c94..8b3c6e2a 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -1,12 +1,12 @@
 <template>
-  <card :title="$t('home')">
-    This is admin
+  <card>
+    This is home
   </card>
 </template>
 
 <script>
 export default {
-  middleware: 'admin',
+  middleware: ['auth'],
 
   metaInfo () {
     return { title: this.$t('home') }
diff --git a/resources/assets/js/pages/admin/index.vue b/resources/assets/js/pages/admin/index.vue
index c60c3751..67871a7c 100644
--- a/resources/assets/js/pages/admin/index.vue
+++ b/resources/assets/js/pages/admin/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="top-right links">
       <template v-if="authenticated">
-        <router-link :to="{ name: 'home' }">
+        <router-link :to="{ name: 'admin/home' }">
           {{ $t('home') }}
         </router-link>
       </template>
@@ -18,7 +18,7 @@
 
     <div class="text-center">
       <div class="title mb-4">
-        This is admin
+        This index
       </div>
 
     </div>
@@ -32,7 +32,7 @@ export default {
   layout: 'basic',
 
   metaInfo () {
-    return { title: this.$t('home') }
+    // return { title: this.$t('admin.home') }
   },
 
   data: () => ({
@@ -51,8 +51,3 @@ export default {
   right: 10px;
   top: 18px;
 }
-
-.title {
-  font-size: 85px;
-}
-</style>
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index b7e4448c..a0154ea0 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -11,6 +11,8 @@ const Settings = () => import('~/pages/settings/index').then(m => m.default || m
 const SettingsProfile = () => import('~/pages/settings/profile').then(m => m.default || m)
 const SettingsPassword = () => import('~/pages/settings/password').then(m => m.default || m)
 
+// const Admin = () => import('~/pages/admin/adminhome').then(m => m.default || m)
+const Admin = () => import('~/pages/admin/index').then(m => m.default || m)
 const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
 
 export default [
@@ -31,7 +33,13 @@ export default [
       { path: 'password', name: 'settings.password', component: SettingsPassword }
     ] },
 
-  { path: '/admin', name: 'admin.home', component: AdminHome },
+  { path: '/admin',
+    component: Admin,
+    children: [
+      { path: '', redirect: { name: 'admin.index' } },
+      { path: 'index', name: 'admin.index', component: Admin },
+      { path: 'home', name: 'admin.home', component: AdminHome }
+    ] },
 
   { path: '*', component: NotFound }
 ]