From 7f33be84852504994f428aaacc05d07036f21e4f Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Mon, 5 Apr 2021 14:06:39 +0100
Subject: [PATCH] Moved Header from Home to App, and added check that data
 exists

---
 src/App.vue                 | 30 +++++++++++++++-------
 src/components/Item.vue     | 37 +++++++++------------------
 src/components/ItemIcon.vue |  1 -
 src/router.js               |  4 +++
 src/views/Home.vue          | 50 ++++++++++++++++++++-----------------
 5 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ff8012b1..f5a3abde 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,26 +1,38 @@
 <template>
   <div id="app">
-    <router-view/>
+    <Header :pageInfo="getPageInfo(pageInfo)" />
+    <router-view />
     <Footer />
   </div>
 </template>
 <script>
 
-// const jsyaml = require("js-yaml");
+import Header from '@/components/Header.vue';
 import Footer from '@/components/Footer.vue';
-// import defaultConfig from '../src/data/conf.yml';
+import conf from '@/data/conf.yml';
 
 export default {
   name: 'app',
   components: {
+    Header,
     Footer,
   },
-  // methods: {
-  //   getConfig: async function () {
-  //     // const defaults = jsyaml.load(defaultConfig);
-
-  //   },
-  // }
+  data: () => ({
+    pageInfo: conf.pageInfo,
+  }),
+  methods: {
+    /* Returns either page info from the config, or default values */
+    getPageInfo(pageInfo) {
+      const defaults = { title: 'Demo', description: '' };
+      if (pageInfo) {
+        return {
+          title: pageInfo.title || defaults.title,
+          description: pageInfo.description || defaults.description,
+        };
+      }
+      return defaults;
+    },
+  },
 };
 </script>
 
diff --git a/src/components/Item.vue b/src/components/Item.vue
index 525e2d45..a189c1ec 100644
--- a/src/components/Item.vue
+++ b/src/components/Item.vue
@@ -1,29 +1,16 @@
 <template>
-    <el-tooltip placement="bottom" effect="dark" :content="description" :disabled="!description">
-        <a :href="url"  :class="`item ${!icon? 'short': ''}`" v-on:click="$emit('itemClicked')"
-            tabindex="0" target="_blank" rel="noopener noreferrer">
-            <div class="tile-title" :id="`tile-${id}`">
-                <span class="text">{{ title }}</span>
-                <div class="overflow-dots">...</div>
-            </div>
-            <icon :icon="icon" :url="url" />
-            <!-- <img
-                v-if="icon"
-                :src="getAppropriateImgPath(icon, url)"
-                class="tile-icon"
-            /> -->
-            <!-- <img
-                v-else-if="iconType === 'svg' && icon"
-                :src="`/img/item-icons/tile-svgs/${icon}.svg`"
-                class="tile-svg"
-            /> -->
-            <!-- <img
-                v-else-if="fontAwesome"
-                :src="`/img/tile-svgs/${svg}.svg`"
-                class="tile-svg"
-            /> -->
-        </a>
-    </el-tooltip>
+  <el-tooltip placement="bottom" effect="dark" :content="description" :disabled="!description">
+    <a :href="url"  :class="`item ${!icon? 'short': ''}`" v-on:click="$emit('itemClicked')"
+    tabindex="0" target="_blank" rel="noopener noreferrer">
+      <!-- Item Text -->
+      <div class="tile-title" :id="`tile-${id}`">
+        <span class="text">{{ title }}</span>
+        <div class="overflow-dots">...</div>
+      </div>
+      <!-- Item Icon -->
+      <Icon :icon="icon" :url="url" />
+    </a>
+  </el-tooltip>
 </template>
 
 <script>
diff --git a/src/components/ItemIcon.vue b/src/components/ItemIcon.vue
index f0e4c2a3..2f0a375f 100644
--- a/src/components/ItemIcon.vue
+++ b/src/components/ItemIcon.vue
@@ -88,5 +88,4 @@ export default {
     width: 60px;
     filter: drop-shadow(2px 4px 6px $transparent-black) saturate(0.65);
 }
