Changed units to be more responsive and removed unnecessary properties

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

.env.example

@@ -18,3 +18,4 @@ 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

@@ -3,7 +3,7 @@ name: libretunes
 services:
   libretunes:
     container_name: libretunes
-    # image: registry.mregirouard.com/libretunes/libretunes:latest
+    # image: git.libretunes.xyz/libretunes/libretunes:latest
     build: .
     ports:
       - "3000:3000"
@@ -15,6 +15,7 @@ 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/albumdata.rs

@@ -1,11 +1,14 @@
 use crate::models::Artist;
 use crate::components::dashboard_tile::DashboardTile;
+use serde::{Serialize, Deserialize};
 
 use chrono::NaiveDate;
 
 /// Holds information about an album
 /// 
 /// Intended to be used in the front-end
+
+#[derive(Serialize, Deserialize, Clone)]
 pub struct AlbumData {
 	/// Album id
 	pub id: i32,
@@ -36,4 +39,4 @@ impl DashboardTile for AlbumData {
 	fn description(&self) -> Option<String> {
 		Some(format!("Album • {}", Artist::display_list(&self.artists)))
 	}
-}
+}

src/api/album.rs

@@ -0,0 +1,33 @@
+use leptos::*;
+use crate::albumdata::AlbumData;
+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 = "album/get")]
+pub async fn get_album(id: i32) -> Result<AlbumData, ServerFnError> {
+	use crate::models::Album;
+	let db_con = &mut get_db_conn();
+	let album = Album::get_album_data(id,db_con)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting album: {}", e)))?;
+	Ok(album)
+}
+
+#[server(endpoint = "album/get_songs")]
+pub async fn get_songs(id: i32) -> Result<Vec<SongData>, ServerFnError> {
+	use crate::models::Album;
+	use crate::auth::get_logged_in_user;
+	let user = get_logged_in_user().await?;
+	let db_con = &mut get_db_conn();
+	// TODO: NEEDS SONG DATA QUERIES
+	let songdata = Album::get_song_data(id,user,db_con)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting song data: {}", e)))?;
+	Ok(songdata)
+}

src/api/mod.rs

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

src/app.rs

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

src/auth.rs

@@ -19,6 +19,11 @@ 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
@@ -87,6 +92,7 @@ pub async fn logout() -> Result<(), ServerFnError> {
 	auth_session.logout().await
 		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
 
+	leptos_axum::redirect("/login");
 	Ok(())
 }
 

src/components.rs

@@ -8,3 +8,4 @@ pub mod upload;
 pub mod song_list;
 pub mod loading;
 pub mod error;
+pub mod album_info;

src/components/album_info.rs

@@ -0,0 +1,25 @@
+use leptos::leptos_dom::*;
+use leptos::*;
+use crate::albumdata::AlbumData;
+
+#[component]
+pub fn AlbumInfo(albumdata: AlbumData) -> impl IntoView {
+	view! {
+		<div class="album-info">
+			<img class="album-image" src={albumdata.image_path} alt="dashboard-tile" />
+			<div class="album-body">
+				<p class="album-title">{albumdata.title}</p>
+				<div class="album-artists">
+					{
+						albumdata.artists.iter().map(|artist| {
+							view! {
+								<a class="album-artist" href={format!("/artist/{}", artist.id.unwrap())}>{artist.name.clone()}</a>
+							}
+						}).collect::<Vec<_>>()
+					}
+				</div>
+			</div>
+		</div>
+	}.into_view()
+}
+

src/components/personal.rs

