Redesign page search input area

+ redefine global search input colors
+ redesign settings page
+ move settings text to a strings module
+ add title and description to now playing settings

src/App.vue

@@ -6,7 +6,6 @@
   <section
     id="app-grid"
     :class="{
-      showAltNP: settings.use_sidebar && settings.use_alt_np,
       noSidebar: !settings.use_sidebar || !xl,
       extendWidth: settings.extend_width && settings.extend_width_enabled,
       addBorderRight: xxl && !settings.extend_width,
@@ -51,7 +50,6 @@ import Notification from "@/components/Notification.vue";
 import NavBar from "@/components/nav/NavBar.vue";
 import LeftSidebar from "./components/LeftSidebar/index.vue";
 import RightSideBar from "@/components/RightSideBar/Main.vue";
-import SearchInput from "@/components/RightSideBar/SearchInput.vue";
 import NowPlayingRight from "@/components/RightSideBar/NowPlayingRight.vue";
 
 const queue = useQStore();

src/assets/scss/Global/app-grid.scss

@@ -9,18 +9,24 @@
 
   gap: 0 1.5rem;
   height: 100%;
+  border: solid 1px $gray3;
+  border-top: none;
+  border-bottom: none;
+  margin: 0 auto;
+  max-width: 1720px;
 }
 
 #acontent {
   grid-area: content;
   margin-right: calc(0rem - ($medium + 2px));
   padding-right: calc($medium);
-  
+
   overflow: hidden;
 }
 
 .r-sidebar {
   grid-area: r-sidebar;
+  border-left: solid 1px $gray3;
 }
 
 .topnav {
@@ -33,8 +39,9 @@
   grid-area: l-sidebar;
   display: grid;
   grid-template-rows: 1fr max-content;
-  border-top: none !important;
-  border-bottom: none !important;
+  // border-top: none !important;
+  // border-bottom: none !important;
+  border-right: solid 1px $gray3;
 }
 
 .b-bar {
@@ -44,9 +51,10 @@
 // ====== MODIFIERS =======
 
 #app-grid.extendWidth {
-  padding-right: 0;
-  border-right: none;
   max-width: 100%;
+  padding-right: 0;
+  border-left: none;
+  border-right: none;
 }
 
 #app-grid.noSidebar {
@@ -58,7 +66,7 @@
 
   #acontent {
     margin-right: 0 !important;
-    padding-right: 1rem !important;
+    padding-right: $medium !important;
   }
 
   .topnav {

src/assets/scss/Global/basic.scss

@@ -33,7 +33,7 @@
 }
 
 .circular {
-  border-radius: 50%;
+  border-radius: 10rem;
 }
 
 .flex {
@@ -82,12 +82,13 @@ button {
   }
 
   &:hover {
-    background-image: linear-gradient(70deg, $darkestblue, $darkblue);
+    background-image: linear-gradient($darkestblue, $darkblue);
   }
 }
 
+
 .btn-active {
-  background-image: linear-gradient(70deg, $darkestblue, $darkblue);
+  background-image: linear-gradient($darkestblue, $darkblue);
 }
 
 .btn-more {

src/assets/scss/Global/index.scss

@@ -36,8 +36,7 @@ body {
   #app {
     width: 100%;
     height: 100%;
-    margin: 0 auto;
-    max-width: 1720px;
+
   }
 
   a {

src/assets/scss/_variables.scss

@@ -25,7 +25,7 @@ $gray2: rgb(99, 99, 102);
 $gray3: rgb(72, 72, 74);
 $gray4: rgb(58, 58, 60);
 $gray5: rgb(44, 44, 46);
-$body: $gray;
+$body: rgba(0, 0, 0, 0.95);
 
 $red: #ff453a;
 $blue: #0a84ff;

src/assets/scss/moz.scss

@@ -14,23 +14,23 @@
     }
   }
 
-  #app-grid.isSmall,
-  #app-grid.disableSidebar {
-    #acontent {
-      margin-right: -$small;
-      padding-right: $medium;
+  // #app-grid.isSmall,
+  // #app-grid.disableSidebar {
+  //   #acontent {
+  //     margin-right: -$small;
+  //     padding-right: $medium;
 
