From fde70b744f3ade37d8dd0b39e07c21205cb329b8 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 13 Jun 2018 21:50:06 +0800
Subject: [PATCH] fix login loading screen

---
 resources/assets/js/pages/auth/login.vue | 17 +++++++++++------
 resources/assets/js/pages/home.vue       |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue
index fe8b159c..054eb81f 100644
--- a/resources/assets/js/pages/auth/login.vue
+++ b/resources/assets/js/pages/auth/login.vue
@@ -80,6 +80,12 @@ export default {
 
   methods: {
     async login () {
+
+      // Submit the form.
+      const { data } = await this.form.post('/api/login')
+
+
+      // Add loading screen
       const loading = this.$loading({
         lock: true,
         text: 'Logging in',
@@ -87,25 +93,24 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       })
 
-      // Submit the form.
-      const { data } = await this.form.post('/api/login')
-
       // Save the token.
       this.$store.dispatch('auth/saveToken', {
         token: data.token,
-        remember: this.remember
+        remember: this.remember,
       })
 
       // Fetch the user.
       await this.$store.dispatch('auth/fetchUser')
 
+
+
       // Redirect home.
       if (store.getters['auth/user'].role === 'admin') {
-        loading.close()
         this.$router.push({ name: 'admin.home' })
+        loading.close()
       }
-      loading.close()
       this.$router.push({ name: 'home' })
+      loading.close()
     }
   }
 }
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 58567b36..c9e88e0d 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -16,7 +16,7 @@
     </el-row>
     <br>
     <el-row :gutter="20" type="flex" justify="center" align="middle">
-      <el-col :xs="18" :sm="18" :md="8" :lg="8" :xl="8"><div class="grid-content bg-purple" align="left"><el-input type="number" v-model="booking.amount" placeholder="Amount"/></div></el-col>
+      <el-col :xs="18" :sm="18" :md="8" :lg="8" :xl="8"><div class="grid-content bg-purple" align="left"><el-input v-model="booking.amount" placeholder="Amount"/></div></el-col>
     </el-row>
     <!-- Input-Amount-end -->
     <hr>