From e0288bb04eee4cb8d11c554342aea8b964273c76 Mon Sep 17 00:00:00 2001
From: Thomas Amland <thomas.amland@gmail.com>
Date: Fri, 31 Jul 2020 10:52:06 +0200
Subject: [PATCH] refactor tile component

---
 src/home/Home.vue                    | 22 +++++++-------
 src/library/album/AlbumList.vue      | 26 +++++++---------
 src/library/artist/ArtistDetails.vue | 34 ++++++++++-----------
 src/library/artist/ArtistList.vue    | 22 ++++++--------
 src/library/genre/GenreList.vue      | 28 ++++++++----------
 src/shared/components/Tile.vue       | 44 ++++++++++++++++++++++++++++
 src/shared/components/Tiles.vue      | 44 +++-------------------------
 src/shared/components/index.ts       |  2 ++
 8 files changed, 109 insertions(+), 113 deletions(-)
 create mode 100644 src/shared/components/Tile.vue

diff --git a/src/home/Home.vue b/src/home/Home.vue
index 6d127db..8bfd434 100644
--- a/src/home/Home.vue
+++ b/src/home/Home.vue
@@ -4,17 +4,17 @@
     <template v-else>
       <div v-for="section in sections" :key="section.key" class="mb-4">
         <h1>{{ section.name }}</h1>
-        <Tiles :items="$data[section.key]" v-slot="{ item }" square>
-          <div class="text-truncate">
-            <router-link :to="{name: 'album', params: { id: item.id } }">
-              <strong>{{ item.name }}</strong>
-            </router-link>
-          </div>
-          <div class="text-truncate text-muted">
-            <router-link :to="{name: 'artist', params: { id: item.artistId } }">
-              {{ item.artist }}
-            </router-link>
-          </div>
+        <Tiles square>
+          <Tile v-for="item in $data[section.key]" :key="item.id"
+            :image="item.image"
+            :to="{name: 'album', params: { id: item.id } }"
+            :title="item.name">
+            <template v-slot:text>
+              <router-link :to="{name: 'artist', params: { id: item.artistId } }">
+                {{ item.artist }}
+              </router-link>
+            </template>
+          </Tile>
         </Tiles>
       </div>
     </template>
diff --git a/src/library/album/AlbumList.vue b/src/library/album/AlbumList.vue
index 95e039b..135809c 100644
--- a/src/library/album/AlbumList.vue
+++ b/src/library/album/AlbumList.vue
@@ -1,30 +1,26 @@
 <template>
   <div>
     <Spinner :data="albums" v-slot="{albums: data}">
-      <Tiles :items="albums" v-slot="{ item }" square>
-        <div class="text-truncate">
-          <router-link :to="{name: 'album', params: { id: item.id } }">
-            <strong>{{ item.name }}</strong>
-          </router-link>
-        </div>
-        <div class="text-truncate text-muted">
-          <router-link :to="{name: 'artist', params: { id: item.artistId } }">
-            {{ item.artist }}
-          </router-link>
-        </div>
+      <Tiles square>
+        <Tile v-for="item in albums" :key="item.id"
+          :image="item.image"
+          :to="{name: 'album', params: { id: item.id } }"
+          :title="item.name">
+          <template v-slot:text>
+            <router-link :to="{name: 'artist', params: { id: item.artistId } }">
+              {{ item.artist }}
+            </router-link>
+          </template>
+        </Tile>
       </Tiles>
     </Spinner>
   </div>
 </template>
 <script lang="ts">
 import Vue from "vue";
