Setup basic audio testing environment, and setup module for audio player

Merge pull request '81_switch-from-gitlab-ci-cd-to-gitea-actions' (#91 ) from 81_switch-from-gitlab-ci-cd-to-gitea-actions into main
Reviewed-on: LibreTunes/LibreTunes#91
2024-09-27 17:18:09 -04:00 · 2024-09-16 02:57:38 +00:00 · 2024-09-15 21:49:53 -04:00 · 2024-09-15 21:47:04 -04:00 · 2024-09-16 01:44:52 +00:00 · 2024-09-15 21:43:59 -04:00
42 changed files with 1822 additions and 336 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -8,3 +8,4 @@
 !/style
 !/Cargo.lock
 !/Cargo.toml
+!/ascii_art.txt
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@ -0,0 +1,119 @@
+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
@ -1,101 +0,0 @@
-# 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
@ -44,6 +44,21 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"

+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.81"
@ -56,6 +71,12 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"

+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
 [[package]]
 name = "async-recursion"
 version = "1.1.0"
@ -138,15 +159,11 @@ dependencies = [
 "pin-project-lite",
 "rustversion",
 "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
 "sync_wrapper 1.0.0",
 "tokio",
 "tower",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@ -167,7 +184,6 @@ dependencies = [
 "sync_wrapper 0.1.2",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@ -244,6 +260,12 @@ version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"

+[[package]]
+name = "bytemuck"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@ -316,6 +338,18 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+[[package]]
+name = "chrono"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "ciborium"
 version = "0.2.2"
@ -422,6 +456,12 @@ dependencies = [
 "futures",
 ]

+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@ -613,6 +653,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

+[[package]]
+name = "flexi_logger"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f248c29a6d4bc5d065c9e9068d858761a0dcd796759f7801cc14db35db23abd8"
+dependencies = [
+ "chrono",
+ "glob",
+ "log",
+ "thiserror",
+]
+
 [[package]]
 name = "float-cmp"
 version = "0.9.0"
@ -796,6 +848,12 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"

+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "gloo-net"
 version = "0.5.0"
@ -965,6 +1023,29 @@ dependencies = [
 "tokio",
 ]

+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "icondata"
 version = "0.3.0"
@ -1501,7 +1582,7 @@ dependencies = [
 "diesel",
 "diesel_migrations",
 "dotenv",
- "futures",
+ "flexi_logger",
 "http",
 "icondata",
 "lazy_static",
@ -1510,17 +1591,21 @@ dependencies = [
 "leptos_icons",
 "leptos_meta",
 "leptos_router",
+ "log",
+ "multer",
 "openssl",
 "pbkdf2",
 "serde",
+ "server_fn",
+ "symphonia",
 "thiserror",
 "time",
 "tokio",
 "tower",
 "tower-http",
- "tower-sessions",
 "tower-sessions-redis-store",
 "wasm-bindgen",
+ "web-sys",
 ]

 [[package]]
@ -2245,16 +2330,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
 [[package]]
 name = "serde_qs"
 version = "0.12.0"
@ -2284,23 +2359,11 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "server_fn"
-version = "0.6.10"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a46a2ffdecb81430ecfb995989218a18b6e94c1ead50cb806b5927c986a8ce"
+checksum = "536a5b959673643ee01e59ae41bf01425482c8070dee95d7061ee2d45296b59c"
 dependencies = [
 "axum",
 "bytes",
@ -2314,6 +2377,7 @@ dependencies = [
 "hyper",
 "inventory",
 "js-sys",
+ "multer",
 "once_cell",
 "send_wrapper",
 "serde",
@ -2419,6 +2483,55 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"

+[[package]]
+name = "symphonia"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
+dependencies = [
+ "lazy_static",
+ "symphonia-bundle-mp3",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-bundle-mp3"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-core"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
+dependencies = [
+ "encoding_rs",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@ -2487,9 +2600,9 @@ dependencies = [

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

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

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

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

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

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

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

 [[package]]
 name = "wasm-streams"
@ -3066,6 +3180,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,41 +8,50 @@ build = "src/build.rs"
 crate-type = ["cdylib", "rlib"]

 [dependencies]
-console_error_panic_hook = "0.1"
+console_error_panic_hook = { version = "0.1", optional = true }
 cfg-if = "1"
-http = "1.0"
-leptos = { version = "0.6", features = ["nightly"] }
+http = { version = "1.0", default-features = false }
+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 = "=0.2.92"
+wasm-bindgen = { version = "=0.2.93", default-features = false, optional = true }
 leptos_icons = { version = "0.3.0" }
 icondata = { version = "0.3.0" }
 dotenv = { version = "0.15.0", optional = true }
-diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], optional = true }
+diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true }
 lazy_static = { version = "1.4.0", optional = true }
-serde = { versions = "1.0.195", features = ["derive"] }
+serde = { version = "1.0.195", features = ["derive"], default-features = false }
 openssl = { version = "0.10.63", optional = true }
-time = { version = "0.3.34", features = ["serde"] }
+time = { version = "0.3.34", features = ["serde"], default-features = false }
 diesel_migrations = { version = "2.1.0", optional = true }
 pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
-futures = { version = "0.3.30", default-features = false, optional = true }
 tokio = { version = "1", optional = true, features = ["rt-multi-thread"] }
-axum = { version = "0.7.5", optional = true }
-tower = { veresion = "0.4.13", optional = true }
+axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = false, optional = true }
+tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.5", optional = true, features = ["fs"] }
 thiserror = "1.0.57"
-tower-sessions = { version = "0.11", default-features = false }
 tower-sessions-redis-store = { version = "0.11", optional = true }
-async-trait = "0.1.79"
+async-trait = { version = "0.1.79", optional = true }
 axum-login = { version = "0.14.0", optional = true }
+server_fn = { version = "0.6.11", features = ["multipart"] }
+symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], optional = true }
+multer = { version = "3.0.0", optional = true }
+log = { version = "0.4.21", optional = true }
+flexi_logger = { version = "0.28.0", optional = true, default-features = false }
+web-sys = "0.3.69"

 [patch.crates-io]
 gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" }

 [features]
-csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
-hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+hydrate = [
+  "leptos/hydrate",
+  "leptos_meta/hydrate",
+  "leptos_router/hydrate",
+  "console_error_panic_hook",
+  "wasm-bindgen",
+]
 ssr = [
  "dep:leptos_axum",
  "leptos/ssr",
@ -54,13 +63,17 @@ ssr = [
  "openssl",
  "diesel_migrations",
  "pbkdf2",
-  "futures",
  "tokio",
  "axum",
  "tower",
  "tower-http",
  "tower-sessions-redis-store",
+  "async-trait",
  "axum-login",
+  "symphonia",
+  "multer",
+  "log",
+  "flexi_logger",
 ]

 # Defines a size-optimized profile for the WASM bundle in release mode
--- a/9
+++ b/9
@ -1,14 +1,20 @@
-FROM registry.mregirouard.com/libretunes/ops/docker-leptos/musl:latest as builder
+FROM clux/muslrust:nightly 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
@ -32,6 +38,7 @@ COPY style /app/style
 # Minify CSS
 RUN npx tailwindcss -i /app/style/main.scss -o /app/style/main.scss --minify

+COPY ascii_art.txt /app/ascii_art.txt
 COPY assets /app/assets
 COPY src /app/src
 COPY migrations /app/migrations
--- a/ascii_art.txt
+++ b/ascii_art.txt
@ -0,0 +1,10 @@
+                                                         .-=.  =+==-.    
+                                                       .=++++. =+++++=.  
+  _      _ _           _______                        =++++++= :*++++++= 
+ | |    (_) |         |__   __|                      -++++**+.  -+**++++-
+ | |     _| |__  _ __ ___| |_   _ _ __   ___  ___    *+++**+      +**+++*
+ | |    | | '_ \| '__/ _ \ | | | | '_ \ / _ \/ __|   *+++**+      +**+++*
+ | |____| | |_) | | |  __/ | |_| | | | |  __/\__ \   -++++**+-:  +**++++-
+ |______|_|_.__/|_|  \___|_|\__,_|_| |_|\___||___/    =++++++**+ -+++++= 
+                                                       .=+++++++=.+++=.  
+                                                         .-==++++---.    
--- a/assets/images/placeholders/MusicPlaceholder.svg
+++ b/assets/images/placeholders/MusicPlaceholder.svg
@ -0,0 +1 @@
+<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
@ -0,0 +1,2 @@
+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
@ -0,0 +1,11 @@
+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/migrations/2024-05-16-220659_add_album_images/down.sql
+++ b/migrations/2024-05-16-220659_add_album_images/down.sql
@ -0,0 +1 @@
+ALTER TABLE albums DROP COLUMN image_path;
--- a/migrations/2024-05-16-220659_add_album_images/up.sql
+++ b/migrations/2024-05-16-220659_add_album_images/up.sql
@ -0,0 +1 @@
+ALTER TABLE albums ADD COLUMN image_path VARCHAR;
--- a/migrations/2024-05-18-231505_add_user_admin/down.sql
+++ b/migrations/2024-05-18-231505_add_user_admin/down.sql
@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN admin;
--- a/migrations/2024-05-18-231505_add_user_admin/up.sql
+++ b/migrations/2024-05-18-231505_add_user_admin/up.sql
@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT FALSE NOT NULL;
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@ -0,0 +1 @@
+pub mod songs;
--- a/src/api/songs.rs
+++ b/src/api/songs.rs
@ -0,0 +1,55 @@
+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,6 +6,7 @@ use leptos_meta::*;
 use leptos_router::*;
 use crate::pages::login::*;
 use crate::pages::signup::*;
+use crate::pages::audiotest::*;
 use crate::error_template::{AppError, ErrorTemplate};


@ -14,6 +15,10 @@ pub fn App() -> impl IntoView {
    // Provides context that manages stylesheets, titles, meta tags, etc.
    provide_meta_context();

+    let play_status = PlayStatus::default();
+    let play_status = create_rw_signal(play_status);
+    let upload_open = create_rw_signal(false);
+
    view! {
        // injects a stylesheet into the document <head>
        // id=leptos means cargo-leptos will hot-reload this stylesheet
@ -33,9 +38,14 @@ pub fn App() -> impl IntoView {
        }>
            <main>
                <Routes>
-                    <Route path="" view=HomePage/>
+                    <Route path="" view=move || view! { <HomePage play_status=play_status upload_open=upload_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>
@ -46,24 +56,17 @@ use crate::components::sidebar::*;
 use crate::components::dashboard::*;
 use crate::components::search::*;
 use crate::components::personal::*;
+use crate::components::upload::*;

 /// Renders the home page of your application.
 #[component]
-fn HomePage() -> impl IntoView {
-    let play_status = PlayStatus::default();
-    let play_status = create_rw_signal(play_status);
-    
-    let (dashboard_open, set_dashboard_open) = create_signal(true);
-
+fn HomePage(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>) -> impl IntoView {
    view! {
        <div class="home-container">
-            <Sidebar setter=set_dashboard_open active=dashboard_open />
-            <Show 
-                when=move || {dashboard_open() == true}
-                fallback=move || view! { <Search /> }
-            >
-                <Dashboard />
-            </Show>
+            <Upload open=upload_open/>
+            <Sidebar upload_open=upload_open/>
+            // This <Outlet /> will render the child route components
+            <Outlet />
            <Personal />
            <PlayBar status=play_status/>
            <Queue status=play_status/>
--- a/src/audioplayer.rs
+++ b/src/audioplayer.rs
--- a/src/auth.rs
+++ b/src/auth.rs
@ -21,9 +21,10 @@ use crate::users::UserCredentials;
 pub async fn signup(new_user: User) -> Result<(), ServerFnError> {
 	use crate::users::create_user;

-	// Ensure the user has no id
+	// Ensure the user has no id, and is not a self-proclaimed admin
 	let new_user = User {
 		id: None,
+		admin: false,
 		..new_user
 	};

@ -120,3 +121,60 @@ 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")]
+pub async fn check_admin() -> Result<bool, ServerFnError> {
+	let auth_session = extract::<AuthSession<AuthBackend>>().await
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
+
+	Ok(auth_session.user.as_ref().map(|u| u.admin).unwrap_or(false))
+}
+
+/// Require that a user is logged in and an admin
+/// Returns a Result with the error message if the user is not logged in or is not an admin
+/// Intended to be used at the start of a protected route, to ensure the user is logged in and an admin:
+/// ```rust
+/// use leptos::*;
+/// use libretunes::auth::require_admin;
+/// #[server(endpoint = "protected_admin_route")]
+/// pub async fn protected_admin_route() -> Result<(), ServerFnError> {
+/// 	require_admin().await?;
+/// 	// Continue with protected route
+/// 	Ok(())
+/// }
+/// ```
+#[cfg(feature = "ssr")]
+pub async fn require_admin() -> Result<(), ServerFnError> {
+	check_admin().await.and_then(|is_admin| {
+		if is_admin {
+			Ok(())
+		} else {
+			Err(ServerFnError::<NoCustomError>::ServerError(format!("Unauthorized")))
+		}
+	})
+}
--- a/src/auth_backend.rs
+++ b/src/auth_backend.rs
@ -1,10 +1,17 @@
-use async_trait::async_trait;
 use axum_login::{AuthnBackend, AuthUser, UserId};
 use crate::users::UserCredentials;
 use leptos::server_fn::error::ServerFnErrorErr;

 use crate::models::User;

+use cfg_if::cfg_if;
+
+cfg_if! {
+	if #[cfg(feature = "ssr")] {
+		use async_trait::async_trait;
+	}
+}
+
 impl AuthUser for User {
 	type Id = i32;

--- a/src/components.rs
+++ b/src/components.rs
@ -2,3 +2,4 @@ pub mod sidebar;
 pub mod dashboard;
 pub mod search;
 pub mod personal;
+pub mod upload;
--- a/src/components/sidebar.rs
+++ b/src/components/sidebar.rs
@ -1,30 +1,34 @@
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
+use crate::components::upload::*;

 #[component]
-pub fn Sidebar(setter: WriteSignal<bool>, active: ReadSignal<bool>) -> impl IntoView {
-    let open_dashboard = move |_| {
-        setter.update(|value| *value = true);
-        log!("open dashboard");
-    };
-    let open_search = move |_| {
-        setter.update(|value| *value = false);
-        log!("open search");
-    };
+pub fn Sidebar(upload_open: RwSignal<bool>) -> impl IntoView {
+    use leptos_router::use_location;
+    let location = use_location();
+
+    let on_dashboard = Signal::derive(
+        move || location.pathname.get().starts_with("/dashboard") || location.pathname.get() == "/",
+    );
+
+    let on_search = Signal::derive(
+        move || location.pathname.get().starts_with("/search"),
+    );

    view! {
        <div class="sidebar-container">
            <div class="sidebar-top-container">
                <h2 class="header">LibreTunes</h2>
-                <div class="buttons" on:click=open_dashboard style={move || if active() {"color: #e1e3e1"} else {""}} >
+                <UploadBtn dialog_open=upload_open />
+                <a class="buttons" href="/dashboard" style={move || if on_dashboard() {"color: #e1e3e1"} else {""}} >
                    <Icon icon=icondata::OcHomeFillLg />
                    <h1>Dashboard</h1>
-                </div>
-                <div class="buttons" on:click=open_search style={move || if !active() {"color: #e1e3e1"} else {""}}>
+                </a>
+                <a class="buttons" href="/search" style={move || if on_search() {"color: #e1e3e1"} else {""}}>
                    <Icon icon=icondata::BiSearchRegular />
                    <h1>Search</h1>
-                </div>
+                </a>
            </div>
            <Bottom />

--- a/src/components/upload.rs
+++ b/src/components/upload.rs
@ -0,0 +1,245 @@
+use std::rc::Rc;
+use leptos::leptos_dom::*;
+use leptos::*;
+use leptos_icons::*;
+use leptos_router::Form;
+use web_sys::Response;
+use crate::search::search_artists;
+use crate::search::search_albums;
+use crate::models::Artist;
+use crate::models::Album;
+
+#[component]
+pub fn UploadBtn(dialog_open: RwSignal<bool>) -> impl IntoView {
+	let open_dialog = move |_| {
+		dialog_open.set(true);
+	};
+
+	view! {
+		<button class="upload-btn" on:click=open_dialog>
+			<div class="add-sign">
+				<Icon icon=icondata::IoAddSharp />
+			</div>
+			Upload
+		</button>
+	}
+}
+
+#[component]
+pub fn Upload(open: RwSignal<bool>) -> impl IntoView {
+	// Create signals for the artist input and the filtered artists
+	let (artists, set_artists) = create_signal("".to_string());
+	let (filtered_artists, set_filtered_artists)  = create_signal(vec![]);
+
+	let (albums, set_albums) = create_signal("".to_string());
+	let (filtered_albums, set_filtered_albums) = create_signal(vec![]);
+
+	let (error_msg, set_error_msg) = create_signal::<Option<String>>(None);
+
+	let close_dialog = move |ev: leptos::ev::MouseEvent| {
+		ev.prevent_default();
+		open.set(false);
+	};
+	// Create a filter function to handle filtering artists
+	// Allow users to search for artists by name, converts the artist name to artist id to be handed off to backend
+	let handle_filter_artists = move |ev: leptos::ev::Event| {
+		ev.prevent_default();
+
+		let artist_input: String = event_target_value(&ev);
+
+		//Get the artist that we are currently searching for
+		let mut all_artists: Vec<&str> = artist_input.split(",").collect();
+		let search = all_artists.pop().unwrap().to_string();
+		
+		//Update the artist signal with the input
+		set_artists.update(|value: &mut String| *value = artist_input);
+
+		spawn_local(async move {
+			let filter_results = search_artists(search, 3).await;
+			if let Err(err) = filter_results {
+				log!("Error filtering artists: {:?}", err);
+			} else if let Ok(artists) = filter_results {
+				log!("Filtered artists: {:?}", artists);
+
+				set_filtered_artists.update(|value| *value = artists);
+			}
+		})
+	};
+	// Create a filter function to handle filtering albums
+	// Allow users to search for albums by title, converts the album title to album id to be handed off to backend
+	let handle_filter_albums = move |ev: leptos::ev::Event| {
+		ev.prevent_default();
+
+		let album_input: String = event_target_value(&ev);
+		
+		//Update the album signal with the input
+		set_albums.update(|value: &mut String| *value = album_input);
+
+		spawn_local(async move {
+			let filter_results = search_albums(albums.get_untracked(), 3).await;
+			if let Err(err) = filter_results {
+				log!("Error filtering albums: {:?}", err);
+			} else if let Ok(albums) = filter_results {
+				log!("Filtered albums: {:?}", albums);
+				set_filtered_albums.update(|value| *value = albums);
+			}
+		})
+	};
+
+	let handle_response = Rc::new(move |response: &Response| {
+		if response.ok() {
+			set_error_msg.update(|value| *value = None);
+			set_filtered_artists.update(|value| *value = vec![]);
+			set_filtered_albums.update(|value| *value = vec![]);
+			set_artists.update(|value| *value = "".to_string());
+			set_albums.update(|value| *value = "".to_string());
+			open.set(false);
+		} else {
+			// TODO: Extract error message from response
+			set_error_msg.update(|value| *value = Some("Error uploading song".to_string()));
+		}
+	});
+
+	view! {
+		<Show when=open fallback=move || view! {}>
+			<div class="upload-container" open=open>
+				<div class="close-button" on:click=close_dialog><Icon icon=icondata::IoClose /></div>
+				<div class="upload-header">
+					<h1>Upload Song</h1>
+				</div>
+				<Form action="/api/upload" method="POST" enctype=String::from("multipart/form-data")
+					class="upload-form" on_response=handle_response.clone()>
+					<div class="input-bx">
+						<input type="text" name="title" required class="text-input" required/>
+						<span>Title</span>
+					</div>
+					<div class="artists has-search">
+						<div class="input-bx">
+							<input type="text" name="artist_ids" class="text-input" prop:value=artists on:input=handle_filter_artists/>
+							<span>Artists</span>
+						</div>
+						<Show
+							when=move || {filtered_artists.get().len() > 0}
+							fallback=move || view! {}						
+						>
+							<ul class="artist_results search-results">
+								{
+									move || filtered_artists.get().iter().enumerate().map(|(_index,filtered_artist)| view! {
+										<Artist artist=filtered_artist.clone() artists=artists set_artists=set_artists set_filtered=set_filtered_artists/>
+									}).collect::<Vec<_>>()
+								}
+							</ul>
+						</Show>
+					</div>
+					<div class="albums has-search">
+						<div class="input-bx">
+							<input type="text" name="album_id" class="text-input" prop:value=albums on:input=handle_filter_albums/>
+							<span>Album ID</span>
+						</div>
+						<Show
+							when=move || {filtered_albums.get().len() > 0}
+							fallback=move || view! {}						
+						>
+							<ul class="album_results search-results">
+								{
+									move || filtered_albums.get().iter().enumerate().map(|(_index,filtered_album)| view! {
+										<Album album=filtered_album.clone() _albums=albums set_albums=set_albums set_filtered=set_filtered_albums/>
+									}).collect::<Vec<_>>()
+								}
+							</ul>
+						</Show>
+					</div>
+					
+					<div class="input-bx">
+						<input type="number" name="track_number" class="text-input"/>
+						<span>Track Number</span>
+					</div>
+					<div class="release-date">
+						<div class="left">
+							<span>Release</span>
+							<span>Date</span>
+						</div>
+						<input class="info" type="date" name="release_date"/>
+					</div>
+					<div class="file">
+						<span>File</span>
+						<input class="info" type="file" accept=".mp3" name="file" required/>
+					</div>
+					<button type="submit" class="upload-button">Upload</button>
+				</Form>
+				<Show
+					when=move || {error_msg.get().is_some()}
+					fallback=move || view! {}
+				>
+					<div class="error-msg">
+						<Icon icon=icondata::IoAlertCircleSharp />
+						{error_msg.get().as_ref().unwrap()}
+					</div>
+				</Show>
+			</div>
+		</Show>
+	}
+}
+
+#[component]
+pub fn Artist(artist: Artist, artists: ReadSignal<String>, set_artists: WriteSignal<String>, set_filtered: WriteSignal<Vec<Artist>>) -> impl IntoView {
+	// Converts artist name to artist id and adds it to the artist input
+	let add_artist = move |_| {
+		//Create an empty string to hold previous artist ids
+		let mut s: String = String::from("");
+		//Get the current artist input
+		let all_artirts: String = artists.get();
+		//Split the input into a vector of artists separated by commas
+		let mut ids: Vec<&str> = all_artirts.split(",").collect();
+		//If there is only one artist in the input, get their id equivalent and add it to the string
+		if ids.len() == 1 {
+			let value_str = match artist.id.clone() {
+				Some(v) => v.to_string(),
+				None => String::from("None"),
+			};
+			s.push_str(&value_str);
+			s.push_str(",");
+			set_artists.update(|value| *value = s);
+		//If there are multiple artists in the input, pop the last artist by string off the vector, 
+		//get their id equivalent, and add it to the string
+		} else {
+			ids.pop();
+			for id in ids {
+				s.push_str(id);
+				s.push_str(",");
+			}
+			let value_str = match artist.id.clone() {
+				Some(v) => v.to_string(),
+				None => String::from("None"),
+			};
+			s.push_str(&value_str);
+			s.push_str(",");
+			set_artists.update(|value| *value = s);
+		}
+		//Clear the search results
+		set_filtered.update(|value| *value = vec![]);
+	};
+
+	view! {
+		<div class="artist result" on:click=add_artist>
+			{artist.name.clone()}
+		</div>
+	}
+}
+#[component]
+pub fn Album(album: Album, _albums: ReadSignal<String>, set_albums: WriteSignal<String>, set_filtered: WriteSignal<Vec<Album>>) -> impl IntoView {
+	//Converts album title to album id to upload a song
+	let add_album = move |_| {
+		let value_str = match album.id.clone() {
+			Some(v) => v.to_string(),
+			None => String::from("None"),
+		};
+		set_albums.update(|value| *value = value_str);
+		set_filtered.update(|value| *value = vec![]);
+	};
+	view! {
+		<div class="album result" on:click=add_album>
+			{album.title.clone()}
+		</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(res) => Ok(res.into_response()),
-            Err(err) => Err((
+        match ServeDir::new(root).oneshot(req).await.ok() {
+            Some(res) => Ok(res.into_response()),
+            None => Err((
                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Something went wrong: {err}"),
+                format!("Something went wrong"),
            )),
        }
    }
--- a/src/lib.rs
+++ b/src/lib.rs
@ -3,6 +3,7 @@ pub mod auth;
 pub mod songdata;
 pub mod playstatus;
 pub mod playbar;
+pub mod audioplayer;
 pub mod database;
 pub mod queue;
 pub mod song;
@ -13,6 +14,10 @@ pub mod users;
 pub mod search;
 pub mod fileserv;
 pub mod error_template;
+pub mod api;
+pub mod upload;
+pub mod util;
+
 use cfg_if::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 = "x86_64-unknown-linux-musl")]
+#[cfg(target_env = "musl")]
 extern crate openssl;

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

@ -19,17 +19,27 @@ async fn main() {
    use leptos_axum::{generate_route_list, LeptosRoutes};
    use libretunes::app::*;
    use libretunes::fileserv::{file_and_error_handler, get_static_file};
-    use tower_sessions::SessionManagerLayer;
+    use axum_login::tower_sessions::SessionManagerLayer;
    use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
    use axum_login::AuthManagerLayerBuilder;
    use libretunes::auth_backend::AuthBackend;
+    use log::*;
+
+    flexi_logger::Logger::try_with_env_or_str("debug").unwrap().format(flexi_logger::opt_format).start().unwrap();
+
+    info!("\n{}", include_str!("../ascii_art.txt"));
+    info!("Starting Leptos server...");

    use dotenv::dotenv;
    dotenv().ok();

+    debug!("Running database migrations...");
+
    // Bring the database up to date
    libretunes::database::migrate();

+    debug!("Connecting to Redis...");
+
    let redis_url = std::env::var("REDIS_URL").expect("REDIS_URL must be set");
    let redis_config = RedisConfig::from_url(&redis_url).expect(&format!("Unable to parse Redis URL: {}", redis_url));
    let redis_pool = RedisPool::new(redis_config, None, None, None, 1).expect("Unable to create Redis pool");
@ -55,30 +65,16 @@ async fn main() {
        .fallback(file_and_error_handler)
        .with_state(leptos_options);

-    println!("listening on http://{}", &addr);
-
    let listener = tokio::net::TcpListener::bind(&addr).await.expect(&format!("Could not bind to {}", &addr));
+
+    info!("Listening on http://{}", &addr);
+
    axum::serve(listener, app.into_make_service()).await.expect("Server failed");
 }

-#[cfg(not(any(feature = "ssr", feature = "csr")))]
+#[cfg(not(feature = "ssr"))]
 pub fn main() {
    // no client-side main function
    // unless we want this to work with e.g., Trunk for pure client-side testing
    // see lib.rs for hydration function instead
-    // see optional feature `csr` instead
-}
-
-#[cfg(all(not(feature = "ssr"), feature = "csr"))]
-pub fn main() {
-    // a client-side main function is required for using `trunk serve`
-    // prefer using `cargo leptos serve` instead
-    // to run: `trunk serve --open --features csr`
-    use leptos::*;
-    use libretunes::app::*;
-    use wasm_bindgen::prelude::wasm_bindgen;
-
-    console_error_panic_hook::set_once();
-
-    leptos::mount_to_body(App);
 }
--- a/src/models.rs
+++ b/src/models.rs
@ -41,13 +41,144 @@ pub struct User {
 	/// The time the user was created
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = SystemTime))]
 	pub created_at: Option<SystemTime>,
+	/// Whether the user is an admin
+	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))]
+#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::artists))]
 #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Artist {
 	/// A unique id for the artist
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
@ -162,13 +293,33 @@ 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
-#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
+#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::albums))]
 #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Album {
 	/// A unique id for the album
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
@ -177,6 +328,8 @@ pub struct Album {
 	pub title: String,
 	/// The album's release date
 	pub release_date: Option<Date>,
+	/// The path to the album's image file
+	pub image_path: Option<String>,
 }

 impl Album {
@ -289,4 +442,30 @@ 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,2 +1,3 @@
 pub mod login;
 pub mod signup;
+pub mod audiotest;
--- a/src/pages/audiotest.rs
+++ b/src/pages/audiotest.rs
@ -0,0 +1,9 @@
+use leptos::leptos_dom::*;
+use leptos::*;
+
+#[component]
+pub fn AudioTest() -> impl IntoView {
+    view! {
+        <p>Hello World</p>
+    }
+}
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@ -25,6 +25,7 @@ pub fn Signup() -> impl IntoView {
            email: email.get(),
            password: Some(password.get()),
            created_at: None,
+            admin: false,
        };
        log!("new user: {:?}", new_user);

--- a/src/playbar.rs
+++ b/src/playbar.rs
@ -1,4 +1,7 @@
+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::*;
@ -243,37 +246,149 @@ 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.name.clone())
+			status.queue.front().map_or("No media playing".into(), |song| song.title.clone())
 		})
    });

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

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

 	let image = Signal::derive(move || {
 		status.with(|status| {
-			// TODO Use some default / unknown image?
-			status.queue.front().map_or("".into(), |song| song.image_path.clone())
+			status.queue.front().map_or("/images/placeholders/MusicPlaceholder.svg".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>
    }
 }
@ -400,7 +515,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.name);
+                log!("Starting playing with song: {}", song.title);

                // Don't use the set_play_src / set_playing helper function
                // here because we already have access to the audio element
@ -453,7 +568,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.name);
+                log!("Adding song to history: {}", prev_song.title);
                status.history.push_back(prev_song);
            } else {
                log!("Queue empty, no previous song to add to history");
@ -486,7 +601,10 @@ 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,3 +1,4 @@
+use crate::models::Artist;
 use crate::playstatus::PlayStatus;
 use crate::song::Song;
 use leptos::ev::MouseEvent;
@ -98,7 +99,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.name.clone() song_artist=song.artist.clone() />
+									<Song song_image_path=song.image_path.clone() song_title=song.title.clone() song_artist=Artist::display_list(&song.artists) />
 									<Show
 										when=move || index != 0
 										fallback=|| view!{
--- a/src/schema.rs
+++ b/src/schema.rs
@ -12,6 +12,7 @@ diesel::table! {
        id -> Int4,
        title -> Varchar,
        release_date -> Nullable<Date>,
+        image_path -> Nullable<Varchar>,
    }
 }

@ -29,6 +30,20 @@ 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,
@ -49,6 +64,7 @@ diesel::table! {
        email -> Varchar,
        password -> Varchar,
        created_at -> Timestamp,
+        admin -> Bool,
    }
 }

@ -56,6 +72,10 @@ 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!(
@ -63,6 +83,8 @@ diesel::allow_tables_to_appear_in_same_query!(
    albums,
    artists,
    song_artists,
+    song_dislikes,
+    song_likes,
    songs,
    users,
 );
--- a/src/search.rs
+++ b/src/search.rs
@ -102,7 +102,7 @@ pub async fn search(query: String, limit: i64) -> Result<(Vec<Album>, Vec<Artist
 	let artists = search_artists(query.clone(), limit);
 	let songs = search_songs(query.clone(), limit);

-	use futures::join;
+	use tokio::join;

 	let (albums, artists, songs) = join!(albums, artists, songs);
 	Ok((albums?, artists?, songs?))
--- a/src/songdata.rs
+++ b/src/songdata.rs
@ -1,16 +1,62 @@
+use crate::models::{Album, Artist, Song};
+
+use time::Date;
+
 /// Holds information about a song
-#[derive(Debug, Clone)]
+/// 
+/// Intended to be used in the front-end, as it includes artist and album objects, rather than just their ids.
 pub struct SongData {
+	/// Song id
+	pub id: i32,
 	/// Song name
-	pub name: String,
-	/// Song artist
-	pub artist: String,
+	pub title: String,
+	/// Song artists
+	pub artists: Vec<Artist>,
 	/// Song album
-	pub album: String,
+	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>,
 	/// 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/src/upload.rs
+++ b/src/upload.rs
@ -0,0 +1,294 @@
+use leptos::*;
+use server_fn::codec::{MultipartData, MultipartFormData};
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+	if #[cfg(feature = "ssr")] {
+		use multer::Field;
+		use crate::database::get_db_conn;
+		use diesel::prelude::*;
+		use log::*;
+		use server_fn::error::NoCustomError;
+		use time::Date;
+	}
+}
+
+/// Extract the text from a multipart field
+#[cfg(feature = "ssr")]
+async fn extract_field(field: Field<'static>) -> Result<String, ServerFnError> {
+	let field = match field.text().await {
+		Ok(field) => field,
+		Err(e) => Err(ServerFnError::<NoCustomError>::ServerError(format!("Error reading field: {}", e)))?,
+	};
+
+	Ok(field)
+}
+
+/// Validate the artist ids in a multipart field
+/// Expects a field with a comma-separated list of artist ids, and ensures each is a valid artist id in the database
+#[cfg(feature = "ssr")]
+async fn validate_artist_ids(artist_ids: Field<'static>) -> Result<Vec<i32>, ServerFnError> {
+    use crate::models::Artist;
+	use diesel::result::Error::NotFound;
+
+	// Extract the artist id from the field
+	match artist_ids.text().await {
+		Ok(artist_ids) => {
+			let artist_ids = artist_ids.trim_end_matches(',').split(',');
+
+			artist_ids.filter(|artist_id| !artist_id.is_empty()).map(|artist_id| {
+				// Parse the artist id as an integer
+				if let Ok(artist_id) = artist_id.parse::<i32>() {
+					// Check if the artist exists
+					let db_con = &mut get_db_conn();
+					let artist = crate::schema::artists::dsl::artists.find(artist_id).first::<Artist>(db_con);
+
+					match artist {
+						Ok(_) => Ok(artist_id),
+						Err(NotFound) => Err(ServerFnError::<NoCustomError>::
+							ServerError("Artist does not exist".to_string())),
+						Err(e) => Err(ServerFnError::<NoCustomError>::
+							ServerError(format!("Error finding artist id: {}", e))),
+					}
+				} else {
+					Err(ServerFnError::<NoCustomError>::ServerError("Error parsing artist id".to_string()))
+				}
+			}).collect()
+		},
+
+		Err(e) => Err(ServerFnError::<NoCustomError>::ServerError(format!("Error reading artist id: {}", e))),
+	}
+}
+
+/// Validate the album id in a multipart field
+/// Expects a field with an album id, and ensures it is a valid album id in the database
+#[cfg(feature = "ssr")]
+async fn validate_album_id(album_id: Field<'static>) -> Result<Option<i32>, ServerFnError> {
+	use crate::models::Album;
+	use diesel::result::Error::NotFound;
+
+	// Extract the album id from the field
+	match album_id.text().await {
+		Ok(album_id) => {
+			if album_id.is_empty() {
+				return Ok(None);
+			}
+
+			// Parse the album id as an integer
+			if let Ok(album_id) = album_id.parse::<i32>() {
+				// Check if the album exists
+				let db_con = &mut get_db_conn();
+				let album = crate::schema::albums::dsl::albums.find(album_id).first::<Album>(db_con);
+
+				match album {
+					Ok(_) => Ok(Some(album_id)),
+					Err(NotFound) => Err(ServerFnError::<NoCustomError>::
+						ServerError("Album does not exist".to_string())),
+					Err(e) => Err(ServerFnError::<NoCustomError>::
+						ServerError(format!("Error finding album id: {}", e))),
+				}
+			} else {
+				Err(ServerFnError::<NoCustomError>::ServerError("Error parsing album id".to_string()))
+			}
+		},
+		Err(e) => Err(ServerFnError::<NoCustomError>::ServerError(format!("Error reading album id: {}", e))),
+	}
+}
+
+/// Validate the track number in a multipart field
+/// Expects a field with a track number, and ensures it is a valid track number (non-negative integer)
+#[cfg(feature = "ssr")]
+async fn validate_track_number(track_number: Field<'static>) -> Result<Option<i32>, ServerFnError> {
+	match track_number.text().await {
+		Ok(track_number) => {
+			if track_number.is_empty() {
+				return Ok(None);
+			}
+
+			if let Ok(track_number) = track_number.parse::<i32>() {
+				if track_number < 0 {
+					return Err(ServerFnError::<NoCustomError>::
+						ServerError("Track number must be positive or 0".to_string()));
+				} else {
+					Ok(Some(track_number))
+				}
+			} else {
+				return Err(ServerFnError::<NoCustomError>::ServerError("Error parsing track number".to_string()));
+			}
+		},
+		Err(e) => Err(ServerFnError::<NoCustomError>::ServerError(format!("Error reading track number: {}", e)))?,
+	}
+}
+
+/// Validate the release date in a multipart field
+/// Expects a field with a release date, and ensures it is a valid date in the format [year]-[month]-[day]
+#[cfg(feature = "ssr")]
+async fn validate_release_date(release_date: Field<'static>) -> Result<Option<Date>, ServerFnError> {
+	match release_date.text().await {
+		Ok(release_date) => {
+			if release_date.trim().is_empty() {
+				return Ok(None);
+			}
+
+			let date_format = time::macros::format_description!("[year]-[month]-[day]");
+			let release_date = Date::parse(&release_date.trim(), date_format);
+
+			match release_date {
+				Ok(release_date) => Ok(Some(release_date)),
+				Err(_) => Err(ServerFnError::<NoCustomError>::ServerError("Invalid release date".to_string())),
+			}
+		},
+		Err(e) => Err(ServerFnError::<NoCustomError>::ServerError(format!("Error reading release date: {}", e))),
+	}
+}
+
+/// Handle the file upload form
+#[server(input = MultipartFormData, endpoint = "/upload")]
+pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> {
+	// Safe to unwrap - "On the server side, this always returns Some(_). On the client side, always returns None."
+	let mut data = data.into_inner().unwrap();
+
+	let mut title = None;
+	let mut artist_ids = None;
+	let mut album_id = None;
+	let mut track = None;
+	let mut release_date = None;
+	let mut file_name = None;
+	let mut duration = None;
+
+	// Fetch the fields from the form data
+	while let Ok(Some(mut field)) = data.next_field().await {
+		let name = field.name().unwrap_or_default().to_string();
+
+		match name.as_str() {
+			"title" => { title = Some(extract_field(field).await?); },
+			"artist_ids" => { artist_ids = Some(validate_artist_ids(field).await?); },
+			"album_id" => { album_id = Some(validate_album_id(field).await?); },
+			"track_number" => { track = Some(validate_track_number(field).await?); },
+			"release_date" => { release_date = Some(validate_release_date(field).await?); },
+			"file" => {
+				use symphonia::core::codecs::CODEC_TYPE_MP3;
+				use crate::util::audio::extract_metadata;
+				use std::fs::OpenOptions;
+				use std::io::{Seek, Write};
+
+				// Some logging is done here where there is high potential for bugs / failures,
+				// or behavior that we may wish to change in the future
+
+				// Create file name
+				let title = title.clone().ok_or(ServerFnError::<NoCustomError>::
+					ServerError("Title field required and must precede file field".to_string()))?;
+
+				let clean_title = title.replace(" ", "_").replace("/", "_");
+				let date_format = time::macros::format_description!("[year]-[month]-[day]_[hour]:[minute]:[second]");
+				let date_str = time::OffsetDateTime::now_utc().format(date_format).unwrap_or_default();
+				let upload_path = format!("assets/audio/upload-{}_{}.mp3", date_str, clean_title);
+				file_name = Some(format!("upload-{}_{}.mp3", date_str, clean_title));
+
+				debug!("Saving uploaded file {}", upload_path);
+
+				// Save file to disk
+				// Use these open options to create the file, write to it, then read from it
+				let mut file = OpenOptions::new()
+					.read(true)
+					.write(true)
+					.create(true)
+					.open(upload_path.clone())?;
+
+				while let Some(chunk) = field.chunk().await? {
+					file.write(&chunk)?;
+				}
+
+				file.flush()?;
+
+				// Rewind the file so the duration can be measured
+				file.rewind()?;
+
+				// Get the codec and duration of the file
+				let (file_codec, file_duration) = extract_metadata(file)
+					.map_err(|e| {
+						let msg = format!("Error measuring duration of audio file {}: {}", upload_path, e);
+						warn!("{}", msg);
+						ServerFnError::<NoCustomError>::ServerError(msg)
+					})?;
+
+				if file_codec != CODEC_TYPE_MP3 {
+					let msg = format!("Invalid uploaded audio file codec: {}", file_codec);
+					warn!("{}", msg);
+					return Err(ServerFnError::<NoCustomError>::ServerError(msg));
+				}
+
+				duration = Some(file_duration);
+			},
+			_ => {
+				warn!("Unknown file upload field: {}", name);
+			}
+		}
+	}
+
+	// Unwrap mandatory fields
+	let title = title.ok_or(ServerFnError::<NoCustomError>::ServerError("Missing title".to_string()))?;
+	let artist_ids = artist_ids.unwrap_or(vec![]);
+	let file_name = file_name.ok_or(ServerFnError::<NoCustomError>::ServerError("Missing file".to_string()))?;
+	let duration = duration.ok_or(ServerFnError::<NoCustomError>::ServerError("Missing duration".to_string()))?;
+	let duration = i32::try_from(duration).map_err(|e| ServerFnError::<NoCustomError>::
+		ServerError(format!("Error converting duration to i32: {}", e)))?;
+
+	let album_id = album_id.unwrap_or(None);
+	let track = track.unwrap_or(None);
+	let release_date = release_date.unwrap_or(None);
+
+	if album_id.is_some() != track.is_some() {
+		return Err(ServerFnError::<NoCustomError>
+			::ServerError("Album id and track number must both be present or both be absent".to_string()));
+	}
+
+	// Create the song
+	use crate::models::Song;
+	let song = Song {
+		id: None,
+		title,
+		album_id,
+		track,
+		duration,
+		release_date,
+		storage_path: file_name,
+		image_path: None,
+	};
+
+	// Save the song to the database
+	let db_con = &mut get_db_conn();
+	let song = song.insert_into(crate::schema::songs::table)
+		.get_result::<Song>(db_con)
+		.map_err(|e| {
+			let msg = format!("Error saving song to database: {}", e);
+			warn!("{}", msg);
+			ServerFnError::<NoCustomError>::ServerError(msg)
+		})?;
+
+	// Save the song's artists to the database
+	let song_id = song.id.ok_or_else(|| {
+		let msg = "Error saving song to database: song id not found after insertion".to_string();
+		warn!("{}", msg);
+		ServerFnError::<NoCustomError>::ServerError(msg)
+	})?;
+
+	use crate::schema::song_artists;
+	use diesel::ExpressionMethods;
+
+	let artist_ids = artist_ids.into_iter().map(|artist_id| {
+		(song_artists::song_id.eq(song_id), song_artists::artist_id.eq(artist_id))
+	}).collect::<Vec<_>>();
+
+	diesel::insert_into(crate::schema::song_artists::table)
+		.values(&artist_ids)
+		.execute(db_con)
+		.map_err(|e| {
+			let msg = format!("Error saving song artists to database: {}", e);
+			warn!("{}", msg);
+			ServerFnError::<NoCustomError>::ServerError(msg)
+		})?;
+
+	Ok(())
+}
--- a/src/util/audio.rs
+++ b/src/util/audio.rs
@ -0,0 +1,37 @@
+use symphonia::core::codecs::CodecType;
+use symphonia::core::formats::FormatOptions;
+use symphonia::core::io::MediaSourceStream;
+use symphonia::core::meta::MetadataOptions;
+use symphonia::core::probe::Hint;
+use std::fs::File;
+
+/// Extract the codec and duration of an audio file
+/// This is combined into one function because the file object will be consumed
+pub fn extract_metadata(file: File) -> Result<(CodecType, u64), Box<dyn std::error::Error>> {
+	let source_stream = MediaSourceStream::new(Box::new(file), Default::default());
+
+	let hint = Hint::new();
+	let format_opts = FormatOptions::default();
+	let metadata_opts = MetadataOptions::default();
+
+	let probe = symphonia::default::get_probe().format(&hint, source_stream, &format_opts, &metadata_opts)?;
+	let reader = probe.format;
+
+	if reader.tracks().len() != 1 {
+		return Err(format!("Expected 1 track, found {}", reader.tracks().len()).into())
+	}
+
+	let track = &reader.tracks()[0];
+
+	let time_base = track.codec_params.time_base.ok_or("Missing time base")?;
+	let duration = track.codec_params.n_frames
+		.map(|frames| track.codec_params.start_ts + frames)
+		.ok_or("Missing number of frames")?;
+
+	let duration = duration
+		.checked_mul(time_base.numer as u64)
+		.and_then(|v| v.checked_div(time_base.denom as u64))
+		.ok_or("Overflow while computing duration")?;
+
+	Ok((track.codec_params.codec, duration))
+}
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@ -0,0 +1,7 @@
+use cfg_if::cfg_if;
+
+cfg_if! {
+	if #[cfg(feature = "ssr")] {
+		pub mod audio;
+	}
+}
--- a/style/main.scss
+++ b/style/main.scss
@ -8,6 +8,7 @@
@import 'home.scss';
@import 'search.scss';
@import 'personal.scss';
+@import 'upload.scss';

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

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

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

 	.playcontrols {
@ -64,23 +65,6 @@
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
-
-		button {
-			.controlbtn {
-				color: $text-controls-color;
-			}
-
-			.controlbtn:hover {
-				color: $controls-hover-color;
-			}
-
-			.controlbtn:active {
-				color: $controls-click-color;
-			}
-	
-			background-color: transparent;
-			border: transparent;
-		}
 	}

 	.playduration {
@ -94,22 +78,30 @@
 		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;
+	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;
 	}
 }
--- a/style/sidebar.scss
+++ b/style/sidebar.scss
@ -4,67 +4,20 @@
  background-color: transparent;
  width: 22rem;
  height: calc(100% - 75px);
-}
-
-.sidebar-top-container {
-  border-radius: 1rem;
-  background-color: #1c1c1c;
-  height: 9rem;
-  margin: 3px;
-  padding: 0.1rem 1rem 1rem 1rem;
-}
-
-.sidebar-top-container .header {
-  font-size: 1.2rem;
-}
-.sidebar-top-container .buttons {
-  display: flex;
-  flex-direction: row;
-  font-size: 1.8rem;
-  align-items: center;
-  transition: all 0.5s;
-  cursor: pointer;
-  color: grey;
-}
-.sidebar-top-container .buttons:hover {
-  color: white;
-}
-
-.sidebar-top-container .buttons:last-child {
-  margin-left: 0.02rem;
-  margin-top: 0.5rem;
-}
-
-.sidebar-top-container h1 {
-  font-size: 0.95rem;
-  margin-left: 0.9rem;
-  font-weight: 400;
-  font-style: $standard-font;
-  letter-spacing: 0.5px;
-}
-
-.sidebar-bottom-container {
-  border-radius: 1rem;
-  background-color: #1c1c1c;
-  margin: 3px;
-  margin-top: 6px;
-  padding: 0.2rem 1rem 1rem 1rem;
-  height: calc(100% - 9rem);
-
-  .heading {
-    display: flex;
-    flex-direction: row;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-
+  .sidebar-top-container {
+    border-radius: 1rem;
+    background-color: #1c1c1c;
+    height: 9rem;
+    margin: 3px;
+    padding: 0.1rem 1rem 1rem 1rem;
+    position: relative;
    .header {
      font-size: 1.2rem;
-      font-weight: 200;
    }
-
-    .add-playlist {
+    .upload-btn {
+      position: absolute;
+      top: 10px;
+      right: 7px;
      display: flex;
      flex-direction: row;
      align-items: center;
@ -73,8 +26,8 @@
      border-radius: 50px;
      border: none;
      height: 2.2rem;
-      padding-right: 2rem;
-      padding-left: 2rem;
+      padding-right: 1rem;
+      padding-left: 1rem;
      cursor: pointer;
      transition: background-color 0.3s ease;
      .add-sign {
@ -84,8 +37,80 @@
        color: white;
      }
    }
-    .add-playlist:hover {
+    .upload-btn:hover {
      background-color: #9e9e9e;
    }
+    .buttons {
+      display: flex;
+      flex-direction: row;
+      font-size: 1.8rem;
+      align-items: center;
+      transition: all 0.5s;
+      cursor: pointer;
+      color: grey;
+      text-decoration: none;
+    }
+    .buttons:hover {
+      color: white;
+    }
+    .buttons:last-child {
+      margin-left: 0.02rem;
+      margin-top: 0.5rem;
+    }
+    h1 {
+      font-size: 0.95rem;
+      margin-left: 0.9rem;
+      font-weight: 400;
+      font-style: $standard-font;
+      letter-spacing: 0.5px;
+    }
+  }
+  .sidebar-bottom-container {
+    border-radius: 1rem;
+    background-color: #1c1c1c;
+    margin: 3px;
+    margin-top: 6px;
+    padding: 0.2rem 1rem 1rem 1rem;
+    height: calc(100% - 9rem);
+  
+    .heading {
+      display: flex;
+      flex-direction: row;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+  
+      .header {
+        font-size: 1.2rem;
+        font-weight: 200;
+      }
+  
+      .add-playlist {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.9rem;
+        border-radius: 50px;
+        border: none;
+        height: 2.2rem;
+        padding-right: 2rem;
+        padding-left: 2rem;
+        cursor: pointer;
+        transition: background-color 0.3s ease;
+        .add-sign {
+          font-size: 1.5rem;
+          margin-top: auto;
+          margin-right: 5px;
+          color: white;
+        }
+      }
+      .add-playlist:hover {
+        background-color: #9e9e9e;
+      }
+    }
  }  
 }
+
+
--- a/style/upload.scss
+++ b/style/upload.scss
@ -0,0 +1,188 @@
+@import "theme.scss";
+
+.upload-container {
+    position: fixed;
+    top: 45%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 30rem;
+    height: 30rem;
+    border: 1px solid white;
+    border-radius: 5px;
+    padding: 1rem;
+    padding-top: 0;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    background-color: #1c1c1c;
+    .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);
+    }
+    .upload-header {
+        font-size: .7rem;
+        font-weight: 300;
+        padding-bottom: 0;
+        border-bottom: 1px solid white;
+        font-family: "Roboto", sans-serif;
+    }
+    .upload-form {
+        padding: .1rem;
+        display: flex;
+        flex-direction: column;
+        .input-bx{
+            margin-top: 1rem;
+            position: relative;
+            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;
+            }
+        }
+        .file {
+            margin-top: .5rem;
+            display: flex;
+            align-items: center;
+            span {
+                font-size: .9rem;
+                color: #7f8fa6;
+                font-family: "Roboto", sans-serif;
+                margin-left: 5px;
+                margin-right: 10px;
+            }
+            input {
+                padding: 10px;
+            }
+        }
+        .upload-button {
+            margin-top: 1rem;
+            padding: 10px;
+            background-color: #7f8fa6;
+            color: #fff;
+            font-size: 1rem;
+            font-family: "Roboto", sans-serif;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: 0.3s;
+            &:hover {
+                background-color: #fff;
+                color: #7f8fa6;
+            }
+        }
+        .has-search {
+            position: relative;
+            width: 325px;
+            .search-results {
+                display: flex;
+                flex-direction: column;
+                border: 1px solid white;
+                width: 100%;
+                position: absolute;
+                top: 75%;
+                background-color: #1c1c1c;
+                z-index: 2;
+                border-radius: 5px;
+                padding: 0;
+                .result {
+                    border-bottom: 1px solid white; 
+                    padding: 10px;
+                    cursor: pointer;
+                    transition: 0.3s;
+                    &:hover {
+                        background-color: #7f8fa6;
+                    }
+                }
+                .result:last-child {
+                    border-bottom: none;
+                }
+            }
+        }
+    }
+
+    .error-msg {
+        padding-top: 10px;
+        color: red;
+
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        svg {
+            width: 20px;
+            height: 20px;
+            margin-right: 5px;
+        }
+    }
+}
Author	SHA1	Message	Date
Carter Bertolini	5d1e8cb01b	Setup basic audio testing environment, and setup module for audio player	2024-09-27 17:18:09 -04:00
Ethan Girouard	bf89838297	Merge pull request '81_switch-from-gitlab-ci-cd-to-gitea-actions' (#91 ) from 81_switch-from-gitlab-ci-cd-to-gitea-actions into main Reviewed-on: LibreTunes/LibreTunes#91	2024-09-16 02:57:38 +00:00
Ethan Girouard	b7e5327903	Add Gitea Actions jobs	2024-09-15 21:49:53 -04:00
Ethan Girouard	8fea5fcec7	Remove GitLab CI/CD file	2024-09-15 21:47:04 -04:00
Ethan Girouard	266bba05aa	Merge pull request 'Convert Infaliable Result into Option and handle' (#90 ) from 89_fix-warning-with-handling-infaliable-result-in-fileserv-rs into main Reviewed-on: LibreTunes/LibreTunes#90	2024-09-16 01:44:52 +00:00
Ethan Girouard	86f9b6fbb3	Convert Infaliable Result into Option and handle	2024-09-15 21:43:59 -04:00
Ethan Girouard	da45a503ac	Merge pull request 'Add Docker build steps from old docker-leptos/musl image' (#88 ) from 86_combine-old-docker-leptos-musl-image-build-into-dockerfile into main Reviewed-on: LibreTunes/LibreTunes#88	2024-09-16 01:32:20 +00:00
Ethan Girouard	074f866e5f	Add Docker build steps from old docker-leptos/musl image	2024-09-15 21:31:22 -04:00
Ethan Girouard	cb0936003c	Merge pull request 'Change target cfg condition to target_env' (#87 ) from 85_fix-warnings-due-to-removal-of-target-cfg-condition into main Reviewed-on: LibreTunes/LibreTunes#87	2024-09-16 00:20:10 +00:00
Ethan Girouard	d66849c6cb	Change target cfg condition to target_env	2024-09-15 20:18:02 -04:00
Ethan Girouard	b54ecb5b27	Merge pull request 'Update time to v0.3.36' (#84 ) from 83_update-time-crate-to-fix-type-inference-build-error into main Reviewed-on: LibreTunes/LibreTunes#84	2024-09-15 00:38:43 +00:00
Ethan Girouard	0ee61f288f	Update time to v0.3.36	2024-09-15 00:36:22 +00:00
Ethan Girouard	8c516e3070	Merge pull request 'Update wasm-bindgen to 0.2.93' (#82 ) from 80_update-wasm-bindgen-to-0.2.93 into main Reviewed-on: LibreTunes/LibreTunes#82	2024-09-15 00:30:50 +00:00
Ethan Girouard	22f3749ee4	Update wasm-bindgen to 0.2.93	2024-09-15 00:23:43 +00:00
Ethan Girouard	7cb556e5ef	Merge branch '36-implement-likes-and-dislikes' into 'main' Implement likes and dislikes Closes #36 See merge request libretunes/libretunes!32	2024-07-30 20:55:52 -04:00
Ethan Girouard	bab819822d	Remove like/dislike API calls TODO comment	2024-07-30 19:34:52 -04:00
Ethan Girouard	0c54f0aeb8	Remove leftover dislike button logging	2024-07-30 19:34:15 -04:00
Ethan Girouard	afbcc65457	Implement like/dislike using SongData instead of PlayStatus	2024-07-28 22:42:04 -04:00
Ethan Girouard	e5a6e8f44e	Add like_dislike field to SongData	2024-07-28 22:40:52 -04:00
Ethan Girouard	d45f102be7	Remove TryInto<SongData> for Song These pre-defined conversion traits are meant to be fast, and implementing this conversion that accesses the database goes against this design.	2024-07-28 22:37:17 -04:00
Ethan Girouard	74b34b1e54	Merge remote-tracking branch 'origin/31-update-songdata-for-fetching-songs-on-frontend-for-playback' into 36-implement-likes-and-dislikes	2024-07-24 17:30:05 -04:00
Ethan Girouard	2ea3979a89	Merge branch '31-update-songdata-for-fetching-songs-on-frontend-for-playback' into 'main' Resolve "Update SongData for fetching songs on frontend for playback" Closes #31 See merge request libretunes/libretunes!31	2024-07-24 17:18:10 -04:00
Ethan Girouard	21bb2d127f	Fix unused crate::database import	2024-07-23 23:37:48 -04:00
Ethan Girouard	76631126de	Add Song/SongData conversions	2024-07-23 23:32:26 -04:00
Ethan Girouard	f8bbe319bd	Update SongData for frontend use	2024-07-23 23:31:48 -04:00
Ethan Girouard	ffad799f72	Add function to get song album object	2024-07-23 23:30:15 -04:00
Ethan Girouard	c72d4aee18	Add Arist::display_list function	2024-07-23 22:57:24 -04:00
Ethan Girouard	8a474077da	Merge branch '47-add-placeholder-images-for-when-no-artist-album-song-image-is-present' into 'main' Add music placeholder image Closes #47 See merge request libretunes/libretunes!30	2024-07-23 21:44:12 -04:00
Ethan Girouard	6202b287f0	Fix music placeholder asset path	2024-07-23 20:51:12 -04:00
Ethan Girouard	6b8c8d41e4	Add music placeholder image	2024-07-21 13:15:55 -04:00
Ethan Girouard	4513335784	Merge branch '29-implement-admin-user-permission-flag' into 'main' Implement admin user permission flag Closes #29 See merge request libretunes/libretunes!28	2024-05-19 12:43:51 -04:00
Ethan Girouard	fa26ee40ed	Add auth functions for checking admin status	2024-05-19 12:20:50 -04:00
Ethan Girouard	c27ad19499	Prevent arbitrary admin user creation	2024-05-19 10:45:50 -04:00
Ethan Girouard	6ae55d5cfc	Add admin column to users table	2024-05-19 10:45:45 -04:00
Ethan Girouard	7bcb5f8c04	Merge branch '40-reduce-dependencies-and-their-features' into 'main' Reduce dependencies and their features Closes #40 See merge request libretunes/libretunes!27	2024-05-18 20:29:27 -04:00
Ethan Girouard	9a462d5ee9	Make async-trait required for backend only	2024-05-18 18:51:59 -04:00
Ethan Girouard	5cc504b4d6	Merge branch '19-implement-file-uploads' into 'main' Resolve "Implement file uploads" Closes #19 See merge request libretunes/libretunes!26	2024-05-18 18:51:30 -04:00
Ethan Girouard	eb4dcd4776	Remove tower_sessions dependency	2024-05-18 18:39:14 -04:00
Ethan Girouard	355c791ea7	Reset form fields after sucessful submission	2024-05-18 18:15:50 -04:00
Ethan Girouard	b0edd2174e	Don't initially show upload error message	2024-05-18 18:10:48 -04:00
Ethan Girouard	3978526231	Merge remote-tracking branch 'origin/main' into 19-implement-file-uploads	2024-05-18 18:10:03 -04:00
Ethan Girouard	0adf294cfc	Display error message when upload song fails	2024-05-18 16:36:37 -04:00
Ethan Girouard	e7e7a8175e	Add web_sys dependency	2024-05-18 16:34:48 -04:00
Ethan Girouard	952fb93e1e	Only allow mp3 file upload selections	2024-05-18 16:34:07 -04:00
Ethan Girouard	1633d8c1a5	Fix required/optional form fields	2024-05-18 16:33:48 -04:00
Ethan Girouard	b4054aa2b7	Ensure track is specified if album is specified	2024-05-18 16:32:31 -04:00
Ethan Girouard	3934a25900	Handle present but empty fields	2024-05-18 16:32:04 -04:00
Ethan Girouard	26c34e0012	Merge branch '39-add-images-to-albums' into 'main' Add image_path column to albums table Closes #39 See merge request libretunes/libretunes!25	2024-05-16 21:58:49 -04:00
Ethan Girouard	522658c0dc	Merge branch '38-refactor-navigation-using-leptos-nested-routing' into 'main' Use nested routing for navigation Closes #38 See merge request libretunes/libretunes!24	2024-05-16 21:50:21 -04:00
Ethan Girouard	3c9ae521b1	Remove trailing comma from artist id field	2024-05-16 20:59:48 -04:00
dannyzou18	4958d3a881	fixed bug	2024-05-16 20:58:27 -04:00
Ethan Girouard	965bf5a457	Reduce axum features to tokio, http1	2024-05-16 19:30:46 -04:00
Ethan Girouard	8ffe09381c	Remove futures dependency Use tokio::join instead of futures::join	2024-05-16 19:23:48 -04:00
Ethan Girouard	12384b5a75	Disable default features in time	2024-05-16 19:18:53 -04:00
Ethan Girouard	bf9067aa43	Disable default features in serde	2024-05-16 19:17:21 -04:00
Ethan Girouard	7b43906632	Disable default features in diesel	2024-05-16 19:14:38 -04:00
Ethan Girouard	4685861af3	Make wasm-bindgen required for frontend only	2024-05-16 19:08:22 -04:00
Ethan Girouard	df78afbe60	Disable default features in wasm-bindgen	2024-05-16 19:07:39 -04:00
dannyzou18	caefc46fcc	added album search feature for upload	2024-05-16 18:59:16 -04:00
Ethan Girouard	94d62ea2d5	Disable default features in leptos crate	2024-05-16 18:53:58 -04:00
Ethan Girouard	893c411c7f	Disable default features in http crate	2024-05-16 18:51:47 -04:00
Ethan Girouard	618b7d65ce	Make console_error_panic_hook required for frontend only	2024-05-16 18:47:45 -04:00
Ethan Girouard	78d8e1243d	Remove csr feature	2024-05-16 18:42:03 -04:00
dannyzou18	955fc84412	allow choosing artists by searching for upload	2024-05-16 18:35:02 -04:00
Ethan Girouard	cc4aee4ab4	Add image_path column to albums table	2024-05-16 18:13:14 -04:00
dannyzou18	5775d3148b	finished upload design	2024-05-16 15:44:13 -04:00
dannyzou18	714fbc596a	styled upload form	2024-05-12 23:56:59 -07:00
Ethan Girouard	ff43b3f7e8	Use nested routing for navigation Remove dashboard_open signal Use <a> tags to navigate to new pages Add dashboard and search to nested routing	2024-05-12 11:00:47 -04:00
Ethan Girouard	e411ab9eee	Add API functions for liking and disliking songs	2024-05-10 20:32:23 -04:00
Ethan Girouard	775c7eff3a	Add api module	2024-05-10 20:32:23 -04:00
Ethan Girouard	2ed67e5545	Add various like/dislike functions for users	2024-05-10 20:32:22 -04:00
Ethan Girouard	08f1b95c18	Add get_user auth function	2024-05-10 20:26:59 -04:00
Ethan Girouard	7a750b60aa	Update styling to fit LikeDislike component	2024-05-10 20:26:25 -04:00
Ethan Girouard	2b9d849578	Add styling for horizontally mirrored button	2024-05-10 20:26:25 -04:00
Ethan Girouard	28ff98ab32	Add LikeDislike component	2024-05-10 20:26:10 -04:00
Ethan Girouard	a0da89204c	Move MediaInfo into playbar-left-group div	2024-05-10 19:51:27 -04:00
Ethan Girouard	c07237ad8a	Move redundant controlbtn styling	2024-05-10 17:38:37 -04:00
Ethan Girouard	727029b757	Create DB tables for likes and dislikes	2024-05-10 16:03:18 -04:00
Ethan Girouard	8a959d530d	Implement basic upload dialog	2024-05-10 15:51:26 -04:00
Ethan Girouard	7abfbaf600	Fix unused imports	2024-05-10 15:25:57 -04:00
Ethan Girouard	161ea5f9c2	Implement file upload backend	2024-05-10 15:20:57 -04:00
Ethan Girouard	353a8e3a9c	Allow finding Artist and Album by primary key	2024-05-10 14:18:48 -04:00
Ethan Girouard	5d7ac2bb80	Add returning codec type to audio util function	2024-05-10 14:09:24 -04:00
Ethan Girouard	695f404ba8	Merge remote-tracking branch 'origin/main' into 19-implement-file-uploads	2024-05-10 12:49:58 -04:00
Ethan Girouard	79ba191415	Add function to get audio file duration	2024-05-10 11:28:43 -04:00
Ethan Girouard	3338cc2662	Add util module	2024-05-10 11:28:11 -04:00
Ethan Girouard	60ad643669	Merge branch '34-fix-serde-version-warning-in-cargo-toml' into 'main' Fix unspecified dependency version warnings in Cargo.toml Closes #34 See merge request libretunes/libretunes!23	2024-05-10 11:11:11 -04:00
Ethan Girouard	490772654d	Add multer crate	2024-05-10 10:55:26 -04:00
Ethan Girouard	b2fd8dc8e5	Fix misspelling of "version" for tower	2024-05-10 10:33:16 -04:00
Ethan Girouard	91812f4695	Fix misspelling of "version" for serde	2024-05-10 10:32:19 -04:00
Ethan Girouard	9b1ea51896	Merge branch '30-add-logging-to-startup-of-backend' into 'main' Add logging Closes #30 See merge request libretunes/libretunes!22	2024-05-08 17:56:45 -04:00
Ethan Girouard	6bf08b7507	Add symphonia crate	2024-04-19 09:23:10 -04:00
Ethan Girouard	04e0a66122	Add server_fn crate	2024-04-12 17:04:51 -04:00
Ethan Girouard	b6066e2d3e	Include ASCII art file in Docker build	2024-04-11 23:42:22 -04:00
Ethan Girouard	241389e5f7	Add logging to main	2024-04-11 23:19:21 -04:00
Ethan Girouard	557c189a17	Add ASCII art of logo and name	2024-04-11 23:19:02 -04:00
Ethan Girouard	4f6f3f90c1	Add flexi_logger crate	2024-04-11 23:14:53 -04:00
Ethan Girouard	7062c75013	Add log crate	2024-04-11 23:06:04 -04:00
				`@ -0,0 +1 @@`
				<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>
				`@ -0,0 +1 @@`
				`ALTER TABLE albums ADD COLUMN image_path VARCHAR;`
				`@ -0,0 +1 @@`
				`ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT FALSE NOT NULL;`