From a43955726abcdd7077374c645416c10718472b4a Mon Sep 17 00:00:00 2001 From: Carter Bertolini Date: Fri, 4 Oct 2024 17:33:51 -0400 Subject: [PATCH 01/25] Setup routing for image and audio assets based on environment variables --- src/fileserv.rs | 30 ++++++++++++++++++++++++++++++ src/main.rs | 6 ++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/fileserv.rs b/src/fileserv.rs index 4fe7a30..dbfccc6 100644 --- a/src/fileserv.rs +++ b/src/fileserv.rs @@ -12,6 +12,7 @@ cfg_if! { if #[cfg(feature = "ssr")] { use tower_http::services::ServeDir; use leptos::*; use crate::app::App; + use std::str::FromStr; pub async fn file_and_error_handler(uri: Uri, State(options): State, req: Request) -> AxumResponse { let root = options.site_root.clone(); @@ -27,6 +28,7 @@ cfg_if! { if #[cfg(feature = "ssr")] { pub async fn get_static_file(uri: Uri, root: &str) -> Result, (StatusCode, String)> { let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap(); + // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot` // This path is relative to the cargo root match ServeDir::new(root).oneshot(req).await.ok() { @@ -37,4 +39,32 @@ cfg_if! { if #[cfg(feature = "ssr")] { )), } } + + pub enum AssetType { + Audio, + Image, + } + + pub async fn get_asset_file(filename: String, asset_type: AssetType) -> Result, (StatusCode, String)> { + const DEFAULT_AUDIO_PATH: &str = "assets/audio"; + const DEFAULT_IMAGE_PATH: &str = "assets/images"; + + let root = match asset_type { + AssetType::Audio => std::env::var("LIBRETUNES_AUDIO_PATH").unwrap_or(DEFAULT_AUDIO_PATH.to_string()), + AssetType::Image => std::env::var("LIBRETUNES_IMAGE_PATH").unwrap_or(DEFAULT_IMAGE_PATH.to_string()), + }; + + // Create a Uri from the filename + // ServeDir expects a leading `/` + let uri = Uri::from_str(format!("/{}", filename).as_str()); + + match uri { + Ok(uri) => get_static_file(uri, root.as_str()).await, + Err(_) => Err(( + StatusCode::INTERNAL_SERVER_ERROR, + format!("Attempted to serve an invalid file"), + )), + } + } + }} diff --git a/src/main.rs b/src/main.rs index 6e50edf..a4efbee 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,11 +14,11 @@ extern crate diesel_migrations; #[cfg(feature = "ssr")] #[tokio::main] async fn main() { - use axum::{routing::get, Router}; + use axum::{routing::get, Router, extract::Path}; use leptos::*; use leptos_axum::{generate_route_list, LeptosRoutes}; use libretunes::app::*; - use libretunes::fileserv::{file_and_error_handler, get_static_file}; + use libretunes::fileserv::{file_and_error_handler, get_asset_file, get_static_file, AssetType}; use axum_login::tower_sessions::SessionManagerLayer; use tower_sessions_redis_store::{fred::prelude::*, RedisStore}; use axum_login::AuthManagerLayerBuilder; @@ -60,6 +60,8 @@ async fn main() { let app = Router::new() .leptos_routes(&leptos_options, routes, App) + .route("/assets/audio/:song", get(|Path(song) : Path| get_asset_file(song, AssetType::Audio))) + .route("/assets/images/:image", get(|Path(image) : Path| get_asset_file(image, AssetType::Image))) .route("/assets/*uri", get(|uri| get_static_file(uri, ""))) .layer(auth_layer) .fallback(file_and_error_handler) From 0550b18d7720755edfa75c3a1763449fb4941059 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 11 Oct 2024 13:22:57 -0400 Subject: [PATCH 02/25] Add SongList component --- src/components.rs | 1 + src/components/song_list.rs | 157 ++++++++++++++++++++++++++++++++++++ src/songdata.rs | 1 + style/main.scss | 1 + style/song_list.scss | 124 ++++++++++++++++++++++++++++ 5 files changed, 284 insertions(+) create mode 100644 src/components/song_list.rs create mode 100644 style/song_list.scss diff --git a/src/components.rs b/src/components.rs index 29ac621..893727c 100644 --- a/src/components.rs +++ b/src/components.rs @@ -5,3 +5,4 @@ pub mod personal; pub mod dashboard_tile; pub mod dashboard_row; pub mod upload; +pub mod song_list; diff --git a/src/components/song_list.rs b/src/components/song_list.rs new file mode 100644 index 0000000..2ace92a --- /dev/null +++ b/src/components/song_list.rs @@ -0,0 +1,157 @@ +use leptos::*; +use leptos_icons::*; + +use crate::songdata::SongData; +use crate::models::{Album, Artist}; + +const LIKE_DISLIKE_BTN_SIZE: &str = "2em"; + +#[component] +pub fn SongList(songs: MaybeSignal>) -> impl IntoView { + view! { + + { + songs.with(|songs| { + let mut first_song = true; + + songs.iter().map(|song| { + let playing = first_song.into(); + first_song = false; + + view! { + + } + }).collect::>() + }) + } +
+ } +} + +#[component] +pub fn SongListItem(song: SongData, song_playing: MaybeSignal) -> impl IntoView { + let liked = create_rw_signal(song.like_dislike.map(|(liked, _)| liked).unwrap_or(false)); + let disliked = create_rw_signal(song.like_dislike.map(|(_, disliked)| disliked).unwrap_or(false)); + + view! { + + +

{song.title}