-import AlbumCard from "./AlbumCard.vue";
 import { AlbumSort } from '@/shared/api';
 
 export default Vue.extend({
-  components: {
-    AlbumCard
-  },
   props: {
     msg: String
   },
diff --git a/src/library/artist/ArtistDetails.vue b/src/library/artist/ArtistDetails.vue
index e60606c..62902df 100644
--- a/src/library/artist/ArtistDetails.vue
+++ b/src/library/artist/ArtistDetails.vue
@@ -10,33 +10,31 @@
       </div>
     </div>
     <h3 class="pt-5">Albums</h3>
-    <Tiles :items="item.albums" v-slot="{ item }" square>
-      <div class="text-truncate">
-        <router-link :to="{name: 'album', params: { id: item.id } }">
-          <strong>{{ item.name }}</strong>
-        </router-link>
-      </div>
-      <div class="text-truncate text-muted">
-        {{ item.artist }}
-      </div>
+    <Tiles square>
+      <Tile v-for="item in item.albums" :key="item.id"
+        :image="item.image"
+        :to="{name: 'album', params: { id: item.id } }"
+        :title="item.name"
+        :text="item.artist">
+      </Tile>
     </Tiles>
-
     <h3 class="pt-5">Similar artist</h3>
-    <Tiles :items="item.similarArtist" v-slot="{ item }">
-      <ArtistCard :item="item"></ArtistCard>
+    <Tiles>
+      <Tile v-for="item in item.similarArtist" :key="item.id"
+        :to="{name: 'artist', params: { id: item.id } }"
+        :title="item.name">
+        <template v-slot:text>
+          <strong>{{ item.albumCount }}</strong> albums
+        </template>
+      </Tile>
     </Tiles>
   </div>
 </template>
 <script lang="ts">
 import Vue from "vue";
-import AlbumCard from "@/library/album/AlbumCard.vue";
-import ArtistCard from "@/library/artist/ArtistCard.vue";
 
 export default Vue.extend({
-  components: {
-    AlbumCard,
-    ArtistCard,
-  },
+  components: {},
   props: {
     id: String
   },
diff --git a/src/library/artist/ArtistList.vue b/src/library/artist/ArtistList.vue
index febcb93..fd3c601 100644
--- a/src/library/artist/ArtistList.vue
+++ b/src/library/artist/ArtistList.vue
@@ -1,23 +1,19 @@
 <template>
-  <Tiles :items="items" v-slot="{ item }">
-    <div class="text-truncate">
-      <router-link :to="{name: 'artist', params: { id: item.id } }">
-        <strong>{{ item.name }}</strong>
-      </router-link>
-    </div>
-     <div class="text-truncate text-muted">
-      <strong>{{ item.albumCount }}</strong> albums
-    </div>
+  <Tiles>
+    <Tile v-for="item in items" :key="item.id"
+      :image="item.image"
+      :to="{name: 'artist', params: { id: item.id } }"
+      :title="item.name">
+      <template v-slot:text>
+        <strong>{{ item.albumCount }}</strong> albums
+      </template>
+    </Tile>
   </Tiles>
 </template>
 <script lang="ts">
   import Vue from "vue";
-  import ArtistCard from "./ArtistCard.vue";
 
   export default Vue.extend({
-    components: {
-      ArtistCard,
-    },
     data() {
       return {
         items: []
diff --git a/src/library/genre/GenreList.vue b/src/library/genre/GenreList.vue
index 76a2a40..09541d2 100644
--- a/src/library/genre/GenreList.vue
+++ b/src/library/genre/GenreList.vue
@@ -1,34 +1,30 @@
 <template>
-  <Tiles :items="items">
-    <template v-slot="{ item }">
-      <div class="text-truncate">
-        <router-link :to="{name: 'genre', params: { id: item.id } }">
-          <strong>{{ item.name }}</strong>
-        </router-link>
-      </div>
-      <div class="text-truncate text-muted">
+  <Tiles>
+    <Tile v-for="item in items" :key="item.id"
+      :image="item.image"
+      :to="{name: 'genre', params: { id: item.id } }"
+      :title="item.name">
+      <template v-slot:text>
         <strong>{{ item.albumCount }}</strong> albums ·
         <strong>{{ item.songCount }}</strong> songs
-      </div>
-    </template>
+      </template>
+    </Tile>
   </Tiles>
 </template>
 <script lang="ts">
 import Vue from "vue";
 
 export default Vue.extend({
-  components: {
-    
-  },
+  components: {},
   data() {
     return {
-      items: []
+      items: [],
     };
   },
   created() {
-    this.$api.getGenres().then(items => {
+    this.$api.getGenres().then((items) => {
       this.items = items;
     });
-  }
+  },
 });
 </script>
diff --git a/src/shared/components/Tile.vue b/src/shared/components/Tile.vue
new file mode 100644
index 0000000..02db989
--- /dev/null
+++ b/src/shared/components/Tile.vue
@@ -0,0 +1,44 @@
+<template functional>
+  <div class="tile card">
+    <div class="tile-img">
+      <img v-if="props.image" :src="props.image">
+      <Icon v-else class="tile-img-fallback text-muted" icon="music-note-beamed"/>
+    </div>
+    <div class="card-body">
+      <div class="text-truncate font-weight-bold">
+        <slot name="title">
+          <router-link :to="props.to">
+            {{ props.title }}
+          </router-link>
+        </slot>
+      </div>
+      <div class="text-truncate text-muted">
+        <slot name="text">
+          {{ props.text }}
+        </slot>
+      </div>
+    </div>
+  </div>
+</template>
+<style lang="scss">
+  .tile-img {
+    position: relative;
+    width: 100%;
+    background-color: var(--secondary);
+
+    img {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+  }
+
+  .tile-img-fallback {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 4.5rem;
+  }
+</style>
diff --git a/src/shared/components/Tiles.vue b/src/shared/components/Tiles.vue
index 7f8f079..0247ddd 100644
--- a/src/shared/components/Tiles.vue
+++ b/src/shared/components/Tiles.vue
@@ -1,18 +1,6 @@
 <template functional>
- <div class="tiles" :class="props.square ? 'tiles-sq' : 'tiles-rect'">
-    <div v-for="(item, index) in props.items" :key="item.id">
-      <div class="card">
-        <div class="tile-img bg-secondary">
-          <div class="tile-img-inner">
-            <img v-if="item.image" :src="item.image">
-            <Icon v-else class="fallback-img text-muted" icon="music-note-beamed"/>
-          </div>
-        </div>
-        <div class="card-body">
-          <slot :item="item" :index="index"></slot>
-        </div>
-      </div>
-    </div>
+  <div class="tiles" :class="props.square ? 'tiles-square' : 'tiles-rect'">
+    <slot></slot>
   </div>
 </template>
 <style lang="scss">
@@ -28,47 +16,23 @@
     }
   }
 
-  .tiles-sq {
+  .tiles-square {
     .tile-img {
       padding-bottom: 100%;
     }
   }
+
   .tiles-rect {
     .tile-img {
       padding-bottom: 70%;
     }
   }
-  .tile-img {
-    position: relative;
-    width: 100%;
-    
-    .tile-img-inner {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-
-      img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-      }
-
-      .fallback-img {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        font-size: 4.5rem;
-      }
-    }
-  }
 </style>
 <script lang="ts">
   import Vue from "vue";
 
   export default Vue.extend({
     props: {
-      items: { type: Array, required: true },
       square: { type: Boolean, default: false },
     }
   });
diff --git a/src/shared/components/index.ts b/src/shared/components/index.ts
index 2e42caf..fcc3af9 100644
--- a/src/shared/components/index.ts
+++ b/src/shared/components/index.ts
@@ -3,12 +3,14 @@ import Icon from "./Icon.vue";
 import OverflowMenu from "./OverflowMenu.vue";
 import Spinner from "./Spinner.vue";
 import Tiles from "./Tiles.vue";
+import Tile from "./Tile.vue";
 
 const components = {
   Icon,
   OverflowMenu,
   Spinner,
   Tiles,
+  Tile,
 };
 
 type Key = keyof typeof components;