From e539e0b3883a20f244ea44c95dcd7872566233f5 Mon Sep 17 00:00:00 2001
From: jack <jack@botahead.com>
Date: Sat, 19 May 2018 12:01:26 +0800
Subject: [PATCH] fixed login and register frontend

---
 Dockerfile                                  | 2 +-
 resources/assets/js/middleware/auth.js      | 6 +++++-
 resources/assets/js/pages/auth/login.vue    | 1 +
 resources/assets/js/pages/auth/register.vue | 1 +
 resources/assets/js/pages/home.vue          | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb811351..dad9c2bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,5 @@ RUN composer install
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-CMD /usr/local/bin/wait.sh && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && composer dumpautoload && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000
diff --git a/resources/assets/js/middleware/auth.js b/resources/assets/js/middleware/auth.js
index d1bb7af7..1302a8b7 100644
--- a/resources/assets/js/middleware/auth.js
+++ b/resources/assets/js/middleware/auth.js
@@ -3,7 +3,11 @@ import store from '~/store'
 export default async (to, from, next) => {
   if (!store.getters['auth/check']) {
     next({ name: 'login' })
-  } else {
+  } 
+  else if (store.getters['auth/user'].role == "admin"){
+    next({ name : 'admin.home' })
+  }
+  else {
     next()
   }
 }
diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue
index aae968cf..e35dc708 100644
--- a/resources/assets/js/pages/auth/login.vue
+++ b/resources/assets/js/pages/auth/login.vue
@@ -55,6 +55,7 @@
 <script>
 import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
+import store from '~/store'
 
 export default {
   middleware: 'guest',
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index 27d6e340..be69fc71 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -59,6 +59,7 @@
 <script>
 import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
+import store from '~/store'
 
 export default {
   middleware: 'guest',
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 5592b76a..6f8a26a0 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -6,7 +6,7 @@
 
 <script>
 export default {
-  middleware: ['auth', 'admin'],
+  middleware: ['auth'],
 
   metaInfo () {
     return { title: this.$t('home') }