From 2c5afdf2c42ad8839ede878c0b317895a65abdcb Mon Sep 17 00:00:00 2001
From: geoffrey45 <geoffreymungai45@gmail.com>
Date: Sun, 28 Aug 2022 02:14:37 +0300
Subject: [PATCH] show use_alt_np as disabled if dependent setting is disabled

+ add getters to settings store
+ add use sidebar setting
---
 src/App.vue                                   |  7 ++--
 src/assets/scss/Global/app-grid.scss          |  9 +++++
 src/components/LeftSidebar/index.vue          |  2 +-
 .../RightSideBar/NowPlayingRight.vue          |  2 +-
 src/components/SettingsView/Group.vue         | 11 +++++-
 src/components/nav/NavBar.vue                 | 15 ++++----
 src/components/nav/Titles/Folder.vue          | 34 +++++++++++--------
 src/interfaces/settings.ts                    |  1 +
 src/settings/general/now-playing.ts           | 25 +++++++++-----
 src/stores/settings/index.ts                  | 19 +++++++++--
 10 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a30b6cfa..8e42f56b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,8 @@
   <div
     id="app-grid"
     :class="{
-      showAltNP: settings.use_alt_np,
+      showAltNP: settings.use_sidebar && settings.use_alt_np,
+      disableSidebar: !settings.use_sidebar,
     }"
   >
     <LeftSidebar />
@@ -14,8 +15,8 @@
       <router-view />
     </div>
     <NowPlayingRight />
-    <SearchInput />
-    <RightSideBar />
+    <SearchInput v-if="settings.use_sidebar" />
+    <RightSideBar v-if="settings.use_sidebar" />
   </div>
 </template>
 
diff --git a/src/assets/scss/Global/app-grid.scss b/src/assets/scss/Global/app-grid.scss
index 1113fc28..7513a572 100644
--- a/src/assets/scss/Global/app-grid.scss
+++ b/src/assets/scss/Global/app-grid.scss
@@ -42,6 +42,15 @@
   }
 }
 
+#app-grid.disableSidebar {
+  grid-template-columns: min-content 1fr;
+  grid-template-areas:
+    "l-sidebar nav"
+    "l-sidebar content"
+    "l-sidebar content"
+    "l-sidebar content";
+}
+
 #acontent {
   grid-area: content;
   max-width: 1955px;
diff --git a/src/components/LeftSidebar/index.vue b/src/components/LeftSidebar/index.vue
index e1169b73..c49add6a 100644
--- a/src/components/LeftSidebar/index.vue
+++ b/src/components/LeftSidebar/index.vue
@@ -5,7 +5,7 @@
       <Navigation />
     </div>
 
-    <nowPlaying v-if="!settings.use_alt_np" />
+    <nowPlaying v-if="settings.show_default_np" />
   </div>
 </template>
 
diff --git a/src/components/RightSideBar/NowPlayingRight.vue b/src/components/RightSideBar/NowPlayingRight.vue
index 4fd23c77..865b7baa 100644
--- a/src/components/RightSideBar/NowPlayingRight.vue
+++ b/src/components/RightSideBar/NowPlayingRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="b-bar bg-primary pad-medium rounded" v-if="settings.use_alt_np">
+  <div class="b-bar bg-primary pad-medium rounded" v-if="settings.show_alt_np">
     <div class="info">
       <img
         :src="paths.images.thumb + queue.currenttrack?.image"
diff --git a/src/components/SettingsView/Group.vue b/src/components/SettingsView/Group.vue
index 26215373..536bf848 100644
--- a/src/components/SettingsView/Group.vue
+++ b/src/components/SettingsView/Group.vue
@@ -5,7 +5,11 @@
       <div class="desc" v-if="group.desc">{{ group.desc }}</div>
     </div>
     <div class="setting rounded bg-primary pad-lg">
-      <div v-for="(setting, index) in group.settings" :key="index">
+      <div
+        v-for="(setting, index) in group.settings"
+        :key="index"
+        :class="{ inactive: setting.inactive && setting.inactive() }"
+      >
         <div class="title">
           {{ setting.title }}
         </div>