-      .search-view {
-        margin-right: -0.8rem;
-      }
-    }
-  }
+  //     .search-view {
+  //       margin-right: -0.8rem;
+  //     }
+  //   }
+  // }
 
-  #app-grid.isSmall #page-search {
-    margin-right: $smaller;
-  }
+  // #app-grid.isSmall #page-search {
+  //   margin-right: $smaller;
+  // }
 
-  #app-grid.disableSidebar #page-search {
-    margin-right: $smaller;
-  }
+  // #app-grid.disableSidebar #page-search {
+  //   margin-right: $smaller;
+  // }
 }

src/components/LeftSidebar/index.vue

@@ -1,17 +1,17 @@
 <template>
-  <div class="l-sidebar noscroll border">
+  <div class="l-sidebar noscroll">
     <div class="withlogo">
       <Logo />
       <Navigation />
     </div>
 
-    <nowPlaying v-if="settings.show_default_np" />
+    <NPImg v-if="settings.use_np_img" />
   </div>
 </template>
 
 <script setup lang="ts">
 import Navigation from "@/components/LeftSidebar/Navigation.vue";
-import nowPlaying from "@/components/LeftSidebar/nowPlaying.vue";
+import NPImg from "@/components/LeftSidebar/nowPlayingImg.vue";
 import Logo from "@/components/Logo.vue";
 
 import useSettingsStore from "@/stores/settings";

src/components/RightSideBar/Main.vue

@@ -1,11 +1,6 @@
 <template>
-  <div
-    class="r-sidebar border"
-    :style="{
-      marginBottom: !settings.show_alt_np ? '-1rem' : '',
-    }"
-  >
-  <SearchInput />
+  <div class="r-sidebar">
+    <SearchInput />
     <div class="r-content noscroll">
       <div class="r-dash" v-if="tabs.current === tabs.tabs.home">
         <DashBoard />
@@ -25,11 +20,9 @@ import Search from "./Search/Main.vue";
 import Queue from "./Queue.vue";
 import DashBoard from "./Home/Main.vue";
 import useTabStore from "../../stores/tabs";
-import useSettingsStore from "@/stores/settings";
 import SearchInput from "./SearchInput.vue";
 
 const tabs = useTabStore();
-const settings = useSettingsStore();
 </script>
 
 <style lang="scss">
@@ -41,6 +34,7 @@ const settings = useSettingsStore();
   padding-bottom: 1rem;
   border-top: none;
   border-bottom: none;
