From 703b3cf2404b5ca65a9413f0c45fe1825bc689cb Mon Sep 17 00:00:00 2001
From: geoffrey45 <geoffreymungai45@gmail.com>
Date: Tue, 16 Aug 2022 09:25:40 +0300
Subject: [PATCH] fix album and artist card search results responsiveness

---
 src/assets/scss/Global/index.scss             |  2 +-
 src/assets/scss/index.scss                    |  2 +-
 src/components/FolderView/SongList.vue        |  3 -
 .../RightSideBar/Search/ArtistGrid.vue        | 30 +++++----
 src/components/RightSideBar/Search/Main.vue   |  9 +--
 src/components/shared/AlbumCard.vue           | 67 +++++--------------
 src/components/shared/ArtistCard.vue          | 18 +++--
 src/layouts/HeaderContentBottom.vue           |  4 ++
 src/views/FolderView.vue                      |  3 +-
 src/views/playlist/index.vue                  |  2 +-
 10 files changed, 56 insertions(+), 84 deletions(-)

diff --git a/src/assets/scss/Global/index.scss b/src/assets/scss/Global/index.scss
index f69b561c..b61c9d7c 100644
--- a/src/assets/scss/Global/index.scss
+++ b/src/assets/scss/Global/index.scss
@@ -15,7 +15,7 @@ body {
   color: #fff;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica,
     Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  font-family: "SF Compact Display" !important;
+  font-family: "SFCompactDisplay" !important;
   font-size: 1rem;
   image-rendering: -webkit-optimize-contrast;
   width: calc(100vw - 1rem);
diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss
index 1549b452..9a2e4604 100644
--- a/src/assets/scss/index.scss
+++ b/src/assets/scss/index.scss
@@ -9,6 +9,6 @@
 
 
 @font-face {
-    font-family: "SF Compact Display";
+    font-family: "SFCompactDisplay";
     src: url("../sf-compact.woff") format("woff");
 }
diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue
index 1563c7d3..9fe5b065 100644
--- a/src/components/FolderView/SongList.vue
+++ b/src/components/FolderView/SongList.vue
@@ -6,9 +6,6 @@
         <div class="disc-number" v-if="$route.name === Routes.folder">
           In this folder
         </div>
-        <div class="disc-number" v-if="$route.name === Routes.playlist">
-          &nbsp;
-        </div>
       </div>
       <div class="songlist">
         <SongItem
diff --git a/src/components/RightSideBar/Search/ArtistGrid.vue b/src/components/RightSideBar/Search/ArtistGrid.vue
index 534aaeef..97bc21e3 100644
--- a/src/components/RightSideBar/Search/ArtistGrid.vue
+++ b/src/components/RightSideBar/Search/ArtistGrid.vue
@@ -1,6 +1,9 @@
 <template>
-  <div class="artists-results" v-if="search.artists.value.length">
-    <div class="search-results-grid">
+  <div class="artists-results">
+    <div class="search-results-grid" v-if="album_grid == true">
+      <AlbumCard v-for="a in search.albums.value" :key="a.albumid" :album="a" />
+    </div>
+    <div class="search-results-grid" v-else>
       <ArtistCard
         v-for="artist in search.artists.value"
         :key="artist.image"
@@ -14,10 +17,17 @@
 
 <script setup lang="ts">
 import useSearchStore from "../../../stores/search";
+
+import AlbumCard from "@/components/shared/AlbumCard.vue";
 import ArtistCard from "../../shared/ArtistCard.vue";
 import LoadMore from "./LoadMore.vue";
+
 const search = useSearchStore();
 
+defineProps<{
+  album_grid?: boolean;
+}>();
+
 function loadMore() {
   search.updateLoadCounter("artists");
   search.loadArtists(search.loadCounter.artists);
@@ -25,18 +35,14 @@ function loadMore() {
 </script>
 
 <style lang="scss">
-.right-search .artists-results {
+.artists-results {
   display: grid;
   margin: 0 1rem;
+}
 
-  .xartist {
-    background-color: $gray;
-
-    .artist-image {
-      width: 7rem;
-      height: 7rem;
-      object-fit: cover;
-    }
-  }
+.search-results-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 0.75rem;
 }
 </style>
diff --git a/src/components/RightSideBar/Search/Main.vue b/src/components/RightSideBar/Search/Main.vue
index 99e85308..49fef5ac 100644
--- a/src/components/RightSideBar/Search/Main.vue
+++ b/src/components/RightSideBar/Search/Main.vue
@@ -5,7 +5,7 @@
         <TracksGrid />
       </Tab>
       <Tab name="albums">
-        <AlbumGrid />
+        <ArtistGrid :album_grid="true" />
       </Tab>
       <Tab name="artists">
         <ArtistGrid />
@@ -15,7 +15,6 @@
 </template>
 
 <script setup lang="ts">
-import AlbumGrid from "./AlbumGrid.vue";
 import ArtistGrid from "./ArtistGrid.vue";
 import Tab from "./Tab.vue";
 import TabsWrapper from "./TabsWrapper.vue";
@@ -36,11 +35,7 @@ import TracksGrid from "./TracksGrid.vue";
     font-size: 2rem;
     color: $white;
   }
-  .search-results-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 0.75rem;
-  }
+
 
   .input {
     display: flex;
diff --git a/src/components/shared/AlbumCard.vue b/src/components/shared/AlbumCard.vue
index 5fe01412..277fc7f3 100644
--- a/src/components/shared/AlbumCard.vue
+++ b/src/components/shared/AlbumCard.vue
@@ -6,17 +6,11 @@
     }"
     class="result-item"
   >
-    <div class="img">
-      <div
-        class="album-art image"
-        :style="{
-          backgroundImage: `url(&quot;${imguri + album.image}&quot;)`,
-        }"
-      ></div>
-      <div class="play shadow-lg image"></div>
+    <img class="rounded" :src="imguri + album.image" alt="" />
+    <div>
+      <h4 class="title ellip">{{ album.title }}</h4>
+      <div class="artist ellip">{{ album.artist }}</div>
     </div>
