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

2024-09-27 17:18:09 -04:00
52 changed files with 164 additions and 2382 deletions
--- 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
@ -3,10 +3,22 @@ on: push
 jobs:
  build:
-    runs-on: libretunes-cicd
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Setup Rust toolchain
        id: setup-toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
          toolchain: nightly
          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
      - name: Cache
        uses: Swatinem/rust-cache@v2
        with:
            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
      - name: Install cargo-leptos
        run: cargo install cargo-leptos
      - name: Build project
        env:
          RUSTFLAGS: "-D warnings"
@ -46,26 +58,58 @@ jobs:
          cache-to: type=inline
  test:
-    runs-on: libretunes-cicd
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Setup Rust toolchain
        id: setup-toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
          toolchain: nightly
          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
      - name: Cache
        uses: Swatinem/rust-cache@v2
        with:
            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
      - name: Test project
        run: cargo test --all-targets --all-features
  leptos-test:
-    runs-on: libretunes-cicd
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Setup Rust toolchain
        id: setup-toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
          toolchain: nightly
          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
      - name: Cache
        uses: Swatinem/rust-cache@v2
        with:
            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
      - name: Install cargo-leptos
        run: cargo install cargo-leptos
      - name: Run Leptos tests
        run: cargo-leptos test
  docs:
-    runs-on: libretunes-cicd
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Setup Rust toolchain
        id: setup-toolchain
        uses: dtolnay/rust-toolchain@stable
        with:
          toolchain: nightly
          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
      - name: Cache
        uses: Swatinem/rust-cache@v2
        with:
            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
      - name: Generate docs
        run: cargo doc --no-deps
      - name: Upload docs
--- a/.gitignore
+++ b/.gitignore
@ -24,7 +24,6 @@ playwright/.cache/
 *.jpeg
 *.png
 *.gif
 *.webp
 # Environment variables
 .env
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 [[package]]
 name = "addr2line"
@ -17,12 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 [[package]]
 name = "adler2"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 [[package]]
 name = "ahash"
 version = "0.8.11"
@ -151,7 +145,7 @@ dependencies = [
 "axum-core",
 "bytes",
 "futures-util",
- "http 1.1.0",
+ "http",
 "http-body",
 "http-body-util",
 "hyper",
@ -167,7 +161,7 @@ dependencies = [
 "serde",
 "sync_wrapper 1.0.0",
 "tokio",
- "tower 0.4.13",
+ "tower",
 "tower-layer",
 "tower-service",
 ]
@ -181,7 +175,7 @@ dependencies = [
 "async-trait",
 "bytes",
 "futures-util",
- "http 1.1.0",
+ "http",
 "http-body",
 "http-body-util",
 "mime",
@ -222,7 +216,7 @@ dependencies = [
 "cc",
 "cfg-if",
 "libc",
- "miniz_oxide 0.7.2",
+ "miniz_oxide",
 "object",
 "rustc-demangle",
 ]
@ -239,29 +233,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "bindgen"
 version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
 "bitflags 2.5.0",
 "cexpr",
 "clang-sys",
 "itertools",
 "lazy_static",
 "lazycell",
 "log",
 "prettyplease",
 "proc-macro2",
 "quote",
 "regex",
 "rustc-hash",
 "shlex",
 "syn 2.0.58",
 "which",
 ]
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@ -337,7 +308,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f"
 dependencies = [
- "darling 0.14.4",
+ "darling",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
@ -361,15 +332,6 @@ version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 [[package]]
 name = "cexpr"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
 "nom",
 ]
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@ -378,16 +340,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "serde",
 "wasm-bindgen",
 "windows-targets 0.52.4",
 ]
@ -418,26 +377,6 @@ dependencies = [
 "half",
 ]
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
 "glob",
 "libc",
 "libloading",
 ]
 [[package]]
 name = "codee"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
 dependencies = [
 "thiserror",
 ]
 [[package]]
 name = "collection_literals"
 version = "1.0.1"
@ -523,12 +462,6 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 [[package]]
 name = "cow-utils"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "417bef24afe1460300965a25ff4a24b8b45ad011948302ec221e8a0a81eb2c79"
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@ -544,15 +477,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
 "cfg-if",
 ]
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@ -575,18 +499,8 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core 0.14.4",
+ "darling_core",
- "darling_macro 0.14.4",
+ "darling_macro",
 ]
 [[package]]
 name = "darling"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
 "darling_core 0.20.10",
 "darling_macro 0.20.10",
 ]
 [[package]]
@ -599,46 +513,21 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.10.0",
+ "strsim",
 "syn 1.0.109",
 ]
 [[package]]
 name = "darling_core"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2",
 "quote",
 "strsim 0.11.1",
 "syn 2.0.58",
 ]
 [[package]]
 name = "darling_macro"
 version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
- "darling_core 0.14.4",
+ "darling_core",
 "quote",
 "syn 1.0.109",
 ]
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core 0.20.10",
 "quote",
 "syn 2.0.58",
 ]
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@ -652,18 +541,6 @@ dependencies = [
 "parking_lot_core",
 ]
 [[package]]
 name = "default-struct-builder"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8fa90da96b8fd491f5754d1f7a731f73921e3b7aa0ce333c821a0e43666ac14"
 dependencies = [
 "darling 0.20.10",
 "proc-macro2",
 "quote",
 "syn 2.0.58",
 ]
 [[package]]
 name = "deranged"
 version = "0.3.11"
@ -693,11 +570,11 @@ checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559"
 dependencies = [
 "bitflags 2.5.0",
 "byteorder",
 "chrono",
 "diesel_derives",
 "itoa",
 "pq-sys",
 "r2d2",
 "time",
 ]
 [[package]]
@ -743,17 +620,6 @@ dependencies = [
 "subtle",
 ]
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.58",
 ]
 [[package]]
 name = "dotenv"
 version = "0.15.0"
@ -787,35 +653,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 [[package]]
 name = "errno"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
 "libc",
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "fdeflate"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
 dependencies = [
 "simd-adler32",
 ]
 [[package]]
 name = "flate2"
 version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
 "crc32fast",
 "miniz_oxide 0.8.0",
 ]
 [[package]]
 name = "flexi_logger"
 version = "0.28.0"
@ -1020,14 +857,13 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "gloo-net"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380"
 checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173"
 dependencies = [
 "futures-channel",
 "futures-core",
 "futures-sink",
 "gloo-utils",
- "http 0.2.12",
+ "http",
 "js-sys",
 "pin-project",
 "serde",
@ -1038,23 +874,10 @@ dependencies = [
 "web-sys",
 ]
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
 "futures-channel",
 "futures-core",
 "js-sys",
 "wasm-bindgen",
 ]
 [[package]]
 name = "gloo-utils"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380"
 checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
 dependencies = [
 "js-sys",
 "serde",
@ -1104,15 +927,6 @@ dependencies = [
 "digest",
 ]
 [[package]]
 name = "home"
 version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "html-escape"
 version = "0.2.13"
@ -1122,17 +936,6 @@ dependencies = [
 "utf8-width",
 ]
 [[package]]
 name = "http"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
 "bytes",
 "fnv",
 "itoa",
 ]
 [[package]]
 name = "http"
 version = "1.1.0"
@ -1151,7 +954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
 "bytes",
- "http 1.1.0",
+ "http",
 ]
 [[package]]
@ -1162,7 +965,7 @@ checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
 "bytes",
 "futures-core",
- "http 1.1.0",
+ "http",
 "http-body",
 "pin-project-lite",
 ]
