eta357/LibreTunes-Nix-Test
1
0
Fork 0
Code Pull Requests Actions Activity

fix search bar bugs and style search bar and results

Browse Source
This commit is contained in:
Connor Wittman 2024-12-06 19:12:08 -05:00
parent 0afdbf2ad5
commit f8a28ca75c
3 changed files with 94 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/components/search.rs
View File

@ -32,15 +32,6 @@ pub fn Search() -> impl IntoView {
spawn_local(async move { spawn_local(async move {
log!("Searching for: {:?}", search_query.get_untracked()); log!("Searching for: {:?}", search_query.get_untracked());
// let results = search(search_query.get_untracked(), search_limit).await;
// match results {
// Ok((albums, artists, songs)) => {
// search_results.set((albums, artists, songs));
// }
// Err(err) => {
// log!("Error searching: {:?}", err);
// }
// }
let albums = search_albums(search_query.get_untracked(), search_limit).await; let albums = search_albums(search_query.get_untracked(), search_limit).await;
let artists = search_artists(search_query.get_untracked(), search_limit).await; let artists = search_artists(search_query.get_untracked(), search_limit).await;
let songs = search_songs(search_query.get_untracked(), search_limit).await; let songs = search_songs(search_query.get_untracked(), search_limit).await;
@ -98,8 +89,9 @@ pub fn Search() -> impl IntoView {
<input type="search" placeholder="Search" on:input=on_input on:blur=on_disabled on:focus=on_enabled/> <input type="search" placeholder="Search" on:input=on_input on:blur=on_disabled on:focus=on_enabled/>
</div> </div>
<div class="search-results"> <div class="search-results">
// Display 3 columns of search results: songs, albums, and artists
<ul class="search-result-list"> <ul class="search-result-list">
{song_search_results.with(|songs| -> Vec<leptos::HtmlElement<Li>> { {move || song_search_results.with(|songs| -> Vec<leptos::HtmlElement<Li>> {
let mut song_list = Vec::new(); let mut song_list = Vec::new();
log!("Songs: {:?}", songs); log!("Songs: {:?}", songs);
for (song, _) in songs { for (song, _) in songs {
@ -122,12 +114,11 @@ pub fn Search() -> impl IntoView {
</li> </li>
}); });
} }
song_list song_list
})} })}
</ul> </ul>
<ul class="search-result-list"> <ul class="search-result-list">
{album_search_results.with(|albums| -> Vec<leptos::HtmlElement<Li>> { {move || album_search_results.with(|albums| -> Vec<leptos::HtmlElement<Li>> {
let mut album_list = Vec::new(); let mut album_list = Vec::new();
log!("Albums: {:?}", albums); log!("Albums: {:?}", albums);
for (album, _) in albums { for (album, _) in albums {
@ -153,12 +144,11 @@ pub fn Search() -> impl IntoView {
</li> </li>
}); });
} }
album_list album_list
})} })}
</ul> </ul>
<ul class="search-result-list"> <ul class="search-result-list">
{artist_search_results.with(|artists| -> Vec<leptos::HtmlElement<Li>> { {move || artist_search_results.with(|artists| -> Vec<leptos::HtmlElement<Li>> {
let mut artist_list = Vec::new(); let mut artist_list = Vec::new();
log!("Artists: {:?}", artists); log!("Artists: {:?}", artists);
for (artist, _) in artists { for (artist, _) in artists {
@ -180,104 +170,9 @@ pub fn Search() -> impl IntoView {
</li> </li>
}); });
} }
artist_list artist_list
})} })}
</ul> </ul>
/* {
move || search_results.with(|(albums, artists, songs)| -> (leptos::HtmlElement<Ul>, leptos::HtmlElement<Ul>, leptos::HtmlElement<Ul>) {
// log the search results
log!("Albums: {:?}", albums);
log!("Artists: {:?}", artists);
log!("Songs: {:?}", songs);
// We need 3 uls, one for songs, one for albums, and one for artists, each in ascending order of score (distance)
let mut song_list = Vec::new();
for (song, score) in songs {
song_list.push(view! {
<li class="search-result">
<div class="result-container">
<Song song_image_path=match song.image_path.clone() {
Some(path) => path,
None => "".to_string()
} song_title=song.title.clone() song_artist="".to_string() />
<div class="right-side-result">
<div class="search-item-type">
"(Song)"
</div>
<button class="search-result-options" on:mousedown=prevent_focus>
<Icon class="search-result-options-icon" width=OPTIONS_BTN_SIZE height=OPTIONS_BTN_SIZE icon=icondata::BsThreeDotsVertical />
</button>
</div>
</div>
</li>
});
}
let mut album_list = Vec::new();
for (album, score) in albums {
album_list.push(view! {
<li class="search-result">
<div class="result-container">
<div class="search-result-album">
{album.title.clone()}
{match album.release_date {
Some(date) => format!(" ({})", date),
None => "".to_string()
}}
</div>
<div class="right-side-result">
<div class="search-item-type">
"(Album)"
</div>
<button class="search-result-options" on:mousedown=prevent_focus>
<Icon class="search-result-options-icon" width=OPTIONS_BTN_SIZE height=OPTIONS_BTN_SIZE icon=icondata::BsThreeDotsVertical />
</button>
</div>
</div>
</li>
});
}
let mut artist_list = Vec::new();
for (artist, score) in artists {
artist_list.push(view! {
<li class="search-result">
<div class="result-container">
<div class="search-result-artist">
{artist.name.clone()}
</div>
<div class="right-side-result">
<div class="search-item-type">
"(Artist)"
</div>
<button class="search-result-options" on:mousedown=prevent_focus>
<Icon class="search-result-options-icon" width=OPTIONS_BTN_SIZE height=OPTIONS_BTN_SIZE icon=icondata::BsThreeDotsVertical />
</button>
</div>
</div>
</li>
});
}
(view! {
<ul class="search-result-list">
{song_list}
</ul>
}, view! {
<ul class="search-result-list">
{album_list}
</ul>
}, view! {
<ul class="search-result-list">
{artist_list}
</ul>
})
}) */
// }
</div> </div>
</div> </div>
} }

