From ade8edcba2288b16648ebc3cf1b3e75d001a5409 Mon Sep 17 00:00:00 2001 From: geoffrey45 Date: Fri, 19 Aug 2022 21:28:46 +0300 Subject: [PATCH] add now playing card settings + move left sidebar to separate component --- src/App.vue | 18 +- src/components/BottomBar/BottomBar.vue | 21 +-- src/components/LeftSidebar/NP/Progress.vue | 9 +- src/components/LeftSidebar/index.vue | 24 +++ src/components/RightSideBar/NowPlaying.vue | 161 ------------------ src/components/RightSideBar/SearchInput.vue | 5 - .../SettingsView/Components/Switch.vue | 10 +- src/components/SettingsView/Content.vue | 43 ----- src/components/SettingsView/Group.vue | 19 ++- src/composables/mediaNotification.ts | 35 ++-- src/interfaces/settings.ts | 5 +- src/settings/general/index.ts | 8 +- src/settings/general/now-playing.ts | 22 ++- src/stores/queue.ts | 14 +- src/stores/settings/actions.ts | 1 + src/stores/settings/index.ts | 24 +++ src/views/SettingsView.vue | 2 +- tsconfig.json | 2 +- 18 files changed, 135 insertions(+), 288 deletions(-) create mode 100644 src/components/LeftSidebar/index.vue delete mode 100644 src/components/RightSideBar/NowPlaying.vue create mode 100644 src/stores/settings/actions.ts create mode 100644 src/stores/settings/index.ts diff --git a/src/App.vue b/src/App.vue index 6952747..00b407d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,15 +3,7 @@
- +
@@ -33,20 +25,18 @@ import useModalStore from "@/stores/modal"; import useContextStore from "@/stores/context"; import handleShortcuts from "@/composables/useKeyboard"; -import Logo from "@/components/Logo.vue"; import Modal from "@/components/modal.vue"; import NavBar from "@/components/nav/NavBar.vue"; // import Tabs from "@/components/RightSideBar/Tabs.vue"; import ContextMenu from "@/components/contextMenu.vue"; import Notification from "@/components/Notification.vue"; -import Navigation from "@/components/LeftSidebar/Navigation.vue"; -import nowPlaying from "@/components/LeftSidebar/nowPlaying.vue"; + import RightSideBar from "@/components/RightSideBar/Main.vue"; import SearchInput from "@/components/RightSideBar/SearchInput.vue"; import BottomBar from "@/components/BottomBar/BottomBar.vue"; +import LeftSidebar from "./components/LeftSidebar/index.vue"; import { readLocalStorage, writeLocalStorage } from "@/utils"; -import Playlists from "./components/LeftSidebar/Playlists.vue"; const queue = useQStore(); const router = useRouter(); @@ -71,6 +61,7 @@ onStartTyping(() => { const elem = document.getElementById("globalsearch") as HTMLInputElement; elem.focus(); elem.value = ""; + document.getElementById("ginner")?.classList.add("search-focused"); }); function handleWelcomeModal() { @@ -97,7 +88,6 @@ onMounted(() => { .l-sidebar { position: relative; - .withlogo { padding: 1rem; } diff --git a/src/components/BottomBar/BottomBar.vue b/src/components/BottomBar/BottomBar.vue index a4aa3e8..1998919 100644 --- a/src/components/BottomBar/BottomBar.vue +++ b/src/components/BottomBar/BottomBar.vue @@ -1,5 +1,5 @@ @@ -40,11 +35,13 @@ import "@/assets/scss/BottomBar/BottomBar.scss"; 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"; const queue = useQStore(); +const settings = useSettingsStore(); diff --git a/src/components/RightSideBar/NowPlaying.vue b/src/components/RightSideBar/NowPlaying.vue deleted file mode 100644 index a1779b0..0000000 --- a/src/components/RightSideBar/NowPlaying.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - - diff --git a/src/components/RightSideBar/SearchInput.vue b/src/components/RightSideBar/SearchInput.vue index 328bea4..ae60ee0 100644 --- a/src/components/RightSideBar/SearchInput.vue +++ b/src/components/RightSideBar/SearchInput.vue @@ -4,15 +4,12 @@ id="ginner" tabindex="0" class="bg-black rounded" - :class="{ 'search-focused': focused }" >
@@ -24,7 +21,6 @@ diff --git a/src/components/SettingsView/Group.vue b/src/components/SettingsView/Group.vue index 83d831f..e919bda 100644 --- a/src/components/SettingsView/Group.vue +++ b/src/components/SettingsView/Group.vue @@ -9,14 +9,20 @@
{{ setting.title }}
-
+
+ +