@ -1194,7 +997,7 @@ dependencies = [
 "bytes",
 "futures-channel",
 "futures-util",
- "http 1.1.0",
+ "http",
 "http-body",
 "httparse",
 "httpdate",
@ -1212,7 +1015,7 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
 "bytes",
 "futures-util",
- "http 1.1.0",
+ "http",
 "http-body",
 "hyper",
 "pin-project-lite",
@ -1243,16 +1046,6 @@ dependencies = [
 "cc",
 ]
 [[package]]
 name = "ico"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae"
 dependencies = [
 "byteorder",
 "png",
 ]
 [[package]]
 name = "icondata"
 version = "0.3.0"
@ -1464,19 +1257,6 @@ dependencies = [
 "unicode-normalization",
 ]
 [[package]]
 name = "image-convert"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3eb95018550c5770e1a25219a75c192fa2f6475efef2244a0d46799d3fdf6cf"
 dependencies = [
 "ico",
 "magick_rust",
 "once_cell",
 "regex",
 "str-utils",
 ]
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@ -1525,9 +1305,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
 "wasm-bindgen",
 ]
@ -1538,12 +1318,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "lazycell"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 [[package]]
 name = "leptos"
 version = "0.6.10"
@ -1564,29 +1338,6 @@ dependencies = [
 "web-sys",
 ]
 [[package]]
 name = "leptos-use"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ab8914bd0ff8ab5029521540a6e15292dcc05d0f1a791a3aa8cc31a94436bfb"
 dependencies = [
 "cfg-if",
 "codee",
 "cookie",
 "default-struct-builder",
 "futures-util",
 "gloo-timers",
 "js-sys",
 "lazy_static",
 "leptos",
 "paste",
 "thiserror",
 "unic-langid",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
 ]
 [[package]]
 name = "leptos_axum"
 version = "0.6.10"
@ -1819,16 +1570,6 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 [[package]]
 name = "libloading"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
 "cfg-if",
 "windows-targets 0.52.4",
 ]
 [[package]]
 name = "libretunes"
 version = "0.1.0"
