fixed input bug

Fix doc comment indentation
added background overlay when adding anything
2024-05-29 10:54:13 -04:00 · 2024-05-26 20:44:40 -04:00 · 2024-05-23 00:02:13 -04:00 · 2024-05-22 23:17:52 -04:00 · 2024-05-22 23:04:21 -04:00 · 2024-05-22 20:24:30 -04:00
38 changed files with 828 additions and 694 deletions
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@ -1,119 +0,0 @@
-name: Push Workflows
-on: push
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
-      - name: Install cargo-leptos
-        run: cargo install cargo-leptos
-      - name: Build project
-        env:
-          RUSTFLAGS: "-D warnings"
-        run: cargo-leptos build
-
-  docker-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.registry }}
-          username: ${{ env.actions_user }}
-          password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
-      - name: Get Image Name
-        id: get-image-name
-        run: |
-          echo "IMAGE_NAME=$(echo ${{ env.registry }}/${{ gitea.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: "${{ steps.get-image-name.outputs.IMAGE_NAME }}:${{ gitea.sha }}"
-          cache-from: type=registry,ref=${{ steps.get-image-name.outputs.IMAGE_NAME }}:${{ gitea.sha }}
-          cache-to: type=inline
-      - name: Build and push Docker image with "latest" tag
-        uses: docker/build-push-action@v5
-        if: gitea.ref == 'refs/heads/main'
-        with:
-          push: true
-          tags: "${{ steps.get-image-name.outputs.IMAGE_NAME }}:latest"
-          cache-from: type=registry,ref=${{ steps.get-image-name.outputs.IMAGE_NAME }}:latest
-          cache-to: type=inline
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
-      - name: Test project
-        run: cargo test --all-targets --all-features
-
-  leptos-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
-      - name: Install cargo-leptos
-        run: cargo install cargo-leptos
-      - name: Run Leptos tests
-        run: cargo-leptos test
-
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
-      - name: Generate docs
-        run: cargo doc --no-deps
-      - name: Upload docs
-        uses: actions/upload-artifact@v3
-        with:
-          name: docs
-          path: target/doc
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,101 @@
+# Build the project
+build:
+  needs: []
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  variables:
+    RUSTFLAGS: "-D warnings"
+  script:
+    - cargo-leptos build
+
+.docker:
+  image: docker:latest
+  services:
+    - docker:dind
+  tags:
+    - docker
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
+# Build the docker image and push it to the registry
+docker-build:
+  needs: ["build"]
+  extends: .docker
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
+      # If running on the default branch, tag as latest
+    - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then docker tag
+        $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+        $CI_REGISTRY_IMAGE:latest; fi
+    - docker push $CI_REGISTRY_IMAGE --all-tags
+
+# Run leptos tests
+leptos-tests:
+  needs: ["build"]
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  script:
+    - cargo-leptos test
+
+# Run all tests
+tests:
+  needs: ["build"]
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  script:
+    - cargo test --all-targets --all-features
+
+# Generate docs
+cargo-doc:
+  needs: []
+  image: rust:slim
+  script:
+    - cargo doc --no-deps
+  artifacts:
+    paths:
+      - target/doc
+
+# Start the review environment
+start-review:
+  extends: .docker
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+  script:
+    - apk add curl openssl
+    - cd cicd
+    - echo "$CLOUDFLARE_TUNNEL_AUTH_JSON" > tunnel-auth.json
+    - ./add-dns.sh $CLOUDFLARE_ZONE_ID review-$CI_COMMIT_SHORT_SHA libretunes-auto-review $CLOUDFLARE_API_TOKEN $CLOUDFLARE_TUNNEL_ID
+    - ./create-tunnel-config.sh http://libretunes:3000 review-$CI_COMMIT_SHORT_SHA.libretunes.xyz $CLOUDFLARE_TUNNEL_ID
+    - export COMPOSE_PROJECT_NAME=review-$CI_COMMIT_SHORT_SHA
+    - export POSTGRES_PASSWORD=$(openssl rand -hex 16)
+    - export LIBRETUNES_VERSION=$CI_COMMIT_SHORT_SHA
+    - docker compose --file docker-compose-cicd.yml pull
+    - docker compose --file docker-compose-cicd.yml create
+    - export CONFIG_VOL_NAME=review-${CI_COMMIT_SHORT_SHA}_cloudflared-config
+    - export TMP_CONTAINER_NAME=$(docker run --rm -d -v $CONFIG_VOL_NAME:/data busybox sh -c "sleep infinity")
+    - docker cp tunnel-auth.json $TMP_CONTAINER_NAME:/data/auth.json
+    - docker cp cloudflared-tunnel-config.yml $TMP_CONTAINER_NAME:/data/config.yml
+    - docker stop $TMP_CONTAINER_NAME
+    - docker compose --file docker-compose-cicd.yml up -d
+  environment:
+    name: review/$CI_COMMIT_SHORT_SHA
+    url: https://review-$CI_COMMIT_SHORT_SHA.libretunes.xyz
+    on_stop: stop-review
+    auto_stop_in: 1 week
+
+# Stop the review environment
+stop-review:
+  needs: ["start-review"]
+  extends: .docker
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+  allow_failure: true
+  script:
+    - apk add jq curl
+    - ./cicd/remove-dns.sh $CLOUDFLARE_ZONE_ID review-$CI_COMMIT_SHORT_SHA.libretunes.xyz libretunes-auto-review $CLOUDFLARE_API_TOKEN
+    - export COMPOSE_PROJECT_NAME=review-$CI_COMMIT_SHORT_SHA
+    - export LIBRETUNES_VERSION=$CI_COMMIT_SHORT_SHA
+    - docker compose --file cicd/docker-compose-cicd.yml down
+    - docker compose --file cicd/docker-compose-cicd.yml rm -f -v
+  environment:
+    name: review/$CI_COMMIT_SHORT_SHA
+    action: stop
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2600,9 +2600,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
 "deranged",
 "itoa",
@ -2621,9 +2621,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
 "num-conv",
 "time-core",
@ -3061,20 +3061,19 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
 "cfg-if",
- "once_cell",
 "wasm-bindgen-macro",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
 "bumpalo",
 "log",
@ -3099,9 +3098,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@ -3109,9 +3108,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3122,9 +3121,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"

 [[package]]
 name = "wasm-streams"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -15,7 +15,7 @@ leptos = { version = "0.6", default-features = false, features = ["nightly"] }
 leptos_meta = { version = "0.6", features = ["nightly"] }
 leptos_axum = { version = "0.6", optional = true }
 leptos_router = { version = "0.6", features = ["nightly"] }
-wasm-bindgen = { version = "=0.2.93", default-features = false, optional = true }
+wasm-bindgen = { version = "=0.2.92", default-features = false, optional = true }
 leptos_icons = { version = "0.3.0" }
 icondata = { version = "0.3.0" }
 dotenv = { version = "0.15.0", optional = true }
--- a/8
+++ b/8
@ -1,20 +1,14 @@
-FROM clux/muslrust:nightly AS builder
+FROM registry.mregirouard.com/libretunes/ops/docker-leptos/musl:latest as builder

 WORKDIR /app

-RUN rustup target add wasm32-unknown-unknown
-
 # Install a few dependencies
 RUN set -eux; \
    apt-get update; \
    apt-get install -y --no-install-recommends \