@@ -1,6 +1,8 @@
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
+use crate::auth::logout;
+use crate::util::state::GlobalState;
 
 #[component]
 pub fn Personal() -> impl IntoView {
@@ -14,18 +16,66 @@ pub fn Personal() -> impl IntoView {
 #[component]
 pub fn Profile() -> impl IntoView {
     let (dropdown_open, set_dropdown_open) = create_signal(false);
-
-    let open_dropdown = move |_| {
+	let user = GlobalState::logged_in_user();
+    
+	let open_dropdown = move |_| {
         set_dropdown_open.update(|value| *value = !*value);
-        log!("opened dropdown");
     };
+
+    let user_profile_picture = move || {
+        user.get().and_then(|user| {
+            if let Some(user) = user {
+				if user.id.is_none() {
+					return None;
+				}
+				Some(format!("/assets/images/profile/{}.webp", user.id.unwrap()))
+			} else {
+				None
+			}
+        })
+    };
+
     view! {
         <div class="profile-container">
+            <div class="profile-name">
+                <Suspense
+                    fallback=|| view!{
+                        <h1>Not Logged In</h1>
+                    }>
+					<Show
+						when=move || user.get().map(|user| user.is_some()).unwrap_or(false)
+						fallback=|| view!{
+							<h1>Not Logged In</h1>
+						}>
+                    	<h1>{move || user.get().map(|user| user.map(|user| user.username))}</h1>
+					</Show>
+                </Suspense>
+            </div>
             <div class="profile-icon" on:click=open_dropdown>
-                <Icon icon=icondata::CgProfile />
+				<Suspense fallback=|| view! { <Icon icon=icondata::CgProfile width="45" height="45"/> }>
+					<Show 
+						when=move || user.get().map(|user| user.is_some()).unwrap_or(false)
+						fallback=|| view! { <Icon icon=icondata::CgProfile width="45" height="45"/> }
+					>
+						<object class="profile-image" data={user_profile_picture} type="image/webp">
+							<Icon class="profile-image" icon=icondata::CgProfile width="45" height="45"/>
+						</object>
+					</Show>
+				</Suspense>
             </div>
             <div class="dropdown-container" style={move || if dropdown_open() {"display: flex"} else {"display: none"}}>
-                <DropDownNotLoggedIn />
+				<Suspense
+					fallback=|| view!{
+						<DropDownNotLoggedIn />
+					}>
+					<Show
+						when=move || user.get().map(|user| user.is_some()).unwrap_or(false)
+						fallback=|| view!{
+							<DropDownNotLoggedIn />
+						}>
+						<DropDownLoggedIn />
+					</Show>
+				</Suspense>
             </div>
         </div>
     }
@@ -33,10 +83,33 @@ pub fn Profile() -> impl IntoView {
 #[component]
 pub fn DropDownNotLoggedIn() -> impl IntoView {
     view! {
-        <div class="dropdown-not-logged">
-            <h1>Not Logged in!</h1>
+        <div class="dropdown-logged">
+            <h1>Not Logged In</h1>
             <a href="/login"><button class="auth-button">Log In</button></a>
-            <a href="/signup"><button class="auth-button">Sign up</button></a>
+            <a href="/signup"><button class="auth-button">Sign Up</button></a>
+        </div>
+    }
+}
+#[component]
+pub fn DropDownLoggedIn() -> impl IntoView {
+    
+	let logout = move |_| {
+        spawn_local(async move {
+            let result = logout().await;
+            if let Err(err) = result {
+                log!("Error logging out: {:?}", err);
+            } else {
+				let user = GlobalState::logged_in_user();
+				user.refetch();
+                log!("Logged out successfully");
+            }
+        });
+    };
+
+    view! {
+        <div class="dropdown-logged">
+            <h1>"Logged In"</h1>
+            <button on:click=logout class="auth-button">Log Out</button>
         </div>
     }
 }

src/main.rs

@@ -14,10 +14,11 @@ extern crate diesel_migrations;
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::get, Router, extract::Path};
+    use axum::{routing::get, Router, extract::Path, middleware::from_fn};
     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};
@@ -63,6 +64,7 @@ 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

@@ -6,8 +6,10 @@ use cfg_if::cfg_if;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use diesel::prelude::*;
-		use crate::database::PgPooledConn;
+		use crate::database::*;
 		use std::error::Error;
+		use crate::songdata::SongData;
+		use crate::albumdata::AlbumData;
 	}
 }
 
@@ -498,7 +500,7 @@ impl Album {
 		Ok(())
 	}
 
-	/// Get songs by this artist from the database
+	/// Get songs by this album from the database
 	/// 
 	/// The `id` field of this album must be present (Some) to get songs
 	/// 
@@ -525,6 +527,143 @@ impl Album {
 
 		Ok(my_songs)
 	}
+
+	/// Obtain an album from its albumid
+	/// # Arguments
+	/// 
+	/// * `album_id` - The id of the album to select
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<Album, Box<dyn Error>>` - A result indicating success with the desired album, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	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
+			.filter(album_artists::album_id.eq(album_id))
+			.inner_join(artists::table.on(album_artists::artist_id.eq(artists::id)))
+			.select(
+				artists::all_columns
+			)
+			.load(conn)?;
+
+		// Get info of album
+		let albuminfo = albums::table
+			.filter(albums::id.eq(album_id))
+			.first::<Album>(conn)?;
+
+		let img = albuminfo.image_path.unwrap_or("/assets/images/placeholders/MusicPlaceholder.svg".to_string());
+
+		let albumdata = AlbumData {
+			id: albuminfo.id.unwrap(),
+			title: albuminfo.title,
+			artists: artist_list,
+			release_date: albuminfo.release_date,
+			image_path: img
+		};
+
+		Ok(albumdata)
+	}
+
+	/// Obtain an album from its albumid
+	/// # Arguments
+	/// 
+	/// * `album_id` - The id of the album to select
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<Album, Box<dyn Error>>` - A result indicating success with the desired album, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	pub fn get_song_data(album_id: i32, user_like_dislike: Option<User>, conn: &mut PgPooledConn) -> Result<Vec<SongData>, Box<dyn Error>> {
+		use crate::schema::*;
+		use std::collections::HashMap;
+		
+		let song_list = if let Some(user_like_dislike) = user_like_dislike {
+			let user_like_dislike_id = user_like_dislike.id.unwrap();
+			let song_list: Vec<(Album, Option<Song>, Option<Artist>, Option<(i32, i32)>, Option<(i32, i32)>)> =
+				albums::table
+					.find(album_id)
+					.left_join(songs::table.on(albums::id.nullable().eq(songs::album_id)))
+					.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(user_like_dislike_id))))
+					.left_join(song_dislikes::table.on(songs::id.eq(song_dislikes::song_id).and(song_dislikes::user_id.eq(user_like_dislike_id))))
+					.select((
+						albums::all_columns,
+						songs::all_columns.nullable(),
+						artists::all_columns.nullable(),
+						song_likes::all_columns.nullable(),
+						song_dislikes::all_columns.nullable()
+					))
+					.order(songs::track.asc())
+					.load(conn)?;
+			song_list
+		} else {
+			let song_list: Vec<(Album, Option<Song>, Option<Artist>)> =
+				albums::table
+					.find(album_id)
+					.left_join(songs::table.on(albums::id.nullable().eq(songs::album_id)))
+					.left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id)))
+					.select((
+						albums::all_columns,
+						songs::all_columns.nullable(),
+						artists::all_columns.nullable()
+					))
+					.order(songs::track.asc())
+					.load(conn)?;
+
+			let song_list:  Vec<(Album, Option<Song>, Option<Artist>, Option<(i32, i32)>, Option<(i32, i32)>)> =
+				song_list.into_iter().map( |(album, song, artist)| (album, song, artist, None, None) ).collect();
+			song_list
+		};
+
+		let mut album_songs: HashMap<i32, SongData> = HashMap::with_capacity(song_list.len());
+		
+		for (album, song, artist, like, dislike) in song_list {
+			if let Some(song) = song {				
+				if let Some(stored_songdata) = album_songs.get_mut(&song.id.unwrap()) {
+					// 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.image_path.clone().unwrap_or("/assets/images/placeholders/MusicPlaceholder.svg".to_string()));
+		
+					let songdata = SongData {
+						id: song.id.unwrap(),
+						title: song.title,
+						artists: artist.map(|artist| vec![artist]).unwrap_or_default(),
+						album: Some(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,
+					};
+		
+					album_songs.insert(song.id.unwrap(), songdata);
+				}
+			} 
+		}
+		
+		// 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));
+		Ok(songdata)
+	}
 }
 
 /// Model for a song

