Fixed enter key issue

.env.example

@@ -18,4 +18,3 @@ DATABASE_URL=postgresql://libretunes:password@localhost:5432/libretunes
 
 LIBRETUNES_AUDIO_PATH=assets/audio
 LIBRETUNES_IMAGE_PATH=assets/images
-LIBRETUNES_DISABLE_SIGNUP=true

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:slim AS builder
+FROM rust:slim as builder
 
 WORKDIR /app
 

docker-compose.yml

@@ -15,7 +15,6 @@ services:
       POSTGRES_DB: ${POSTGRES_DB}
       LIBRETUNES_AUDIO_PATH: /assets/audio
       LIBRETUNES_IMAGE_PATH: /assets/images
-      LIBRETUNES_DISABLE_SIGNUP: "true"
     volumes:
       - libretunes-audio:/assets/audio
       - libretunes-images:/assets/images

src/auth.rs

@@ -19,11 +19,6 @@ use crate::users::UserCredentials;
 /// Returns a Result with the error message if the user could not be created
 #[server(endpoint = "signup")]
 pub async fn signup(new_user: User) -> Result<(), ServerFnError> {
-	// Check LIBRETUNES_DISABLE_SIGNUP env var
-	if std::env::var("LIBRETUNES_DISABLE_SIGNUP").is_ok_and(|v| v == "true") {
-		return Err(ServerFnError::<NoCustomError>::ServerError("Signup is disabled".to_string()));
-	}
-
 	use crate::users::create_user;
 
 	// Ensure the user has no id, and is not a self-proclaimed admin

src/main.rs

@@ -14,11 +14,10 @@ extern crate diesel_migrations;
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::get, Router, extract::Path, middleware::from_fn};
+    use axum::{routing::get, Router, extract::Path};
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use libretunes::app::*;
-    use libretunes::util::require_auth::require_auth_middleware;
     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};
@@ -64,7 +63,6 @@ async fn main() {
         .route("/assets/audio/:song", get(|Path(song) : Path<String>| get_asset_file(song, AssetType::Audio)))
         .route("/assets/images/:image", get(|Path(image) : Path<String>| get_asset_file(image, AssetType::Image)))
         .route("/assets/*uri", get(|uri| get_static_file(uri, "")))
-        .layer(from_fn(require_auth_middleware))
         .layer(auth_layer)
         .fallback(file_and_error_handler)
         .with_state(leptos_options);

src/models.rs

@@ -542,14 +542,24 @@ impl Album {
 	pub fn get_album_data(album_id: i32, conn: &mut PgPooledConn) -> Result<AlbumData, Box<dyn Error>> {
 		use crate::schema::*;
 
-		let artist_list: Vec<Artist> = album_artists::table
+		let album: Vec<(Album, std::option::Option<Artist>)> = albums::table
-			.filter(album_artists::album_id.eq(album_id))
+			.find(album_id)
-			.inner_join(artists::table.on(album_artists::artist_id.eq(artists::id)))
+			.left_join(songs::table.on(albums::id.nullable().eq(songs::album_id)))
-			.select(
+			.left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id)))
-				artists::all_columns
+			.select((
-			)
+				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))
@@ -661,7 +671,7 @@ impl Album {
 		
 		// Sort the songs by date
 		let mut songdata: Vec<SongData> = album_songs.into_values().collect();
-		songdata.sort_by(|a, b| a.track.cmp(&b.track));
+		songdata.sort_by(|a, b| b.track.cmp(&a.track));
 		Ok(songdata)
 	}
 }

src/pages/login.rs