-
 </style>
diff --git a/src/router.js b/src/router.js
index b92b6a54..87bd20f0 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 import Home from './views/Home.vue';
+import conf from './data/conf.yml'; // Main site configuration
 
 Vue.use(Router);
 
@@ -10,6 +11,9 @@ const router = new Router({
       path: '/',
       name: 'home',
       component: Home,
+      props: {
+        sections: conf.sections || [],
+      },
       meta: {
         title: 'Home Page',
         metaTags: [
diff --git a/src/views/Home.vue b/src/views/Home.vue
index cb235845..ef5aa522 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="home">
-    <!-- Page title and navigation buttons -->
-    <Header :pageInfo="getPageInfo(pageInfo)" />
     <!-- Search bar, layout options and settings -->
     <FilterTile ref="filterComp"
       @user-is-searchin="searching"
@@ -10,7 +8,7 @@
       class="filter-container"
     />
     <!-- Main content, section for each group of items -->
-    <div :class="`item-group-container orientation-${layout}`">
+    <div :class="`item-group-container orientation-${layout}`" v-if="checkTheresData(sections)">
       <ItemGroup
         v-for="(section, index) in sections"
         :key="index"
@@ -21,26 +19,25 @@
          @itemClicked="finishedSearching()"
       />
     </div>
+    <div v-else class="no-data">No Data Found Yet</div>
   </div>
 </template>
 
 <script>
 
-import Header from '@/components/Header.vue';
 import FilterTile from '@/components/FilterTile.vue';
 import ItemGroup from '@/components/ItemGroup.vue';
-import conf from '../data/conf.yml'; // Main site configuration
 
 export default {
   name: 'home',
+  props: {
+    sections: Array, // Main site configuration
+  },
   components: {
-    Header,
     FilterTile,
     ItemGroup,
   },
   data: () => ({
-    pageInfo: conf.pageInfo, // Site meta data (title, description, etc)
-    sections: conf.sections, // List of sections, containing items
     searchValue: '',
     layout: '',
   }),
@@ -54,11 +51,9 @@ export default {
     },
   },
   methods: {
-    setLayoutOrientation(layout) {
-      this.layoutOrientation = layout;
-    },
-    getLayoutOrientation() {
-      return localStorage.layoutOrientation || 'default';
+    /* Returns true if there is one or more sections in the config */
+    checkTheresData(sections) {
+      return sections && sections.length >= 1;
     },
     /* Updates local data with search value, triggered from filter comp */
     searching(searchValue) {
@@ -91,16 +86,13 @@ export default {
     getDisplayData(section) {
       return !section.displayData ? {} : section.displayData;
     },
-    /* Returns either page info from the config, or default values */
-    getPageInfo(pageInfo) {
-      const defaults = { title: 'Demo', description: '' };
-      if (pageInfo) {
-        return {
-          title: pageInfo.title || defaults.title,
-          description: pageInfo.description || defaults.description,
-        };
-      }
-      return defaults;
+    /* Sets layout attribute, which is used by ItemGroup */
+    setLayoutOrientation(layout) {
+      this.layoutOrientation = layout;
+    },
+    /* Either gets user's preferred layout from session, or returns default */
+    getLayoutOrientation() {
+      return localStorage.layoutOrientation || 'default';
     },
     /* Injects font-awesome's script tag, used for item icons */
     initiateFontAwesome() {
@@ -123,6 +115,7 @@ export default {
 .home {
   background: $background;
   padding-bottom: 1px;
+  min-height: 90%;
 }
 
 /* Outside container wrapping the item groups*/
@@ -157,4 +150,15 @@ export default {
     grid-template-columns: repeat(4, 1fr);
   }
 }
+
+.no-data {
+    font-size: 2rem;
+    color: $background;
+    background: #ffffffeb;
+    width: fit-content;
+    margin: 2rem auto;
+    padding: 0.5rem 1rem;
+    border-radius: 4px;
+}
+
 </style>