Update ahash to fix build

Fix wasm bindgen version issue
Update styling of song in queue to adjust for blank space in suspense of artists
2024-04-16 16:47:01 -04:00 · 2024-04-16 16:27:43 -04:00 · 2024-04-12 23:47:36 -04:00 · 2024-04-12 23:46:37 -04:00 · 2024-04-12 23:45:14 -04:00 · 2024-04-12 23:43:52 -04:00
70 changed files with 1656 additions and 4786 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -8,4 +8,3 @@
 !/style
 !/Cargo.lock
 !/Cargo.toml
-!/ascii_art.txt
--- a/.env.example
+++ b/.env.example
@ -15,6 +15,3 @@ DATABASE_URL=postgresql://libretunes:password@localhost:5432/libretunes
 # POSTGRES_HOST=localhost
 # POSTGRES_PORT=5432
 # POSTGRES_DB=libretunes
-
-LIBRETUNES_AUDIO_PATH=assets/audio
-LIBRETUNES_IMAGE_PATH=assets/images
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@ -1,75 +0,0 @@
-name: Push Workflows
-on: push
-
-jobs:
-  build:
-    runs-on: libretunes-cicd
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - 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: libretunes-cicd
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Test project
-        run: cargo test --all-targets --all-features
-
-  leptos-test:
-    runs-on: libretunes-cicd
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Run Leptos tests
-        run: cargo-leptos test
-
-  docs:
-    runs-on: libretunes-cicd
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Generate docs
-        run: cargo doc --no-deps
-      - name: Upload docs
-        uses: actions/upload-artifact@v3
-        with:
-          name: docs
-          path: target/doc
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,101 @@
+# Build the project
+build:
+  needs: []
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  variables:
+    RUSTFLAGS: "-D warnings"
+  script:
+    - cargo-leptos build
+
+.docker:
+  image: docker:latest
+  services:
+    - docker:dind
+  tags:
+    - docker
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
+# Build the docker image and push it to the registry
+docker-build:
+  needs: ["build"]
+  extends: .docker
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
+      # If running on the default branch, tag as latest
+    - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then docker tag
+        $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+        $CI_REGISTRY_IMAGE:latest; fi
+    - docker push $CI_REGISTRY_IMAGE --all-tags
+
+# Run leptos tests
+leptos-tests:
+  needs: ["build"]
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  script:
+    - cargo-leptos test
+
+# Run all tests
+tests:
+  needs: ["build"]
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
+  script:
+    - cargo test --all-targets --all-features
+
+# Generate docs
+cargo-doc:
+  needs: []
+  image: rust:slim
+  script:
+    - cargo doc --no-deps
+  artifacts:
+    paths:
+      - target/doc
+
+# Start the review environment
+start-review:
+  extends: .docker
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+  script:
+    - apk add curl openssl
+    - cd cicd
+    - echo "$CLOUDFLARE_TUNNEL_AUTH_JSON" > tunnel-auth.json
+    - ./add-dns.sh $CLOUDFLARE_ZONE_ID review-$CI_COMMIT_SHORT_SHA libretunes-auto-review $CLOUDFLARE_API_TOKEN $CLOUDFLARE_TUNNEL_ID
+    - ./create-tunnel-config.sh http://libretunes:3000 review-$CI_COMMIT_SHORT_SHA.libretunes.xyz $CLOUDFLARE_TUNNEL_ID
+    - export COMPOSE_PROJECT_NAME=review-$CI_COMMIT_SHORT_SHA
+    - export POSTGRES_PASSWORD=$(openssl rand -hex 16)
+    - export LIBRETUNES_VERSION=$CI_COMMIT_SHORT_SHA
+    - docker compose --file docker-compose-cicd.yml pull
+    - docker compose --file docker-compose-cicd.yml create
+    - export CONFIG_VOL_NAME=review-${CI_COMMIT_SHORT_SHA}_cloudflared-config
+    - export TMP_CONTAINER_NAME=$(docker run --rm -d -v $CONFIG_VOL_NAME:/data busybox sh -c "sleep infinity")
+    - docker cp tunnel-auth.json $TMP_CONTAINER_NAME:/data/auth.json
+    - docker cp cloudflared-tunnel-config.yml $TMP_CONTAINER_NAME:/data/config.yml
+    - docker stop $TMP_CONTAINER_NAME
+    - docker compose --file docker-compose-cicd.yml up -d
+  environment:
+    name: review/$CI_COMMIT_SHORT_SHA
+    url: https://review-$CI_COMMIT_SHORT_SHA.libretunes.xyz
+    on_stop: stop-review
+    auto_stop_in: 1 week
+
+# Stop the review environment
+stop-review:
+  needs: ["start-review"]
+  extends: .docker
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+  allow_failure: true
+  script:
+    - apk add jq curl
+    - ./cicd/remove-dns.sh $CLOUDFLARE_ZONE_ID review-$CI_COMMIT_SHORT_SHA.libretunes.xyz libretunes-auto-review $CLOUDFLARE_API_TOKEN
+    - export COMPOSE_PROJECT_NAME=review-$CI_COMMIT_SHORT_SHA
+    - export LIBRETUNES_VERSION=$CI_COMMIT_SHORT_SHA
+    - docker compose --file cicd/docker-compose-cicd.yml down
+    - docker compose --file cicd/docker-compose-cicd.yml rm -f -v
+  environment:
+    name: review/$CI_COMMIT_SHORT_SHA
+    action: stop
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,51 +8,46 @@ build = "src/build.rs"
 crate-type = ["cdylib", "rlib"]

 [dependencies]
-console_error_panic_hook = { version = "0.1", optional = true }
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1"
 cfg-if = "1"
-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 = { version = "=0.2.93", default-features = false, optional = true }
-leptos_icons = { version = "0.3.0" }
-icondata = { version = "0.3.0" }
+http = { version = "0.2", optional = true }
+leptos = { version = "0.5", features = ["nightly"] }
+leptos_meta = { version = "0.5", features = ["nightly"] }
+leptos_actix = { version = "0.5", optional = true }
+leptos_router = { version = "0.5", features = ["nightly"] }
+wasm-bindgen = "=0.2.92"
+leptos_icons = { version = "0.1.0", default_features = false, features = [
+  "BsPlayFill",
+  "BsPauseFill",
+  "BsSkipStartFill",
+  "BsSkipEndFill",
+  "RiPlayListMediaFill",
+  "CgTrash",
+  "IoReturnUpBackSharp",
+  "AiEyeFilled",
+  "AiEyeInvisibleFilled"
+] }
 dotenv = { version = "0.15.0", optional = true }
-diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true }
+diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], optional = true }
 lazy_static = { version = "1.4.0", optional = true }
-serde = { version = "1.0.195", features = ["derive"], default-features = false }
+serde = { versions = "1.0.195", features = ["derive"] }
 openssl = { version = "0.10.63", optional = true }
-time = { version = "0.3.34", features = ["serde"], default-features = false }
+time = { version = "0.3.34", features = ["serde"] }
 diesel_migrations = { version = "2.1.0", optional = true }
+actix-identity = { version = "0.7.0", optional = true }
+actix-session = { version = "0.9.0", features = ["redis-rs-session"], optional = true }
 pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
-tokio = { version = "1", optional = true, features = ["rt-multi-thread"] }
-axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = false, optional = true }
-tower = { version = "0.5.1", optional = true, features = ["util"] }
-tower-http = { version = "0.6.1", optional = true, features = ["fs"] }
-thiserror = "1.0.57"
-tower-sessions-redis-store = { version = "0.11", optional = true }
-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"
-leptos-use = "0.13.5"
-image-convert = { version = "0.18.0", optional = true, default-features = false }
+futures = { version = "0.3.30", default-features = false, optional = true }

 [features]
-hydrate = [
-  "leptos/hydrate",
-  "leptos_meta/hydrate",
-  "leptos_router/hydrate",
-  "console_error_panic_hook",
-  "wasm-bindgen",
-]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
-  "dep:leptos_axum",
+  "dep:actix-files",
+  "dep:actix-web",
+  "dep:leptos_actix",
  "leptos/ssr",
  "leptos_meta/ssr",
  "leptos_router/ssr",
@ -61,20 +56,10 @@ ssr = [
  "lazy_static",
  "openssl",
  "diesel_migrations",
+  "actix-identity",
+  "actix-session",
  "pbkdf2",
-  "tokio",
-  "axum",
-  "tower",
-  "tower-http",
-  "tower-sessions-redis-store",
-  "async-trait",
-  "axum-login",
-  "symphonia",
-  "multer",
-  "log",
-  "flexi_logger",
-  "leptos-use/ssr",
-  "image-convert",
+  "futures",
 ]

 # Defines a size-optimized profile for the WASM bundle in release mode
--- a/46
+++ b/46
@ -1,37 +1,22 @@
-FROM rust:slim as builder
+FROM registry.mregirouard.com/libretunes/ops/docker-leptos/musl:latest as builder

 WORKDIR /app

-RUN rustup default nightly
-RUN rustup target add wasm32-unknown-unknown
-RUN cargo install cargo-leptos
-
 # Install a few dependencies
 RUN set -eux; \
    apt-get update; \
    apt-get install -y --no-install-recommends \