+ + + + + + + {format!("{}:{:02}", song.duration / 60, song.duration % 60)} + + } +} + +/// Display the song's image, with an overlay if the song is playing +/// When the song list item is hovered, the overlay will show the play button +#[component] +fn SongImage(image_path: String, song_playing: MaybeSignal) -> impl IntoView { + view! { + + {if song_playing.get() { + view! { }.into_view() + } else { + view! { }.into_view() + }} + } +} + +/// Displays a song's artists, with links to their artist pages +#[component] +fn SongArtists(artists: Vec) -> impl IntoView { + let num_artists = artists.len() as isize; + + artists.iter().enumerate().map(|(i, artist)| { + let i = i as isize; + + view! { + { + if let Some(id) = artist.id { + view! { {artist.name.clone()} }.into_view() + } else { + view! { {artist.name.clone()} }.into_view() + } + } + {if i < num_artists - 2 { ", " } else if i == num_artists - 2 { " & " } else { "" }} + } + }).collect::>() +} + +/// Display a song's album, with a link to the album page +#[component] +fn SongAlbum(album: Option) -> impl IntoView { + album.as_ref().map(|album| { + view! { + + { + if let Some(id) = album.id { + view! { {album.title.clone()} }.into_view() + } else { + view! { {album.title.clone()} }.into_view() + } + } + + } + }) +} + +/// Display like and dislike buttons for a song, and indicate if the song is liked or disliked +#[component] +fn SongLikeDislike(liked: RwSignal, disliked: RwSignal) -> impl IntoView { + let like_icon = Signal::derive(move || { + if liked.get() { + icondata::TbThumbUpFilled + } else { + icondata::TbThumbUp + } + }); + + let dislike_icon = Signal::derive(move || { + if disliked.get() { + icondata::TbThumbDownFilled + } else { + icondata::TbThumbDown + } + }); + + let like_class = MaybeProp::derive(move || { + if liked.get() { + Some(TextProp::from("controlbtn")) + } else { + Some(TextProp::from("controlbtn hide-until-hover")) + } + }); + + let dislike_class = MaybeProp::derive(move || { + if disliked.get() { + Some(TextProp::from("controlbtn hmirror")) + } else { + Some(TextProp::from("controlbtn hmirror hide-until-hover")) + } + }); + + let toggle_like = move |_| { + liked.set(!liked.get_untracked()); + disliked.set(disliked.get_untracked() && !liked.get_untracked()); + }; + + let toggle_dislike = move |_| { + disliked.set(!disliked.get_untracked()); + liked.set(liked.get_untracked() && !disliked.get_untracked()); + }; + + view! { + + + } +} diff --git a/src/songdata.rs b/src/songdata.rs index 6851a85..36e5679 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -6,6 +6,7 @@ use time::Date; /// Holds information about a song /// /// Intended to be used in the front-end, as it includes artist and album objects, rather than just their ids. +#[derive(Clone)] pub struct SongData { /// Song id pub id: i32, diff --git a/style/main.scss b/style/main.scss index 1a80b34..042e605 100644 --- a/style/main.scss +++ b/style/main.scss @@ -11,6 +11,7 @@ @import 'dashboard_tile.scss'; @import 'dashboard_row.scss'; @import 'upload.scss'; +@import 'song_list.scss'; body { font-family: sans-serif; diff --git a/style/song_list.scss b/style/song_list.scss new file mode 100644 index 0000000..88904ab --- /dev/null +++ b/style/song_list.scss @@ -0,0 +1,124 @@ +table.song-list { + width: 100%; + border-collapse: collapse; + + tr.song-list-item { + border: solid; + border-width: 1px 0; + border-color: #303030; + position: relative; + + td { + color: $text-controls-color; + white-space: nowrap; + padding-left: 10px; + padding-right: 10px; + + a { + text-decoration: none; + color: $text-controls-color; + } + } + + a:hover { + text-decoration: underline $controls-hover-color; + } + + td.song-image { + width: 35px; + display: flex; + + img.song-image { + position: absolute; + top: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); + width: 35px; + height: 35px; + border-radius: 5px; + } + + svg.song-image-overlay { + position: absolute; + top: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); + width: 35px; + height: 35px; + border-radius: 5px; + fill: $text-controls-color; + } + + svg.song-image-overlay:hover { + fill: $controls-hover-color; + } + + svg.song-image-overlay:active { + fill: $controls-click-color; + } + } + + td.song-list-spacer { + width: 20%; + } + + td.song-list-spacer-big { + width: 40%; + } + + button { + svg.hmirror { + -moz-transform: scale(-1, 1); + -webkit-transform: scale(-1, 1); + -o-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } + + .controlbtn { + color: $text-controls-color; + } + + .controlbtn:hover { + color: $controls-hover-color; + } + + .controlbtn:active { + color: $controls-click-color; + } + + background-color: transparent; + border: transparent; + } + + .hide-until-hover { + visibility: hidden; + } + + .song-playing-overlay { + background-color: rgba(0, 0, 0, 0.8); + } + } + + tr.song-list-item:first-child { + border-top: none; + } + + tr.song-list-item:last-child { + border-bottom: none; + } + + tr.song-list-item:hover { + background-color: #303030; + + .hide-until-hover { + visibility: visible; + } + + td.song-image { + svg.song-image-overlay { + background-color: rgba(0, 0, 0, 0.8); + } + } + } +} From b222b7911ff68e6019abea92f8e4ac20e37c2fbd Mon Sep 17 00:00:00 2001 From: Carter Bertolini Date: Fri, 11 Oct 2024 16:53:08 -0400 Subject: [PATCH 03/25] Add example environment variables and update docker-compose --- .env.example | 3 +++ docker-compose.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.env.example b/.env.example index ef8c8dd..893f587 100644 --- a/.env.example +++ b/.env.example @@ -15,3 +15,6 @@ DATABASE_URL=postgresql://libretunes:password@localhost:5432/libretunes # POSTGRES_HOST=localhost # POSTGRES_PORT=5432 # POSTGRES_DB=libretunes + +LIBRETUNES_AUDIO_PATH=assets/audio +LIBRETUNES_IMAGE_PATH=assets/images diff --git a/docker-compose.yml b/docker-compose.yml index c2d0865..fffc2b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,8 @@ services: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} + LIBRETUNES_AUDIO_PATH: /site/assets/audio + LIBRETUNES_IMAGE_PATH: /site/assets/images volumes: - libretunes-audio:/site/audio depends_on: From e90ea56d149b9907618dc7a02bc10d50c03fd004 Mon Sep 17 00:00:00 2001 From: Carter Bertolini Date: Fri, 11 Oct 2024 17:16:51 -0400 Subject: [PATCH 04/25] Remove TODO --- src/songdata.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/songdata.rs b/src/songdata.rs index 61e263f..d8db885 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -47,7 +47,6 @@ impl TryInto for SongData { track: self.track, duration: self.duration, release_date: self.release_date, - // TODO https://gitlab.mregirouard.com/libretunes/libretunes/-/issues/35 storage_path: self.song_path, // Note that if the source of the image_path was the album, the image_path From f39d93bd0c66e551762e2ef58aac1061c4ea6544 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Tue, 15 Oct 2024 23:22:15 -0400 Subject: [PATCH 05/25] Change audio and image path Docker comopse settings Add volume for images --- docker-compose.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fffc2b5..2a1ea56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,10 +13,11 @@ services: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} - LIBRETUNES_AUDIO_PATH: /site/assets/audio - LIBRETUNES_IMAGE_PATH: /site/assets/images + LIBRETUNES_AUDIO_PATH: /assets/audio + LIBRETUNES_IMAGE_PATH: /assets/images volumes: - - libretunes-audio:/site/audio + - libretunes-audio:/assets/audio + - libretunes-images:/assets/images depends_on: - redis - postgres From 88e2a229a422128862b1ca48738377b2debdcb59 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 21 Oct 2024 22:54:26 -0400 Subject: [PATCH 06/25] Move home component width to .home-component selector --- style/dashboard.scss | 1 - style/home.scss | 1 + style/search.scss | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/style/dashboard.scss b/style/dashboard.scss index e0df7d0..733e58a 100644 --- a/style/dashboard.scss +++ b/style/dashboard.scss @@ -1,7 +1,6 @@ @import "theme.scss"; .dashboard-container { - width: calc(100% - 22rem - 16rem); .dashboard-header { font-size: 1.2rem; font-weight: 300; diff --git a/style/home.scss b/style/home.scss index 371032d..4d74ee0 100644 --- a/style/home.scss +++ b/style/home.scss @@ -10,6 +10,7 @@ .home-component { background: #1c1c1c; height: 100vh; + width: calc(100% - 22rem - 16rem); margin: 2px; padding: 0.2rem 1.5rem 1.5rem 1rem; border-radius: 0.5rem; diff --git a/style/search.scss b/style/search.scss index 9e43f4b..8a6c80d 100644 --- a/style/search.scss +++ b/style/search.scss @@ -1,6 +1,4 @@ @import "theme.scss"; .search-container { - width: calc(100% - 22rem - 16rem); - } From f1e177c7b074ee6b5367aa52d7e6303e0c0b88aa Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 21 Oct 2024 22:57:27 -0400 Subject: [PATCH 07/25] Add page for displaying error --- src/pages.rs | 3 ++- src/pages/error.rs | 24 ++++++++++++++++++++++++ style/error.scss | 18 ++++++++++++++++++ style/main.scss | 1 + 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/pages/error.rs create mode 100644 style/error.scss diff --git a/src/pages.rs b/src/pages.rs index 40f63fd..35dad03 100644 --- a/src/pages.rs +++ b/src/pages.rs @@ -1,2 +1,3 @@ pub mod login; -pub mod signup; \ No newline at end of file +pub mod signup; +pub mod error; diff --git a/src/pages/error.rs b/src/pages/error.rs new file mode 100644 index 0000000..9b68b8f --- /dev/null +++ b/src/pages/error.rs @@ -0,0 +1,24 @@ +use leptos::*; +use leptos_icons::*; +use std::fmt::Display; + +#[component] +pub fn ServerError( + #[prop(optional, into, default="An Error Occurred".into())] + title: TextProp, + #[prop(optional, into)] + message: TextProp, + #[prop(optional, into)] + error: Option>, +) -> impl IntoView { + view! { +
+
+ +

{title}

+
+

{message}

+

{error.map(|error| format!("{}", error))}

