From 79dcc61084c51d80ef72e1638d844c2a06112ac1 Mon Sep 17 00:00:00 2001
From: geoffrey45 <geoffreymungai45@gmail.com>
Date: Fri, 19 Aug 2022 22:14:23 +0300
Subject: [PATCH] rename bg-black to  bg-primary

+ rename BottomBar to NowPlayingRight
---
 src/App.vue                                          |  4 ++--
 src/assets/scss/Global/basic.scss                    |  2 +-
 src/components/AlbumView/AlbumBio.vue                |  4 ++--
 src/components/LeftSidebar/Navigation.vue            |  7 ++++---
 src/components/PlaylistView/Header.vue               | 11 ++++++-----
 .../{playlists => PlaylistsList}/NewPlaylistCard.vue |  4 ++--
 .../{playlists => PlaylistsList}/PlaylistCard.vue    |  2 +-
 src/components/RightSideBar/Home/Recommendation.vue  |  2 +-
 .../NowPlayingRight.vue}                             |  4 ++--
 src/components/RightSideBar/Queue.vue                |  2 +-
 src/components/RightSideBar/Queue/playingFrom.vue    |  2 +-
 src/components/RightSideBar/Queue/upNext.vue         |  2 +-
 src/components/RightSideBar/Search/PlaylistsGrid.vue |  2 +-
 src/components/RightSideBar/Search/TabsWrapper.vue   |  2 +-
 src/components/RightSideBar/SearchInput.vue          |  8 ++++----
 src/components/SettingsView/Group.vue                |  6 +++---
 src/components/SettingsView/Nav.vue                  |  2 +-
 src/components/modals/NewPlaylist.vue                |  5 +++--
 src/composables/enums.ts                             |  2 +-
 src/router/index.ts                                  | 12 ++++++------
 src/settings/general/now-playing.ts                  | 12 ++++++------
 src/utils/useVisibility.ts                           |  2 +-
 src/views/{Playlists.vue => PlaylistList.vue}        |  4 ++--
 src/views/SettingsView.vue                           |  5 -----
 24 files changed, 53 insertions(+), 55 deletions(-)
 rename src/components/{playlists => PlaylistsList}/NewPlaylistCard.vue (88%)
 rename src/components/{playlists => PlaylistsList}/PlaylistCard.vue (97%)
 rename src/components/{BottomBar/BottomBar.vue => RightSideBar/NowPlayingRight.vue} (96%)
 rename src/views/{Playlists.vue => PlaylistList.vue} (82%)

diff --git a/src/App.vue b/src/App.vue
index 00b407d1..7701e740 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
     <div id="acontent" class="rounded">
       <router-view />
     </div>
-    <BottomBar />
+    <NowPlayingRight />
     <SearchInput />
     <RightSideBar />
     <!-- <Tabs /> -->
@@ -33,7 +33,7 @@ import Notification from "@/components/Notification.vue";
 
 import RightSideBar from "@/components/RightSideBar/Main.vue";
 import SearchInput from "@/components/RightSideBar/SearchInput.vue";
-import BottomBar from "@/components/BottomBar/BottomBar.vue";
+import NowPlayingRight from "@/components/RightSideBar/NowPlayingRight.vue";
 import LeftSidebar from "./components/LeftSidebar/index.vue";
 
 import { readLocalStorage, writeLocalStorage } from "@/utils";
diff --git a/src/assets/scss/Global/basic.scss b/src/assets/scss/Global/basic.scss
index be62d1aa..4ab06b81 100644
--- a/src/assets/scss/Global/basic.scss
+++ b/src/assets/scss/Global/basic.scss
@@ -43,7 +43,7 @@
   display: flex;
 }
 
