From ff6a4e34b59aeeb4fd4c32dabe32d342cd938e71 Mon Sep 17 00:00:00 2001
From: geoffrey45 <geoffreymungai45@gmail.com>
Date: Mon, 27 Dec 2021 23:12:00 +0300
Subject: [PATCH] add album header info

---
 server/app/api.py                      |  21 +++++
 src/App.vue                            |   2 +-
 src/components/AlbumView/Header.vue    | 104 ++++++++++++++++---------
 src/components/FolderView/SongList.vue |   6 +-
 src/composables/getAlbum.js            |  16 ++++
 src/composables/getFiles.js            |  12 +--
 src/router/index.js                    |   2 +-
 src/views/AlbumView.vue                |  28 ++++++-
 src/views/FolderView.vue               |  13 +---
 9 files changed, 141 insertions(+), 63 deletions(-)
 create mode 100644 src/composables/getAlbum.js

diff --git a/server/app/api.py b/server/app/api.py
index c23268b0..d0b5eeec 100644
--- a/server/app/api.py
+++ b/server/app/api.py
@@ -350,3 +350,24 @@ def getAlbums():
             albums.append(al_obj)
 
     return {'albums': albums}
+
+@bp.route('/albums/<album>')
+def getAlbumSongs(album: str):
+    album = urllib.parse.unquote(album)
+    songs = all_songs_instance.find_songs_by_album(album)
+    songs_array = convert_to_json(songs)
+
+    for song in songs_array:
+        song['artists'] = song['artists'].split(', ')
+        song['filepath'] = song['filepath'].replace(home_dir, '')
+        song['image'] = img_path + song['image']
+
+    album_obj = {
+        "name": album,
+        "count": len(songs_array),
+        "duration": sum(song['length'] for song in songs_array),
+        "image": songs_array[0]['image'],
+        "artist": songs_array[0]['album_artist']
+        # "date": songs_array[0]['date']
+    }
+    return {'songs': songs_array, 'info': album_obj}
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index ada03e3c..d454070f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,7 +53,7 @@ export default {
   },
 
   setup() {
-    const collapsed = ref(false);
+    const collapsed = ref(true);
 
     perks.readQueue();
 
diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue
index 42f3829d..27293d6a 100644
--- a/src/components/AlbumView/Header.vue
+++ b/src/components/AlbumView/Header.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="a-header rounded">
-    <div class="art rounded"></div>
+    <div id="header-blur"></div>
+    <div
+      class="art rounded"
+      :style="{
+        backgroundImage: `url(&quot;${album_info.image}&quot;)`,
+      }"
+    ></div>
     <div class="info">
       <div class="top">
-        <div class="title">{{ album.title }}</div>
-        <div class="artist">{{ album.artist }}</div>
+        <div class="title">{{ album_info.name }}</div>
+        <div class="artist">{{ album_info.artist }}</div>
       </div>
       <div class="separator"></div>
       <div class="bottom">
         <div class="stats">
-          {{ album.count }} Tracks • {{ album.duration }} • {{ album.date }}
+          {{ album_info.count }} Tracks • {{ album_info.duration }} • 2021
         </div>
         <div class="play rounded">
           <div class="icon"></div>
@@ -17,57 +23,79 @@
         </div>
       </div>
     </div>
+    <div class="most-played">
+      <div class="image rounded"></div>
+      <div>
+        <div class="title">Girl Of My Dreams</div>
+        <div class="artist">Juice Wrld, Suga [BTS]</div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import { ref } from "@vue/reactivity";
-
 export default {
-  setup() {
-    const album = ref({
-      title: "Fighting Demons",
-      artist: "Juice Wrld",
-      count: 17,
-      duration: "54 min",
-      date: 2021,
-    });
-
-    return {
-      album,
-    };
-  },
+  props: ["album_info"],
+  setup() {},
 };
 </script>
 
 <style lang="scss">