@@ -16,9 +16,10 @@ pub fn Login() -> impl IntoView {
     let loading = create_rw_signal(false);
     let error_msg = create_rw_signal(None);
 
-    let toggle_password = move |_| {
+    let toggle_password = move |ev: leptos::ev::MouseEvent| {
+        ev.prevent_default();
         set_show_password.update(|show_password| *show_password = !*show_password);
-        log!("showing password");
+        log!("Password visibility toggled");
     };    
 
     let on_submit = move |ev: leptos::ev::SubmitEvent| {
@@ -94,16 +95,16 @@ pub fn Login() -> impl IntoView {
                         />
                         <span>Password</span>
                         <i></i>
-                        <Show
+                        <Show when=move || { show_password() == false }
-                            when=move || {show_password() == false}
+                            fallback=move || view! {
-                            fallback=move || view!{ <button on:click=toggle_password class="login-password-visibility">
+                                <button on:click=toggle_password class="login-password-visibility">
                                     <Icon icon=icondata::AiEyeInvisibleFilled />
-                                               </button> /> }
+                                </button>
+                            }
                         >
                         <button on:click=toggle_password class="login-password-visibility">
                             <Icon icon=icondata::AiEyeFilled />
                         </button>
-
                     </Show>
                     </div>
                     <a href="" class="forgot-pw">Forgot Password?</a>

src/util/mod.rs

@@ -3,7 +3,6 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		pub mod audio;
-		pub mod require_auth;
 	}
 }
 

src/util/require_auth.rs

@@ -1,46 +0,0 @@
-use axum::extract::Request;
-use axum::response::Response;
-use axum::body::Body;
-use axum::middleware::Next;
-use axum_login::AuthSession;
-use http::StatusCode;
-
-use crate::auth_backend::AuthBackend;
-
-use axum::extract::FromRequestParts;
-
-// Things in pkg/ are allowed automatically. This includes the CSS/JS/WASM files
-const ALLOWED_PATHS: [&str; 5] = ["/login", "/signup", "/api/login", "/api/signup", "/favicon.ico"];
-
-/**
- * Middleware to require authentication for all paths except those in ALLOWED_PATHS
- * 
- * If a user is not authenticated, they will be redirected to the login page
- */
-pub async fn require_auth_middleware(req: Request, next: Next) -> Result<Response<Body>, (StatusCode, &'static str)> {
-	let path = req.uri().path();
-
-	if !ALLOWED_PATHS.iter().any(|&x| x == path) {
-		let (mut parts, body) = req.into_parts();
-
-		let auth_session = AuthSession::<AuthBackend>::from_request_parts(&mut parts, &())
-			.await?;
-
-		if auth_session.user.is_none() {
-			let response = Response::builder()
-				.status(StatusCode::TEMPORARY_REDIRECT)
-				.header("Location", "/login")
-				.body(Body::empty())
-				.map_err(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Failed to build response"))?;
-
-			return Ok(response);
-		}
-
-		let req = Request::from_parts(parts, body);
-		let response = next.run(req).await;
-		Ok(response)
-	} else {
-		let response = next.run(req).await;
-		Ok(response)
-	}
-}

style/login.scss

@@ -8,56 +8,155 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 30rem; /* Slightly adjusted height for better layout */
+  height: 31rem;
   transform: translate(-50%, -50%);
   background: $auth-containers;
-  z-index: 10; /* Increased z-index for better stacking context */
+  z-index: 1;
-  border-radius: 0.5rem; /* Adjusted unit */
+  border-radius: 8px;
   overflow: hidden;
-  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1); /* Added subtle shadow */
 }
 
 .login-container .header h1 {
-  margin-top: 2.5rem; /* Adjusted margin for alignment */
+  margin-top: 3rem;
-  font-size: 2.4rem; /* Slightly smaller for consistency */
+  font-size: 2.5rem;
   color: $accent-color;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2); /* Added slight text shadow */
 }
-
 .login-container .login-form {
-  width: 80%; /* Adjusted width for responsiveness */
+  width: 75%;
+}
+.login-form .input-box:first-child {
+  margin-top: 1rem;
 }
-
 .login-form .input-box {
   position: relative;
-  margin-top: 2.5rem; /* Adjusted spacing */
+  margin-top: 3rem;
 }
