diff --git a/src/assets/scss/Global/app-grid.scss b/src/assets/scss/Global/app-grid.scss index abaff4cc..95b51b54 100644 --- a/src/assets/scss/Global/app-grid.scss +++ b/src/assets/scss/Global/app-grid.scss @@ -15,7 +15,7 @@ grid-area: content; margin-right: calc(0rem - ($medium + 2px)); padding-right: calc($medium); - + overflow: hidden; } @@ -67,7 +67,7 @@ } // show scrollbars on search page - .search-view { - margin-right: -1rem; - } + // .search-view { + // margin-right: -1rem; + // } } diff --git a/src/assets/scss/Global/basic.scss b/src/assets/scss/Global/basic.scss index f0fdfda0..3e0097fa 100644 --- a/src/assets/scss/Global/basic.scss +++ b/src/assets/scss/Global/basic.scss @@ -138,4 +138,4 @@ button { #tooltip[data-popper-reference-hidden] { visibility: hidden !important; pointer-events: none; -} +} \ No newline at end of file diff --git a/src/components/LeftSidebar/Navigation.vue b/src/components/LeftSidebar/Navigation.vue index 138206f0..1985f7d2 100644 --- a/src/components/LeftSidebar/Navigation.vue +++ b/src/components/LeftSidebar/Navigation.vue @@ -57,6 +57,7 @@ const menus = [ { name: "search", route_name: Routes.search, + params: { page: "top" }, icon: SearchSvg, }, { diff --git a/src/components/RightSideBar/SearchInput.vue b/src/components/RightSideBar/SearchInput.vue index 2271e892..a5692d19 100644 --- a/src/components/RightSideBar/SearchInput.vue +++ b/src/components/RightSideBar/SearchInput.vue @@ -3,47 +3,28 @@
- - @@ -54,6 +35,10 @@ import SearchSvg from "@/assets/icons/search.svg"; import useSearchStore from "@/stores/search"; import useTabStore from "@/stores/tabs"; +defineProps<{ + on_nav?: boolean; +}>(); + const search = useSearchStore(); const tabs = useTabStore(); let classList: DOMTokenList | undefined; @@ -82,7 +67,6 @@ function removeFocusedClass() { display: flex; align-items: center; gap: $small; - padding: 0 $small; border-radius: 3rem; button { @@ -91,7 +75,6 @@ function removeFocusedClass() { padding: 0; border-radius: 3rem; cursor: pointer; - margin-left: -$smaller; &:hover { transition: all 0.2s ease; diff --git a/src/components/nav/Titles/SearchTitle.vue b/src/components/nav/Titles/SearchTitle.vue index 751e5b83..0c0a9e10 100644 --- a/src/components/nav/Titles/SearchTitle.vue +++ b/src/components/nav/Titles/SearchTitle.vue @@ -1,7 +1,6 @@ @@ -11,28 +10,12 @@ import SearchInput from "@/components/RightSideBar/SearchInput.vue"; diff --git a/src/router/routes.ts b/src/router/routes.ts index c2b56c4b..d0f245ae 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -81,9 +81,9 @@ const routes = [ component: () => import("@/views/SettingsView.vue"), }, { - path: "/search", + path: "/search/:page", name: "SearchView", - component: () => import("@/views/Search.vue"), + component: () => import("@/views/search/main.vue"), }, { path: "/queue", diff --git a/src/views/search/albums.vue b/src/views/search/albums.vue new file mode 100644 index 00000000..e8fa5ef9 --- /dev/null +++ b/src/views/search/albums.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/search/artists.vue b/src/views/search/artists.vue new file mode 100644 index 00000000..9d8f798c --- /dev/null +++ b/src/views/search/artists.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/search/folders.vue b/src/views/search/folders.vue new file mode 100644 index 00000000..18741480 --- /dev/null +++ b/src/views/search/folders.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/search/main.vue b/src/views/search/main.vue new file mode 100644 index 00000000..f30ff4d0 --- /dev/null +++ b/src/views/search/main.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/views/search/tracks.vue b/src/views/search/tracks.vue new file mode 100644 index 00000000..1e528f7d --- /dev/null +++ b/src/views/search/tracks.vue @@ -0,0 +1,30 @@ + + + + +