-.a-header {
-  height: 14rem;
-  background: rgb(0, 0, 0);
-  background: #355c7d; /* fallback for old browsers */
-  background: -webkit-linear-gradient(
-    to right,
-    #c06c84,
-    #6c5b7b,
-    #355c7d
-  ); /* Chrome 10-25, Safari 5.1-6 */
-  background: linear-gradient(
-    to right,
-    #c06c84,
-    #6c5b7b,
-    #355c7d
-  ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+#header-blur {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  z-index: -1;
+  left: 0;
+  backdrop-filter: blur(20px);
+}
 
-  background-position: 50% 10%;
+.a-header {
+  position: relative;
+  height: 14rem;
+  background: #232526;
+  background: -webkit-linear-gradient(to right, #414345, #232526);
+  background: linear-gradient(to right, #050107, #00090e);
+
+  backdrop-filter: blur(0px);
+  overflow: hidden;
 
   display: flex;
   align-items: center;
   padding: 0 1rem 0 1rem;
 
+  .most-played {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    padding: 0 0 0 $small;
+    background-color: rgb(24, 24, 24);
+    border-radius: 1rem;
+    right: 1rem;
+    width: 25rem;
+    height: 5rem;
+
+    .image {
+      width: 4rem;
+      height: 4rem;
+      background-image: url(../../assets/images/jw.jpeg);
+    }
+
+    .title {
+      margin-left: $small;
+      margin-bottom: $small;
+    }
+
+    .artist {
+      font-size: small;
+      margin-left: $small;
+    }
+  }
+
   .art {
     width: 12rem;
     height: 12rem;
-    background: no-repeat center/cover url(../../assets/images/jw.jpeg);
+    background: no-repeat center/cover url(../../assets/images/null.webp);
     margin-right: 1rem;
   }
 
@@ -104,7 +132,7 @@ export default {
         width: 6rem;
         display: flex;
         align-items: center;
-        background: rgb(33, 145, 61);
+        background: $blue;
         padding: $small;
         margin: $small 0;
 
diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue
index 86907743..a2fe5797 100644
--- a/src/components/FolderView/SongList.vue
+++ b/src/components/FolderView/SongList.vue
@@ -39,7 +39,11 @@
               </div>
             </td>
             <td :style="{ width: songTitleWidth + 'px' }">
-              <div class="ellip">{{ song.album }}</div>
+              <router-link
+                class="ellip"
+                :to="{ name: 'AlbumView', params: { album: song.album } }"
+                >{{ song.album }}</router-link
+              >
             </td>
             <td
               :style="{ width: songTitleWidth + 'px' }"
diff --git a/src/composables/getAlbum.js b/src/composables/getAlbum.js
new file mode 100644
index 00000000..be3de2d9
--- /dev/null
+++ b/src/composables/getAlbum.js
@@ -0,0 +1,16 @@
+let base_uri = "http://127.0.0.1:9876";
+
+const getAlbum = async (name) => {
+  const res = await fetch(base_uri + "/albums/" + name);
+
+  if (!res.ok) {
+    const message = `An error has occured: ${res.status}`;
+    throw new Error(message);
+  }
+
+  const data = await res.json();
+
+  return data;
+};
+
+export default getAlbum;
diff --git a/src/composables/getFiles.js b/src/composables/getFiles.js
index aa0a6006..f31f595b 100644
--- a/src/composables/getFiles.js
+++ b/src/composables/getFiles.js
@@ -1,14 +1,10 @@
-import { ref } from "@vue/reactivity";
-
-let folders_uri = "http://127.0.0.1:9876";
+let base_uri = "http://127.0.0.1:9876";
 
 const getData = async (path) => {
   let url;
-  const songs = ref(null);
-  const folders = ref(null);
 
   const encoded_path = encodeURIComponent(path.replaceAll("/", "|"));
-  url = url = `${folders_uri}/f/${encoded_path}`;
+  url = url = `${base_uri}/f/${encoded_path}`;
 
   const res = await fetch(url);
 
@@ -19,8 +15,8 @@ const getData = async (path) => {
 
   const data = await res.json();
 
-  songs.value = data.files;
-  folders.value = data.folders;
+  const songs = data.files;
+  const folders = data.folders;
 
   return { songs, folders };
 };
diff --git a/src/router/index.js b/src/router/index.js
index 1b9f6eaf..832d60a7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,7 @@ const routes = [
     component: AlbumsExplorer,
   },
   {
-    path: "/albums/:id",
+    path: "/albums/:album",
     name: "AlbumView",
     component: AlbumView,
   },
diff --git a/src/views/AlbumView.vue b/src/views/AlbumView.vue
index 1485489b..f2147a38 100644
--- a/src/views/AlbumView.vue
+++ b/src/views/AlbumView.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="al-view rounded">
     <div class="header">
-      <Header />
+      <Header :album_info="album_info"/>
     </div>
     <div class="separator" id="av-sep"></div>
     <div>
-      <SongList />
+      <SongList :album_songs="album_songs"/>
     </div>
     <div class="separator" id="av-sep"></div>
     <FeaturedArtists />
@@ -17,7 +17,8 @@
 </template>
 
 <script>
-// import { useRoute } from 'vue-router'
+import { useRoute } from "vue-router";
+import { onMounted, ref } from "@vue/runtime-core";
 
 import Header from "../components/AlbumView/Header.vue";
 import AlbumBio from "../components/AlbumView/AlbumBio.vue";
@@ -26,6 +27,8 @@ import FromTheSameArtist from "../components/AlbumView/FromTheSameArtist.vue";
 import SongList from "../components/PlaylistView/SongList.vue";
 import FeaturedArtists from "../components/PlaylistView/FeaturedArtists.vue";
 
+import getAlbum from "../composables/getAlbum.js";
+
 export default {
   components: {
     Header,
@@ -34,7 +37,24 @@ export default {
     SongList,
     FeaturedArtists,
   },
-  setup() {},
+  setup() {
+    const route = useRoute();
+    const album_name = route.params.album;
+    const album_songs = ref([]);
+    const album_info = ref({});
+
+    onMounted(() => {
+      getAlbum(album_name).then((data) => {
+        album_songs.value = data.songs;
+        album_info.value = data.info;
+      });
+    });
+
+    return {
+      album_songs,
+      album_info,
+    };
+  },
 };
 </script>
 
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index fadac573..310cb5cc 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -33,8 +33,6 @@ export default {
 
     const songs = ref([]);
     const folders = ref([]);
-    const last_page = ref([]);
-    const last_song_id = ref(null);
 
     const scrollable = ref(null);
     const loading = ref(false);
@@ -45,14 +43,9 @@ export default {
         getData(path, last_id).then((data) => {
           scrollable.value.scrollTop = 0;
 
-          songs.value = data.songs.value;
-          last_page.value = songs.value;
-
-          if (songs.value.length) {
-            last_song_id.value = songs.value.slice(-1)[0]._id.$oid;
-          }
-
-          folders.value = data.folders.value;
+          songs.value = data.songs;
+          folders.value = data.folders;
+          
           loading.value = false;
         });
       };