-		pkg-config \
-		clang \
 		npm; \
 	rm -rf /var/lib/apt/lists/*

-RUN cargo install cargo-leptos
-
 RUN npm install tailwindcss@3.1.8 -g

 # Copy project dependency manifests
--- a/assets/images/placeholders/MusicPlaceholder.svg
+++ b/assets/images/placeholders/MusicPlaceholder.svg
@ -1 +0,0 @@
-<svg version="1.1" viewBox="0.0 0.0 960.0 960.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 960.0l-960.0 0l0 -960.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#4032a8" d="m0 0l960.0 0l0 960.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m290.11365 265.52475l35.496063 0l0 471.3386l-35.496063 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m115.68951 737.6639l0 0c0 -36.946594 46.99247 -66.897644 104.960625 -66.897644l0 0c57.968155 0 104.96065 29.95105 104.96065 66.897644l0 0c0 36.946533 -46.992493 66.897644 -104.96065 66.897644l0 0c-57.968155 0 -104.960625 -29.95111 -104.960625 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m723.79346 175.86597l35.496033 0l0 471.33856l-35.496033 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m549.3693 648.00507l0 0c0 -36.946533 46.99243 -66.897644 104.96063 -66.897644l0 0c57.96814 0 104.96057 29.95111 104.96057 66.897644l0 0c0 36.946533 -46.99243 66.897644 -104.96057 66.897644l0 0c-57.9682 0 -104.96063 -29.95111 -104.96063 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m759.2711 155.4385l-0.01727295 94.79588l-427.05206 100.14052l-42.09601 -84.920654z" fill-rule="evenodd"/><path fill="#ffffff" d="m421.49164 234.64502l21.039368 89.85828l-131.40158 30.803131l-21.039368 -89.85828z" fill-rule="evenodd"/></g></svg>
--- a/migrations/2024-05-10-195644_create_likes_dislikes_table/down.sql
+++ b/migrations/2024-05-10-195644_create_likes_dislikes_table/down.sql
@ -1,2 +0,0 @@
-DROP TABLE song_likes;
-DROP TABLE song_dislikes;
--- a/migrations/2024-05-10-195644_create_likes_dislikes_table/up.sql
+++ b/migrations/2024-05-10-195644_create_likes_dislikes_table/up.sql
@ -1,11 +0,0 @@
-CREATE TABLE song_likes (
-	song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL,
-	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (song_id, user_id)
-);
-
-CREATE TABLE song_dislikes (
-	song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL,
-	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (song_id, user_id)
-);
--- a/src/api/albums.rs
+++ b/src/api/albums.rs
@ -0,0 +1,66 @@
+use leptos::*;
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use crate::database::get_db_conn;
+        use diesel::prelude::*;
+        use time::Date;
+    }
+}
+
+/// Add an album to the database
+/// 
+/// # Arguments
+/// 
+/// * `album_title` - The name of the artist to add
+/// * `release_data` - The release date of the album (Optional)
+/// * `image_path` - The path to the album's image file (Optional)
+/// 
+/// # Returns
+///  * `Result<(), Box<dyn Error>>` - A empty result if successful, or an error
+/// 
+#[server(endpoint = "albums/add-album")]
+pub async fn add_album(album_title: String, release_date: Option<String>, image_path: Option<String>) -> Result<(), ServerFnError> {
+    use crate::schema::albums::{self};
+    use crate::models::Album;
+    use leptos::server_fn::error::NoCustomError;
+    
+    let date_format = time::macros::format_description!("[year]-[month]-[day]");
+    let parsed_release_date = match release_date {
+        Some(date) => {
+            match Date::parse(&date, &date_format) {
+                Ok(parsed_date) => Some(parsed_date),
+                Err(_e) => return Err(ServerFnError::<NoCustomError>::ServerError("Invalid release date".to_string()))
+            }
+        },
+        None => None
+    };
+
+    let image_path_arg = match image_path {
+        Some(image_path) => {
+            if image_path.is_empty() {
+                None
+            } else {
+                Some(image_path)
+            }
+        },
+        None => None
+    };
+    
+    let new_album = Album {
+        id: None,
+        title: album_title,
+        release_date: parsed_release_date,
+        image_path: image_path_arg
+    };
+
+    let db = &mut get_db_conn();
+    diesel::insert_into(albums::table)
+        .values(&new_album)
+        .execute(db)
+        .map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error adding album: {}", e)))?;
+
+    Ok(())
+}
--- a/src/api/artists.rs
+++ b/src/api/artists.rs
@ -0,0 +1,39 @@
+use leptos::*;
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use crate::database::get_db_conn;
+        use diesel::prelude::*;
+    }
+}
+
+/// Add an artist to the database
+/// 
+/// # Arguments
+/// 
+/// * `artist_name` - The name of the artist to add
+/// 
+/// # Returns
+///  * `Result<(), Box<dyn Error>>` - A empty result if successful, or an error
+/// 
+#[server(endpoint = "artists/add-artist")]
+pub async fn add_artist(artist_name: String) -> Result<(), ServerFnError> {
+    use crate::schema::artists::dsl::*;
+    use crate::models::Artist;
+    use leptos::server_fn::error::NoCustomError;
+
+    let new_artist = Artist {
+        id: None,
+        name: artist_name,
+    };
+
+    let db = &mut get_db_conn();
+    diesel::insert_into(artists)
+        .values(&new_artist)
+        .execute(db)
+        .map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error adding artist: {}", e)))?;
+    
+    Ok(())
+}
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@ -1 +1,2 @@
-pub mod songs;
+pub mod artists;
+pub mod albums;
--- a/src/api/songs.rs
+++ b/src/api/songs.rs
@ -1,55 +0,0 @@
-use leptos::*;
-
-use cfg_if::cfg_if;
-
-
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		use leptos::server_fn::error::NoCustomError;
-		use crate::database::get_db_conn;
-		use crate::auth::get_user;
-	}
-}
-
-/// Like or unlike a song
-#[server(endpoint = "songs/set_like")]
-pub async fn set_like_song(song_id: i32, like: bool) -> Result<(), ServerFnError> {
-	let user = get_user().await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error getting user: {}", e)))?;
-	
-	let db_con = &mut get_db_conn();
-
-	user.set_like_song(song_id, like, db_con).await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error liking song: {}", e)))
-}
-
-/// Dislike or remove dislike from a song
-#[server(endpoint = "songs/set_dislike")]
-pub async fn set_dislike_song(song_id: i32, dislike: bool) -> Result<(), ServerFnError> {
-	let user = get_user().await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error getting user: {}", e)))?;
-	
-	let db_con = &mut get_db_conn();
-
-	user.set_dislike_song(song_id, dislike, db_con).await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error disliking song: {}", e)))
-}
-
-/// Get the like and dislike status of a song
-#[server(endpoint = "songs/get_like_dislike")]
-pub async fn get_like_dislike_song(song_id: i32) -> Result<(bool, bool), ServerFnError> {
-	let user = get_user().await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error getting user: {}", e)))?;
-
-	let db_con = &mut get_db_conn();
-
-	// TODO this could probably be done more efficiently with a tokio::try_join, but 
-	// doing so is much more complicated than it would initially seem
-
-	let like = user.get_like_song(song_id, db_con).await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error getting song liked: {}", e)))?;
-	let dislike = user.get_dislike_song(song_id, db_con).await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error getting song disliked: {}", e)))?;
-
-	Ok((like, dislike))
-}
--- a/src/app.rs
+++ b/src/app.rs
@ -6,7 +6,6 @@ use leptos_meta::*;
 use leptos_router::*;
 use crate::pages::login::*;
 use crate::pages::signup::*;
-use crate::pages::audiotest::*;
 use crate::error_template::{AppError, ErrorTemplate};


@ -18,6 +17,8 @@ pub fn App() -> impl IntoView {
    let play_status = PlayStatus::default();
    let play_status = create_rw_signal(play_status);
    let upload_open = create_rw_signal(false);
+    let add_artist_open = create_rw_signal(false);
+    let add_album_open = create_rw_signal(false);

    view! {
        // injects a stylesheet into the document <head>
@ -38,14 +39,19 @@ pub fn App() -> impl IntoView {
        }>
            <main>
                <Routes>
-                    <Route path="" view=move || view! { <HomePage play_status=play_status upload_open=upload_open/> }>
+                    <Route path="" view=move || 
+                    view! { <HomePage play_status=play_status 
+                                upload_open=upload_open 
+                                add_artist_open=add_artist_open 
+                                add_album_open=add_album_open
+                            /> 
+                        }>
                        <Route path="" view=Dashboard />
                        <Route path="dashboard" view=Dashboard />
                        <Route path="search" view=Search />
                    </Route>
                    <Route path="/login" view=Login />
                    <Route path="/signup" view=Signup />
-                    <Route path="/audiotest" view=AudioTest />
                </Routes>
            </main>
        </Router>
@ -57,14 +63,18 @@ use crate::components::dashboard::*;
 use crate::components::search::*;
 use crate::components::personal::*;
 use crate::components::upload::*;
+use crate::components::add_artist::AddArtist;
+use crate::components::add_album::AddAlbum;

 /// Renders the home page of your application.
 #[component]
-fn HomePage(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>) -> impl IntoView {
+fn HomePage(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>, add_artist_open: RwSignal<bool>, add_album_open: RwSignal<bool>) -> impl IntoView {
    view! {
        <div class="home-container">
            <Upload open=upload_open/>
-            <Sidebar upload_open=upload_open/>
+            <AddArtist open=add_artist_open/>
+            <AddAlbum open=add_album_open/>
+            <Sidebar upload_open=upload_open add_artist_open=add_artist_open add_album_open=add_album_open/>
            // This <Outlet /> will render the child route components
            <Outlet />
            <Personal />
--- a/src/audioplayer.rs
+++ b/src/audioplayer.rs
--- a/src/auth.rs
+++ b/src/auth.rs
@ -122,29 +122,6 @@ pub async fn require_auth() -> Result<(), ServerFnError> {
 	})
 }

-/// Get the current logged-in user
-/// Returns a Result with the user if they are logged in
-/// Returns an error if the user is not logged in, or if there is an error getting the user
-/// Intended to be used in a route to get the current user:
-/// ```rust
-/// use leptos::*;
-/// use libretunes::auth::get_user;
-/// #[server(endpoint = "user_route")]
-/// pub async fn user_route() -> Result<(), ServerFnError> {
-/// 	let user = get_user().await?;
-/// 	println!("Logged in as: {}", user.username);
-/// 	// Do something with the user
-/// 	Ok(())
-/// }
-/// ```
-#[cfg(feature = "ssr")]
-pub async fn get_user() -> Result<User, ServerFnError> {
-	let auth_session = extract::<AuthSession<AuthBackend>>().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
-
-	auth_session.user.ok_or(ServerFnError::<NoCustomError>::ServerError("User not logged in".to_string()))
-}
-
 /// 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")]
--- a/src/components.rs
+++ b/src/components.rs
@ -3,3 +3,6 @@ pub mod dashboard;
 pub mod search;
 pub mod personal;
 pub mod upload;
+pub mod upload_dropdown;
+pub mod add_artist;
+pub mod add_album;
--- a/src/components/add_album.rs
+++ b/src/components/add_album.rs
@ -0,0 +1,92 @@
+use leptos::*;
+use leptos::leptos_dom::log;
+use leptos_icons::*;
+use crate::api::albums::add_album;
+
+#[component]
+pub fn AddAlbumBtn(add_album_open: RwSignal<bool>) -> impl IntoView {
+    let open_dialog = move |_| {
+        add_album_open.set(true);
+    };
+    view! {
+        <button class="add-album-btn add-btns" on:click=open_dialog>
+            Add Album
+        </button>
+    }
+}
+#[component]
+pub fn AddAlbum(open: RwSignal<bool>) -> impl IntoView {
+    let album_title = create_rw_signal("".to_string());
+    let release_date = create_rw_signal("".to_string());
+    let image_path = create_rw_signal("".to_string());
+
+    let close_dialog = move |ev: leptos::ev::MouseEvent| {
+		ev.prevent_default();
+		open.set(false);
+	};
+
+    let on_add_album = move |ev: leptos::ev::SubmitEvent| {
+        ev.prevent_default();
+        let album_title_clone = album_title.get();
+        let release_date_clone = Some(release_date.get());
+        let image_path_clone = Some(image_path.get());
+
+        spawn_local(async move {
+            let add_album_result = add_album(album_title_clone, release_date_clone, image_path_clone).await;
+            if let Err(err) = add_album_result {
+                log!("Error adding album: {:?}", err);
+            } else if let Ok(album) = add_album_result {
+                log!("Added album: {:?}", album);
+                album_title.set("".to_string());
+                release_date.set("".to_string());
+                image_path.set("".to_string());
+            }
+        })
+    };
+
+    view! {
+        <Show when=open fallback=move|| view!{}>
+            <div class="add-album-container">
+                <div class="upload-header">
+                    <h1>Add Album</h1>
+                </div>
+                <div class="close-button" on:click=close_dialog><Icon icon=icondata::IoClose /></div>
+                <form class="create-album-form" action="POST" on:submit=on_add_album>
+                    <div class="input-bx">
+                        <input type="text" required class="text-input" 
+                            prop:value=album_title
+                            on:input=move |ev: leptos::ev::Event| {
+                                album_title.set(event_target_value(&ev));
+                            }        
+                            required 
+                         />
+                        <span>Album Title</span>
+                    </div>
+                    <div class="release-date">
+						<div class="left">
+							<span>Release</span>
+							<span>Date</span>
+						</div>
+						<input class="info" type="date"
+                            prop:value=release_date
+                            on:input=move |ev: leptos::ev::Event| {
+                                release_date.set(event_target_value(&ev));
+                            }
+                        />
+					</div>
+                    <div class="input-bx">
+                        <input type="text" class="text-input" 
+                            prop:value=image_path
+                            on:input=move |ev: leptos::ev::Event| {
+                                image_path.set(event_target_value(&ev));
+                            }        
+                         />
+                        <span>Image Path</span>
+                    </div>
+                    <button type="submit" class="upload-button">Add</button>
+                </form>
+            </div>
+        </Show>
+    }
+
+}
--- a/src/components/add_artist.rs
+++ b/src/components/add_artist.rs
@ -0,0 +1,62 @@
+use leptos::*;
+use leptos::leptos_dom::log;
+use leptos_icons::*;
+use crate::api::artists::add_artist;
+
+#[component]
+pub fn AddArtistBtn(add_artist_open: RwSignal<bool>) -> impl IntoView {
+    let open_dialog = move |_| {
+        add_artist_open.set(true);
+    };
+    view! {
+        <button class="add-artist-btn add-btns" on:click=open_dialog>
+            Add Artist
+        </button>
+    }
+}
+#[component]
+pub fn AddArtist(open: RwSignal<bool>) -> impl IntoView {
+    let artist_name = create_rw_signal("".to_string());
+
+    let close_dialog = move |ev: leptos::ev::MouseEvent| {
+		ev.prevent_default();
+		open.set(false);
+	};
+    let on_add_artist = move |ev: leptos::ev::SubmitEvent| {
+        ev.prevent_default();
+        let artist_name_clone = artist_name.get();
+        spawn_local(async move {
+            let add_artist_result = add_artist(artist_name_clone).await;
+            if let Err(err) = add_artist_result {
+                log!("Error adding artist: {:?}", err);
+            } else if let Ok(artist) = add_artist_result {
+                log!("Added artist: {:?}", artist);
+                artist_name.set("".to_string());
+            }
+        })
+    };
+
+    view! {
+        <Show when=open fallback=move|| view!{}>
+            <div class="add-artist-container">
+                <div class="upload-header">
+                    <h1>Add Artist</h1>
+                </div>
+                <div class="close-button" on:click=close_dialog><Icon icon=icondata::IoClose /></div>
+                <form class="create-artist-form" action="POST" on:submit=on_add_artist>
+                    <div class="input-bx">
+                        <input type="text" name="title" required class="text-input" 
+                            prop:value=artist_name
+                            on:input=move |ev: leptos::ev::Event| {
+                                artist_name.set(event_target_value(&ev));
+                            }        
+                            required 
+                         />
+                        <span>Artist Name</span>
+                    </div>
+                    <button type="submit" class="upload-button">Add</button>
+                </form>
+            </div>
+        </Show>
+    }
+}
--- a/src/components/sidebar.rs
+++ b/src/components/sidebar.rs
@ -1,13 +1,15 @@
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
-use crate::components::upload::*;
+use crate::components::upload_dropdown::*;

 #[component]
-pub fn Sidebar(upload_open: RwSignal<bool>) -> impl IntoView {
+pub fn Sidebar(upload_open: RwSignal<bool>, add_artist_open: RwSignal<bool>, add_album_open: RwSignal<bool>) -> impl IntoView {
    use leptos_router::use_location;
    let location = use_location();

+    let dropdown_open = create_rw_signal(false);
+
    let on_dashboard = Signal::derive(
        move || location.pathname.get().starts_with("/dashboard") || location.pathname.get() == "/",
    );
@ -19,8 +21,26 @@ pub fn Sidebar(upload_open: RwSignal<bool>) -> impl IntoView {
    view! {
        <div class="sidebar-container">
            <div class="sidebar-top-container">
+                <Show
+                    when=move || {upload_open.get() || add_artist_open.get() || add_album_open.get()}
+                    fallback=move || view! {}
+                >
+                    <div class="upload-overlay" on:click=move |_| {
+                        upload_open.set(false);
+                        add_artist_open.set(false);
+                        add_album_open.set(false);
+                    }></div>
+                </Show>
                <h2 class="header">LibreTunes</h2>
-                <UploadBtn dialog_open=upload_open />
+                <div class="upload-dropdown-container">
+                    <UploadDropdownBtn dropdown_open=dropdown_open/>
+                    <Show
+                        when= move || dropdown_open()
+                        fallback=move || view! {}
+                    >
+                        <UploadDropdown dropdown_open=dropdown_open upload_open=upload_open add_artist_open=add_artist_open add_album_open=add_album_open/>
+                    </Show>
+                </div>
                <a class="buttons" href="/dashboard" style={move || if on_dashboard() {"color: #e1e3e1"} else {""}} >
                    <Icon icon=icondata::OcHomeFillLg />
                    <h1>Dashboard</h1>
--- a/src/components/upload.rs
+++ b/src/components/upload.rs
@ -16,11 +16,8 @@ pub fn UploadBtn(dialog_open: RwSignal<bool>) -> impl IntoView {
 	};

 	view! {
-		<button class="upload-btn" on:click=open_dialog>
-			<div class="add-sign">
-				<Icon icon=icondata::IoAddSharp />
-			</div>
-			Upload
+		<button class="upload-btn add-btns" on:click=open_dialog>
+			Upload Song
 		</button>
 	}
 }
--- a/src/components/upload_dropdown.rs
+++ b/src/components/upload_dropdown.rs
@ -0,0 +1,30 @@
+use leptos::*;
+use leptos_icons::*;
+use crate::components::upload::*;
+use crate::components::add_artist::*;
+use crate::components::add_album::*;
+
+#[component]
+pub fn UploadDropdownBtn(dropdown_open: RwSignal<bool>) -> impl IntoView {
+    let open_dropdown = move |_| {
+        dropdown_open.set(!dropdown_open.get());
+    };
+    view! {
+        <button class={move || if dropdown_open() {"upload-dropdown-btn upload-dropdown-btn-active"} else {"upload-dropdown-btn"}} on:click=open_dropdown>
+			<div class="add-sign">
+				<Icon icon=icondata::IoAddSharp />
+			</div>
+		</button>
+    }
+}
+
+#[component]
+pub fn UploadDropdown(dropdown_open: RwSignal<bool>, upload_open: RwSignal<bool>, add_artist_open: RwSignal<bool>, add_album_open: RwSignal<bool>) -> impl IntoView {
+    view! {
+        <div class="upload-dropdown" on:click=move |_| dropdown_open.set(false)>
+            <UploadBtn dialog_open=upload_open />
+            <AddArtistBtn add_artist_open=add_artist_open/>
+            <AddAlbumBtn add_album_open=add_album_open/>
+        </div>
+    }
+}
--- a/src/fileserv.rs
+++ b/src/fileserv.rs
@ -29,11 +29,11 @@ cfg_if! { if #[cfg(feature = "ssr")] {
        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() {
-            Some(res) => Ok(res.into_response()),
-            None => Err((
+        match ServeDir::new(root).oneshot(req).await {
+            Ok(res) => Ok(res.into_response()),
+            Err(err) => Err((
                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Something went wrong"),
+                format!("Something went wrong: {err}"),
            )),
        }
    }
--- a/src/lib.rs
+++ b/src/lib.rs
@ -3,7 +3,6 @@ pub mod auth;
 pub mod songdata;
 pub mod playstatus;
 pub mod playbar;
-pub mod audioplayer;
 pub mod database;
 pub mod queue;
 pub mod song;
@ -14,9 +13,9 @@ pub mod users;
 pub mod search;
 pub mod fileserv;
 pub mod error_template;
-pub mod api;
 pub mod upload;
 pub mod util;
+pub mod api;

 use cfg_if::cfg_if;

--- a/src/main.rs
+++ b/src/main.rs
@ -1,10 +1,10 @@
 // Needed for building in Docker container
 // See https://github.com/clux/muslrust?tab=readme-ov-file#diesel-and-pq-builds
 // See https://github.com/sgrif/pq-sys/issues/25
-#[cfg(target_env = "musl")]
+#[cfg(target = "x86_64-unknown-linux-musl")]
 extern crate openssl;

-#[cfg(target_env = "musl")]
+#[cfg(target = "x86_64-unknown-linux-musl")]
 #[macro_use]
 extern crate diesel;

--- a/src/models.rs
+++ b/src/models.rs
@ -45,135 +45,6 @@ pub struct User {
 	pub admin: bool,
 }

-impl User {
-	/// Like or unlike a song for this user
-	/// If likeing a song, remove dislike if it exists
-	#[cfg(feature = "ssr")]
-	pub async fn set_like_song(self: &Self, song_id: i32, like: bool, conn: &mut PgPooledConn) -> 
-		Result<(), Box<dyn Error>> {
-		use log::*;
-		debug!("Setting like for song {} to {}", song_id, like);
-
-		use crate::schema::song_likes;
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to like/un-like a song")?;
-
-		if like {
-			diesel::insert_into(song_likes::table)
-				.values((song_likes::song_id.eq(song_id), song_likes::user_id.eq(my_id)))
-				.execute(conn)?;
-
-			// Remove dislike if it exists
-			diesel::delete(song_dislikes::table.filter(song_dislikes::song_id.eq(song_id)
-				.and(song_dislikes::user_id.eq(my_id))))
-				.execute(conn)?;
-		} else {
-			diesel::delete(song_likes::table.filter(song_likes::song_id.eq(song_id).and(song_likes::user_id.eq(my_id))))
-				.execute(conn)?;
-		}
-
-		Ok(())
-	}
-
-	/// Get the like status of a song for this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_like_song(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
-		use crate::schema::song_likes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get like status of a song")?;
-
-		let like = song_likes::table
-			.filter(song_likes::song_id.eq(song_id).and(song_likes::user_id.eq(my_id)))
-			.first::<(i32, i32)>(conn)
-			.optional()?
-			.is_some();
-
-		Ok(like)
-	}
-
-	/// Get songs liked by this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_liked_songs(self: &Self, conn: &mut PgPooledConn) -> Result<Vec<Song>, Box<dyn Error>> {
-		use crate::schema::songs::dsl::*;
-		use crate::schema::song_likes::dsl::*;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get liked songs")?;
-
-		let my_songs = songs
-			.inner_join(song_likes)
-			.filter(user_id.eq(my_id))
-			.select(songs::all_columns())
-			.load(conn)?;
-
-		Ok(my_songs)
-	}
-
-	/// Dislike or remove dislike from a song for this user
-	/// If disliking a song, remove like if it exists
-	#[cfg(feature = "ssr")]
-	pub async fn set_dislike_song(self: &Self, song_id: i32, dislike: bool, conn: &mut PgPooledConn) -> 
-		Result<(), Box<dyn Error>> {
-		use log::*;
-		debug!("Setting dislike for song {} to {}", song_id, dislike);
-
-		use crate::schema::song_likes;
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to dislike/un-dislike a song")?;
-
-		if dislike {
-			diesel::insert_into(song_dislikes::table)
-				.values((song_dislikes::song_id.eq(song_id), song_dislikes::user_id.eq(my_id)))
-				.execute(conn)?;
-
-			// Remove like if it exists
-			diesel::delete(song_likes::table.filter(song_likes::song_id.eq(song_id)
-				.and(song_likes::user_id.eq(my_id))))
-				.execute(conn)?;
-		} else {
-			diesel::delete(song_dislikes::table.filter(song_dislikes::song_id.eq(song_id)
-				.and(song_dislikes::user_id.eq(my_id))))
-				.execute(conn)?;
-		}
-
-		Ok(())
-	}
-
-	/// Get the dislike status of a song for this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_dislike_song(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get dislike status of a song")?;
-
-		let dislike = song_dislikes::table
-			.filter(song_dislikes::song_id.eq(song_id).and(song_dislikes::user_id.eq(my_id)))
-			.first::<(i32, i32)>(conn)
-			.optional()?
-			.is_some();
-
-		Ok(dislike)
-	}
-
-	/// Get songs disliked by this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_disliked_songs(self: &Self, conn: &mut PgPooledConn) -> Result<Vec<Song>, Box<dyn Error>> {
-		use crate::schema::songs::dsl::*;
-		use crate::schema::song_likes::dsl::*;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get disliked songs")?;
-
-		let my_songs = songs
-			.inner_join(song_likes)
-			.filter(user_id.eq(my_id))
-			.select(songs::all_columns())
-			.load(conn)?;
-
-		Ok(my_songs)
-	}
-}
-
 /// Model for an artist
 #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::artists))]
@ -293,26 +164,6 @@ impl Artist {

 		Ok(my_songs)
 	}
-
-	/// Display a list of artists as a string.
-	/// 
-	/// For one artist, displays [artist1]. For two artists, displays [artist1] & [artist2].
-	/// For three or more artists, displays [artist1], [artist2], & [artist3].
-	pub fn display_list(artists: &Vec<Artist>) -> String {
-		let mut artist_list = String::new();
-
-		for (i, artist) in artists.iter().enumerate() {
-			if i == 0 {
-				artist_list.push_str(&artist.name);
-			} else if i == artists.len() - 1 {
-				artist_list.push_str(&format!(" & {}", artist.name));
-			} else {
-				artist_list.push_str(&format!(", {}", artist.name));
-			}
-		}
-
-		artist_list
-	}
 }

 /// Model for an album
@ -442,30 +293,4 @@ impl Song {

 		Ok(my_artists)
 	}
-
-	/// Get the album for this song from the database
-	/// 
-	/// # Arguments
-	/// 
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<Option<Album>, Box<dyn Error>>` - A result indicating success with an album, or None if
-	/// the song does not have an album, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn get_album(self: &Self, conn: &mut PgPooledConn) -> Result<Option<Album>, Box<dyn Error>> {
-		use crate::schema::albums::dsl::*;
-
-		if let Some(album_id) = self.album_id {
-			let my_album = albums
-				.filter(id.eq(album_id))
-				.first::<Album>(conn)?;
-
-			Ok(Some(my_album))
-		} else {
-			Ok(None)
-		}
-	}
 }
--- a/src/pages.rs
+++ b/src/pages.rs
@ -1,3 +1,2 @@
 pub mod login;
 pub mod signup;
-pub mod audiotest;
--- a/src/pages/audiotest.rs
+++ b/src/pages/audiotest.rs
@ -1,9 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-
-#[component]
-pub fn AudioTest() -> impl IntoView {
-    view! {
-        <p>Hello World</p>
-    }
-}
--- a/src/playbar.rs
+++ b/src/playbar.rs
@ -1,7 +1,4 @@
-use crate::models::Artist;
 use crate::playstatus::PlayStatus;
-use crate::songdata::SongData;
-use crate::api::songs;
 use leptos::ev::MouseEvent;
 use leptos::html::{Audio, Div};
 use leptos::leptos_dom::*;
@ -246,149 +243,37 @@ fn PlayDuration(elapsed_secs: MaybeSignal<i64>, total_secs: MaybeSignal<i64>) ->
 fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
    let name = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("No media playing".into(), |song| song.title.clone())
+			status.queue.front().map_or("No media playing".into(), |song| song.name.clone())
 		})
    });

 	let artist = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("".into(), |song| format!("{}", Artist::display_list(&song.artists)))
+			status.queue.front().map_or("".into(), |song| song.artist.clone())
 		})
 	});

 	let album = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("".into(), |song|
-                song.album.as_ref().map_or("".into(), |album| album.title.clone()))
+			status.queue.front().map_or("".into(), |song| song.album.clone())
 		})
 	});

 	let image = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("/images/placeholders/MusicPlaceholder.svg".into(),
-                |song| song.image_path.clone())
+			// TODO Use some default / unknown image?
+			status.queue.front().map_or("".into(), |song| song.image_path.clone())
 		})
 	});

    view! {
+        <div class="media-info">
        <img class="media-info-img" align="left" src={image}/>
        <div class="media-info-text">
            {name}
            <br/>
            {artist} - {album}
        </div>
-    }
-}
-
-/// The like and dislike buttons
-#[component]
-fn LikeDislike(status: RwSignal<PlayStatus>) -> impl IntoView {
-    let like_icon = Signal::derive(move || {
-        status.with(|status| {
-            match status.queue.front() {
-                Some(SongData { like_dislike: Some((true, _)), .. }) => icondata::TbThumbUpFilled,
-                _ => icondata::TbThumbUp,
-            }
-        })
-    });
-
-    let dislike_icon = Signal::derive(move || {
-        status.with(|status| {
-            match status.queue.front() {
-                Some(SongData { like_dislike: Some((_, true)), .. }) => icondata::TbThumbDownFilled,
-                _ => icondata::TbThumbDown,
-            }
-        })
-    });
-
-    let toggle_like = move |_| {
-        status.update(|status| {
-            match status.queue.front_mut() {
-                Some(SongData { id, like_dislike: Some((liked, disliked)), .. }) => {
-                    *liked = !*liked;
-
-                    if *liked {
-                        *disliked = false;
-                    }
-
-                    let id = *id;
-                    let liked = *liked;
-                    spawn_local(async move {
-                        if let Err(e) = songs::set_like_song(id, liked).await {
-                            error!("Error liking song: {:?}", e);
-                        }
-                    });
-                },
-                Some(SongData { id, like_dislike, .. }) => {
-                    // This arm should only be reached if like_dislike is None
-                    // In this case, the buttons will show up not filled, indicating that the song is not
-                    // liked or disliked. Therefore, clicking the like button should like the song.
-
-                    *like_dislike = Some((true, false));
-
-                    let id = *id;
-                    spawn_local(async move {
-                        if let Err(e) = songs::set_like_song(id, true).await {
-                            error!("Error liking song: {:?}", e);
-                        }
-                    });
-                },
-                _ => {
-                    log!("Unable to like song: No song in queue");
-                    return;
-                }
-            }
-        });
-    };
-
-    let toggle_dislike = move |_| {
-        status.update(|status| {
-            match status.queue.front_mut() {
-                Some(SongData { id, like_dislike: Some((liked, disliked)), .. }) => {
-                    *disliked = !*disliked;
-
-                    if *disliked {
-                        *liked = false;
-                    }
-
-                    let id = *id;
-                    let disliked = *disliked;
-                    spawn_local(async move {
-                        if let Err(e) = songs::set_dislike_song(id, disliked).await {
-                            error!("Error disliking song: {:?}", e);
-                        }
-                    });
-                },
-                Some(SongData { id, like_dislike, .. }) => {
-                    // This arm should only be reached if like_dislike is None
-                    // In this case, the buttons will show up not filled, indicating that the song is not
-                    // liked or disliked. Therefore, clicking the dislike button should dislike the song.
-                    
-                    *like_dislike = Some((false, true));
-
-                    let id = *id;
-                    spawn_local(async move { 
-                        if let Err(e) = songs::set_dislike_song(id, true).await {
-                            error!("Error disliking song: {:?}", e);
-                        }
-                    });
-                },
-                _ => {
-                    log!("Unable to dislike song: No song in queue");
-                    return;
-                }
-            }
-        });
-    };
-
-    view! {
-        <div class="like-dislike">
-            <button on:click=toggle_dislike>
-                <Icon class="controlbtn hmirror" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=dislike_icon />
-            </button>
-            <button on:click=toggle_like>
-                <Icon class="controlbtn" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=like_icon />
-            </button>
        </div>
    }
 }
@ -515,7 +400,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
        status.with_untracked(|status| {
            // Start playing the first song in the queue, if available
            if let Some(song) = status.queue.front() {
-                log!("Starting playing with song: {}", song.title);
+                log!("Starting playing with song: {}", song.name);

                // Don't use the set_play_src / set_playing helper function
                // here because we already have access to the audio element
@ -568,7 +453,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
            let prev_song = status.queue.pop_front();

            if let Some(prev_song) = prev_song {
-                log!("Adding song to history: {}", prev_song.title);
+                log!("Adding song to history: {}", prev_song.name);
                status.history.push_back(prev_song);
            } else {
                log!("Queue empty, no previous song to add to history");
@ -601,10 +486,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
            on:timeupdate=on_time_update on:ended=on_end type="audio/mpeg" />
        <div class="playbar">
        <ProgressBar percentage=percentage.into() status=status />
-        <div class="playbar-left-group">
        <MediaInfo status=status />
-        <LikeDislike status=status />
-        </div>
        <PlayControls status=status />
        <PlayDuration elapsed_secs=elapsed_secs.into() total_secs=total_secs.into() />
        <QueueToggle status=status />
--- a/src/queue.rs
+++ b/src/queue.rs
@ -1,4 +1,3 @@
-use crate::models::Artist;
 use crate::playstatus::PlayStatus;
 use crate::song::Song;
 use leptos::ev::MouseEvent;
@ -99,7 +98,7 @@ pub fn Queue(status: RwSignal<PlayStatus>) -> impl IntoView {
 									on:dragenter=move |e: DragEvent| on_drag_enter(e, index)
 									on:dragover=on_drag_over
 								>
-									<Song song_image_path=song.image_path.clone() song_title=song.title.clone() song_artist=Artist::display_list(&song.artists) />
+									<Song song_image_path=song.image_path.clone() song_title=song.name.clone() song_artist=song.artist.clone() />
 									<Show
 										when=move || index != 0
 										fallback=|| view!{
--- a/src/schema.rs
+++ b/src/schema.rs
@ -30,20 +30,6 @@ diesel::table! {
    }
 }

-diesel::table! {
-    song_dislikes (song_id, user_id) {
-        song_id -> Int4,
-        user_id -> Int4,
-    }
-}
-
-diesel::table! {
-    song_likes (song_id, user_id) {
-        song_id -> Int4,
-        user_id -> Int4,
-    }
-}
-
 diesel::table! {
    songs (id) {
        id -> Int4,
@ -72,10 +58,6 @@ diesel::joinable!(album_artists -> albums (album_id));
 diesel::joinable!(album_artists -> artists (artist_id));
 diesel::joinable!(song_artists -> artists (artist_id));
 diesel::joinable!(song_artists -> songs (song_id));
-diesel::joinable!(song_dislikes -> songs (song_id));
-diesel::joinable!(song_dislikes -> users (user_id));
-diesel::joinable!(song_likes -> songs (song_id));
-diesel::joinable!(song_likes -> users (user_id));
 diesel::joinable!(songs -> albums (album_id));

 diesel::allow_tables_to_appear_in_same_query!(
@ -83,8 +65,6 @@ diesel::allow_tables_to_appear_in_same_query!(
    albums,
    artists,
    song_artists,
-    song_dislikes,
-    song_likes,
    songs,
    users,
 );
--- a/src/songdata.rs
+++ b/src/songdata.rs
@ -1,62 +1,16 @@
-use crate::models::{Album, Artist, Song};
-
-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(Debug, Clone)]
 pub struct SongData {
-	/// Song id
-	pub id: i32,
 	/// Song name
-	pub title: String,
-	/// Song artists
-	pub artists: Vec<Artist>,
+	pub name: String,
+	/// Song artist
+	pub artist: String,
 	/// Song album
-	pub album: Option<Album>,
-	/// The track number of the song on the album
-	pub track: Option<i32>,
-	/// The duration of the song in seconds
-	pub duration: i32,
-	/// The song's release date
-	pub release_date: Option<Date>,
+	pub album: String,
 	/// Path to song file, relative to the root of the web server.
 	/// For example, `"/assets/audio/Song.mp3"`
 	pub song_path: String,
 	/// Path to song image, relative to the root of the web server.
 	/// For example, `"/assets/images/Song.jpg"`
 	pub image_path: String,
-	/// Whether the song is liked by the user
-	pub like_dislike: Option<(bool, bool)>,
-}
-
-
-impl TryInto<Song> for SongData {
-	type Error = Box<dyn std::error::Error>;
-
-	/// Convert a SongData object into a Song object
-	/// 
-	/// The SongData/Song conversions are also not truly reversible,
-	/// due to the way the image_path data is handled.
-	fn try_into(self) -> Result<Song, Self::Error> {
-		Ok(Song {
-			id: Some(self.id),
-			title: self.title,
-			album_id: self.album.map(|album|
-				album.id.ok_or("Album id must be present (Some) to convert to Song")).transpose()?,
-			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
-			// will be set to the album's image_path instead of None
-			image_path: if self.image_path == "/assets/images/placeholder.jpg" {
-				None
-			} else {
-				Some(self.image_path)
-			},
-		})
-	}
 }
--- a/style/addAlbum.scss
+++ b/style/addAlbum.scss
@ -0,0 +1,135 @@
+@import "theme.scss";
+
+.add-album-container {
+    position: fixed;
+    top: 45%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 30rem;
+    height: 24rem;
+    border: 1px solid white;
+    border-radius: 5px;
+    padding: 1rem;
+    padding-top: 0;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    background-color: #1c1c1c;
+    z-index: 11;
+    .upload-header {
+        font-size: .7rem;
+        font-weight: 300;
+        padding-bottom: 0;
+        border-bottom: 1px solid white;
+        font-family: "Roboto", sans-serif;
+    }
+    .close-button {
+        position: absolute;
+        top: 5px;
+        right: 5px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        border-radius: 50%;
+        font-size: 1.6rem;
+        transition: all 0.3s;
+        border: none;
+
+    }
+    .close-button:hover {
+        transform: scale(1.1);
+    background-color: rgba(255, 255, 255, 0.1);
+    }
+    .close-button:active {
+        transform: scale(0.8);
+    }
+    .create-album-form {
+        width:100%;
+        height: 100%;
+        position: relative;
+        .input-bx{
+            position: relative;
+            margin-top: 1rem;
+            width: 300px;
+            input{
+                width: 100%;
+                padding: 10px;
+                border: 2px solid #7f8fa6;
+                border-radius: 5px;
+                outline: none;
+                font-size: 1rem;
+                transition: 0.6s;
+                background-color: transparent;
+            }
+            span{
+                position: absolute;
+                left: 0;
+                top: 1px;
+                padding: 10px;
+                font-size: 1rem;
+                color: #7f8fa6;
+                text-transform: uppercase;
+                pointer-events: none;
+                transition: 0.6s;
+                background-color: transparent;
+            }
+            input:valid ~ span,
+            input:focus ~ span{
+                color: #fff;
+                transform: translateX(10px) translateY(-7px);
+                font-size: 0.65rem;
+                font-weight: 600;
+                padding: 0 10px;
+                background: #1c1c1c;
+                letter-spacing: 0.1rem;
+            }
+            input:valid,
+            input:focus{
+                color: #fff;
+                border: 2px solid #fff;
+            }
+
+        }
+        .release-date {
+            margin-top: 1rem;
+            font-size: 1.2rem;
+            color: #7f8fa6;
+            font-family: "Roboto", sans-serif;
+            display: flex;
+            align-items: center;
+            .left {
+                display: flex;
+                flex-direction: column;
+                margin-left: 5px;
+                margin-right: 10px;
+            }
+            span {
+                font-size: .85rem;
+            }
+            input {
+                padding: 8px;
+            }
+        }
+        .upload-button {
+            position: absolute;
+            bottom: 5px;
+            margin-top: 1rem;
+            padding: 10px;
+            background-color: #7f8fa6;
+            color: #fff;
+            width: 100%;
+            font-size: 1rem;
+            font-family: "Roboto", sans-serif;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: 0.3s;
+            &:hover {
+                background-color: #fff;
+                color: #7f8fa6;
+            }
+        }
+    }
+    
+}
--- a/style/addArtist.scss
+++ b/style/addArtist.scss
@ -0,0 +1,115 @@
+@import "theme.scss";
+
+.add-artist-container {
+    position: fixed;
+    top: 45%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 30rem;
+    height: 15rem;
+    border: 1px solid white;
+    border-radius: 5px;
+    padding: 1rem;
+    padding-top: 0;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    background-color: #1c1c1c;
+    z-index: 11;
+    .upload-header {
+        font-size: .7rem;
+        font-weight: 300;
+        padding-bottom: 0;
+        border-bottom: 1px solid white;
+        font-family: "Roboto", sans-serif;
+    }
+    .close-button {
+        position: absolute;
+        top: 5px;
+        right: 5px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        border-radius: 50%;
+        font-size: 1.6rem;
+        transition: all 0.3s;
+        border: none;
+
+    }
+    .close-button:hover {
+        transform: scale(1.1);
+    background-color: rgba(255, 255, 255, 0.1);
+    }
+    .close-button:active {
+        transform: scale(0.8);
+    }
+    .create-artist-form {
+        width:100%;
+        height: 100%;
+        position: relative;
+        .input-bx{
+            margin-top: 1rem;
+            width: 300px;
+            position: relative;
+            input{
+                width: 100%;
+                padding: 10px;
+                border: 2px solid #7f8fa6;
+                border-radius: 5px;
+                outline: none;
+                font-size: 1rem;
+                transition: 0.6s;
+                background-color: transparent;
+            }
+            span{
+                position: absolute;
+                left: 0;
+                top: 1px;
+                padding: 10px;
+                font-size: 1rem;
+                color: #7f8fa6;
+                text-transform: uppercase;
+                pointer-events: none;
+                transition: 0.6s;
+                background-color: transparent;
+            }
+            input:valid ~ span,
+            input:focus ~ span{
+                color: #fff;
+                transform: translateX(10px) translateY(-7px);
+                font-size: 0.65rem;
+                font-weight: 600;
+                padding: 0 10px;
+                background: #1c1c1c;
+                letter-spacing: 0.1rem;
+            }
+            input:valid,
+            input:focus{
+                color: #fff;
+                border: 2px solid #fff;
+            }
+
+        }
+        .upload-button {
+            position: absolute;
+            bottom: 5px;
+            margin-top: 1rem;
+            padding: 10px;
+            background-color: #7f8fa6;
+            color: #fff;
+            width: 100%;
+            font-size: 1rem;
+            font-family: "Roboto", sans-serif;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: 0.3s;
+            &:hover {
+                background-color: #fff;
+                color: #7f8fa6;
+            }
+        }
+    }
+    
+}
--- a/style/home.scss
+++ b/style/home.scss
@ -6,6 +6,7 @@
  height: 100vh;
  display: flex;
  flex-direction: row;
+  overflow: hidden;
 }
 .home-component {
  background: #1c1c1c;
--- a/style/main.scss
+++ b/style/main.scss
@ -9,6 +9,8 @@
@import 'search.scss';
@import 'personal.scss';
@import 'upload.scss';
+@import 'addArtist.scss';
+@import 'addAlbum.scss';

 body {
  font-family: sans-serif;
--- a/style/playbar.scss
+++ b/style/playbar.scss
@ -39,12 +39,15 @@
 		}
 	}

-	.playbar-left-group {
-		display: flex;
+	.media-info {
+		font-size: 16;
+		margin-left: 10px;
+
 		position: absolute;
 		top: 50%;
 		transform: translateY(-50%);
-		margin-left: 10px;
+		display: grid;
+		grid-template-columns: 50px 1fr;

 		.media-info-img {
 			width: 50px;
@ -54,10 +57,6 @@
 			text-align: left;
 			margin-left: 10px;
 		}
-
-		.like-dislike {
-			margin-left: 20px;
-		}
 	}

 	.playcontrols {
@ -65,30 +64,8 @@
 		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;
 			}
@ -105,3 +82,34 @@
 			border: transparent;
 		}
 	}
+
+	.playduration {
+		position: absolute;
+		right: 10px;
+		top: 13px;
+	}
+
+	.queue-toggle {
+		position: absolute;
+		bottom: 13px;
+		top: 13px;
+		right: 90px;
+
+		button {
+			.controlbtn {
+				color: $text-controls-color;
+			}
+
+			.controlbtn:hover {
+				color: $controls-hover-color;
+			}
+
+			.controlbtn:active {
+				color: $controls-click-color;
+			}
+	
+			background-color: transparent;
+			border: transparent;
+		}
+	}
+}
--- a/style/sidebar.scss
+++ b/style/sidebar.scss
@ -11,16 +11,29 @@
    margin: 3px;
    padding: 0.1rem 1rem 1rem 1rem;
    position: relative;
+    .upload-overlay {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100vw;
+      height: 100vh;
+      background-color: rgba(0, 0, 0, 0.5);
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      z-index: 10;
+    }
    .header {
      font-size: 1.2rem;
    }
-    .upload-btn {
+    .upload-dropdown-container {
      position: absolute;
      top: 10px;
      right: 7px;
+      .upload-dropdown-btn {
        display: flex;
        flex-direction: row;
-      align-items: center;
        justify-content: center;
        font-size: 0.9rem;
        border-radius: 50px;
@ -29,17 +42,40 @@
        padding-right: 1rem;
        padding-left: 1rem;
        cursor: pointer;
-      transition: background-color 0.3s ease;
+        transition: all 0.3s ease;
        .add-sign {
          font-size: 1.5rem;
          margin-top: auto;
-        margin-right: 5px;
-        color: white;
        }
      }
-    .upload-btn:hover {
+      .upload-dropdown-btn:hover {
        background-color: #9e9e9e;
      }
+      .upload-dropdown-btn-active {
+        border-radius: 12.5px 12.5px 0 0;
+        width: 110px;
+      }
+      .upload-dropdown {
+        background-color: #f0ecec;
+        color: black;
+        width: 110px;
+        border-radius: 0 0 5px 5px;
+        .add-btns {
+          border: none;
+          border-bottom: 1px solid black;
+          width: 100%;
+          padding: 0.25rem;
+          cursor: pointer;
+        }
+        .add-btns:first-child {
+          border-top: 1px solid black;
+        }
+        .add-btns:last-child {
+          border-radius: 0 0 5px 5px;
+        }
+      }
+    }
+    
    .buttons {
      display: flex;
      flex-direction: row;
--- a/style/upload.scss
+++ b/style/upload.scss
@ -15,6 +15,7 @@
    display: flex;
    flex-direction: column;
    background-color: #1c1c1c;
+    z-index: 11;
    .close-button {
        position: absolute;
        top: 5px;
@ -27,9 +28,7 @@
        font-size: 1.6rem;
        transition: all 0.3s;
        border: none;
-
    }
-
    .close-button:hover {
    transform: scale(1.1);
    background-color: rgba(255, 255, 255, 0.1);
@ -48,6 +47,9 @@
        padding: .1rem;
        display: flex;
        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        position: relative;
        .input-bx{
            margin-top: 1rem;
            position: relative;
@ -126,6 +128,9 @@
            }
        }
        .upload-button {
+            position: absolute;
+            bottom: 5px;
+            width: 100%;
            margin-top: 1rem;
            padding: 10px;
            background-color: #7f8fa6;
Author	SHA1	Message	Date
dannyzou18	6112e0dfac	fixed input bug	2024-05-29 10:54:13 -04:00
Ethan Girouard	af604a9ddc	Fix doc comment indentation	2024-05-26 20:44:40 -04:00
dannyzou18	bcb24c2a97	added background overlay when adding anything	2024-05-23 00:02:13 -04:00
dannyzou18	6676f2c533	upload dropdown closes after selecting what upload	2024-05-22 23:17:52 -04:00
dannyzou18	3746c370a2	completed add album component, front and backend	2024-05-22 23:04:21 -04:00
dannyzou18	64e93649af	Completed Adding Artist component, front and back	2024-05-22 20:24:30 -04:00
dannyzou18	fcc5870824	create artist	2024-05-21 22:39:56 -04:00
dannyzou18	3ce762ce5b	create artist ui created	2024-05-21 22:39:48 -04:00
dannyzou18	1ecd13d65f	dropdown component complete	2024-05-21 12:41:44 -04:00
dannyzou18	be775862f9	created dropdown component	2024-05-21 11:50:41 -04:00
				`@ -1 +0,0 @@`
				<svg version="1.1" viewBox="0.0 0.0 960.0 960.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 960.0l-960.0 0l0 -960.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#4032a8" d="m0 0l960.0 0l0 960.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m290.11365 265.52475l35.496063 0l0 471.3386l-35.496063 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m115.68951 737.6639l0 0c0 -36.946594 46.99247 -66.897644 104.960625 -66.897644l0 0c57.968155 0 104.96065 29.95105 104.96065 66.897644l0 0c0 36.946533 -46.992493 66.897644 -104.96065 66.897644l0 0c-57.968155 0 -104.960625 -29.95111 -104.960625 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m723.79346 175.86597l35.496033 0l0 471.33856l-35.496033 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m549.3693 648.00507l0 0c0 -36.946533 46.99243 -66.897644 104.96063 -66.897644l0 0c57.96814 0 104.96057 29.95111 104.96057 66.897644l0 0c0 36.946533 -46.99243 66.897644 -104.96057 66.897644l0 0c-57.9682 0 -104.96063 -29.95111 -104.96063 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m759.2711 155.4385l-0.01727295 94.79588l-427.05206 100.14052l-42.09601 -84.920654z" fill-rule="evenodd"/><path fill="#ffffff" d="m421.49164 234.64502l21.039368 89.85828l-131.40158 30.803131l-21.039368 -89.85828z" fill-rule="evenodd"/></g></svg>