-
 .login-form .input-box input {
+  position: relative;
   width: 100%;
-  padding: 1.1rem 0 0.6rem; /* Adjusted padding */
+  max-width: 34vw;
-  border: 1px solid rgba(255, 255, 255, 0.2); /* Added subtle border */
+  padding: 17px 0px 10px;
-  border-radius: 0.3rem; /* Added border radius */
+  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 {
-  padding: 0.8rem 0 0.5rem; /* Adjusted padding */
+  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 {
-  height: 0.2rem; /* Adjusted height for better visual hierarchy */
+  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-form .input-box input:focus ~ i {
+  height: 2.6rem;
+}
+.login-form .forgot-pw {
+  display: inline-flex;
+  margin-top: 3px;
+  font-size: 0.9rem;
+  cursor: pointer;
+  color: #8f8f8f;
+  text-decoration: underline;
+}
+.login-form .forgot-pw:hover {
+  color: #fff;
+  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: 2.5rem; /* Adjusted spacing */
+  margin-top: 3rem;
+  width: 100%;
   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 {
-  top: 15px; /* Adjusted position for better alignment */
+  position: absolute;
-  left: 15px; /* Adjusted position for better alignment */
+  left: 10px;
-  padding: 0.4rem; /* Adjusted padding */
+  top: 10px;
-  background-color: rgba(255, 255, 255, 0.1); /* Added subtle background */
+  font-size: 1.8rem;
+  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,4 +1,5 @@
-@import "theme.scss";
+@import 'theme.scss';
+
 .playbar {
 	width: 100%;
 	height: $playbar-size;
@@ -6,81 +7,101 @@
 	opacity: 0.9;
 	position: fixed;
 	bottom: 0;
+
 	.invisible-media-progress {
 		width: 100%;
-    height: 0.875rem;
+		height: 14px;
 		background-color: transparent;
 		position: absolute;
 		transform: translateY(-50%);
-    padding-top: 0.4375rem;
+		padding-top: 7px;
+		
 		.media-progress {
 			width: 100%;
-      height: 0.1875rem;
+			height: 3px;
 			background-color: $controls-click-color;
+			
 			.media-progress-solid {
 				position: relative;
-        height: 0.1875rem;
+				height: 3px;
 				background: linear-gradient(90deg, $play-grad-start, $play-grad-end);
 			}
 		}
+
 		.media-progress-solid::before {
 			content: "";
 			position: absolute;
-      height: 0.1875rem;
+			height: 3px;
 			width: 100%;
 			background: linear-gradient(90deg, $play-grad-start, $play-grad-end);
 			z-index: -1;
-      filter: blur(0.1875rem);
+			filter: blur(3px);
 		}
 	}
+
 	.playbar-left-group {
 		display: flex;
 		position: absolute;
 		top: 50%;
 		transform: translateY(-50%);
-    margin-left: 0.625rem;
+		margin-left: 10px;
+
 		.media-info-img {
-      width: 3.125rem;
+			width: 50px;
 		}
+
 		.media-info-text {
 			text-align: left;
-      margin-left: 0.625rem;
+			margin-left: 10px;
 		}
+
 		.like-dislike {
-      margin-left: 1.25rem;
+			margin-left: 20px;
 		}
 	}
+
 	.playcontrols {
 		display: flex;
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
 	}
+
 	.playduration {
 		position: absolute;
-    right: 0.625rem;
+		right: 10px;
-    top: 0.8125rem;
+		top: 13px;
 	}
+
 	.queue-toggle {
 		position: absolute;
-    bottom: 0.8125rem;
+		bottom: 13px;
-    top: 0.8125rem;
+		top: 13px;
-    right: 5.625rem;
+		right: 90px;
 	}
+
 	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: none;
+		border: transparent;
 	}
 }

style/signup.scss

@@ -21,150 +21,141 @@
   transform: translate(-50%, -50%);
   background: $auth-containers;
   z-index: 1;
-  border-radius: 0.5rem;
+  border-radius: 8px;
   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%;
-  padding: 1.0625rem 0 0.625rem;
+  max-width: 34vw;
+  padding: 17px 0px 10px;
   background: transparent;
   outline: none;
   border: none;
-  color: #fff;
+  box-shadow: none;
-  font-size: 1.1rem;
+  color: #23242a;
+  font-size: 1.1em;
   font-family: "Roboto", sans-serif;
   font-weight: 400;
-  text-indent: 0.625rem;
+  letter-spacing: 0px;
+  text-indent: 10px;
   vertical-align: middle;
+  z-index: 10;
+  color: #fff;
 }
-
 .signup-form .input-box span {
   position: absolute;
   left: 0;
-  padding: 0.9375rem 0 0.625rem;
+  padding: 15px 0px 10px;
   pointer-events: none;
   color: black;
-  font-size: 1.19rem;
+  font-size: 1.19em;
   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(-1.875rem);
+  transform: translateY(-30px);
   font-weight: 400;
 }
-
 .signup-form .input-box i {
   position: absolute;
   left: 0;
   bottom: 0;
   width: 100%;
-  height: 0.125rem;
+  height: 2px;
   background: $auth-inputs;
-  border-radius: 0.25rem;
+  border-radius: 4px;
+  overflow: hidden;
   transition: 0.5s;
   pointer-events: none;
 }
 
 .signup-form .input-box input:valid ~ i,
 .signup-form .input-box input:focus ~ i {
-  height: 1.625rem;
+  height: 2.6rem;
 }
-
 .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: 2.8125rem;
+  height: 45px;
   border: none;
-  border-radius: 0.5rem;
+  border-radius: 8px;
   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: color 0.2s;
+  transition: all 0.2s;
 }
-
 .signup-container .return {
   position: absolute;
-  left: 0.625rem;
+  left: 10px;
-  top: 0.625rem;
+  top: 10px;
   font-size: 1.8rem;
   color: white;
   cursor: pointer;
-  border-radius: 0.5rem;
+  transition: all 0.3s;
+  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: 0.3125rem;
+  right: 5px;
+  z-index: 5;
   cursor: pointer;
   border: none;
   background-color: transparent;
   color: white;
 }
-
 .pw-requirements {
   font-size: 0.7rem;
 }

style/song_list.scss

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