From 75bb55a6a338f4ce400ba5400ea2d121d0b95c17 Mon Sep 17 00:00:00 2001
From: Kevin <kevinsebastianate@hotmail.com>
Date: Fri, 15 Nov 2019 18:14:17 +0100
Subject: [PATCH] :art: Simplify search.vue & minor changes

---
 components/CardsView.vue |  4 ++--
 components/TableView.vue |  4 ++--
 pages/_category.vue      |  7 ++++++-
 pages/search.vue         | 24 +++++++++++-------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/components/CardsView.vue b/components/CardsView.vue
index 219a327..296e512 100644
--- a/components/CardsView.vue
+++ b/components/CardsView.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .cards
-    Card(v-for='resource in category.resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+    Card(v-for='resource in resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
 </template>
 
 <script>
@@ -8,6 +8,6 @@ import Card from './Card'
 
 export default {
   components: { Card },
-  props: ['category', 'createCopyUrl', 'activeCard'],
+  props: ['resources', 'createCopyUrl', 'activeCard'],
 }
 </script>
diff --git a/components/TableView.vue b/components/TableView.vue
index 5f31724..4f4f68c 100644
--- a/components/TableView.vue
+++ b/components/TableView.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   table
-    TableRow(v-for='resource in category.resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+    TableRow(v-for='resource in resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
 </template>
 
 <script>
@@ -8,6 +8,6 @@ import TableRow from '../components/TableRow'
 
 export default {
   components: { TableRow },
-  props: ['category', 'createCopyUrl', 'activeCard'],
+  props: ['resources', 'createCopyUrl', 'activeCard'],
 }
 </script>
diff --git a/pages/_category.vue b/pages/_category.vue
index 7a70052..36bf426 100644
--- a/pages/_category.vue
+++ b/pages/_category.vue
@@ -4,7 +4,12 @@
       h1(v-if="showTitle") {{ category.title }}
     transition(name="fade-card")
       div(v-if="showCards")
-        <component :is="areCardsVisible ? 'CardsView' : 'TableView'" :category="category" :createCopyUrl="createCopyUrl" :activeCard='activeCard'></component>
+        component(
+          :is="areCardsVisible ? 'CardsView' : 'TableView'"
+          :resources="category.resources"
+          :createCopyUrl="createCopyUrl"
+          :activeCard='activeCard'
+        )
 </template>
 
 <script>
diff --git a/pages/search.vue b/pages/search.vue
index 987d9e5..79e4ea4 100644
--- a/pages/search.vue
+++ b/pages/search.vue
@@ -3,26 +3,24 @@
     transition(name="fade-title" @after-enter="afterEnter")
       h1(v-if="showTitle") Search
     transition(name="fade-card")
-      .cards(v-if="areCardsVisible && showCards")
-        template(v-if="resources.length")
-          template(v-for='resource in resources' )
-            Card(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
-        p(v-else) No results
-    transition(name="fade-card")
-      table(v-if="!areCardsVisible && showCards")
-        template(v-if="resources.length")
-          template(v-for='resource in resources' )
-            TableRow(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+      div(showCards)
+        component(
+          v-if="resources.length"
+          :is="areCardsVisible ? 'CardsView' : 'TableView'"
+          :createCopyUrl="createCopyUrl"
+          :activeCard="activeCard"
+          :resources="resources"
+        )
         p(v-else) No results
 </template>
 
 <script>
-import Card from '../components/Card'
-import TableRow from '../components/TableRow'
+import CardsView from '../components/CardsView'
+import TableView from '../components/TableView'
 import * as R from 'ramda'
 
 export default {
-  components: { Card, TableRow },
+  components: { CardsView, TableView },
   data() {
     return {
       activeCard: '',