@@ -52,6 +56,11 @@ defineProps<{
   .setting {
     display: grid;
     gap: 1rem;
+
+    .inactive {
+      opacity: 0.5;
+      pointer-events: none;
+    }
   }
 
   .setting > * {
diff --git a/src/components/nav/NavBar.vue b/src/components/nav/NavBar.vue
index a2fea290..a53bbd5f 100644
--- a/src/components/nav/NavBar.vue
+++ b/src/components/nav/NavBar.vue
@@ -8,17 +8,14 @@
           overflow: $route.name === Routes.search ? 'visible' : 'hidden',
         }"
       >
-        <APTitle v-show="showAPTitle" />
+        <APTitle v-if="showAPTitle" />
         <SimpleTitle
-          v-show="$route.name == Routes.playlists"
+          v-if="$route.name == Routes.playlists"
           :text="'Playlists'"
         />
-        <SimpleTitle
-          v-show="$route.name == Routes.settings"
-          :text="'Settings'"
-        />
-        <Folder v-show="$route.name == Routes.folder" :subPaths="subPaths" />
-        <SearchTitle v-show="$route.name == Routes.search" />
+        <SimpleTitle v-if="$route.name == Routes.settings" :text="'Settings'" />
+        <Folder v-if="$route.name == Routes.folder" :subPaths="subPaths" />
+        <SearchTitle v-if="$route.name == Routes.search" />
       </div>
     </div>
 
@@ -89,6 +86,7 @@ watch(
   display: grid;
   grid-template-columns: 1fr min-content;
   width: 100%;
+  gap: $small;
 
   .left {
     display: grid;
@@ -97,7 +95,6 @@ watch(
 
     .info {
       margin: auto 0;
-      // overflow: hidden;
 
       .title {
         font-size: 1.5rem;
diff --git a/src/components/nav/Titles/Folder.vue b/src/components/nav/Titles/Folder.vue
index 3b46c0f6..fb4b74cb 100644
--- a/src/components/nav/Titles/Folder.vue
+++ b/src/components/nav/Titles/Folder.vue
@@ -2,18 +2,24 @@
   <div id="folder-nav-title">
     <div class="folder">
       <div class="fname">
-        <div class="icon image"></div>
+        <div
+          class="icon image"
+          @click="
+            $router.push({ name: Routes.folder, params: { path: '$home' } })
+          "
+        ></div>
         <div class="paths">
           <div
             class="path"
-            v-for="path in subPaths"
+            v-for="path in subPaths.slice(1)"
             :key="path.path"
             :class="{ inthisfolder: path.active }"
-            @click="
-              $router.push({ name: 'FolderView', params: { path: path.path } })
-            "
           >
-            <span class="text">{{ path.name }}</span>
+            <router-link
+              class="text"
+              :to="{ name: Routes.folder, params: { path: path.path } }"
+              >{{ path.name }}</router-link
+            >
           </div>
         </div>
       </div>
@@ -25,6 +31,7 @@
 import { focusElem } from "@/utils";
 import { subPath } from "@/interfaces";
 import { onUpdated } from "vue";
+import { Routes } from "@/composables/enums";
 
 defineProps<{
   subPaths: subPath[];
@@ -43,7 +50,6 @@ onUpdated(() => {
   .folder {
     display: flex;
     gap: $small;
-    width: inherit;
 
     .playbtnrect {
       height: 2.25rem;
@@ -64,7 +70,6 @@ onUpdated(() => {
       height: 2.25rem;
       display: flex;
       align-items: center;
-      width: 100%;
       overflow: auto;
       padding-right: $smaller;
 
@@ -74,7 +79,7 @@ onUpdated(() => {
         background-image: url("../../../assets/icons/folder.fill.svg");
         background-size: 1.5rem;
         margin-left: $smaller;
-        background-position: 65% 50%;
+        cursor: pointer;
       }
 
       .paths {
@@ -91,7 +96,10 @@ onUpdated(() => {
         .path {
           white-space: nowrap;
           margin: auto 0;
-          cursor: default;
+
+          a {
+            cursor: default;
+          }
 
           .text {
             padding: $smaller;
@@ -102,13 +110,11 @@ onUpdated(() => {
             content: "/";
             font-size: small;
             margin-right: $smaller;
-            opacity: .25;
+            opacity: 0.25;
           }
 
           &:first-child {
-            &::before {
-              display: none;
-            }
+            display: none;
           }
 
           &:last-child {
diff --git a/src/interfaces/settings.ts b/src/interfaces/settings.ts
index 4d45a164..ca6e4336 100644
--- a/src/interfaces/settings.ts
+++ b/src/interfaces/settings.ts
@@ -14,6 +14,7 @@ export interface Setting {
   title: string;
   type: SettingType;
   options?: SettingOption[];
+  inactive?: () => boolean;
   action: (arg0?: any) => void;
   source: () => any;
 }
diff --git a/src/settings/general/now-playing.ts b/src/settings/general/now-playing.ts
index da759660..5776ddd3 100644
--- a/src/settings/general/now-playing.ts
+++ b/src/settings/general/now-playing.ts
@@ -1,13 +1,20 @@
-import { SettingType } from "@/interfaces/settings";
+import { Setting, SettingType } from "@/interfaces/settings";
 import useSettingsStore from "@/stores/settings";
 
 const settings = useSettingsStore;
 
-export default [
-  {
-    title: "Use alternate now playing card",
-    type: SettingType.switch,
-    source: () => settings().use_alt_np,
-    action: () => settings().toggleUseRightNP(),
-  },
-];
+const use_alt_np: Setting = {
+  title: "Use alternate now playing card",
+  type: SettingType.switch,
+  source: () => settings().use_alt_np,
+  inactive: () => settings().disable_show_alt_np,
+  action: () => settings().toggleUseRightNP(),
+};
+const use_sidebar: Setting = {
+  title: "Use right sidebar",
+  type: SettingType.switch,
+  source: () => settings().use_sidebar,
+  action: () => settings().toggleDisableSidebar(),
+};
+
+export default [use_sidebar, use_alt_np];
diff --git a/src/stores/settings/index.ts b/src/stores/settings/index.ts
index 4a6f9499..0feecb5c 100644
--- a/src/stores/settings/index.ts
+++ b/src/stores/settings/index.ts
@@ -1,16 +1,29 @@
 import { defineStore } from "pinia";
-import useQueueStore from "../queue";
 
 export default defineStore("settings", {
   state: () => ({
     use_alt_np: false,
+    use_sidebar: true,
   }),
   actions: {
     toggleUseRightNP() {
+      if (!this.use_sidebar) return;
       this.use_alt_np = !this.use_alt_np;
-      useQueueStore();
+    },
+    toggleDisableSidebar() {
+      this.use_sidebar = !this.use_sidebar;
+    },
+  },
+  getters: {
+    show_alt_np(): boolean {
+      return this.use_sidebar && this.use_alt_np;
+    },
+    show_default_np(): boolean {
+      return !this.show_alt_np;
+    },
+    disable_show_alt_np(): boolean {
+      return !this.use_sidebar;
     },
   },
-  getters: {},
   persist: true,
 });