-		pkg-config \
-		clang \
-		build-essential \
-		libssl-dev \
-		libpq-dev \
-		wget; \
+		npm; \
 	rm -rf /var/lib/apt/lists/*

-# Install ImageMagick
-RUN cd / && \
-	wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-38.tar.gz && \
-	tar xf 7.1.1-38.tar.gz && \
-	rm 7.1.1-38.tar.gz && \
-	cd ImageMagick-7.1.1-38 && \
-	./configure && \
-	make install -j $(nproc) && \
-	cd .. && \
-	rm -rf ImageMagick-7.1.1-38
+RUN npm install tailwindcss@3.1.8 -g

 # Copy project dependency manifests
 COPY Cargo.toml Cargo.lock /app/

+# Add the target to Cargo.toml so we can statically link:
+RUN echo 'bin-target-triple = "x86_64-unknown-linux-musl"' >> Cargo.toml
+
 # Create dummy files to force cargo to build the dependencies
 RUN mkdir /app/src && mkdir /app/style && mkdir /app/assets && \
 		echo "fn main() {}" | tee /app/src/build.rs > /app/src/main.rs && \
@ -42,12 +27,14 @@ RUN mkdir /app/src && mkdir /app/style && mkdir /app/assets && \
 RUN cargo-leptos build --release --precompress

 RUN rm -rf /app/src /app/style /app/assets
+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
-COPY style /app/style

 # Touch files to force rebuild
 RUN touch /app/src/main.rs && touch /app/src/lib.rs && touch /app/src/build.rs
@ -55,11 +42,6 @@ RUN touch /app/src/main.rs && touch /app/src/lib.rs && touch /app/src/build.rs
 # Actually build the binary
 RUN cargo-leptos build --release --precompress

-# Use ldd to list all dependencies of /app/target/release/libretunes, then copy them to /app/libs
-# Setting LD_LIBRARY_PATH is necessary to find the ImageMagick libraries
-RUN mkdir /app/libs && LD_LIBRARY_PATH=/usr/local/lib ldd /app/target/release/libretunes | grep "=> /" | \
-	awk '{print $3}' | xargs -I '{}' cp '{}' /app/libs
-
 # Build the final image
 FROM scratch

@ -68,15 +50,9 @@ LABEL description="LibreTunes, an open-source browser audio player and \
 library manager built for collaborative listening."

 # Copy the binary and the compressed assets to the "site root"
-COPY --from=builder /app/target/release/libretunes /libretunes
+COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/libretunes /libretunes
 COPY --from=builder /app/target/site /site

-# Copy libraries to /lib64
-COPY --from=builder /app/libs /lib64
-COPY --from=builder /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
-
-ENV LD_LIBRARY_PATH=/lib64
-
 # Configure Leptos settings
 ENV LEPTOS_SITE_ADDR=0.0.0.0:3000
 ENV LEPTOS_SITE_ROOT=/site
--- a/ascii_art.txt
+++ b/ascii_art.txt
@ -1,10 +0,0 @@
-                                                         .-=.  =+==-.    
-                                                       .=++++. =+++++=.  
-  _      _ _           _______                        =++++++= :*++++++= 
- | |    (_) |         |__   __|                      -++++**+.  -+**++++-
- | |     _| |__  _ __ ___| |_   _ _ __   ___  ___    *+++**+      +**+++*
- | |    | | '_ \| '__/ _ \ | | | | '_ \ / _ \/ __|   *+++**+      +**+++*
- | |____| | |_) | | |  __/ | |_| | | | |  __/\__ \   -++++**+-:  +**++++-
- |______|_|_.__/|_|  \___|_|\__,_|_| |_|\___||___/    =++++++**+ -+++++= 
-                                                       .=+++++++=.+++=.  
-                                                         .-==++++---.    
--- a/assets/images/placeholders/MusicPlaceholder.svg
+++ b/assets/images/placeholders/MusicPlaceholder.svg
@ -1 +0,0 @@
-<svg version="1.1" viewBox="0.0 0.0 960.0 960.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 960.0l-960.0 0l0 -960.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#4032a8" d="m0 0l960.0 0l0 960.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m290.11365 265.52475l35.496063 0l0 471.3386l-35.496063 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m115.68951 737.6639l0 0c0 -36.946594 46.99247 -66.897644 104.960625 -66.897644l0 0c57.968155 0 104.96065 29.95105 104.96065 66.897644l0 0c0 36.946533 -46.992493 66.897644 -104.96065 66.897644l0 0c-57.968155 0 -104.960625 -29.95111 -104.960625 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m723.79346 175.86597l35.496033 0l0 471.33856l-35.496033 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m549.3693 648.00507l0 0c0 -36.946533 46.99243 -66.897644 104.96063 -66.897644l0 0c57.96814 0 104.96057 29.95111 104.96057 66.897644l0 0c0 36.946533 -46.99243 66.897644 -104.96057 66.897644l0 0c-57.9682 0 -104.96063 -29.95111 -104.96063 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m759.2711 155.4385l-0.01727295 94.79588l-427.05206 100.14052l-42.09601 -84.920654z" fill-rule="evenodd"/><path fill="#ffffff" d="m421.49164 234.64502l21.039368 89.85828l-131.40158 30.803131l-21.039368 -89.85828z" fill-rule="evenodd"/></g></svg>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -13,11 +13,8 @@ services:
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
-      LIBRETUNES_AUDIO_PATH: /assets/audio
-      LIBRETUNES_IMAGE_PATH: /assets/images
    volumes:
-      - libretunes-audio:/assets/audio
-      - libretunes-images:/assets/images
+      - libretunes-audio:/site/audio
    depends_on:
      - redis
      - postgres
@ -53,6 +50,5 @@ services:

 volumes:
  libretunes-audio:
-  libretunes-images:
  libretunes-redis:
  libretunes-postgres:
--- a/migrations/2024-05-10-195644_create_likes_dislikes_table/down.sql
+++ b/migrations/2024-05-10-195644_create_likes_dislikes_table/down.sql
@ -1,2 +0,0 @@
-DROP TABLE song_likes;
-DROP TABLE song_dislikes;
--- a/migrations/2024-05-10-195644_create_likes_dislikes_table/up.sql
+++ b/migrations/2024-05-10-195644_create_likes_dislikes_table/up.sql
@ -1,11 +0,0 @@
-CREATE TABLE song_likes (
-	song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL,
-	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (song_id, user_id)
-);
-
-CREATE TABLE song_dislikes (
-	song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL,
-	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (song_id, user_id)
-);
--- a/migrations/2024-05-16-220659_add_album_images/down.sql
+++ b/migrations/2024-05-16-220659_add_album_images/down.sql
@ -1 +0,0 @@
-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
@ -1 +0,0 @@
-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
@ -1 +0,0 @@
-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
@ -1 +0,0 @@
-ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT FALSE NOT NULL;
--- a/migrations/2024-05-19-163229_add_song_history/down.sql
+++ b/migrations/2024-05-19-163229_add_song_history/down.sql
@ -1,2 +0,0 @@
-DROP INDEX song_history_user_id_idx;
-DROP TABLE song_history;
--- a/migrations/2024-05-19-163229_add_song_history/up.sql
+++ b/migrations/2024-05-19-163229_add_song_history/up.sql
@ -1,8 +0,0 @@
-CREATE TABLE song_history (
-	id SERIAL PRIMARY KEY UNIQUE NOT NULL,
-	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	date TIMESTAMP NOT NULL DEFAULT NOW(),
-	song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL
-);
-
-CREATE INDEX song_history_user_id_idx ON song_history(user_id);
--- a/migrations/2024-05-20-154208_add_friends/down.sql
+++ b/migrations/2024-05-20-154208_add_friends/down.sql
@ -1,7 +0,0 @@
-DROP INDEX friendships_friend_2_idx;
-DROP INDEX friendships_friend_1_idx;
-DROP TABLE friendships;
-
-DROP INDEX incoming_friend_requests_idx;
-DROP INDEX outgoing_friend_requests_idx;
-DROP TABLE friend_requests;
--- a/migrations/2024-05-20-154208_add_friends/up.sql
+++ b/migrations/2024-05-20-154208_add_friends/up.sql
@ -1,19 +0,0 @@
-CREATE TABLE friend_requests (
-	created_at TIMESTAMP NOT NULL DEFAULT NOW(),
-	from_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	to_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (from_id, to_id)
-);
-
-CREATE INDEX outgoing_friend_requests_idx ON friend_requests(from_id);
-CREATE INDEX incoming_friend_requests_idx ON friend_requests(to_id);
-
-CREATE TABLE friendships (
-	created_at TIMESTAMP NOT NULL DEFAULT NOW(),
-	friend_1_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	friend_2_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-	PRIMARY KEY (friend_1_id, friend_2_id)
-);
-
-CREATE INDEX friendships_friend_1_idx ON friendships(friend_1_id);
-CREATE INDEX friendships_friend_2_idx ON friendships(friend_2_id);
--- a/src/albumdata.rs
+++ b/src/albumdata.rs
@ -1,39 +0,0 @@
-use crate::models::Artist;
-use crate::components::dashboard_tile::DashboardTile;
-
-use time::Date;
-
-/// Holds information about an album
-/// 
-/// Intended to be used in the front-end
-pub struct AlbumData {
-	/// Album id
-	pub id: i32,
-	/// Album title
-	pub title: String,
-	/// Album artists
-	pub artists: Vec<Artist>,
-	/// Album release date
-	pub release_date: Option<Date>,
-	/// Path to album image, relative to the root of the web server.
-	/// For example, `"/assets/images/Album.jpg"`
-	pub image_path: String,
-}
-
-impl DashboardTile for AlbumData {
-	fn image_path(&self) -> String {
-		self.image_path.clone()
-	}
-
-	fn title(&self) -> String {
-		self.title.clone()
-	}
-
-	fn link(&self) -> String {
-		format!("/album/{}", self.id)
-	}
-
-	fn description(&self) -> Option<String> {
-		Some(format!("Album • {}", Artist::display_list(&self.artists)))
-	}
-}
--- a/src/api/albums.rs
+++ b/src/api/albums.rs
@ -0,0 +1,36 @@
+use leptos::*;
+use crate::models::Album;
+
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+	use crate::database::get_db_conn;
+	use diesel::prelude::*;
+}
+}
+
+/// Gets the Album associated with an album id
+/// 
+/// # Arguments
+/// `album_id_arg` The id of the Album to get the album for
+/// 
+/// # Returns
+/// A Result containing an Album if the operation was successful, or an error if the operation failed
+#[server(endpoint = "albums/get-album")]
+pub async fn get_album(album_id_arg: Option<i32>) -> Result<Album, ServerFnError> {
+
+	use crate::schema::albums::dsl::*;
+
+	let my_id = album_id_arg.ok_or(ServerFnError::ServerError("Album id must be present (Some) to get Album".to_string()))?;
+
+	let mut my_album_vec: Vec<Album> = albums
+		.filter(id.eq(my_id))
+		.limit(1)
+		.load(&mut get_db_conn())?;
+
+	let my_album = my_album_vec.pop().ok_or(ServerFnError::ServerError("Album not found".to_string()))?;
+
+	Ok(my_album)
+}
--- a/src/api/history.rs
+++ b/src/api/history.rs
@ -1,44 +0,0 @@
-use std::time::SystemTime;
-use leptos::*;
-use crate::models::HistoryEntry;
-use crate::models::Song;
-
-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;
-	}
-}
-
-/// Get the history of the current user.
-#[server(endpoint = "history/get")]
-pub async fn get_history(limit: Option<i64>) -> Result<Vec<HistoryEntry>, ServerFnError> {
-	let user = get_user().await?;
-	let db_con = &mut get_db_conn();
-	let history = user.get_history(limit, db_con)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting history: {}", e)))?;
-	Ok(history)
-}
-
-/// Get the listen dates and songs of the current user.
-#[server(endpoint = "history/get_songs")]
-pub async fn get_history_songs(limit: Option<i64>) -> Result<Vec<(SystemTime, Song)>, ServerFnError> {
-	let user = get_user().await?;
-	let db_con = &mut get_db_conn();
-	let songs = user.get_history_songs(limit, db_con)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting history songs: {}", e)))?;
-	Ok(songs)
-}
-
-/// Add a song to the history of the current user.
-#[server(endpoint = "history/add")]
-pub async fn add_history(song_id: i32) -> Result<(), ServerFnError> {
-	let user = get_user().await?;
-	let db_con = &mut get_db_conn();
-	user.add_history(song_id, db_con)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error adding history: {}", e)))?;
-	Ok(())
-}
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@ -1,3 +1,2 @@
-pub mod history;
-pub mod profile;
 pub mod songs;
+pub mod albums;
--- a/src/api/profile.rs
+++ b/src/api/profile.rs
@ -1,49 +0,0 @@
-use leptos::*;
-use server_fn::codec::{MultipartData, MultipartFormData};
-
-use cfg_if::cfg_if;
-
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		use crate::auth::get_user;
-		use server_fn::error::NoCustomError;
-	}
-}
-
-/// Handle a user uploading a profile picture. Converts the image to webp and saves it to the server.
-#[server(input = MultipartFormData, endpoint = "/profile/upload_picture")]
-pub async fn upload_picture(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 field = data.next_field().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting field: {}", e)))?
-		.ok_or_else(|| ServerFnError::<NoCustomError>::ServerError("No field found".to_string()))?;
-
-	if field.name() != Some("picture") {
-		return Err(ServerFnError::ServerError("Field name is not 'picture'".to_string()));
-	}
-
-	// Get user id from session
-	let user = get_user().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting user: {}", e)))?;
-
-	let user_id = user.id.ok_or_else(|| ServerFnError::<NoCustomError>::ServerError("User has no id".to_string()))?;
-
-	// Read the image, and convert it to webp
-	use image_convert::{to_webp, WEBPConfig, ImageResource};
-
-	let bytes = field.bytes().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting field bytes: {}", e)))?;
-
-	let reader = std::io::Cursor::new(bytes);
-	let image_source = ImageResource::from_reader(reader)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error creating image resource: {}", e)))?;
-
-	let profile_picture_path = format!("assets/images/profile/{}.webp", user_id);
-	let mut image_target = ImageResource::from_path(&profile_picture_path);
-	to_webp(&mut image_target, &image_source, &WEBPConfig::new())
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error converting image to webp: {}", e)))?;
-
-	Ok(())
-}
--- a/src/api/songs.rs
+++ b/src/api/songs.rs
@ -1,55 +1,59 @@
 use leptos::*;
+use crate::models::Artist;
+use crate::models::Song;
+

 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;
-	}
+if #[cfg(feature = "ssr")] {
+	use crate::database::get_db_conn;
+	use diesel::prelude::*;
+}
 }

-/// 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)))?;
+/// Gets a Vector of Artists associated with a Song
+/// 
+/// # Arguments
+/// `song_id_arg` - The id of the Song to get the Artists for
+/// 
+/// # Returns
+/// A Result containing a Vector of Artists if the operation was successful, or an error if the operation failed
+#[server(endpoint = "songs/get-artists")]
+pub async fn get_artists(song_id_arg: Option<i32>) -> Result<Vec<Artist>, ServerFnError> {
+	use crate::schema::artists::dsl::*;
+	use crate::schema::song_artists::dsl::*;

-	let db_con = &mut get_db_conn();
+	let my_id = song_id_arg.ok_or(ServerFnError::ServerError("Song id must be present (Some) to get artists".to_string()))?;

-	user.set_like_song(song_id, like, db_con).await.map_err(|e| ServerFnError::<NoCustomError>::
-		ServerError(format!("Error liking song: {}", e)))
+	let my_artists = artists
+		.inner_join(song_artists)
+		.filter(song_id.eq(my_id))
+		.select(artists::all_columns())
+		.load(&mut get_db_conn())?;
+
+	Ok(my_artists)
 }

-/// 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)))?;
+/// Gets the song associated with a song id
+/// 
+/// # Arguments
+/// `song_id_arg` - The id of the Song to get the song for
+/// 
+/// # Returns
+/// A Result containing a Song if the operation was successful, or an error if the operation failed
+#[server(endpoint = "songs/get-song")]
+pub async fn get_song(song_id_arg: Option<i32>) -> Result<Song, ServerFnError> {
+	use crate::schema::songs::dsl::*;

-	let db_con = &mut get_db_conn();
+	let my_id = song_id_arg.ok_or(ServerFnError::ServerError("Song id must be present (Some) to get Song".to_string()))?;

-	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))
+	let mut my_song_vec: Vec<Song> = songs
+		.filter(id.eq(my_id))
+		.limit(1)
+		.load(&mut get_db_conn())?;
+
+	let my_song = my_song_vec.pop().ok_or(ServerFnError::ServerError("Song not found".to_string()))?;
+
+	Ok(my_song)
 }
--- a/src/app.rs
+++ b/src/app.rs
@ -1,5 +1,4 @@
 use crate::playbar::PlayBar;
-use crate::playbar::CustomTitle;
 use crate::playstatus::PlayStatus;
 use crate::queue::Queue;
 use leptos::*;
@ -7,42 +6,26 @@ use leptos_meta::*;
 use leptos_router::*;
 use crate::pages::login::*;
 use crate::pages::signup::*;
-use crate::error_template::{AppError, ErrorTemplate};
-

 #[component]
 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
        <Stylesheet id="leptos" href="/pkg/libretunes.css"/>

        // sets the document title
-        <CustomTitle play_status=play_status/>
+        <Title text="LibreTunes"/>

        // content for this welcome page
-        <Router fallback=|| {
-            let mut outside_errors = Errors::default();
-            outside_errors.insert_with_default_key(AppError::NotFound);
-            view! {
-                <ErrorTemplate outside_errors/>
-            }
-            .into_view()
-        }>
+        <Router>
            <main>
                <Routes>
-                    <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="" view=HomePage/>
+                    <Route path="/*any" view=NotFound/>
                    <Route path="/login" view=Login />
                    <Route path="/signup" view=Signup />
                </Routes>
@ -51,25 +34,15 @@ pub fn App() -> impl IntoView {
    }
 }

-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(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>) -> impl IntoView {
+fn HomePage() -> impl IntoView {
+    let play_status = PlayStatus::default();
+    let play_status = create_rw_signal(play_status);
+
    view! {
-        <div class="home-container">
-            <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/>
-        </div>
+        <PlayBar status=play_status/>
+        <Queue status=play_status/>
    }
 }

@ -86,8 +59,8 @@ fn NotFound() -> impl IntoView {
    {
        // this can be done inline because it's synchronous
        // if it were async, we'd use a server function
-        let resp = expect_context::<leptos_axum::ResponseOptions>();
-        resp.set_status(axum::http::StatusCode::NOT_FOUND);
+        let resp = expect_context::<leptos_actix::ResponseOptions>();
+        resp.set_status(actix_web::http::StatusCode::NOT_FOUND);
    }

    view! {
--- a/src/artistdata.rs
+++ b/src/artistdata.rs
@ -1,32 +0,0 @@
-use crate::components::dashboard_tile::DashboardTile;
-
-/// Holds information about an artist
-/// 
-/// Intended to be used in the front-end
-pub struct ArtistData {
-	/// Artist id
-	pub id: i32,
-	/// Artist name
-	pub name: String,
-	/// Path to artist image, relative to the root of the web server.
-	/// For example, `"/assets/images/Artist.jpg"`
-	pub image_path: String,
-}
-
-impl DashboardTile for ArtistData {
-	fn image_path(&self) -> String {
-		self.image_path.clone()
-	}
-
-	fn title(&self) -> String {
-		self.name.clone()
-	}
-
-	fn link(&self) -> String {
-		format!("/artist/{}", self.id)
-	}
-
-	fn description(&self) -> Option<String> {
-		Some("Artist".to_string())
-	}
-}
--- a/src/auth.rs
+++ b/src/auth.rs
@ -1,18 +1,5 @@
 use leptos::*;
-
-use cfg_if::cfg_if;
-
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		use leptos::server_fn::error::NoCustomError;
-		use leptos_axum::extract;
-		use axum_login::AuthSession;
-		use crate::auth_backend::AuthBackend;
-	}
-}
-
 use crate::models::User;
-use crate::users::UserCredentials;

 /// Create a new user and log them in
 /// Takes in a NewUser struct, with the password in plaintext
@ -21,160 +8,64 @@ use crate::users::UserCredentials;
 pub async fn signup(new_user: User) -> Result<(), ServerFnError> {
 	use crate::users::create_user;

-	// Ensure the user has no id, and is not a self-proclaimed admin
+	use leptos_actix::extract;
+	use actix_web::{HttpMessage, HttpRequest};
+	use actix_identity::Identity;
+
+	// Ensure the user has no id
 	let new_user = User {
 		id: None,
-		admin: false,
 		..new_user
 	};

 	create_user(&new_user).await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error creating user: {}", e)))?;
+		.map_err(|e| ServerFnError::ServerError(format!("Error creating user: {}", e)))?;

-	let mut auth_session = extract::<AuthSession<AuthBackend>>().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
+	extract(|request: HttpRequest| async move {
+		Identity::login(&request.extensions(), new_user.username.clone())
+	}).await??;

-	let credentials = UserCredentials {
-		username_or_email: new_user.username.clone(),
-		password: new_user.password.clone().unwrap()
-	};
-
-	match auth_session.authenticate(credentials).await {
-		Ok(Some(user)) => {
-			auth_session.login(&user).await
-				.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error logging in user: {}", e)))
-		},
-		Ok(None) => {
-			Err(ServerFnError::<NoCustomError>::ServerError("Error authenticating user: User not found".to_string()))
-		},
-		Err(e) => {
-			Err(ServerFnError::<NoCustomError>::ServerError(format!("Error authenticating user: {}", e)))
-		}
-	}
+	Ok(())
 }

 /// Log a user in
 /// Takes in a username or email and a password in plaintext
 /// Returns a Result with a boolean indicating if the login was successful
 #[server(endpoint = "login")]
-pub async fn login(credentials: UserCredentials) -> Result<bool, ServerFnError> {
+pub async fn login(username_or_email: String, password: String) -> Result<bool, ServerFnError> {
 	use crate::users::validate_user;
+	use actix_web::{HttpMessage, HttpRequest};
+	use actix_identity::Identity;
+	use leptos_actix::extract;

-	let mut auth_session = extract::<AuthSession<AuthBackend>>().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
+	let possible_user = validate_user(username_or_email, password).await
+		.map_err(|e| ServerFnError::ServerError(format!("Error validating user: {}", e)))?;

-	let user = validate_user(credentials).await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error validating user: {}", e)))?;
+	let user = match possible_user {
+		Some(user) => user,
+		None => return Ok(false)
+	};

-	if let Some(user) = user {
-		auth_session.login(&user).await
-			.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error logging in user: {}", e)))?;
-		Ok(true)
-	} else {
-		Ok(false)
-	}
+	extract(|request: HttpRequest| async move {
+		Identity::login(&request.extensions(), user.username.clone())
+	}).await??;
+	
+	Ok(true)
 }

 /// Log a user out
 /// Returns a Result with the error message if the user could not be logged out
 #[server(endpoint = "logout")]
 pub async fn logout() -> Result<(), ServerFnError> {
-	let mut auth_session = extract::<AuthSession<AuthBackend>>().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
+	use leptos_actix::extract;
+	use actix_identity::Identity;

-	auth_session.logout().await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
+	extract(|user: Option<Identity>| async move {
+		if let Some(user) = user {
+			user.logout();
+		}
+	}).await?;

 	Ok(())
 }

-/// Check if a user is logged in
-/// Returns a Result with a boolean indicating if the user is logged in
-#[server(endpoint = "check_auth")]
-pub async fn check_auth() -> 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.is_some())
-}
-
-/// Require that a user is logged in
-/// Returns a Result with the error message if the user is not logged in
-/// Intended to be used at the start of a protected route, to ensure the user is logged in:
-/// ```rust
-/// use leptos::*;
-/// use libretunes::auth::require_auth;
-/// #[server(endpoint = "protected_route")]
-/// pub async fn protected_route() -> Result<(), ServerFnError> {
-/// 	require_auth().await?;
-/// 	// Continue with protected route
-/// 	Ok(())
-/// }
-/// ```
-#[cfg(feature = "ssr")]
-pub async fn require_auth() -> Result<(), ServerFnError> {
-	check_auth().await.and_then(|logged_in| {
-		if logged_in {
-			Ok(())
-		} else {
-			Err(ServerFnError::<NoCustomError>::ServerError(format!("Unauthorized")))
-		}
-	})
-}
-
-/// 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,48 +0,0 @@
-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;
-
-	// TODO: Ideally, we shouldn't have to unwrap here
-
-	fn id(&self) -> Self::Id {
-		self.id.unwrap()
-	}
-
-	fn session_auth_hash(&self) -> &[u8] {
-		self.password.as_ref().unwrap().as_bytes()
-	}
-}
-
-#[derive(Clone)]
-pub struct AuthBackend;
-
-#[cfg(feature = "ssr")]
-#[async_trait]
-impl AuthnBackend for AuthBackend {
-	type User = User;
-	type Credentials = UserCredentials;
-	type Error = ServerFnErrorErr;
-
-	async fn authenticate(&self, creds: Self::Credentials) -> Result<Option<Self::User>, Self::Error> {
-		crate::users::validate_user(creds).await
-			.map_err(|e| ServerFnErrorErr::ServerError(format!("Error validating user: {}", e)))
-	}
-
-	async fn get_user(&self, user_id: &UserId<Self>) ->  Result<Option<Self::User>, Self::Error> {
-		crate::users::find_user_by_id(*user_id).await
-			.map_err(|e| ServerFnErrorErr::ServerError(format!("Error getting user: {}", e)))
-	}
-}
--- a/src/components.rs
+++ b/src/components.rs
@ -1,8 +0,0 @@
-pub mod sidebar;
-pub mod dashboard;
-pub mod search;
-pub mod personal;
-pub mod dashboard_tile;
-pub mod dashboard_row;
-pub mod upload;
-pub mod song_list;
--- a/src/components/dashboard.rs
+++ b/src/components/dashboard.rs
@ -1,10 +0,0 @@
-use leptos::*;
-
-#[component]
-pub fn Dashboard() -> impl IntoView {
-    view! {
-        <div class="dashboard-container home-component">
-            <h1 class="dashboard-header">Dashboard</h1>
-        </div>
-    }
-}
--- a/src/components/dashboard_row.rs
+++ b/src/components/dashboard_row.rs
@ -1,118 +0,0 @@
-use leptos::html::Ul;
-use leptos::leptos_dom::*;
-use leptos::*;
-use leptos_use::{use_element_size, UseElementSizeReturn, use_scroll, UseScrollReturn};
-use crate::components::dashboard_tile::DashboardTile;
-use leptos_icons::*;
-
-/// A row of dashboard tiles, with a title
-pub struct DashboardRow {
-	pub title: String,
-	pub tiles: Vec<Box<dyn DashboardTile>>,
-}
-
-impl DashboardRow {
-	pub fn new(title: String, tiles: Vec<Box<dyn DashboardTile>>) -> Self {
-		Self {
-			title,
-			tiles,
-		}
-	}
-}
-
-impl IntoView for DashboardRow {
-	fn into_view(self) -> View {
-		let list_ref = create_node_ref::<Ul>();
-
-		// Scroll functions attempt to align the left edge of the scroll area with the left edge of a tile
-		// This is done by scrolling to the nearest multiple of the tile width, plus some for padding
-
-		let scroll_left = move |_| {
-			if let Some(scroll_element) = list_ref.get_untracked() {
-				let client_width = scroll_element.client_width() as f64;
-				let current_pos = scroll_element.scroll_left() as f64;
-				let desired_pos = current_pos - client_width;
-
-				if let Some(first_tile) = scroll_element.first_element_child() {
-					let tile_width = first_tile.client_width() as f64;
-					let scroll_pos = desired_pos + (tile_width - (desired_pos % tile_width));
-					scroll_element.scroll_to_with_x_and_y(scroll_pos, 0.0);
-				} else {
-					warn!("Could not get first tile to scroll left");
-					// Fall back to scrolling by the client width if we can't get the tile width
-					scroll_element.scroll_to_with_x_and_y(desired_pos, 0.0);
-				}
-			} else {
-				warn!("Could not get scroll element to scroll left");
-			}
-		};
-
-		let scroll_right = move |_| {
-			if let Some(scroll_element) = list_ref.get_untracked() {
-				let client_width = scroll_element.client_width() as f64;
-				let current_pos = scroll_element.scroll_left() as f64;
-				let desired_pos = current_pos + client_width;
-				
-				if let Some(first_tile) = scroll_element.first_element_child() {
-					let tile_width = first_tile.client_width() as f64;
-					let scroll_pos = desired_pos - (desired_pos % tile_width);
-					scroll_element.scroll_to_with_x_and_y(scroll_pos, 0.0);
-				} else {
-					warn!("Could not get first tile to scroll right");
-					// Fall back to scrolling by the client width if we can't get the tile width
-					scroll_element.scroll_to_with_x_and_y(desired_pos, 0.0);
-				}
-			} else {
-				warn!("Could not get scroll element to scroll right");
-			}
-		};
-
-		let UseElementSizeReturn { width: scroll_element_width, .. } = use_element_size(list_ref);
-		let UseScrollReturn { x: scroll_x, .. } = use_scroll(list_ref);
-
-		let scroll_right_hidden = Signal::derive(move || {
-			if let Some(scroll_element) = list_ref.get() {
-				if scroll_element.scroll_width() as f64 - scroll_element_width.get() <= scroll_x.get() {
-					"visibility: hidden"
-				} else {
-					""
-				}
-			} else {
-				""
-			}
-		});
-
-		let scroll_left_hidden = Signal::derive(move || {
-			if scroll_x.get() <= 0.0 {
-				"visibility: hidden"
-			} else {
-				""
-			}
-		});
-
-		view! {
-			<div class="dashboard-tile-row">
-				<div class="dashboard-tile-row-title-row">
-					<h2>{self.title}</h2>
-					<div class="dashboard-tile-row-scroll-btn">
-						<button on:click=scroll_left tabindex=-1 style=scroll_left_hidden>
-							<Icon class="dashboard-tile-row-scroll" icon=icondata::FiChevronLeft />
-						</button>
-						<button on:click=scroll_right tabindex=-1 style=scroll_right_hidden>
-							<Icon class="dashboard-tile-row-scroll" icon=icondata::FiChevronRight />
-						</button>
-					</div>
-				</div>
-				<ul _ref={list_ref}>
-				{self.tiles.into_iter().map(|tile_info| {
-					view! {
-						<li>
-							{ tile_info.into_view() }
-						</li>
-					}
-				}).collect::<Vec<_>>()}
-				</ul>
-			</div>
-		}.into_view()
-	}
-}
--- a/src/components/dashboard_tile.rs
+++ b/src/components/dashboard_tile.rs
@ -1,27 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-
-pub trait DashboardTile {
-	fn image_path(&self) -> String;
-	fn title(&self) -> String;
-	fn link(&self) -> String;
-	fn description(&self) -> Option<String> { None }
-}
-
-impl IntoView for &dyn DashboardTile {
-	fn into_view(self) -> View {
-		let link = self.link();
-
-		view! {
-			<div class="dashboard-tile">
-				<a href={link}>
-					<img src={self.image_path()} alt="dashboard-tile" />
-					<p class="dashboard-tile-title">{self.title()}</p>
-					<p class="dashboard-tile-description">
-						{self.description().unwrap_or_default()}
-					</p>
-				</a>
-			</div>
-		}.into_view()
-	}
-}
--- a/src/components/personal.rs
+++ b/src/components/personal.rs
@ -1,42 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-use leptos_icons::*;
-
-#[component]
-pub fn Personal() -> impl IntoView {
-    view! {
-        <div class=" personal-container">
-            <Profile />
-        </div>
-    }
-}
-
-#[component]
-pub fn Profile() -> impl IntoView {
-    let (dropdown_open, set_dropdown_open) = create_signal(false);
-
-    let open_dropdown = move |_| {
-        set_dropdown_open.update(|value| *value = !*value);
-        log!("opened dropdown");
-    };
-    view! {
-        <div class="profile-container">
-            <div class="profile-icon" on:click=open_dropdown>
-                <Icon icon=icondata::CgProfile />
-            </div>
-            <div class="dropdown-container" style={move || if dropdown_open() {"display: flex"} else {"display: none"}}>
-                <DropDownNotLoggedIn />
-            </div>
-        </div>
-    }
-}
-#[component]
-pub fn DropDownNotLoggedIn() -> impl IntoView {
-    view! {
-        <div class="dropdown-not-logged">
-            <h1>Not Logged in!</h1>
-            <a href="/login"><button class="auth-button">Log In</button></a>
-            <a href="/signup"><button class="auth-button">Sign up</button></a>
-        </div>
-    }
-}
--- a/src/components/search.rs
+++ b/src/components/search.rs
@ -1,10 +0,0 @@
-use leptos::*;
-
-#[component]
-pub fn Search() -> impl IntoView {
-    view! {
-        <div class="search-container home-component">
-            <h1>Searching...</h1>
-        </div>
-    }
-}
--- a/src/components/sidebar.rs
+++ b/src/components/sidebar.rs
@ -1,54 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-use leptos_icons::*;
-use crate::components::upload::*;
-
-#[component]
-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>
-                <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>
-                </a>
-                <a class="buttons" href="/search" style={move || if on_search() {"color: #e1e3e1"} else {""}}>
-                    <Icon icon=icondata::BiSearchRegular />
-                    <h1>Search</h1>
-                </a>
-            </div>
-            <Bottom />
-
-        </div>
-    }
-}
-
-#[component]
-pub fn Bottom() -> impl IntoView {
-    view! {
-        <div class="sidebar-bottom-container">
-            <div class="heading">
-                <h1 class="header">Playlists</h1>
-                <button class="add-playlist">
-                    <div class="add-sign">
-                        <Icon icon=icondata::IoAddSharp />
-                    </div>
-                    New Playlist
-                </button>
-            </div>
-        </div>
-    }
-}
--- a/src/components/song_list.rs
+++ b/src/components/song_list.rs
@ -1,157 +0,0 @@
-use leptos::*;
-use leptos_icons::*;
-
-use crate::songdata::SongData;
-use crate::models::{Album, Artist};
-
-const LIKE_DISLIKE_BTN_SIZE: &str = "2em";
-
-#[component]
-pub fn SongList(songs: MaybeSignal<Vec<SongData>>) -> impl IntoView {
-	view! {
-		<table class="song-list">
-			{
-				songs.with(|songs| {
-					let mut first_song = true;
-
-					songs.iter().map(|song| {
-						let playing = first_song.into();
-						first_song = false;
-
-						view! {
-							<SongListItem song={song.clone()} song_playing=playing />
-						}
-					}).collect::<Vec<_>>()
-				})
-			}
-		</table>
-	}
-}
-
-#[component]
-pub fn SongListItem(song: SongData, song_playing: MaybeSignal<bool>) -> impl IntoView {
-	let liked = create_rw_signal(song.like_dislike.map(|(liked, _)| liked).unwrap_or(false));
-	let disliked = create_rw_signal(song.like_dislike.map(|(_, disliked)| disliked).unwrap_or(false));
-	
-	view! {
-		<tr class="song-list-item">
-			<td class="song-image"><SongImage image_path=song.image_path song_playing /></td>
-			<td class="song-title"><p>{song.title}</p></td>
-			<td class="song-list-spacer"></td>
-			<td class="song-artists"><SongArtists artists=song.artists /></td>
-			<td class="song-list-spacer"></td>
-			<td class="song-album"><SongAlbum album=song.album /></td>
-			<td class="song-list-spacer-big"></td>
-			<td class="song-like-dislike"><SongLikeDislike liked disliked/></td>
-			<td>{format!("{}:{:02}", song.duration / 60, song.duration % 60)}</td>
-		</tr>
-	}
-}
-
-/// Display the song's image, with an overlay if the song is playing
-/// When the song list item is hovered, the overlay will show the play button
-#[component]
-fn SongImage(image_path: String, song_playing: MaybeSignal<bool>) -> impl IntoView {
-	view! {
-		<img class="song-image" src={image_path}/>
-		{if song_playing.get() {
-			view! { <Icon class="song-image-overlay song-playing-overlay" icon=icondata::BsPauseFill /> }.into_view()
-		} else {
-			view! { <Icon class="song-image-overlay hide-until-hover" icon=icondata::BsPlayFill /> }.into_view()
-		}}
-	}
-}
-
-/// Displays a song's artists, with links to their artist pages
-#[component]
-fn SongArtists(artists: Vec<Artist>) -> impl IntoView {
-	let num_artists = artists.len() as isize;
-
-	artists.iter().enumerate().map(|(i, artist)| {
-		let i = i as isize;
-		
-		view! {
-			{
-				if let Some(id) = artist.id {
-					view! { <a href={format!("/artist/{}", id)}>{artist.name.clone()}</a> }.into_view()
-				} else {
-					view! { <span>{artist.name.clone()}</span> }.into_view()
-				}
-			}
-			{if i < num_artists - 2 { ", " } else if i == num_artists - 2 { " & " } else { "" }}
-		}
-	}).collect::<Vec<_>>()
-}
-
-/// Display a song's album, with a link to the album page
-#[component]
-fn SongAlbum(album: Option<Album>) -> impl IntoView {
-	album.as_ref().map(|album| {
-		view! {
-			<span>
-				{
-					if let Some(id) = album.id {
-						view! { <a href={format!("/album/{}", id)}>{album.title.clone()}</a> }.into_view()
-					} else {
-						view! { <span>{album.title.clone()}</span> }.into_view()
-					}
-				}
-			</span>
-		}
-	})
-}
-
-/// Display like and dislike buttons for a song, and indicate if the song is liked or disliked
-#[component]
-fn SongLikeDislike(liked: RwSignal<bool>, disliked: RwSignal<bool>) -> impl IntoView {
-	let like_icon = Signal::derive(move || {
-		if liked.get() {
-			icondata::TbThumbUpFilled
-		} else {
-			icondata::TbThumbUp
-		}
-	});
-
-	let dislike_icon = Signal::derive(move || {
-		if disliked.get() {
-			icondata::TbThumbDownFilled
-		} else {
-			icondata::TbThumbDown
-		}
-	});
-
-	let like_class = MaybeProp::derive(move || {
-		if liked.get() {
-			Some(TextProp::from("controlbtn"))
-		} else {
-			Some(TextProp::from("controlbtn hide-until-hover"))
-		}
-	});
-
-	let dislike_class = MaybeProp::derive(move || {
-		if disliked.get() {
-			Some(TextProp::from("controlbtn hmirror"))
-		} else {
-			Some(TextProp::from("controlbtn hmirror hide-until-hover"))
-		}
-	});
-
-	let toggle_like = move |_| {
-		liked.set(!liked.get_untracked());
-		disliked.set(disliked.get_untracked() && !liked.get_untracked());
-	};
-
-	let toggle_dislike = move |_| {
-		disliked.set(!disliked.get_untracked());
-		liked.set(liked.get_untracked() && !disliked.get_untracked());
-	};
-
-	view! {
-		<button on:click=toggle_dislike>
-			<Icon class=dislike_class width=LIKE_DISLIKE_BTN_SIZE height=LIKE_DISLIKE_BTN_SIZE icon=dislike_icon />
-		</button>
-		<button on:click=toggle_like>
-			<Icon class=like_class width=LIKE_DISLIKE_BTN_SIZE height=LIKE_DISLIKE_BTN_SIZE icon=like_icon />
-		</button>
-	}
-}
--- a/src/components/upload.rs
+++ b/src/components/upload.rs
@ -1,245 +0,0 @@
-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/error_template.rs
+++ b/src/error_template.rs
@ -1,73 +0,0 @@
-use http::status::StatusCode;
-use leptos::*;
-use thiserror::Error;
-
-#[cfg(feature = "ssr")]
-use leptos_axum::ResponseOptions;
-
-#[derive(Clone, Debug, Error)]
-pub enum AppError {
-    #[error("Not Found")]
-    NotFound,
-}
-
-impl AppError {
-    pub fn status_code(&self) -> StatusCode {
-        match self {
-            AppError::NotFound => StatusCode::NOT_FOUND,
-        }
-    }
-}
-
-// A basic function to display errors served by the error boundaries.
-// Feel free to do more complicated things here than just displaying the error.
-#[component]
-pub fn ErrorTemplate(
-    #[prop(optional)] outside_errors: Option<Errors>,
-    #[prop(optional)] errors: Option<RwSignal<Errors>>,
-) -> impl IntoView {
-    let errors = match outside_errors {
-        Some(e) => create_rw_signal(e),
-        None => match errors {
-            Some(e) => e,
-            None => panic!("No Errors found and we expected errors!"),
-        },
-    };
-    // Get Errors from Signal
-    let errors = errors.get_untracked();
-
-    // Downcast lets us take a type that implements `std::error::Error`
-    let errors: Vec<AppError> = errors
-        .into_iter()
-        .filter_map(|(_k, v)| v.downcast_ref::<AppError>().cloned())
-        .collect();
-
-    // Only the response code for the first error is actually sent from the server
-    // this may be customized by the specific application
-    #[cfg(feature = "ssr")]
-    {
-        let response = use_context::<ResponseOptions>();
-        if let Some(response) = response {
-            response.set_status(errors[0].status_code());
-        }
-    }
-    
-    view! {
-        <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1>
-        <For
-            // a function that returns the items we're iterating over; a signal is fine
-            each= move || {errors.clone().into_iter().enumerate()}
-            // a unique key for each item as a reference
-            key=|(index, _error)| *index
-            // renders each item to a view
-            children=move |error| {
-                let error_string = error.1.to_string();
-                let error_code= error.1.status_code();
-                view! {
-                    <h2>{error_code.to_string()}</h2>
-                    <p>"Error: " {error_string}</p>
-                }
-            }
-        />
-    }
-}
--- a/src/fileserv.rs
+++ b/src/fileserv.rs
@ -1,70 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! { if #[cfg(feature = "ssr")] {
-    use axum::{
-        body::Body,
-        extract::State,
-        response::IntoResponse,
-        http::{Request, Response, StatusCode, Uri},
-    };
-    use axum::response::Response as AxumResponse;
-    use tower::ServiceExt;
-    use tower_http::services::ServeDir;
-    use leptos::*;
-    use crate::app::App;
-    use std::str::FromStr;
-
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
-        let root = options.site_root.clone();
-        let res = get_static_file(uri.clone(), &root).await.unwrap();
-
-        if res.status() == StatusCode::OK {
-            res.into_response()
-        } else {
-            let handler = leptos_axum::render_app_to_stream(options.to_owned(), App);
-            handler(req).await.into_response()
-        }
-    }
-
-    pub async fn get_static_file(uri: Uri, root: &str) -> Result<Response<Body>, (StatusCode, String)> {
-        let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap();
-
-        // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
-        // This path is relative to the cargo root
-        match ServeDir::new(root).oneshot(req).await.ok() {
-            Some(res) => Ok(res.into_response()),
-            None => Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Something went wrong"),
-            )),
-        }
-    }
-
-    pub enum AssetType {
-        Audio,
-        Image,
-    }
-
-    pub async fn get_asset_file(filename: String, asset_type: AssetType) -> Result<Response<Body>, (StatusCode, String)> {
-        const DEFAULT_AUDIO_PATH: &str = "assets/audio";
-        const DEFAULT_IMAGE_PATH: &str = "assets/images";
-
-        let root = match asset_type {
-            AssetType::Audio => std::env::var("LIBRETUNES_AUDIO_PATH").unwrap_or(DEFAULT_AUDIO_PATH.to_string()),
-            AssetType::Image => std::env::var("LIBRETUNES_IMAGE_PATH").unwrap_or(DEFAULT_IMAGE_PATH.to_string()),
-        };
-
-        // Create a Uri from the filename
-        // ServeDir expects a leading `/`
-        let uri = Uri::from_str(format!("/{}", filename).as_str());
-
-        match uri {
-            Ok(uri) => get_static_file(uri, root.as_str()).await,
-            Err(_) => Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Attempted to serve an invalid file"),
-            )),
-        }
-    }
-
-}}
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,8 +1,5 @@
 pub mod app;
 pub mod auth;
-pub mod songdata;
-pub mod albumdata;
-pub mod artistdata;
 pub mod playstatus;
 pub mod playbar;
 pub mod database;
@ -10,20 +7,13 @@ pub mod queue;
 pub mod song;
 pub mod models;
 pub mod pages;
-pub mod components;
+pub mod api;
 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! {
-  if #[cfg(feature = "ssr")] {
-    pub mod auth_backend;
+	if #[cfg(feature = "ssr")] {
    pub mod schema;
  }
 }
--- a/src/main.rs
+++ b/src/main.rs
@ -1,10 +1,10 @@
 // Needed for building in Docker container
 // See https://github.com/clux/muslrust?tab=readme-ov-file#diesel-and-pq-builds
 // See https://github.com/sgrif/pq-sys/issues/25
-#[cfg(target_env = "musl")]
+#[cfg(target = "x86_64-unknown-linux-musl")]
 extern crate openssl;

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

@ -12,71 +12,93 @@ extern crate diesel;
 extern crate diesel_migrations;

 #[cfg(feature = "ssr")]
-#[tokio::main]
-async fn main() {
-    use axum::{routing::get, Router, extract::Path};
-    use leptos::*;
-    use leptos_axum::{generate_route_list, LeptosRoutes};
-    use libretunes::app::*;
-    use libretunes::fileserv::{file_and_error_handler, get_asset_file, get_static_file, AssetType};
-    use axum_login::tower_sessions::SessionManagerLayer;
-    use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
-    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...");
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    use actix_identity::IdentityMiddleware;
+    use actix_session::storage::RedisSessionStore;
+    use actix_session::SessionMiddleware;
+    use actix_web::cookie::Key;

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

-    debug!("Running database migrations...");
-
    // Bring the database up to date
    libretunes::database::migrate();
    
-    debug!("Connecting to Redis...");
+    let session_secret_key = if let Ok(key) = std::env::var("SESSION_SECRET_KEY") {
+        Key::from(key.as_bytes())
+    } else {
+        Key::generate()
+    };

    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");
-    redis_pool.connect();
-    redis_pool.wait_for_connect().await.expect("Unable to connect to Redis");
+    let redis_store = RedisSessionStore::new(redis_url).await.unwrap();

-    let session_store = RedisStore::new(redis_pool);
-    let session_layer = SessionManagerLayer::new(session_store);
-
-    let auth_backend = AuthBackend;
-    let auth_layer = AuthManagerLayerBuilder::new(auth_backend, session_layer).build();
+    use actix_files::Files;
+    use actix_web::*;
+    use leptos::*;
+    use leptos_actix::{generate_route_list, LeptosRoutes};
+    use libretunes::app::*;

    let conf = get_configuration(None).await.unwrap();
-    let leptos_options = conf.leptos_options;
-    let addr = leptos_options.site_addr;
+    let addr = conf.leptos_options.site_addr;
    // Generate the list of routes in your Leptos App
    let routes = generate_route_list(App);
+    println!("listening on http://{}", &addr);

-    let app = Router::new()
-        .leptos_routes(&leptos_options, routes, App)
-        .route("/assets/audio/:song", get(|Path(song) : Path<String>| get_asset_file(song, AssetType::Audio)))
-        .route("/assets/images/:image", get(|Path(image) : Path<String>| get_asset_file(image, AssetType::Image)))
-        .route("/assets/*uri", get(|uri| get_static_file(uri, "")))
-        .layer(auth_layer)
-        .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+    HttpServer::new(move || {
+        let leptos_options = &conf.leptos_options;
+        let site_root = &leptos_options.site_root;

-    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");
+        App::new()
+            .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+            // serve JS/WASM/CSS from `pkg`
+            .service(Files::new("/pkg", format!("{site_root}/pkg")))
+            // serve other assets from the `assets` directory
+            .service(Files::new("/assets", site_root))
+            // serve the favicon from /favicon.ico
+            .service(favicon)
+            .leptos_routes(leptos_options.to_owned(), routes.to_owned(), App)
+            .app_data(web::Data::new(leptos_options.to_owned()))
+            .wrap(IdentityMiddleware::default())
+            .wrap(SessionMiddleware::new(redis_store.clone(), session_secret_key.clone()))
+        //.wrap(middleware::Compress::default())
+    })
+    .bind(&addr)?
+    .run()
+    .await
 }

-#[cfg(not(feature = "ssr"))]
+#[cfg(feature = "ssr")]
+#[actix_web::get("favicon.ico")]
+async fn favicon(
+    leptos_options: actix_web::web::Data<leptos::LeptosOptions>,
+) -> actix_web::Result<actix_files::NamedFile> {
+    let leptos_options = leptos_options.into_inner();
+    let site_root = &leptos_options.site_root;
+    Ok(actix_files::NamedFile::open(format!(
+        "{site_root}/favicon.ico"
+    ))?)
+}
+
+#[cfg(not(any(feature = "ssr", feature = "csr")))]
 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,284 +41,13 @@ 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 {
-	/// Get the history of songs listened to by this user from the database
-	/// 
-	/// The returned history will be ordered by date in descending order,
-	/// and a limit of N will select the N most recent entries.
-	/// The `id` field of this user must be present (Some) to get history
-	/// 
-	/// # Arguments
-	/// 
-	/// * `limit` - An optional limit on the number of history entries to return
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<Vec<HistoryEntry>, Box<dyn Error>>` -
-	/// 	A result indicating success with a vector of history entries, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn get_history(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
-		Result<Vec<HistoryEntry>, Box<dyn Error>> {
-		use crate::schema::song_history::dsl::*;
-
-		let my_id = self.id.ok_or("Artist id must be present (Some) to get history")?;
-
-		let my_history = 
-		if let Some(limit) = limit {
-			song_history
-				.filter(user_id.eq(my_id))
-				.order(date.desc())
-				.limit(limit)
-				.load(conn)?
-		} else {
-			song_history
-				.filter(user_id.eq(my_id))
-				.load(conn)?
-		};
-
-		Ok(my_history)
-	}
-
-	/// Get the history of songs listened to by this user from the database
-	/// 
-	/// The returned history will be ordered by date in descending order,
-	/// and a limit of N will select the N most recent entries.
-	/// The `id` field of this user must be present (Some) to get history
-	/// 
-	/// # Arguments
-	/// 
-	/// * `limit` - An optional limit on the number of history entries to return
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<Vec<(SystemTime, Song)>, Box<dyn Error>>` -
-	/// 	A result indicating success with a vector of listen dates and songs, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn get_history_songs(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
-		Result<Vec<(SystemTime, Song)>, Box<dyn Error>> {
-		use crate::schema::songs::dsl::*;
-		use crate::schema::song_history::dsl::*;
-
-		let my_id = self.id.ok_or("Artist id must be present (Some) to get history")?;
-
-		let my_history =
-		if let Some(limit) = limit {
-			song_history
-				.inner_join(songs)
-				.filter(user_id.eq(my_id))
-				.order(date.desc())
-				.limit(limit)
-				.select((date, songs::all_columns()))
-				.load(conn)?
-		} else {
-			song_history
-				.inner_join(songs)
-				.filter(user_id.eq(my_id))
-				.order(date.desc())
-				.select((date, songs::all_columns()))
-				.load(conn)?
-		};
-
-		Ok(my_history)
-	}
-
-	/// Add a song to this user's history in the database
-	/// 
-	/// The date of the history entry will be the current time
-	/// The `id` field of this user must be present (Some) to add history
-	/// 
-	/// # Arguments
-	/// 
-	/// * `song_id` - The id of the song to add to this user's history
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<(), Box<dyn Error>>` - A result indicating success with an empty value, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn add_history(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<(), Box<dyn Error>> {
-		use crate::schema::song_history;
-
-		let my_id = self.id.ok_or("Artist id must be present (Some) to add history")?;
-
-		diesel::insert_into(song_history::table)
-			.values((song_history::user_id.eq(my_id), song_history::song_id.eq(song_id)))
-			.execute(conn)?;
-
-		Ok(())
-	}
-
-	/// Check if this user has listened to a song
-	/// 
-	/// The `id` field of this user must be present (Some) to check history
-	/// 
-	/// # Arguments
-	/// 
-	/// * `song_id` - The id of the song to check if this user has listened to
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<bool, Box<dyn Error>>` - A result indicating success with a boolean value, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn has_listened_to(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
-		use crate::schema::song_history::{self, user_id};
-
-		let my_id = self.id.ok_or("Artist id must be present (Some) to check history")?;
-
-		let has_listened = song_history::table
-			.filter(user_id.eq(my_id))
-			.filter(song_history::song_id.eq(song_id))
-			.first::<HistoryEntry>(conn)
-			.optional()?
-			.is_some();
-
-		Ok(has_listened)
-	}
-
-	/// Like or unlike a song for this user
-	/// If likeing a song, remove dislike if it exists
-	#[cfg(feature = "ssr")]
-	pub async fn set_like_song(self: &Self, song_id: i32, like: bool, conn: &mut PgPooledConn) -> 
-		Result<(), Box<dyn Error>> {
-		use log::*;
-		debug!("Setting like for song {} to {}", song_id, like);
-
-		use crate::schema::song_likes;
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to like/un-like a song")?;
-
-		if like {
-			diesel::insert_into(song_likes::table)
-				.values((song_likes::song_id.eq(song_id), song_likes::user_id.eq(my_id)))
-				.execute(conn)?;
-
-			// Remove dislike if it exists
-			diesel::delete(song_dislikes::table.filter(song_dislikes::song_id.eq(song_id)
-				.and(song_dislikes::user_id.eq(my_id))))
-				.execute(conn)?;
-		} else {
-			diesel::delete(song_likes::table.filter(song_likes::song_id.eq(song_id).and(song_likes::user_id.eq(my_id))))
-				.execute(conn)?;
-		}
-
-		Ok(())
-	}
-
-	/// Get the like status of a song for this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_like_song(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
-		use crate::schema::song_likes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get like status of a song")?;
-
-		let like = song_likes::table
-			.filter(song_likes::song_id.eq(song_id).and(song_likes::user_id.eq(my_id)))
-			.first::<(i32, i32)>(conn)
-			.optional()?
-			.is_some();
-
-		Ok(like)
-	}
-
-	/// Get songs liked by this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_liked_songs(self: &Self, conn: &mut PgPooledConn) -> Result<Vec<Song>, Box<dyn Error>> {
-		use crate::schema::songs::dsl::*;
-		use crate::schema::song_likes::dsl::*;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get liked songs")?;
-
-		let my_songs = songs
-			.inner_join(song_likes)
-			.filter(user_id.eq(my_id))
-			.select(songs::all_columns())
-			.load(conn)?;
-
-		Ok(my_songs)
-	}
-
-	/// Dislike or remove dislike from a song for this user
-	/// If disliking a song, remove like if it exists
-	#[cfg(feature = "ssr")]
-	pub async fn set_dislike_song(self: &Self, song_id: i32, dislike: bool, conn: &mut PgPooledConn) -> 
-		Result<(), Box<dyn Error>> {
-		use log::*;
-		debug!("Setting dislike for song {} to {}", song_id, dislike);
-
-		use crate::schema::song_likes;
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to dislike/un-dislike a song")?;
-
-		if dislike {
-			diesel::insert_into(song_dislikes::table)
-				.values((song_dislikes::song_id.eq(song_id), song_dislikes::user_id.eq(my_id)))
-				.execute(conn)?;
-
-			// Remove like if it exists
-			diesel::delete(song_likes::table.filter(song_likes::song_id.eq(song_id)
-				.and(song_likes::user_id.eq(my_id))))
-				.execute(conn)?;
-		} else {
-			diesel::delete(song_dislikes::table.filter(song_dislikes::song_id.eq(song_id)
-				.and(song_dislikes::user_id.eq(my_id))))
-				.execute(conn)?;
-		}
-
-		Ok(())
-	}
-
-	/// Get the dislike status of a song for this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_dislike_song(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
-		use crate::schema::song_dislikes;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get dislike status of a song")?;
-
-		let dislike = song_dislikes::table
-			.filter(song_dislikes::song_id.eq(song_id).and(song_dislikes::user_id.eq(my_id)))
-			.first::<(i32, i32)>(conn)
-			.optional()?
-			.is_some();
-
-		Ok(dislike)
-	}
-
-	/// Get songs disliked by this user
-	#[cfg(feature = "ssr")]
-	pub async fn get_disliked_songs(self: &Self, conn: &mut PgPooledConn) -> Result<Vec<Song>, Box<dyn Error>> {
-		use crate::schema::songs::dsl::*;
-		use crate::schema::song_likes::dsl::*;
-
-		let my_id = self.id.ok_or("User id must be present (Some) to get disliked songs")?;
-
-		let my_songs = songs
-			.inner_join(song_likes)
-			.filter(user_id.eq(my_id))
-			.select(songs::all_columns())
-			.load(conn)?;
-
-		Ok(my_songs)
-	}
 }

 /// Model for an artist
-#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable, Identifiable))]
+#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::artists))]
 #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct Artist {
 	/// A unique id for the artist
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
@ -433,33 +162,13 @@ 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, Identifiable))]
+#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::albums))]
 #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct Album {
 	/// A unique id for the album
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
@ -468,8 +177,6 @@ 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 {
@ -532,7 +239,7 @@ impl Album {
 #[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
 #[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::songs))]
 #[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Song {
 	/// A unique id for the song
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
@ -582,47 +289,4 @@ impl Song {

 		Ok(my_artists)
 	}
-
-	/// Get the album for this song from the database
-	/// 
-	/// # Arguments
-	/// 
-	/// * `conn` - A mutable reference to a database connection
-	/// 
-	/// # Returns
-	/// 
-	/// * `Result<Option<Album>, Box<dyn Error>>` - A result indicating success with an album, or None if
-	/// the song does not have an album, or an error
-	/// 
-	#[cfg(feature = "ssr")]
-	pub fn get_album(self: &Self, conn: &mut PgPooledConn) -> Result<Option<Album>, Box<dyn Error>> {
-		use crate::schema::albums::dsl::*;
-
-		if let Some(album_id) = self.album_id {
-			let my_album = albums
-				.filter(id.eq(album_id))
-				.first::<Album>(conn)?;
-
-			Ok(Some(my_album))
-		} else {
-			Ok(None)
-		}
-	}
-}
-
-/// Model for a history entry
-#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
-#[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::song_history))]
-#[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
-#[derive(Serialize, Deserialize)]
-pub struct HistoryEntry {
-	/// A unique id for the history entry
-	#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
-	pub id: Option<i32>,
-	/// The id of the user who listened to the song
-	pub user_id: i32,
-	/// The date the song was listened to
-	pub date: SystemTime,
-	/// The id of the song that was listened to
-	pub song_id: i32,
 }
--- a/src/pages/login.rs
+++ b/src/pages/login.rs
@ -1,8 +1,9 @@
 use crate::auth::login;
 use leptos::leptos_dom::*;
 use leptos::*;
+use leptos_icons::AiIcon::*;
+use leptos_icons::IoIcon::*;
 use leptos_icons::*;
-use crate::users::UserCredentials;

 #[component]
 pub fn Login() -> impl IntoView {
@ -23,12 +24,7 @@ pub fn Login() -> impl IntoView {
        let password1 = password.get();

        spawn_local(async move {
-            let user_credentials = UserCredentials {
-                username_or_email: username_or_email1,
-                password: password1
-            };
-            
-            let login_result = login(user_credentials).await;
+            let login_result = login(username_or_email1, password1).await;
            if let Err(err) = login_result {
                // Handle the error here, e.g., log it or display to the user
                log!("Error logging in: {:?}", err);
@ -46,7 +42,7 @@ pub fn Login() -> impl IntoView {
    view! {
        <div class="auth-page-container">
            <div class="login-container">
-                <a class="return" href="/"><Icon icon=icondata::IoReturnUpBackSharp /></a>
+                <a class="return" href="/"><Icon icon=Icon::from(IoReturnUpBackSharp) /></a>
                <div class="header">
                    <h1>LibreTunes</h1>
                </div>
@ -74,11 +70,11 @@ pub fn Login() -> impl IntoView {
                        <Show
                            when=move || {show_password() == false}
                            fallback=move || view!{ <button on:click=toggle_password class="login-password-visibility">
-                                                  <Icon icon=icondata::AiEyeInvisibleFilled />
+                                                  <Icon icon=Icon::from(AiEyeInvisibleFilled) />
                                               </button> /> }
                        >
                            <button on:click=toggle_password class="login-password-visibility">
-                                <Icon icon=icondata::AiEyeFilled />
+                                <Icon icon=Icon::from(AiEyeFilled) />
                            </button>

                        </Show>
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@ -2,6 +2,8 @@ use crate::auth::signup;
 use crate::models::User;
 use leptos::leptos_dom::*;
 use leptos::*;
+use leptos_icons::AiIcon::*;
+use leptos_icons::IoIcon::*;
 use leptos_icons::*;

 #[component]
@ -25,7 +27,6 @@ pub fn Signup() -> impl IntoView {
            email: email.get(),
            password: Some(password.get()),
            created_at: None,
-            admin: false,
        };
        log!("new user: {:?}", new_user);

@ -45,7 +46,7 @@ pub fn Signup() -> impl IntoView {
    view! {
        <div class="auth-page-container">
            <div class="signup-container">
-                <a class="return" href="/"><Icon icon=icondata::IoReturnUpBackSharp /></a>
+                <a class="return" href="/"><Icon icon=Icon::from(IoReturnUpBackSharp) /></a>
                <div class="header">
                    <h1>LibreTunes</h1>
                </div>
@ -82,10 +83,10 @@ pub fn Signup() -> impl IntoView {
                        <i></i>
                        <Show
                            when=move || {show_password() == false}
-                            fallback=move || view!{ <button on:click=toggle_password class="password-visibility"> <Icon icon=icondata::AiEyeInvisibleFilled /></button> /> }
+                            fallback=move || view!{ <button on:click=toggle_password class="password-visibility"> <Icon icon=Icon::from(AiEyeInvisibleFilled) /></button> /> }
                        >
                            <button on:click=toggle_password class="password-visibility">
-                                <Icon icon=icondata::AiEyeFilled />
+                                <Icon icon=Icon::from(AiEyeFilled) />
                            </button>
                        </Show>
                    </div>
--- a/src/playbar.rs
+++ b/src/playbar.rs
@ -1,14 +1,13 @@
-use crate::models::Artist;
 use crate::playstatus::PlayStatus;
-use crate::songdata::SongData;
-use crate::api::songs;
+use crate::api::songs::get_artists;
+use crate::api::albums::get_album;
 use leptos::ev::MouseEvent;
 use leptos::html::{Audio, Div};
 use leptos::leptos_dom::*;
-use leptos_meta::Title;
 use leptos::*;
+use leptos_icons::BsIcon::*;
+use leptos_icons::RiIcon::*;
 use leptos_icons::*;
-use leptos_use::{utils::Pausable, use_interval_fn};

 /// Width and height of the forward/backward skip buttons
 const SKIP_BTN_SIZE: &str = "3.5em";
@ -24,9 +23,6 @@ const MIN_SKIP_BACK_TIME: f64 = 5.0;
 /// How many seconds to skip forward/backward when the user presses the arrow keys
 const ARROW_KEY_SKIP_TIME: f64 = 5.0;

-/// Threshold in seconds for considering when the user has listened to a song, for adding it to the history
-const HISTORY_LISTEN_THRESHOLD: u64 = MIN_SKIP_BACK_TIME as u64;
-
 // TODO Handle errors better, when getting audio HTML element and when playing/pausing audio

 /// Get the current time and duration of the current song, if available
@ -117,26 +113,6 @@ fn toggle_queue(status: impl SignalUpdate<Value = PlayStatus>) {
 	
 }

-/// Set the source of the audio player
-/// 
-/// Logs an error if the audio element is not available
-/// 
-/// 
-/// # Arguments
-/// * `status` - The `PlayStatus` to get the audio element from, as a signal
-/// * `src` - The source to set the audio player to
-/// 
-fn set_play_src(status: impl SignalUpdate<Value = PlayStatus>, src: String) {
-    status.update(|status| {
-        if let Some(audio) = status.get_audio() {
-            audio.set_src(&src);
-            log!("Player set src to: {}", src);
-        } else {
-            error!("Unable to set src: Audio element not available");
-        }
-    });
-}
-
 /// The play, pause, and skip buttons
 #[component]
 fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
@ -157,10 +133,8 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
                status.update(|status| last_played_song = status.history.pop_back());

                if let Some(last_played_song) = last_played_song {
-                    // Push the popped song to the front of the queue, and play it
-                    let next_src = last_played_song.song_path.clone();
+                    // Push the popped song to the front of the queue, and set status to playing
                    status.update(|status| status.queue.push_front(last_played_song));
-                    set_play_src(status, next_src);
                    set_playing(status, true);
                } else {
                    warn!("Unable to skip back: No previous song");
@ -199,9 +173,9 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
    let icon = Signal::derive(move || {
        status.with(|status| {
            if status.playing {
-                icondata::BsPauseFill
+                Icon::from(BsPauseFill)
            } else {
-                icondata::BsPlayFill
+                Icon::from(BsPlayFill)
            }
        })
    });
@ -210,7 +184,7 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
        <div class="playcontrols" align="center">

        <button on:click=skip_back on:mousedown=prevent_focus>
-        <Icon class="controlbtn" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=icondata::BsSkipStartFill />
+        <Icon class="controlbtn" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=Icon::from(BsSkipStartFill) />
        </button>

        <button on:click=toggle_play on:mousedown=prevent_focus>
@ -218,7 +192,7 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
        </button>

        <button on:click=skip_forward on:mousedown=prevent_focus>
-        <Icon class="controlbtn" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=icondata::BsSkipEndFill />
+        <Icon class="controlbtn" width=SKIP_BTN_SIZE height=SKIP_BTN_SIZE icon=Icon::from(BsSkipEndFill) />
        </button>

        </div>
@ -255,145 +229,74 @@ fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
 		})
    });

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

-	let album = Signal::derive(move || {
+	let song_artists_resource = create_resource(song_id, move |song_id| async move {
+		if let Some(song_id) = song_id {
+			let artists_vec = get_artists(Some(song_id)).await.map_or(Vec::new(), |artists| artists);
+			// convert the vec of artists to a string of artists separated by commas
+			let artists_string = artists_vec.iter().map(|artist| artist.name.clone()).collect::<Vec<String>>().join(", ");
+			artists_string
+		} else {
+			"".into()
+		}
+	});
+
+	let album_id = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("".into(), |song|
-                song.album.as_ref().map_or("".into(), |album| album.title.clone()))
+			status.queue.front().map_or(None, |song| song.album_id)
 		})
 	});

+	let album_resource = create_resource(album_id, move |album_id| async move {
+		// get the album name attribute or return ""
+		if let Some(album_id) = album_id {
+			get_album(Some(album_id)).await.map_or("".into(), |album| album.title)
+		} else {
+			"".into()
+		}
+	});
+
 	let image = Signal::derive(move || {
 		status.with(|status| {
-			status.queue.front().map_or("/images/placeholders/MusicPlaceholder.svg".into(),
-                |song| song.image_path.clone())
+			// TODO Use some default / unknown image?
+			status.queue.front().map_or("".into(), |song| song.image_path.clone().unwrap_or("".into()))
 		})
 	});

    view! {
+        <div class="media-info">
        <img class="media-info-img" align="left" src={image}/>
        <div class="media-info-text">
            {name}
-            <br/>
-            {artist} - {album}
+			<br/>
+			<Suspense 
+				fallback=move || {
+					view! {}
+				}
+			>
+			{move || {
+				song_artists_resource.get().map_or(view!{{}""}, |artists_string| view! {
+					{artists_string}" - "
+				})
+			}}
+			</Suspense>
+			<Suspense
+				fallback=move || {
+					view! {}
+				}
+			>
+			{move || {
+				album_resource.get().map_or(view!{{}""}, |album_name| view! {
+					""{album_name}
+				})
+			}}
+			</Suspense>
        </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>
    }
 }
@ -455,30 +358,42 @@ fn QueueToggle(status: RwSignal<PlayStatus>) -> impl IntoView {
    view! {
        <div class="queue-toggle">
        <button on:click=update_queue on:mousedown=prevent_focus>
-        <Icon class="controlbtn" width=QUEUE_BTN_SIZE height=QUEUE_BTN_SIZE icon=icondata::RiPlayListMediaFill />
+        <Icon class="controlbtn" width=QUEUE_BTN_SIZE height=QUEUE_BTN_SIZE icon=Icon::from(RiPlayListMediaFill) />
        </button>
        </div>
    }
 }

-/// Renders the title of the page based on the currently playing song
-#[component]
-pub fn CustomTitle(play_status: RwSignal<PlayStatus>) -> impl IntoView {
-    let title = create_memo(move |_| {
-        play_status.with(|play_status| {
-            play_status.queue.front().map_or("LibreTunes".to_string(), |song_data| {
-                    format!("{} - {} | {}",song_data.title.clone(),Artist::display_list(&song_data.artists), "LibreTunes")
-                })
-            })
-        });
-    view! {
-        <Title text=title />
-    }
-}
-
 /// The main play bar component, containing the progress bar, media info, play controls, and play duration
 #[component]
 pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
+
+	// Set the source of the audio player to the first song in the queue
+	let current_song_path = create_memo(
+		move |_| {
+			status.with(|status| {
+				status.queue.front().map(|song| song.storage_path.clone())
+			})
+		}
+	);
+	create_effect(move |_| {
+		current_song_path.with(|current_song_path| {
+			status.with_untracked(|status| {
+				if let Some(audio) = status.get_audio() {
+					if let Some(song_path) = current_song_path {
+						audio.set_src(&song_path);
+						log!("Player set src to: {}", song_path);
+					} else {
+						// We are treating this as a non-fatal error because the queue could be empty or finished
+						warn!("Unable to set src: No song in queue");
+					}
+				} else {
+					error!("Unable to set src: Audio element not available");
+				}
+			});
+		});
+	});
+
    // Listen for key down events -- arrow keys don't seem to trigger key press events
    let _arrow_key_handle = window_event_listener(ev::keydown, move |e: ev::KeyboardEvent| {
        if e.key() == "ArrowRight" {
@ -539,7 +454,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {

                // Don't use the set_play_src / set_playing helper function
                // here because we already have access to the audio element
-                audio.set_src(&song.song_path);
+                audio.set_src(&song.storage_path);

                if let Err(e) = audio.play() {
                    error!("Error playing audio on load: {:?}", e);
@ -552,39 +467,6 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
        });
    });

-    let current_song_id = create_memo(move |_| {
-        status.with(|status| {
-            status.queue.front().map(|song| song.id)
-        })
-    });
-
-    // Track the last song that was added to the history to prevent duplicates
-    let last_history_song_id = create_rw_signal(None);
-
-    let Pausable { 
-        is_active: hist_timeout_pending,
-        resume: resume_hist_timeout,
-        pause: pause_hist_timeout,
-        ..
-    } = use_interval_fn(move || {
-        if last_history_song_id.get_untracked() == current_song_id.get_untracked() {
-            return;
-        }
-
-        if let Some(current_song_id) = current_song_id.get_untracked() {
-            last_history_song_id.set(Some(current_song_id));
-
-            spawn_local(async move {
-                if let Err(e) = crate::api::history::add_history(current_song_id).await {
-                    error!("Error adding song {} to history: {}", current_song_id, e);
-                }
-            });
-        }
-    }, HISTORY_LISTEN_THRESHOLD * 1000);
-
-    // Initially pause the timeout, since the audio starts off paused
-    pause_hist_timeout();
-
    let on_play = move |_| {
        log!("Audio playing");
        status.update(|status| status.playing = true);
@ -593,7 +475,6 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
    let on_pause = move |_| {
        log!("Audio paused");
        status.update(|status| status.playing = false);
-        pause_hist_timeout();
    };

    let on_time_update = move |_| {
@ -611,11 +492,6 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
                error!("Unable to update time: Audio element not available");
            }
        });
-
-        // If time is updated, audio is playing, so make sure the history timeout is running
-        if !hist_timeout_pending.get_untracked() {
-            resume_hist_timeout();
-        }
    };

    let on_end = move |_| {
@ -636,7 +512,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {

        // Get the next song to play, if available
        let next_src = status.with_untracked(|status| {
-            status.queue.front().map(|song| song.song_path.clone())
+            status.queue.front().map(|song| song.storage_path.clone())
        });

        if let Some(audio) = audio_ref.get() {
@ -660,10 +536,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
            on:timeupdate=on_time_update on:ended=on_end type="audio/mpeg" />
        <div class="playbar">
        <ProgressBar percentage=percentage.into() status=status />
-        <div class="playbar-left-group">
        <MediaInfo status=status />
-        <LikeDislike status=status />
-        </div>
        <PlayControls status=status />
        <PlayDuration elapsed_secs=elapsed_secs.into() total_secs=total_secs.into() />
        <QueueToggle status=status />
--- a/src/playstatus.rs
+++ b/src/playstatus.rs
@ -3,7 +3,7 @@ use leptos::NodeRef;
 use leptos::html::Audio;
 use std::collections::VecDeque;

-use crate::songdata::SongData;
+use crate::models::Song;

 /// Represents the global state of the audio player feature of LibreTunes
 pub struct PlayStatus {
@ -14,9 +14,9 @@ pub struct PlayStatus {
 	/// A reference to the HTML audio element
    pub audio_player: Option<NodeRef<Audio>>,
 	/// A queue of songs that have been played, ordered from oldest to newest
-    pub history: VecDeque<SongData>,
+    pub history: VecDeque<Song>,
 	/// A queue of songs that have yet to be played, ordered from next up to last
-    pub queue: VecDeque<SongData>,
+    pub queue: VecDeque<Song>,
 }

 impl PlayStatus {
--- a/src/queue.rs
+++ b/src/queue.rs
@ -1,10 +1,10 @@
-use crate::models::Artist;
 use crate::playstatus::PlayStatus;
 use crate::song::Song;
 use leptos::ev::MouseEvent;
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
+use leptos_icons::CgIcon::*;
 use leptos::ev::DragEvent;

 const RM_BTN_SIZE: &str = "2.5rem";
@ -99,14 +99,14 @@ pub fn Queue(status: RwSignal<PlayStatus>) -> impl IntoView {
 									on:dragenter=move |e: DragEvent| on_drag_enter(e, index)
 									on:dragover=on_drag_over
 								>
-									<Song song_image_path=song.image_path.clone() song_title=song.title.clone() song_artist=Artist::display_list(&song.artists) />
+									<Song song_id_arg=song.id song_image_path=song.image_path.clone().unwrap_or("".to_string()) song_title=song.title.clone() />
 									<Show
 										when=move || index != 0
 										fallback=|| view!{
 											<p>Playing</p>
 										}>
 										<button on:click=move |_| remove_song(index) on:mousedown=prevent_focus>
-											<Icon class="remove-song" width=RM_BTN_SIZE height=RM_BTN_SIZE icon=icondata::CgTrash />
+											<Icon class="remove-song" width=RM_BTN_SIZE height=RM_BTN_SIZE icon=Icon::from(CgTrash) />
 										</button>
 									</Show>
 								</div>
--- a/src/schema.rs
+++ b/src/schema.rs
@ -12,7 +12,6 @@ diesel::table! {
        id -> Int4,
        title -> Varchar,
        release_date -> Nullable<Date>,
-        image_path -> Nullable<Varchar>,
    }
 }

@ -23,22 +22,6 @@ diesel::table! {
    }
 }

-diesel::table! {
-    friend_requests (from_id, to_id) {
-        created_at -> Timestamp,
-        from_id -> Int4,
-        to_id -> Int4,
-    }
-}
-
-diesel::table! {
-    friendships (friend_1_id, friend_2_id) {
-        created_at -> Timestamp,
-        friend_1_id -> Int4,
-        friend_2_id -> Int4,
-    }
-}
-
 diesel::table! {
    song_artists (song_id, artist_id) {
        song_id -> Int4,
@ -46,29 +29,6 @@ diesel::table! {
    }
 }

-diesel::table! {
-    song_dislikes (song_id, user_id) {
-        song_id -> Int4,
-        user_id -> Int4,
-    }
-}
-
-diesel::table! {
-    song_history (id) {
-        id -> Int4,
-        user_id -> Int4,
-        date -> Timestamp,
-        song_id -> Int4,
-    }
-}
-
-diesel::table! {
-    song_likes (song_id, user_id) {
-        song_id -> Int4,
-        user_id -> Int4,
-    }
-}
-
 diesel::table! {
    songs (id) {
        id -> Int4,
@ -89,7 +49,6 @@ diesel::table! {
        email -> Varchar,
        password -> Varchar,
        created_at -> Timestamp,
-        admin -> Bool,
    }
 }

@ -97,24 +56,13 @@ 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_history -> songs (song_id));
-diesel::joinable!(song_history -> 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!(
    album_artists,
    albums,
    artists,
-    friend_requests,
-    friendships,
    song_artists,
-    song_dislikes,
-    song_history,
-    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 tokio::join;
+	use futures::join;

 	let (albums, artists, songs) = join!(albums, artists, songs);
 	Ok((albums?, artists?, songs?))
--- a/src/song.rs
+++ b/src/song.rs
@ -1,13 +1,41 @@
 use leptos::*;
+use leptos::logging::*;
+use crate::api::songs::get_artists;

 #[component]
-pub fn Song(song_image_path: String, song_title: String, song_artist: String) -> impl IntoView {
+pub fn Song(song_id_arg: Option<i32>, song_image_path: String, song_title: String) -> impl IntoView {
+
+	let song_id = Signal::derive(move || song_id_arg);
+
+	let song_artists_resource = create_resource(song_id, move |song_id| async move {
+		let artists_vec = get_artists(song_id).await.unwrap_or_else(|_| {
+			warn!("Error when searching for artists for song");
+			Vec::new()
+		});
+		// convert the vec of artists to a string of artists separated by commas
+		let artists_string = artists_vec.iter().map(|artist| artist.name.clone()).collect::<Vec<String>>().join(", ");
+		artists_string
+	});
+
 	view!{
 		<div class="queue-song">
 			<img src={song_image_path} alt={song_title.clone()} />
 			<div class="queue-song-info">
 				<h3>{song_title}</h3>
-				<p>{song_artist}</p>
+				<Suspense
+					fallback=move || view! {<p class="fallback-artists">""</p>}
+				>
+				{move || {
+					song_artists_resource.get().map(|artists_string| {
+						if artists_string.is_empty() {
+							view! {<p class="fallback-artists">""</p>}
+						}
+						else {
+							view! {<p class="artists">{artists_string}</p>}
+						}
+					})
+				}}
+				</Suspense>
 			</div>
 		</div>
 	}
--- a/src/songdata.rs
+++ b/src/songdata.rs
@ -1,81 +0,0 @@
-use crate::models::{Album, Artist, Song};
-use crate::components::dashboard_tile::DashboardTile;
-
-use time::Date;
-
-/// Holds information about a song
-/// 
-/// Intended to be used in the front-end, as it includes artist and album objects, rather than just their ids.
-#[derive(Clone)]
-pub struct SongData {
-	/// Song id
-	pub id: i32,
-	/// Song name
-	pub title: String,
-	/// Song artists
-	pub artists: Vec<Artist>,
-	/// Song album
-	pub album: Option<Album>,
-	/// The track number of the song on the album
-	pub track: Option<i32>,
-	/// The duration of the song in seconds
-	pub duration: i32,
-	/// The song's release date
-	pub release_date: Option<Date>,
-	/// 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,
-			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)
-			},
-		})
-	}
-}
-
-impl DashboardTile for SongData {
-	fn image_path(&self) -> String {
-		self.image_path.clone()
-	}
-
-	fn title(&self) -> String {
-		self.title.clone()
-	}
-
-	fn link(&self) -> String {
-		format!("/song/{}", self.id)
-	}
-
-	fn description(&self) -> Option<String> {
-		Some(format!("Song • {}", Artist::display_list(&self.artists)))
-	}
-}
--- a/src/upload.rs
+++ b/src/upload.rs
@ -1,294 +0,0 @@
-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/users.rs
+++ b/src/users.rs
@ -14,42 +14,19 @@ cfg_if::cfg_if! {
 }

 use leptos::*;
-use serde::{Serialize, Deserialize};
 use crate::models::User;

-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UserCredentials {
-	pub username_or_email: String,
-	pub password: String
-}
-
 /// Get a user from the database by username or email
 /// Returns a Result with the user if found, None if not found, or an error if there was a problem
 #[cfg(feature = "ssr")]
 pub async fn find_user(username_or_email: String) -> Result<Option<User>, ServerFnError> {
 	use crate::schema::users::dsl::*;
-	use leptos::server_fn::error::NoCustomError;

 	// Look for either a username or email that matches the input, and return an option with None if no user is found
 	let db_con = &mut get_db_conn();
 	let user = users.filter(username.eq(username_or_email.clone())).or_filter(email.eq(username_or_email))
 		.first::<User>(db_con).optional()
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting user from database: {}", e)))?;
-
-	Ok(user)
-}
-
-/// Get a user from the database by ID
-/// Returns a Result with the user if found, None if not found, or an error if there was a problem
-#[cfg(feature = "ssr")]
-pub async fn find_user_by_id(user_id: i32) -> Result<Option<User>, ServerFnError> {
-	use crate::schema::users::dsl::*;
-	use leptos::server_fn::error::NoCustomError;
-
-	let db_con = &mut get_db_conn();
-	let user = users.filter(id.eq(user_id))
-		.first::<User>(db_con).optional()
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting user from database: {}", e)))?;
+		.map_err(|e| ServerFnError::ServerError(format!("Error getting user from database: {}", e)))?;

 	Ok(user)
 }
@ -59,14 +36,13 @@ pub async fn find_user_by_id(user_id: i32) -> Result<Option<User>, ServerFnError
 #[cfg(feature = "ssr")]
 pub async fn create_user(new_user: &User) -> Result<(), ServerFnError> {
 	use crate::schema::users::dsl::*;
-	use leptos::server_fn::error::NoCustomError;

 	let new_password = new_user.password.clone()
-		.ok_or(ServerFnError::<NoCustomError>::ServerError(format!("No password provided for user {}", new_user.username)))?;
+		.ok_or(ServerFnError::ServerError(format!("No password provided for user {}", new_user.username)))?;

 	let salt = SaltString::generate(&mut OsRng);
 	let password_hash = Pbkdf2.hash_password(new_password.as_bytes(), &salt)
-		.map_err(|_| ServerFnError::<NoCustomError>::ServerError("Error hashing password".to_string()))?.to_string();
+		.map_err(|_| ServerFnError::ServerError("Error hashing password".to_string()))?.to_string();
 	
 	let new_user = User {
 		password: Some(password_hash),
@ -76,7 +52,7 @@ pub async fn create_user(new_user: &User) -> Result<(), ServerFnError> {
 	let db_con = &mut get_db_conn();

 	diesel::insert_into(users).values(&new_user).execute(db_con)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error creating user: {}", e)))?;
+		.map_err(|e| ServerFnError::ServerError(format!("Error creating user: {}", e)))?;

 	Ok(())
 }
@ -84,11 +60,9 @@ pub async fn create_user(new_user: &User) -> Result<(), ServerFnError> {
 /// Validate a user's credentials
 /// Returns a Result with the user if the credentials are valid, None if not valid, or an error if there was a problem
 #[cfg(feature = "ssr")]
-pub async fn validate_user(credentials: UserCredentials) -> Result<Option<User>, ServerFnError> {
-	use leptos::server_fn::error::NoCustomError;
-
-	let db_user = find_user(credentials.username_or_email.clone()).await
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting user from database: {}", e)))?;
+pub async fn validate_user(username_or_email: String, password: String) -> Result<Option<User>, ServerFnError> {
+	let db_user = find_user(username_or_email.clone()).await
+		.map_err(|e| ServerFnError::ServerError(format!("Error getting user from database: {}", e)))?;

 	// If the user is not found, return None
 	let db_user = match db_user {
@ -97,18 +71,18 @@ pub async fn validate_user(credentials: UserCredentials) -> Result<Option<User>,
 	};

 	let db_password = db_user.password.clone()
-		.ok_or(ServerFnError::<NoCustomError>::ServerError(format!("No password found for user {}", db_user.username)))?;
+		.ok_or(ServerFnError::ServerError(format!("No password found for user {}", db_user.username)))?;

 	let password_hash = PasswordHash::new(&db_password)
-		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error hashing supplied password: {}", e)))?;
+		.map_err(|e| ServerFnError::ServerError(format!("Error hashing supplied password: {}", e)))?;

-	match Pbkdf2.verify_password(credentials.password.as_bytes(), &password_hash) {
+	match Pbkdf2.verify_password(password.as_bytes(), &password_hash) {
 		Ok(()) => {},
 		Err(Error::Password) => {
 			return Ok(None);
 		},
 		Err(e) => {
-			return Err(ServerFnError::<NoCustomError>::ServerError(format!("Error verifying password: {}", e)));
+			return Err(ServerFnError::ServerError(format!("Error verifying password: {}", e)));
 		}
 	}

--- a/src/util/audio.rs
+++ b/src/util/audio.rs
@ -1,37 +0,0 @@
-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
@ -1,7 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-	if #[cfg(feature = "ssr")] {
-		pub mod audio;
-	}
-}
--- a/style/dashboard.scss
+++ b/style/dashboard.scss
@ -1,10 +0,0 @@
-@import "theme.scss";
-
-.dashboard-container {
-  width: calc(100% - 22rem - 16rem);
-  .dashboard-header {
-    font-size: 1.2rem;
-    font-weight: 300;
-    border-bottom: 2px solid white;
-  }
-}
--- a/style/dashboard_row.scss
+++ b/style/dashboard_row.scss
@ -1,45 +0,0 @@
-.dashboard-tile-row {
-	.dashboard-tile-row-title-row {
-		display: flex;
-
-		.dashboard-tile-row-scroll-btn {
-			margin-left: auto;
-			margin-top: auto;
-			margin-bottom: auto;
-
-			button {
-				background-color: transparent;
-				border: none;
-				
-				.dashboard-tile-row-scroll {
-					color: $text-controls-color;
-					width: 2.5rem;
-					height: 2.5rem;
-				}
-				
-				.dashboard-tile-row-scroll:hover {
-					color: $controls-hover-color;
-				}
-				
-				.dashboard-tile-row-scroll:active {
-					color: $controls-click-color;
-				}
-			}
-		}
-	}
-
-	ul {
-		display: flex;
-		overflow-x: hidden;
-		scroll-behavior: smooth;
-		margin-left: 40px;
-		padding-inline-start: 0;
-
-		li {
-			list-style-type: none;
-	  	}
-
-		-webkit-mask-image: linear-gradient(90deg, #000000 95%, transparent);
-		mask-image: linear-gradient(90deg, #000000 95%, transparent);
-	}
-}
--- a/style/dashboard_tile.scss
+++ b/style/dashboard_tile.scss
@ -1,28 +0,0 @@
-.dashboard-tile {
-	img {
-		width: $dashboard-tile-size;
-		height: $dashboard-tile-size;
-		border-radius: 7px;
-		margin-right: 20px;
-	}
-
-	a {
-		text-decoration: none;
-		color: $text-controls-color;
-	}
-
-	p.dashboard-tile-title {
-		font-size: 16px;
-		font-weight: bold;
-		margin: 0;
-		padding: 0;
-	}
-
-	p.dashboard-tile-description {
-		font-size: 12px;
-		margin: 0;
-		padding: 0;
-	}
-	
-	margin-right: 10px;
-}
--- a/style/home.scss
+++ b/style/home.scss
@ -1,16 +0,0 @@
-@import "theme.scss";
-
-.home-container {
-  margin-top: 0;
-  width: 100%;
-  height: 100vh;
-  display: flex;
-  flex-direction: row;
-}
-.home-component {
-  background: #1c1c1c;
-  height: 100vh;
-  margin: 2px;
-  padding: 0.2rem 1.5rem 1.5rem 1rem;
-  border-radius: 0.5rem;
-}
--- a/style/main.scss
+++ b/style/main.scss
@ -1,22 +1,13 @@
-@import "playbar.scss";
-@import "theme.scss";
-@import "queue.scss";
-@import "login.scss";
-@import "signup.scss";
-@import "sidebar.scss";
-@import "dashboard.scss";
-@import 'home.scss';
-@import 'search.scss';
-@import 'personal.scss';
-@import 'dashboard_tile.scss';
-@import 'dashboard_row.scss';
-@import 'upload.scss';
-@import 'song_list.scss';
+@import 'playbar.scss';
+@import 'theme.scss';
+@import 'queue.scss';
+@import 'login.scss';
+@import 'signup.scss';

 body {
-  font-family: sans-serif;
-  background-color: $background-color;
-  color: $text-controls-color;
-  margin: 0;
-  padding: 0;
+	font-family: sans-serif;
+	background-color: $background-color;
+	color: $text-controls-color;
+	margin: 0;
+	padding: 0;
 }
--- a/style/personal.scss
+++ b/style/personal.scss
@ -1,74 +0,0 @@
-@import "theme.scss";
-
-.personal-container {
-  width: 16rem;
-  background: #1c1c1c;
-  height: 100vh;
-  margin: 2px;
-  border-radius: 0.5rem;
-
-  .profile-container {
-    display: flex;
-    border-radius: 0.4rem;
-    margin: 0.2rem;
-    min-height: 6rem;
-    border: 2px solid rgba(89, 89, 89, 0.199);
-    padding: 0.5rem;
-
-    .profile-icon {
-      display: inline-flex;
-      padding: 0.2rem;
-      cursor: pointer;
-      font-size: 2rem;
-      border-radius: 50%;
-      transition: all 0.3s;
-      height: max-content;
-      margin-left: auto;
-    }
-
-    .profile-icon:hover {
-      transform: scale(1.1);
-      background-color: rgba(255, 255, 255, 0.1);
-    }
-
-    .profile-icon:active {
-      transform: scale(0.8);
-    }
-    .dropdown-container {
-      position: absolute;
-      top: 3.8rem;
-      right: 0.8rem;
-      background: #1c1c1c;
-      border-radius: 0.5rem;
-      width: 10rem;
-      z-index: 1;
-      background-color: red;
-      border: 1px solid grey;
-
-      .dropdown-not-logged {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-        align-items: center;
-        justify-content: center;
-        h1 {
-          font-size: 1.2rem;
-        }
-        .auth-button {
-        }
-      }
-    }
-    .dropdown-container:before {
-      content: "";
-      position: absolute;
-      top: -0.4rem;
-      right: 0.92rem;
-      width: 10px;
-      height: 10px;
-      transform: rotate(45deg);
-      background-color: red;
-      border-left: 1px solid grey;
-      border-top: 1px solid grey;
-    }
-  }
-}
--- a/style/playbar.scss
+++ b/style/playbar.scss
@ -39,12 +39,15 @@
 		}
 	}

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

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

 	.playcontrols {
@ -65,6 +64,23 @@
 		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 {
@ -78,30 +94,22 @@
 		bottom: 13px;
 		top: 13px;
 		right: 90px;
-	}

-	button {
-		.hmirror {
-			-moz-transform: scale(-1, 1);
-			-webkit-transform: scale(-1, 1);
-			-o-transform: scale(-1, 1);
-			-ms-transform: scale(-1, 1);
-			transform: scale(-1, 1);
+		button {
+			.controlbtn {
+				color: $text-controls-color;
+			}
+
+			.controlbtn:hover {
+				color: $controls-hover-color;
+			}
+
+			.controlbtn:active {
+				color: $controls-click-color;
+			}
+	
+			background-color: transparent;
+			border: transparent;
 		}
-
-		.controlbtn {
-			color: $text-controls-color;
-		}
-
-		.controlbtn:hover {
-			color: $controls-hover-color;
-		}
-
-		.controlbtn:active {
-			color: $controls-click-color;
-		}
-
-		background-color: transparent;
-		border: transparent;
 	}
 }
--- a/style/queue.scss
+++ b/style/queue.scss
@ -48,7 +48,12 @@
 						color: #fff; /* Adjust text color for song */
 					}
 			
