From d2ca59eb962d532ac7de2411dd3218ceba9711a2 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 13 Jun 2018 16:09:47 +0800
Subject: [PATCH] fix loading screen on login

---
 resources/assets/js/pages/auth/login.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue
index adcbe8a0..8af30930 100644
--- a/resources/assets/js/pages/auth/login.vue
+++ b/resources/assets/js/pages/auth/login.vue
@@ -86,10 +86,6 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         });
-        setTimeout(() => {
-          loading.close();
-        }, 1500);
-
 
       // Submit the form.
       const { data } = await this.form.post('/api/login')
@@ -105,8 +101,10 @@ export default {
 
       // Redirect home.
       if(store.getters['auth/user'].role === 'admin'){
+        loading.close();
         this.$router.push({ name: 'admin.home' })
       }
+      loading.close();
       this.$router.push({ name: 'home' })
     }
   }