-    <div class="title ellip">{{ album.title }}</div>
-    <div class="artistsx ellipsis">{{ album.artist }}</div>
   </router-link>
 </template>
 
@@ -32,60 +26,31 @@ defineProps<{
 
 <style lang="scss">
 .result-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+  display: grid;
+  gap: $small;
   padding: $small;
-  border-radius: 0.75rem;
-  text-align: left !important;
   background-color: $gray4;
-  color: #ffffffde !important;
   transition: all 0.5s ease;
-  min-width: 8.5rem;
+  border-radius: .7rem;
 
-  .img {
-    position: relative;
+  img {
+    width: 100%;
+    height: auto;
+  }
 
-    &:hover {
-      .play {
-        visibility: visible;
-      }
-    }
-
-    .play {
-      width: 3rem;
-      height: 3rem;
-      background-color: $gray;
-      border-radius: 1rem;
-      position: absolute;
-      left: 2rem;
-      bottom: 2.5rem;
-      background-image: url("../../assets/icons/play.svg");
-      background-size: 2rem;
-      background-position: 60% 50%;
-      visibility: hidden;
-    }
-
-    .album-art {
-      height: 7.5rem;
-      width: 7.5rem;
-      border-radius: 0.5rem;
-      margin-bottom: 0.5rem;
-    }
+  h4 {
+    margin: 0;
   }
 
   .title {
-    width: 7rem;
-    margin-bottom: 0.25rem;
+    margin-bottom: $smaller;
     font-size: 0.9rem;
-    font-weight: bold;
   }
 
-  .artistsx {
-    width: 7rem;
+  .artist {
     font-size: 0.8rem;
     text-align: left;
-    color: #ffffffbd;
+    opacity: .75;
   }
 }
 </style>
diff --git a/src/components/shared/ArtistCard.vue b/src/components/shared/ArtistCard.vue
index 91cd645e..3dc3918d 100644
--- a/src/components/shared/ArtistCard.vue
+++ b/src/components/shared/ArtistCard.vue
@@ -3,7 +3,6 @@
     <img
       class="artist-image shadow-sm"
       :src="imguri + artist.image"
-      alt=""
       loading="lazy"
     />
     <div>
@@ -30,13 +29,10 @@ defineProps<{
   overflow: hidden;
   position: relative;
 
-  min-width: 8.5em;
-  height: 11em;
   border-radius: 0.75rem;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+  display: grid;
   justify-content: center;
+  padding: 1rem $small;
   cursor: pointer;
 
   .artist-image {
@@ -66,5 +62,15 @@ defineProps<{
 
 ._is_on_sidebar {
   background-color: $gray4 !important;
+
+  .artist-image {
+    width: 7rem;
+    height: 7rem;
+
+    @include for-desktop-down {
+      width: 6rem;
+      height: 6rem;
+    }
+  }
 }
 </style>
diff --git a/src/layouts/HeaderContentBottom.vue b/src/layouts/HeaderContentBottom.vue
index 793b79d4..59c169a4 100644
--- a/src/layouts/HeaderContentBottom.vue
+++ b/src/layouts/HeaderContentBottom.vue
@@ -113,6 +113,10 @@ function toggleBottom() {
 
     .ap-page-content {
       padding-bottom: 16rem;
+      
+      @include for-desktop-down {
+        min-height: calc(100vh - 38.75rem);
+      }
     }
   }
 
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index 565486aa..26068749 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -33,7 +33,7 @@ import { isSameRoute } from "@/composables/perks";
 const loader = useLoaderStore();
 const FStore = useFStore();
 
-const scrollable = ref(null);
+const scrollable = ref<any>(null);
 
 function getFolderName(route: RouteLocationNormalized) {
   const path = route.params.path as string;
@@ -47,7 +47,6 @@ onBeforeRouteUpdate((to, from) => {
   FStore.fetchAll(to.params.path as string)
 
     .then(() => {
-      console.log("fetched");
       scrollable.value.scrollTop = 0;
     })
     .then(() => {
diff --git a/src/views/playlist/index.vue b/src/views/playlist/index.vue
index e64561b4..4911bdf8 100644
--- a/src/views/playlist/index.vue
+++ b/src/views/playlist/index.vue
@@ -35,7 +35,7 @@ onMounted(() => {
   playlist.fetchArtists(route.params.pid as string);
 });
 
-onUnmounted(() => playlist.reset());
+onUnmounted(() => playlist.resetArtists());
 </script>
 
 <style lang="scss"></style>