-					p {
+					.fallback-artists {
+						margin: 14px 0 0 0; /* Adjust margin for blank space to align text */
+					}
+
+					.artists {
+						font-size: 14px;
 						margin: 0; /* Remove default margin for paragraph */
 						color: #aaa; /* Adjust text color for artist */
 					}
--- a/style/search.scss
+++ b/style/search.scss
@ -1,6 +0,0 @@
-@import "theme.scss";
-
-.search-container {
-  width: calc(100% - 22rem - 16rem);
-  
-}
--- a/style/sidebar.scss
+++ b/style/sidebar.scss
@ -1,116 +0,0 @@
-@import "theme.scss";
-
-.sidebar-container {
-  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;
-    position: relative;
-    .header {
-      font-size: 1.2rem;
-    }
-    .upload-btn {
-      position: absolute;
-      top: 10px;
-      right: 7px;
-      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: 1rem;
-      padding-left: 1rem;
-      cursor: pointer;
-      transition: background-color 0.3s ease;
-      .add-sign {
-        font-size: 1.5rem;
-        margin-top: auto;
-        margin-right: 5px;
-        color: white;
-      }
-    }
-    .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/song_list.scss
+++ b/style/song_list.scss
@ -1,124 +0,0 @@
-table.song-list {
-	width: 100%;
-	border-collapse: collapse;
-
-	tr.song-list-item {
-		border: solid;
-		border-width: 1px 0;
-		border-color: #303030;
-		position: relative;
-
-		td {
-			color: $text-controls-color;
-			white-space: nowrap;
-			padding-left: 10px;
-			padding-right: 10px;
-			
-			a {
-				text-decoration: none;
-				color: $text-controls-color;
-			}
-		}
-
-		a:hover {
-			text-decoration: underline $controls-hover-color;
-		}
-		
-		td.song-image {
-			width: 35px;
-			display: flex;
-
-			img.song-image {
-				position: absolute;
-				top: 50%;
-				-ms-transform: translateY(-50%);
-				transform: translateY(-50%);
-				width: 35px;
-				height: 35px;
-				border-radius: 5px;
-			}
-
-			svg.song-image-overlay {
-				position: absolute;
-				top: 50%;
-				-ms-transform: translateY(-50%);
-				transform: translateY(-50%);
-				width: 35px;
-				height: 35px;
-				border-radius: 5px;
-				fill: $text-controls-color;
-			}
-
-			svg.song-image-overlay:hover {
-				fill: $controls-hover-color;
-			}
-
-			svg.song-image-overlay:active {
-				fill: $controls-click-color;
-			}
-		}
-
-		td.song-list-spacer {
-			width: 20%;
-		}
-
-		td.song-list-spacer-big {
-			width: 40%;
-		}
-
-		button {
-			svg.hmirror {
-				-moz-transform: scale(-1, 1);
-				-webkit-transform: scale(-1, 1);
-				-o-transform: scale(-1, 1);
-				-ms-transform: scale(-1, 1);
-				transform: scale(-1, 1);
-			}
-	
-			.controlbtn {
-				color: $text-controls-color;
-			}
-	
-			.controlbtn:hover {
-				color: $controls-hover-color;
-			}
-	
-			.controlbtn:active {
-				color: $controls-click-color;
-			}
-	
-			background-color: transparent;
-			border: transparent;
-		}
-
-		.hide-until-hover {
-			visibility: hidden;
-		}
-
-		.song-playing-overlay {
-			background-color: rgba(0, 0, 0, 0.8);
-		}
-	}
-
-	tr.song-list-item:first-child {
-		border-top: none;
-	}
-
-	tr.song-list-item:last-child {
-		border-bottom: none;
-	}
-
-	tr.song-list-item:hover {
-		background-color: #303030;
-
-		.hide-until-hover {
-			visibility: visible;
-		}
-
-		td.song-image {
-			svg.song-image-overlay {
-				background-color: rgba(0, 0, 0, 0.8);
-			}
-		}
-	}
-}
--- a/style/theme.scss
+++ b/style/theme.scss
@ -1,7 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap');
-
-$standard-font: 'Open Sans', sans-serif;
-
 $background-color: #030303;
 $accent-color: #4032a8;
 $text-controls-color: #e0e0e0;
@ -14,5 +10,3 @@ $queue-background-color: $play-bar-background-color;

 $auth-inputs: #796dd4;
 $auth-containers: white;
-
-$dashboard-tile-size: 200px;
--- a/style/upload.scss
+++ b/style/upload.scss
@ -1,188 +0,0 @@
-@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
ecco257	2fffc16c82	Update ahash to fix build	2024-04-16 16:47:01 -04:00
ecco257	08fcba5495	Fix wasm bindgen version issue	2024-04-16 16:27:43 -04:00
ecco257	076d3a2865	Update styling of song in queue to adjust for blank space in suspense of artists	2024-04-12 23:47:36 -04:00
ecco257	13d6d07e8e	Fix handling of artists resource in song component	2024-04-12 23:46:37 -04:00
ecco257	cf07ec2982	Fix handling of album and song resources in MediaInfo	2024-04-12 23:45:14 -04:00
ecco257	aa76a068d6	Stop using set_player_src, instead, memo and effect to set src of audio element	2024-04-12 23:43:52 -04:00
ecco257	2037122dc0	Add clone trait to Song model	2024-04-12 23:40:10 -04:00
ecco257	9327ec19f5	Add server function to get song from song id	2024-04-12 23:38:35 -04:00
ecco257	ece6d19fc3	Remove SongData struct	2024-04-05 23:51:17 -04:00
ecco257	633000062c	Modify queue, playbar, and playstatus to work with Song model struct instead of old SongData	2024-04-05 23:48:24 -04:00
ecco257	082e6b9269	Add albums server functions to fetch album from album id	2024-04-05 23:47:08 -04:00
ecco257	ec33b09fa9	update Song component to work for model version of Song struct	2024-04-05 23:46:24 -04:00
ecco257	e1d3bb4099	Add songs server endpoint to get artists using song id	2024-04-05 23:43:44 -04:00
				`@ -1 +0,0 @@`
				<svg version="1.1" viewBox="0.0 0.0 960.0 960.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l960.0 0l0 960.0l-960.0 0l0 -960.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#4032a8" d="m0 0l960.0 0l0 960.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m290.11365 265.52475l35.496063 0l0 471.3386l-35.496063 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m115.68951 737.6639l0 0c0 -36.946594 46.99247 -66.897644 104.960625 -66.897644l0 0c57.968155 0 104.96065 29.95105 104.96065 66.897644l0 0c0 36.946533 -46.992493 66.897644 -104.96065 66.897644l0 0c-57.968155 0 -104.960625 -29.95111 -104.960625 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m723.79346 175.86597l35.496033 0l0 471.33856l-35.496033 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m549.3693 648.00507l0 0c0 -36.946533 46.99243 -66.897644 104.96063 -66.897644l0 0c57.96814 0 104.96057 29.95111 104.96057 66.897644l0 0c0 36.946533 -46.99243 66.897644 -104.96057 66.897644l0 0c-57.9682 0 -104.96063 -29.95111 -104.96063 -66.897644z" fill-rule="evenodd"/><path fill="#ffffff" d="m759.2711 155.4385l-0.01727295 94.79588l-427.05206 100.14052l-42.09601 -84.920654z" fill-rule="evenodd"/><path fill="#ffffff" d="m421.49164 234.64502l21.039368 89.85828l-131.40158 30.803131l-21.039368 -89.85828z" fill-rule="evenodd"/></g></svg>
				`@ -1 +0,0 @@`
				`ALTER TABLE albums ADD COLUMN image_path VARCHAR;`
				`@ -1 +0,0 @@`
				`ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT FALSE NOT NULL;`