+
+ } +} diff --git a/style/error.scss b/style/error.scss new file mode 100644 index 0000000..dae3a36 --- /dev/null +++ b/style/error.scss @@ -0,0 +1,18 @@ +.error-container { + .error-header { + display: inline-grid; + + svg { + width: 30px; + height: 30px; + grid-row-start: 1; + align-self: center; + padding-right: 10px; + } + + h1 { + grid-row-start: 1; + align-self: center; + } + } +} diff --git a/style/main.scss b/style/main.scss index de15da6..3dfb627 100644 --- a/style/main.scss +++ b/style/main.scss @@ -9,6 +9,7 @@ @import 'search.scss'; @import 'personal.scss'; @import 'upload.scss'; +@import 'error.scss'; body { font-family: sans-serif; From 14aa4d236ea48d0a7e0a71d2cf090efbf6708337 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 25 Oct 2024 18:28:45 +0000 Subject: [PATCH 08/25] Add libretunes-images to volumes --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2a1ea56..c3d466d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,5 +53,6 @@ services: volumes: libretunes-audio: + libretunes-images: libretunes-redis: libretunes-postgres: From 23bfb510c15369d809b1ac743935cb4d5eceabe9 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 1 Nov 2024 13:05:47 -0400 Subject: [PATCH 09/25] Add functions to get top/recent songs and artists from history --- src/api/profile.rs | 243 +++++++++++++++++++++++++++++++++++++++++++++ src/songdata.rs | 2 + 2 files changed, 245 insertions(+) diff --git a/src/api/profile.rs b/src/api/profile.rs index 790af13..0dcd6ec 100644 --- a/src/api/profile.rs +++ b/src/api/profile.rs @@ -3,10 +3,23 @@ use server_fn::codec::{MultipartData, MultipartFormData}; use cfg_if::cfg_if; +use crate::songdata::SongData; +use crate::models::Artist; + +use std::time::SystemTime; + cfg_if! { if #[cfg(feature = "ssr")] { use crate::auth::get_user; use server_fn::error::NoCustomError; + + use crate::database::get_db_conn; + use diesel::prelude::*; + use diesel::dsl::count; + use crate::models::*; + use crate::schema::*; + + use std::collections::HashMap; } } @@ -47,3 +60,233 @@ pub async fn upload_picture(data: MultipartData) -> Result<(), ServerFnError> { Ok(()) } + +/// Get a user's recent songs listened to +/// Optionally takes a limit parameter to limit the number of songs returned. +/// If not provided, all songs ever listend to are returned. +/// Returns a list of tuples with the date the song was listened to +/// and the song data, sorted by date (most recent first). +#[server(endpoint = "/profile/recent_songs")] +pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result, ServerFnError> { + let mut db_con = get_db_conn(); + + // Get the ids of the most recent songs listened to + let history_items: Vec = + if let Some(limit) = limit { + song_history::table + .filter(song_history::user_id.eq(for_user_id)) + .order(song_history::date.desc()) + .limit(limit) + .select(song_history::id) + .load(&mut db_con)? + } else { + song_history::table + .filter(song_history::user_id.eq(for_user_id)) + .order(song_history::date.desc()) + .select(song_history::id) + .load(&mut db_con)? + }; + + // Take the history ids and get the song data for them + let history: Vec<(HistoryEntry, Song, Option, Option, Option<(i32, i32)>, Option<(i32, i32)>)> + = song_history::table + .filter(song_history::id.eq_any(history_items)) + .inner_join(songs::table) + .left_join(albums::table.on(songs::album_id.eq(albums::id.nullable()))) + .left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id))) + .left_join(song_likes::table.on(songs::id.eq(song_likes::song_id).and(song_likes::user_id.eq(for_user_id)))) + .left_join(song_dislikes::table.on( + songs::id.eq(song_dislikes::song_id).and(song_dislikes::user_id.eq(for_user_id)))) + .select(( + song_history::all_columns, + songs::all_columns, + albums::all_columns.nullable(), + artists::all_columns.nullable(), + song_likes::all_columns.nullable(), + song_dislikes::all_columns.nullable(), + )) + .load(&mut db_con)?; + + // Process the history data into a map of song ids to song data + let mut history_songs: HashMap = HashMap::with_capacity(history.len()); + + for (history, song, album, artist, like, dislike) in history { + let song_id = history.song_id; + + if let Some((_, stored_songdata)) = history_songs.get_mut(&song_id) { + // If the song is already in the map, update the artists + if let Some(artist) = artist { + stored_songdata.artists.push(artist); + } + } else { + let like_dislike = match (like, dislike) { + (Some(_), Some(_)) => Some((true, true)), + (Some(_), None) => Some((true, false)), + (None, Some(_)) => Some((false, true)), + _ => None, + }; + + let image_path = song.image_path.unwrap_or( + album.as_ref().map(|album| album.image_path.clone()).flatten() + .unwrap_or("/assets/images/placeholder.jpg".to_string())); + + let songdata = SongData { + id: song_id, + title: song.title, + artists: artist.map(|artist| vec![artist]).unwrap_or_default(), + album: album, + track: song.track, + duration: song.duration, + release_date: song.release_date, + song_path: song.storage_path, + image_path: image_path, + like_dislike: like_dislike, + }; + + history_songs.insert(song_id, (history.date, songdata)); + } + } + + // Sort the songs by date + let mut history_songs: Vec<(SystemTime, SongData)> = history_songs.into_values().collect(); + history_songs.sort_by(|a, b| b.0.cmp(&a.0)); + Ok(history_songs) +} + +/// Get a user's top songs by play count from a date range +/// Optionally takes a limit parameter to limit the number of songs returned. +/// If not provided, all songs listened to in the date range are returned. +/// Returns a list of tuples with the play count and the song data, sorted by play count (most played first). +#[server(endpoint = "/profile/top_songs")] +pub async fn top_songs(for_user_id: i32, start_date: SystemTime, end_date: SystemTime, limit: Option) + -> Result, ServerFnError> +{ + let mut db_con = get_db_conn(); + + // Get the play count and ids of the songs listened to in the date range + let history_counts: Vec<(i32, i64)> = + if let Some(limit) = limit { + song_history::table + .filter(song_history::date.between(start_date, end_date)) + .filter(song_history::user_id.eq(for_user_id)) + .group_by(song_history::song_id) + .select((song_history::song_id, count(song_history::song_id))) + .order(count(song_history::song_id).desc()) + .limit(limit) + .load(&mut db_con)? + } else { + song_history::table + .filter(song_history::date.between(start_date, end_date)) + .filter(song_history::user_id.eq(for_user_id)) + .group_by(song_history::song_id) + .select((song_history::song_id, count(song_history::song_id))) + .load(&mut db_con)? + }; + + let history_counts: HashMap = history_counts.into_iter().collect(); + let history_song_ids = history_counts.iter().map(|(song_id, _)| *song_id).collect::>(); + + // Get the song data for the songs listened to in the date range + let history_songs: Vec<(Song, Option, Option, Option<(i32, i32)>, Option<(i32, i32)>)> + = songs::table + .filter(songs::id.eq_any(history_song_ids)) + .left_join(albums::table.on(songs::album_id.eq(albums::id.nullable()))) + .left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id))) + .left_join(song_likes::table.on(songs::id.eq(song_likes::song_id).and(song_likes::user_id.eq(for_user_id)))) + .left_join(song_dislikes::table.on( + songs::id.eq(song_dislikes::song_id).and(song_dislikes::user_id.eq(for_user_id)))) + .select(( + songs::all_columns, + albums::all_columns.nullable(), + artists::all_columns.nullable(), + song_likes::all_columns.nullable(), + song_dislikes::all_columns.nullable(), + )) + .load(&mut db_con)?; + + // Process the history data into a map of song ids to song data + let mut history_songs_map: HashMap = HashMap::with_capacity(history_counts.len()); + + for (song, album, artist, like, dislike) in history_songs { + let song_id = song.id + .ok_or(ServerFnError::ServerError::("Song id not found in database".to_string()))?; + + if let Some((_, stored_songdata)) = history_songs_map.get_mut(&song_id) { + // If the song is already in the map, update the artists + if let Some(artist) = artist { + stored_songdata.artists.push(artist); + } + } else { + let like_dislike = match (like, dislike) { + (Some(_), Some(_)) => Some((true, true)), + (Some(_), None) => Some((true, false)), + (None, Some(_)) => Some((false, true)), + _ => None, + }; + + let image_path = song.image_path.unwrap_or( + album.as_ref().map(|album| album.image_path.clone()).flatten() + .unwrap_or("/assets/images/placeholder.jpg".to_string())); + + let songdata = SongData { + id: song_id, + title: song.title, + artists: artist.map(|artist| vec![artist]).unwrap_or_default(), + album: album, + track: song.track, + duration: song.duration, + release_date: song.release_date, + song_path: song.storage_path, + image_path: image_path, + like_dislike: like_dislike, + }; + + let plays = history_counts.get(&song_id) + .ok_or(ServerFnError::ServerError::("Song id not found in history counts".to_string()))?; + + history_songs_map.insert(song_id, (*plays, songdata)); + } + } + + // Sort the songs by play count + let mut history_songs: Vec<(i64, SongData)> = history_songs_map.into_values().collect(); + history_songs.sort_by(|a, b| b.0.cmp(&a.0)); + Ok(history_songs) +} + +/// Get a user's top artists by play count from a date range +/// Optionally takes a limit parameter to limit the number of artists returned. +/// If not provided, all artists listened to in the date range are returned. +/// Returns a list of tuples with the play count and the artist data, sorted by play count (most played first). +#[server(endpoint = "/profile/top_artists")] +pub async fn top_artists(for_user_id: i32, start_date: SystemTime, end_date: SystemTime, limit: Option) + -> Result, ServerFnError> +{ + let mut db_con = get_db_conn(); + + let artist_counts: Vec<(i64, Artist)> = + if let Some(limit) = limit { + song_history::table + .filter(song_history::date.between(start_date, end_date)) + .filter(song_history::user_id.eq(for_user_id)) + .inner_join(song_artists::table.on(song_history::song_id.eq(song_artists::song_id))) + .inner_join(artists::table.on(song_artists::artist_id.eq(artists::id))) + .group_by(artists::id) + .select((count(artists::id), artists::all_columns)) + .order(count(artists::id).desc()) + .limit(limit) + .load(&mut db_con)? + } else { + song_history::table + .filter(song_history::date.between(start_date, end_date)) + .filter(song_history::user_id.eq(for_user_id)) + .inner_join(song_artists::table.on(song_history::song_id.eq(song_artists::song_id))) + .inner_join(artists::table.on(song_artists::artist_id.eq(artists::id))) + .group_by(artists::id) + .select((count(artists::id), artists::all_columns)) + .order(count(artists::id).desc()) + .load(&mut db_con)? + }; + + Ok(artist_counts) +} diff --git a/src/songdata.rs b/src/songdata.rs index 61e263f..3a09af3 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -1,10 +1,12 @@ use crate::models::{Album, Artist, Song}; +use serde::{Serialize, Deserialize}; use time::Date; /// Holds information about a song /// /// Intended to be used in the front-end, as it includes artist and album objects, rather than just their ids. +#[derive(Serialize, Deserialize)] pub struct SongData { /// Song id pub id: i32, From 0453aef37d2ee165fedb6b109783fcffb65b5855 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Fri, 1 Nov 2024 14:26:38 -0400 Subject: [PATCH 10/25] Fix incorrect placeholder image path --- src/api/profile.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/profile.rs b/src/api/profile.rs index 0dcd6ec..3525def 100644 --- a/src/api/profile.rs +++ b/src/api/profile.rs @@ -128,7 +128,7 @@ pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result Date: Fri, 1 Nov 2024 14:36:38 -0400 Subject: [PATCH 11/25] Add component to display SongList with additional data --- src/components/song_list.rs | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/components/song_list.rs b/src/components/song_list.rs index 2ace92a..e0c46d7 100644 --- a/src/components/song_list.rs +++ b/src/components/song_list.rs @@ -18,8 +18,10 @@ pub fn SongList(songs: MaybeSignal>) -> impl IntoView { let playing = first_song.into(); first_song = false; + let extra = Option::<()>::None; + view! { - + } }).collect::>() }) @@ -29,7 +31,33 @@ pub fn SongList(songs: MaybeSignal>) -> impl IntoView { } #[component] -pub fn SongListItem(song: SongData, song_playing: MaybeSignal) -> impl IntoView { +pub fn SongListExtra(songs: MaybeSignal>) -> impl IntoView where + T: Clone + IntoView + 'static +{ + view! { + + { + songs.with(|songs| { + let mut first_song = true; + + songs.iter().map(|(song, extra)| { + let playing = first_song.into(); + first_song = false; + + view! { + + } + }).collect::>() + }) + } +
+ } +} + +#[component] +pub fn SongListItem(song: SongData, song_playing: MaybeSignal, extra: Option) -> impl IntoView where + T: IntoView + 'static +{ let liked = create_rw_signal(song.like_dislike.map(|(liked, _)| liked).unwrap_or(false)); let disliked = create_rw_signal(song.like_dislike.map(|(_, disliked)| disliked).unwrap_or(false)); @@ -44,6 +72,10 @@ pub fn SongListItem(song: SongData, song_playing: MaybeSignal) -> impl Int {format!("{}:{:02}", song.duration / 60, song.duration % 60)} + {extra.map(|extra| view! { + + {extra} + })} } } From a70de76c4d3a796ec26fd63a8c4c4178f4587759 Mon Sep 17 00:00:00 2001 From: Daniel Miller Date: Sat, 2 Nov 2024 02:37:50 +0000 Subject: [PATCH 12/25] Added webp files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ab27e5e..f472188 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ playwright/.cache/ *.jpeg *.png *.gif +*.webp # Environment variables .env From 251d56786399a7fe50d77219ab41a0f2afd3d605 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 3 Nov 2024 16:52:15 -0500 Subject: [PATCH 13/25] Return logged in user from login endpoint --- src/auth.rs | 10 ++++++---- src/pages/login.rs | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index 37f861f..c0751d1 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -57,7 +57,7 @@ pub async fn signup(new_user: User) -> Result<(), ServerFnError> { /// Takes in a username or email and a password in plaintext /// Returns a Result with a boolean indicating if the login was successful #[server(endpoint = "login")] -pub async fn login(credentials: UserCredentials) -> Result { +pub async fn login(credentials: UserCredentials) -> Result, ServerFnError> { use crate::users::validate_user; let mut auth_session = extract::>().await @@ -66,12 +66,14 @@ pub async fn login(credentials: UserCredentials) -> Result let user = validate_user(credentials).await .map_err(|e| ServerFnError::::ServerError(format!("Error validating user: {}", e)))?; - if let Some(user) = user { + if let Some(mut user) = user { auth_session.login(&user).await .map_err(|e| ServerFnError::::ServerError(format!("Error logging in user: {}", e)))?; - Ok(true) + + user.password = None; + Ok(Some(user)) } else { - Ok(false) + Ok(None) } } diff --git a/src/pages/login.rs b/src/pages/login.rs index 62aca49..1fda5ca 100644 --- a/src/pages/login.rs +++ b/src/pages/login.rs @@ -32,12 +32,12 @@ pub fn Login() -> impl IntoView { if let Err(err) = login_result { // Handle the error here, e.g., log it or display to the user log!("Error logging in: {:?}", err); - } else if let Ok(true) = login_result { + } else if let Ok(Some(_)) = login_result { // Redirect to the login page log!("Logged in Successfully!"); leptos_router::use_navigate()("/", Default::default()); log!("Navigated to home page after login"); - } else if let Ok(false) = login_result { + } else if let Ok(None) = login_result { log!("Invalid username or password"); } }); From 43a5b519fdf8e5fb744db287d907bf59bdc5e23f Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 3 Nov 2024 16:59:23 -0500 Subject: [PATCH 14/25] Add API endpoint to get logged in user --- src/auth.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/auth.rs b/src/auth.rs index c0751d1..558bfe2 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -147,6 +147,19 @@ pub async fn get_user() -> Result { auth_session.user.ok_or(ServerFnError::::ServerError("User not logged in".to_string())) } +#[server(endpoint = "get_logged_in_user")] +pub async fn get_logged_in_user() -> Result, ServerFnError> { + let auth_session = extract::>().await + .map_err(|e| ServerFnError::::ServerError(format!("Error getting auth session: {}", e)))?; + + let user = auth_session.user.map(|mut user| { + user.password = None; + user + }); + + Ok(user) +} + /// Check if a user is an admin /// Returns a Result with a boolean indicating if the user is logged in and an admin #[server(endpoint = "check_admin")] From 8ac3a87c58a2e1512e4e7ec017341713e5d0dac1 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 3 Nov 2024 16:59:46 -0500 Subject: [PATCH 15/25] Add global logged in user Resource --- src/app.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/app.rs b/src/app.rs index ed9fd1b..9e91878 100644 --- a/src/app.rs +++ b/src/app.rs @@ -3,12 +3,16 @@ use crate::playbar::CustomTitle; use crate::playstatus::PlayStatus; use crate::queue::Queue; use leptos::*; +use leptos::logging::*; use leptos_meta::*; use leptos_router::*; use crate::pages::login::*; use crate::pages::signup::*; use crate::error_template::{AppError, ErrorTemplate}; +use crate::auth::get_logged_in_user; +use crate::models::User; +pub type LoggedInUserResource = Resource<(), Option>; #[component] pub fn App() -> impl IntoView { @@ -19,6 +23,18 @@ pub fn App() -> impl IntoView { let play_status = create_rw_signal(play_status); let upload_open = create_rw_signal(false); + // A resource that fetches the logged in user + // This will not automatically refetch, so any login/logout related code + // should call `refetch` on this resource + let logged_in_user: LoggedInUserResource = create_resource(|| (), |_| async { + get_logged_in_user().await + .inspect_err(|e| { + error!("Error getting logged in user: {:?}", e); + }) + .ok() + .flatten() + }); + view! { // injects a stylesheet into the document // id=leptos means cargo-leptos will hot-reload this stylesheet From 2b380d77876cd7aef245a4ab1e2e5cf26b70ae9c Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 3 Nov 2024 17:13:40 -0500 Subject: [PATCH 16/25] Refetch logged in user on login/signup --- src/app.rs | 4 ++-- src/pages/login.rs | 14 ++++++++++++-- src/pages/signup.rs | 14 +++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/app.rs b/src/app.rs index 9e91878..50cad40 100644 --- a/src/app.rs +++ b/src/app.rs @@ -59,8 +59,8 @@ pub fn App() -> impl IntoView { - - + } /> + } /> diff --git a/src/pages/login.rs b/src/pages/login.rs index 1fda5ca..585f2f0 100644 --- a/src/pages/login.rs +++ b/src/pages/login.rs @@ -3,9 +3,10 @@ use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; use crate::users::UserCredentials; +use crate::app::LoggedInUserResource; #[component] -pub fn Login() -> impl IntoView { +pub fn Login(user: LoggedInUserResource) -> impl IntoView { let (username_or_email, set_username_or_email) = create_signal("".to_string()); let (password, set_password) = create_signal("".to_string()); @@ -32,13 +33,22 @@ pub fn Login() -> impl IntoView { if let Err(err) = login_result { // Handle the error here, e.g., log it or display to the user log!("Error logging in: {:?}", err); - } else if let Ok(Some(_)) = login_result { + + // Since we're not sure what the state is, manually refetch the user + user.refetch(); + } else if let Ok(Some(login_user)) = login_result { + // Manually set the user to the new user, avoiding a refetch + user.set(Some(login_user)); + // Redirect to the login page log!("Logged in Successfully!"); leptos_router::use_navigate()("/", Default::default()); log!("Navigated to home page after login"); } else if let Ok(None) = login_result { log!("Invalid username or password"); + + // User could be already logged in or not, so refetch the user + user.refetch(); } }); }; diff --git a/src/pages/signup.rs b/src/pages/signup.rs index f02dfab..8e9a0ac 100644 --- a/src/pages/signup.rs +++ b/src/pages/signup.rs @@ -3,9 +3,10 @@ use crate::models::User; use leptos::leptos_dom::*; use leptos::*; use leptos_icons::*; +use crate::app::LoggedInUserResource; #[component] -pub fn Signup() -> impl IntoView { +pub fn Signup(user: LoggedInUserResource) -> impl IntoView { let (username, set_username) = create_signal("".to_string()); let (email, set_email) = create_signal("".to_string()); let (password, set_password) = create_signal("".to_string()); @@ -19,7 +20,7 @@ pub fn Signup() -> impl IntoView { let on_submit = move |ev: leptos::ev::SubmitEvent| { ev.prevent_default(); - let new_user = User { + let mut new_user = User { id: None, username: username.get(), email: email.get(), @@ -30,10 +31,17 @@ pub fn Signup() -> impl IntoView { log!("new user: {:?}", new_user); spawn_local(async move { - if let Err(err) = signup(new_user).await { + if let Err(err) = signup(new_user.clone()).await { // Handle the error here, e.g., log it or display to the user log!("Error signing up: {:?}", err); + + // Since we're not sure what the state is, manually refetch the user + user.refetch(); } else { + // Manually set the user to the new user, avoiding a refetch + new_user.password = None; + user.set(Some(new_user)); + // Redirect to the login page log!("Signed up successfully!"); leptos_router::use_navigate()("/", Default::default()); From 414489d1bedc890a9bc7fdda818326e061f6e964 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 00:29:53 -0500 Subject: [PATCH 17/25] Return ArtistData from top_artists --- src/api/profile.rs | 13 +++++++++++-- src/artistdata.rs | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/api/profile.rs b/src/api/profile.rs index 3525def..9d4348e 100644 --- a/src/api/profile.rs +++ b/src/api/profile.rs @@ -4,6 +4,7 @@ use server_fn::codec::{MultipartData, MultipartFormData}; use cfg_if::cfg_if; use crate::songdata::SongData; +use crate::artistdata::ArtistData; use crate::models::Artist; use std::time::SystemTime; @@ -260,7 +261,7 @@ pub async fn top_songs(for_user_id: i32, start_date: SystemTime, end_date: Syste /// Returns a list of tuples with the play count and the artist data, sorted by play count (most played first). #[server(endpoint = "/profile/top_artists")] pub async fn top_artists(for_user_id: i32, start_date: SystemTime, end_date: SystemTime, limit: Option) - -> Result, ServerFnError> + -> Result, ServerFnError> { let mut db_con = get_db_conn(); @@ -288,5 +289,13 @@ pub async fn top_artists(for_user_id: i32, start_date: SystemTime, end_date: Sys .load(&mut db_con)? }; - Ok(artist_counts) + let artist_data: Vec<(i64, ArtistData)> = artist_counts.into_iter().map(|(plays, artist)| { + (plays, ArtistData { + id: artist.id.unwrap(), + name: artist.name, + image_path: format!("/assets/images/artists/{}.webp", artist.id.unwrap()), + }) + }).collect(); + + Ok(artist_data) } diff --git a/src/artistdata.rs b/src/artistdata.rs index e799679..9a2d5f2 100644 --- a/src/artistdata.rs +++ b/src/artistdata.rs @@ -1,8 +1,10 @@ use crate::components::dashboard_tile::DashboardTile; +use serde::{Serialize, Deserialize}; /// Holds information about an artist /// /// Intended to be used in the front-end +#[derive(Serialize, Deserialize)] pub struct ArtistData { /// Artist id pub id: i32, From ddcb4a5be7c69ff4a952d170d4a25e8254be4648 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 15:13:07 -0500 Subject: [PATCH 18/25] Add loading indicator --- src/components.rs | 1 + src/components/loading.rs | 19 +++++++++++++ style/loading.scss | 59 +++++++++++++++++++++++++++++++++++++++ style/main.scss | 1 + 4 files changed, 80 insertions(+) create mode 100644 src/components/loading.rs create mode 100644 style/loading.scss diff --git a/src/components.rs b/src/components.rs index 893727c..023602d 100644 --- a/src/components.rs +++ b/src/components.rs @@ -6,3 +6,4 @@ pub mod dashboard_tile; pub mod dashboard_row; pub mod upload; pub mod song_list; +pub mod loading; diff --git a/src/components/loading.rs b/src/components/loading.rs new file mode 100644 index 0000000..b3de9cd --- /dev/null +++ b/src/components/loading.rs @@ -0,0 +1,19 @@ +use leptos::*; + +/// A loading indicator +#[component] +pub fn Loading() -> impl IntoView { + view! { +
+ } +} + +/// A full page, centered loading indicator +#[component] +pub fn LoadingPage() -> impl IntoView { + view!{ +
+ +
+ } +} diff --git a/style/loading.scss b/style/loading.scss new file mode 100644 index 0000000..89ae90e --- /dev/null +++ b/style/loading.scss @@ -0,0 +1,59 @@ +@import "theme.scss"; + +.loading-page { + display: flex; + justify-content: center; + align-items: center; + height: 100%; +} + +.loading { + position: relative; + width: 10px; + height: 10px; + border-radius: 5px; + margin: 10px; + background-color: $accent-color; + color: $accent-color; + animation: dot-flashing 1s infinite linear alternate; + animation-delay: 0.5s; +} + +.loading::before, .loading::after { + content: ""; + display: inline-block; + position: absolute; + top: 0; +} + +.loading::before { + left: -15px; + width: 10px; + height: 10px; + border-radius: 5px; + background-color: $accent-color; + color: $accent-color; + animation: dot-flashing 1s infinite alternate; + animation-delay: 0s; +} + +.loading::after { + left: 15px; + width: 10px; + height: 10px; + border-radius: 5px; + background-color: $accent-color; + color: $accent-color; + animation: dot-flashing 1s infinite alternate; + animation-delay: 1s; +} + +@keyframes dot-flashing { + 0% { + background-color: $accent-color; + } + + 50%, 100% { + background-color: $controls-hover-color; + } +} diff --git a/style/main.scss b/style/main.scss index 99faa8b..c581d58 100644 --- a/style/main.scss +++ b/style/main.scss @@ -13,6 +13,7 @@ @import 'upload.scss'; @import 'error.scss'; @import 'song_list.scss'; +@import 'loading.scss'; body { font-family: sans-serif; From 89433df8b6cd811dc13c4d16ebbec7c2386c727c Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 15:14:05 -0500 Subject: [PATCH 19/25] Add function to get user by id --- src/users.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/users.rs b/src/users.rs index 2d61c69..ff5606f 100644 --- a/src/users.rs +++ b/src/users.rs @@ -128,3 +128,15 @@ pub async fn get_user(username_or_email: String) -> Result, ServerF Ok(user) } + +#[server(endpoint = "get_user_by_id")] +pub async fn get_user_by_id(user_id: i32) -> Result, ServerFnError> { + let mut user = find_user_by_id(user_id).await?; + + // Remove the password hash before returning the user + if let Some(user) = user.as_mut() { + user.password = None; + } + + Ok(user) +} From 5011cda8fa9845aa0b4e2bf0710b278b1825eebb Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 17:01:42 -0500 Subject: [PATCH 20/25] Allow home-component to scroll --- style/home.scss | 4 ++-- style/personal.scss | 1 - style/playbar.scss | 2 +- style/theme.scss | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/style/home.scss b/style/home.scss index 4d74ee0..1b4e896 100644 --- a/style/home.scss +++ b/style/home.scss @@ -9,9 +9,9 @@ } .home-component { background: #1c1c1c; - height: 100vh; width: calc(100% - 22rem - 16rem); margin: 2px; - padding: 0.2rem 1.5rem 1.5rem 1rem; + padding: 0.2rem 1.5rem $playbar-size 1rem; border-radius: 0.5rem; + overflow: scroll; } diff --git a/style/personal.scss b/style/personal.scss index e03e05e..3a83435 100644 --- a/style/personal.scss +++ b/style/personal.scss @@ -3,7 +3,6 @@ .personal-container { width: 16rem; background: #1c1c1c; - height: 100vh; margin: 2px; border-radius: 0.5rem; diff --git a/style/playbar.scss b/style/playbar.scss index 522ea11..698a2df 100644 --- a/style/playbar.scss +++ b/style/playbar.scss @@ -2,7 +2,7 @@ .playbar { width: 100%; - height: 75px; + height: $playbar-size; background-color: $play-bar-background-color; opacity: 0.9; position: fixed; diff --git a/style/theme.scss b/style/theme.scss index fe96046..b0cea43 100644 --- a/style/theme.scss +++ b/style/theme.scss @@ -16,3 +16,4 @@ $auth-inputs: #796dd4; $auth-containers: white; $dashboard-tile-size: 200px; +$playbar-size: 75px; From 39dd8099cd3f46f89f3875b9fea92e6645c5b2e3 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 17:02:59 -0500 Subject: [PATCH 21/25] Make ServerError a component instead of a page --- src/components.rs | 1 + src/{pages => components}/error.rs | 2 +- src/pages.rs | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{pages => components}/error.rs (91%) diff --git a/src/components.rs b/src/components.rs index 023602d..2624877 100644 --- a/src/components.rs +++ b/src/components.rs @@ -7,3 +7,4 @@ pub mod dashboard_row; pub mod upload; pub mod song_list; pub mod loading; +pub mod error; diff --git a/src/pages/error.rs b/src/components/error.rs similarity index 91% rename from src/pages/error.rs rename to src/components/error.rs index 9b68b8f..4691b55 100644 --- a/src/pages/error.rs +++ b/src/components/error.rs @@ -12,7 +12,7 @@ pub fn ServerError( error: Option>, ) -> impl IntoView { view! { -
+

