From 211524258a5d9cb90ccb85a90d668a0bbcc4c077 Mon Sep 17 00:00:00 2001
From: ManjaroOne666 <git@gabbaell.co.uk>
Date: Mon, 21 Jan 2019 10:56:12 +0000
Subject: [PATCH] refactored background image loading into separate component

---
 components/BackgroundImageLoader.vue | 52 ++++++++++++++++++++++++++--
 components/ContentPage.vue           | 48 +++----------------------
 pages/index.vue                      |  5 ++-
 3 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/components/BackgroundImageLoader.vue b/components/BackgroundImageLoader.vue
index 22f8674..b55d59e 100644
--- a/components/BackgroundImageLoader.vue
+++ b/components/BackgroundImageLoader.vue
@@ -1,5 +1,11 @@
 <template>
-  <div class="background-image">
+  <div class="background-image-loader">
+    <div class="background-container">
+      <div class="background background-loading"
+           :style="loadingStyle"></div>
+      <div class="background background-img"
+           :style="backgroundStyle"></div>
+    </div>
   </div>
 </template>
 
@@ -8,7 +14,22 @@ import imageLoader from '~/mixins/imageLoader.js'
 
 export default {
   mixins: [ imageLoader ],
+
   props: {
+    bgLoading: {
+      type: String,
+      required: false,
+      default: function () {
+        return 'linear-gradient(310deg, #35405d, #6174aa, #a8b3d0, #e2e5ef)'
+      }
+    },
+    img: {
+      type: String,
+      required: false,
+      default: function () {
+        return 'url(https://via.placeholder.com/1920x1080)'
+      }
+    },
   },
 
   data () {
@@ -16,6 +37,19 @@ export default {
     }
   },
 
+  computed: {
+    loadingStyle () {
+      return {
+        background: this.bgLoading
+      }
+    },
+    backgroundStyle () {
+      return {
+        backgroundImage: this.img
+      }
+    }
+  },
+
   methods: {
   }
 }
@@ -23,11 +57,23 @@ export default {
 
 <style lang="scss" scoped>
 
-.background-image {
+.background-image-loader {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.background {
   position: absolute;
   width: 100%;
   height: 100%;
-  left: 0;
   top: 0;
+  left: 0;
+}
+
+.background-img {
+  background-size: cover;
+  background-position: center center;
+  opacity: .5;
 }
 </style>
diff --git a/components/ContentPage.vue b/components/ContentPage.vue
index 44e83bf..ec31f8c 100644
--- a/components/ContentPage.vue
+++ b/components/ContentPage.vue
@@ -2,16 +2,12 @@
   <article class="content-page">
     <h1 class="page-heading">{{ heading }}</h1>
     <section class="content-container">
-      <div class="content">
+      <div v-if="$slots.default" class="content">
         <slot></slot>
       </div>
     </section>
-    <!-- TODO CHANGE THE BACKGROUND DIV TO A NAMED SLOT -->
-    <div class="background background-container">
-      <div class="background background-loading"
-           :style="loadingStyle"></div>
-      <div class="background background-img"
-           :style="backgroundStyle"></div>
+    <div v-if="$slots.background" class="background">
+      <slot name="background"></slot>
     </div>
   </article>
 </template>
@@ -19,20 +15,6 @@
 <script>
 export default {
   props: {
-    bgLoading: {
-      type: String,
-      required: false,
-      default: function () {
-        return 'linear-gradient(310deg, #35405d, #6174aa, #a8b3d0, #e2e5ef)'
-      }
-    },
-    img: {
-      type: String,
-      required: false,
-      default: function () {
-        return 'url(https://via.placeholder.com/1920x1080)'
-      }
-    },
     heading: {
       type: String,
       required: true
@@ -44,19 +26,6 @@ export default {
     }
   },
 
-  computed: {
-    loadingStyle () {
-      return {
-        background: this.bgLoading
-      }
-    },
-    backgroundStyle () {
-      return {
-        backgroundImage: this.img
-      }
-    }
-  },
-
   methods: {
   }
 
@@ -116,10 +85,6 @@ $z-index-top: 10;
   color: #fff; // TEMP
 }
 
-.background-container {
-  z-index: $z-index-bottom
-}
-
 .page-heading {
   z-index: $z-index-top;
   position: relative;
@@ -131,16 +96,11 @@ $z-index-top: 10;
 }
 
 .background {
+  z-index: $z-index-bottom;
   position: absolute;
   width: 100%;
   height: 100%;
   top: 0;
   left: 0;
 }
-
-.background-img {
-  background-size: cover;
-  background-position: center center;
-  opacity: .5;
-}
 </style>
diff --git a/pages/index.vue b/pages/index.vue
index 60c0b88..eb34f88 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,16 +1,19 @@
 <template>
   <ContentPage heading="The Index Page Heading">
+    <BackgroundImageLoader slot="background" />
   </ContentPage>
 </template>
 
 <script>
 import ContentPage from '@/components/ContentPage'
+import BackgroundImageLoader from '@/components/BackgroundImageLoader'
 
 export default {
   name: 'HomePage',
 
   components: {
-    ContentPage
+    ContentPage,
+    BackgroundImageLoader
   },
 
   data() {