Changed units to be more responsive and removed unnecessary properties

Reviewed-on: LibreTunes/LibreTunes#165
Reviewed-by: Ethan Girouard <ethan@girouard.com>

migrations/2024-12-10-221544_add_playlist_track/down.sql

@@ -1 +0,0 @@
-ALTER TABLE playlist_songs DROP COLUMN track;

migrations/2024-12-10-221544_add_playlist_track/up.sql

@@ -1 +0,0 @@
-ALTER TABLE playlist_songs ADD COLUMN track INTEGER DEFAULT 1 NOT NULL;

src/api/mod.rs

@@ -2,4 +2,3 @@ pub mod history;
 pub mod profile;
 pub mod songs;
 pub mod album;
-pub mod playlist;

src/api/playlist.rs

@@ -1,22 +0,0 @@
-use leptos::*;
-use crate::playlistdata::PlaylistData;
-use crate::songdata::SongData;
-
-use cfg_if::cfg_if;
-
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		use leptos::server_fn::error::NoCustomError;
-		use crate::database::get_db_conn;
-	}
-}
-
-#[server(endpoint = "playlist/get")]
-pub async fn get_playlist(id: i32) -> Result<PlaylistData, ServerFnError> {
-    use crate::models::Playlist;
-    let db_con = &mut get_db_conn();
-    let playlist = Playlist::get_playlist_data(id,db_con)
-        .map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting playlist: {}", e)))?;
-    Ok(playlist)
-}
-

src/app.rs

@@ -8,7 +8,6 @@ use crate::pages::login::*;
 use crate::pages::signup::*;
 use crate::pages::profile::*;
 use crate::pages::albumpage::*;
-use crate::pages::playlistpage::*;
 use crate::error_template::{AppError, ErrorTemplate};
 use crate::util::state::GlobalState;
 
@@ -47,7 +46,6 @@ pub fn App() -> impl IntoView {
                         <Route path="user/:id" view=Profile />
                         <Route path="user" view=Profile />
                         <Route path="album/:id" view=AlbumPage />
-                        <Route path="playlist/:id" view=PlaylistPage />
                     </Route>
                     <Route path="/login" view=Login />
                     <Route path="/signup" view=Signup />

src/lib.rs

@@ -4,7 +4,6 @@ pub mod songdata;
 pub mod albumdata;
 pub mod artistdata;
 pub mod playstatus;
-pub mod playlistdata;
 pub mod playbar;
 pub mod database;
 pub mod queue;

src/models.rs

@@ -10,7 +10,6 @@ cfg_if! {
 		use std::error::Error;
 		use crate::songdata::SongData;
 		use crate::albumdata::AlbumData;
-		use crate::playlistdata::PlaylistData;
 	}
 }
 
@@ -543,24 +542,14 @@ impl Album {
 	pub fn get_album_data(album_id: i32, conn: &mut PgPooledConn) -> Result<AlbumData, Box<dyn Error>> {
 		use crate::schema::*;
 
-		let album: Vec<(Album, std::option::Option<Artist>)> = albums::table
+		let artist_list: Vec<Artist> = album_artists::table
-			.find(album_id)
+			.filter(album_artists::album_id.eq(album_id))
-			.left_join(songs::table.on(albums::id.nullable().eq(songs::album_id)))
+			.inner_join(artists::table.on(album_artists::artist_id.eq(artists::id)))
-			.left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id)))
+			.select(
-			.select((
+				artists::all_columns
-				albums::all_columns,
+			)
-				artists::all_columns.nullable()
-			))
-			.distinct()
 			.load(conn)?;
 
-		let mut artist_list: Vec<Artist> = Vec::new();
-
-		for (_, artist) in album {
-			if let Some(artist) = artist {
-				artist_list.push(artist);
-			}
-		}
 		// Get info of album
 		let albuminfo = albums::table
 			.filter(albums::id.eq(album_id))