{title}

diff --git a/src/pages.rs b/src/pages.rs index 35dad03..815d2a9 100644 --- a/src/pages.rs +++ b/src/pages.rs @@ -1,3 +1,2 @@ pub mod login; pub mod signup; -pub mod error; From 833393cb3a6426121b3a6e222ac1dc3323750d05 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 17:11:26 -0500 Subject: [PATCH 22/25] Add generic Error component --- src/components/error.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/components/error.rs b/src/components/error.rs index 4691b55..ae2f18a 100644 --- a/src/components/error.rs +++ b/src/components/error.rs @@ -10,6 +10,27 @@ pub fn ServerError( message: TextProp, #[prop(optional, into)] error: Option>, +) -> impl IntoView { + view!{ +
+
+ +

{title}

+
+

{message}

+

{error.map(|error| format!("{}", error))}

+
+ } +} + +#[component] +pub fn Error( + #[prop(optional, into, default="An Error Occurred".into())] + title: TextProp, + #[prop(optional, into)] + message: TextProp, + #[prop(optional, into)] + error: Option, ) -> impl IntoView { view! {
From ef5576ab3f402d710111a960855d92b695e0cefc Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 17:15:55 -0500 Subject: [PATCH 23/25] Create profile page --- src/app.rs | 5 +- src/artistdata.rs | 2 +- src/pages.rs | 1 + src/pages/profile.rs | 330 +++++++++++++++++++++++++++++++++++++++++++ style/main.scss | 1 + style/profile.scss | 36 +++++ 6 files changed, 373 insertions(+), 2 deletions(-) create mode 100644 src/pages/profile.rs create mode 100644 style/profile.scss diff --git a/src/app.rs b/src/app.rs index 50cad40..15d877f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -8,6 +8,7 @@ use leptos_meta::*; use leptos_router::*; use crate::pages::login::*; use crate::pages::signup::*; +use crate::pages::profile::*; use crate::error_template::{AppError, ErrorTemplate}; use crate::auth::get_logged_in_user; use crate::models::User; @@ -58,6 +59,8 @@ pub fn App() -> impl IntoView { + } /> + } /> } /> } /> @@ -70,7 +73,7 @@ pub fn App() -> impl IntoView { use crate::components::sidebar::*; use crate::components::dashboard::*; use crate::components::search::*; -use crate::components::personal::*; +use crate::components::personal::Personal; use crate::components::upload::*; /// Renders the home page of your application. diff --git a/src/artistdata.rs b/src/artistdata.rs index 9a2d5f2..401979d 100644 --- a/src/artistdata.rs +++ b/src/artistdata.rs @@ -4,7 +4,7 @@ use serde::{Serialize, Deserialize}; /// Holds information about an artist /// /// Intended to be used in the front-end -#[derive(Serialize, Deserialize)] +#[derive(Clone, Serialize, Deserialize)] pub struct ArtistData { /// Artist id pub id: i32, diff --git a/src/pages.rs b/src/pages.rs index 815d2a9..1e65f58 100644 --- a/src/pages.rs +++ b/src/pages.rs @@ -1,2 +1,3 @@ pub mod login; pub mod signup; +pub mod profile; diff --git a/src/pages/profile.rs b/src/pages/profile.rs new file mode 100644 index 0000000..8bec37a --- /dev/null +++ b/src/pages/profile.rs @@ -0,0 +1,330 @@ +use leptos::*; +use leptos::logging::*; +use leptos_router::use_params_map; +use leptos_icons::*; +use server_fn::error::NoCustomError; + +use crate::components::dashboard_row::DashboardRow; +use crate::components::dashboard_tile::DashboardTile; +use crate::components::song_list::*; +use crate::components::loading::*; +use crate::components::error::*; + +use crate::api::profile::*; + +use crate::app::LoggedInUserResource; +use crate::models::User; +use crate::users::get_user_by_id; + +/// Duration in seconds backwards from now to aggregate history data for +const HISTORY_SECS: u64 = 60 * 60 * 24 * 30; +const HISTORY_MESSAGE: &str = "Last Month"; + +/// How many top songs to show +const TOP_SONGS_COUNT: i64 = 10; +/// How many recent songs to show +const RECENT_SONGS_COUNT: i64 = 5; +/// How many recent artists to show +const TOP_ARTISTS_COUNT: i64 = 10; + +/// Profile page +/// Shows the current user's profile if no id is specified, or a user's profile if an id is specified in the path +#[component] +pub fn Profile(logged_in_user: LoggedInUserResource) -> impl IntoView { + let params = use_params_map(); + + view! { +
+ {move || params.with(|params| { + match params.get("id").map(|id| id.parse::()) { + None => { + // No id specified, show the current user's profile + view! { }.into_view() + }, + Some(Ok(id)) => { + // Id specified, get the user and show their profile + view! { }.into_view() + }, + Some(Err(e)) => { + // Invalid id, return an error + view! { + + title="Invalid User ID" + error=e.to_string() + /> + }.into_view() + } + } + })} +
+ } +} + +/// Show the logged in user's profile +#[component] +fn OwnProfile(logged_in_user: LoggedInUserResource) -> impl IntoView { + view! { + } + > + {move || logged_in_user.get().map(|user| { + match user { + Some(user) => { + let user_id = user.id.unwrap(); + view! { + + + + + }.into_view() + }, + None => view! { + + title="Not Logged In" + message="You must be logged in to view your profile" + /> + }.into_view(), + } + })} + + } +} + +/// Show a user's profile by ID +#[component] +fn UserIdProfile(#[prop(into)] id: MaybeSignal) -> impl IntoView { + let user_info = create_resource(move || id.get(), move |id| { + get_user_by_id(id) + }); + + // Show the details if the user is found + let show_details = create_rw_signal(false); + + view!{ + } + > + {move || user_info.get().map(|user| { + match user { + Ok(Some(user)) => { + show_details.set(true); + + view! { }.into_view() + }, + Ok(None) => { + show_details.set(false); + + view! { + + title="User Not Found" + message=format!("User with ID {} not found", id.get()) + /> + }.into_view() + }, + Err(error) => { + show_details.set(false); + + view! { + + title="Error Getting User" + error + /> + }.into_view() + } + } + })} + + + } +} + +/// Show a profile for a User object +#[component] +fn UserProfile(user: User) -> impl IntoView { + let user_id = user.id.unwrap(); + let profile_image_path = format!("/assets/images/profile/{}.webp", user_id); + + view! { +
+ + + +

{user.username}

+
+
+

+ {user.email} + { + user.created_at.map(|created_at| { + use time::{OffsetDateTime, macros::format_description}; + let format = format_description!("[month repr:long] [year]"); + let date_time = Into::::into(created_at).format(format); + + match date_time { + Ok(date_time) => { + format!(" • Joined {}", date_time) + }, + Err(e) => { + error!("Error formatting date: {}", e); + String::new() + } + } + }) + } + { + if user.admin { + " • Admin" + } else { + "" + } + } +

+
+ } +} + +/// Show a list of top songs for a user +#[component] +fn TopSongs(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { + let top_songs = create_resource(move || user_id.get(), |user_id| async move { + use std::time::{SystemTime, Duration}; + + let now = SystemTime::now(); + let start = now - Duration::from_secs(HISTORY_SECS); + let top_songs = top_songs(user_id, start, now, Some(TOP_SONGS_COUNT)).await; + + top_songs.map(|top_songs| { + top_songs.into_iter().map(|(plays, song)| { + let plays = if plays == 1 { + format!("{} Play", plays) + } else { + format!("{} Plays", plays) + }; + + (song, plays) + }).collect::>() + }) + }); + + view! { +

{format!("Top Songs {}", HISTORY_MESSAGE)}

+ } + > + {e.to_string()}

}) + .collect_view() + } + } + > + {move || + top_songs.get().map(|top_songs| { + top_songs.map(|top_songs| { + view! { + + } + }) + }) + } + + + } +} + +/// Show a list of recently played songs for a user +#[component] +fn RecentSongs(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { + let recent_songs = create_resource(move || user_id.get(), |user_id| async move { + let recent_songs = recent_songs(user_id, Some(RECENT_SONGS_COUNT)).await; + + recent_songs.map(|recent_songs| { + recent_songs.into_iter().map(|(_date, song)| { + song + }).collect::>() + }) + }); + + view! { +