src/pages.rs

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

src/pages/albumpage.rs

@@ -0,0 +1,87 @@
+use leptos::leptos_dom::*;
+use leptos::*;
+use leptos_router::*;
+use crate::components::song_list::*;
+use crate::api::album::*;
+use crate::components::album_info::*;
+
+
+#[derive(Params, PartialEq)]
+struct AlbumParams {
+    id: i32
+}
+
+#[component]
+pub fn AlbumPage() -> impl IntoView {
+    let params = use_params::<AlbumParams>();
+
+    let id = move || {params.with(|params| {
+            params.as_ref()
+                .map(|params| params.id)
+                .map_err(|e| e.clone())
+        })
+    };
+
+    let song_list = create_resource(
+        id,
+        |value| async move {
+            match value {
+                Ok(v) => {get_songs(v).await},
+                Err(e) => {Err(ServerFnError::Request(format!("Error getting song data: {}", e).into()))},
+            }
+        },
+    );
+
+    let albumdata = create_resource(
+        id,
+        |value| async move {
+            match value {
+                Ok(v) => {get_album(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 || {
+                        albumdata.with( |albumdata| {
+                            match albumdata {
+                                Some(Ok(s)) => {
+                                    view! { <AlbumInfo albumdata=(*s).clone() /> }
+                                },
+                                Some(Err(e)) => {
+                                    view! { <div class="error">{format!("Error loading album : {}",e)}</div> }.into_view()
+                                },
+                                None => {view! { }.into_view()}
+                            }
+                        })
+                    }}
+                </Suspense>
+            </div>
+        
+            <Suspense
+                fallback=move || view! { <p class="loading">"Loading..."</p> }
+            >
+                {move || {
+                    song_list.with( |song_list| {
+                        match song_list {
+                            Some(Ok(s)) => {
+                                view! { <SongList songs=(*s).clone()/> }
+                            },
+                            Some(Err(e)) => {
+                                view! { <div class="error">{format!("Error loading albums: : {}",e)}</div> }.into_view()
+                            },
+                            None => {view! { }.into_view()}
+                        }
+                    })
+                }}
+            </Suspense>
+        </div>
+    }
+}
+

src/pages/login.rs

@@ -4,6 +4,7 @@ use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
 use crate::users::UserCredentials;
+use crate::components::loading::Loading;
 
 #[component]
 pub fn Login() -> impl IntoView {
@@ -12,6 +13,9 @@ pub fn Login() -> impl IntoView {
 
     let (show_password, set_show_password) = create_signal(false);
 
+    let loading = create_rw_signal(false);
+    let error_msg = create_rw_signal(None);
+
     let toggle_password = move |_| {
         set_show_password.update(|show_password| *show_password = !*show_password);
         log!("showing password");
@@ -24,6 +28,9 @@ pub fn Login() -> impl IntoView {
         let password1 = password.get();
 
         spawn_local(async move {
+            loading.set(true);
+            error_msg.set(None);
+
             let user_credentials = UserCredentials {
                 username_or_email: username_or_email1,
                 password: password1
@@ -35,6 +42,7 @@ 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);
+                error_msg.set(Some(err.to_string()));
 
                 // Since we're not sure what the state is, manually refetch the user
                 user.refetch();
@@ -48,10 +56,13 @@ pub fn Login() -> impl IntoView {
                 log!("Navigated to home page after login");
             } else if let Ok(None) = login_result {
                 log!("Invalid username or password");
+                error_msg.set(Some("Invalid username or password".to_string()));
 
                 // User could be already logged in or not, so refetch the user
                 user.refetch();
             }
+
+            loading.set(false);
         });
     };
 
@@ -96,7 +107,13 @@ pub fn Login() -> impl IntoView {
                         </Show>
                     </div>
                     <a href="" class="forgot-pw">Forgot Password?</a>
-                    <input type="submit" value="Login" />
+                    <div class="error-msg" >{ move || error_msg.get() }</div>
+                    <Show
+                        when=move || !loading.get()
+                        fallback=move || view! { <Loading /> }
+                    >
+                        <input type="submit" value="Login" />
+                    </Show>
                     <span class="go-to-signup">
                         New here? <a href="/signup">Create an Account</a>
                     </span>

src/pages/signup.rs

@@ -4,6 +4,7 @@ use crate::util::state::GlobalState;
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
+use crate::components::loading::Loading;
 
 #[component]
 pub fn Signup() -> impl IntoView {
@@ -13,6 +14,9 @@ pub fn Signup() -> impl IntoView {
 
     let (show_password, set_show_password) = create_signal(false);
 
+    let loading = create_rw_signal(false);
+    let error_msg = create_rw_signal(None);
+
     let toggle_password = move |_| {
         set_show_password.update(|show_password| *show_password = !*show_password);
         log!("showing password");
@@ -30,12 +34,16 @@ pub fn Signup() -> impl IntoView {
         };
         log!("new user: {:?}", new_user);
 
+        loading.set(true);
+        error_msg.set(None);
+
         let user = GlobalState::logged_in_user();
 
         spawn_local(async move {
             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);
+                error_msg.set(Some(err.to_string()));
 
                 // Since we're not sure what the state is, manually refetch the user
                 user.refetch();
@@ -49,6 +57,8 @@ pub fn Signup() -> impl IntoView {
                 leptos_router::use_navigate()("/", Default::default());
                 log!("Navigated to home page after signup")
             }
+
+            loading.set(false);
         });
     };
 
@@ -99,7 +109,13 @@ pub fn Signup() -> impl IntoView {
                             </button>
                         </Show>
                     </div>
-                    <input type="submit" value="Sign Up"  />
+                    <div class="error-msg">{ move || error_msg.get() }</div>
+                    <Show
+                        when=move || !loading.get()
+                        fallback=move || view!{ <Loading /> }
+                    >
+                        <input type="submit" value="Sign Up" />
+                    </Show>
                     <span class="go-to-login">
                         Already Have an Account? <a href="/login" class="link" >Go to Login</a>
                     </span>

src/playbar.rs

@@ -450,7 +450,7 @@ fn QueueToggle() -> impl IntoView {
 		log!("queue button pressed, queue status: {:?}",
             GlobalState::play_status().with_untracked(|status| status.queue_open));
     };
-
+    
 	// We use this to prevent the buttons from being focused when clicked
     // If buttons were focused on clicks, then pressing space bar to play/pause would "click" the button
     // and trigger unwanted behavior

src/users.rs

@@ -117,7 +117,7 @@ pub async fn validate_user(credentials: UserCredentials) -> Result<Option<User>,
 
 /// Get a user from the database by username or email
 /// Returns a Result with the user if found, None if not found, or an error if there was a problem
-#[server(endpoint = "get_user")]
+#[server(endpoint = "find_user")]
 pub async fn get_user(username_or_email: String) -> Result<Option<User>, ServerFnError> {
 	let mut user = find_user(username_or_email).await?;
 

src/util/mod.rs

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

src/util/require_auth.rs

@@ -0,0 +1,46 @@
+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/album_page.scss

@@ -0,0 +1,80 @@
+@import 'theme.scss';
+
+.album-page-container {
+	width: 90vw;
+
+	.album-header {
+		height: 40vh;
+		width: 65vw;
+		margin: auto;
+		
+
+		padding:20px;
+
+		background-image: linear-gradient($accent-color, $background-color);
+		border-radius: 15px;
+
+		.album-info {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+.album-info {
+	display: flex;
+	flex-flow: row nowrap;
+	justify-content: space-around;
+
+	.album-image {
+		max-width: 80%;
+		max-height: 80%;
+		box-shadow: 10px 10px 50px -10px $background-color;
+	}
+
+	.album-body {
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: center;
+
+		.album-title {
+			color: $text-controls-color;
+			font-size: 40px;
+			font-weight: bold;
+			margin:15px;
+			text-align: center;
+		}
+
+		.album-artists {
+			display: flex;
+			flex-flow: row wrap;
+			justify-content: space-around;
+			align-content: space-around;
+			margin:15px;
+
+			color: $text-controls-color;
+			font-size: 20px;
+			
+			.album-artist {
+				margin: 5px;
+				text-align: center;
+				text-decoration: underline;
+			}
+		}
+	}
+
+	a {
+		color: $text-controls-color;
+	}
+	a:visited {
+		color: $text-controls-color;
+	  }
+	a:hover {
+		color: $controls-hover-color;
+	}
+
+	a:active {
+		color: $controls-click-color;
+	}
+	
+}

style/login.scss

@@ -8,144 +8,56 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 30rem;
+  height: 30rem; /* Slightly adjusted height for better layout */
   transform: translate(-50%, -50%);
   background: $auth-containers;
-  z-index: 1;
-  border-radius: 8px;
+  z-index: 10; /* Increased z-index for better stacking context */
+  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;
-  font-size: 2.5rem;
+  margin-top: 2.5rem; /* Adjusted margin for alignment */
+  font-size: 2.4rem; /* Slightly smaller for consistency */
   color: $accent-color;
-}
-.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;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2); /* Added slight text shadow */
 }
 
-.login-form .input-box input:valid ~ i,
-.login-form .input-box input:focus ~ i {
-  height: 2.6rem;
+.login-container .login-form {
+  width: 80%; /* Adjusted width for responsiveness */
 }
-.login-form .forgot-pw {
-  display: inline-flex;
-  margin-top: 3px;
-  font-size: 0.9rem;
-  cursor: pointer;
-  color: #8f8f8f;
-  text-decoration: underline;
+
+.login-form .input-box {
+  position: relative;
+  margin-top: 2.5rem; /* Adjusted spacing */
 }
-.login-form .forgot-pw:hover {
-  color: #fff;
-  transition: all 0.2s;
-}
-.login-form input[type="submit"] {
-  margin-top: 3rem;
+
+.login-form .input-box input {
   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;
-  left: 10px;
-  top: 10px;
-  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;
-}
+  top: 15px; /* Adjusted position for better alignment */
+  left: 15px; /* Adjusted position for better alignment */
+  padding: 0.4rem; /* Adjusted padding */
+  background-color: rgba(255, 255, 255, 0.1); /* Added subtle background */
+}

style/main.scss

@@ -15,6 +15,7 @@
 @import 'song_list.scss';
 @import 'profile.scss';
 @import 'loading.scss';
+@import 'album_page.scss';
 
 body {
   font-family: sans-serif;

style/personal.scss

@@ -11,9 +11,19 @@
     border-radius: 0.4rem;
     margin: 0.2rem;
     min-height: 6rem;
-    border: 2px solid rgba(89, 89, 89, 0.199);
+    border: 0.2rem solid rgba(89, 89, 89, 0.199);
     padding: 0.5rem;
 
+    .profile-name {
+      display: flex;
+      flex-direction: column;
+      margin-left: 0.5rem;
+      h1 {
+        font-size: 1.2rem;
+        margin: 0;
+      }
+    }
+
     .profile-icon {
       display: inline-flex;
       padding: 0.2rem;
@@ -21,17 +31,23 @@
       font-size: 2rem;
       border-radius: 50%;
       transition: all 0.3s;
-      height: max-content;
+      height: 45;
+      width: 45;
       margin-left: auto;
+      .profile-image {
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;
+      }
     }
 
     .profile-icon:hover {
-      transform: scale(1.1);
+      transform: scale(1.05);
       background-color: rgba(255, 255, 255, 0.1);
     }
 
     .profile-icon:active {
-      transform: scale(0.8);
+      transform: scale(0.95);
     }
     .dropdown-container {
       position: absolute;
@@ -41,10 +57,10 @@
       border-radius: 0.5rem;
       width: 10rem;
       z-index: 1;
-      background-color: red;
-      border: 1px solid grey;
+      background-color: #1c1c1c;
+      border: 0.2rem solid rgba(89, 89, 89, 0.199);
 
-      .dropdown-not-logged {
+      .dropdown-logged {
         display: flex;
         flex-direction: column;
         width: 100%;
@@ -53,21 +69,29 @@
         h1 {
           font-size: 1.2rem;
         }
+        .profile-info {
+          display: flex;
+          width: 100%;
+          justify-content: center;
+          border-top: 0.2rem solid rgba(89, 89, 89, 0.199);
+          border-bottom: 0.2rem solid rgba(89, 89, 89, 0.199);
+          h1 {
+            font-size: 1rem;
+            margin-top: 0.5rem;
+          }
+        }
         .auth-button {
+          margin-top: 0.5rem;
+          padding: 0.5rem;
+          border-radius: 0.5rem;
+          background-color: #1c1c1c;
+          border: 0.2rem solid rgba(89, 89, 89, 0.199);
+          color: white;
+          cursor: pointer;
+          transition: all 0.3s;
+          margin-bottom: 0.5rem;
         }
       }
     }
-    .dropdown-container:before {
-      content: "";
-      position: absolute;
-      top: -0.4rem;
-      right: 0.92rem;
-      width: 10px;
-      height: 10px;
-      transform: rotate(45deg);
-      background-color: red;
-      border-left: 1px solid grey;
-      border-top: 1px solid grey;
-    }
   }
 }

style/playbar.scss

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

style/signup.scss

@@ -17,135 +17,154 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 35rem;
+  height: 36rem;
   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: 17px 0px 10px;
+  padding: 1.0625rem 0 0.625rem;
   background: transparent;
   outline: none;
   border: none;
-  box-shadow: none;
-  color: #23242a;
-  font-size: 1.1em;
+  color: #fff;
+  font-size: 1.1rem;
   font-family: "Roboto", sans-serif;
   font-weight: 400;
-  letter-spacing: 0px;
-  text-indent: 10px;
+  text-indent: 0.625rem;
   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;
-  overflow: hidden;
+  border-radius: 0.25rem;
   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;
-  top: 10px;
+  left: 0.625rem;
+  top: 0.625rem;
   font-size: 1.8rem;
   color: white;
   cursor: pointer;
-  transition: all 0.3s;
-  border-radius: 8px;
+  border-radius: 0.5rem;
   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;
-  z-index: 5;
+  right: 0.3125rem;
   cursor: pointer;
   border: none;
   background-color: transparent;
   color: white;
 }
+
 .pw-requirements {
   font-size: 0.7rem;
 }

style/song_list.scss

@@ -1,124 +1,115 @@
 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;
-			}
+	  border: 1px solid #303030; /* Simplified border shorthand */
+	  position: relative;
+  
+	  td {
+		color: $text-controls-color;
+		white-space: nowrap;
+		padding: 0.6rem; /* Adjusted padding for consistency */
+  
+		a {
+		  text-decoration: none;
+		  color: $text-controls-color;
 		}
-
-		a:hover {
-			text-decoration: underline $controls-hover-color;
+	  }
+  
+	  a:hover {
+		text-decoration: underline $controls-hover-color;
+	  }
+  
+	  td.song-image {
+		width: 2.2rem; /* Replaced static px with rem */
+		display: flex;
+  
+		img.song-image {
+		  position: absolute;
+		  top: 50%;
+		  transform: translateY(-50%);
+		  width: 2.2rem; /* Adjusted to rem */
+		  height: 2.2rem; /* Adjusted to rem */
+		  border-radius: 0.3rem; /* Adjusted radius */
 		}
-		
-		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;
-			}
+  
+		svg.song-image-overlay {
+		  position: absolute;
+		  top: 50%;
+		  transform: translateY(-50%);
+		  width: 2.2rem; /* Adjusted to rem */
+		  height: 2.2rem; /* Adjusted to rem */
+		  border-radius: 0.3rem; /* Adjusted radius */
+		  fill: $text-controls-color;
 		}
-
-		td.song-list-spacer {
-			width: 20%;
+  
+		svg.song-image-overlay:hover {
+		  fill: $controls-hover-color;
 		}
-
-		td.song-list-spacer-big {
-			width: 40%;
+  
+		svg.song-image-overlay:active {
+		  fill: $controls-click-color;
 		}
-
-		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;
+	  }
+  
+	  td.song-list-spacer {
+		width: 20%;
+	  }
+  
+	  td.song-list-spacer-big {
+		width: 40%;
+	  }
+  
+	  button {
+		svg.hmirror {
+		  transform: scale(-1, 1); /* Removed redundant prefixes */
 		}
-
-		.hide-until-hover {
-			visibility: hidden;
+  
+		.controlbtn {
+		  color: $text-controls-color;
 		}
-
-		.song-playing-overlay {
-			background-color: rgba(0, 0, 0, 0.8);
+  
+		.controlbtn:hover {
+		  color: $controls-hover-color;
 		}
+  
+		.controlbtn:active {
+		  color: $controls-click-color;
+		}
+  
+		background-color: transparent;
+		border: none; /* Simplified border */
+	  }
+  
+	  .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;
+	  border-top: none;
 	}
-
+  
 	tr.song-list-item:last-child {
-		border-bottom: none;
+	  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);
-			}
+	  background-color: #303030;
+  
+	  .hide-until-hover {
+		visibility: visible;
+	  }
+  
+	  td.song-image {
+		svg.song-image-overlay {
+		  background-color: rgba(0, 0, 0, 0.8);
 		}
+	  }
 	}
-}
+  }

style/theme.scss

@@ -10,10 +10,12 @@ $controls-click-color: #909090;
 $play-bar-background-color: #212121;
 $play-grad-start: #0a0533;
 $play-grad-end: $accent-color;
+$border-color: #7851ed;
 $queue-background-color: $play-bar-background-color;
+$error-color: red;
 
 $auth-inputs: #796dd4;
 $auth-containers: white;
 
 $dashboard-tile-size: 200px;
-$playbar-size: 75px;
+$playbar-size: 75px;