88
style/search.scss
View File

@ -1,4 +1,92 @@
@import "theme.scss"; @import "theme.scss";
.search-container { .search-container {
display: flex;
flex-direction: column;
gap: 1rem;
.search-bar {
input[type="search"] {
width: 100%;
padding: 0.5rem 1rem;
font-size: 1rem;
border: 1px solid $search-border;
border-radius: 4px;
transition: border-color 0.2s;
&:focus {
border-color: $accent-color;
outline: none;
}
}
}
.search-results {
display: flex;
justify-content: space-between;
gap: 1rem;
.search-result-list {
flex: 1;
list-style: none;
margin: 0;
padding: 0;
.search-result {
display: flex;
flex-direction: column;
gap: 0.5rem;
padding: 0.5rem;
border: 1px solid $search-border;
border-radius: 4px;
background-color: $search-background;
transition: box-shadow 0.2s;
margin: 0.2rem;
min-height: 6rem;
.result-container {
display: flex;
justify-content: space-between;
align-items: center;
.search-result-album,
.search-result-artist {
font-size: 1rem;
font-weight: bold;
}
.search-item-type {
font-size: 0.9rem;
color: $text-controls-color;
}
.right-side-result {
display: flex;
align-items: center;
gap: 0.5rem;
.search-result-options {
background: none;
border: none;
padding: 0;
cursor: pointer;
.search-result-options-icon {
fill: $text-controls-color;
transition: fill 0.2s;
&:hover {
fill: $controls-hover-color;
}
&:active {
fill: $controls-click-color;
}
}
}
}
}
}
}
}
} }

2
style/theme.scss
View File

@ -11,6 +11,8 @@ $play-bar-background-color: #212121;
$play-grad-start: #0a0533; $play-grad-start: #0a0533;
$play-grad-end: $accent-color; $play-grad-end: $accent-color;
$queue-background-color: $play-bar-background-color; $queue-background-color: $play-bar-background-color;
$search-background: $play-bar-background-color;
$search-border: #3f3f3f;
$auth-inputs: #796dd4; $auth-inputs: #796dd4;
$auth-containers: white; $auth-containers: white;