Fix redirection from search page

Moosync · Dec 18, 2024 · 47e14a4 · 47e14a4
1 parent c9014c8
commit 47e14a4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -36,7 +36,7 @@
     "withGlobalTauri": true
   },
   "build": {
-    "beforeDevCommand": "trunk serve --config ../Trunk.toml",
+    "beforeDevCommand": "trunk serve",
     "beforeBuildCommand": "pwd && trunk build --release",
     "devUrl": "http://localhost:1420",
     "frontendDist": "../dist"

diff --git a/src/app.rs b/src/app.rs
@@ -4,6 +4,7 @@ use crate::{
     components::{
         better_animated_outlet::AnimatedOutletSimultaneous, prefs::static_components::SettingRoutes,
     },
+    console_info,
     pages::explore::Explore,
     players::librespot::LibrespotPlayer,
     store::ui_store::UiStore,
@@ -50,6 +51,7 @@ use crate::{
 #[tracing::instrument(level = "trace", skip())]
 #[component]
 pub fn RedirectAll() -> impl IntoView {
+    tracing::info!("Current location {:?}", window().location().href());
     view! { <Redirect path="/main/allsongs" /> }
 }
 

diff --git a/src/components/cardview.rs b/src/components/cardview.rs
@@ -101,6 +101,7 @@ pub fn CardView<T, S, C>(
     #[prop()] card_item: C,
     #[prop(optional, default = false)] songs_view: bool,
     #[prop(optional)] on_click: Option<Box<dyn Fn(T)>>,
+    #[prop(optional, default = "")] redirect_root: &'static str,
 ) -> impl IntoView
 where
     T: 'static + Clone,
@@ -140,7 +141,11 @@ where
                     }
                 } else {
                     view! {
-                        <A href=format!("single?id={}", card_item_data.id.clone())>
+                        <A href=format!(
+                            "{}/single?id={}",
+                            redirect_root,
+                            card_item_data.id.clone(),
+                        )>
                             <CardItem
                                 on:contextmenu=move |ev| {
                                     if let Some(cb) = &card_item_data1.context_menu {

diff --git a/src/main.rs b/src/main.rs
@@ -30,6 +30,7 @@ fn main() {
         .pretty()
         .with_target(true)
         .without_time()
+        .with_ansi(false)
         .with_writer(MakeConsoleWriter::default());
 
     let layer = fmt::layer()

diff --git a/src/pages/search.rs b/src/pages/search.rs
@@ -307,6 +307,7 @@ pub fn Search() -> impl IntoView {
                                         view! {
                                             <CardView
                                                 items=create_rw_signal(res.albums.clone())
+                                                redirect_root="/main/albums"
                                                 card_item=move |(_, item)| {
                                                     SimplifiedCardItem {
                                                         title: item.album_name.clone().unwrap_or_default(),
@@ -324,6 +325,7 @@ pub fn Search() -> impl IntoView {
                                         view! {
                                             <CardView
                                                 items=create_rw_signal(res.artists.clone())
+                                                redirect_root="/main/artists"
                                                 card_item=move |(_, item)| {
                                                     SimplifiedCardItem {
                                                         title: item.artist_name.clone().unwrap_or_default(),
@@ -341,6 +343,7 @@ pub fn Search() -> impl IntoView {
                                         view! {
                                             <CardView
                                                 items=create_rw_signal(res.playlists.clone())
+                                                redirect_root="/main/playlists/"
                                                 card_item=move |(_, item)| {
                                                     SimplifiedCardItem {
                                                         title: item.playlist_name.clone(),