+  margin-bottom: -1rem;
 
   .gsearch-input {
     height: 2.5rem;

src/components/RightSideBar/SearchInput.vue

@@ -1,24 +1,20 @@
 <template>
   <div class="gsearch-input">
-    <div id="ginner" tabindex="0" class="bg-primary">
+    <div id="ginner" tabindex="0" ref="inputRef">
       <button
         :title="
           tabs.current === tabs.tabs.search ? 'back to queue' : 'go to search'
         "
+        @click.prevent="handleButton"
+        :class="{ no_bg: on_nav }"
       >
-        <SearchSvg
-          v-if="on_nav || tabs.current === tabs.tabs.queue"
-          @click.prevent="!on_nav && tabs.switchToSearch()"
-        />
-        <BackSvg
-          v-else-if="tabs.current === tabs.tabs.search"
-          @click.prevent="tabs.switchToQueue"
-        />
+        <SearchSvg v-if="on_nav || tabs.current === tabs.tabs.queue" />
+        <BackSvg v-else-if="tabs.current === tabs.tabs.search" />
       </button>
       <input
         id="globalsearch"
         v-model.trim="search.query"
-        placeholder="Search your library"
+        placeholder="Start typing to search"
         type="text"
         autocomplete="off"
         @blur.prevent="removeFocusedClass"
@@ -29,30 +25,39 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from "vue";
+import { onMounted, ref } from "vue";
 import BackSvg from "@/assets/icons/arrow.svg";
 import SearchSvg from "@/assets/icons/search.svg";
 import useSearchStore from "@/stores/search";
 import useTabStore from "@/stores/tabs";
 
-defineProps<{
+const props = defineProps<{
   on_nav?: boolean;
 }>();
 
-const search = useSearchStore();
 const tabs = useTabStore();
-let classList: DOMTokenList | undefined;
-
-onMounted(() => {
-  classList = document.getElementById("ginner")?.classList;
-});
+const search = useSearchStore();
 
+// HANDLE FOCUS
+const inputRef = ref<HTMLElement>();
 function addFocusedClass() {
-  classList?.add("search-focused");
+  inputRef.value?.classList.add("search-focused");
 }
 
 function removeFocusedClass() {
-  classList?.remove("search-focused");
+  inputRef.value?.classList.remove("search-focused");
+}
+
+// @end
+
+function handleButton() {
+  if (props.on_nav) return;
+
+  if (tabs.current === tabs.tabs.search) {
+    tabs.switchToQueue();
+  } else {
+    tabs.switchToSearch();
+  }
 }
 </script>
 
@@ -68,12 +73,14 @@ function removeFocusedClass() {
     align-items: center;
     gap: $small;
     border-radius: 3rem;
+    outline: solid 1px $gray3;
 
     button {
       background: transparent;
       width: 3rem;
       padding: 0;
       border-radius: 3rem;
+      height: 100%;
       cursor: pointer;
 
       &:hover {
@@ -82,6 +89,10 @@ function removeFocusedClass() {
       }
     }
 
+    button.no_bg {
+      pointer-events: none;
+    }
+
     input {
       width: 100%;
       border: none;
@@ -94,6 +105,6 @@ function removeFocusedClass() {
   }
 }
 .search-focused {
-  outline: solid $accent;
+  outline: solid $darkblue !important;
 }
 </style>

src/components/SettingsView/Components/Switch.vue

@@ -13,7 +13,7 @@ defineProps<{
 <style lang="scss">
 .switch {
   height: 1.5rem;
-  background-color: $gray;
+  background-color: $gray3;
   width: 2.5rem;
   padding: $smaller;
   position: relative;

src/components/SettingsView/Group.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="settingsgroup">
-    <div v-if="group.name || group.desc">
-      <h4 v-if="group.name">{{ group.name }}</h4>
+    <div v-if="group.title || group.desc" class="info">
+      <h4 v-if="group.title">{{ group.title }}</h4>
       <div class="desc" v-if="group.desc">{{ group.desc }}</div>
     </div>
-    <div class="setting rounded border pad-lg">
+    <div class="setting rounded pad-lg">
       <div
         v-for="(setting, index) in group.settings"
         :key="index"
@@ -39,21 +39,26 @@ defineProps<{
   display: grid;
   gap: $small;
   margin-top: 2rem;
-
+  
   &:first-child {
     margin-top: 0;
   }
 
+  .info {
+    margin-left: $smaller;
+  }
+
   h4 {
     margin: $small auto;
   }
-
+  
   .desc {
     opacity: 0.5;
-    font-size: 0.9rem;
+    font-size: 0.8rem;
   }
 
   .setting {
+    background-color: $gray;
     display: grid;
     gap: 1rem;
 

src/components/nav/Titles/Folder.vue

@@ -25,15 +25,15 @@
           </div>
         </div>
       </div>
-      <div>
-        <Input :page="Routes.folder" />
-      </div>
+      <SearchInput :page="Routes.folder" />
+      <!-- <div>
+      </div> -->
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import Input from "@/components/shared/Input.vue";
+import SearchInput from "@/components/shared/Input.vue";
 import { Routes } from "@/composables/enums";
 import { subPath } from "@/interfaces";
 import { focusElem } from "@/utils";
@@ -55,7 +55,6 @@ onUpdated(() => {
   .folder {
     display: grid;
     grid-template-columns: 1fr max-content;
-    gap: $small;
 
     .fname-wrapper {
       width: 100%;
@@ -122,13 +121,13 @@ onUpdated(() => {
           }
         }
 
-        .inthisfolder > .text {
-          color: #fff;
-          font-weight: bold;
-          background-color: $gray;
+        // .inthisfolder > .text {
+        //   color: #fff;
+        //   font-weight: bold;
+        //   background-color: $gray;
 
-          transition: all 0.5s;
-        }
+        //   transition: all 0.5s;
+        // }
       }
     }
   }

src/components/shared/Input.vue

@@ -1,13 +1,16 @@
 <template>
   <div class="header-input-wrapper rounded-sm" :class="{ showInput: clicked }">
-    <div class="search-svg" @click="handleFocus">
-      <SearchSvg />
-    </div>
+    <button
+      class="search-btn circular"
+      :class="{ 'btn-active': clicked }"
+      @click="handleFocus"
+    >
+      <SearchSvg /> Search
+    </button>
     <input
-      type="search"
-      class="header-input rounded-sm pad-sm"
+      class="header-input pad-sm"
       :class="{ showInput: clicked }"
-      placeholder="Search here"
+      placeholder="Type to search"
       v-model.trim="query"
       id="page-search"
       ref="inputRef"
@@ -26,7 +29,7 @@ import useFolderStore from "@/stores/pages/folder";
 import { Routes } from "@/composables/enums";
 import SearchSvg from "@/assets/icons/search.svg";
 
-const clicked = ref(true);
+const clicked = ref(false);
 const [playlist, album, folder] = [
   usePStore(),
   useAlbumStore(),
@@ -82,18 +85,19 @@ if (source) {
 
 <style lang="scss">
 .header-input-wrapper {
+  &.showInput {
+    width: 21.5rem;
+  }
+
   display: flex;
   flex-direction: row-reverse;
-  width: 1.5rem;
+  width: 7rem;
+  gap: $small;
   transition: all 0.25s;
-
-  &.showInput {
-    width: 15rem;
-  }
 }
 
 .header-input {
-  background-color: $gray3;
+  background-color: transparent;
   outline: none;
   border: none;
   color: inherit;
@@ -102,9 +106,12 @@ if (source) {
   transition: all 0.25s $overshoot;
   opacity: 0;
   transform: translateY(-1rem);
-
+  border-radius: 3rem;
+  padding-left: 1rem;
+  outline: solid 1px $gray1;
+  
   &:focus {
-    outline: solid;
+    outline: solid $darkblue;
   }
 
   &.showInput {
@@ -114,16 +121,9 @@ if (source) {
   }
 }
 
-.search-svg {
-  margin-top: $smaller;
+.search-btn {
   cursor: pointer;
-  width: 2.25rem;
-  height: 2rem;
-  z-index: 100;
-
-  svg {
-    display: block;
-    margin: 0 auto;
-  }
+  padding: 0 $small;
+  padding-right: 1rem;
 }
 </style>

src/interfaces/settings.ts

@@ -20,7 +20,7 @@ export interface Setting {
 }
 
 export interface SettingGroup {
-  name?: string;
+  title?: string;
   desc?: string;
   settings: Setting[];
 }

src/layouts/HeaderAndVList.vue

@@ -3,7 +3,7 @@
   <div class="header-list-layout">
     <div
       v-bind="containerProps"
-      style="height: 100%;"
+      style="height: 100%"
       :style="{ paddingTop: !no_header ? headerHeight - 64 + 24 + 'px' : 0 }"
       @scroll="handleScroll"
     >
@@ -118,7 +118,7 @@ function handleScroll(e: Event) {
 
 <style lang="scss">
 .header-list-layout {
-  margin-right: calc(0rem - ($medium));
+  margin-right: -$medium;
   height: 100%;
 
   .scrollable {

src/settings/general/extend-width.ts

@@ -1,10 +1,11 @@
 import { Setting, SettingType } from "@/interfaces/settings";
 import useSettingsStore from "@/stores/settings";
+import { appWidthStrings } from "./../strings";
 
 const settings = useSettingsStore;
 
 const extend_to_full_width: Setting = {
-  title: "Extend app to full screen width",
+  title: appWidthStrings.settings.extend,
   type: SettingType.binary,
   source: () => settings().extend_width,
   action: () => settings().toggleExtendWidth(),

src/settings/general/index.ts

@@ -1,13 +1,21 @@
 import { SettingCategory } from "@/interfaces/settings";
+import * as strings from "../strings";
+import extendWidth from "./extend-width";
 import nowPlaying from "./now-playing";
 import sidebarSettings from "./sidebar";
-import extendWidth from "./extend-width";
+
+const npStrings = strings.nowPlayingStrings;
 
 export default {
   title: "General",
   groups: [
     {
-      settings: [...sidebarSettings, ...nowPlaying, ...extendWidth],
+      settings: [...sidebarSettings, ...extendWidth],
+    },
+    {
+      title: npStrings.title,
+      desc: npStrings.desc,
+      settings: [...nowPlaying],
     },
   ],
 } as SettingCategory;

src/settings/general/now-playing.ts

@@ -1,14 +1,14 @@
 import { Setting, SettingType } from "@/interfaces/settings";
 import useSettingsStore from "@/stores/settings";
+import { nowPlayingStrings as data } from "../strings";
 
 const settings = useSettingsStore;
 
-const use_alt_np: Setting = {
-  title: "Use alternate now playing card",
+const disable_np_img: Setting = {
+  title: data.settings.album_art,
   type: SettingType.binary,
-  source: () => settings().use_alt_np,
-  inactive: () => settings().disable_show_alt_np,
-  action: () => settings().toggleUseRightNP(),
+  source: () => settings().use_np_img,
+  action: () => settings().toggleUseNPImg(),
 };
 
-export default [use_alt_np];
+export default [disable_np_img];

src/settings/general/sidebar.ts

@@ -1,10 +1,11 @@
+import { sidebarStrings } from "./../strings";
 import { Setting, SettingType } from "@/interfaces/settings";
 import useSettingsStore from "@/stores/settings";
 
 const settings = useSettingsStore;
 
 const use_sidebar: Setting = {
-  title: "Use right sidebar",
+  title: sidebarStrings.settings.use_sidebar,
   type: SettingType.binary,
   source: () => settings().use_sidebar,
   action: () => settings().toggleDisableSidebar(),

src/settings/strings.ts

@@ -0,0 +1,30 @@
+/**
+ * Settings data strings
+ */
+interface S {
+  title?: string;
+  desc?: string;
+  settings: {
+    [key: string]: string;
+  };
+}
+
+export const nowPlayingStrings = {
+  title: "Now playing",
+  desc: "Settings related to the current song",
+  settings: {
+    album_art: "Show album art on the left sidebar",
+  },
+} as S;
+
+export const appWidthStrings = {
+  settings: {
+    extend: "Extend app to full screen width",
+  },
+} as S;
+
+export const sidebarStrings = <S>{
+  settings: {
+    use_sidebar: "Show right sidebar",
+  },
+};

src/stores/settings/index.ts

@@ -1,16 +1,15 @@
-import { xxl, xl } from "@/composables/useBreakpoints";
+import { xxl } from "@/composables/useBreakpoints";
 import { defineStore } from "pinia";
 
 export default defineStore("settings", {
   state: () => ({
-    use_alt_np: false,
+    use_np_img: false,
     use_sidebar: true,
     extend_width: false,
   }),
   actions: {
-    toggleUseRightNP() {
-      if (!this.use_sidebar) return;
-      this.use_alt_np = !this.use_alt_np;
+    toggleUseNPImg() {
+      this.use_np_img = !this.use_np_img;
     },
     toggleDisableSidebar() {
       this.use_sidebar = !this.use_sidebar;
@@ -20,18 +19,6 @@ export default defineStore("settings", {
     },
   },
   getters: {
-    show_alt_np(): boolean {
-      return xl.value && this.use_sidebar && this.use_alt_np;
-    },
-    show_default_np(): boolean {
-      return !this.show_alt_np;
-    },
-    disable_show_alt_np(): boolean {
-      return !xl.value || !this.use_sidebar;
-    },
-    hide_queue_page(): boolean {
-      return this.use_sidebar;
-    },
     extend_width_enabled(): boolean {
      return xxl.value
     },

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
+    "allowSyntheticDefaultImports": true,
     "useDefineForClassFields": true,
     "module": "ESNext",
     "moduleResolution": "Node",
@@ -17,11 +18,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.d.ts",
-    "src/**/*.vue",
-    "src/**/*.svg"
-  ],
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue", "src/**/*.svg"],
   "references": [{ "path": "./tsconfig.node.json" }]
-}
+}