"Recently Played"

+ } + > + {e.to_string()}

}) + .collect_view() + } + } + > + {move || + recent_songs.get().map(|recent_songs| { + recent_songs.map(|recent_songs| { + view! { + + } + }) + }) + } + + + } +} + +/// Show a list of top artists for a user +#[component] +fn TopArtists(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { + let top_artists = create_resource(move || user_id.get(), |user_id| async move { + use std::time::{SystemTime, Duration}; + + let now = SystemTime::now(); + let start = now - Duration::from_secs(HISTORY_SECS); + let top_artists = top_artists(user_id, start, now, Some(TOP_ARTISTS_COUNT)).await; + + top_artists.map(|top_artists| { + top_artists.into_iter().map(|(_plays, artist)| { + artist + }).collect::>() + }) + }); + + view! { + {format!("Top Artists {}", HISTORY_MESSAGE)} + + } + > + {format!("Top Artists {}", HISTORY_MESSAGE)} + {move || errors.get() + .into_iter() + .map(|(_, e)| view! {

{e.to_string()}

}) + .collect_view() + } + } + > + {move || + top_artists.get().map(|top_artists| { + top_artists.map(|top_artists| { + let tiles = top_artists.into_iter().map(|artist| { + Box::new(artist) as Box + }).collect::>(); + + DashboardRow::new(format!("Top Artists {}", HISTORY_MESSAGE), tiles) + }) + }) + } + + + } +} diff --git a/style/main.scss b/style/main.scss index c581d58..a19abe7 100644 --- a/style/main.scss +++ b/style/main.scss @@ -13,6 +13,7 @@ @import 'upload.scss'; @import 'error.scss'; @import 'song_list.scss'; +@import 'profile.scss'; @import 'loading.scss'; body { diff --git a/style/profile.scss b/style/profile.scss new file mode 100644 index 0000000..e76c09a --- /dev/null +++ b/style/profile.scss @@ -0,0 +1,36 @@ +@import 'theme.scss'; + +.profile-container { + .profile-header { + display: flex; + + .profile-image { + width: 75px; + height: 75px; + border-radius: 50%; + padding: 10px; + padding-bottom: 5px; + margin-top: auto; + margin-bottom: auto; + + svg { + padding: 0; + margin: 0; + } + } + + h1 { + font-size: 40px; + align-self: center; + padding: 10px; + padding-bottom: 5px; + } + } + + .profile-details { + p { + font-size: 1rem; + margin: 0.5rem; + } + } +} From f23430af73ce9fb342e8891560cff7cf40ff3b9a Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 17:16:09 -0500 Subject: [PATCH 24/25] Remove unnecessary Artist import --- src/api/profile.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/api/profile.rs b/src/api/profile.rs index 9d4348e..c8c8716 100644 --- a/src/api/profile.rs +++ b/src/api/profile.rs @@ -5,7 +5,6 @@ use cfg_if::cfg_if; use crate::songdata::SongData; use crate::artistdata::ArtistData; -use crate::models::Artist; use std::time::SystemTime; From 6dcbba258896ee5c18e3dfd8764572d7fe8b3657 Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Mon, 4 Nov 2024 18:23:25 -0500 Subject: [PATCH 25/25] Switch to chrono instead of time --- Cargo.lock | 11 +++++++---- Cargo.toml | 5 +++-- src/albumdata.rs | 4 ++-- src/api/history.rs | 4 ++-- src/api/profile.rs | 12 ++++++------ src/models.rs | 15 +++++++-------- src/pages/profile.rs | 34 ++++++++++------------------------ src/songdata.rs | 4 ++-- src/upload.rs | 10 ++++------ 9 files changed, 43 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44b8a0a..76948b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -378,13 +378,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", + "serde", + "wasm-bindgen", "windows-targets 0.52.4", ] @@ -690,11 +693,11 @@ checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" dependencies = [ "bitflags 2.5.0", "byteorder", + "chrono", "diesel_derives", "itoa", "pq-sys", "r2d2", - "time", ] [[package]] @@ -1834,6 +1837,7 @@ dependencies = [ "axum", "axum-login", "cfg-if", + "chrono", "console_error_panic_hook", "diesel", "diesel_migrations", @@ -1857,7 +1861,6 @@ dependencies = [ "server_fn", "symphonia", "thiserror", - "time", "tokio", "tower 0.5.1", "tower-http", diff --git a/Cargo.toml b/Cargo.toml index 2bdcda4..88c540a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,11 +19,10 @@ wasm-bindgen = { version = "=0.2.93", default-features = false, optional = true leptos_icons = { version = "0.3.0" } icondata = { version = "0.3.0" } dotenv = { version = "0.15.0", optional = true } -diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true } +diesel = { version = "2.1.4", features = ["postgres", "r2d2", "chrono"], default-features = false, optional = true } lazy_static = { version = "1.4.0", optional = true } serde = { version = "1.0.195", features = ["derive"], default-features = false } openssl = { version = "0.10.63", optional = true } -time = { version = "0.3.34", features = ["serde"], default-features = false } diesel_migrations = { version = "2.1.0", optional = true } pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true } tokio = { version = "1", optional = true, features = ["rt-multi-thread"] } @@ -42,6 +41,7 @@ flexi_logger = { version = "0.28.0", optional = true, default-features = false } web-sys = "0.3.69" leptos-use = "0.13.5" image-convert = { version = "0.18.0", optional = true, default-features = false } +chrono = { version = "0.4.38", default-features = false, features = ["serde", "clock"] } [features] hydrate = [ @@ -50,6 +50,7 @@ hydrate = [ "leptos_router/hydrate", "console_error_panic_hook", "wasm-bindgen", + "chrono/wasmbind", ] ssr = [ "dep:leptos_axum", diff --git a/src/albumdata.rs b/src/albumdata.rs index e42baea..2b86b25 100644 --- a/src/albumdata.rs +++ b/src/albumdata.rs @@ -1,7 +1,7 @@ use crate::models::Artist; use crate::components::dashboard_tile::DashboardTile; -use time::Date; +use chrono::NaiveDate; /// Holds information about an album /// @@ -14,7 +14,7 @@ pub struct AlbumData { /// Album artists pub artists: Vec, /// Album release date - pub release_date: Option, + pub release_date: Option, /// Path to album image, relative to the root of the web server. /// For example, `"/assets/images/Album.jpg"` pub image_path: String, diff --git a/src/api/history.rs b/src/api/history.rs index 5f6cabb..697b255 100644 --- a/src/api/history.rs +++ b/src/api/history.rs @@ -1,4 +1,4 @@ -use std::time::SystemTime; +use chrono::NaiveDateTime; use leptos::*; use crate::models::HistoryEntry; use crate::models::Song; @@ -25,7 +25,7 @@ pub async fn get_history(limit: Option) -> Result, Server /// Get the listen dates and songs of the current user. #[server(endpoint = "history/get_songs")] -pub async fn get_history_songs(limit: Option) -> Result, ServerFnError> { +pub async fn get_history_songs(limit: Option) -> Result, ServerFnError> { let user = get_user().await?; let db_con = &mut get_db_conn(); let songs = user.get_history_songs(limit, db_con) diff --git a/src/api/profile.rs b/src/api/profile.rs index c8c8716..f994b49 100644 --- a/src/api/profile.rs +++ b/src/api/profile.rs @@ -6,7 +6,7 @@ use cfg_if::cfg_if; use crate::songdata::SongData; use crate::artistdata::ArtistData; -use std::time::SystemTime; +use chrono::NaiveDateTime; cfg_if! { if #[cfg(feature = "ssr")] { @@ -67,7 +67,7 @@ pub async fn upload_picture(data: MultipartData) -> Result<(), ServerFnError> { /// Returns a list of tuples with the date the song was listened to /// and the song data, sorted by date (most recent first). #[server(endpoint = "/profile/recent_songs")] -pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result, ServerFnError> { +pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result, ServerFnError> { let mut db_con = get_db_conn(); // Get the ids of the most recent songs listened to @@ -108,7 +108,7 @@ pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result = HashMap::with_capacity(history.len()); + let mut history_songs: HashMap = HashMap::with_capacity(history.len()); for (history, song, album, artist, like, dislike) in history { let song_id = history.song_id; @@ -148,7 +148,7 @@ pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result = history_songs.into_values().collect(); + let mut history_songs: Vec<(NaiveDateTime, SongData)> = history_songs.into_values().collect(); history_songs.sort_by(|a, b| b.0.cmp(&a.0)); Ok(history_songs) } @@ -158,7 +158,7 @@ pub async fn recent_songs(for_user_id: i32, limit: Option) -> Result) +pub async fn top_songs(for_user_id: i32, start_date: NaiveDateTime, end_date: NaiveDateTime, limit: Option) -> Result, ServerFnError> { let mut db_con = get_db_conn(); @@ -259,7 +259,7 @@ pub async fn top_songs(for_user_id: i32, start_date: SystemTime, end_date: Syste /// If not provided, all artists listened to in the date range are returned. /// Returns a list of tuples with the play count and the artist data, sorted by play count (most played first). #[server(endpoint = "/profile/top_artists")] -pub async fn top_artists(for_user_id: i32, start_date: SystemTime, end_date: SystemTime, limit: Option) +pub async fn top_artists(for_user_id: i32, start_date: NaiveDateTime, end_date: NaiveDateTime, limit: Option) -> Result, ServerFnError> { let mut db_con = get_db_conn(); diff --git a/src/models.rs b/src/models.rs index b96c8d2..4e2ca03 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,5 +1,4 @@ -use std::time::SystemTime; -use time::Date; +use chrono::{NaiveDate, NaiveDateTime}; use serde::{Deserialize, Serialize}; use cfg_if::cfg_if; @@ -39,8 +38,8 @@ pub struct User { #[cfg_attr(feature = "ssr", diesel(deserialize_as = String))] pub password: Option, /// The time the user was created - #[cfg_attr(feature = "ssr", diesel(deserialize_as = SystemTime))] - pub created_at: Option, + #[cfg_attr(feature = "ssr", diesel(deserialize_as = NaiveDateTime))] + pub created_at: Option, /// Whether the user is an admin pub admin: bool, } @@ -103,7 +102,7 @@ impl User { /// #[cfg(feature = "ssr")] pub fn get_history_songs(self: &Self, limit: Option, conn: &mut PgPooledConn) -> - Result, Box> { + Result, Box> { use crate::schema::songs::dsl::*; use crate::schema::song_history::dsl::*; @@ -467,7 +466,7 @@ pub struct Album { /// The album's title pub title: String, /// The album's release date - pub release_date: Option, + pub release_date: Option, /// The path to the album's image file pub image_path: Option, } @@ -546,7 +545,7 @@ pub struct Song { /// The duration of the song in seconds pub duration: i32, /// The song's release date - pub release_date: Option, + pub release_date: Option, /// The path to the song's audio file pub storage_path: String, /// The path to the song's image file @@ -622,7 +621,7 @@ pub struct HistoryEntry { /// The id of the user who listened to the song pub user_id: i32, /// The date the song was listened to - pub date: SystemTime, + pub date: NaiveDateTime, /// The id of the song that was listened to pub song_id: i32, } diff --git a/src/pages/profile.rs b/src/pages/profile.rs index 8bec37a..744229f 100644 --- a/src/pages/profile.rs +++ b/src/pages/profile.rs @@ -1,5 +1,4 @@ use leptos::*; -use leptos::logging::*; use leptos_router::use_params_map; use leptos_icons::*; use server_fn::error::NoCustomError; @@ -17,7 +16,7 @@ use crate::models::User; use crate::users::get_user_by_id; /// Duration in seconds backwards from now to aggregate history data for -const HISTORY_SECS: u64 = 60 * 60 * 24 * 30; +const HISTORY_SECS: i64 = 60 * 60 * 24 * 30; const HISTORY_MESSAGE: &str = "Last Month"; /// How many top songs to show @@ -160,19 +159,7 @@ fn UserProfile(user: User) -> impl IntoView { {user.email} { user.created_at.map(|created_at| { - use time::{OffsetDateTime, macros::format_description}; - let format = format_description!("[month repr:long] [year]"); - let date_time = Into::::into(created_at).format(format); - - match date_time { - Ok(date_time) => { - format!(" • Joined {}", date_time) - }, - Err(e) => { - error!("Error formatting date: {}", e); - String::new() - } - } + format!(" • Joined {}", created_at.format("%B %Y")) }) } { @@ -191,11 +178,10 @@ fn UserProfile(user: User) -> impl IntoView { #[component] fn TopSongs(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { let top_songs = create_resource(move || user_id.get(), |user_id| async move { - use std::time::{SystemTime, Duration}; - - let now = SystemTime::now(); - let start = now - Duration::from_secs(HISTORY_SECS); - let top_songs = top_songs(user_id, start, now, Some(TOP_SONGS_COUNT)).await; + use chrono::{Local, Duration}; + let now = Local::now(); + let start = now - Duration::seconds(HISTORY_SECS); + let top_songs = top_songs(user_id, start.naive_utc(), now.naive_utc(), Some(TOP_SONGS_COUNT)).await; top_songs.map(|top_songs| { top_songs.into_iter().map(|(plays, song)| { @@ -283,11 +269,11 @@ fn RecentSongs(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { #[component] fn TopArtists(#[prop(into)] user_id: MaybeSignal) -> impl IntoView { let top_artists = create_resource(move || user_id.get(), |user_id| async move { - use std::time::{SystemTime, Duration}; + use chrono::{Local, Duration}; - let now = SystemTime::now(); - let start = now - Duration::from_secs(HISTORY_SECS); - let top_artists = top_artists(user_id, start, now, Some(TOP_ARTISTS_COUNT)).await; + let now = Local::now(); + let start = now - Duration::seconds(HISTORY_SECS); + let top_artists = top_artists(user_id, start.naive_utc(), now.naive_utc(), Some(TOP_ARTISTS_COUNT)).await; top_artists.map(|top_artists| { top_artists.into_iter().map(|(_plays, artist)| { diff --git a/src/songdata.rs b/src/songdata.rs index bbbb64b..a70707f 100644 --- a/src/songdata.rs +++ b/src/songdata.rs @@ -2,7 +2,7 @@ use crate::models::{Album, Artist, Song}; use crate::components::dashboard_tile::DashboardTile; use serde::{Serialize, Deserialize}; -use time::Date; +use chrono::NaiveDate; /// Holds information about a song /// @@ -22,7 +22,7 @@ pub struct SongData { /// The duration of the song in seconds pub duration: i32, /// The song's release date - pub release_date: Option, + pub release_date: Option, /// Path to song file, relative to the root of the web server. /// For example, `"/assets/audio/Song.mp3"` pub song_path: String, diff --git a/src/upload.rs b/src/upload.rs index ff7d30d..083b0d2 100644 --- a/src/upload.rs +++ b/src/upload.rs @@ -10,7 +10,7 @@ cfg_if! { use diesel::prelude::*; use log::*; use server_fn::error::NoCustomError; - use time::Date; + use chrono::NaiveDate; } } @@ -124,15 +124,14 @@ async fn validate_track_number(track_number: Field<'static>) -> Result) -> Result, ServerFnError> { +async fn validate_release_date(release_date: Field<'static>) -> Result, ServerFnError> { match release_date.text().await { Ok(release_date) => { if release_date.trim().is_empty() { return Ok(None); } - let date_format = time::macros::format_description!("[year]-[month]-[day]"); - let release_date = Date::parse(&release_date.trim(), date_format); + let release_date = NaiveDate::parse_from_str(&release_date.trim(), "%Y-%m-%d"); match release_date { Ok(release_date) => Ok(Some(release_date)), @@ -181,8 +180,7 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> { ServerError("Title field required and must precede file field".to_string()))?; let clean_title = title.replace(" ", "_").replace("/", "_"); - let date_format = time::macros::format_description!("[year]-[month]-[day]_[hour]:[minute]:[second]"); - let date_str = time::OffsetDateTime::now_utc().format(date_format).unwrap_or_default(); + let date_str = chrono::Utc::now().format("%Y-%m-%d_%H:%M:%S").to_string(); let upload_path = format!("assets/audio/upload-{}_{}.mp3", date_str, clean_title); file_name = Some(format!("upload-{}_{}.mp3", date_str, clean_title));