@@ -672,7 +661,7 @@ impl Album {
 		
 		// Sort the songs by date
 		let mut songdata: Vec<SongData> = album_songs.into_values().collect();
-		songdata.sort_by(|a, b| b.track.cmp(&a.track));
+		songdata.sort_by(|a, b| a.track.cmp(&b.track));
 		Ok(songdata)
 	}
 }
@@ -796,44 +785,3 @@ pub struct Playlist {
 	/// The name of the playlist
 	pub name: String,
 }
-
-impl Playlist {
-	/// Obtain a playlist from its playlistid
-	/// # Arguments
-	/// 
-	/// * `playlist_id` - The id of the playlist to select
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<Playlist, Box<dyn Error>>` - A result indicating success with the desired playlist, or an error
-	///
-	#[cfg(feature = "ssr")]
-	pub fn get_playlist_data(playlist_id: i32, conn: &mut PgPooledConn) -> Result<PlaylistData, Box<dyn Error>> {
-		use crate::schema::*;
-
-		let playlist: (Playlist, User) = playlists::table
-			.find(playlist_id)
-			.inner_join(users::table.on(playlists::owner_id.eq(users::id)))
-			.select((playlists::all_columns, users::all_columns))
-			.first(conn)?;
-
-		let playlistdata = PlaylistData {
-			id: playlist.0.id.unwrap(),
-			title: playlist.0.name,
-			owner: User {
-				id: playlist.1.id,
-				username: playlist.1.username,
-				email: playlist.1.email,
-				password: None,
-				created_at: playlist.1.created_at,
-				admin: playlist.1.admin,
-			},
-			created_at: playlist.0.created_at.unwrap(),
-			updated_at: playlist.0.updated_at.unwrap(),
-			image_path: "/assets/images/placeholders/MusicPlaceholder.svg".to_string(),
-		};
-
-		Ok(playlistdata)
-	}
-}

src/pages.rs

@@ -2,4 +2,3 @@ pub mod login;
 pub mod signup;
 pub mod profile;
 pub mod albumpage;
-pub mod playlistpage;

src/pages/playlistpage.rs

@@ -1,58 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-use leptos_router::*;
-use crate::components::song_list::*;
-use crate::api::playlist::*;
-
-
-#[derive(Params, PartialEq)]
-struct PlaylistParams {
-    id: i32
-}
-
-#[component]
-pub fn PlaylistPage() -> impl IntoView {
-    let params = use_params::<PlaylistParams>();
-
-    let id = move || {params.with(|params| {
-            params.as_ref()
-                .map(|params| params.id)
-                .map_err(|e| e.clone())
-        })
-    };
-
-    let playlist_data = create_resource(
-        id,
-        |value| async move {
-            match value {
-                Ok(v) => {get_playlist(v).await},
-                Err(e) => {Err(ServerFnError::Request(format!("Error getting song data: {}", e).into()))},
-            }
-        }
-    );
-
-    view! {
-        <div class="album-page-container">
-            <div class="album-header">
-                <Suspense
-                    fallback=move || view! { <p class="loading">"Loading..."</p> }
-                >
-                    {move || {
-                        playlist_data.with( |playlist_data| {
-                            match playlist_data {
-                                Some(Ok(s)) => {
-                                    view! { <h1>{(*s).clone().title}</h1> }
-                                },
-                                Some(Err(e)) => {
-                                    view! { <div class="error">{format!("Error loading playlist : {}",e)}</div> }.into_view()
-                                },
-                                None => {view! { }.into_view()}
-                            }
-                        })
-                    }}
-                </Suspense>
-            </div>
-        </div>
-    }
-}
-

src/playlistdata.rs

@@ -1,43 +0,0 @@
-use crate::components::dashboard_tile::DashboardTile;
-use crate::models::User;
-use serde::{Serialize, Deserialize};
-
-use chrono::NaiveDateTime;
-
-/// Holds information about a playlist
-///
-/// Intended to be used in the front-end
-#[derive(Serialize, Deserialize, Clone)]
-pub struct PlaylistData {
-    /// Playlist id
-    pub id: i32,
-    /// Playlist title
-    pub title: String,
-    /// Playlist owner
-    pub owner: User,
-    /// Playlist creation time
-    pub created_at: NaiveDateTime,
-    /// Playlist update time3
-    pub updated_at: NaiveDateTime,
-    /// Path to playlist image, relative to the root of the web server.
-    /// For example, `"/assets/images/Playlist.jpg"`
-    pub image_path: String,
-}
-
-impl DashboardTile for PlaylistData {
-    fn image_path(&self) -> String {
-        self.image_path.clone()
-    }
-
-    fn title(&self) -> String {
-        self.title.clone()
-    }
-
-    fn link(&self) -> String {
-        format!("/playlist/{}", self.id)
-    }
-
-    fn description(&self) -> Option<String> {
-        Some(format!("Playlist by {}", self.owner.username))
-    }
-}

style/login.scss

@@ -8,155 +8,56 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 31rem;
+  height: 30rem; /* Slightly adjusted height for better layout */
   transform: translate(-50%, -50%);
   background: $auth-containers;
-  z-index: 1;
+  z-index: 10; /* Increased z-index for better stacking context */
-  border-radius: 8px;
+  border-radius: 0.5rem; /* Adjusted unit */
   overflow: hidden;
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1); /* Added subtle shadow */
 }
 
 .login-container .header h1 {
-  margin-top: 3rem;
+  margin-top: 2.5rem; /* Adjusted margin for alignment */
-  font-size: 2.5rem;
+  font-size: 2.4rem; /* Slightly smaller for consistency */
   color: $accent-color;
-}
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2); /* Added slight text shadow */
-.login-container .login-form {
-  width: 75%;
-}
-.login-form .input-box:first-child {
-  margin-top: 1rem;
-}
-.login-form .input-box {
-  position: relative;
-  margin-top: 3rem;
-}
-.login-form .input-box input {
-  position: relative;
-  width: 100%;
-  max-width: 34vw;
-  padding: 17px 0px 10px;
-  background: transparent;
-  outline: none;
-  border: none;
-  box-shadow: none;
-  color: #23242a;
-  font-size: 1.1em;
-  font-family: "Roboto", sans-serif;
-  font-weight: 400;
-  letter-spacing: 0px;
-  text-indent: 10px;
-  vertical-align: middle;
-  z-index: 10;
-  color: #fff;
-}
-.login-form .input-box span {
-  position: absolute;
-  left: 0;
-  padding: 15px 0px 10px;
-  pointer-events: none;
-  color: black;
-  font-size: 1.19em;
-  letter-spacing: 0.5px;
-  transition: 0.5s;
-}
-.login-form .input-box input:valid ~ span,
-.login-form .input-box input:focus ~ span {
-  color: rgb(94, 93, 93);
-  font-size: 0.9rem;
-  transform: translateY(-30px);
-  font-weight: 400;
-}
-.login-form .input-box i {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  width: 100%;
-  height: 2px;
-  background: $auth-inputs;
-  border-radius: 4px;
-  overflow: hidden;
-  transition: 0.5s;
-  pointer-events: none;
 }
 
-.login-form .input-box input:valid ~ i,
+.login-container .login-form {
-.login-form .input-box input:focus ~ i {
+  width: 80%; /* Adjusted width for responsiveness */
-  height: 2.6rem;
 }
-.login-form .forgot-pw {
+
-  display: inline-flex;
+.login-form .input-box {
-  margin-top: 3px;
+  position: relative;
-  font-size: 0.9rem;
+  margin-top: 2.5rem; /* Adjusted spacing */
-  cursor: pointer;
-  color: #8f8f8f;
-  text-decoration: underline;
 }
-.login-form .forgot-pw:hover {
+
-  color: #fff;
+.login-form .input-box input {
-  transition: all 0.2s;
-}
-.login-form .error-msg {
-  color: $error-color;
-  margin-top: 1rem;
-  height: 1rem;
-}
-.login-form .loading {
-  margin-top: 4.5rem;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: calc(1.5rem - 10px);
-}
-.login-form input[type="submit"] {
-  margin-top: 3rem;
   width: 100%;
+  padding: 1.1rem 0 0.6rem; /* Adjusted padding */
+  border: 1px solid rgba(255, 255, 255, 0.2); /* Added subtle border */
+  border-radius: 0.3rem; /* Added border radius */
+}
+
+.login-form .input-box span {
+  padding: 0.8rem 0 0.5rem; /* Adjusted padding */
+}
+
+.login-form .input-box i {
+  height: 0.2rem; /* Adjusted height for better visual hierarchy */
+}
+
+.login-form input[type="submit"] {
+  margin-top: 2.5rem; /* Adjusted spacing */
   height: 3rem;
-  border: none;
-  border-radius: 8px;
-  color: rgb(210, 207, 207);
-  cursor: pointer;
-  font-size: 1.1rem;
-  font-weight: 600;
   background-color: $accent-color;
+  border: 1px solid rgba(255, 255, 255, 0.3); /* Added border for consistency */
 }
-.login-form .go-to-signup {
+
-  color: #8f8f8f;
-  font-size: 0.9rem;
-}
-.login-form .go-to-signup a {
-  cursor: pointer;
-  color: #8f8f8f;
-  text-decoration: underline;
-}
-.login-form .go-to-signup a:hover {
-  color: black;
-  transition: all 0.2s;
-}
 .login-container .return {
-  position: absolute;
+  top: 15px; /* Adjusted position for better alignment */
-  left: 10px;
+  left: 15px; /* Adjusted position for better alignment */
-  top: 10px;
+  padding: 0.4rem; /* Adjusted padding */
-  font-size: 1.8rem;
+  background-color: rgba(255, 255, 255, 0.1); /* Added subtle background */
-  color: white;
-  cursor: pointer;
-  transition: all 0.3s;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0.3rem;
-}
-.login-container .return:hover {
-  background-color: rgba(0, 0, 0, 0.4);
-}
-.login-password-visibility {
-  position: absolute;
-  font-size: 1.7rem;
-  top: 28%;
-  right: 5px;
-  z-index: 5;
-  cursor: pointer;
-  border: none;
-  background-color: transparent;
-  color: white;
 }

style/playbar.scss

@@ -1,5 +1,4 @@
-@import 'theme.scss';
+@import "theme.scss";
-
 .playbar {
   width: 100%;
   height: $playbar-size;
@@ -7,101 +6,81 @@
   opacity: 0.9;
   position: fixed;
   bottom: 0;
-
   .invisible-media-progress {
     width: 100%;
-		height: 14px;
+    height: 0.875rem;
     background-color: transparent;
     position: absolute;
     transform: translateY(-50%);
-		padding-top: 7px;
+    padding-top: 0.4375rem;
-		
     .media-progress {
       width: 100%;
-			height: 3px;
+      height: 0.1875rem;
       background-color: $controls-click-color;
-			
       .media-progress-solid {
         position: relative;
-				height: 3px;
+        height: 0.1875rem;
         background: linear-gradient(90deg, $play-grad-start, $play-grad-end);
       }
     }
-
     .media-progress-solid::before {
       content: "";
       position: absolute;
-			height: 3px;
+      height: 0.1875rem;
       width: 100%;
       background: linear-gradient(90deg, $play-grad-start, $play-grad-end);
       z-index: -1;
-			filter: blur(3px);
+      filter: blur(0.1875rem);
     }
   }
-
   .playbar-left-group {
     display: flex;
     position: absolute;
     top: 50%;
     transform: translateY(-50%);
-		margin-left: 10px;
+    margin-left: 0.625rem;
-
     .media-info-img {
-			width: 50px;
+      width: 3.125rem;
     }
-
     .media-info-text {
       text-align: left;
-			margin-left: 10px;
+      margin-left: 0.625rem;
     }
-
     .like-dislike {
-			margin-left: 20px;
+      margin-left: 1.25rem;
     }
   }
-
   .playcontrols {
     display: flex;
     flex-direction: row;
     justify-content: center;
     align-items: center;
   }
-
   .playduration {
     position: absolute;
-		right: 10px;
+    right: 0.625rem;
-		top: 13px;
+    top: 0.8125rem;
   }
-
   .queue-toggle {
     position: absolute;
-		bottom: 13px;
+    bottom: 0.8125rem;
-		top: 13px;
+    top: 0.8125rem;
-		right: 90px;
+    right: 5.625rem;
   }
-
   button {
     .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;
+    border: none;
   }
 }

style/signup.scss

@@ -21,141 +21,150 @@
   transform: translate(-50%, -50%);
   background: $auth-containers;
   z-index: 1;
-  border-radius: 8px;
+  border-radius: 0.5rem;
   overflow: hidden;
 }
+
 .signup-container .header h1 {
   margin-top: 3rem;
   font-size: 2.5rem;
   color: $accent-color;
 }
+
 .signup-container .signup-form {
   width: 80%;
 }
+
 .signup-form .input-box {
   position: relative;
   margin-top: 3rem;
 }
+
 .signup-form .input-box:first-child {
   margin-top: 0.7rem;
 }
+
 .signup-form .input-box input {
-  position: relative;
   width: 100%;
-  max-width: 34vw;
+  padding: 1.0625rem 0 0.625rem;
-  padding: 17px 0px 10px;
   background: transparent;
   outline: none;
   border: none;
-  box-shadow: none;
+  color: #fff;
-  color: #23242a;
+  font-size: 1.1rem;
-  font-size: 1.1em;
   font-family: "Roboto", sans-serif;
   font-weight: 400;
-  letter-spacing: 0px;
+  text-indent: 0.625rem;
-  text-indent: 10px;
   vertical-align: middle;
-  z-index: 10;
-  color: #fff;
 }
+
 .signup-form .input-box span {
   position: absolute;
   left: 0;
-  padding: 15px 0px 10px;
+  padding: 0.9375rem 0 0.625rem;
   pointer-events: none;
   color: black;
-  font-size: 1.19em;
+  font-size: 1.19rem;
   letter-spacing: 0.5px;
   transition: 0.5s;
 }
+
 .signup-form .input-box input:valid ~ span,
 .signup-form .input-box input:focus ~ span {
   color: rgb(94, 93, 93);
   font-size: 0.9rem;
-  transform: translateY(-30px);
+  transform: translateY(-1.875rem);
   font-weight: 400;
 }
+
 .signup-form .input-box i {
   position: absolute;
   left: 0;
   bottom: 0;
   width: 100%;
-  height: 2px;
+  height: 0.125rem;
   background: $auth-inputs;
-  border-radius: 4px;
+  border-radius: 0.25rem;
-  overflow: hidden;
   transition: 0.5s;
   pointer-events: none;
 }
 
 .signup-form .input-box input:valid ~ i,
 .signup-form .input-box input:focus ~ i {
-  height: 2.6rem;
+  height: 1.625rem;
 }
+
 .signup-form .error-msg {
   color: $error-color;
   margin-top: 1rem;
   height: 1rem;
 }
+
 .signup-form .loading {
   margin-top: 4.5rem;
   margin-left: auto;
   margin-right: auto;
   margin-bottom: calc(1.5rem - 10px);
 }
+
 .signup-form input[type="submit"] {
   margin-top: 3.5rem;
   width: 100%;
-  height: 45px;
+  height: 2.8125rem;
   border: none;
-  border-radius: 8px;
+  border-radius: 0.5rem;
   color: white;
   cursor: pointer;
   font-size: 1.1rem;
   font-weight: 600;
   background-color: $accent-color;
 }
+
 .signup-form .go-to-login {
   color: #8f8f8f;
   font-size: 0.9rem;
 }
+
 .signup-form .go-to-login a {
-  cursor: pointer;
   color: #8f8f8f;
   text-decoration: underline;
 }
+
 .signup-form .go-to-login a:hover {
   color: black;
-  transition: all 0.2s;
+  transition: color 0.2s;
 }
+
 .signup-container .return {
   position: absolute;
-  left: 10px;
+  left: 0.625rem;
-  top: 10px;
+  top: 0.625rem;
   font-size: 1.8rem;
   color: white;
   cursor: pointer;
-  transition: all 0.3s;
+  border-radius: 0.5rem;
-  border-radius: 8px;
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 0.3rem;
+  transition: background-color 0.3s;
 }
+
 .signup-container .return:hover {
   background-color: rgba(0, 0, 0, 0.4);
 }
+
 .password-visibility {
   position: absolute;
   font-size: 1.7rem;
   top: 28%;
-  right: 5px;
+  right: 0.3125rem;
-  z-index: 5;
   cursor: pointer;
   border: none;
   background-color: transparent;
   color: white;
 }
+
 .pw-requirements {
   font-size: 0.7rem;
 }

style/song_list.scss

@@ -3,16 +3,13 @@ table.song-list {
 	border-collapse: collapse;
   
 	tr.song-list-item {
-		border: solid;
+	  border: 1px solid #303030; /* Simplified border shorthand */
-		border-width: 1px 0;
-		border-color: #303030;
 	  position: relative;
   
 	  td {
 		color: $text-controls-color;
 		white-space: nowrap;
-			padding-left: 10px;
+		padding: 0.6rem; /* Adjusted padding for consistency */
-			padding-right: 10px;
   
 		a {
 		  text-decoration: none;
@@ -25,27 +22,25 @@ table.song-list {
 	  }
   
 	  td.song-image {
-			width: 35px;
+		width: 2.2rem; /* Replaced static px with rem */
 		display: flex;
   
 		img.song-image {
 		  position: absolute;
 		  top: 50%;
-				-ms-transform: translateY(-50%);
 		  transform: translateY(-50%);
-				width: 35px;
+		  width: 2.2rem; /* Adjusted to rem */
-				height: 35px;
+		  height: 2.2rem; /* Adjusted to rem */
-				border-radius: 5px;
+		  border-radius: 0.3rem; /* Adjusted radius */
 		}
   
 		svg.song-image-overlay {
 		  position: absolute;
 		  top: 50%;
-				-ms-transform: translateY(-50%);
 		  transform: translateY(-50%);
-				width: 35px;
+		  width: 2.2rem; /* Adjusted to rem */
-				height: 35px;
+		  height: 2.2rem; /* Adjusted to rem */
-				border-radius: 5px;
+		  border-radius: 0.3rem; /* Adjusted radius */
 		  fill: $text-controls-color;
 		}
   
@@ -68,11 +63,7 @@ table.song-list {
   
 	  button {
 		svg.hmirror {
-				-moz-transform: scale(-1, 1);
+		  transform: scale(-1, 1); /* Removed redundant prefixes */
-				-webkit-transform: scale(-1, 1);
-				-o-transform: scale(-1, 1);
-				-ms-transform: scale(-1, 1);
-				transform: scale(-1, 1);
 		}
   
 		.controlbtn {
@@ -88,7 +79,7 @@ table.song-list {
 		}
   
 		background-color: transparent;
-			border: transparent;
+		border: none; /* Simplified border */
 	  }
   
 	  .hide-until-hover {
@@ -121,4 +112,4 @@ table.song-list {
 		}
 	  }
 	}
-}
+  }