-.bg-black {
+.bg-primary {
   background-color: $gray4;
   box-shadow: 0 0 1rem rgba(0, 0, 0, 0.425)
 }
diff --git a/src/components/AlbumView/AlbumBio.vue b/src/components/AlbumView/AlbumBio.vue
index 46a0b86d..68637d3a 100644
--- a/src/components/AlbumView/AlbumBio.vue
+++ b/src/components/AlbumView/AlbumBio.vue
@@ -17,8 +17,8 @@
           loading="lazy"
         />
       </div>
-      <div class="bio rounded bg-black" v-html="bio" v-if="bio"></div>
-      <div class="bio rounded bg-black" v-else>No bio found</div>
+      <div class="bio rounded bg-primary" v-html="bio" v-if="bio"></div>
+      <div class="bio rounded bg-primary" v-else>No bio found</div>
     </div>
   </div>
 </template>
diff --git a/src/components/LeftSidebar/Navigation.vue b/src/components/LeftSidebar/Navigation.vue
index 8f4d031e..ad022951 100644
--- a/src/components/LeftSidebar/Navigation.vue
+++ b/src/components/LeftSidebar/Navigation.vue
@@ -3,7 +3,7 @@
     <router-link
       v-for="menu in menus"
       :key="menu.name"
-      :to="{ name: menu.route_name, params: menu.params }"
+      :to="{ name: menu.route_name, params: menu?.params }"
     >
       <div class="nav-button" id="home-button">
         <div class="in">
@@ -19,11 +19,12 @@
 import PlaylistSvg from "../../assets/icons/playlist.svg";
 import FolderSvg from "../../assets/icons/folder.svg";
 import SettingsSvg from "../../assets/icons/settings.svg";
+import { Routes } from "@/composables/enums";
 
 const menus = [
   {
     name: "playlists",
-    route_name: "Playlists",
+    route_name: Routes.playlists,
     icon: PlaylistSvg,
   },
   {
@@ -34,7 +35,7 @@ const menus = [
   },
   {
     name: "settings",
-    route_name: "SettingsView",
+    route_name: Routes.settings,
     icon: SettingsSvg,
   },
 ];
diff --git a/src/components/PlaylistView/Header.vue b/src/components/PlaylistView/Header.vue
index d3a2162f..32ff52f8 100644
--- a/src/components/PlaylistView/Header.vue
+++ b/src/components/PlaylistView/Header.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="p-header image"
+    class="p-header image rounded noscroll"
     ref="playlistheader"
     :style="[
       {
@@ -13,7 +13,10 @@
       <div class="info">
         <div class="btns">
           <PlayBtnRect :source="playSources.playlist" :store="usePStore" />
-          <Option @showDropdown="showDropdown" :src="context.src" />
+          <Option
+            @showDropdown="showDropdown"
+            :src="context?.src || undefined"
+          />
         </div>
         <div class="duration">
           <span v-if="props.info.count == 0">No Tracks</span>
@@ -60,7 +63,7 @@ const imguri = paths.images.playlist;
 const context = useContextStore();
 const modal = useModalStore();
 const nav = useNavStore();
-const playlistheader = ref(null);
+const playlistheader = ref<HTMLElement | null>(null);
 
 useVisibility(playlistheader, nav.toggleShowPlay);
 
@@ -83,7 +86,6 @@ function showDropdown(e: any) {
   grid-template-columns: 1fr;
   height: 100%;
   position: relative;
-  border-radius: 0.75rem;
   color: $white;
   background-color: transparent;
   z-index: 0;
@@ -100,7 +102,6 @@ function showDropdown(e: any) {
       transparent,
       $black 90%
     );
-    border-radius: 0.5rem;
   }
 
   .last-updated {
diff --git a/src/components/playlists/NewPlaylistCard.vue b/src/components/PlaylistsList/NewPlaylistCard.vue
similarity index 88%
rename from src/components/playlists/NewPlaylistCard.vue
rename to src/components/PlaylistsList/NewPlaylistCard.vue
index 7f6fd61e..6f7b2fca 100644
--- a/src/components/playlists/NewPlaylistCard.vue
+++ b/src/components/PlaylistsList/NewPlaylistCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="p-card new-playlist-card rounded bg-black"
+    class="p-card new-playlist-card rounded bg-primary"
     @click="Modal.showNewPlaylistModal()"
   >
     <PlusSvg />
@@ -8,8 +8,8 @@
 </template>
 
 <script setup lang="ts">
-import useModalStore from "../../stores/modal";
 import PlusSvg from "../../assets/icons/plus.svg";
+import useModalStore from "../../stores/modal";
 
 const Modal = useModalStore();
 </script>
diff --git a/src/components/playlists/PlaylistCard.vue b/src/components/PlaylistsList/PlaylistCard.vue
similarity index 97%
rename from src/components/playlists/PlaylistCard.vue
rename to src/components/PlaylistsList/PlaylistCard.vue
index 4c0c6c97..0dd46c46 100644
--- a/src/components/playlists/PlaylistCard.vue
+++ b/src/components/PlaylistsList/PlaylistCard.vue
@@ -2,7 +2,7 @@
   <router-link
     :to="{ name: 'PlaylistView', params: { pid: props.playlist.playlistid } }"
     :playlist="props.playlist"
-    class="p-card rounded bg-black"
+    class="p-card rounded bg-primary"
   >
     <div
       class="image p-image rounded shadow-sm"
diff --git a/src/components/RightSideBar/Home/Recommendation.vue b/src/components/RightSideBar/Home/Recommendation.vue
index 9aec9785..cefc0019 100644
--- a/src/components/RightSideBar/Home/Recommendation.vue
+++ b/src/components/RightSideBar/Home/Recommendation.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="r-tracks rounded bg-black">
+  <div class="r-tracks rounded bg-primary">
     <div class="heading">Similar tracks</div>
     <div class="tracks">
       <div class="song-item" v-for="song in songs" :key="song.artist">
diff --git a/src/components/BottomBar/BottomBar.vue b/src/components/RightSideBar/NowPlayingRight.vue
similarity index 96%
rename from src/components/BottomBar/BottomBar.vue
rename to src/components/RightSideBar/NowPlayingRight.vue
index 19989197..161f0667 100644
--- a/src/components/BottomBar/BottomBar.vue
+++ b/src/components/RightSideBar/NowPlayingRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="b-bar bg-black pad-medium rounded" v-if="settings.use_right_np">
+  <div class="b-bar bg-primary pad-medium rounded" v-if="settings.use_right_np">
     <div class="info">
       <img
         :src="paths.images.thumb + queue.currenttrack?.image"
@@ -32,10 +32,10 @@
 
 <script setup lang="ts">
 import "@/assets/scss/BottomBar/BottomBar.scss";
+import useSettingsStore from "@/stores/settings";
 import { formatSeconds, putCommas } from "@/utils";
 import HotKeys from "../LeftSidebar/NP/HotKeys.vue";
 import Progress from "../LeftSidebar/NP/Progress.vue";
-import useSettingsStore from "@/stores/settings";
 
 import { paths } from "@/config";
 import useQStore from "@/stores/queue";
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index 33a1a45b..aaaa6eb6 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="up-next">
     <div class="r-grid">
-      <div class="scrollable-r bg-black rounded">
+      <div class="scrollable-r bg-primary rounded">
         <QueueActions />
         <div
           class="inner"
diff --git a/src/components/RightSideBar/Queue/playingFrom.vue b/src/components/RightSideBar/Queue/playingFrom.vue
index 5abf30b9..34ce438a 100644
--- a/src/components/RightSideBar/Queue/playingFrom.vue
+++ b/src/components/RightSideBar/Queue/playingFrom.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="playing-from" class="bg-black rounded" @click="goTo">
+  <div id="playing-from" class="bg-primary rounded" @click="goTo">
     <div class="h">
       <div class="icon image" :class="from.icon"></div>
       Playing from
diff --git a/src/components/RightSideBar/Queue/upNext.vue b/src/components/RightSideBar/Queue/upNext.vue
index 0c974663..d89d69f5 100644
--- a/src/components/RightSideBar/Queue/upNext.vue
+++ b/src/components/RightSideBar/Queue/upNext.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="next-track bg-black rounded"
+    class="next-track bg-primary rounded"
     :class="{ contexton: context_on }"
     @click="playNext"
     @contextmenu.prevent="showMenu"
diff --git a/src/components/RightSideBar/Search/PlaylistsGrid.vue b/src/components/RightSideBar/Search/PlaylistsGrid.vue
index b0b222fa..bf28d34d 100644
--- a/src/components/RightSideBar/Search/PlaylistsGrid.vue
+++ b/src/components/RightSideBar/Search/PlaylistsGrid.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="albums-results bg-black">
+  <div class="albums-results bg-primary">
     <div class="grid">
       <PCard
         v-for="album in search.albums.value"
diff --git a/src/components/RightSideBar/Search/TabsWrapper.vue b/src/components/RightSideBar/Search/TabsWrapper.vue
index ed22800e..81e3ae1b 100644
--- a/src/components/RightSideBar/Search/TabsWrapper.vue
+++ b/src/components/RightSideBar/Search/TabsWrapper.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="right-tabs" class="bg-black rounded">
+  <div id="right-tabs" class="bg-primary rounded">
     <div class="tab-buttons-wrapper">
       <div id="tabheaders" class="rounded-sm noscroll">
         <div
diff --git a/src/components/RightSideBar/SearchInput.vue b/src/components/RightSideBar/SearchInput.vue
index ae60ee06..3b5c523d 100644
--- a/src/components/RightSideBar/SearchInput.vue
+++ b/src/components/RightSideBar/SearchInput.vue
@@ -3,7 +3,7 @@
     <div
       id="ginner"
       tabindex="0"
-      class="bg-black rounded"
+      class="bg-primary rounded"
     >
       <input
         id="globalsearch"
@@ -13,7 +13,7 @@
       />
       <SearchSvg />
     </div>
-    <div class="buttons rounded bg-black">
+    <div class="buttons rounded bg-primary">
       <button @click="tabs.switchToQueue"><QueueSvg /></button>
       <button @click="tabs.switchToSearch"><SearchSvg /></button>
     </div>
@@ -21,9 +21,9 @@
 </template>
 
 <script setup lang="ts">
-import useSearchStore from "../../stores/search";
-import SearchSvg from "../../assets/icons/search.svg";
 import QueueSvg from "../../assets/icons/queue.svg";
+import SearchSvg from "../../assets/icons/search.svg";
+import useSearchStore from "../../stores/search";
 import useTabStore from "../../stores/tabs";
 
 const search = useSearchStore();
diff --git a/src/components/SettingsView/Group.vue b/src/components/SettingsView/Group.vue
index e919bdae..26215373 100644
--- a/src/components/SettingsView/Group.vue
+++ b/src/components/SettingsView/Group.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="settingsgroup">
     <div>
-      <h4>{{ group.title }}</h4>
-      <div class="desc">{{ group.desc }}</div>
+      <h4 v-if="group.title">{{ group.title }}</h4>
+      <div class="desc" v-if="group.desc">{{ group.desc }}</div>
     </div>
-    <div class="setting rounded bg-black pad-lg">
+    <div class="setting rounded bg-primary pad-lg">
       <div v-for="(setting, index) in group.settings" :key="index">
         <div class="title">
           {{ setting.title }}
diff --git a/src/components/SettingsView/Nav.vue b/src/components/SettingsView/Nav.vue
index 63b9b434..ec41a4f1 100644
--- a/src/components/SettingsView/Nav.vue
+++ b/src/components/SettingsView/Nav.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="settingsnav">
-    <div class="buttongroup rounded bg-black">
+    <div class="buttongroup rounded bg-primary">
       <button v-for="(group, index) in settingGroups" :key="index">
         {{ group.title }}
       </button>
diff --git a/src/components/modals/NewPlaylist.vue b/src/components/modals/NewPlaylist.vue
index 9cfa6132..f6e9e65e 100644
--- a/src/components/modals/NewPlaylist.vue
+++ b/src/components/modals/NewPlaylist.vue
@@ -22,6 +22,7 @@ import { createNewPlaylist } from "../../composables/fetch/playlists";
 import { Track } from "../../interfaces";
 import { Notification, NotifType } from "../../stores/notification";
 import usePlaylistStore from "@/stores/pages/playlists";
+import { Routes } from "@/composables/enums";
 
 const props = defineProps<{
   track?: Track;
@@ -47,7 +48,7 @@ emit("setTitle", "New Playlist");
  */
 function create(e: Event) {
   e.preventDefault();
-  const name = (e.target as HTMLFormElement).elements["name"].value;
+  const name = (e.target as any).elements["name"].value;
 
   if (name.trim()) {
     createNewPlaylist(name, props.track).then(({ success, playlist }) => {
@@ -55,7 +56,7 @@ function create(e: Event) {
 
       if (!success) return;
 
-      if (route.name !== "Playlists") return;
+      if (route.name !== Routes.playlists) return;
 
       setTimeout(() => {
         playlistStore.addPlaylist(playlist);
diff --git a/src/composables/enums.ts b/src/composables/enums.ts
index bb846800..d1ac0403 100644
--- a/src/composables/enums.ts
+++ b/src/composables/enums.ts
@@ -28,7 +28,7 @@ export enum ContextSrc {
 export enum Routes {
   home = "Home",
   folder = "FolderView",
-  playlists = "Playlists",
+  playlists = "PlaylistList",
   playlist = "PlaylistView",
   albums = "AlbumsView",
   album = "AlbumView",
diff --git a/src/router/index.ts b/src/router/index.ts
index 92b68a89..72ec71c7 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -8,7 +8,7 @@ import AlbumView from "@/views/album/index.vue";
 import ArtistsExplorer from "@/views/ArtistsExplorer.vue";
 import FolderView from "@/views/FolderView.vue";
 import Home from "@/views/Home.vue";
-import Playlists from "@/views/Playlists.vue";
+import PlaylistList from "@/views/PlaylistList.vue";
 import PlaylistView from "@/views/playlist/index.vue";
 import SettingsView from "@/views/SettingsView.vue";
 import { createRouter, createWebHashHistory } from "vue-router";
@@ -24,7 +24,7 @@ const routes = [
     path: "/folder/:path",
     name: "FolderView",
     component: FolderView,
-    beforeEnter: async (to) => {
+    beforeEnter: async (to: any) => {
       state.loading.value = true;
       await useFStore()
         .fetchAll(to.params.path)
@@ -39,8 +39,8 @@ const routes = [
   },
   {
     path: "/playlists",
-    name: "Playlists",
-    component: Playlists,
+    name: "PlaylistList",
+    component: PlaylistList,
     beforeEnter: async () => {
       state.loading.value = true;
       await usePStore()
@@ -54,7 +54,7 @@ const routes = [
     path: "/playlist/:pid",
     name: "PlaylistView",
     component: PlaylistView,
-    beforeEnter: async (to) => {
+    beforeEnter: async (to: any) => {
       state.loading.value = true;
       await usePTrackStore()
         .fetchAll(to.params.pid)
@@ -72,7 +72,7 @@ const routes = [
     path: "/albums/:hash",
     name: "AlbumView",
     component: AlbumView,
-    beforeEnter: async (to) => {
+    beforeEnter: async (to: any) => {
       state.loading.value = true;
       const store = useAStore();
 
diff --git a/src/settings/general/now-playing.ts b/src/settings/general/now-playing.ts
index 984aab99..ef09c6bc 100644
--- a/src/settings/general/now-playing.ts
+++ b/src/settings/general/now-playing.ts
@@ -4,16 +4,16 @@ import useSettingsStore from "@/stores/settings";
 const settings = useSettingsStore;
 
 export default [
-  {
-    title: "Use left now playing card",
-    type: SettingType.switch,
-    source: () => settings().use_side_np,
-    action: () => settings().toggleUseSideNP(),
-  },
   {
     title: "Use right bottom now playing card",
     type: SettingType.switch,
     source: () => settings().use_right_np,
     action: () => settings().toggleUseRightNP(),
   },
+  {
+    title: "Use left now playing card",
+    type: SettingType.switch,
+    source: () => settings().use_side_np,
+    action: () => settings().toggleUseSideNP(),
+  },
 ];
diff --git a/src/utils/useVisibility.ts b/src/utils/useVisibility.ts
index d625f7fa..56cd44e6 100644
--- a/src/utils/useVisibility.ts
+++ b/src/utils/useVisibility.ts
@@ -3,7 +3,7 @@ import { useIntersectionObserver } from "@vueuse/core";
 import { Ref, watch } from "vue";
 
 export default function useVisibility(
-  elem: Ref<HTMLElement>,
+  elem: Ref<HTMLElement | null>,
   callback: (state: boolean) => void
 ) {
   const visible = ref(false);
diff --git a/src/views/Playlists.vue b/src/views/PlaylistList.vue
similarity index 82%
rename from src/views/Playlists.vue
rename to src/views/PlaylistList.vue
index 737ec696..19e5d526 100644
--- a/src/views/Playlists.vue
+++ b/src/views/PlaylistList.vue
@@ -12,9 +12,9 @@
 </template>
 
 <script setup lang="ts">
-import PlaylistCard from "@/components/playlists/PlaylistCard.vue";
+import PlaylistCard from "@/components/PlaylistsList/PlaylistCard.vue";
 
-import NewPlaylistCard from "@/components/playlists/NewPlaylistCard.vue";
+import NewPlaylistCard from "@/components/PlaylistsList/NewPlaylistCard.vue";
 import usePStore from "@/stores/pages/playlists";
 const pStore = usePStore();
 </script>
diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
index f94a86c9..70c5520c 100644
--- a/src/views/SettingsView.vue
+++ b/src/views/SettingsView.vue
@@ -23,11 +23,6 @@ import Content from "../components/SettingsView/Content.vue";
 
   .scrollable {
     overflow: auto;
-    margin-top: 1rem;
-
-    @include for-desktop-down {
-      margin-top: 0;
-    }
   }
 }
 </style>