@ -1837,18 +1578,15 @@ dependencies = [
 "axum",
 "axum-login",
 "cfg-if",
 "chrono",
 "console_error_panic_hook",
 "diesel",
 "diesel_migrations",
 "dotenv",
 "flexi_logger",
- "http 1.1.0",
+ "http",
 "icondata",
 "image-convert",
 "lazy_static",
 "leptos",
 "leptos-use",
 "leptos_axum",
 "leptos_icons",
 "leptos_meta",
@ -1861,8 +1599,9 @@ dependencies = [
 "server_fn",
 "symphonia",
 "thiserror",
 "time",
 "tokio",
- "tower 0.5.1",
+ "tower",
 "tower-http",
 "tower-sessions-redis-store",
 "wasm-bindgen",
@ -1879,12 +1618,6 @@ dependencies = [
 "serde_test",
 ]
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@ -1911,17 +1644,6 @@ dependencies = [
 "hashbrown 0.14.3",
 ]
 [[package]]
 name = "magick_rust"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f862f489ba66357a730356f1d48abdb2c5028707b6c17dee7842359bc6372c"
 dependencies = [
 "bindgen",
 "libc",
 "pkg-config",
 ]
 [[package]]
 name = "manyhow"
 version = "0.10.4"
@ -2009,16 +1731,6 @@ dependencies = [
 "adler",
 ]
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
 "adler2",
 "simd-adler32",
 ]
 [[package]]
 name = "mio"
 version = "0.8.11"
@ -2039,7 +1751,7 @@ dependencies = [
 "bytes",
 "encoding_rs",
 "futures-util",
- "http 1.1.0",
+ "http",
 "httparse",
 "log",
 "memchr",
@ -2244,19 +1956,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 [[package]]
 name = "png"
 version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
 dependencies = [
 "bitflags 1.3.2",
 "crc32fast",
 "fdeflate",
 "flate2",
 "miniz_oxide 0.8.0",
 ]
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@ -2532,19 +2231,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 [[package]]
 name = "rustix"
 version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
 "bitflags 2.5.0",
 "errno",
 "libc",
 "linux-raw-sys",
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@ -2686,7 +2372,7 @@ dependencies = [
 "dashmap",
 "futures",
 "gloo-net",
- "http 1.1.0",
+ "http",
 "http-body-util",
 "hyper",
 "inventory",
@ -2699,7 +2385,7 @@ dependencies = [
 "serde_qs",
 "server_fn_macro_default",
 "thiserror",
- "tower 0.4.13",
+ "tower",
 "tower-layer",
 "url",
 "wasm-bindgen",
@ -2744,18 +2430,6 @@ dependencies = [
 "digest",
 ]
 [[package]]
 name = "shlex"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 [[package]]
 name = "slab"
 version = "0.4.9"
@ -2797,28 +2471,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 [[package]]
 name = "str-utils"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60bcb3d541a8fd455189b9e022f27d255d103dafd5087a93cff4c0a156a8b597"
 dependencies = [
 "cow-utils",
 "unicase",
 ]
 [[package]]
 name = "strsim"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 [[package]]
 name = "subtle"
 version = "2.5.0"
@ -2922,18 +2580,18 @@ checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2971,15 +2629,6 @@ dependencies = [
 "time-core",
 ]
 [[package]]
 name = "tinystr"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
 "displaydoc",
 ]
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@ -3125,20 +2774,6 @@ dependencies = [
 "tracing",
 ]
 [[package]]
 name = "tower"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
 dependencies = [
 "futures-core",
 "futures-util",
 "pin-project-lite",
 "sync_wrapper 0.1.2",
 "tower-layer",
 "tower-service",
 ]
 [[package]]
 name = "tower-cookies"
 version = "0.10.0"
@ -3149,7 +2784,7 @@ dependencies = [
 "axum-core",
 "cookie",
 "futures-util",
- "http 1.1.0",
+ "http",
 "parking_lot",
 "pin-project-lite",
 "tower-layer",
@ -3158,14 +2793,14 @@ dependencies = [
 [[package]]
 name = "tower-http"
-version = "0.6.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
 "bitflags 2.5.0",
 "bytes",
 "futures-util",
- "http 1.1.0",
+ "http",
 "http-body",
 "http-body-util",
 "http-range-header",
@ -3183,15 +2818,15 @@ dependencies = [
 [[package]]
 name = "tower-layer"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
 [[package]]
 name = "tower-service"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 [[package]]
 name = "tower-sessions"
@ -3200,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b27326208b21807803c5f5aa1020d30ca0432b78cfe251b51a67a05e0baea102"
 dependencies = [
 "async-trait",
- "http 1.1.0",
+ "http",
 "time",
 "tokio",
 "tower-cookies",
@ -3221,7 +2856,7 @@ dependencies = [
 "axum-core",
 "base64",
 "futures",
- "http 1.1.0",
+ "http",
 "parking_lot",
 "rand",
 "serde",
@ -3316,24 +2951,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "unic-langid"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44"
 dependencies = [
 "unic-langid-impl",
 ]
 [[package]]
 name = "unic-langid-impl"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5"
 dependencies = [
 "tinystr",
 ]
 [[package]]
 name = "unicase"
 version = "2.7.0"
@ -3524,26 +3141,14 @@ dependencies = [
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
 ]
 [[package]]
 name = "which"
 version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
 "either",
 "home",
 "once_cell",
 "rustix",
 ]
 [[package]]
 name = "winapi"
 version = "0.3.9"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -19,16 +19,17 @@ wasm-bindgen = { version = "=0.2.93", default-features = false, optional = true
 leptos_icons = { version = "0.3.0" }
 icondata = { version = "0.3.0" }
 dotenv = { version = "0.15.0", optional = true }
-diesel = { version = "2.1.4", features = ["postgres", "r2d2", "chrono"], default-features = false, optional = true }
+diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true }
 lazy_static = { version = "1.4.0", optional = true }
 serde = { version = "1.0.195", features = ["derive"], default-features = false }
 openssl = { version = "0.10.63", optional = true }
 time = { version = "0.3.34", features = ["serde"], default-features = false }
 diesel_migrations = { version = "2.1.0", optional = true }
 pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
 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 = { version = "0.4.13", optional = true }
-tower-http = { version = "0.6.1", optional = true, features = ["fs"] }
+tower-http = { version = "0.5", 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 }
@ -39,9 +40,9 @@ 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 }
+[patch.crates-io]
-chrono = { version = "0.4.38", default-features = false, features = ["serde", "clock"] }
+gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" }
 [features]
 hydrate = [
@ -50,7 +51,6 @@ hydrate = [
  "leptos_router/hydrate",
  "console_error_panic_hook",
  "wasm-bindgen",
  "chrono/wasmbind",
 ]
 ssr = [
  "dep:leptos_axum",
@ -74,8 +74,6 @@ ssr = [
  "multer",
  "log",
  "flexi_logger",
  "leptos-use/ssr",
  "image-convert",
 ]
 # Defines a size-optimized profile for the WASM bundle in release mode
--- a/43
+++ b/43
@ -1,10 +1,8 @@
-FROM rust:slim as builder
+FROM clux/muslrust:nightly 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; \
@ -12,26 +10,19 @@ RUN set -eux; \
    apt-get install -y --no-install-recommends \
 		pkg-config \
 		clang \
-		build-essential \
+		npm; \
 		libssl-dev \
 		libpq-dev \
 		wget; \
 	rm -rf /var/lib/apt/lists/*
-# Install ImageMagick
+RUN cargo install cargo-leptos
-RUN cd / && \
+
-	wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-38.tar.gz && \
+RUN npm install tailwindcss@3.1.8 -g
 	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
 # 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 +33,15 @@ 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 +49,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 +57,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/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-audio:/site/audio
      - libretunes-images:/assets/images
    depends_on:
      - redis
      - postgres
@ -53,6 +50,5 @@ services:
 volumes:
  libretunes-audio:
  libretunes-images:
  libretunes-redis:
  libretunes-postgres:
--- 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 chrono::NaiveDate;
 /// 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<NaiveDate>,
 	/// 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/history.rs
+++ b/src/api/history.rs
@ -1,44 +0,0 @@
 use chrono::NaiveDateTime;
 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<(NaiveDateTime, 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 @@
 pub mod history;
 pub mod profile;
 pub mod songs;
--- a/src/api/profile.rs
+++ b/src/api/profile.rs
@ -1,300 +0,0 @@
 use leptos::*;
 use server_fn::codec::{MultipartData, MultipartFormData};
 use cfg_if::cfg_if;
 use crate::songdata::SongData;
 use crate::artistdata::ArtistData;
 use chrono::NaiveDateTime;
 cfg_if! {
 	if #[cfg(feature = "ssr")] {
 		use crate::auth::get_user;
 		use server_fn::error::NoCustomError;
 		use crate::database::get_db_conn;
 		use diesel::prelude::*;
 		use diesel::dsl::count;
 		use crate::models::*;
 		use crate::schema::*;
 		use std::collections::HashMap;
 	}
 }
 /// 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(())
 }
 /// Get a user's recent songs listened to
 /// Optionally takes a limit parameter to limit the number of songs returned.
 /// If not provided, all songs ever listend to are returned.
 /// Returns a list of tuples with the date the song was listened to
 /// and the song data, sorted by date (most recent first).
 #[server(endpoint = "/profile/recent_songs")]
 pub async fn recent_songs(for_user_id: i32, limit: Option<i64>) -> Result<Vec<(NaiveDateTime, SongData)>, ServerFnError> {
 	let mut db_con = get_db_conn();
 	// Get the ids of the most recent songs listened to
 	let history_items: Vec<i32> = 
 		if let Some(limit) = limit {
 			song_history::table
 				.filter(song_history::user_id.eq(for_user_id))
 				.order(song_history::date.desc())
 				.limit(limit)
 				.select(song_history::id)
 				.load(&mut db_con)?
 		} else {
 			song_history::table
 				.filter(song_history::user_id.eq(for_user_id))
 				.order(song_history::date.desc())
 				.select(song_history::id)
 				.load(&mut db_con)?
 		};
 	// Take the history ids and get the song data for them
 	let history: Vec<(HistoryEntry, Song, Option<Album>, Option<Artist>, Option<(i32, i32)>, Option<(i32, i32)>)>
 	= song_history::table
 		.filter(song_history::id.eq_any(history_items))
 		.inner_join(songs::table)
 		.left_join(albums::table.on(songs::album_id.eq(albums::id.nullable())))
 		.left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id)))
 		.left_join(song_likes::table.on(songs::id.eq(song_likes::song_id).and(song_likes::user_id.eq(for_user_id))))
 		.left_join(song_dislikes::table.on(
 			songs::id.eq(song_dislikes::song_id).and(song_dislikes::user_id.eq(for_user_id))))
 		.select((
 			song_history::all_columns,
 			songs::all_columns,
 			albums::all_columns.nullable(),
 			artists::all_columns.nullable(),
 			song_likes::all_columns.nullable(),
 			song_dislikes::all_columns.nullable(),
 		))
 		.load(&mut db_con)?;
 	// Process the history data into a map of song ids to song data
 	let mut history_songs: HashMap<i32, (NaiveDateTime, SongData)> = HashMap::with_capacity(history.len());
 	for (history, song, album, artist, like, dislike) in history {
 		let song_id = history.song_id;
 		if let Some((_, stored_songdata)) = history_songs.get_mut(&song_id) {
 			// If the song is already in the map, update the artists
 			if let Some(artist) = artist {
 				stored_songdata.artists.push(artist);
 			}
 		} else {
 			let like_dislike = match (like, dislike) {
 				(Some(_), Some(_)) => Some((true, true)),
 				(Some(_), None) => Some((true, false)),
 				(None, Some(_)) => Some((false, true)),
 				_ => None,
 			};
 			let image_path = song.image_path.unwrap_or(
 				album.as_ref().map(|album| album.image_path.clone()).flatten()
 					.unwrap_or("/assets/images/placeholders/MusicPlaceholder.svg".to_string()));
 			let songdata = SongData {
 				id: song_id,
 				title: song.title,
 				artists: artist.map(|artist| vec![artist]).unwrap_or_default(),
 				album: album,
 				track: song.track,
 				duration: song.duration,
 				release_date: song.release_date,
 				song_path: song.storage_path,
 				image_path: image_path,
 				like_dislike: like_dislike,
 			};
 			history_songs.insert(song_id, (history.date, songdata));
 		}
 	}
 	// Sort the songs by date
 	let mut history_songs: Vec<(NaiveDateTime, SongData)> = history_songs.into_values().collect();
 	history_songs.sort_by(|a, b| b.0.cmp(&a.0));
 	Ok(history_songs)
 }
 /// Get a user's top songs by play count from a date range
 /// Optionally takes a limit parameter to limit the number of songs returned.
 /// If not provided, all songs listened to in the date range are returned.
 /// Returns a list of tuples with the play count and the song data, sorted by play count (most played first).
 #[server(endpoint = "/profile/top_songs")]
 pub async fn top_songs(for_user_id: i32, start_date: NaiveDateTime, end_date: NaiveDateTime, limit: Option<i64>)
 	-> Result<Vec<(i64, SongData)>, ServerFnError>
 {
 	let mut db_con = get_db_conn();
 	// Get the play count and ids of the songs listened to in the date range
 	let history_counts: Vec<(i32, i64)> = 
 		if let Some(limit) = limit {
 			song_history::table
 				.filter(song_history::date.between(start_date, end_date))
 				.filter(song_history::user_id.eq(for_user_id))
 				.group_by(song_history::song_id)
 				.select((song_history::song_id, count(song_history::song_id)))
 				.order(count(song_history::song_id).desc())
 				.limit(limit)
 				.load(&mut db_con)?
 		} else {
 			song_history::table
 				.filter(song_history::date.between(start_date, end_date))
 				.filter(song_history::user_id.eq(for_user_id))
 				.group_by(song_history::song_id)
 				.select((song_history::song_id, count(song_history::song_id)))
 				.load(&mut db_con)?
 		};
 	let history_counts: HashMap<i32, i64> = history_counts.into_iter().collect();
 	let history_song_ids = history_counts.iter().map(|(song_id, _)| *song_id).collect::<Vec<i32>>();
 	// Get the song data for the songs listened to in the date range
 	let history_songs: Vec<(Song, Option<Album>, Option<Artist>, Option<(i32, i32)>, Option<(i32, i32)>)>
 	= songs::table
 		.filter(songs::id.eq_any(history_song_ids))
 		.left_join(albums::table.on(songs::album_id.eq(albums::id.nullable())))
 		.left_join(song_artists::table.inner_join(artists::table).on(songs::id.eq(song_artists::song_id)))
 		.left_join(song_likes::table.on(songs::id.eq(song_likes::song_id).and(song_likes::user_id.eq(for_user_id))))
 		.left_join(song_dislikes::table.on(
 			songs::id.eq(song_dislikes::song_id).and(song_dislikes::user_id.eq(for_user_id))))
 		.select((
 			songs::all_columns,
 			albums::all_columns.nullable(),
 			artists::all_columns.nullable(),
 			song_likes::all_columns.nullable(),
 			song_dislikes::all_columns.nullable(),
 		))
 		.load(&mut db_con)?;
 	// Process the history data into a map of song ids to song data
 	let mut history_songs_map: HashMap<i32, (i64, SongData)> = HashMap::with_capacity(history_counts.len());
 	for (song, album, artist, like, dislike) in history_songs {
 		let song_id = song.id
 			.ok_or(ServerFnError::ServerError::<NoCustomError>("Song id not found in database".to_string()))?;
 		if let Some((_, stored_songdata)) = history_songs_map.get_mut(&song_id) {
 			// If the song is already in the map, update the artists
 			if let Some(artist) = artist {
 				stored_songdata.artists.push(artist);
 			}
 		} else {
 			let like_dislike = match (like, dislike) {
 				(Some(_), Some(_)) => Some((true, true)),
 				(Some(_), None) => Some((true, false)),
 				(None, Some(_)) => Some((false, true)),
 				_ => None,
 			};
 			let image_path = song.image_path.unwrap_or(
 				album.as_ref().map(|album| album.image_path.clone()).flatten()
 					.unwrap_or("/assets/images/placeholders/MusicPlaceholder.svg".to_string()));
 			let songdata = SongData {
 				id: song_id,
 				title: song.title,
 				artists: artist.map(|artist| vec![artist]).unwrap_or_default(),
 				album: album,
 				track: song.track,
 				duration: song.duration,
 				release_date: song.release_date,
 				song_path: song.storage_path,
 				image_path: image_path,
 				like_dislike: like_dislike,
 			};
 			let plays = history_counts.get(&song_id)
 				.ok_or(ServerFnError::ServerError::<NoCustomError>("Song id not found in history counts".to_string()))?;
 			history_songs_map.insert(song_id, (*plays, songdata));
 		}
 	}
 	// Sort the songs by play count
 	let mut history_songs: Vec<(i64, SongData)> = history_songs_map.into_values().collect();
 	history_songs.sort_by(|a, b| b.0.cmp(&a.0));
 	Ok(history_songs)
 }
 /// Get a user's top artists by play count from a date range
 /// Optionally takes a limit parameter to limit the number of artists returned.
 /// If not provided, all artists listened to in the date range are returned.
 /// Returns a list of tuples with the play count and the artist data, sorted by play count (most played first).
 #[server(endpoint = "/profile/top_artists")]
 pub async fn top_artists(for_user_id: i32, start_date: NaiveDateTime, end_date: NaiveDateTime, limit: Option<i64>)
 	-> Result<Vec<(i64, ArtistData)>, ServerFnError>
 {
 	let mut db_con = get_db_conn();
 	let artist_counts: Vec<(i64, Artist)> = 
 		if let Some(limit) = limit {
 			song_history::table
 				.filter(song_history::date.between(start_date, end_date))
 				.filter(song_history::user_id.eq(for_user_id))
 				.inner_join(song_artists::table.on(song_history::song_id.eq(song_artists::song_id)))
 				.inner_join(artists::table.on(song_artists::artist_id.eq(artists::id)))
 				.group_by(artists::id)
 				.select((count(artists::id), artists::all_columns))
 				.order(count(artists::id).desc())
 				.limit(limit)
 				.load(&mut db_con)?
 		} else {
 			song_history::table
 				.filter(song_history::date.between(start_date, end_date))
 				.filter(song_history::user_id.eq(for_user_id))
 				.inner_join(song_artists::table.on(song_history::song_id.eq(song_artists::song_id)))
 				.inner_join(artists::table.on(song_artists::artist_id.eq(artists::id)))
 				.group_by(artists::id)
 				.select((count(artists::id), artists::all_columns))
 				.order(count(artists::id).desc())
 				.load(&mut db_con)?
 		};
 	let artist_data: Vec<(i64, ArtistData)> = artist_counts.into_iter().map(|(plays, artist)| {
 		(plays, ArtistData {
 			id: artist.id.unwrap(),
 			name: artist.name,
 			image_path: format!("/assets/images/artists/{}.webp", artist.id.unwrap()),
 		})
 	}).collect();
 	Ok(artist_data)
 }
--- a/src/app.rs
+++ b/src/app.rs
@ -1,19 +1,14 @@
 use crate::playbar::PlayBar;
 use crate::playbar::CustomTitle;
 use crate::playstatus::PlayStatus;
 use crate::queue::Queue;
 use leptos::*;
 use leptos::logging::*;
 use leptos_meta::*;
 use leptos_router::*;
 use crate::pages::login::*;
 use crate::pages::signup::*;
-use crate::pages::profile::*;
+use crate::pages::audiotest::*;
 use crate::error_template::{AppError, ErrorTemplate};
 use crate::auth::get_logged_in_user;
 use crate::models::User;
 pub type LoggedInUserResource = Resource<(), Option<User>>;
 #[component]
 pub fn App() -> impl IntoView {
@ -24,25 +19,13 @@ pub fn App() -> impl IntoView {
    let play_status = create_rw_signal(play_status);
    let upload_open = create_rw_signal(false);
    // A resource that fetches the logged in user
    // This will not automatically refetch, so any login/logout related code
    // should call `refetch` on this resource
    let logged_in_user: LoggedInUserResource = create_resource(|| (), |_| async {
        get_logged_in_user().await
            .inspect_err(|e| {
                error!("Error getting logged in user: {:?}", e);
            })
            .ok()
            .flatten()
    });
    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=|| {
@ -59,11 +42,10 @@ pub fn App() -> impl IntoView {
                        <Route path="" view=Dashboard />
                        <Route path="dashboard" view=Dashboard />
                        <Route path="search" view=Search />
                        <Route path="user/:id" view=move || view!{ <Profile logged_in_user /> } />
                        <Route path="user" view=move || view!{ <Profile logged_in_user /> } />
                    </Route>
-                    <Route path="/login" view=move || view!{ <Login user=logged_in_user /> } />
+                    <Route path="/login" view=Login />
-                    <Route path="/signup" view=move || view!{ <Signup user=logged_in_user /> } />
+                    <Route path="/signup" view=Signup />
                    <Route path="/audiotest" view=AudioTest />
                </Routes>
            </main>
        </Router>
@ -73,7 +55,7 @@ pub fn App() -> impl IntoView {
 use crate::components::sidebar::*;
 use crate::components::dashboard::*;
 use crate::components::search::*;
-use crate::components::personal::Personal;
+use crate::components::personal::*;
 use crate::components::upload::*;
 /// Renders the home page of your application.
--- a/src/artistdata.rs
+++ b/src/artistdata.rs
@ -1,34 +0,0 @@
 use crate::components::dashboard_tile::DashboardTile;
 use serde::{Serialize, Deserialize};
 /// Holds information about an artist
 /// 
 /// Intended to be used in the front-end
 #[derive(Clone, Serialize, Deserialize)]
 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/audioplayer.rs
+++ b/src/audioplayer.rs
--- a/src/auth.rs
+++ b/src/auth.rs
@ -57,7 +57,7 @@ pub async fn signup(new_user: User) -> Result<(), ServerFnError> {
 /// 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<Option<User>, ServerFnError> {
+pub async fn login(credentials: UserCredentials) -> Result<bool, ServerFnError> {
 	use crate::users::validate_user;
 	let mut auth_session = extract::<AuthSession<AuthBackend>>().await
@ -66,14 +66,12 @@ pub async fn login(credentials: UserCredentials) -> Result<Option<User>, ServerF
 	let user = validate_user(credentials).await
 		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error validating user: {}", e)))?;
-	if let Some(mut user) = user {
+	if let Some(user) = user {
 		auth_session.login(&user).await
 			.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error logging in user: {}", e)))?;
-
+		Ok(true)
 		user.password = None;
 		Ok(Some(user))
 	} else {
-		Ok(None)
+		Ok(false)
 	}
 }
@ -147,19 +145,6 @@ pub async fn get_user() -> Result<User, ServerFnError> {
 	auth_session.user.ok_or(ServerFnError::<NoCustomError>::ServerError("User not logged in".to_string()))
 }
 #[server(endpoint = "get_logged_in_user")]
 pub async fn get_logged_in_user() -> Result<Option<User>, ServerFnError> {
 	let auth_session = extract::<AuthSession<AuthBackend>>().await
 		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting auth session: {}", e)))?;
 	let user = auth_session.user.map(|mut user| {
 		user.password = None;
 		user
 	});
 	Ok(user)
 }
 /// Check if a user is an admin
 /// Returns a Result with a boolean indicating if the user is logged in and an admin
 #[server(endpoint = "check_admin")]
--- a/src/components.rs
+++ b/src/components.rs
@ -2,9 +2,4 @@ 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;
 pub mod loading;
 pub mod error;
--- 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/error.rs
+++ b/src/components/error.rs
@ -1,45 +0,0 @@
 use leptos::*;
 use leptos_icons::*;
 use std::fmt::Display;
 #[component]
 pub fn ServerError<E: Display + 'static>(
 	#[prop(optional, into, default="An Error Occurred".into())]
 	title: TextProp,
 	#[prop(optional, into)]
 	message: TextProp,
 	#[prop(optional, into)]
 	error: Option<ServerFnError<E>>,
 ) -> impl IntoView {
 	view!{
 		<div class="error-container">
 			<div class="error-header">
 				<Icon icon=icondata::BiErrorSolid />
 				<h1>{title}</h1>
 			</div>
 			<p>{message}</p>
 			<p>{error.map(|error| format!("{}", error))}</p>
 		</div>
 	}
 }
 #[component]
 pub fn Error<E: Display + 'static>(
 	#[prop(optional, into, default="An Error Occurred".into())]
 	title: TextProp,
 	#[prop(optional, into)]
 	message: TextProp,
 	#[prop(optional, into)]
 	error: Option<E>,
 ) -> impl IntoView {
 	view! {
 		<div class="error-container">
 			<div class="error-header">
 				<Icon icon=icondata::BiErrorSolid />
 				<h1>{title}</h1>
 			</div>
 			<p>{message}</p>
 			<p>{error.map(|error| format!("{}", error))}</p>
 		</div>
 	}
 }
--- a/src/components/loading.rs
+++ b/src/components/loading.rs
@ -1,19 +0,0 @@
 use leptos::*;
 /// A loading indicator
 #[component]
 pub fn Loading() -> impl IntoView {
 	view! {
 		<div class="loading"></div>
 	}
 }
 /// A full page, centered loading indicator
 #[component]
 pub fn LoadingPage() -> impl IntoView {
 	view!{
 		<div class="loading-page">
 			<Loading />
 		</div>
 	}
 }
--- a/src/components/song_list.rs
+++ b/src/components/song_list.rs
@ -1,189 +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;
 						let extra = Option::<()>::None;
 						view! {
 							<SongListItem song={song.clone()} song_playing=playing extra />
 						}
 					}).collect::<Vec<_>>()
 				})
 			}
 		</table>
 	}
 }
 #[component]
 pub fn SongListExtra<T>(songs: MaybeSignal<Vec<(SongData, T)>>) -> impl IntoView where 
 	T: Clone + IntoView + 'static
 {
 	view! {
 		<table class="song-list">
 			{
 				songs.with(|songs| {
 					let mut first_song = true;
 					songs.iter().map(|(song, extra)| {
 						let playing = first_song.into();
 						first_song = false;
 						view! {
 							<SongListItem song={song.clone()} song_playing=playing extra=Some(extra.clone()) />
 						}
 					}).collect::<Vec<_>>()
 				})
 			}
 		</table>
 	}
 }
 #[component]
 pub fn SongListItem<T>(song: SongData, song_playing: MaybeSignal<bool>, extra: Option<T>) -> impl IntoView where
 	T: IntoView + 'static
 {
 	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>
 			{extra.map(|extra| view! {
 				<td class="song-list-spacer"></td>
 				<td>{extra}</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/fileserv.rs
+++ b/src/fileserv.rs
@ -12,7 +12,6 @@ cfg_if! { if #[cfg(feature = "ssr")] {
    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();
@ -28,7 +27,6 @@ cfg_if! { if #[cfg(feature = "ssr")] {
    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() {
@ -39,32 +37,4 @@ cfg_if! { if #[cfg(feature = "ssr")] {
            )),
        }
    }
    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,10 +1,9 @@
 pub mod app;
 pub mod auth;
 pub mod songdata;
 pub mod albumdata;
 pub mod artistdata;
 pub mod playstatus;
 pub mod playbar;
 pub mod audioplayer;
 pub mod database;
 pub mod queue;
 pub mod song;
--- a/src/main.rs
+++ b/src/main.rs
@ -14,11 +14,11 @@ extern crate diesel_migrations;
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::get, Router, extract::Path};
+    use axum::{routing::get, Router};
    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 libretunes::fileserv::{file_and_error_handler, get_static_file};
    use axum_login::tower_sessions::SessionManagerLayer;
    use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
    use axum_login::AuthManagerLayerBuilder;
@ -60,8 +60,6 @@ async fn main() {
    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)
--- a/src/models.rs
+++ b/src/models.rs
@ -1,4 +1,5 @@
-use chrono::{NaiveDate, NaiveDateTime};
+use std::time::SystemTime;
 use time::Date;
 use serde::{Deserialize, Serialize};
 use cfg_if::cfg_if;
@ -38,153 +39,13 @@ pub struct User {
 	#[cfg_attr(feature = "ssr", diesel(deserialize_as = String))]
 	pub password: Option<String>,
 	/// The time the user was created
-	#[cfg_attr(feature = "ssr", diesel(deserialize_as = NaiveDateTime))]
+	#[cfg_attr(feature = "ssr", diesel(deserialize_as = SystemTime))]
-	pub created_at: Option<NaiveDateTime>,
+	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<(NaiveDateTime, 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")]
@ -466,7 +327,7 @@ pub struct Album {
 	/// The album's title
 	pub title: String,
 	/// The album's release date
-	pub release_date: Option<NaiveDate>,
+	pub release_date: Option<Date>,
 	/// The path to the album's image file
 	pub image_path: Option<String>,
 }
@ -545,7 +406,7 @@ pub struct Song {
 	/// The duration of the song in seconds
 	pub duration: i32,
 	/// The song's release date
-	pub release_date: Option<NaiveDate>,
+	pub release_date: Option<Date>,
 	/// The path to the song's audio file
 	pub storage_path: String,
 	/// The path to the song's image file
@ -608,20 +469,3 @@ impl Song {
 		}
 	}
 }
 /// 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: NaiveDateTime,
 	/// The id of the song that was listened to
 	pub song_id: i32,
 }
--- a/src/pages.rs
+++ b/src/pages.rs
@ -1,3 +1,3 @@
 pub mod login;
 pub mod signup;
-pub mod profile;
+pub mod audiotest;
--- a/src/pages/audiotest.rs
+++ b/src/pages/audiotest.rs
@ -0,0 +1,9 @@
 use leptos::leptos_dom::*;
 use leptos::*;
 #[component]
 pub fn AudioTest() -> impl IntoView {
    view! {
        <p>Hello World</p>
    }
 }
--- a/src/pages/login.rs
+++ b/src/pages/login.rs
@ -3,10 +3,9 @@ use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
 use crate::users::UserCredentials;
 use crate::app::LoggedInUserResource;
 #[component]
-pub fn Login(user: LoggedInUserResource) -> impl IntoView {
+pub fn Login() -> impl IntoView {
    let (username_or_email, set_username_or_email) = create_signal("".to_string());
    let (password, set_password) = create_signal("".to_string());
@ -33,22 +32,13 @@ pub fn Login(user: LoggedInUserResource) -> impl IntoView {
            if let Err(err) = login_result {
                // Handle the error here, e.g., log it or display to the user
                log!("Error logging in: {:?}", err);
-
+            } else if let Ok(true) = login_result {
                // Since we're not sure what the state is, manually refetch the user
                user.refetch();
            } else if let Ok(Some(login_user)) = login_result {
                // Manually set the user to the new user, avoiding a refetch
                user.set(Some(login_user));
                // Redirect to the login page
                log!("Logged in Successfully!");
                leptos_router::use_navigate()("/", Default::default());
                log!("Navigated to home page after login");
-            } else if let Ok(None) = login_result {
+            } else if let Ok(false) = login_result {
                log!("Invalid username or password");
                // User could be already logged in or not, so refetch the user
                user.refetch();
            }
        });
    };
--- a/src/pages/profile.rs
+++ b/src/pages/profile.rs
@ -1,316 +0,0 @@
 use leptos::*;
 use leptos_router::use_params_map;
 use leptos_icons::*;
 use server_fn::error::NoCustomError;
 use crate::components::dashboard_row::DashboardRow;
 use crate::components::dashboard_tile::DashboardTile;
 use crate::components::song_list::*;
 use crate::components::loading::*;
 use crate::components::error::*;
 use crate::api::profile::*;
 use crate::app::LoggedInUserResource;
 use crate::models::User;
 use crate::users::get_user_by_id;
 /// Duration in seconds backwards from now to aggregate history data for
 const HISTORY_SECS: i64 = 60 * 60 * 24 * 30;
 const HISTORY_MESSAGE: &str = "Last Month";
 /// How many top songs to show
 const TOP_SONGS_COUNT: i64 = 10;
 /// How many recent songs to show
 const RECENT_SONGS_COUNT: i64 = 5;
 /// How many recent artists to show
 const TOP_ARTISTS_COUNT: i64 = 10;
 /// Profile page
 /// Shows the current user's profile if no id is specified, or a user's profile if an id is specified in the path
 #[component]
 pub fn Profile(logged_in_user: LoggedInUserResource) -> impl IntoView {
 	let params = use_params_map();
 	view! {
 		<div class="profile-container home-component">
 			{move || params.with(|params| {
 				match params.get("id").map(|id| id.parse::<i32>()) {
 					None => {
 						// No id specified, show the current user's profile
 						view! { <OwnProfile logged_in_user /> }.into_view()
 					},
 					Some(Ok(id)) => {
 						// Id specified, get the user and show their profile
 						view! { <UserIdProfile id /> }.into_view()
 					},
 					Some(Err(e)) => {
 						// Invalid id, return an error
 						view! {
 							<Error<String>
 								title="Invalid User ID"
 								error=e.to_string()
 							/>
 						}.into_view()
 					}
 				}
 			})}
 		</div>
 	}
 }
 /// Show the logged in user's profile
 #[component]
 fn OwnProfile(logged_in_user: LoggedInUserResource) -> impl IntoView {
 	view! {
 		<Transition
 			fallback=move || view! { <LoadingPage /> }
 		>
 			{move || logged_in_user.get().map(|user| {
 				match user {
 					Some(user) => {
 						let user_id = user.id.unwrap();
 						view! {
 								<UserProfile user />
 								<TopSongs user_id={user_id} />
 								<RecentSongs user_id={user_id} />
 								<TopArtists user_id={user_id} />
 						}.into_view()
 					},
 					None => view! {
 						<Error<String>
 							title="Not Logged In"
 							message="You must be logged in to view your profile"
 						/>
 					}.into_view(),
 				}
 			})}
 		</Transition>
 	}
 }
 /// Show a user's profile by ID
 #[component]
 fn UserIdProfile(#[prop(into)] id: MaybeSignal<i32>) -> impl IntoView {
 	let user_info = create_resource(move || id.get(), move |id| {
 		get_user_by_id(id)
 	});
 	// Show the details if the user is found
 	let show_details = create_rw_signal(false);
 	view!{ 
 		<Transition
 			fallback=move || view! { <LoadingPage /> }
 		>
 			{move || user_info.get().map(|user| {
 				match user {
 					Ok(Some(user)) => {
 						show_details.set(true);
 						view! { <UserProfile user /> }.into_view()
 					},
 					Ok(None) => {
 						show_details.set(false);
 						view! {
 							<Error<String>
 								title="User Not Found"
 								message=format!("User with ID {} not found", id.get())
 							/>
 						}.into_view()
 					},
 					Err(error) => {
 						show_details.set(false);
 						view! {
 							<ServerError<NoCustomError>
 								title="Error Getting User"
 								error
 							/>
 						}.into_view()
 					}
 				}
 			})}
 		</Transition>
 		<div hidden={move || !show_details.get()}>
 			<TopSongs user_id={id} />
 			<RecentSongs user_id={id} />
 			<TopArtists user_id={id} />
 		</div>
 	}
 }
 /// Show a profile for a User object
 #[component]
 fn UserProfile(user: User) -> impl IntoView {
 	let user_id = user.id.unwrap();
 	let profile_image_path = format!("/assets/images/profile/{}.webp", user_id);
 	view! {
 		<div class="profile-header">
 			<object class="profile-image" data={profile_image_path.clone()} type="image/webp">
 				<Icon class="profile-image" icon=icondata::CgProfile width="75" height="75"/>
 			</object>
 			<h1>{user.username}</h1>
 		</div>
 		<div class="profile-details">
 			<p>
 				{user.email}
 				{
 					user.created_at.map(|created_at| {
 						format!(" • Joined {}", created_at.format("%B %Y"))
 					})
 				}
 				{
 					if user.admin {
 						" • Admin"
 					} else {
 						""
 					}
 				}
 			</p>
 		</div>
 	}
 }
 /// Show a list of top songs for a user
 #[component]
 fn TopSongs(#[prop(into)] user_id: MaybeSignal<i32>) -> impl IntoView {
 	let top_songs = create_resource(move || user_id.get(), |user_id| async move {
 		use chrono::{Local, Duration};
 		let now = Local::now();
 		let start = now - Duration::seconds(HISTORY_SECS);
 		let top_songs = top_songs(user_id, start.naive_utc(), now.naive_utc(), Some(TOP_SONGS_COUNT)).await;
 		top_songs.map(|top_songs| {
 			top_songs.into_iter().map(|(plays, song)| {
 				let plays = if plays == 1 {
 					format!("{} Play", plays)
 				} else {
 					format!("{} Plays", plays)
 				};
 				(song, plays)
 			}).collect::<Vec<_>>()
 		})
 	});
 	view! {
 		<h2>{format!("Top Songs {}", HISTORY_MESSAGE)}</h2>
 		<Transition
 			fallback=move || view! { <Loading /> }
 		>
 			<ErrorBoundary
 				fallback=|errors| view! {
 					{move || errors.get()
 						.into_iter()
 						.map(|(_, e)| view! { <p>{e.to_string()}</p>})
 						.collect_view()
 					}
 				}
 			>
 				{move ||
 					top_songs.get().map(|top_songs| {
 						top_songs.map(|top_songs| {
 							view! {
 								<SongListExtra songs={top_songs.into()} />
 							}
 						})
 					})
 				}
 			</ErrorBoundary>
 		</Transition>
 	}
 }
 /// Show a list of recently played songs for a user
 #[component]
 fn RecentSongs(#[prop(into)] user_id: MaybeSignal<i32>) -> impl IntoView {
 	let recent_songs = create_resource(move || user_id.get(), |user_id| async move {
 		let recent_songs = recent_songs(user_id, Some(RECENT_SONGS_COUNT)).await;
 		recent_songs.map(|recent_songs| {
 			recent_songs.into_iter().map(|(_date, song)| {
 				song
 			}).collect::<Vec<_>>()
 		})
 	});
 	view! {
 		<h2>"Recently Played"</h2>
 		<Transition
 			fallback=move || view! { <Loading /> }
 		>
 			<ErrorBoundary
 				fallback=|errors| view! {
 					{move || errors.get()
 						.into_iter()
 						.map(|(_, e)| view! { <p>{e.to_string()}</p>})
 						.collect_view()
 					}
 				}
 			>
 				{move ||
 					recent_songs.get().map(|recent_songs| {
 						recent_songs.map(|recent_songs| {
 							view! {
 								<SongList songs={recent_songs.into()} />
 							}
 						})
 					})
 				}
 			</ErrorBoundary>	
 		</Transition>
 	}
 }
 /// Show a list of top artists for a user
 #[component]
 fn TopArtists(#[prop(into)] user_id: MaybeSignal<i32>) -> impl IntoView {
 	let top_artists = create_resource(move || user_id.get(), |user_id| async move {
 		use chrono::{Local, Duration};
 		let now = Local::now();
 		let start = now - Duration::seconds(HISTORY_SECS);
 		let top_artists = top_artists(user_id, start.naive_utc(), now.naive_utc(), Some(TOP_ARTISTS_COUNT)).await;
 		top_artists.map(|top_artists| {
 			top_artists.into_iter().map(|(_plays, artist)| {
 				artist
 			}).collect::<Vec<_>>()
 		})
 	});
 	view! {
 		<Transition
 			fallback=move || view! {
 				<h2>{format!("Top Artists {}", HISTORY_MESSAGE)}</h2>
 				<Loading />
 			}
 		>
 			<ErrorBoundary
 				fallback=|errors| view! {
 					<h2>{format!("Top Artists {}", HISTORY_MESSAGE)}</h2>
 					{move || errors.get()
 						.into_iter()
 						.map(|(_, e)| view! { <p>{e.to_string()}</p>})
 						.collect_view()
 					}
 				}
 			>
 				{move ||
 					top_artists.get().map(|top_artists| {
 						top_artists.map(|top_artists| {
 							let tiles = top_artists.into_iter().map(|artist| {
 								Box::new(artist) as Box<dyn DashboardTile>
 							}).collect::<Vec<_>>();
 							DashboardRow::new(format!("Top Artists {}", HISTORY_MESSAGE), tiles)
 						})
 					})
 				}
 			</ErrorBoundary>
 		</Transition>
 	}
 }
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@ -3,10 +3,9 @@ use crate::models::User;
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
 use crate::app::LoggedInUserResource;
 #[component]
-pub fn Signup(user: LoggedInUserResource) -> impl IntoView {
+pub fn Signup() -> impl IntoView {
    let (username, set_username) = create_signal("".to_string());
    let (email, set_email) = create_signal("".to_string());
    let (password, set_password) = create_signal("".to_string());
@ -20,7 +19,7 @@ pub fn Signup(user: LoggedInUserResource) -> impl IntoView {
    let on_submit = move |ev: leptos::ev::SubmitEvent| {
        ev.prevent_default();
-        let mut new_user = User {
+        let new_user = User {
            id: None,
            username: username.get(),
            email: email.get(),
@ -31,17 +30,10 @@ pub fn Signup(user: LoggedInUserResource) -> impl IntoView {
        log!("new user: {:?}", new_user);
        spawn_local(async move {
-            if let Err(err) = signup(new_user.clone()).await {
+            if let Err(err) = signup(new_user).await {
                // Handle the error here, e.g., log it or display to the user
                log!("Error signing up: {:?}", err);
                // Since we're not sure what the state is, manually refetch the user
                user.refetch();
            } else {
                // Manually set the user to the new user, avoiding a refetch
                new_user.password = None;
                user.set(Some(new_user));
                // Redirect to the login page
                log!("Signed up successfully!");
                leptos_router::use_navigate()("/", Default::default());
--- a/src/playbar.rs
+++ b/src/playbar.rs
@ -5,10 +5,8 @@ use crate::api::songs;
 use leptos::ev::MouseEvent;
 use leptos::html::{Audio, Div};
 use leptos::leptos_dom::*;
 use leptos_meta::Title;
 use leptos::*;
 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 +22,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
@ -461,21 +456,6 @@ fn QueueToggle(status: RwSignal<PlayStatus>) -> impl IntoView {
    }
 }
 /// 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 {
@ -552,39 +532,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 +540,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 +557,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 |_| {
--- a/src/schema.rs
+++ b/src/schema.rs
@ -23,22 +23,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,
@ -53,15 +37,6 @@ diesel::table! {
    }
 }
 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,
@ -99,8 +74,6 @@ 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));
@ -109,11 +82,8 @@ 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/songdata.rs
+++ b/src/songdata.rs
@ -1,13 +1,10 @@
 use crate::models::{Album, Artist, Song};
 use crate::components::dashboard_tile::DashboardTile;
-use serde::{Serialize, Deserialize};
+use time::Date;
 use chrono::NaiveDate;
 /// 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(Serialize, Deserialize, Clone)]
 pub struct SongData {
 	/// Song id
 	pub id: i32,
@ -22,7 +19,7 @@ pub struct SongData {
 	/// The duration of the song in seconds
 	pub duration: i32,
 	/// The song's release date
-	pub release_date: Option<NaiveDate>,
+	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,
@ -50,6 +47,7 @@ impl TryInto<Song> for SongData {
 			track: self.track,
 			duration: self.duration,
 			release_date: self.release_date,
 			// TODO https://gitlab.mregirouard.com/libretunes/libretunes/-/issues/35
 			storage_path: self.song_path,
 			// Note that if the source of the image_path was the album, the image_path
@ -62,21 +60,3 @@ impl TryInto<Song> for SongData {
 		})
 	}
 }
 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
@ -10,7 +10,7 @@ cfg_if! {
 		use diesel::prelude::*;
 		use log::*;
 		use server_fn::error::NoCustomError;
-		use chrono::NaiveDate;
+		use time::Date;
 	}
 }
@ -124,14 +124,15 @@ async fn validate_track_number(track_number: Field<'static>) -> Result<Option<i3
 /// 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<NaiveDate>, ServerFnError> {
+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 release_date = NaiveDate::parse_from_str(&release_date.trim(), "%Y-%m-%d");
+			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)),
@ -180,7 +181,8 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> {
 					ServerError("Title field required and must precede file field".to_string()))?;
 				let clean_title = title.replace(" ", "_").replace("/", "_");
-				let date_str = chrono::Utc::now().format("%Y-%m-%d_%H:%M:%S").to_string();
+				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));
--- a/src/users.rs
+++ b/src/users.rs
@ -128,15 +128,3 @@ pub async fn get_user(username_or_email: String) -> Result<Option<User>, ServerF
 	Ok(user)
 }
 #[server(endpoint = "get_user_by_id")]
 pub async fn get_user_by_id(user_id: i32) -> Result<Option<User>, ServerFnError> {
 	let mut user = find_user_by_id(user_id).await?;
 	// Remove the password hash before returning the user
 	if let Some(user) = user.as_mut() {
 		user.password = None;
 	}
 	Ok(user)
 }
--- a/style/dashboard.scss
+++ b/style/dashboard.scss
@ -1,6 +1,7 @@
@import "theme.scss";
 .dashboard-container {
  width: calc(100% - 22rem - 16rem);
  .dashboard-header {
    font-size: 1.2rem;
    font-weight: 300;
--- 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/error.scss
+++ b/style/error.scss
@ -1,18 +0,0 @@
 .error-container {
 	.error-header {
 		display: inline-grid;
 		svg {
 			width: 30px;
 			height: 30px;
 			grid-row-start: 1;
 			align-self: center;
 			padding-right: 10px;
 		}
 		h1 {
 			grid-row-start: 1;
 			align-self: center;
 		}
 	}
 }
--- a/style/home.scss
+++ b/style/home.scss
@ -9,9 +9,8 @@
 }
 .home-component {
  background: #1c1c1c;
-  width: calc(100% - 22rem - 16rem);
+  height: 100vh;
  margin: 2px;
-  padding: 0.2rem 1.5rem $playbar-size 1rem;
+  padding: 0.2rem 1.5rem 1.5rem 1rem;
  border-radius: 0.5rem;
  overflow: scroll;
 }
--- a/style/loading.scss
+++ b/style/loading.scss
@ -1,59 +0,0 @@
@import "theme.scss";
 .loading-page {
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	height: 100%;
 }
 .loading {
 	position: relative;
 	width: 10px;
 	height: 10px;
 	border-radius: 5px;
 	margin: 10px;
 	background-color: $accent-color;
 	color: $accent-color;
 	animation: dot-flashing 1s infinite linear alternate;
 	animation-delay: 0.5s;
 }
 .loading::before, .loading::after {
 	content: "";
 	display: inline-block;
 	position: absolute;
 	top: 0;
 }
 .loading::before {
 	left: -15px;
 	width: 10px;
 	height: 10px;
 	border-radius: 5px;
 	background-color: $accent-color;
 	color: $accent-color;
 	animation: dot-flashing 1s infinite alternate;
 	animation-delay: 0s;
 }
 .loading::after {
 	left: 15px;
 	width: 10px;
 	height: 10px;
 	border-radius: 5px;
 	background-color: $accent-color;
 	color: $accent-color;
 	animation: dot-flashing 1s infinite alternate;
 	animation-delay: 1s;
 }
@keyframes dot-flashing {
 	0% {
 		background-color: $accent-color;
 	}
 	50%, 100% {
 		background-color: $controls-hover-color;
 	}
 }
--- a/style/main.scss
+++ b/style/main.scss
@ -8,13 +8,7 @@
@import 'home.scss';
@import 'search.scss';
@import 'personal.scss';
@import 'dashboard_tile.scss';
@import 'dashboard_row.scss';
@import 'upload.scss';
@import 'error.scss';
@import 'song_list.scss';
@import 'profile.scss';
@import 'loading.scss';
 body {
  font-family: sans-serif;
--- a/style/personal.scss
+++ b/style/personal.scss
@ -3,6 +3,7 @@
 .personal-container {
  width: 16rem;
  background: #1c1c1c;
  height: 100vh;
  margin: 2px;
  border-radius: 0.5rem;
--- a/style/playbar.scss
+++ b/style/playbar.scss
@ -2,7 +2,7 @@
 .playbar {
 	width: 100%;
-	height: $playbar-size;
+	height: 75px;
 	background-color: $play-bar-background-color;
 	opacity: 0.9;
 	position: fixed;
--- a/style/profile.scss
+++ b/style/profile.scss
@ -1,36 +0,0 @@
@import 'theme.scss';
 .profile-container {
 	.profile-header {
 		display: flex;
 		.profile-image {
 			width: 75px;
 			height: 75px;
 			border-radius: 50%;
 			padding: 10px;
 			padding-bottom: 5px;
 			margin-top: auto;
 			margin-bottom: auto;
 			svg {
 				padding: 0;
 				margin: 0;
 			}
 		}
 		h1 {
 			font-size: 40px;
 			align-self: center;
 			padding: 10px;
 			padding-bottom: 5px;
 		}
 	}
 	.profile-details {
 		p {
 			font-size: 1rem;
 			margin: 0.5rem;
 		}
 	}
 }
--- a/style/search.scss
+++ b/style/search.scss
@ -1,4 +1,6 @@
@import "theme.scss";
 .search-container {
  width: calc(100% - 22rem - 16rem);
 }
--- 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
@ -14,6 +14,3 @@ $queue-background-color: $play-bar-background-color;
 $auth-inputs: #796dd4;
 $auth-containers: white;
 $dashboard-tile-size: 200px;
 $playbar-size: 75px;
		`@ -1,2 +0,0 @@`
			`DROP INDEX song_history_user_id_idx;`
			`DROP TABLE song_history;`