Merge remote-tracking branch 'origin/main' into 95-fix-home-screen-account-button-ui
This commit is contained in:
commit
3d1dc94b06
@ -15,3 +15,6 @@ DATABASE_URL=postgresql://libretunes:password@localhost:5432/libretunes
|
|||||||
# POSTGRES_HOST=localhost
|
# POSTGRES_HOST=localhost
|
||||||
# POSTGRES_PORT=5432
|
# POSTGRES_PORT=5432
|
||||||
# POSTGRES_DB=libretunes
|
# POSTGRES_DB=libretunes
|
||||||
|
|
||||||
|
LIBRETUNES_AUDIO_PATH=assets/audio
|
||||||
|
LIBRETUNES_IMAGE_PATH=assets/images
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,6 +24,7 @@ playwright/.cache/
|
|||||||
*.jpeg
|
*.jpeg
|
||||||
*.png
|
*.png
|
||||||
*.gif
|
*.gif
|
||||||
|
*.webp
|
||||||
|
|
||||||
# Environment variables
|
# Environment variables
|
||||||
.env
|
.env
|
||||||
|
|||||||
114
Cargo.lock
generated
114
Cargo.lock
generated
@ -1,6 +1,6 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 3
|
version = 4
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "addr2line"
|
name = "addr2line"
|
||||||
@ -151,7 +151,7 @@ dependencies = [
|
|||||||
"axum-core",
|
"axum-core",
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"hyper",
|
"hyper",
|
||||||
@ -167,7 +167,7 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"sync_wrapper 1.0.0",
|
"sync_wrapper 1.0.0",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower",
|
"tower 0.4.13",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
]
|
]
|
||||||
@ -181,7 +181,7 @@ dependencies = [
|
|||||||
"async-trait",
|
"async-trait",
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"mime",
|
"mime",
|
||||||
@ -378,13 +378,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.37"
|
version = "0.4.38"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
|
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android-tzdata",
|
"android-tzdata",
|
||||||
"iana-time-zone",
|
"iana-time-zone",
|
||||||
|
"js-sys",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
"serde",
|
||||||
|
"wasm-bindgen",
|
||||||
"windows-targets 0.52.4",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -690,11 +693,11 @@ checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.5.0",
|
"bitflags 2.5.0",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
|
"chrono",
|
||||||
"diesel_derives",
|
"diesel_derives",
|
||||||
"itoa",
|
"itoa",
|
||||||
"pq-sys",
|
"pq-sys",
|
||||||
"r2d2",
|
"r2d2",
|
||||||
"time",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1017,13 +1020,14 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gloo-net"
|
name = "gloo-net"
|
||||||
version = "0.5.0"
|
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 = [
|
dependencies = [
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-sink",
|
"futures-sink",
|
||||||
"gloo-utils",
|
"gloo-utils",
|
||||||
"http",
|
"http 0.2.12",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"pin-project",
|
"pin-project",
|
||||||
"serde",
|
"serde",
|
||||||
@ -1049,7 +1053,8 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gloo-utils"
|
name = "gloo-utils"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"serde",
|
"serde",
|
||||||
@ -1117,6 +1122,17 @@ dependencies = [
|
|||||||
"utf8-width",
|
"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]]
|
[[package]]
|
||||||
name = "http"
|
name = "http"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@ -1135,7 +1151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
|
checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1146,7 +1162,7 @@ checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
]
|
]
|
||||||
@ -1178,7 +1194,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"httparse",
|
"httparse",
|
||||||
"httpdate",
|
"httpdate",
|
||||||
@ -1196,7 +1212,7 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"hyper",
|
"hyper",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
@ -1550,9 +1566,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "leptos-use"
|
name = "leptos-use"
|
||||||
version = "0.13.5"
|
version = "0.13.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3ab8914bd0ff8ab5029521540a6e15292dcc05d0f1a791a3aa8cc31a94436bfb"
|
checksum = "32d4708472867704085a2813c47cada122a6e8c3b90ccff764862c0b351bfb96"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"codee",
|
"codee",
|
||||||
@ -1821,12 +1837,13 @@ dependencies = [
|
|||||||
"axum",
|
"axum",
|
||||||
"axum-login",
|
"axum-login",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
|
"chrono",
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"diesel",
|
"diesel",
|
||||||
"diesel_migrations",
|
"diesel_migrations",
|
||||||
"dotenv",
|
"dotenv",
|
||||||
"flexi_logger",
|
"flexi_logger",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"icondata",
|
"icondata",
|
||||||
"image-convert",
|
"image-convert",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
@ -1844,9 +1861,8 @@ dependencies = [
|
|||||||
"server_fn",
|
"server_fn",
|
||||||
"symphonia",
|
"symphonia",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"time",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower",
|
"tower 0.5.1",
|
||||||
"tower-http",
|
"tower-http",
|
||||||
"tower-sessions-redis-store",
|
"tower-sessions-redis-store",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
@ -2023,7 +2039,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"httparse",
|
"httparse",
|
||||||
"log",
|
"log",
|
||||||
"memchr",
|
"memchr",
|
||||||
@ -2670,7 +2686,7 @@ dependencies = [
|
|||||||
"dashmap",
|
"dashmap",
|
||||||
"futures",
|
"futures",
|
||||||
"gloo-net",
|
"gloo-net",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"hyper",
|
"hyper",
|
||||||
"inventory",
|
"inventory",
|
||||||
@ -2683,7 +2699,7 @@ dependencies = [
|
|||||||
"serde_qs",
|
"serde_qs",
|
||||||
"server_fn_macro_default",
|
"server_fn_macro_default",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tower",
|
"tower 0.4.13",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"url",
|
"url",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
@ -3109,6 +3125,20 @@ dependencies = [
|
|||||||
"tracing",
|
"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]]
|
[[package]]
|
||||||
name = "tower-cookies"
|
name = "tower-cookies"
|
||||||
version = "0.10.0"
|
version = "0.10.0"
|
||||||
@ -3119,7 +3149,7 @@ dependencies = [
|
|||||||
"axum-core",
|
"axum-core",
|
||||||
"cookie",
|
"cookie",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
@ -3128,14 +3158,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-http"
|
name = "tower-http"
|
||||||
version = "0.5.2"
|
version = "0.6.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
|
checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.5.0",
|
"bitflags 2.5.0",
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"http-range-header",
|
"http-range-header",
|
||||||
@ -3153,15 +3183,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-layer"
|
name = "tower-layer"
|
||||||
version = "0.3.2"
|
version = "0.3.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
|
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-service"
|
name = "tower-service"
|
||||||
version = "0.3.2"
|
version = "0.3.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
|
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-sessions"
|
name = "tower-sessions"
|
||||||
@ -3170,7 +3200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "b27326208b21807803c5f5aa1020d30ca0432b78cfe251b51a67a05e0baea102"
|
checksum = "b27326208b21807803c5f5aa1020d30ca0432b78cfe251b51a67a05e0baea102"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"time",
|
"time",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower-cookies",
|
"tower-cookies",
|
||||||
@ -3191,7 +3221,7 @@ dependencies = [
|
|||||||
"axum-core",
|
"axum-core",
|
||||||
"base64",
|
"base64",
|
||||||
"futures",
|
"futures",
|
||||||
"http",
|
"http 1.1.0",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"rand",
|
"rand",
|
||||||
"serde",
|
"serde",
|
||||||
@ -3414,9 +3444,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
|
checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@ -3425,9 +3455,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-backend"
|
name = "wasm-bindgen-backend"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
|
checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bumpalo",
|
"bumpalo",
|
||||||
"log",
|
"log",
|
||||||
@ -3452,9 +3482,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro"
|
name = "wasm-bindgen-macro"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
|
checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"wasm-bindgen-macro-support",
|
"wasm-bindgen-macro-support",
|
||||||
@ -3462,9 +3492,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro-support"
|
name = "wasm-bindgen-macro-support"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@ -3475,9 +3505,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-shared"
|
name = "wasm-bindgen-shared"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
|
checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-streams"
|
name = "wasm-streams"
|
||||||
|
|||||||
14
Cargo.toml
14
Cargo.toml
@ -15,21 +15,20 @@ leptos = { version = "0.6", default-features = false, features = ["nightly"] }
|
|||||||
leptos_meta = { version = "0.6", features = ["nightly"] }
|
leptos_meta = { version = "0.6", features = ["nightly"] }
|
||||||
leptos_axum = { version = "0.6", optional = true }
|
leptos_axum = { version = "0.6", optional = true }
|
||||||
leptos_router = { version = "0.6", features = ["nightly"] }
|
leptos_router = { version = "0.6", features = ["nightly"] }
|
||||||
wasm-bindgen = { version = "=0.2.93", default-features = false, optional = true }
|
wasm-bindgen = { version = "=0.2.95", default-features = false, optional = true }
|
||||||
leptos_icons = { version = "0.3.0" }
|
leptos_icons = { version = "0.3.0" }
|
||||||
icondata = { version = "0.3.0" }
|
icondata = { version = "0.3.0" }
|
||||||
dotenv = { version = "0.15.0", optional = true }
|
dotenv = { version = "0.15.0", optional = true }
|
||||||
diesel = { version = "2.1.4", features = ["postgres", "r2d2", "time"], default-features = false, optional = true }
|
diesel = { version = "2.1.4", features = ["postgres", "r2d2", "chrono"], default-features = false, optional = true }
|
||||||
lazy_static = { version = "1.4.0", optional = true }
|
lazy_static = { version = "1.4.0", optional = true }
|
||||||
serde = { version = "1.0.195", features = ["derive"], default-features = false }
|
serde = { version = "1.0.195", features = ["derive"], default-features = false }
|
||||||
openssl = { version = "0.10.63", optional = true }
|
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 }
|
diesel_migrations = { version = "2.1.0", optional = true }
|
||||||
pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
|
pbkdf2 = { version = "0.12.2", features = ["simple"], optional = true }
|
||||||
tokio = { version = "1", optional = true, features = ["rt-multi-thread"] }
|
tokio = { version = "1", optional = true, features = ["rt-multi-thread"] }
|
||||||
axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = false, optional = true }
|
axum = { version = "0.7.5", features = ["tokio", "http1"], default-features = false, optional = true }
|
||||||
tower = { version = "0.4.13", optional = true }
|
tower = { version = "0.5.1", optional = true, features = ["util"] }
|
||||||
tower-http = { version = "0.5", optional = true, features = ["fs"] }
|
tower-http = { version = "0.6.1", optional = true, features = ["fs"] }
|
||||||
thiserror = "1.0.57"
|
thiserror = "1.0.57"
|
||||||
tower-sessions-redis-store = { version = "0.11", optional = true }
|
tower-sessions-redis-store = { version = "0.11", optional = true }
|
||||||
async-trait = { version = "0.1.79", optional = true }
|
async-trait = { version = "0.1.79", optional = true }
|
||||||
@ -42,9 +41,7 @@ flexi_logger = { version = "0.28.0", optional = true, default-features = false }
|
|||||||
web-sys = "0.3.69"
|
web-sys = "0.3.69"
|
||||||
leptos-use = "0.13.5"
|
leptos-use = "0.13.5"
|
||||||
image-convert = { version = "0.18.0", optional = true, default-features = false }
|
image-convert = { version = "0.18.0", optional = true, default-features = false }
|
||||||
|
chrono = { version = "0.4.38", default-features = false, features = ["serde", "clock"] }
|
||||||
[patch.crates-io]
|
|
||||||
gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" }
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
hydrate = [
|
hydrate = [
|
||||||
@ -53,6 +50,7 @@ hydrate = [
|
|||||||
"leptos_router/hydrate",
|
"leptos_router/hydrate",
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
|
"chrono/wasmbind",
|
||||||
]
|
]
|
||||||
ssr = [
|
ssr = [
|
||||||
"dep:leptos_axum",
|
"dep:leptos_axum",
|
||||||
|
|||||||
@ -13,8 +13,11 @@ services:
|
|||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_DB: ${POSTGRES_DB}
|
POSTGRES_DB: ${POSTGRES_DB}
|
||||||
|
LIBRETUNES_AUDIO_PATH: /assets/audio
|
||||||
|
LIBRETUNES_IMAGE_PATH: /assets/images
|
||||||
volumes:
|
volumes:
|
||||||
- libretunes-audio:/site/audio
|
- libretunes-audio:/assets/audio
|
||||||
|
- libretunes-images:/assets/images
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
- postgres
|
- postgres
|
||||||
@ -50,5 +53,6 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
libretunes-audio:
|
libretunes-audio:
|
||||||
|
libretunes-images:
|
||||||
libretunes-redis:
|
libretunes-redis:
|
||||||
libretunes-postgres:
|
libretunes-postgres:
|
||||||
|
|||||||
@ -0,0 +1,5 @@
|
|||||||
|
DROP INDEX playlists_owner_idx;
|
||||||
|
DROP TABLE playlists;
|
||||||
|
|
||||||
|
DROP INDEX playlist_songs_playlist_idx;
|
||||||
|
DROP TABLE playlist_songs;
|
||||||
17
migrations/2024-10-22-212759_create_playlist_tables/up.sql
Normal file
17
migrations/2024-10-22-212759_create_playlist_tables/up.sql
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
CREATE TABLE playlists (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||||
|
owner_id INTEGER REFERENCES users(id) ON DELETE CASCADE NOT NULL,
|
||||||
|
name TEXT NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX playlists_owner_idx ON playlists(owner_id);
|
||||||
|
|
||||||
|
CREATE TABLE playlist_songs (
|
||||||
|
playlist_id INTEGER REFERENCES playlists(id) ON DELETE CASCADE NOT NULL,
|
||||||
|
song_id INTEGER REFERENCES songs(id) ON DELETE CASCADE NOT NULL,
|
||||||
|
PRIMARY KEY (playlist_id, song_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX playlist_songs_playlist_idx ON playlist_songs(playlist_id);
|
||||||
39
src/albumdata.rs
Normal file
39
src/albumdata.rs
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
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)))
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
use std::time::SystemTime;
|
use chrono::NaiveDateTime;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use crate::models::HistoryEntry;
|
use crate::models::HistoryEntry;
|
||||||
use crate::models::Song;
|
use crate::models::Song;
|
||||||
@ -25,7 +25,7 @@ pub async fn get_history(limit: Option<i64>) -> Result<Vec<HistoryEntry>, Server
|
|||||||
|
|
||||||
/// Get the listen dates and songs of the current user.
|
/// Get the listen dates and songs of the current user.
|
||||||
#[server(endpoint = "history/get_songs")]
|
#[server(endpoint = "history/get_songs")]
|
||||||
pub async fn get_history_songs(limit: Option<i64>) -> Result<Vec<(SystemTime, Song)>, ServerFnError> {
|
pub async fn get_history_songs(limit: Option<i64>) -> Result<Vec<(NaiveDateTime, Song)>, ServerFnError> {
|
||||||
let user = get_user().await?;
|
let user = get_user().await?;
|
||||||
let db_con = &mut get_db_conn();
|
let db_con = &mut get_db_conn();
|
||||||
let songs = user.get_history_songs(limit, db_con)
|
let songs = user.get_history_songs(limit, db_con)
|
||||||
|
|||||||
@ -3,10 +3,23 @@ use server_fn::codec::{MultipartData, MultipartFormData};
|
|||||||
|
|
||||||
use cfg_if::cfg_if;
|
use cfg_if::cfg_if;
|
||||||
|
|
||||||
|
use crate::songdata::SongData;
|
||||||
|
use crate::artistdata::ArtistData;
|
||||||
|
|
||||||
|
use chrono::NaiveDateTime;
|
||||||
|
|
||||||
cfg_if! {
|
cfg_if! {
|
||||||
if #[cfg(feature = "ssr")] {
|
if #[cfg(feature = "ssr")] {
|
||||||
use crate::auth::get_user;
|
use crate::auth::get_user;
|
||||||
use server_fn::error::NoCustomError;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,3 +60,241 @@ pub async fn upload_picture(data: MultipartData) -> Result<(), ServerFnError> {
|
|||||||
|
|
||||||
Ok(())
|
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)
|
||||||
|
}
|
||||||
|
|||||||
23
src/app.rs
23
src/app.rs
@ -1,21 +1,22 @@
|
|||||||
use crate::playbar::PlayBar;
|
use crate::playbar::PlayBar;
|
||||||
use crate::playstatus::PlayStatus;
|
use crate::playbar::CustomTitle;
|
||||||
use crate::queue::Queue;
|
use crate::queue::Queue;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_meta::*;
|
use leptos_meta::*;
|
||||||
use leptos_router::*;
|
use leptos_router::*;
|
||||||
use crate::pages::login::*;
|
use crate::pages::login::*;
|
||||||
use crate::pages::signup::*;
|
use crate::pages::signup::*;
|
||||||
|
use crate::pages::profile::*;
|
||||||
use crate::error_template::{AppError, ErrorTemplate};
|
use crate::error_template::{AppError, ErrorTemplate};
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn App() -> impl IntoView {
|
pub fn App() -> impl IntoView {
|
||||||
// Provides context that manages stylesheets, titles, meta tags, etc.
|
// Provides context that manages stylesheets, titles, meta tags, etc.
|
||||||
provide_meta_context();
|
provide_meta_context();
|
||||||
|
|
||||||
let play_status = PlayStatus::default();
|
provide_context(GlobalState::new());
|
||||||
let play_status = create_rw_signal(play_status);
|
|
||||||
let upload_open = create_rw_signal(false);
|
let upload_open = create_rw_signal(false);
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
@ -24,7 +25,7 @@ pub fn App() -> impl IntoView {
|
|||||||
<Stylesheet id="leptos" href="/pkg/libretunes.css"/>
|
<Stylesheet id="leptos" href="/pkg/libretunes.css"/>
|
||||||
|
|
||||||
// sets the document title
|
// sets the document title
|
||||||
<Title text="LibreTunes"/>
|
<CustomTitle />
|
||||||
|
|
||||||
// content for this welcome page
|
// content for this welcome page
|
||||||
<Router fallback=|| {
|
<Router fallback=|| {
|
||||||
@ -37,10 +38,12 @@ pub fn App() -> impl IntoView {
|
|||||||
}>
|
}>
|
||||||
<main>
|
<main>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="" view=move || view! { <HomePage play_status=play_status upload_open=upload_open/> }>
|
<Route path="" view=move || view! { <HomePage upload_open=upload_open/> }>
|
||||||
<Route path="" view=Dashboard />
|
<Route path="" view=Dashboard />
|
||||||
<Route path="dashboard" view=Dashboard />
|
<Route path="dashboard" view=Dashboard />
|
||||||
<Route path="search" view=Search />
|
<Route path="search" view=Search />
|
||||||
|
<Route path="user/:id" view=Profile />
|
||||||
|
<Route path="user" view=Profile />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="/login" view=Login />
|
<Route path="/login" view=Login />
|
||||||
<Route path="/signup" view=Signup />
|
<Route path="/signup" view=Signup />
|
||||||
@ -53,12 +56,12 @@ pub fn App() -> impl IntoView {
|
|||||||
use crate::components::sidebar::*;
|
use crate::components::sidebar::*;
|
||||||
use crate::components::dashboard::*;
|
use crate::components::dashboard::*;
|
||||||
use crate::components::search::*;
|
use crate::components::search::*;
|
||||||
use crate::components::personal::*;
|
use crate::components::personal::Personal;
|
||||||
use crate::components::upload::*;
|
use crate::components::upload::*;
|
||||||
|
|
||||||
/// Renders the home page of your application.
|
/// Renders the home page of your application.
|
||||||
#[component]
|
#[component]
|
||||||
fn HomePage(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>) -> impl IntoView {
|
fn HomePage(upload_open: RwSignal<bool>) -> impl IntoView {
|
||||||
view! {
|
view! {
|
||||||
<div class="home-container">
|
<div class="home-container">
|
||||||
<Upload open=upload_open/>
|
<Upload open=upload_open/>
|
||||||
@ -66,8 +69,8 @@ fn HomePage(play_status: RwSignal<PlayStatus>, upload_open: RwSignal<bool>) -> i
|
|||||||
// This <Outlet /> will render the child route components
|
// This <Outlet /> will render the child route components
|
||||||
<Outlet />
|
<Outlet />
|
||||||
<Personal />
|
<Personal />
|
||||||
<PlayBar status=play_status/>
|
<PlayBar />
|
||||||
<Queue status=play_status/>
|
<Queue />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
34
src/artistdata.rs
Normal file
34
src/artistdata.rs
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
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())
|
||||||
|
}
|
||||||
|
}
|
||||||
23
src/auth.rs
23
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
|
/// Takes in a username or email and a password in plaintext
|
||||||
/// Returns a Result with a boolean indicating if the login was successful
|
/// Returns a Result with a boolean indicating if the login was successful
|
||||||
#[server(endpoint = "login")]
|
#[server(endpoint = "login")]
|
||||||
pub async fn login(credentials: UserCredentials) -> Result<bool, ServerFnError> {
|
pub async fn login(credentials: UserCredentials) -> Result<Option<User>, ServerFnError> {
|
||||||
use crate::users::validate_user;
|
use crate::users::validate_user;
|
||||||
|
|
||||||
let mut auth_session = extract::<AuthSession<AuthBackend>>().await
|
let mut auth_session = extract::<AuthSession<AuthBackend>>().await
|
||||||
@ -66,12 +66,14 @@ pub async fn login(credentials: UserCredentials) -> Result<bool, ServerFnError>
|
|||||||
let user = validate_user(credentials).await
|
let user = validate_user(credentials).await
|
||||||
.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error validating user: {}", e)))?;
|
.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error validating user: {}", e)))?;
|
||||||
|
|
||||||
if let Some(user) = user {
|
if let Some(mut user) = user {
|
||||||
auth_session.login(&user).await
|
auth_session.login(&user).await
|
||||||
.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error logging in user: {}", e)))?;
|
.map_err(|e| ServerFnError::<NoCustomError>::ServerError(format!("Error logging in user: {}", e)))?;
|
||||||
Ok(true)
|
|
||||||
|
user.password = None;
|
||||||
|
Ok(Some(user))
|
||||||
} else {
|
} else {
|
||||||
Ok(false)
|
Ok(None)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,6 +148,19 @@ pub async fn get_user() -> Result<User, ServerFnError> {
|
|||||||
auth_session.user.ok_or(ServerFnError::<NoCustomError>::ServerError("User not logged in".to_string()))
|
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
|
/// Check if a user is an admin
|
||||||
/// Returns a Result with a boolean indicating if the user is logged in and an admin
|
/// Returns a Result with a boolean indicating if the user is logged in and an admin
|
||||||
#[server(endpoint = "check_admin")]
|
#[server(endpoint = "check_admin")]
|
||||||
|
|||||||
@ -2,4 +2,9 @@ pub mod sidebar;
|
|||||||
pub mod dashboard;
|
pub mod dashboard;
|
||||||
pub mod search;
|
pub mod search;
|
||||||
pub mod personal;
|
pub mod personal;
|
||||||
|
pub mod dashboard_tile;
|
||||||
|
pub mod dashboard_row;
|
||||||
pub mod upload;
|
pub mod upload;
|
||||||
|
pub mod song_list;
|
||||||
|
pub mod loading;
|
||||||
|
pub mod error;
|
||||||
|
|||||||
118
src/components/dashboard_row.rs
Normal file
118
src/components/dashboard_row.rs
Normal file
@ -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()
|
||||||
|
}
|
||||||
|
}
|
||||||
27
src/components/dashboard_tile.rs
Normal file
27
src/components/dashboard_tile.rs
Normal file
@ -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()
|
||||||
|
}
|
||||||
|
}
|
||||||
45
src/components/error.rs
Normal file
45
src/components/error.rs
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
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>
|
||||||
|
}
|
||||||
|
}
|
||||||
19
src/components/loading.rs
Normal file
19
src/components/loading.rs
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
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>
|
||||||
|
}
|
||||||
|
}
|
||||||
230
src/components/song_list.rs
Normal file
230
src/components/song_list.rs
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
use leptos::*;
|
||||||
|
use leptos::logging::*;
|
||||||
|
use leptos_icons::*;
|
||||||
|
|
||||||
|
use crate::api::songs::*;
|
||||||
|
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 song_id=song.id 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(
|
||||||
|
#[prop(into)]
|
||||||
|
song_id: MaybeSignal<i32>,
|
||||||
|
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"))
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// If an error occurs, check the like/dislike status again to ensure consistency
|
||||||
|
let check_like_dislike = move || {
|
||||||
|
spawn_local(async move {
|
||||||
|
match get_like_dislike_song(song_id.get_untracked()).await {
|
||||||
|
Ok((like, dislike)) => {
|
||||||
|
liked.set(like);
|
||||||
|
disliked.set(dislike);
|
||||||
|
},
|
||||||
|
Err(_) => {}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
let toggle_like = move |_| {
|
||||||
|
let new_liked = !liked.get_untracked();
|
||||||
|
liked.set(new_liked);
|
||||||
|
disliked.set(disliked.get_untracked() && !liked.get_untracked());
|
||||||
|
|
||||||
|
spawn_local(async move {
|
||||||
|
match set_like_song(song_id.get_untracked(), new_liked).await {
|
||||||
|
Ok(_) => {},
|
||||||
|
Err(e) => {
|
||||||
|
error!("Error setting like: {}", e);
|
||||||
|
check_like_dislike();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
let toggle_dislike = move |_| {
|
||||||
|
disliked.set(!disliked.get_untracked());
|
||||||
|
liked.set(liked.get_untracked() && !disliked.get_untracked());
|
||||||
|
|
||||||
|
spawn_local(async move {
|
||||||
|
match set_dislike_song(song_id.get_untracked(), disliked.get_untracked()).await {
|
||||||
|
Ok(_) => {},
|
||||||
|
Err(e) => {
|
||||||
|
error!("Error setting dislike: {}", e);
|
||||||
|
check_like_dislike();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
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>
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -12,6 +12,7 @@ cfg_if! { if #[cfg(feature = "ssr")] {
|
|||||||
use tower_http::services::ServeDir;
|
use tower_http::services::ServeDir;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use crate::app::App;
|
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 {
|
pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
|
||||||
let root = options.site_root.clone();
|
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)> {
|
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();
|
let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap();
|
||||||
|
|
||||||
// `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
|
// `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
|
||||||
// This path is relative to the cargo root
|
// This path is relative to the cargo root
|
||||||
match ServeDir::new(root).oneshot(req).await.ok() {
|
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"),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
pub mod app;
|
pub mod app;
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod songdata;
|
pub mod songdata;
|
||||||
|
pub mod albumdata;
|
||||||
|
pub mod artistdata;
|
||||||
pub mod playstatus;
|
pub mod playstatus;
|
||||||
pub mod playbar;
|
pub mod playbar;
|
||||||
pub mod database;
|
pub mod database;
|
||||||
|
|||||||
@ -14,11 +14,11 @@ extern crate diesel_migrations;
|
|||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
use axum::{routing::get, Router};
|
use axum::{routing::get, Router, extract::Path};
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_axum::{generate_route_list, LeptosRoutes};
|
use leptos_axum::{generate_route_list, LeptosRoutes};
|
||||||
use libretunes::app::*;
|
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 axum_login::tower_sessions::SessionManagerLayer;
|
||||||
use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
|
use tower_sessions_redis_store::{fred::prelude::*, RedisStore};
|
||||||
use axum_login::AuthManagerLayerBuilder;
|
use axum_login::AuthManagerLayerBuilder;
|
||||||
@ -60,6 +60,8 @@ async fn main() {
|
|||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.leptos_routes(&leptos_options, routes, App)
|
.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, "")))
|
.route("/assets/*uri", get(|uri| get_static_file(uri, "")))
|
||||||
.layer(auth_layer)
|
.layer(auth_layer)
|
||||||
.fallback(file_and_error_handler)
|
.fallback(file_and_error_handler)
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
use std::time::SystemTime;
|
use chrono::{NaiveDate, NaiveDateTime};
|
||||||
use time::Date;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use cfg_if::cfg_if;
|
use cfg_if::cfg_if;
|
||||||
@ -39,8 +38,8 @@ pub struct User {
|
|||||||
#[cfg_attr(feature = "ssr", diesel(deserialize_as = String))]
|
#[cfg_attr(feature = "ssr", diesel(deserialize_as = String))]
|
||||||
pub password: Option<String>,
|
pub password: Option<String>,
|
||||||
/// The time the user was created
|
/// The time the user was created
|
||||||
#[cfg_attr(feature = "ssr", diesel(deserialize_as = SystemTime))]
|
#[cfg_attr(feature = "ssr", diesel(deserialize_as = NaiveDateTime))]
|
||||||
pub created_at: Option<SystemTime>,
|
pub created_at: Option<NaiveDateTime>,
|
||||||
/// Whether the user is an admin
|
/// Whether the user is an admin
|
||||||
pub admin: bool,
|
pub admin: bool,
|
||||||
}
|
}
|
||||||
@ -103,7 +102,7 @@ impl User {
|
|||||||
///
|
///
|
||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub fn get_history_songs(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
|
pub fn get_history_songs(self: &Self, limit: Option<i64>, conn: &mut PgPooledConn) ->
|
||||||
Result<Vec<(SystemTime, Song)>, Box<dyn Error>> {
|
Result<Vec<(NaiveDateTime, Song)>, Box<dyn Error>> {
|
||||||
use crate::schema::songs::dsl::*;
|
use crate::schema::songs::dsl::*;
|
||||||
use crate::schema::song_history::dsl::*;
|
use crate::schema::song_history::dsl::*;
|
||||||
|
|
||||||
@ -467,7 +466,7 @@ pub struct Album {
|
|||||||
/// The album's title
|
/// The album's title
|
||||||
pub title: String,
|
pub title: String,
|
||||||
/// The album's release date
|
/// The album's release date
|
||||||
pub release_date: Option<Date>,
|
pub release_date: Option<NaiveDate>,
|
||||||
/// The path to the album's image file
|
/// The path to the album's image file
|
||||||
pub image_path: Option<String>,
|
pub image_path: Option<String>,
|
||||||
}
|
}
|
||||||
@ -546,7 +545,7 @@ pub struct Song {
|
|||||||
/// The duration of the song in seconds
|
/// The duration of the song in seconds
|
||||||
pub duration: i32,
|
pub duration: i32,
|
||||||
/// The song's release date
|
/// The song's release date
|
||||||
pub release_date: Option<Date>,
|
pub release_date: Option<NaiveDate>,
|
||||||
/// The path to the song's audio file
|
/// The path to the song's audio file
|
||||||
pub storage_path: String,
|
pub storage_path: String,
|
||||||
/// The path to the song's image file
|
/// The path to the song's image file
|
||||||
@ -622,7 +621,28 @@ pub struct HistoryEntry {
|
|||||||
/// The id of the user who listened to the song
|
/// The id of the user who listened to the song
|
||||||
pub user_id: i32,
|
pub user_id: i32,
|
||||||
/// The date the song was listened to
|
/// The date the song was listened to
|
||||||
pub date: SystemTime,
|
pub date: NaiveDateTime,
|
||||||
/// The id of the song that was listened to
|
/// The id of the song that was listened to
|
||||||
pub song_id: i32,
|
pub song_id: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Model for a playlist
|
||||||
|
#[cfg_attr(feature = "ssr", derive(Queryable, Selectable, Insertable))]
|
||||||
|
#[cfg_attr(feature = "ssr", diesel(table_name = crate::schema::playlists))]
|
||||||
|
#[cfg_attr(feature = "ssr", diesel(check_for_backend(diesel::pg::Pg)))]
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct Playlist {
|
||||||
|
/// A unique id for the playlist
|
||||||
|
#[cfg_attr(feature = "ssr", diesel(deserialize_as = i32))]
|
||||||
|
pub id: Option<i32>,
|
||||||
|
/// The time the playlist was created
|
||||||
|
#[cfg_attr(feature = "ssr", diesel(deserialize_as = NaiveDateTime))]
|
||||||
|
pub created_at: Option<NaiveDateTime>,
|
||||||
|
/// The time the playlist was last updated
|
||||||
|
#[cfg_attr(feature = "ssr", diesel(deserialize_as = NaiveDateTime))]
|
||||||
|
pub updated_at: Option<NaiveDateTime>,
|
||||||
|
/// The id of the user who owns the playlist
|
||||||
|
pub owner_id: i32,
|
||||||
|
/// The name of the playlist
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
pub mod login;
|
pub mod login;
|
||||||
pub mod signup;
|
pub mod signup;
|
||||||
|
pub mod profile;
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
use crate::auth::login;
|
use crate::auth::login;
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
use leptos::leptos_dom::*;
|
use leptos::leptos_dom::*;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_icons::*;
|
use leptos_icons::*;
|
||||||
@ -28,17 +29,28 @@ pub fn Login() -> impl IntoView {
|
|||||||
password: password1
|
password: password1
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let user = GlobalState::logged_in_user();
|
||||||
|
|
||||||
let login_result = login(user_credentials).await;
|
let login_result = login(user_credentials).await;
|
||||||
if let Err(err) = login_result {
|
if let Err(err) = login_result {
|
||||||
// Handle the error here, e.g., log it or display to the user
|
// Handle the error here, e.g., log it or display to the user
|
||||||
log!("Error logging in: {:?}", err);
|
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
|
// Redirect to the login page
|
||||||
log!("Logged in Successfully!");
|
log!("Logged in Successfully!");
|
||||||
leptos_router::use_navigate()("/", Default::default());
|
leptos_router::use_navigate()("/", Default::default());
|
||||||
log!("Navigated to home page after login");
|
log!("Navigated to home page after login");
|
||||||
} else if let Ok(false) = login_result {
|
} else if let Ok(None) = login_result {
|
||||||
log!("Invalid username or password");
|
log!("Invalid username or password");
|
||||||
|
|
||||||
|
// User could be already logged in or not, so refetch the user
|
||||||
|
user.refetch();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
316
src/pages/profile.rs
Normal file
316
src/pages/profile.rs
Normal file
@ -0,0 +1,316 @@
|
|||||||
|
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::models::User;
|
||||||
|
use crate::users::get_user_by_id;
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
|
|
||||||
|
/// 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() -> 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 /> }.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() -> impl IntoView {
|
||||||
|
view! {
|
||||||
|
<Transition
|
||||||
|
fallback=move || view! { <LoadingPage /> }
|
||||||
|
>
|
||||||
|
{move || GlobalState::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>
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,5 +1,6 @@
|
|||||||
use crate::auth::signup;
|
use crate::auth::signup;
|
||||||
use crate::models::User;
|
use crate::models::User;
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
use leptos::leptos_dom::*;
|
use leptos::leptos_dom::*;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_icons::*;
|
use leptos_icons::*;
|
||||||
@ -19,7 +20,7 @@ pub fn Signup() -> impl IntoView {
|
|||||||
|
|
||||||
let on_submit = move |ev: leptos::ev::SubmitEvent| {
|
let on_submit = move |ev: leptos::ev::SubmitEvent| {
|
||||||
ev.prevent_default();
|
ev.prevent_default();
|
||||||
let new_user = User {
|
let mut new_user = User {
|
||||||
id: None,
|
id: None,
|
||||||
username: username.get(),
|
username: username.get(),
|
||||||
email: email.get(),
|
email: email.get(),
|
||||||
@ -29,11 +30,20 @@ pub fn Signup() -> impl IntoView {
|
|||||||
};
|
};
|
||||||
log!("new user: {:?}", new_user);
|
log!("new user: {:?}", new_user);
|
||||||
|
|
||||||
|
let user = GlobalState::logged_in_user();
|
||||||
|
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
if let Err(err) = signup(new_user).await {
|
if let Err(err) = signup(new_user.clone()).await {
|
||||||
// Handle the error here, e.g., log it or display to the user
|
// Handle the error here, e.g., log it or display to the user
|
||||||
log!("Error signing up: {:?}", err);
|
log!("Error signing up: {:?}", err);
|
||||||
|
|
||||||
|
// Since we're not sure what the state is, manually refetch the user
|
||||||
|
user.refetch();
|
||||||
} else {
|
} 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
|
// Redirect to the login page
|
||||||
log!("Signed up successfully!");
|
log!("Signed up successfully!");
|
||||||
leptos_router::use_navigate()("/", Default::default());
|
leptos_router::use_navigate()("/", Default::default());
|
||||||
|
|||||||
112
src/playbar.rs
112
src/playbar.rs
@ -1,10 +1,11 @@
|
|||||||
use crate::models::Artist;
|
use crate::models::Artist;
|
||||||
use crate::playstatus::PlayStatus;
|
|
||||||
use crate::songdata::SongData;
|
use crate::songdata::SongData;
|
||||||
use crate::api::songs;
|
use crate::api::songs;
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
use leptos::ev::MouseEvent;
|
use leptos::ev::MouseEvent;
|
||||||
use leptos::html::{Audio, Div};
|
use leptos::html::{Audio, Div};
|
||||||
use leptos::leptos_dom::*;
|
use leptos::leptos_dom::*;
|
||||||
|
use leptos_meta::Title;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_icons::*;
|
use leptos_icons::*;
|
||||||
use leptos_use::{utils::Pausable, use_interval_fn};
|
use leptos_use::{utils::Pausable, use_interval_fn};
|
||||||
@ -39,8 +40,8 @@ const HISTORY_LISTEN_THRESHOLD: u64 = MIN_SKIP_BACK_TIME as u64;
|
|||||||
/// * `None` if the audio element is not available
|
/// * `None` if the audio element is not available
|
||||||
/// * `Some((current_time, duration))` if the audio element is available
|
/// * `Some((current_time, duration))` if the audio element is available
|
||||||
///
|
///
|
||||||
pub fn get_song_time_duration(status: impl SignalWithUntracked<Value = PlayStatus>) -> Option<(f64, f64)> {
|
pub fn get_song_time_duration() -> Option<(f64, f64)> {
|
||||||
status.with_untracked(|status| {
|
GlobalState::play_status().with_untracked(|status| {
|
||||||
if let Some(audio) = status.get_audio() {
|
if let Some(audio) = status.get_audio() {
|
||||||
Some((audio.current_time(), audio.duration()))
|
Some((audio.current_time(), audio.duration()))
|
||||||
} else {
|
} else {
|
||||||
@ -60,13 +61,13 @@ pub fn get_song_time_duration(status: impl SignalWithUntracked<Value = PlayStatu
|
|||||||
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
||||||
/// * `time` - The time to skip to, in seconds
|
/// * `time` - The time to skip to, in seconds
|
||||||
///
|
///
|
||||||
pub fn skip_to(status: impl SignalUpdate<Value = PlayStatus>, time: f64) {
|
pub fn skip_to(time: f64) {
|
||||||
if time.is_infinite() || time.is_nan() {
|
if time.is_infinite() || time.is_nan() {
|
||||||
error!("Unable to skip to non-finite time: {}", time);
|
error!("Unable to skip to non-finite time: {}", time);
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
status.update(|status| {
|
GlobalState::play_status().update(|status| {
|
||||||
if let Some(audio) = status.get_audio() {
|
if let Some(audio) = status.get_audio() {
|
||||||
audio.set_current_time(time);
|
audio.set_current_time(time);
|
||||||
log!("Player skipped to time: {}", time);
|
log!("Player skipped to time: {}", time);
|
||||||
@ -84,8 +85,8 @@ pub fn skip_to(status: impl SignalUpdate<Value = PlayStatus>, time: f64) {
|
|||||||
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
||||||
/// * `play` - `true` to play the song, `false` to pause it
|
/// * `play` - `true` to play the song, `false` to pause it
|
||||||
///
|
///
|
||||||
pub fn set_playing(status: impl SignalUpdate<Value = PlayStatus>, play: bool) {
|
pub fn set_playing(play: bool) {
|
||||||
status.update(|status| {
|
GlobalState::play_status().update(|status| {
|
||||||
if let Some(audio) = status.get_audio() {
|
if let Some(audio) = status.get_audio() {
|
||||||
if play {
|
if play {
|
||||||
if let Err(e) = audio.play() {
|
if let Err(e) = audio.play() {
|
||||||
@ -108,8 +109,8 @@ pub fn set_playing(status: impl SignalUpdate<Value = PlayStatus>, play: bool) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn toggle_queue(status: impl SignalUpdate<Value = PlayStatus>) {
|
fn toggle_queue() {
|
||||||
status.update(|status| {
|
GlobalState::play_status().update(|status| {
|
||||||
status.queue_open = !status.queue_open;
|
status.queue_open = !status.queue_open;
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -125,8 +126,8 @@ fn toggle_queue(status: impl SignalUpdate<Value = PlayStatus>) {
|
|||||||
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
/// * `status` - The `PlayStatus` to get the audio element from, as a signal
|
||||||
/// * `src` - The source to set the audio player to
|
/// * `src` - The source to set the audio player to
|
||||||
///
|
///
|
||||||
fn set_play_src(status: impl SignalUpdate<Value = PlayStatus>, src: String) {
|
fn set_play_src(src: String) {
|
||||||
status.update(|status| {
|
GlobalState::play_status().update(|status| {
|
||||||
if let Some(audio) = status.get_audio() {
|
if let Some(audio) = status.get_audio() {
|
||||||
audio.set_src(&src);
|
audio.set_src(&src);
|
||||||
log!("Player set src to: {}", src);
|
log!("Player set src to: {}", src);
|
||||||
@ -138,11 +139,13 @@ fn set_play_src(status: impl SignalUpdate<Value = PlayStatus>, src: String) {
|
|||||||
|
|
||||||
/// The play, pause, and skip buttons
|
/// The play, pause, and skip buttons
|
||||||
#[component]
|
#[component]
|
||||||
fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
|
fn PlayControls() -> impl IntoView {
|
||||||
|
let status = GlobalState::play_status();
|
||||||
|
|
||||||
// On click handlers for the skip and play/pause buttons
|
// On click handlers for the skip and play/pause buttons
|
||||||
|
|
||||||
let skip_back = move |_| {
|
let skip_back = move |_| {
|
||||||
if let Some(duration) = get_song_time_duration(status) {
|
if let Some(duration) = get_song_time_duration() {
|
||||||
// Skip to previous song if the current song is near the start
|
// Skip to previous song if the current song is near the start
|
||||||
// Also skip to the previous song if we're at the end of the current song
|
// Also skip to the previous song if we're at the end of the current song
|
||||||
// This is because after running out of songs in the queue, the current song will be at the end
|
// This is because after running out of songs in the queue, the current song will be at the end
|
||||||
@ -159,8 +162,8 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
// Push the popped song to the front of the queue, and play it
|
// Push the popped song to the front of the queue, and play it
|
||||||
let next_src = last_played_song.song_path.clone();
|
let next_src = last_played_song.song_path.clone();
|
||||||
status.update(|status| status.queue.push_front(last_played_song));
|
status.update(|status| status.queue.push_front(last_played_song));
|
||||||
set_play_src(status, next_src);
|
set_play_src(next_src);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
} else {
|
} else {
|
||||||
warn!("Unable to skip back: No previous song");
|
warn!("Unable to skip back: No previous song");
|
||||||
}
|
}
|
||||||
@ -169,14 +172,14 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
|
|
||||||
// Default to skipping to start of current song, and playing
|
// Default to skipping to start of current song, and playing
|
||||||
log!("Skipping to start of current song");
|
log!("Skipping to start of current song");
|
||||||
skip_to(status, 0.0);
|
skip_to(0.0);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
let skip_forward = move |_| {
|
let skip_forward = move |_| {
|
||||||
if let Some(duration) = get_song_time_duration(status) {
|
if let Some(duration) = get_song_time_duration() {
|
||||||
skip_to(status, duration.1);
|
skip_to(duration.1);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
} else {
|
} else {
|
||||||
error!("Unable to skip forward: Unable to get current duration");
|
error!("Unable to skip forward: Unable to get current duration");
|
||||||
}
|
}
|
||||||
@ -184,7 +187,7 @@ fn PlayControls(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
|
|
||||||
let toggle_play = move |_| {
|
let toggle_play = move |_| {
|
||||||
let playing = status.with_untracked(|status| { status.playing });
|
let playing = status.with_untracked(|status| { status.playing });
|
||||||
set_playing(status, !playing);
|
set_playing(!playing);
|
||||||
};
|
};
|
||||||
|
|
||||||
// We use this to prevent the buttons from being focused when clicked
|
// We use this to prevent the buttons from being focused when clicked
|
||||||
@ -247,7 +250,9 @@ fn PlayDuration(elapsed_secs: MaybeSignal<i64>, total_secs: MaybeSignal<i64>) ->
|
|||||||
|
|
||||||
/// The name, artist, and album of the current song
|
/// The name, artist, and album of the current song
|
||||||
#[component]
|
#[component]
|
||||||
fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
|
fn MediaInfo() -> impl IntoView {
|
||||||
|
let status = GlobalState::play_status();
|
||||||
|
|
||||||
let name = Signal::derive(move || {
|
let name = Signal::derive(move || {
|
||||||
status.with(|status| {
|
status.with(|status| {
|
||||||
status.queue.front().map_or("No media playing".into(), |song| song.title.clone())
|
status.queue.front().map_or("No media playing".into(), |song| song.title.clone())
|
||||||
@ -286,7 +291,9 @@ fn MediaInfo(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
|
|
||||||
/// The like and dislike buttons
|
/// The like and dislike buttons
|
||||||
#[component]
|
#[component]
|
||||||
fn LikeDislike(status: RwSignal<PlayStatus>) -> impl IntoView {
|
fn LikeDislike() -> impl IntoView {
|
||||||
|
let status = GlobalState::play_status();
|
||||||
|
|
||||||
let like_icon = Signal::derive(move || {
|
let like_icon = Signal::derive(move || {
|
||||||
status.with(|status| {
|
status.with(|status| {
|
||||||
match status.queue.front() {
|
match status.queue.front() {
|
||||||
@ -399,7 +406,7 @@ fn LikeDislike(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
|
|
||||||
/// The play progress bar, and click handler for skipping to a certain time in the song
|
/// The play progress bar, and click handler for skipping to a certain time in the song
|
||||||
#[component]
|
#[component]
|
||||||
fn ProgressBar(percentage: MaybeSignal<f64>, status: RwSignal<PlayStatus>) -> impl IntoView {
|
fn ProgressBar(percentage: MaybeSignal<f64>) -> impl IntoView {
|
||||||
// Keep a reference to the progress bar div so we can get its width and calculate the time to skip to
|
// Keep a reference to the progress bar div so we can get its width and calculate the time to skip to
|
||||||
let progress_bar_ref = create_node_ref::<Div>();
|
let progress_bar_ref = create_node_ref::<Div>();
|
||||||
|
|
||||||
@ -411,10 +418,10 @@ fn ProgressBar(percentage: MaybeSignal<f64>, status: RwSignal<PlayStatus>) -> im
|
|||||||
let width = progress_bar.offset_width() as f64;
|
let width = progress_bar.offset_width() as f64;
|
||||||
let percentage = x_click_pos / width * 100.0;
|
let percentage = x_click_pos / width * 100.0;
|
||||||
|
|
||||||
if let Some(duration) = get_song_time_duration(status) {
|
if let Some(duration) = get_song_time_duration() {
|
||||||
let time = duration.1 * percentage / 100.0;
|
let time = duration.1 * percentage / 100.0;
|
||||||
skip_to(status, time);
|
skip_to(time);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
} else {
|
} else {
|
||||||
error!("Unable to skip to time: Unable to get current duration");
|
error!("Unable to skip to time: Unable to get current duration");
|
||||||
}
|
}
|
||||||
@ -437,11 +444,11 @@ fn ProgressBar(percentage: MaybeSignal<f64>, status: RwSignal<PlayStatus>) -> im
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
fn QueueToggle(status: RwSignal<PlayStatus>) -> impl IntoView {
|
fn QueueToggle() -> impl IntoView {
|
||||||
|
|
||||||
let update_queue = move |_| {
|
let update_queue = move |_| {
|
||||||
toggle_queue(status);
|
toggle_queue();
|
||||||
log!("queue button pressed, queue status: {:?}", status.with_untracked(|status| status.queue_open));
|
log!("queue button pressed, queue status: {:?}",
|
||||||
|
GlobalState::play_status().with_untracked(|status| status.queue_open));
|
||||||
};
|
};
|
||||||
|
|
||||||
// We use this to prevent the buttons from being focused when clicked
|
// We use this to prevent the buttons from being focused when clicked
|
||||||
@ -460,20 +467,37 @@ fn QueueToggle(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Renders the title of the page based on the currently playing song
|
||||||
|
#[component]
|
||||||
|
pub fn CustomTitle() -> impl IntoView {
|
||||||
|
let title = create_memo(move |_| {
|
||||||
|
GlobalState::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
|
/// The main play bar component, containing the progress bar, media info, play controls, and play duration
|
||||||
#[component]
|
#[component]
|
||||||
pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
|
pub fn PlayBar() -> impl IntoView {
|
||||||
|
let status = GlobalState::play_status();
|
||||||
|
|
||||||
// Listen for key down events -- arrow keys don't seem to trigger key press events
|
// Listen for key down events -- arrow keys don't seem to trigger key press events
|
||||||
let _arrow_key_handle = window_event_listener(ev::keydown, move |e: ev::KeyboardEvent| {
|
let _arrow_key_handle = window_event_listener(ev::keydown, move |e: ev::KeyboardEvent| {
|
||||||
if e.key() == "ArrowRight" {
|
if e.key() == "ArrowRight" {
|
||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
log!("Right arrow key pressed, skipping forward by {} seconds", ARROW_KEY_SKIP_TIME);
|
log!("Right arrow key pressed, skipping forward by {} seconds", ARROW_KEY_SKIP_TIME);
|
||||||
|
|
||||||
if let Some(duration) = get_song_time_duration(status) {
|
if let Some(duration) = get_song_time_duration() {
|
||||||
let mut time = duration.0 + ARROW_KEY_SKIP_TIME;
|
let mut time = duration.0 + ARROW_KEY_SKIP_TIME;
|
||||||
time = time.clamp(0.0, duration.1);
|
time = time.clamp(0.0, duration.1);
|
||||||
skip_to(status, time);
|
skip_to(time);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
} else {
|
} else {
|
||||||
error!("Unable to skip forward: Unable to get current duration");
|
error!("Unable to skip forward: Unable to get current duration");
|
||||||
}
|
}
|
||||||
@ -482,11 +506,11 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
log!("Left arrow key pressed, skipping backward by {} seconds", ARROW_KEY_SKIP_TIME);
|
log!("Left arrow key pressed, skipping backward by {} seconds", ARROW_KEY_SKIP_TIME);
|
||||||
|
|
||||||
if let Some(duration) = get_song_time_duration(status) {
|
if let Some(duration) = get_song_time_duration() {
|
||||||
let mut time = duration.0 - ARROW_KEY_SKIP_TIME;
|
let mut time = duration.0 - ARROW_KEY_SKIP_TIME;
|
||||||
time = time.clamp(0.0, duration.1);
|
time = time.clamp(0.0, duration.1);
|
||||||
skip_to(status, time);
|
skip_to(time);
|
||||||
set_playing(status, true);
|
set_playing(true);
|
||||||
} else {
|
} else {
|
||||||
error!("Unable to skip backward: Unable to get current duration");
|
error!("Unable to skip backward: Unable to get current duration");
|
||||||
}
|
}
|
||||||
@ -500,7 +524,7 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
log!("Space bar pressed, toggling play/pause");
|
log!("Space bar pressed, toggling play/pause");
|
||||||
|
|
||||||
let playing = status.with_untracked(|status| status.playing);
|
let playing = status.with_untracked(|status| status.playing);
|
||||||
set_playing(status, !playing);
|
set_playing(!playing);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -643,14 +667,14 @@ pub fn PlayBar(status: RwSignal<PlayStatus>) -> impl IntoView {
|
|||||||
<audio _ref=audio_ref on:play=on_play on:pause=on_pause
|
<audio _ref=audio_ref on:play=on_play on:pause=on_pause
|
||||||
on:timeupdate=on_time_update on:ended=on_end type="audio/mpeg" />
|
on:timeupdate=on_time_update on:ended=on_end type="audio/mpeg" />
|
||||||
<div class="playbar">
|
<div class="playbar">
|
||||||
<ProgressBar percentage=percentage.into() status=status />
|
<ProgressBar percentage=percentage.into() />
|
||||||
<div class="playbar-left-group">
|
<div class="playbar-left-group">
|
||||||
<MediaInfo status=status />
|
<MediaInfo />
|
||||||
<LikeDislike status=status />
|
<LikeDislike />
|
||||||
</div>
|
</div>
|
||||||
<PlayControls status=status />
|
<PlayControls />
|
||||||
<PlayDuration elapsed_secs=elapsed_secs.into() total_secs=total_secs.into() />
|
<PlayDuration elapsed_secs=elapsed_secs.into() total_secs=total_secs.into() />
|
||||||
<QueueToggle status=status />
|
<QueueToggle />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
11
src/queue.rs
11
src/queue.rs
@ -1,6 +1,6 @@
|
|||||||
use crate::models::Artist;
|
use crate::models::Artist;
|
||||||
use crate::playstatus::PlayStatus;
|
|
||||||
use crate::song::Song;
|
use crate::song::Song;
|
||||||
|
use crate::util::state::GlobalState;
|
||||||
use leptos::ev::MouseEvent;
|
use leptos::ev::MouseEvent;
|
||||||
use leptos::leptos_dom::*;
|
use leptos::leptos_dom::*;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
@ -9,22 +9,23 @@ use leptos::ev::DragEvent;
|
|||||||
|
|
||||||
const RM_BTN_SIZE: &str = "2.5rem";
|
const RM_BTN_SIZE: &str = "2.5rem";
|
||||||
|
|
||||||
fn remove_song_fn(index: usize, status: RwSignal<PlayStatus>) {
|
fn remove_song_fn(index: usize) {
|
||||||
if index == 0 {
|
if index == 0 {
|
||||||
log!("Error: Trying to remove currently playing song (index 0) from queue");
|
log!("Error: Trying to remove currently playing song (index 0) from queue");
|
||||||
} else {
|
} else {
|
||||||
log!("Remove Song from Queue: Song is not currently playing, deleting song from queue and not adding to history");
|
log!("Remove Song from Queue: Song is not currently playing, deleting song from queue and not adding to history");
|
||||||
status.update(|status| {
|
GlobalState::play_status().update(|status| {
|
||||||
status.queue.remove(index);
|
status.queue.remove(index);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Queue(status: RwSignal<PlayStatus>) -> impl IntoView {
|
pub fn Queue() -> impl IntoView {
|
||||||
|
let status = GlobalState::play_status();
|
||||||
|
|
||||||
let remove_song = move |index: usize| {
|
let remove_song = move |index: usize| {
|
||||||
remove_song_fn(index, status);
|
remove_song_fn(index);
|
||||||
log!("Removed song {}", index + 1);
|
log!("Removed song {}", index + 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -39,6 +39,23 @@ diesel::table! {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
playlist_songs (playlist_id, song_id) {
|
||||||
|
playlist_id -> Int4,
|
||||||
|
song_id -> Int4,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
playlists (id) {
|
||||||
|
id -> Int4,
|
||||||
|
created_at -> Timestamp,
|
||||||
|
updated_at -> Timestamp,
|
||||||
|
owner_id -> Int4,
|
||||||
|
name -> Text,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
diesel::table! {
|
diesel::table! {
|
||||||
song_artists (song_id, artist_id) {
|
song_artists (song_id, artist_id) {
|
||||||
song_id -> Int4,
|
song_id -> Int4,
|
||||||
@ -95,6 +112,9 @@ diesel::table! {
|
|||||||
|
|
||||||
diesel::joinable!(album_artists -> albums (album_id));
|
diesel::joinable!(album_artists -> albums (album_id));
|
||||||
diesel::joinable!(album_artists -> artists (artist_id));
|
diesel::joinable!(album_artists -> artists (artist_id));
|
||||||
|
diesel::joinable!(playlist_songs -> playlists (playlist_id));
|
||||||
|
diesel::joinable!(playlist_songs -> songs (song_id));
|
||||||
|
diesel::joinable!(playlists -> users (owner_id));
|
||||||
diesel::joinable!(song_artists -> artists (artist_id));
|
diesel::joinable!(song_artists -> artists (artist_id));
|
||||||
diesel::joinable!(song_artists -> songs (song_id));
|
diesel::joinable!(song_artists -> songs (song_id));
|
||||||
diesel::joinable!(song_dislikes -> songs (song_id));
|
diesel::joinable!(song_dislikes -> songs (song_id));
|
||||||
@ -111,6 +131,8 @@ diesel::allow_tables_to_appear_in_same_query!(
|
|||||||
artists,
|
artists,
|
||||||
friend_requests,
|
friend_requests,
|
||||||
friendships,
|
friendships,
|
||||||
|
playlist_songs,
|
||||||
|
playlists,
|
||||||
song_artists,
|
song_artists,
|
||||||
song_dislikes,
|
song_dislikes,
|
||||||
song_history,
|
song_history,
|
||||||
|
|||||||
@ -1,10 +1,13 @@
|
|||||||
use crate::models::{Album, Artist, Song};
|
use crate::models::{Album, Artist, Song};
|
||||||
|
use crate::components::dashboard_tile::DashboardTile;
|
||||||
|
|
||||||
use time::Date;
|
use serde::{Serialize, Deserialize};
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
|
||||||
/// Holds information about a song
|
/// 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.
|
/// 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 {
|
pub struct SongData {
|
||||||
/// Song id
|
/// Song id
|
||||||
pub id: i32,
|
pub id: i32,
|
||||||
@ -19,7 +22,7 @@ pub struct SongData {
|
|||||||
/// The duration of the song in seconds
|
/// The duration of the song in seconds
|
||||||
pub duration: i32,
|
pub duration: i32,
|
||||||
/// The song's release date
|
/// The song's release date
|
||||||
pub release_date: Option<Date>,
|
pub release_date: Option<NaiveDate>,
|
||||||
/// Path to song file, relative to the root of the web server.
|
/// Path to song file, relative to the root of the web server.
|
||||||
/// For example, `"/assets/audio/Song.mp3"`
|
/// For example, `"/assets/audio/Song.mp3"`
|
||||||
pub song_path: String,
|
pub song_path: String,
|
||||||
@ -47,7 +50,6 @@ impl TryInto<Song> for SongData {
|
|||||||
track: self.track,
|
track: self.track,
|
||||||
duration: self.duration,
|
duration: self.duration,
|
||||||
release_date: self.release_date,
|
release_date: self.release_date,
|
||||||
// TODO https://gitlab.mregirouard.com/libretunes/libretunes/-/issues/35
|
|
||||||
storage_path: self.song_path,
|
storage_path: self.song_path,
|
||||||
|
|
||||||
// Note that if the source of the image_path was the album, the image_path
|
// Note that if the source of the image_path was the album, the image_path
|
||||||
@ -60,3 +62,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)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ cfg_if! {
|
|||||||
use diesel::prelude::*;
|
use diesel::prelude::*;
|
||||||
use log::*;
|
use log::*;
|
||||||
use server_fn::error::NoCustomError;
|
use server_fn::error::NoCustomError;
|
||||||
use time::Date;
|
use chrono::NaiveDate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,15 +124,14 @@ async fn validate_track_number(track_number: Field<'static>) -> Result<Option<i3
|
|||||||
/// Validate the release date in a multipart field
|
/// 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]
|
/// Expects a field with a release date, and ensures it is a valid date in the format [year]-[month]-[day]
|
||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
async fn validate_release_date(release_date: Field<'static>) -> Result<Option<Date>, ServerFnError> {
|
async fn validate_release_date(release_date: Field<'static>) -> Result<Option<NaiveDate>, ServerFnError> {
|
||||||
match release_date.text().await {
|
match release_date.text().await {
|
||||||
Ok(release_date) => {
|
Ok(release_date) => {
|
||||||
if release_date.trim().is_empty() {
|
if release_date.trim().is_empty() {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
|
|
||||||
let date_format = time::macros::format_description!("[year]-[month]-[day]");
|
let release_date = NaiveDate::parse_from_str(&release_date.trim(), "%Y-%m-%d");
|
||||||
let release_date = Date::parse(&release_date.trim(), date_format);
|
|
||||||
|
|
||||||
match release_date {
|
match release_date {
|
||||||
Ok(release_date) => Ok(Some(release_date)),
|
Ok(release_date) => Ok(Some(release_date)),
|
||||||
@ -181,8 +180,7 @@ pub async fn upload(data: MultipartData) -> Result<(), ServerFnError> {
|
|||||||
ServerError("Title field required and must precede file field".to_string()))?;
|
ServerError("Title field required and must precede file field".to_string()))?;
|
||||||
|
|
||||||
let clean_title = title.replace(" ", "_").replace("/", "_");
|
let clean_title = title.replace(" ", "_").replace("/", "_");
|
||||||
let date_format = time::macros::format_description!("[year]-[month]-[day]_[hour]:[minute]:[second]");
|
let date_str = chrono::Utc::now().format("%Y-%m-%d_%H:%M:%S").to_string();
|
||||||
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);
|
let upload_path = format!("assets/audio/upload-{}_{}.mp3", date_str, clean_title);
|
||||||
file_name = Some(format!("upload-{}_{}.mp3", date_str, clean_title));
|
file_name = Some(format!("upload-{}_{}.mp3", date_str, clean_title));
|
||||||
|
|
||||||
|
|||||||
12
src/users.rs
12
src/users.rs
@ -128,3 +128,15 @@ pub async fn get_user(username_or_email: String) -> Result<Option<User>, ServerF
|
|||||||
|
|
||||||
Ok(user)
|
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)
|
||||||
|
}
|
||||||
|
|||||||
@ -5,3 +5,5 @@ cfg_if! {
|
|||||||
pub mod audio;
|
pub mod audio;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod state;
|
||||||
|
|||||||
49
src/util/state.rs
Normal file
49
src/util/state.rs
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
use leptos::*;
|
||||||
|
use leptos::logging::*;
|
||||||
|
|
||||||
|
use crate::playstatus::PlayStatus;
|
||||||
|
use crate::models::User;
|
||||||
|
use crate::auth::get_logged_in_user;
|
||||||
|
|
||||||
|
/// Global front-end state
|
||||||
|
/// Contains anything frequently needed across multiple components
|
||||||
|
/// Behaves like a singleton, in that provide/expect_context will
|
||||||
|
/// always return the same instance
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct GlobalState {
|
||||||
|
/// 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
|
||||||
|
pub logged_in_user: Resource<(), Option<User>>,
|
||||||
|
|
||||||
|
/// The current play status
|
||||||
|
pub play_status: RwSignal<PlayStatus>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GlobalState {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
let play_status = create_rw_signal(PlayStatus::default());
|
||||||
|
|
||||||
|
let logged_in_user = create_resource(|| (), |_| async {
|
||||||
|
get_logged_in_user().await
|
||||||
|
.inspect_err(|e| {
|
||||||
|
error!("Error getting logged in user: {:?}", e);
|
||||||
|
})
|
||||||
|
.ok()
|
||||||
|
.flatten()
|
||||||
|
});
|
||||||
|
|
||||||
|
Self {
|
||||||
|
logged_in_user,
|
||||||
|
play_status,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn logged_in_user() -> Resource<(), Option<User>> {
|
||||||
|
expect_context::<Self>().logged_in_user
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn play_status() -> RwSignal<PlayStatus> {
|
||||||
|
expect_context::<Self>().play_status
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,7 +1,6 @@
|
|||||||
@import "theme.scss";
|
@import "theme.scss";
|
||||||
|
|
||||||
.dashboard-container {
|
.dashboard-container {
|
||||||
width: calc(100% - 22rem - 16rem);
|
|
||||||
.dashboard-header {
|
.dashboard-header {
|
||||||
font-size: 1.2rem;
|
font-size: 1.2rem;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
|
|||||||
45
style/dashboard_row.scss
Normal file
45
style/dashboard_row.scss
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
28
style/dashboard_tile.scss
Normal file
28
style/dashboard_tile.scss
Normal file
@ -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;
|
||||||
|
}
|
||||||
18
style/error.scss
Normal file
18
style/error.scss
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -9,8 +9,9 @@
|
|||||||
}
|
}
|
||||||
.home-component {
|
.home-component {
|
||||||
background: #1c1c1c;
|
background: #1c1c1c;
|
||||||
height: 100vh;
|
width: calc(100% - 22rem - 16rem);
|
||||||
margin: 2px;
|
margin: 2px;
|
||||||
padding: 0.2rem 1.5rem 1.5rem 1rem;
|
padding: 0.2rem 1.5rem $playbar-size 1rem;
|
||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
|
overflow: scroll;
|
||||||
}
|
}
|
||||||
|
|||||||
59
style/loading.scss
Normal file
59
style/loading.scss
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
@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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -8,7 +8,13 @@
|
|||||||
@import 'home.scss';
|
@import 'home.scss';
|
||||||
@import 'search.scss';
|
@import 'search.scss';
|
||||||
@import 'personal.scss';
|
@import 'personal.scss';
|
||||||
|
@import 'dashboard_tile.scss';
|
||||||
|
@import 'dashboard_row.scss';
|
||||||
@import 'upload.scss';
|
@import 'upload.scss';
|
||||||
|
@import 'error.scss';
|
||||||
|
@import 'song_list.scss';
|
||||||
|
@import 'profile.scss';
|
||||||
|
@import 'loading.scss';
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
|
|||||||
@ -3,8 +3,7 @@
|
|||||||
.personal-container {
|
.personal-container {
|
||||||
width: 16rem;
|
width: 16rem;
|
||||||
background: #1c1c1c;
|
background: #1c1c1c;
|
||||||
height: 100vh;
|
margin: 2px;
|
||||||
margin: 0.2rem;
|
|
||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
|
|
||||||
.profile-container {
|
.profile-container {
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
.playbar {
|
.playbar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 75px;
|
height: $playbar-size;
|
||||||
background-color: $play-bar-background-color;
|
background-color: $play-bar-background-color;
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
|||||||
36
style/profile.scss
Normal file
36
style/profile.scss
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
@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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,6 +1,4 @@
|
|||||||
@import "theme.scss";
|
@import "theme.scss";
|
||||||
|
|
||||||
.search-container {
|
.search-container {
|
||||||
width: calc(100% - 22rem - 16rem);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
124
style/song_list.scss
Normal file
124
style/song_list.scss
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -14,3 +14,6 @@ $queue-background-color: $play-bar-background-color;
|
|||||||
|
|
||||||
$auth-inputs: #796dd4;
|
$auth-inputs: #796dd4;
|
||||||
$auth-containers: white;
|
$auth-containers: white;
|
||||||
|
|
||||||
|
$dashboard-tile-size: 200px;
|
||||||
|
$playbar-size: 75px;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user