Merge pull request 'Fix Docker compose missing libretunes-images volume' (#120 ) from 119-fix-docker-compose-missing-libretunesimages-volume into main

Reviewed-on: LibreTunes/LibreTunes#120
Add libretunes-images to volumes
2024-10-25 19:40:10 +00:00 · 2024-10-25 18:28:45 +00:00 · 2024-10-16 17:48:12 +00:00 · 2024-10-15 23:22:15 -04:00 · 2024-10-15 19:31:05 +00:00 · 2024-10-11 17:16:51 -04:00
35 changed files with 1494 additions and 125 deletions
--- a/.env.example
+++ b/.env.example
@ -15,3 +15,6 @@ 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,22 +3,10 @@ on: push

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: libretunes-cicd
    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"
@ -58,58 +46,26 @@ jobs:
          cache-to: type=inline

  test:
-    runs-on: ubuntu-latest
+    runs-on: libretunes-cicd
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
      - name: Test project
        run: cargo test --all-targets --all-features

  leptos-test:
-    runs-on: ubuntu-latest
+    runs-on: libretunes-cicd
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        id: setup-toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly
-          targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - name: Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-            prefix-key: ${{ steps.setup-toolchain.outputs.cachekey }}
-      - name: Install cargo-leptos
-        run: cargo install cargo-leptos
      - name: Run Leptos tests
        run: cargo-leptos test

  docs:
-    runs-on: ubuntu-latest
+    runs-on: libretunes-cicd
    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/Cargo.lock
+++ b/Cargo.lock
@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "addr2line"
@ -17,6 +17,12 @@ 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"
@ -145,7 +151,7 @@ dependencies = [
 "axum-core",
 "bytes",
 "futures-util",
- "http",
+ "http 1.1.0",
 "http-body",
 "http-body-util",
 "hyper",
@ -161,7 +167,7 @@ dependencies = [
 "serde",
 "sync_wrapper 1.0.0",
 "tokio",
- "tower",
+ "tower 0.4.13",
 "tower-layer",
 "tower-service",
 ]
@ -175,7 +181,7 @@ dependencies = [
 "async-trait",
 "bytes",
 "futures-util",
- "http",
+ "http 1.1.0",
 "http-body",
 "http-body-util",
 "mime",
@ -216,7 +222,7 @@ dependencies = [
 "cc",
 "cfg-if",
 "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.2",
 "object",
 "rustc-demangle",
 ]
@ -233,6 +239,29 @@ 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"
@ -308,7 +337,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f"
 dependencies = [
- "darling",
+ "darling 0.14.4",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
@ -332,6 +361,15 @@ 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"
@ -377,6 +415,26 @@ 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"
@ -462,6 +520,12 @@ 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"
@ -477,6 +541,15 @@ 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"
@ -499,8 +572,18 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
+]
+
+[[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]]
@ -513,21 +596,46 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim",
+ "strsim 0.10.0",
 "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",
+ "darling_core 0.14.4",
 "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"
@ -541,6 +649,18 @@ 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"
@ -620,6 +740,17 @@ 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"
@ -653,6 +784,35 @@ 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"
@ -857,13 +1017,14 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "gloo-net"
 version = "0.5.0"
-source = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173"
 dependencies = [
 "futures-channel",
 "futures-core",
 "futures-sink",
 "gloo-utils",
- "http",
+ "http 0.2.12",
 "js-sys",
 "pin-project",
 "serde",
@ -874,10 +1035,23 @@ 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 = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
 dependencies = [
 "js-sys",
 "serde",
@ -927,6 +1101,15 @@ 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"
@ -936,6 +1119,17 @@ 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"
@ -954,7 +1148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
 "bytes",
- "http",
+ "http 1.1.0",
 ]

 [[package]]
@ -965,7 +1159,7 @@ checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
 "bytes",
 "futures-core",
- "http",
+ "http 1.1.0",
 "http-body",
 "pin-project-lite",
 ]
@ -997,7 +1191,7 @@ dependencies = [
 "bytes",
 "futures-channel",
 "futures-util",
- "http",
+ "http 1.1.0",
 "http-body",
 "httparse",
 "httpdate",
@ -1015,7 +1209,7 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
 "bytes",
 "futures-util",
- "http",
+ "http 1.1.0",
 "http-body",
 "hyper",
 "pin-project-lite",
@ -1046,6 +1240,16 @@ 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"
@ -1257,6 +1461,19 @@ 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"
@ -1305,9 +1522,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
 "wasm-bindgen",
 ]
@ -1318,6 +1535,12 @@ 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"
@ -1338,6 +1561,29 @@ 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"
@ -1570,6 +1816,16 @@ 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"
@ -1583,10 +1839,12 @@ dependencies = [
 "diesel_migrations",
 "dotenv",
 "flexi_logger",
- "http",
+ "http 1.1.0",
 "icondata",
+ "image-convert",
 "lazy_static",
 "leptos",
+ "leptos-use",
 "leptos_axum",
 "leptos_icons",
 "leptos_meta",
@ -1601,7 +1859,7 @@ dependencies = [
 "thiserror",
 "time",
 "tokio",
- "tower",
+ "tower 0.5.1",
 "tower-http",
 "tower-sessions-redis-store",
 "wasm-bindgen",
@ -1618,6 +1876,12 @@ 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"
@ -1644,6 +1908,17 @@ 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"
@ -1731,6 +2006,16 @@ 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"
@ -1751,7 +2036,7 @@ dependencies = [
 "bytes",
 "encoding_rs",
 "futures-util",
- "http",
+ "http 1.1.0",
 "httparse",
 "log",
 "memchr",
@ -1956,6 +2241,19 @@ 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"
@ -2231,6 +2529,19 @@ 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"
@ -2372,7 +2683,7 @@ dependencies = [
 "dashmap",
 "futures",
 "gloo-net",
- "http",
+ "http 1.1.0",
 "http-body-util",
 "hyper",
 "inventory",
@ -2385,7 +2696,7 @@ dependencies = [
 "serde_qs",
 "server_fn_macro_default",
 "thiserror",
- "tower",
+ "tower 0.4.13",
 "tower-layer",
 "url",
 "wasm-bindgen",
@ -2430,6 +2741,18 @@ 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"
@ -2471,12 +2794,28 @@ 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"
@ -2580,18 +2919,18 @@ checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"

 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2629,6 +2968,15 @@ 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"
@ -2774,6 +3122,20 @@ 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"
@ -2784,7 +3146,7 @@ dependencies = [
 "axum-core",
 "cookie",
 "futures-util",
- "http",
+ "http 1.1.0",
 "parking_lot",
 "pin-project-lite",
 "tower-layer",
@ -2793,14 +3155,14 @@ dependencies = [

 [[package]]
 name = "tower-http"
-version = "0.5.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
+checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
 dependencies = [
 "bitflags 2.5.0",
 "bytes",
 "futures-util",
- "http",
+ "http 1.1.0",
 "http-body",
 "http-body-util",
 "http-range-header",
@ -2818,15 +3180,15 @@ dependencies = [

 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"

 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"

 [[package]]
 name = "tower-sessions"
@ -2835,7 +3197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b27326208b21807803c5f5aa1020d30ca0432b78cfe251b51a67a05e0baea102"
 dependencies = [
 "async-trait",
- "http",
+ "http 1.1.0",
 "time",
 "tokio",
 "tower-cookies",
@ -2856,7 +3218,7 @@ dependencies = [
 "axum-core",
 "base64",
 "futures",
- "http",
+ "http 1.1.0",
 "parking_lot",
 "rand",
 "serde",
@ -2951,6 +3313,24 @@ 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"
@ -3141,14 +3521,26 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 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
@ -28,8 +28,8 @@ 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.4.13", optional = true }
-tower-http = { version = "0.5", optional = true, features = ["fs"] }
+tower = { version = "0.5.1", optional = true, features = ["util"] }
+tower-http = { version = "0.6.1", optional = true, features = ["fs"] }
 thiserror = "1.0.57"
 tower-sessions-redis-store = { version = "0.11", optional = true }
 async-trait = { version = "0.1.79", optional = true }
@ -40,9 +40,8 @@ multer = { version = "3.0.0", optional = true }
 log = { version = "0.4.21", optional = true }
 flexi_logger = { version = "0.28.0", optional = true, default-features = false }
 web-sys = "0.3.69"
-
-[patch.crates-io]
-gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" }
+leptos-use = "0.13.5"
+image-convert = { version = "0.18.0", optional = true, default-features = false }

 [features]
 hydrate = [
@ -74,6 +73,8 @@ 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,8 +1,10 @@
-FROM clux/muslrust:nightly AS builder
+FROM rust:slim 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; \
@ -10,19 +12,26 @@ RUN set -eux; \
    apt-get install -y --no-install-recommends \
 		pkg-config \
 		clang \
-		npm; \
+		build-essential \
+		libssl-dev \
+		libpq-dev \
+		wget; \
 	rm -rf /var/lib/apt/lists/*

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

 # 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 && \
@ -33,15 +42,12 @@ 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
@ -49,6 +55,11 @@ 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

@ -57,9 +68,15 @@ 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/x86_64-unknown-linux-musl/release/libretunes /libretunes
+COPY --from=builder /app/target/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,8 +13,11 @@ 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:/site/audio
+      - libretunes-audio:/assets/audio
+      - libretunes-images:/assets/images
    depends_on:
      - redis
      - postgres
@ -50,5 +53,6 @@ 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
@ -0,0 +1,2 @@
+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
@ -0,0 +1,8 @@
+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
@ -0,0 +1,7 @@
+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
@ -0,0 +1,19 @@
+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
@ -0,0 +1,39 @@
+use crate::models::Artist;
+use crate::components::dashboard_tile::DashboardTile;
+
+use time::Date;
+
+/// Holds information about an album
+/// 
+/// Intended to be used in the front-end
+pub struct AlbumData {
+	/// Album id
+	pub id: i32,
+	/// Album title
+	pub title: String,
+	/// Album artists
+	pub artists: Vec<Artist>,
+	/// Album release date
+	pub release_date: Option<Date>,
+	/// Path to album image, relative to the root of the web server.
+	/// For example, `"/assets/images/Album.jpg"`
+	pub image_path: String,
+}
+
+impl DashboardTile for AlbumData {
+	fn image_path(&self) -> String {
+		self.image_path.clone()
+	}
+
+	fn title(&self) -> String {
+		self.title.clone()
+	}
+
+	fn link(&self) -> String {
+		format!("/album/{}", self.id)
+	}
+
+	fn description(&self) -> Option<String> {
+		Some(format!("Album • {}", Artist::display_list(&self.artists)))
+	}
+}
--- a/src/api/history.rs
+++ b/src/api/history.rs
@ -0,0 +1,44 @@
+use std::time::SystemTime;
+use leptos::*;
+use crate::models::HistoryEntry;
+use crate::models::Song;
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+	if #[cfg(feature = "ssr")] {
+		use leptos::server_fn::error::NoCustomError;
+		use crate::database::get_db_conn;
+		use crate::auth::get_user;
+	}
+}
+
+/// Get the history of the current user.
+#[server(endpoint = "history/get")]
+pub async fn get_history(limit: Option<i64>) -> Result<Vec<HistoryEntry>, ServerFnError> {
+	let user = get_user().await?;
+	let db_con = &mut get_db_conn();
+	let history = user.get_history(limit, db_con)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting history: {}", e)))?;
+	Ok(history)
+}
+
+/// Get the listen dates and songs of the current user.
+#[server(endpoint = "history/get_songs")]
+pub async fn get_history_songs(limit: Option<i64>) -> Result<Vec<(SystemTime, Song)>, ServerFnError> {
+	let user = get_user().await?;
+	let db_con = &mut get_db_conn();
+	let songs = user.get_history_songs(limit, db_con)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting history songs: {}", e)))?;
+	Ok(songs)
+}
+
+/// Add a song to the history of the current user.
+#[server(endpoint = "history/add")]
+pub async fn add_history(song_id: i32) -> Result<(), ServerFnError> {
+	let user = get_user().await?;
+	let db_con = &mut get_db_conn();
+	user.add_history(song_id, db_con)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error adding history: {}", e)))?;
+	Ok(())
+}
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@ -1 +1,3 @@
+pub mod history;
+pub mod profile;
 pub mod songs;
--- a/src/api/profile.rs
+++ b/src/api/profile.rs
@ -0,0 +1,49 @@
+use leptos::*;
+use server_fn::codec::{MultipartData, MultipartFormData};
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+	if #[cfg(feature = "ssr")] {
+		use crate::auth::get_user;
+		use server_fn::error::NoCustomError;
+	}
+}
+
+/// Handle a user uploading a profile picture. Converts the image to webp and saves it to the server.
+#[server(input = MultipartFormData, endpoint = "/profile/upload_picture")]
+pub async fn upload_picture(data: MultipartData) -> Result<(), ServerFnError> {
+	// Safe to unwrap - "On the server side, this always returns Some(_). On the client side, always returns None."
+	let mut data = data.into_inner().unwrap();
+
+	let field = data.next_field().await
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting field: {}", e)))?
+		.ok_or_else(|| ServerFnError::<NoCustomError>::ServerError("No field found".to_string()))?;
+
+	if field.name() != Some("picture") {
+		return Err(ServerFnError::ServerError("Field name is not 'picture'".to_string()));
+	}
+
+	// Get user id from session
+	let user = get_user().await
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting user: {}", e)))?;
+
+	let user_id = user.id.ok_or_else(|| ServerFnError::<NoCustomError>::ServerError("User has no id".to_string()))?;
+
+	// Read the image, and convert it to webp
+	use image_convert::{to_webp, WEBPConfig, ImageResource};
+
+	let bytes = field.bytes().await
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error getting field bytes: {}", e)))?;
+
+	let reader = std::io::Cursor::new(bytes);
+	let image_source = ImageResource::from_reader(reader)
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error creating image resource: {}", e)))?;
+
+	let profile_picture_path = format!("assets/images/profile/{}.webp", user_id);
+	let mut image_target = ImageResource::from_path(&profile_picture_path);
+	to_webp(&mut image_target, &image_source, &WEBPConfig::new())
+		.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error converting image to webp: {}", e)))?;
+
+	Ok(())
+}
--- a/src/app.rs
+++ b/src/app.rs
@ -1,4 +1,5 @@
 use crate::playbar::PlayBar;
+use crate::playbar::CustomTitle;
 use crate::playstatus::PlayStatus;
 use crate::queue::Queue;
 use leptos::*;
@ -6,7 +7,6 @@ use leptos_meta::*;
 use leptos_router::*;
 use crate::pages::login::*;
 use crate::pages::signup::*;
-use crate::pages::audiotest::*;
 use crate::error_template::{AppError, ErrorTemplate};


@ -25,7 +25,7 @@ pub fn App() -> impl IntoView {
        <Stylesheet id="leptos" href="/pkg/libretunes.css"/>

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

        // content for this welcome page
        <Router fallback=|| {
@ -45,7 +45,6 @@ pub fn App() -> impl IntoView {
                    </Route>
                    <Route path="/login" view=Login />
                    <Route path="/signup" view=Signup />
-                    <Route path="/audiotest" view=AudioTest />
                </Routes>
            </main>
        </Router>
--- a/src/artistdata.rs
+++ b/src/artistdata.rs
@ -0,0 +1,32 @@
+use crate::components::dashboard_tile::DashboardTile;
+
+/// Holds information about an artist
+/// 
+/// Intended to be used in the front-end
+pub struct ArtistData {
+	/// Artist id
+	pub id: i32,
+	/// Artist name
+	pub name: String,
+	/// Path to artist image, relative to the root of the web server.
+	/// For example, `"/assets/images/Artist.jpg"`
+	pub image_path: String,
+}
+
+impl DashboardTile for ArtistData {
+	fn image_path(&self) -> String {
+		self.image_path.clone()
+	}
+
+	fn title(&self) -> String {
+		self.name.clone()
+	}
+
+	fn link(&self) -> String {
+		format!("/artist/{}", self.id)
+	}
+
+	fn description(&self) -> Option<String> {
+		Some("Artist".to_string())
+	}
+}
--- a/src/audioplayer.rs
+++ b/src/audioplayer.rs
--- a/src/components.rs
+++ b/src/components.rs
@ -2,4 +2,7 @@ pub mod sidebar;
 pub mod dashboard;
 pub mod search;
 pub mod personal;
+pub mod dashboard_tile;
+pub mod dashboard_row;
 pub mod upload;
+pub mod song_list;
--- a/src/components/dashboard_row.rs
+++ b/src/components/dashboard_row.rs
@ -0,0 +1,118 @@
+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
@ -0,0 +1,27 @@
+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/song_list.rs
+++ b/src/components/song_list.rs
@ -0,0 +1,157 @@
+use leptos::*;
+use leptos_icons::*;
+
+use crate::songdata::SongData;
+use crate::models::{Album, Artist};
+
+const LIKE_DISLIKE_BTN_SIZE: &str = "2em";
+
+#[component]
+pub fn SongList(songs: MaybeSignal<Vec<SongData>>) -> impl IntoView {
+	view! {
+		<table class="song-list">
+			{
+				songs.with(|songs| {
+					let mut first_song = true;
+
+					songs.iter().map(|song| {
+						let playing = first_song.into();
+						first_song = false;
+
+						view! {
+							<SongListItem song={song.clone()} song_playing=playing />
+						}
+					}).collect::<Vec<_>>()
+				})
+			}
+		</table>
+	}
+}
+
+#[component]
+pub fn SongListItem(song: SongData, song_playing: MaybeSignal<bool>) -> impl IntoView {
+	let liked = create_rw_signal(song.like_dislike.map(|(liked, _)| liked).unwrap_or(false));
+	let disliked = create_rw_signal(song.like_dislike.map(|(_, disliked)| disliked).unwrap_or(false));
+	
+	view! {
+		<tr class="song-list-item">
+			<td class="song-image"><SongImage image_path=song.image_path song_playing /></td>
+			<td class="song-title"><p>{song.title}</p></td>
+			<td class="song-list-spacer"></td>
+			<td class="song-artists"><SongArtists artists=song.artists /></td>
+			<td class="song-list-spacer"></td>
+			<td class="song-album"><SongAlbum album=song.album /></td>
+			<td class="song-list-spacer-big"></td>
+			<td class="song-like-dislike"><SongLikeDislike liked disliked/></td>
+			<td>{format!("{}:{:02}", song.duration / 60, song.duration % 60)}</td>
+		</tr>
+	}
+}
+
+/// Display the song's image, with an overlay if the song is playing
+/// When the song list item is hovered, the overlay will show the play button
+#[component]
+fn SongImage(image_path: String, song_playing: MaybeSignal<bool>) -> impl IntoView {
+	view! {
+		<img class="song-image" src={image_path}/>
+		{if song_playing.get() {
+			view! { <Icon class="song-image-overlay song-playing-overlay" icon=icondata::BsPauseFill /> }.into_view()
+		} else {
+			view! { <Icon class="song-image-overlay hide-until-hover" icon=icondata::BsPlayFill /> }.into_view()
+		}}
+	}
+}
+
+/// Displays a song's artists, with links to their artist pages
+#[component]
+fn SongArtists(artists: Vec<Artist>) -> impl IntoView {
+	let num_artists = artists.len() as isize;
+
+	artists.iter().enumerate().map(|(i, artist)| {
+		let i = i as isize;
+		
+		view! {
+			{
+				if let Some(id) = artist.id {
+					view! { <a href={format!("/artist/{}", id)}>{artist.name.clone()}</a> }.into_view()
+				} else {
+					view! { <span>{artist.name.clone()}</span> }.into_view()
+				}
+			}
+			{if i < num_artists - 2 { ", " } else if i == num_artists - 2 { " & " } else { "" }}
+		}
+	}).collect::<Vec<_>>()
+}
+
+/// Display a song's album, with a link to the album page
+#[component]
+fn SongAlbum(album: Option<Album>) -> impl IntoView {
+	album.as_ref().map(|album| {
+		view! {
+			<span>
+				{
+					if let Some(id) = album.id {
+						view! { <a href={format!("/album/{}", id)}>{album.title.clone()}</a> }.into_view()
+					} else {
+						view! { <span>{album.title.clone()}</span> }.into_view()
+					}
+				}
+			</span>
+		}
+	})
+}
+
+/// Display like and dislike buttons for a song, and indicate if the song is liked or disliked
+#[component]
+fn SongLikeDislike(liked: RwSignal<bool>, disliked: RwSignal<bool>) -> impl IntoView {
+	let like_icon = Signal::derive(move || {
+		if liked.get() {
+			icondata::TbThumbUpFilled
+		} else {
+			icondata::TbThumbUp
+		}
+	});
+
+	let dislike_icon = Signal::derive(move || {
+		if disliked.get() {
+			icondata::TbThumbDownFilled
+		} else {
+			icondata::TbThumbDown
+		}
+	});
+
+	let like_class = MaybeProp::derive(move || {
+		if liked.get() {
+			Some(TextProp::from("controlbtn"))
+		} else {
+			Some(TextProp::from("controlbtn hide-until-hover"))
+		}
+	});
+
+	let dislike_class = MaybeProp::derive(move || {
+		if disliked.get() {
+			Some(TextProp::from("controlbtn hmirror"))
+		} else {
+			Some(TextProp::from("controlbtn hmirror hide-until-hover"))
+		}
+	});
+
+	let toggle_like = move |_| {
+		liked.set(!liked.get_untracked());
+		disliked.set(disliked.get_untracked() && !liked.get_untracked());
+	};
+
+	let toggle_dislike = move |_| {
+		disliked.set(!disliked.get_untracked());
+		liked.set(liked.get_untracked() && !disliked.get_untracked());
+	};
+
+	view! {
+		<button on:click=toggle_dislike>
+			<Icon class=dislike_class width=LIKE_DISLIKE_BTN_SIZE height=LIKE_DISLIKE_BTN_SIZE icon=dislike_icon />
+		</button>
+		<button on:click=toggle_like>
+			<Icon class=like_class width=LIKE_DISLIKE_BTN_SIZE height=LIKE_DISLIKE_BTN_SIZE icon=like_icon />
+		</button>
+	}
+}
--- a/src/fileserv.rs
+++ b/src/fileserv.rs
@ -12,6 +12,7 @@ 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();
@ -27,6 +28,7 @@ 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() {
@ -37,4 +39,32 @@ 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,9 +1,10 @@
 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};
+    use axum::{routing::get, Router, extract::Path};
    use leptos::*;
    use leptos_axum::{generate_route_list, LeptosRoutes};
    use libretunes::app::*;
-    use libretunes::fileserv::{file_and_error_handler, get_static_file};
+    use libretunes::fileserv::{file_and_error_handler, get_asset_file, get_static_file, AssetType};
    use axum_login::tower_sessions::SessionManagerLayer;
    use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
    use axum_login::AuthManagerLayerBuilder;
@ -60,6 +60,8 @@ 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
@ -46,6 +46,146 @@ pub struct User {
 }

 impl User {
+	/// Get the history of songs listened to by this user from the database
+	/// 
+	/// The returned history will be ordered by date in descending order,
+	/// and a limit of N will select the N most recent entries.
+	/// The `id` field of this user must be present (Some) to get history
+	/// 
+	/// # Arguments
+	/// 
+	/// * `limit` - An optional limit on the number of history entries to return
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<Vec<HistoryEntry>, Box<dyn Error>>` -
+	/// 	A result indicating success with a vector of history entries, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	pub fn get_history(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
+		Result<Vec<HistoryEntry>, Box<dyn Error>> {
+		use crate::schema::song_history::dsl::*;
+
+		let my_id = self.id.ok_or("Artist id must be present (Some) to get history")?;
+
+		let my_history = 
+		if let Some(limit) = limit {
+			song_history
+				.filter(user_id.eq(my_id))
+				.order(date.desc())
+				.limit(limit)
+				.load(conn)?
+		} else {
+			song_history
+				.filter(user_id.eq(my_id))
+				.load(conn)?
+		};
+
+		Ok(my_history)
+	}
+
+	/// Get the history of songs listened to by this user from the database
+	/// 
+	/// The returned history will be ordered by date in descending order,
+	/// and a limit of N will select the N most recent entries.
+	/// The `id` field of this user must be present (Some) to get history
+	/// 
+	/// # Arguments
+	/// 
+	/// * `limit` - An optional limit on the number of history entries to return
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<Vec<(SystemTime, Song)>, Box<dyn Error>>` -
+	/// 	A result indicating success with a vector of listen dates and songs, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	pub fn get_history_songs(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
+		Result<Vec<(SystemTime, Song)>, Box<dyn Error>> {
+		use crate::schema::songs::dsl::*;
+		use crate::schema::song_history::dsl::*;
+
+		let my_id = self.id.ok_or("Artist id must be present (Some) to get history")?;
+
+		let my_history =
+		if let Some(limit) = limit {
+			song_history
+				.inner_join(songs)
+				.filter(user_id.eq(my_id))
+				.order(date.desc())
+				.limit(limit)
+				.select((date, songs::all_columns()))
+				.load(conn)?
+		} else {
+			song_history
+				.inner_join(songs)
+				.filter(user_id.eq(my_id))
+				.order(date.desc())
+				.select((date, songs::all_columns()))
+				.load(conn)?
+		};
+
+		Ok(my_history)
+	}
+
+	/// Add a song to this user's history in the database
+	/// 
+	/// The date of the history entry will be the current time
+	/// The `id` field of this user must be present (Some) to add history
+	/// 
+	/// # Arguments
+	/// 
+	/// * `song_id` - The id of the song to add to this user's history
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<(), Box<dyn Error>>` - A result indicating success with an empty value, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	pub fn add_history(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<(), Box<dyn Error>> {
+		use crate::schema::song_history;
+
+		let my_id = self.id.ok_or("Artist id must be present (Some) to add history")?;
+
+		diesel::insert_into(song_history::table)
+			.values((song_history::user_id.eq(my_id), song_history::song_id.eq(song_id)))
+			.execute(conn)?;
+
+		Ok(())
+	}
+
+	/// Check if this user has listened to a song
+	/// 
+	/// The `id` field of this user must be present (Some) to check history
+	/// 
+	/// # Arguments
+	/// 
+	/// * `song_id` - The id of the song to check if this user has listened to
+	/// * `conn` - A mutable reference to a database connection
+	/// 
+	/// # Returns
+	/// 
+	/// * `Result<bool, Box<dyn Error>>` - A result indicating success with a boolean value, or an error
+	/// 
+	#[cfg(feature = "ssr")]
+	pub fn has_listened_to(self: &Self, song_id: i32, conn: &mut PgPooledConn) -> Result<bool, Box<dyn Error>> {
+		use crate::schema::song_history::{self, user_id};
+
+		let my_id = self.id.ok_or("Artist id must be present (Some) to check history")?;
+
+		let has_listened = song_history::table
+			.filter(user_id.eq(my_id))
+			.filter(song_history::song_id.eq(song_id))
+			.first::<HistoryEntry>(conn)
+			.optional()?
+			.is_some();
+
+		Ok(has_listened)
+	}
+
 	/// Like or unlike a song for this user
 	/// If likeing a song, remove dislike if it exists
 	#[cfg(feature = "ssr")]
@ -469,3 +609,20 @@ 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: SystemTime,
+	/// The id of the song that was listened to
+	pub song_id: i32,
+}
--- a/src/pages.rs
+++ b/src/pages.rs
@ -1,3 +1,2 @@
 pub mod login;
 pub mod signup;
-pub mod audiotest;
--- a/src/pages/audiotest.rs
+++ b/src/pages/audiotest.rs
@ -1,9 +0,0 @@
-use leptos::leptos_dom::*;
-use leptos::*;
-
-#[component]
-pub fn AudioTest() -> impl IntoView {
-    view! {
-        <p>Hello World</p>
-    }
-}
--- a/src/playbar.rs
+++ b/src/playbar.rs
@ -5,8 +5,10 @@ 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";
@ -22,6 +24,9 @@ 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
@ -456,6 +461,21 @@ 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 {
@ -532,6 +552,39 @@ 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);
@ -540,6 +593,7 @@ 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 |_| {
@ -557,6 +611,11 @@ 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,6 +23,22 @@ 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,
@ -37,6 +53,15 @@ 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,
@ -74,6 +99,8 @@ 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));
@ -82,8 +109,11 @@ 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,10 +1,12 @@
 use crate::models::{Album, Artist, Song};
+use crate::components::dashboard_tile::DashboardTile;

 use time::Date;

 /// Holds information about a song
 /// 
 /// Intended to be used in the front-end, as it includes artist and album objects, rather than just their ids.
+#[derive(Clone)]
 pub struct SongData {
 	/// Song id
 	pub id: i32,
@ -47,7 +49,6 @@ 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
@ -60,3 +61,21 @@ 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/style/dashboard_row.scss
+++ b/style/dashboard_row.scss
@ -0,0 +1,45 @@
+.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
@ -0,0 +1,28 @@
+.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/main.scss
+++ b/style/main.scss
@ -8,7 +8,10 @@
@import 'home.scss';
@import 'search.scss';
@import 'personal.scss';
+@import 'dashboard_tile.scss';
+@import 'dashboard_row.scss';
@import 'upload.scss';
+@import 'song_list.scss';

 body {
  font-family: sans-serif;
--- a/style/song_list.scss
+++ b/style/song_list.scss
@ -0,0 +1,124 @@
+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,3 +14,5 @@ $queue-background-color: $play-bar-background-color;

 $auth-inputs: #796dd4;
 $auth-containers: white;
+
+$dashboard-tile-size: 200px;
Author	SHA1	Message	Date
Ethan Girouard	f299254d55	Merge pull request 'Fix Docker compose missing libretunes-images volume' (#120 ) from 119-fix-docker-compose-missing-libretunesimages-volume into main Reviewed-on: LibreTunes/LibreTunes#120	2024-10-25 19:40:10 +00:00
Ethan Girouard	14aa4d236e	Add libretunes-images to volumes	2024-10-25 18:28:45 +00:00
Ethan Girouard	3cfcacc9ba	Merge pull request 'Setup routing for image and audio assets based on environment variables' (#107 ) from 35-make-asset-paths-configurable into main Reviewed-on: LibreTunes/LibreTunes#107 Reviewed-by: Ethan Girouard <ethan@girouard.com>	2024-10-16 17:48:12 +00:00
Ethan Girouard	f39d93bd0c	Change audio and image path Docker comopse settings Add volume for images	2024-10-15 23:22:15 -04:00
Ethan Girouard	cdffd2c5eb	Merge pull request 'Create song list component' (#113 ) from 106-create-song-list-component into main Reviewed-on: LibreTunes/LibreTunes#113	2024-10-15 19:31:05 +00:00
Carter Bertolini	e90ea56d14	Remove TODO	2024-10-11 17:16:51 -04:00
Carter Bertolini	b222b7911f	Add example environment variables and update docker-compose	2024-10-11 16:53:08 -04:00
Ethan Girouard	0550b18d77	Add SongList component	2024-10-11 13:25:14 -04:00
Ethan Girouard	36e7a5827b	Merge pull request 'Create component for displaying music on dashboard' (#105 ) from 33-create-component-for-displaying-music-on-dashboard into main Reviewed-on: LibreTunes/LibreTunes#105	2024-10-06 21:49:01 +00:00
Ethan Girouard	134b425ce6	Remove unused MediaType	2024-10-06 15:50:58 -04:00
Ethan Girouard	c678d93661	Create ArtistData, impl DashboardTile	2024-10-06 15:50:58 -04:00
Ethan Girouard	c18bf277b9	Create AlbumData, impl DashboardTile	2024-10-06 15:50:57 -04:00
Ethan Girouard	097b1fc491	impl DashboardTile for Songdata	2024-10-06 15:47:22 -04:00
Ethan Girouard	f02a22d805	Format text inside dashboard tiles normally	2024-10-06 15:47:22 -04:00
Ethan Girouard	553e24800b	Refactor DashboardTile into trait	2024-10-06 15:47:18 -04:00
Ethan Girouard	2793391f00	Merge remote-tracking branch 'origin/main' into 33-create-component-for-displaying-music-on-dashboard	2024-10-06 14:16:58 -04:00
Ethan Girouard	cce9b946ec	Merge pull request 'Page Title Updates on Playing Song' (#103 ) from 97-update-page-title-with-current-playing into main Reviewed-on: LibreTunes/LibreTunes#103	2024-10-05 16:35:02 +00:00
Aidan Westphal	51858593c2	Updated Title Display	2024-10-04 23:56:12 +00:00
Aidan Westphal	2bb9b3bdd7	Page Title Updates on Playing Song	2024-10-04 23:19:07 +00:00
Carter Bertolini	a43955726a	Setup routing for image and audio assets based on environment variables	2024-10-04 17:33:51 -04:00
Ethan Girouard	e03853929f	Merge pull request 'Update tower to 0.5' (#102 ) from 101-update-tower-to-05 into main Reviewed-on: LibreTunes/LibreTunes#102	2024-10-04 19:57:59 +00:00
Ethan Girouard	2c71e065b7	Update tower and tower-http Remove gloo-net override	2024-10-04 15:14:32 -04:00
Ethan Girouard	20a3c0c7df	Merge pull request 'Add Profile Pictures' (#99 ) from 94-add-profile-pictures into main Reviewed-on: LibreTunes/LibreTunes#99	2024-10-01 17:01:56 +00:00
Ethan Girouard	b2f138e7e9	Move NoCustomError import to fix warning	2024-10-01 00:17:20 -04:00
Ethan Girouard	33aa285deb	Add upload_picture api endpoint	2024-10-01 00:07:26 -04:00
Ethan Girouard	4105d0cedb	Update Actions workflows to use new CICD Docker image	2024-09-30 23:57:45 -04:00
Ethan Girouard	414c1f0e20	Use dynamic linking in Docker build Switch base image to rust:slim Dynamically link libretunes build Copy required shared objs to scratch image Remove CSS minify step (Leptos does this already)	2024-09-30 19:02:59 -04:00
Ethan Girouard	9927b94d59	Add image-convert crate	2024-09-29 17:52:32 -04:00
Ethan Girouard	b9551e5bee	Merge pull request 'Implement history' (#98 ) from 41-implement-history into main Reviewed-on: LibreTunes/LibreTunes#98	2024-09-29 18:27:08 +00:00
Ethan Girouard	73910a087a	Add playing songs to history	2024-09-29 14:04:51 -04:00
Ethan Girouard	236c75492a	Merge pull request 'Implement friends' (#96 ) from 44-implement-friends into main Reviewed-on: LibreTunes/LibreTunes#96	2024-09-29 01:15:56 +00:00
Ethan Girouard	ec76269367	Fix duplicate api module definition	2024-09-28 20:50:25 -04:00
Ethan Girouard	c92d68dddf	Update leptos_use to 0.13.5	2024-09-28 20:50:25 -04:00
Ethan Girouard	8fd064dffc	Merge remote-tracking branch 'origin/main' into 41-implement-history	2024-09-28 20:40:37 -04:00
Ethan Girouard	a83fb9dea5	Add friendships and friend_requests database tables	2024-09-28 20:28:00 -04:00
Ethan Girouard	e55656c0e6	Add leptos_use crate	2024-07-30 22:29:13 -04:00
Ethan Girouard	18cbb0017f	Merge remote-tracking branch 'origin/31-update-songdata-for-fetching-songs-on-frontend-for-playback' into 36-implement-likes-and-dislikes	2024-07-30 22:12:44 -04:00
Ethan Girouard	53cde3bed6	Hide scroll buttons when at end of scroll bar	2024-07-30 21:47:55 -04:00
Ethan Girouard	eab011070d	Don't track scroll_element in scroll button handlers	2024-07-30 21:46:59 -04:00
Ethan Girouard	9d6013b8a4	Move dashboard tile row left spacing to margin-left	2024-07-30 21:35:44 -04:00
Ethan Girouard	fa811350ae	Add leptos_use crate	2024-07-30 21:09:10 -04:00
Ethan Girouard	7f4108e1c5	Add conversion from SongData to DashboardTile	2024-07-30 21:02:48 -04:00
Ethan Girouard	906b5bd9dd	Merge remote-tracking branch 'origin/31-update-songdata-for-fetching-songs-on-frontend-for-playback' into 33-create-component-for-displaying-music-on-dashboard	2024-07-30 20:57:52 -04:00
Ethan Girouard	4aa90cdefb	Add API functions for getting/adding history	2024-05-19 16:14:38 -04:00
Ethan Girouard	ee70b1080e	Add various history functions for users	2024-05-19 15:44:09 -04:00
Ethan Girouard	62def56a41	Add model for history entry	2024-05-19 15:43:58 -04:00
Ethan Girouard	0c64865cd9	Add api module	2024-05-19 15:38:40 -04:00
Ethan Girouard	cc11de4f3d	Add get_user auth function	2024-05-19 15:38:40 -04:00
Ethan Girouard	81f0b9310f	Add DB table for song history	2024-05-19 12:44:47 -04:00
Ethan Girouard	af66381f5f	Implement dashboard row sideways scrolling	2024-05-11 15:23:49 -04:00
Ethan Girouard	683f979bc7	Add styling for dashboard row	2024-05-11 13:16:31 -04:00
Ethan Girouard	f4908ad3b3	Add DashboardRow component	2024-05-11 13:16:02 -04:00
Ethan Girouard	b1cc0f156c	Add styling for dashboard tile	2024-05-11 13:08:32 -04:00
Ethan Girouard	ec43ab472d	Add DashboardTile component	2024-05-11 13:08:05 -04:00
Ethan Girouard	eebd58f5a6	Add MediaType struct	2024-05-11 12:53:57 -04:00