From c6aa8db47f1461d9bb0c9f2e02951918bb3a93bf Mon Sep 17 00:00:00 2001
From: Cretu Eusebiu <cretu.eusebiu@gmail.com>
Date: Mon, 22 Jan 2018 22:13:13 +0200
Subject: [PATCH] Move components

---
 .../js/components/{global => }/Button.vue     |  2 +-
 .../js/components/{global => }/Card.vue       |  2 +-
 .../js/components/{global => }/Checkbox.vue   |  2 +-
 resources/assets/js/components/Loading.vue    |  2 +-
 .../{global => }/LoginWithGithub.vue          |  0
 resources/assets/js/components/index.js       | 40 +++++++------------
 resources/assets/js/pages/auth/login.vue      |  4 ++
 resources/assets/js/pages/auth/register.vue   |  4 ++
 8 files changed, 26 insertions(+), 30 deletions(-)
 rename resources/assets/js/components/{global => }/Button.vue (96%)
 rename resources/assets/js/components/{global => }/Card.vue (92%)
 rename resources/assets/js/components/{global => }/Checkbox.vue (98%)
 rename resources/assets/js/components/{global => }/LoginWithGithub.vue (100%)

diff --git a/resources/assets/js/components/global/Button.vue b/resources/assets/js/components/Button.vue
similarity index 96%
rename from resources/assets/js/components/global/Button.vue
rename to resources/assets/js/components/Button.vue
index abc03751f..a50152742 100644
--- a/resources/assets/js/components/global/Button.vue
+++ b/resources/assets/js/components/Button.vue
@@ -5,7 +5,7 @@
     'btn-lg': large,
     'btn-loading': loading
   }">
-    <slot></slot>
+    <slot/>
   </button>
 </template>
 
diff --git a/resources/assets/js/components/global/Card.vue b/resources/assets/js/components/Card.vue
similarity index 92%
rename from resources/assets/js/components/global/Card.vue
rename to resources/assets/js/components/Card.vue
index 718cfed45..67bd91ca4 100644
--- a/resources/assets/js/components/global/Card.vue
+++ b/resources/assets/js/components/Card.vue
@@ -5,7 +5,7 @@
     </div>
 
     <div class="card-body">
-      <slot></slot>
+      <slot/>
     </div>
   </div>
 </template>
diff --git a/resources/assets/js/components/global/Checkbox.vue b/resources/assets/js/components/Checkbox.vue
similarity index 98%
rename from resources/assets/js/components/global/Checkbox.vue
rename to resources/assets/js/components/Checkbox.vue
index 46a3385e8..6f42d059e 100644
--- a/resources/assets/js/components/global/Checkbox.vue
+++ b/resources/assets/js/components/Checkbox.vue
@@ -9,7 +9,7 @@
       :id="id || name || 'checkbox'"
     >
     <label class="custom-control-label" :for="id || name || 'checkbox'">
-      <slot></slot>
+      <slot/>
     </label>
   </div>
 </template>
diff --git a/resources/assets/js/components/Loading.vue b/resources/assets/js/components/Loading.vue
index f7d1ee496..829606149 100644
--- a/resources/assets/js/components/Loading.vue
+++ b/resources/assets/js/components/Loading.vue
@@ -4,7 +4,7 @@
     height: height,
     opacity: show ? 1 : 0,
     'background-color': canSuccess ? color : failedColor
-  }"></div>
+  }"/>
 </template>
 
 <script>
diff --git a/resources/assets/js/components/global/LoginWithGithub.vue b/resources/assets/js/components/LoginWithGithub.vue
similarity index 100%
rename from resources/assets/js/components/global/LoginWithGithub.vue
rename to resources/assets/js/components/LoginWithGithub.vue
diff --git a/resources/assets/js/components/index.js b/resources/assets/js/components/index.js
index c080e0b67..b056b5d51 100644
--- a/resources/assets/js/components/index.js
+++ b/resources/assets/js/components/index.js
@@ -1,29 +1,17 @@
 import Vue from 'vue'
+import Card from './Card'
+import Button from './Button'
+import Checkbox from './Checkbox'
 import { HasError, AlertError, AlertSuccess } from 'vform'
 
-Vue.component(HasError.name, HasError)
-Vue.component(AlertError.name, AlertError)
-Vue.component(AlertSuccess.name, AlertSuccess)
-
-/**
- * @param {Object} requireContext
- */
-const registerComponents = requireContext => {
-  requireContext.keys().forEach(file => {
-    let component = requireContext(file)
-
-    if (component.default) {
-      component = component.default
-    }
-
-    if (component.name !== undefined) {
-      Vue.component(component.name, component)
-    }
-  })
-}
-
-// Load global components dynamically
-registerComponents(require.context('./global', false, /.*\.(js|vue)$/))
-
-// Load layout components dynamically
-registerComponents(require.context('./layouts', false, /.*\.(js|vue)$/))
+// Components that are registered globaly.
+[
+  Card,
+  Button,
+  Checkbox,
+  HasError,
+  AlertError,
+  AlertSuccess
+].forEach(Component => {
+  Vue.component(Component.name, Component)
+})
diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue
index 1df5c25fe..bdeb20f6e 100644
--- a/resources/assets/js/pages/auth/login.vue
+++ b/resources/assets/js/pages/auth/login.vue
@@ -58,9 +58,13 @@
 
 <script>
 import Form from 'vform'
+import LoginWithGithub from '~/components/LoginWithGithub'
 
 export default {
   middleware: 'guest',
+  components: {
+    LoginWithGithub
+  },
 
   metaInfo () {
     return { title: this.$t('login') }
diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index d56181c3e..dac4fc50b 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -64,9 +64,13 @@
 
 <script>
 import Form from 'vform'
+import LoginWithGithub from '~/components/LoginWithGithub'
 
 export default {
   middleware: 'guest',
+  components: {
+    LoginWithGithub
+  },
 
   metaInfo () {
     return { title: this.$t('register') }