From b38351c82129936c68c071554c8cc1c175da2257 Mon Sep 17 00:00:00 2001 From: JMARyA Date: Fri, 17 Jan 2025 19:35:35 +0100 Subject: [PATCH] update --- Cargo.lock | 250 ++++++++++++++++------------------------ Cargo.toml | 2 +- src/library/mod.rs | 5 +- src/main.rs | 6 - src/pages/components.rs | 138 +++++++++++----------- src/pages/index.rs | 21 +++- src/pages/user.rs | 11 +- src/pages/watch.rs | 148 ++++++++++++++++++------ 8 files changed, 308 insertions(+), 273 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e14b30..b5b08b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,18 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -83,9 +71,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -158,7 +146,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "based" version = "0.1.0" -source = "git+https://git.hydrar.de/jmarya/based#d6555edc29de66ff5190b716a1f8ebac8dbb2110" +source = "git+https://git.hydrar.de/jmarya/based?branch=ui#79f08fd202abcfbc52cbab09be7dccc02f4c7c01" dependencies = [ "bcrypt", "chrono", @@ -211,9 +199,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -263,9 +251,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.6" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -427,9 +415,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "der" @@ -477,7 +465,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "proc-macro2", "proc-macro2-diagnostics", "quote", @@ -573,9 +561,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -619,6 +607,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" + [[package]] name = "foreign-types" version = "0.3.2" @@ -813,24 +807,25 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] [[package]] name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] @@ -1185,9 +1180,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1220,16 +1215,15 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ - "cc", "pkg-config", "vcpkg", ] [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1249,9 +1243,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "loom" @@ -1321,17 +1315,11 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -1383,16 +1371,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1487,7 +1465,7 @@ version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "foreign-types", "libc", @@ -1560,12 +1538,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pear" version = "0.2.9" @@ -1606,9 +1578,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1683,9 +1655,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -1768,7 +1740,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -2017,11 +1989,11 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -2085,7 +2057,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", @@ -2094,9 +2066,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2124,9 +2096,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -2264,21 +2236,11 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - [[package]] name = "sqlx" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" +checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f" dependencies = [ "sqlx-core", "sqlx-macros", @@ -2289,38 +2251,32 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0" dependencies = [ - "atoi", - "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", "either", "event-listener", - "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "hashlink", - "hex", "indexmap", "log", "memchr", "native-tls", "once_cell", - "paste", "percent-encoding", "serde", "serde_json", "sha2", "smallvec", - "sqlformat", "thiserror", "tokio", "tokio-stream", @@ -2331,9 +2287,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310" dependencies = [ "proc-macro2", "quote", @@ -2344,9 +2300,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" +checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad" dependencies = [ "dotenvy", "either", @@ -2370,13 +2326,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" +checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.8.0", "byteorder", "bytes", "chrono", @@ -2414,13 +2370,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" +checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613" dependencies = [ "atoi", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.8.0", "byteorder", "chrono", "crc", @@ -2428,7 +2384,6 @@ dependencies = [ "etcetera", "futures-channel", "futures-core", - "futures-io", "futures-util", "hex", "hkdf", @@ -2454,9 +2409,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540" dependencies = [ "atoi", "chrono", @@ -2520,9 +2475,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.93" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -2569,12 +2524,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", @@ -2591,18 +2547,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -2677,9 +2633,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -2695,9 +2651,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -2920,12 +2876,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "untrusted" version = "0.7.1" @@ -2957,9 +2907,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "serde", @@ -2967,9 +2917,9 @@ dependencies = [ [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -3016,20 +2966,21 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -3041,9 +2992,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -3054,9 +3005,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3064,9 +3015,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -3077,9 +3028,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "watchdogs" @@ -3110,9 +3064,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -3327,9 +3281,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 0f163c3..21d8142 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,4 +24,4 @@ maud = "0.26.0" rand = "0.8.5" data-encoding = "2.6.0" bcrypt = "0.16.0" -based = { git = "https://git.hydrar.de/jmarya/based", features = ["cache", "htmx"] } +based = { git = "https://git.hydrar.de/jmarya/based", features = ["cache", "htmx"], branch = "ui" } diff --git a/src/library/mod.rs b/src/library/mod.rs index 41d3a61..312475f 100644 --- a/src/library/mod.rs +++ b/src/library/mod.rs @@ -254,7 +254,10 @@ impl Library { for path in lib { if !Video::has_path(&path.display().to_string()).await { - Video::insert_path_to_db(&path).await; + if let Some(video) = Video::insert_path_to_db(&path).await { + // Ensure thumbnail + self.get_thumbnail(&video).await; + } } } diff --git a/src/main.rs b/src/main.rs index ee2bb80..a717da1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,12 +35,6 @@ async fn launch() -> _ { library .scan_dir(&Path::new(&dir_path.clone()).to_path_buf()) .await; - - // Ensure thumbnails - for video in library.get_all_videos().await { - log::info!("Ensure thumbnail for {} [{}]", video.title, video.id); - library.get_thumbnail(&video).await; - } }); let cors = rocket_cors::CorsOptions { diff --git a/src/pages/components.rs b/src/pages/components.rs index 2e56bf7..1081b22 100644 --- a/src/pages/components.rs +++ b/src/pages/components.rs @@ -1,11 +1,12 @@ use crate::library::Video; +use based::ui::components::AppBar; +use based::ui::prelude::*; use based::{ auth::User, format::{format_date, format_number, format_seconds_to_hhmmss}, - page::script, request::{RequestContext, StringResponse}, }; -use maud::{html, PreEscaped}; +use maud::{html, PreEscaped, Render}; pub async fn render_page( ctx: RequestContext, @@ -13,33 +14,19 @@ pub async fn render_page( title: &str, user: Option, ) -> StringResponse { - based::page::render_page( + based::ui::render_page( content, title, ctx, - &based::page::Shell::new( + &based::ui::components::Shell::new( html! { script src="https://cdn.tailwindcss.com" {}; script src="/assets/htmx.min.js" {}; meta name="viewport" content="width=device-width, initial-scale=1.0"; }, html! { - header class="bg-gray-800 text-white shadow-md py-2" { - (script(include_str!("../scripts/header.js"))); - - div class="flex justify-between px-6" { - a href="/" class="flex items-center space-x-2" { - img src="/favicon" alt="Logo" class="w-10 h-10 rounded-md"; - span class="font-semibold text-xl" { "WatchDogs" }; - }; - - @if user.is_some() { - p { (user.unwrap().username) }; - }; - - }; - - }; + (script(include_str!("../scripts/header.js"))); + (AppBar("WatchDogs", user)) }, Some(String::from("bg-black text-white")), ), @@ -47,52 +34,31 @@ pub async fn render_page( .await } -pub fn loading_spinner() -> PreEscaped { - html! { - style { - ".spinner { display: flex;justify-content: center;align-items: center;height: 100vh;} - .spinner-border { border: 2px solid #007bff;border-top: 2px solid transparent;border-radius: 50%;width: 40px;height: 40px;animation: spin 1s linear infinite;} - @keyframes spin {0% { transform: rotate(0deg); }100% { transform: rotate(360deg); }}" - }; - div class="spinner" { - div class="spinner-border" {}; - }; - } -} - -pub fn search_bar(query: &str) -> PreEscaped { - html! { - form hx-get="/search" action="/search" hx-push-url="true" hx-target="#main-view" hx-swap="innerHTML" { - input style="width: 100%;" value=(query) name="query" type="search" placeholder="Search..."; - }; - } -} - pub async fn video_element_wide(video: &Video) -> PreEscaped { html!( - a href=(format!("/watch?v={}", video.id)) class="flex items-center w-full p-4 bg-gray-900 shadow-lg rounded-lg overflow-hidden mb-2 mt-2" { + a href=(format!("/watch?v={}", video.id)) class="flex items-center w-full my-4 bg-gray-900 hover:bg-gray-800 shadow-lg rounded-lg overflow-hidden" { div class="flex-shrink-0 relative" { - img width="480" src=(format!("/video/thumbnail?v={}", video.id)) class="w-48 h-32 object-cover rounded-md"; + img width="480" src=(format!("/video/thumbnail?v={}", video.id)) class="aspect-video w-32 w-48 rounded-md object-cover"; span class="absolute bottom-2 right-2 bg-black text-white text-xs px-2 py-1 rounded-sm opacity-90" { (( format_seconds_to_hhmmss(video.duration) )) }; }; - div class="flex flex-col flex-grow ml-4" { - h3 class="text-lg font-semibold mb-1" title=(video.title) { - ( video.title ) - }; + div class="flex flex-col flex-grow ml-2" { + (Margin(Text(&video.title).large().semibold().max_lines(LineClamp::_3).title(&video.title).align(TextAlignment::Start) + ).bottom(ScreenValue::_1) + ) @if let Some(meta) = video.youtube_meta().await { div class="text-sm text-gray-400 mb-2" { - span class="font-medium" { ( meta.uploader_name ) } - span { " - " } - span { ( format_date(&meta.upload_date) ) } + (Span(&meta.uploader_name).medium()) + (Span(" - ")) + (Span(&format_date(&meta.upload_date))) }; div class="text-sm text-gray-400" { - span { ( format_number(meta.views) ) } - span { " views" } + (Span(&format_number(meta.views))) + (Span(" views")) }; }; }; @@ -100,25 +66,53 @@ pub async fn video_element_wide(video: &Video) -> PreEscaped { ) } +pub fn video_thumbnail_with_time(video: &Video) -> PreEscaped { + html! { + div class="relative" { + img width="480" src=(format!("/video/thumbnail?v={}", video.id)) class="w-full h-auto object-cover aspect-video"; + span class="absolute bottom-2 right-2 bg-black text-white text-xs px-2 py-1 rounded-sm opacity-90" { + (( format_seconds_to_hhmmss(video.duration) )) + }; + }; + } +} + pub async fn video_element(video: &mut Video) -> PreEscaped { - html!( - a href=(format!("/watch?v={}", video.id)) class="max-w-sm mx-auto p-4 max-h-60 aspect-video" { - div class="bg-gray-900 shadow-lg rounded-lg overflow-hidden" { - div class="relative" { - img width="480" src=(format!("/video/thumbnail?v={}", video.id)) class="w-full h-auto object-cover aspect-video"; - span class="absolute bottom-2 right-2 bg-black text-white text-xs px-2 py-1 rounded-sm opacity-90" { - (( format_seconds_to_hhmmss(video.duration) )) - }; - }; - - div class="bg-gray-900 shadow-lg rounded-lg overflow-hidden" { - div class="p-4" { - h3 class="text-lg font-semibold" title=(video.title) { - ( video.title ) - }; - }; - }; - }; - }; - ) + Margin(Context(MaxWidth( + ScreenValue::_90, + MaxHeight( + ScreenValue::_60, + Aspect::video(Link( + &format!("/watch?v={}", video.id), + Context( + Hover(Background(Gray::_800, Nothing())).on(Background( + Gray::_900, + Shadow::large( + Rounded( + Div().push(video_thumbnail_with_time(&video)).push(Context( + Rounded(Shadow::large( + Padding( + Text(&video.title) + .base_size() + .semibold() + .align(TextAlignment::Start) + .title(&video.title) + .max_lines(LineClamp::_1) + .overflow(TextOverflow::Truncate), + ) + .y(ScreenValue::_4) + .x(ScreenValue::_2), + )) + .size(Size::Large), + )), + ) + .size(Size::Large), + ), + )), + ), + )), + ), + ))) + .y(ScreenValue::_6) + .render() } diff --git a/src/pages/index.rs b/src/pages/index.rs index 407f8c7..28aaf7e 100644 --- a/src/pages/index.rs +++ b/src/pages/index.rs @@ -1,6 +1,7 @@ +use based::ui::htmx::HTMXAttributes; +use based::ui::prelude::*; use based::{ auth::MaybeUser, - page::htmx_link, request::{ api::{vec_to_api, FallibleApiResponse}, RequestContext, StringResponse, @@ -102,7 +103,7 @@ pub async fn index_page( }; }; - h1 class="text-center text-4xl font-extrabold leading-tight mt-10" { a href="/latest" { "Latest Videos" };}; + h1 class="text-center text-4xl font-extrabold leading-tight mt-16" { a href="/latest" { "Latest Videos" };}; div class="lg:grid grid-cols-3 gap-6 p-6 mb-4" { @for mut vid in library.get_newly_added(3).await { ( video_element(&mut vid).await ); @@ -112,7 +113,21 @@ pub async fn index_page( h1 class="text-center text-4xl font-extrabold leading-tight mt-8" { "Directories:" }; div class="flex flex-wrap p-10" { @for dir in library.get_directories().await { - (htmx_link(&format!("/d/{dir}"), "px-3 py-2 m-2 bg-purple-500 text-white rounded-full cursor-pointer hover:bg-purple-600", "", html! { (dir) })); + + + (Margin( + Padding( + Hover(Background(Purple::_600, Nothing())).on( + Background(Purple::_500, + Rounded( + // TODO : Implement cursor-pointer + Link( + &format!("/d/{dir}"), + Text(&dir).white() + ).use_htmx() + ).size(Size::Full) + )) + ).x(ScreenValue::_3).y(ScreenValue::_2)).all(ScreenValue::_2)) br; }; }; diff --git a/src/pages/user.rs b/src/pages/user.rs index 64bcecf..1fd4ec3 100644 --- a/src/pages/user.rs +++ b/src/pages/user.rs @@ -1,5 +1,6 @@ use based::auth::{Sessions, User}; use based::request::StringResponse; +use based::ui::prelude::*; use based::{auth::MaybeUser, request::RequestContext}; use maud::html; use rocket::http::CookieJar; @@ -51,11 +52,11 @@ pub async fn login_post(login_form: Form, cookies: &CookieJar<'_>) -> pub async fn history_page(ctx: RequestContext, user: User) -> StringResponse { let content = html! { h1 class="text-center text-4xl font-extrabold leading-tight mt-4 mb-2" { "History" }; - div class="p-6" { - @for mut vid in user.history_of(10).await { - ( video_element_wide(&mut vid).await ); - }; - }; + (Padding(html! { + @for mut vid in user.history_of(10).await { + ( video_element_wide(&mut vid).await ); + }; + }).all(ScreenValue::_6)) }; render_page(ctx, content, "History", Some(user)).await diff --git a/src/pages/watch.rs b/src/pages/watch.rs index 80d6184..74f163c 100644 --- a/src/pages/watch.rs +++ b/src/pages/watch.rs @@ -1,11 +1,15 @@ +use based::ui::primitives::space::Fraction; +use based::ui::{prelude::*, AttrExtendable}; use based::{ auth::MaybeUser, format::format_date, request::{RequestContext, StringResponse}, }; -use maud::html; +use maud::{html, PreEscaped, Render}; use rocket::{get, State}; +use crate::library::Video; +use crate::yt_meta::YouTubeMeta; use crate::{ library::{history::VideoHistory, Library}, pages::components::video_element_wide, @@ -31,43 +35,75 @@ pub async fn watch_page( user.insert_history(video.id).await; } - let content = html!( - main class="container mx-auto mt-6 flex flex-col lg:flex-row gap-6" { - div class="lg:w-10/12 mt-10" { - div class="bg-black aspect-video rounded-lg overflow-hidden" { - video - controls - autoplay - class="w-full h-full" { - source src=(format!("/video/raw?v={}", video.id)) type="video/mp4" { - "Your browser does not support the video" + let youtube_meta = video.youtube_meta().await; + let rec = build_rec(&library, &video).await; + + let content = Container( + Margin( + Screen::large(Flex(Nothing()).direction(Direction::Row)).on( + Flex( + Div().vanish() + .push( + Margin( + Screen::large(Width(Fraction::_10on12, Nothing())).on( + Div().push( + Context(Aspect::video( + Background(Colors::Black, + Rounded( + html! { + video + controls + autoplay + class="w-full h-full" { + source src=(format!("/video/raw?v={}", video.id)) type="video/mp4" { + "Your browser does not support the video" + }; }; - }; - }; - div class="p-4 bg-stone-900 rounded-lg shadow-lg mt-8" { - h2 class="text-2xl font-semibold" { (video.title) }; - - @if let Some(meta) = video.youtube_meta().await { - div class="flex justify-between mt-2" { - p class="mb-4 text-gray-300" { (meta.uploader_name) }; - p class="mb-4 text-gray-300" { (format!("{} Views ﹣ {}", meta.views, format_date(&meta.upload_date))) }; - }; - - a href=(format!("https://www.youtube.com/watch?v={}", meta.id)) class="text-blue-400" {"Watch on YouTube" }; - - p class="mb-2 text-gray-300 text-bold mt-2" { "Description: " } span { (meta.description) }; - }; - - }; - }; - div id="recommendations" class="mt-8 w-1/3" { - h3 class="text-center text-4xl font-extrabold leading-tight mb-2" { "In " a class="text-blue-500" href=(format!("/d/{}", video.directory)) { (video.directory) }; } - @for video in library.get_directory_videos(&video.directory).await { - (video_element_wide(&video).await); - }; - }; - }; - ); + } + ).size(Size::Large) + ) + )) + ).push( + Context(Margin(Padding( + Background(Stone::_900, + Rounded( + Shadow::large( + Div() + .push( + Text(&video.title)._2xl().semibold() + ) + .push_some(youtube_meta.as_ref(), |meta: &_| { + Div().vanish() + .push( + Margin(Flex( + Div().vanish().push( + Margin(Text(&format_date(&meta.upload_date)).color(&Gray::_300)).bottom(ScreenValue::_4) + ).push( + Margin(Text(&format!("{} Views ﹣ {}", meta.views, format_date(&meta.upload_date))).color(&Gray::_300)).bottom(ScreenValue::_4) + ) + ).justify(Justify::Between).group()).top(ScreenValue::_2) + ) + .push( + Link(&format!("https://www.youtube.com/watch?v={}", meta.id), + Text("Watch on YouTube").color(&Red::_400) + ) + ).push( + Margin(Text(&meta.description).bold().color(&Gray::_300).wrap(TextWrap::Pretty).whitespace(TextWhitespace::BreakSpaces)).bottom(ScreenValue::_2).top(ScreenValue::_2) + ) + } + ) + )).size(Size::Large) + ) + ).all(ScreenValue::_4)).top(ScreenValue::_8)) + ) + ) + ).top(ScreenValue::_10) + ).push( + rec + ) + ).direction(Direction::Column).gap(ScreenValue::_6)) + ).x(ScreenValue::auto).top(ScreenValue::_6) + ).render(); render_page( ctx, @@ -77,3 +113,41 @@ pub async fn watch_page( ) .await } + +pub async fn build_rec(library: &Library, video: &Video) -> PreEscaped { + let videos = library.get_directory_videos(&video.directory).await; + + let video_elements = html! { + @for video in videos { + (video_element_wide(&video).await); + }; + }; + + Margin(Width( + Fraction::_1on3, + Div() + .id("recommendations") + .push( + Margin( + Paragraph(Context( + SpaceBetween( + Flex(Div().vanish().push(Span("In ")).push(Link( + &format!("/d/{}", video.directory), + Text(&video.directory).color(&Blue::_500), + ))) + .group() + .justify(Justify::Center), + ) + .x(ScreenValue::_2), + )) + .align(TextAlignment::Center) + ._4xl() + .extrabold(), + ) + .bottom(ScreenValue::_2), + ) + .push(video_elements), + )) + .top(ScreenValue::_8) + .render() +}