From 54951621e4fbff248a7ecb37051765517d8830fe Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 15 Nov 2024 12:20:55 +0100
Subject: [PATCH 01/16] wip: upgrade leptos

---
 Cargo.lock                                    | 760 +++++++++---------
 Cargo.toml                                    |  12 +-
 src/backend/assets.rs                         |   2 +-
 src/backend/mod.rs                            |   4 +-
 src/common/mod.rs                             |  20 +
 src/frontend/api.rs                           |   4 +-
 src/frontend/app.rs                           |  55 +-
 src/frontend/components/article_nav.rs        |  28 +-
 src/frontend/components/connect.rs            |  21 +-
 src/frontend/components/credentials.rs        |  14 +-
 src/frontend/components/editor.rs             |  10 +-
 .../components/instance_follow_button.rs      |   8 +-
 src/frontend/components/nav.rs                |  16 +-
 src/frontend/dark_mode.rs                     |   2 +-
 src/frontend/mod.rs                           |   2 +-
 src/frontend/pages/article/actions.rs         |  20 +-
 src/frontend/pages/article/create.rs          |  21 +-
 src/frontend/pages/article/edit.rs            |  23 +-
 src/frontend/pages/article/history.rs         |   2 +-
 src/frontend/pages/article/list.rs            |   7 +-
 src/frontend/pages/article/read.rs            |   2 +-
 src/frontend/pages/diff.rs                    |   6 +-
 src/frontend/pages/instance/details.rs        |  10 +-
 src/frontend/pages/instance/list.rs           |   8 +-
 src/frontend/pages/login.rs                   |  12 +-
 src/frontend/pages/mod.rs                     |  10 +-
 src/frontend/pages/notifications.rs           |  16 +-
 src/frontend/pages/register.rs                |  13 +-
 src/frontend/pages/search.rs                  |  12 +-
 src/frontend/pages/user_profile.rs            |  10 +-
 30 files changed, 599 insertions(+), 531 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f4b086..5d76a59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,7 +36,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "thiserror",
+ "thiserror 1.0.65",
  "tokio",
  "tower 0.4.13",
  "tracing",
@@ -110,6 +110,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "any_spawner"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9747eb01aed7603aba23f7c869d5d7e5d37aab9c3501aced42d8fdb786f1f6e3"
+dependencies = [
+ "futures",
+ "thiserror 1.0.65",
+ "tokio",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.91"
@@ -139,17 +151,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.83"
@@ -158,7 +159,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -178,7 +179,7 @@ dependencies = [
  "manyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -194,7 +195,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -290,7 +291,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -415,38 +416,6 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
-[[package]]
-name = "cached"
-version = "0.45.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eb5776f28a149524d1d8623035760b4454ec881e8cf3838fa8d7e1b11254b3"
-dependencies = [
- "cached_proc_macro",
- "cached_proc_macro_types",
- "hashbrown 0.13.2",
- "instant",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "cached_proc_macro"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "cached_proc_macro_types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
-
 [[package]]
 name = "camino"
 version = "1.1.9"
@@ -495,33 +464,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -538,7 +480,9 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
 dependencies = [
- "thiserror",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -641,6 +585,12 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "const_str_slice_concat"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67855af358fcb20fac58f9d714c94e2b228fe5694c1c9b4ead4a366343eda1b"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -827,7 +777,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -860,16 +810,17 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.5.3"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
+ "crossbeam-utils",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
@@ -885,7 +836,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -927,7 +878,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -969,7 +920,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -989,7 +940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core 0.20.2",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1002,7 +953,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1029,7 +980,7 @@ checksum = "d5adf688c584fe33726ce0e2898f608a2a92578ac94a4a92fcecf73214fe0716"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1042,7 +993,7 @@ dependencies = [
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1062,7 +1013,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
 dependencies = [
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1099,7 +1050,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1157,7 +1108,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1191,6 +1142,15 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
+[[package]]
+name = "either_of"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6e22feb4d5cacf9f2c64902a1c35ef0f2d766e42db316a98b93992bbce669cb"
+dependencies = [
+ "pin-project-lite",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1398,7 +1358,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1485,7 +1445,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.65",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1516,6 +1476,12 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "guardian"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
+
 [[package]]
 name = "h2"
 version = "0.4.6"
@@ -1535,22 +1501,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1665,7 +1615,7 @@ dependencies = [
  "reqwest",
  "reqwest-middleware",
  "sha2",
- "thiserror",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -1681,6 +1631,22 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "hydration_context"
+version = "0.2.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571a2756b518de368146ba56d4feeba265b0b555d176d49b8debd9ce9b69a6fa"
+dependencies = [
+ "futures",
+ "js-sys",
+ "once_cell",
+ "or_poisoned",
+ "pin-project-lite",
+ "serde",
+ "throw_error",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "hyper"
 version = "1.5.0"
@@ -1829,7 +1795,7 @@ dependencies = [
  "time",
  "tokio",
  "tower 0.5.1",
- "tower-http",
+ "tower-http 0.6.1",
  "tower-layer",
  "tracing",
  "url",
@@ -1881,15 +1847,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "interpolator"
 version = "0.5.0"
@@ -1917,15 +1874,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1943,9 +1891,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1987,7 +1935,7 @@ dependencies = [
  "ducc",
  "itertools 0.10.5",
  "js-sys",
- "thiserror",
+ "thiserror 1.0.65",
  "wasm-bindgen",
 ]
 
@@ -2002,18 +1950,35 @@ dependencies = [
 
 [[package]]
 name = "leptos"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cbb3237c274dadf00dcc27db96c52601b40375117178fb24a991cda073624f0"
+checksum = "87a99b3ca2611376257a8b29466dc5ebf22c6bbed8715f86847808c269844785"
 dependencies = [
+ "any_spawner",
+ "base64 0.22.1",
  "cfg-if",
+ "either_of",
+ "futures",
+ "hydration_context",
  "leptos_config",
  "leptos_dom",
+ "leptos_hot_reload",
  "leptos_macro",
- "leptos_reactive",
  "leptos_server",
+ "oco_ref",
+ "or_poisoned",
+ "paste",
+ "rand",
+ "reactive_graph",
+ "rustc-hash",
+ "send_wrapper",
+ "serde",
+ "serde_qs",
  "server_fn",
- "tracing",
+ "slotmap",
+ "tachys",
+ "thiserror 1.0.65",
+ "throw_error",
  "typed-builder",
  "typed-builder-macro",
  "wasm-bindgen",
@@ -2022,9 +1987,9 @@ dependencies = [
 
 [[package]]
 name = "leptos-use"
-version = "0.13.6"
+version = "0.14.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f918fb333772f6401d671f996689e7258e3bee31e4108d5e142566897c678a50"
+checksum = "fc40bd3ae7bf4dd84b5a67f7fc0e91d0335341e07430900001242dd81ac7aec2"
 dependencies = [
  "cfg-if",
  "codee",
@@ -2038,7 +2003,8 @@ dependencies = [
  "leptos",
  "leptos_axum",
  "paste",
- "thiserror",
+ "send_wrapper",
+ "thiserror 2.0.3",
  "unic-langid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -2047,14 +2013,15 @@ dependencies = [
 
 [[package]]
 name = "leptos_axum"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "910681b920c48a43508b2bd0261bdb67c4ef9456a0b3613f956a0d30e832e9de"
+checksum = "1f62374846ed04ab8b4e1ed27e0f276f692ef4f4955e0ba62509bc25fa392987"
 dependencies = [
+ "any_spawner",
  "axum",
- "cfg-if",
+ "dashmap",
  "futures",
- "http-body-util",
+ "hydration_context",
  "leptos",
  "leptos_integration_utils",
  "leptos_macro",
@@ -2062,61 +2029,45 @@ dependencies = [
  "leptos_router",
  "once_cell",
  "parking_lot",
- "serde_json",
  "server_fn",
  "tokio",
- "tokio-util",
- "tracing",
+ "tower 0.4.13",
+ "tower-http 0.5.2",
 ]
 
 [[package]]
 name = "leptos_config"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ed778611380ddea47568ac6ad6ec5158d39b5bd59e6c4dcd24efc15dc3dc0d"
+checksum = "04c89503f59940cef245827075362107d4d53f9a710db31bfc361151866ba39e"
 dependencies = [
  "config",
  "regex",
  "serde",
- "thiserror",
+ "thiserror 1.0.65",
  "typed-builder",
 ]
 
 [[package]]
 name = "leptos_dom"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8401c46c86c1f4c16dcb7881ed319fcdca9cda9b9e78a6088955cb423afcf119"
+checksum = "b108dc3960fac70b98d2302e568cd51c4d09255f1925bb797eba95575acc69b8"
 dependencies = [
- "async-recursion",
- "cfg-if",
- "drain_filter_polyfill",
- "futures",
- "getrandom",
- "html-escape",
- "indexmap",
- "itertools 0.12.1",
  "js-sys",
- "leptos_reactive",
- "once_cell",
- "pad-adapter",
- "paste",
- "rustc-hash 1.1.0",
- "serde",
- "serde_json",
- "server_fn",
- "smallvec",
- "tracing",
+ "or_poisoned",
+ "reactive_graph",
+ "send_wrapper",
+ "tachys",
  "wasm-bindgen",
- "wasm-bindgen-futures",
  "web-sys",
 ]
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb53d4794240b684a2f4be224b84bee9e62d2abc498cf2bcd643cd565e01d96"
+checksum = "10230c3b99bffd7490f192c54e02f0b35411d08089aba7f662d78be2adfbb736"
 dependencies = [
  "anyhow",
  "camino",
@@ -2126,35 +2077,36 @@ dependencies = [
  "quote",
  "rstml",
  "serde",
- "syn 2.0.85",
+ "syn 2.0.87",
  "walkdir",
 ]
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a96976631c2225ec116a7bf9c0ed5bf6999a19fed33f5e3cbcf37af44c384dc"
+checksum = "e66a88bbaf3f6689f7878c2a40bb80af84a9e23acfde483b34c811cdcc975a40"
 dependencies = [
  "futures",
+ "hydration_context",
  "leptos",
  "leptos_config",
- "leptos_hot_reload",
  "leptos_meta",
- "tracing",
+ "leptos_router",
+ "reactive_graph",
 ]
 
 [[package]]
 name = "leptos_macro"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b13bc3db70715cd8218c4535a5af3ae3c0e5fea6f018531fc339377b36bc0e0"
+checksum = "0e948a21600d13a6e91d9a0fb56de9c58692f79890caeaec7dabb1cd63e8ec92"
 dependencies = [
  "attribute-derive",
  "cfg-if",
  "convert_case 0.6.0",
  "html-escape",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "leptos_hot_reload",
  "prettyplease",
  "proc-macro-error2",
@@ -2162,99 +2114,80 @@ dependencies = [
  "quote",
  "rstml",
  "server_fn_macro",
- "syn 2.0.85",
- "tracing",
+ "syn 2.0.87",
  "uuid",
 ]
 
 [[package]]
 name = "leptos_meta"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25acc2f63cf91932013e400a95bf6e35e5d3dbb44a7b7e25a8e3057d12005b3b"
+checksum = "15ad116cab8a1073bb6556d65c153d4c951ff06fa84387f723289ee16bb6a7b4"
 dependencies = [
- "cfg-if",
- "indexmap",
- "leptos",
- "tracing",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "leptos_reactive"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4161acbf80f59219d8d14182371f57302bc7ff81ee41aba8ba1ff7295727f23"
-dependencies = [
- "base64 0.22.1",
- "cfg-if",
  "futures",
  "indexmap",
- "js-sys",
- "oco_ref",
- "paste",
- "pin-project",
- "rustc-hash 1.1.0",
- "self_cell",
- "serde",
- "serde-wasm-bindgen",
- "serde_json",
- "slotmap",
- "thiserror",
- "tokio",
- "tracing",
+ "leptos",
+ "once_cell",
+ "or_poisoned",
+ "send_wrapper",
  "wasm-bindgen",
- "wasm-bindgen-futures",
  "web-sys",
 ]
 
 [[package]]
 name = "leptos_router"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d71dea7d42c0d29c40842750232d3425ed1cf10e313a1f898076d20871dad32"
+checksum = "9924f84cfc4dbe4440c2e58bf54694471e96b21557cb1e693e5bd73f3acae355"
 dependencies = [
- "cached",
- "cfg-if",
+ "any_spawner",
+ "either_of",
+ "futures",
  "gloo-net",
- "itertools 0.12.1",
  "js-sys",
- "lazy_static",
  "leptos",
- "leptos_integration_utils",
- "leptos_meta",
- "linear-map",
- "lru",
+ "leptos_router_macro",
  "once_cell",
+ "or_poisoned",
  "percent-encoding",
- "regex",
+ "reactive_graph",
  "send_wrapper",
- "serde",
- "serde_json",
- "serde_qs 0.13.0",
- "thiserror",
- "tracing",
+ "tachys",
+ "thiserror 1.0.65",
  "url",
  "wasm-bindgen",
- "wasm-bindgen-futures",
  "web-sys",
 ]
 
 [[package]]
-name = "leptos_server"
-version = "0.6.15"
+name = "leptos_router_macro"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a97eb90a13f71500b831c7119ddd3bdd0d7ae0a6b0487cade4fddeed3b8c03f"
+checksum = "cf8fc6fbb1d1f8f3656b8e33265a2e92319fb877b38014407767d85362f528cb"
 dependencies = [
- "inventory",
- "lazy_static",
- "leptos_macro",
- "leptos_reactive",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "leptos_server"
+version = "0.7.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd1abdb945660f19f7510bdf208069d3bc391aa9bb7183aa58e4af5429e6115"
+dependencies = [
+ "any_spawner",
+ "base64 0.22.1",
+ "codee",
+ "futures",
+ "hydration_context",
+ "or_poisoned",
+ "reactive_graph",
+ "send_wrapper",
  "serde",
+ "serde_json",
  "server_fn",
- "thiserror",
- "tracing",
+ "tachys",
 ]
 
 [[package]]
@@ -2274,10 +2207,6 @@ name = "linear-map"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee"
-dependencies = [
- "serde",
- "serde_test",
-]
 
 [[package]]
 name = "linked-hash-map"
@@ -2316,15 +2245,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "lru"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
 [[package]]
 name = "manyhow"
 version = "0.10.4"
@@ -2334,7 +2254,7 @@ dependencies = [
  "manyhow-macros",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2524,7 +2444,7 @@ dependencies = [
  "rustc_version",
  "smallvec",
  "tagptr",
- "thiserror",
+ "thiserror 1.0.65",
  "triomphe",
  "uuid",
 ]
@@ -2563,6 +2483,12 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "next_tuple"
+version = "0.1.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3615947b64839fe27e9ee557f282b04ad13ead564a543a6548b0cfd17457ff4"
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2656,12 +2582,12 @@ dependencies = [
 
 [[package]]
 name = "oco_ref"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51ebcefb2f0b9a5e0bea115532c8ae4215d1b01eff176d0f4ba4192895c2708"
+checksum = "64b94982fe39a861561cf67ff17a7849f2cedadbbad960a797634032b7abb998"
 dependencies = [
  "serde",
- "thiserror",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -2693,7 +2619,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2714,6 +2640,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "or_poisoned"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c04f5d74368e4d0dfe06c45c8627c81bd7c317d52762d118fb9b3076f6420fd"
+
 [[package]]
 name = "ordered-multimap"
 version = "0.7.3"
@@ -2724,12 +2656,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "pad-adapter"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d80efc4b6721e8be2a10a5df21a30fa0b470f1539e53d8b4e6e75faf938b63"
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2803,7 +2729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.65",
  "ucd-trie",
 ]
 
@@ -2827,7 +2753,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2858,7 +2784,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2954,7 +2880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2999,6 +2925,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3040,7 +2967,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
  "version_check",
  "yansi",
 ]
@@ -3104,10 +3031,10 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.0.0",
+ "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
 ]
@@ -3121,10 +3048,10 @@ dependencies = [
  "bytes",
  "rand",
  "ring",
- "rustc-hash 2.0.0",
+ "rustc-hash",
  "rustls",
  "slab",
- "thiserror",
+ "thiserror 1.0.65",
  "tinyvec",
  "tracing",
 ]
@@ -3171,7 +3098,7 @@ dependencies = [
  "proc-macro-utils 0.10.0",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3224,6 +3151,55 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
+[[package]]
+name = "reactive_graph"
+version = "0.1.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cdfe96bdf3d95c9bdd15af1cfc82252ef85c026ea960f83df53feca9fec61a"
+dependencies = [
+ "any_spawner",
+ "async-lock",
+ "futures",
+ "guardian",
+ "hydration_context",
+ "or_poisoned",
+ "pin-project-lite",
+ "rustc-hash",
+ "send_wrapper",
+ "serde",
+ "slotmap",
+ "thiserror 1.0.65",
+ "web-sys",
+]
+
+[[package]]
+name = "reactive_stores"
+version = "0.1.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fa994eaec6638c22faeedd4524cbd5a3653e7f32a67e130a60a0c8c9e1ee81"
+dependencies = [
+ "guardian",
+ "itertools 0.13.0",
+ "or_poisoned",
+ "paste",
+ "reactive_graph",
+ "reactive_stores_macro",
+ "rustc-hash",
+]
+
+[[package]]
+name = "reactive_stores_macro"
+version = "0.1.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9d7cfe1c6d9f1005605ac7c928aef7e037d6808d6eda0429e73f0ca90cb9cb5"
+dependencies = [
+ "convert_case 0.6.0",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "readonly"
 version = "0.2.12"
@@ -3232,7 +3208,7 @@ checksum = "a25d631e41bfb5fdcde1d4e2215f62f7f0afa3ff11e26563765bd6ea1d229aeb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3336,7 +3312,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror",
+ "thiserror 1.0.65",
  "tower-service",
 ]
 
@@ -3401,16 +3377,17 @@ dependencies = [
 
 [[package]]
 name = "rstml"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe542870b8f59dd45ad11d382e5339c9a1047cde059be136a7016095bbdefa77"
+checksum = "51187e564f12336ef40cd04f6f4d805d6919188001dcf1e0a021898ea0fe28ce"
 dependencies = [
+ "derive-where",
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
  "syn_derive",
- "thiserror",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -3429,12 +3406,6 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.0.0"
@@ -3571,12 +3542,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "self_cell"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
-
 [[package]]
 name = "semver"
 version = "1.0.23"
@@ -3601,17 +3566,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.214"
@@ -3620,7 +3574,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3646,17 +3600,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_qs"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "serde_qs"
 version = "0.13.0"
@@ -3665,7 +3608,7 @@ checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -3677,15 +3620,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_test"
-version = "1.0.177"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3700,13 +3634,12 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fae7a3038a32e5a34ba32c6c45eb4852f8affaf8b794ebfcd4b1099e2d62ebe"
+checksum = "166689e862d227e838f359cce92681cf338e60a8cbcbd029bae03548d5a6d785"
 dependencies = [
  "axum",
  "bytes",
- "ciborium",
  "const_format",
  "dashmap",
  "futures",
@@ -3717,12 +3650,14 @@ dependencies = [
  "inventory",
  "js-sys",
  "once_cell",
+ "pin-project-lite",
  "send_wrapper",
  "serde",
  "serde_json",
- "serde_qs 0.12.0",
+ "serde_qs",
  "server_fn_macro_default",
- "thiserror",
+ "thiserror 1.0.65",
+ "throw_error",
  "tower 0.4.13",
  "tower-layer",
  "url",
@@ -3735,26 +3670,26 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaaf648c6967aef78177c0610478abb5a3455811f401f3c62d10ae9bd3901a1"
+checksum = "4230cd52992681cc370885a613a5aad9fb56d61995b789de5c42dc55ff628e98"
 dependencies = [
  "const_format",
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.6.15"
+version = "0.7.0-rc1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2aa8119b558a17992e0ac1fd07f080099564f24532858811ce04f742542440"
+checksum = "b8d4b8ee78096ff2b09c64afacb83f023f4edfdace60c00590b2aea215fea8a4"
 dependencies = [
  "server_fn_macro",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3801,7 +3736,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror",
+ "thiserror 1.0.65",
  "time",
 ]
 
@@ -3820,7 +3755,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
 dependencies = [
- "serde",
  "version_check",
 ]
 
@@ -3838,7 +3772,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3911,9 +3845,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3929,7 +3863,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3964,7 +3898,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.65",
  "walkdir",
  "yaml-rust",
 ]
@@ -3990,6 +3924,38 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "tachys"
+version = "0.1.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b24784a27f391dedcc8160ea4b2ba7a6ad0f5484ca89ff88a10494f960aee270"
+dependencies = [
+ "any_spawner",
+ "const_str_slice_concat",
+ "drain_filter_polyfill",
+ "either_of",
+ "futures",
+ "html-escape",
+ "indexmap",
+ "itertools 0.13.0",
+ "js-sys",
+ "linear-map",
+ "next_tuple",
+ "oco_ref",
+ "once_cell",
+ "or_poisoned",
+ "parking_lot",
+ "paste",
+ "reactive_graph",
+ "reactive_stores",
+ "rustc-hash",
+ "send_wrapper",
+ "slotmap",
+ "throw_error",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "tagptr"
 version = "0.2.0"
@@ -4015,7 +3981,16 @@ version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.65",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
@@ -4026,7 +4001,27 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "throw_error"
+version = "0.2.0-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84bf87b0433891f1029e5868d4de3a11e794a206899082ebb4e82fca139b0d70"
+dependencies = [
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -4119,7 +4114,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4152,8 +4147,6 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
- "futures-util",
- "hashbrown 0.14.5",
  "pin-project-lite",
  "tokio",
 ]
@@ -4198,6 +4191,10 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -4219,6 +4216,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "http-range-header",
+ "httpdate",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-http"
 version = "0.6.1"
@@ -4276,7 +4298,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4302,22 +4324,22 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typed-builder"
-version = "0.18.2"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77739c880e00693faef3d65ea3aad725f196da38b22fdc7ea6ded6e1ce4d3add"
+checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.18.2"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
+checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4468,9 +4490,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4479,16 +4501,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -4506,9 +4528,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4516,22 +4538,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
@@ -4548,9 +4570,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4776,7 +4798,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ee4c72a..29cf167 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,8 +32,6 @@ ssr = [
 ]
 hydrate = [
   "leptos/hydrate",
-  "leptos_meta/hydrate",
-  "leptos_router/hydrate",
   "katex/wasm-js",
 ]
 diesel-derive-newtype = ["dep:diesel-derive-newtype"]
@@ -61,9 +59,9 @@ unwrap_used = "deny"
 
 [dependencies]
 anyhow = "1.0.89"
-leptos = "0.6.15"
-leptos_meta = "0.6.15"
-leptos_router = "0.6.15"
+leptos = "0.7.0-rc1"
+leptos_meta = "0.7.0-rc1"
+leptos_router = "0.7.0-rc1"
 chrono = { version = "0.4.38", features = ["serde"] }
 env_logger = { version = "0.11.5", default-features = false }
 futures = "0.3.30"
@@ -88,7 +86,7 @@ markdown-it-heading-anchors = "0.3.0"
 markdown-it-footnote = "0.2.0"
 markdown-it-sub = "1.0.0"
 markdown-it-sup = "1.0.0"
-leptos-use = "0.13.6"
+leptos-use = "0.14.0-rc2"
 codee = "0.2.0"
 
 # backend-only features
@@ -111,7 +109,7 @@ diesel-derive-newtype = { version = "2.1.2", optional = true }
 diesel_migrations = { version = "2.2.0", optional = true }
 doku = { version = "0.21.1", optional = true }
 jsonwebtoken = { version = "9.3.0", optional = true }
-leptos_axum = { version = "0.6.15", optional = true }
+leptos_axum = { version = "0.7.0-rc1", optional = true }
 bcrypt = { version = "0.15.1", optional = true }
 diffy = { version = "0.4.0", optional = true }
 enum_delegate = { version = "0.2.0", optional = true }
diff --git a/src/backend/assets.rs b/src/backend/assets.rs
index 3bda404..7a3b78f 100644
--- a/src/backend/assets.rs
+++ b/src/backend/assets.rs
@@ -5,7 +5,7 @@ use axum::{
     response::{IntoResponse, Response},
 };
 use axum_macros::debug_handler;
-use leptos::LeptosOptions;
+use leptos::prelude::*;
 use tower::ServiceExt;
 use tower_http::services::ServeDir;
 
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index 2b2cd12..e2933dd 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -47,7 +47,7 @@ use federation::objects::{
     articles_collection::local_articles_url,
     instance_collection::linked_instances_url,
 };
-use leptos::*;
+use leptos::prelude::*;
 use leptos_axum::{generate_route_list, LeptosRoutes};
 use log::info;
 use std::net::SocketAddr;
@@ -93,7 +93,7 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
         setup(&data.to_request_data()).await?;
     }
 
-    let leptos_options = get_configuration(Some("Cargo.toml")).await?.leptos_options;
+    let leptos_options = get_configuration(Some("Cargo.toml"))?.leptos_options;
     let mut addr = leptos_options.site_addr;
     if let Some(override_hostname) = override_hostname {
         addr = override_hostname;
diff --git a/src/common/mod.rs b/src/common/mod.rs
index a7b9ae8..be4666a 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -3,6 +3,7 @@ pub mod utils;
 pub mod validation;
 
 use chrono::{DateTime, Utc};
+use codee::{Decoder, Encoder};
 use newtypes::{ArticleId, ConflictId, EditId, InstanceId, PersonId};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -351,6 +352,25 @@ pub struct SiteView {
     pub config: Options,
 }
 
+// TODO: using () doesnt make much sense
+impl Encoder<()> for SiteView {
+    type Error = serde_json::Error;
+    type Encoded = String;
+
+    fn encode(val: &()) -> Result<Self::Encoded, Self::Error> {
+        serde_json::to_string(val)
+    }
+}
+
+impl Decoder<()> for SiteView {
+    type Error = serde_json::Error;
+    type Encoded = str;
+
+    fn decode(stored_value: &Self::Encoded) -> Result<(), Self::Error> {
+        serde_json::from_str(stored_value)
+    }
+}
+
 #[test]
 fn test_edit_versions() {
     let default = EditVersion::default();
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index abfc016..b4cba97 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -56,7 +56,7 @@ impl ApiClient {
         }
         #[cfg(feature = "ssr")]
         {
-            use leptos::leptos_config::get_config_from_str;
+            use leptos::config::get_config_from_str;
             let leptos_options = get_config_from_str(include_str!("../../Cargo.toml")).unwrap();
             hostname = leptos_options.site_addr.to_string();
             ssl = false;
@@ -287,7 +287,7 @@ where
     #[cfg(feature = "ssr")]
     {
         use crate::common::{Auth, AUTH_COOKIE};
-        use leptos::use_context;
+        use leptos::prelude::use_context;
         use reqwest::header::HeaderName;
 
         let auth = use_context::<Auth>();
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 69a53c0..bc69252 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -23,9 +23,12 @@ use crate::{
         },
     },
 };
-use leptos::*;
+use leptos::prelude::*;
 use leptos_meta::{provide_meta_context, *};
-use leptos_router::{Route, Router, Routes};
+use leptos_router::{
+    components::{Route, Router, Routes},
+    path,
+};
 
 pub fn site() -> Resource<(), SiteView> {
     use_context::<Resource<(), SiteView>>().unwrap()
@@ -43,6 +46,7 @@ pub fn is_admin() -> bool {
     })
 }
 
+// TODO: can probably get rid of this
 pub trait DefaultResource<T> {
     fn with_default<O>(&self, f: impl FnOnce(&T) -> O) -> O;
 }
@@ -58,9 +62,8 @@ impl<T: Default> DefaultResource<T> for Resource<(), T> {
 
 #[component]
 pub fn App() -> impl IntoView {
-    // TODO: should create_resource() but then things break
-    let site_resource =
-        create_local_resource(move || (), |_| async move { CLIENT.site().await.unwrap() });
+    // TODO: should Resource::new() but then things break
+    let site_resource = LocalResource::new(|| async move { CLIENT.site().await.unwrap() });
     provide_context(site_resource);
     provide_meta_context();
 
@@ -68,33 +71,33 @@ pub fn App() -> impl IntoView {
     provide_context(darkmode.clone());
 
     view! {
-        <Html attr:data-theme=darkmode.theme class="h-full" />
-        <Body class="h-full max-sm:flex max-sm:flex-col" />
+        <Html attr:data-theme=darkmode.theme {..} class="h-full" />
+        <Body {..} class="h-full max-sm:flex max-sm:flex-col" />
         <>
             <Stylesheet id="ibis" href="/pkg/ibis.css" />
             <Stylesheet id="katex" href="/katex.min.css" />
             <Router>
                 <Nav />
                 <main class="p-4 md:ml-64">
-                    <Routes>
-                        <Route path="/" view=ReadArticle />
-                        <Route path="/article/:title" view=ReadArticle />
-                        <Route path="/article/:title/history" view=ArticleHistory />
-                        <Route path="/article/:title/edit/:conflict_id?" view=EditArticle />
-                        <Route path="/article/:title/actions" view=ArticleActions />
-                        <Route path="/article/:title/diff/:hash" view=EditDiff />
-                        // TODO: use protected route, otherwise user can view 
-                        //       /article/create without login
-                        //https://github.com/leptos-rs/leptos/blob/leptos_0.7/examples/router/src/lib.rs#L51
-                        <Route path="/article/create" view=CreateArticle />
-                        <Route path="/article/list" view=ListArticles />
-                        <Route path="/instance/:hostname" view=InstanceDetails />
-                        <Route path="/instance/list" view=ListInstances />
-                        <Route path="/user/:name" view=UserProfile />
-                        <Route path="/login" view=Login />
-                        <Route path="/register" view=Register />
-                        <Route path="/search" view=Search />
-                        <Route path="/notifications" view=Notifications />
+                    <Routes fallback=|| "Page not found.".into_view()>
+                        <Route path=path!("/") view=ReadArticle />
+                        <Route path=path!("/article/:title") view=ReadArticle />
+                        <Route path=path!("/article/:title/history") view=ArticleHistory />
+                        <Route path=path!("/article/:title/edit/:conflict_id?") view=EditArticle />
+                        <Route path=path!("/article/:title/actions") view=ArticleActions />
+                        <Route path=path!("/article/:title/diff/:hash") view=EditDiff />
+                        // TODO: use protected route, otherwise user can view
+                        // /article/create without login
+                        // https://github.com/leptos-rs/leptos/blob/leptos_0.7/examples/router/src/lib.rs#L51
+                        <Route path=path!("/article/create") view=CreateArticle />
+                        <Route path=path!("/article/list") view=ListArticles />
+                        <Route path=path!("/instance/:hostname") view=InstanceDetails />
+                        <Route path=path!("/instance/list") view=ListInstances />
+                        <Route path=path!("/user/:name") view=UserProfile />
+                        <Route path=path!("/login") view=Login />
+                        <Route path=path!("/register") view=Register />
+                        <Route path=path!("/search") view=Search />
+                        <Route path=path!("/notifications") view=Notifications />
                     </Routes>
                 </main>
             </Router>
diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index eb2fe0e..d682a40 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -8,8 +8,8 @@ use crate::{
         components::instance_follow_button::InstanceFollowButton,
     },
 };
-use leptos::*;
-use leptos_router::*;
+use leptos::prelude::*;
+use leptos_router::components::A;
 
 pub enum ActiveTab {
     Read,
@@ -19,10 +19,7 @@ pub enum ActiveTab {
 }
 
 #[component]
-pub fn ArticleNav(
-    article: Resource<Option<String>, ArticleView>,
-    active_tab: ActiveTab,
-) -> impl IntoView {
+pub fn ArticleNav(article: Resource<ArticleView>, active_tab: ActiveTab) -> impl IntoView {
     let tab_classes = tab_classes(&active_tab);
 
     view! {
@@ -32,7 +29,7 @@ pub fn ArticleNav(
                     .get()
                     .map(|article_| {
                         let title = article_title(&article_.article);
-                        let instance = create_resource(
+                        let instance = Resource::new(
                             move || article_.article.instance_id,
                             move |instance_id| async move {
                                 let form = GetInstance {
@@ -46,24 +43,33 @@ pub fn ArticleNav(
                         let protected = article_.article.protected;
                         view! {
                             <div role="tablist" class="tabs tabs-lifted">
-                                <A class=tab_classes.read href=article_link.clone()>
+                                <A href=article_link.clone() {..} class=tab_classes.read>
                                     "Read"
                                 </A>
-                                <A class=tab_classes.history href=format!("{article_link}/history")>
+                                <A
+                                    href=format!("{article_link}/history")
+                                    {..}
+                                    class=tab_classes.history
+                                >
                                     "History"
                                 </A>
                                 <Show when=move || {
                                     is_logged_in()
                                         && can_edit_article(&article_.article, is_admin()).is_ok()
                                 }>
-                                    <A class=tab_classes.edit href=format!("{article_link}/edit")>
+                                    <A
+                                        href=format!("{article_link}/edit")
+                                        {..}
+                                        class=tab_classes.edit
+                                    >
                                         "Edit"
                                     </A>
                                 </Show>
                                 <Show when=is_logged_in>
                                     <A
-                                        class=tab_classes.actions
                                         href=format!("{article_link_}/actions")
+                                        {..}
+                                        class=tab_classes.actions
                                     >
                                         "Actions"
                                     </A>
diff --git a/src/frontend/components/connect.rs b/src/frontend/components/connect.rs
index e5b6733..7785d2b 100644
--- a/src/frontend/components/connect.rs
+++ b/src/frontend/components/connect.rs
@@ -1,10 +1,21 @@
 use crate::frontend::api::CLIENT;
-use leptos::{component, *};
+use codee::{Decoder, Encoder};
+use leptos::prelude::*;
+use std::fmt::Debug;
 use url::Url;
 
 #[component]
-pub fn ConnectView<T: Clone + 'static, R: 'static>(res: Resource<T, R>) -> impl IntoView {
-    let connect_ibis_wiki = create_action(move |_: &()| async move {
+pub fn ConnectView<T, R>(res: Resource<T, R>) -> impl IntoView
+where
+    T: Clone + Send + Sync + 'static,
+    R: Encoder<T> + Decoder<T> + Send + Sync + 'static,
+    <R as Encoder<T>>::Error: Debug,
+    <R as Encoder<T>>::Encoded: IntoEncodedString,
+    <R as Decoder<T>>::Encoded: FromEncodedStr,
+    <R as Decoder<T>>::Error: Debug,
+    <<R as Decoder<T>>::Encoded as leptos::prelude::FromEncodedStr>::DecodingError: Debug,
+{
+    let connect_ibis_wiki = Action::new(move |_: &()| async move {
         CLIENT
             .resolve_instance(Url::parse("https://ibis.wiki").unwrap())
             .await
@@ -16,7 +27,9 @@ pub fn ConnectView<T: Clone + 'static, R: 'static>(res: Resource<T, R>) -> impl
         <div class="flex justify-center h-screen">
             <button
                 class="btn btn-primary place-self-center"
-                on:click=move |_| connect_ibis_wiki.dispatch(())
+                on:click=move |_| {
+                    connect_ibis_wiki.dispatch(());
+                }
             >
                 Connect with ibis.wiki
             </button>
diff --git a/src/frontend/components/credentials.rs b/src/frontend/components/credentials.rs
index 05635e8..fa6b373 100644
--- a/src/frontend/components/credentials.rs
+++ b/src/frontend/components/credentials.rs
@@ -1,4 +1,4 @@
-use leptos::{ev, *};
+use leptos::{ev::KeyboardEvent, prelude::*};
 
 #[component]
 pub fn CredentialsForm(
@@ -8,8 +8,8 @@ pub fn CredentialsForm(
     error: Signal<Option<String>>,
     disabled: Signal<bool>,
 ) -> impl IntoView {
-    let (password, set_password) = create_signal(String::new());
-    let (username, set_username) = create_signal(String::new());
+    let (password, set_password) = signal(String::new());
+    let (username, set_username) = signal(String::new());
 
     let dispatch_action = move || action.dispatch((username.get(), password.get()));
 
@@ -34,7 +34,7 @@ pub fn CredentialsForm(
                 required
                 placeholder="Username"
                 prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
+                on:keyup=move |ev: KeyboardEvent| {
                     let val = event_target_value(&ev);
                     set_username.update(|v| *v = val);
                 }
@@ -51,7 +51,7 @@ pub fn CredentialsForm(
                 required
                 placeholder="Password"
                 prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
+                on:keyup=move |ev: KeyboardEvent| {
                     match &*ev.key() {
                         "Enter" => {
                             dispatch_action();
@@ -73,7 +73,9 @@ pub fn CredentialsForm(
                 <button
                     class="btn btn-primary my-2"
                     prop:disabled=move || button_is_disabled.get()
-                    on:click=move |_| dispatch_action()
+                    on:click=move |_| {
+                        dispatch_action();
+                    }
                 >
                     {action_label}
                 </button>
diff --git a/src/frontend/components/editor.rs b/src/frontend/components/editor.rs
index 21d20ae..84dc41a 100644
--- a/src/frontend/components/editor.rs
+++ b/src/frontend/components/editor.rs
@@ -1,16 +1,14 @@
 use crate::frontend::markdown::render_markdown;
-use html::Textarea;
-use leptos::*;
+use leptos::{html::Textarea, prelude::*};
 
 #[component]
 pub fn EditorView(
-    // this param gives a false warning about being unused, ignore that
-    #[allow(unused)] textarea_ref: NodeRef<Textarea>,
+    textarea_ref: NodeRef<Textarea>,
     content: Signal<String>,
     set_content: WriteSignal<String>,
 ) -> impl IntoView {
-    let (preview, set_preview) = create_signal(render_markdown(&content.get_untracked()));
-    let (show_preview, set_show_preview) = create_signal(false);
+    let (preview, set_preview) = signal(render_markdown(&content.get_untracked()));
+    let (show_preview, set_show_preview) = signal(false);
 
     view! {
         <div>
diff --git a/src/frontend/components/instance_follow_button.rs b/src/frontend/components/instance_follow_button.rs
index 1948038..fb04b56 100644
--- a/src/frontend/components/instance_follow_button.rs
+++ b/src/frontend/components/instance_follow_button.rs
@@ -5,11 +5,11 @@ use crate::{
         app::{site, DefaultResource},
     },
 };
-use leptos::{component, *};
+use leptos::prelude::*;
 
 #[component]
 pub fn InstanceFollowButton(instance: DbInstance) -> impl IntoView {
-    let follow_action = create_action(move |instance_id: &InstanceId| {
+    let follow_action = Action::new(move |instance_id: &InstanceId| {
         let instance_id = *instance_id;
         async move {
             let form = FollowInstance { id: instance_id };
@@ -38,7 +38,9 @@ pub fn InstanceFollowButton(instance: DbInstance) -> impl IntoView {
     view! {
         <button
             class=class_
-            on:click=move |_| follow_action.dispatch(instance.id)
+            on:click=move |_| {
+                follow_action.dispatch(instance.id);
+            }
             prop:disabled=move || is_following
             title="Follow the instance so that new edits are synchronized to your instance."
         >
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index 1f10609..cb29025 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -3,21 +3,21 @@ use crate::frontend::{
     app::{is_logged_in, site, DefaultResource},
     dark_mode::DarkMode,
 };
-use leptos::{component, view, IntoView, *};
-use leptos_router::*;
+use leptos::{component, prelude::*, view, IntoView, *};
+use leptos_router::{components::A, hooks::use_navigate};
 
 #[component]
 pub fn Nav() -> impl IntoView {
-    let logout_action = create_action(move |_| async move {
+    let logout_action = Action::new(move |_| async move {
         CLIENT.logout().await.unwrap();
         site().refetch();
     });
-    let notification_count = create_resource(
+    let notification_count = Resource::new(
         || (),
         move |_| async move { CLIENT.notifications_count().await.unwrap_or_default() },
     );
 
-    let (search_query, set_search_query) = create_signal(String::new());
+    let (search_query, set_search_query) = signal(String::new());
     let mut dark_mode = expect_context::<DarkMode>();
     view! {
         <nav class="max-sm:navbar p-2.5 h-full md:fixed md:w-64 max-sm: border-b md:border-e border-slate-400 border-solid">
@@ -70,7 +70,7 @@ pub fn Nav() -> impl IntoView {
                                 class="form-control m-0 p-1"
                                 on:submit=move |ev| {
                                     ev.prevent_default();
-                                    let navigate = leptos_router::use_navigate();
+                                    let navigate = use_navigate();
                                     let query = search_query.get();
                                     if !query.is_empty() {
                                         navigate(
@@ -127,7 +127,9 @@ pub fn Nav() -> impl IntoView {
                                     </p>
                                     <button
                                         class="btn btn-outline btn-xs w-min self-center"
-                                        on:click=move |_| logout_action.dispatch(())
+                                        on:click=move |_| {
+                                            logout_action.dispatch(());
+                                        }
                                     >
                                         Logout
                                     </button>
diff --git a/src/frontend/dark_mode.rs b/src/frontend/dark_mode.rs
index 34fda4a..3d9d0a6 100644
--- a/src/frontend/dark_mode.rs
+++ b/src/frontend/dark_mode.rs
@@ -1,6 +1,6 @@
 use chrono::{Duration, Local};
 use codee::string::FromToStringCodec;
-use leptos::{Signal, SignalGet, SignalGetUntracked, SignalSet, WriteSignal};
+use leptos::prelude::*;
 use leptos_use::{use_cookie_with_options, use_preferred_dark, SameSite, UseCookieOptions};
 
 #[derive(Debug, Clone)]
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index bebe740..5e81e1c 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -1,6 +1,6 @@
 use crate::common::{utils::extract_domain, DbArticle, DbPerson};
 use chrono::{DateTime, Local, Utc};
-use leptos::*;
+use leptos::prelude::*;
 
 pub mod api;
 pub mod app;
diff --git a/src/frontend/pages/article/actions.rs b/src/frontend/pages/article/actions.rs
index 8ed26d6..e40d8d1 100644
--- a/src/frontend/pages/article/actions.rs
+++ b/src/frontend/pages/article/actions.rs
@@ -9,16 +9,16 @@ use crate::{
         DbArticle,
     },
 };
-use leptos::*;
-use leptos_router::Redirect;
+use leptos::{ev::KeyboardEvent, prelude::*};
+use leptos_router::components::Redirect;
 
 #[component]
 pub fn ArticleActions() -> impl IntoView {
     let article = article_resource();
-    let (new_title, set_new_title) = create_signal(String::new());
-    let (fork_response, set_fork_response) = create_signal(Option::<DbArticle>::None);
-    let (error, set_error) = create_signal(None::<String>);
-    let fork_action = create_action(move |(article_id, new_title): &(ArticleId, String)| {
+    let (new_title, set_new_title) = signal(String::new());
+    let (fork_response, set_fork_response) = signal(Option::<DbArticle>::None);
+    let (error, set_error) = signal(None::<String>);
+    let fork_action = Action::new(move |(article_id, new_title): &(ArticleId, String)| {
         let params = ForkArticleForm {
             article_id: *article_id,
             new_title: new_title.to_string(),
@@ -34,7 +34,7 @@ pub fn ArticleActions() -> impl IntoView {
             }
         }
     });
-    let protect_action = create_action(move |(id, protected): &(ArticleId, bool)| {
+    let protect_action = Action::new(move |(id, protected): &(ArticleId, bool)| {
         let params = ProtectArticleForm {
             article_id: *id,
             protected: !protected,
@@ -72,7 +72,7 @@ pub fn ArticleActions() -> impl IntoView {
                                         class="btn btn-secondary"
                                         on:click=move |_| {
                                             protect_action
-                                                .dispatch((article.article.id, article.article.protected))
+                                                .dispatch((article.article.id, article.article.protected));
                                         }
                                     >
                                         Toggle Article Protection
@@ -82,7 +82,7 @@ pub fn ArticleActions() -> impl IntoView {
                                     <input
                                         class="input"
                                         placeholder="New Title"
-                                        on:keyup=move |ev: ev::KeyboardEvent| {
+                                        on:keyup=move |ev: KeyboardEvent| {
                                             let val = event_target_value(&ev);
                                             set_new_title.update(|v| *v = val);
                                         }
@@ -92,7 +92,7 @@ pub fn ArticleActions() -> impl IntoView {
                                         class="btn"
                                         disabled=move || new_title.get().is_empty()
                                         on:click=move |_| {
-                                            fork_action.dispatch((article.article.id, new_title.get()))
+                                            fork_action.dispatch((article.article.id, new_title.get()));
                                         }
                                     >
 
diff --git a/src/frontend/pages/article/create.rs b/src/frontend/pages/article/create.rs
index 40599a7..896e849 100644
--- a/src/frontend/pages/article/create.rs
+++ b/src/frontend/pages/article/create.rs
@@ -2,27 +2,26 @@ use crate::{
     common::CreateArticleForm,
     frontend::{api::CLIENT, components::editor::EditorView},
 };
-use html::Textarea;
-use leptos::*;
-use leptos_router::Redirect;
+use leptos::{html::Textarea, prelude::*};
+use leptos_router::components::Redirect;
 use leptos_use::{use_textarea_autosize, UseTextareaAutosizeReturn};
 
 #[component]
 pub fn CreateArticle() -> impl IntoView {
-    let (title, set_title) = create_signal(String::new());
-    let textarea_ref = create_node_ref::<Textarea>();
+    let (title, set_title) = signal(String::new());
+    let textarea_ref = NodeRef::<Textarea>::new();
     let UseTextareaAutosizeReturn {
         content,
         set_content,
         trigger_resize: _,
     } = use_textarea_autosize(textarea_ref);
-    let (summary, set_summary) = create_signal(String::new());
-    let (create_response, set_create_response) = create_signal(None::<()>);
-    let (create_error, set_create_error) = create_signal(None::<String>);
-    let (wait_for_response, set_wait_for_response) = create_signal(false);
+    let (summary, set_summary) = signal(String::new());
+    let (create_response, set_create_response) = signal(None::<()>);
+    let (create_error, set_create_error) = signal(None::<String>);
+    let (wait_for_response, set_wait_for_response) = signal(false);
     let button_is_disabled =
         Signal::derive(move || wait_for_response.get() || summary.get().is_empty());
-    let submit_action = create_action(move |(title, text, summary): &(String, String, String)| {
+    let submit_action = Action::new(move |(title, text, summary): &(String, String, String)| {
         let title = title.clone();
         let text = text.clone();
         let summary = summary.clone();
@@ -94,7 +93,7 @@ pub fn CreateArticle() -> impl IntoView {
                                 prop:disabled=move || button_is_disabled.get()
                                 on:click=move |_| {
                                     submit_action
-                                        .dispatch((title.get(), content.get(), summary.get()))
+                                        .dispatch((title.get(), content.get(), summary.get()));
                                 }
                             >
                                 Submit
diff --git a/src/frontend/pages/article/edit.rs b/src/frontend/pages/article/edit.rs
index baf993b..165f025 100644
--- a/src/frontend/pages/article/edit.rs
+++ b/src/frontend/pages/article/edit.rs
@@ -9,9 +9,8 @@ use crate::{
         pages::article_resource,
     },
 };
-use html::Textarea;
-use leptos::*;
-use leptos_router::use_params_map;
+use leptos::{html::Textarea, prelude::*};
+use leptos_router::hooks::use_params_map;
 use leptos_use::{use_textarea_autosize, UseTextareaAutosizeReturn};
 
 #[derive(Clone, PartialEq)]
@@ -26,12 +25,12 @@ const CONFLICT_MESSAGE: &str = "There was an edit conflict. Resolve it manually
 #[component]
 pub fn EditArticle() -> impl IntoView {
     let article = article_resource();
-    let (edit_response, set_edit_response) = create_signal(EditResponse::None);
-    let (edit_error, set_edit_error) = create_signal(None::<String>);
+    let (edit_response, set_edit_response) = signal(EditResponse::None);
+    let (edit_error, set_edit_error) = signal(None::<String>);
 
-    let conflict_id = move || use_params_map().get_untracked().get("conflict_id").cloned();
+    let conflict_id = move || use_params_map().get_untracked().get("conflict_id").clone();
     if let Some(conflict_id) = conflict_id() {
-        create_action(move |conflict_id: &String| {
+        Action::new(move |conflict_id: &String| {
             let conflict_id = ConflictId(conflict_id.parse().unwrap());
             async move {
                 let conflict = CLIENT
@@ -52,17 +51,17 @@ pub fn EditArticle() -> impl IntoView {
         .dispatch(conflict_id);
     }
 
-    let textarea_ref = create_node_ref::<Textarea>();
+    let textarea_ref = NodeRef::<Textarea>::new();
     let UseTextareaAutosizeReturn {
         content,
         set_content,
         trigger_resize: _,
     } = use_textarea_autosize(textarea_ref);
-    let (summary, set_summary) = create_signal(String::new());
-    let (wait_for_response, set_wait_for_response) = create_signal(false);
+    let (summary, set_summary) = signal(String::new());
+    let (wait_for_response, set_wait_for_response) = signal(false);
     let button_is_disabled =
         Signal::derive(move || wait_for_response.get() || summary.get().is_empty());
-    let submit_action = create_action(
+    let submit_action = Action::new(
         move |(new_text, summary, article, edit_response): &(
             String,
             String,
@@ -161,7 +160,7 @@ pub fn EditArticle() -> impl IntoView {
                                                                 summary.get(),
                                                                 article_.clone(),
                                                                 edit_response.get(),
-                                                            ))
+                                                            ));
                                                     }
                                                 >
 
diff --git a/src/frontend/pages/article/history.rs b/src/frontend/pages/article/history.rs
index 96774c9..3e82496 100644
--- a/src/frontend/pages/article/history.rs
+++ b/src/frontend/pages/article/history.rs
@@ -5,7 +5,7 @@ use crate::frontend::{
     render_date_time,
     user_link,
 };
-use leptos::*;
+use leptos::prelude::*;
 
 #[component]
 pub fn ArticleHistory() -> impl IntoView {
diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index 99dd800..dfa67e0 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -2,15 +2,14 @@ use crate::{
     common::ListArticlesForm,
     frontend::{api::CLIENT, article_link, article_title, components::connect::ConnectView},
 };
-use html::Input;
-use leptos::*;
+use leptos::{html::Input, prelude::*};
 
 #[component]
 pub fn ListArticles() -> impl IntoView {
-    let (only_local, set_only_local) = create_signal(false);
+    let (only_local, set_only_local) = signal(false);
     let button_only_local = create_node_ref::<Input>();
     let button_all = create_node_ref::<Input>();
-    let articles = create_resource(
+    let articles = Resource::new(
         move || only_local.get(),
         |only_local| async move {
             CLIENT
diff --git a/src/frontend/pages/article/read.rs b/src/frontend/pages/article/read.rs
index 9b9bf23..a8047ee 100644
--- a/src/frontend/pages/article/read.rs
+++ b/src/frontend/pages/article/read.rs
@@ -3,7 +3,7 @@ use crate::frontend::{
     markdown::render_markdown,
     pages::article_resource,
 };
-use leptos::*;
+use leptos::prelude::*;
 
 #[component]
 pub fn ReadArticle() -> impl IntoView {
diff --git a/src/frontend/pages/diff.rs b/src/frontend/pages/diff.rs
index 4d2ea4b..2901eaf 100644
--- a/src/frontend/pages/diff.rs
+++ b/src/frontend/pages/diff.rs
@@ -4,8 +4,8 @@ use crate::frontend::{
     render_date_time,
     user_link,
 };
-use leptos::*;
-use leptos_router::*;
+use leptos::prelude::*;
+use leptos_router::hooks::use_params_map;
 
 #[component]
 pub fn EditDiff() -> impl IntoView {
@@ -21,7 +21,7 @@ pub fn EditDiff() -> impl IntoView {
                 article
                     .get()
                     .map(|article| {
-                        let hash = params.get_untracked().get("hash").cloned().unwrap();
+                        let hash = params.get_untracked().get("hash").clone().unwrap();
                         let edit = article
                             .edits
                             .iter()
diff --git a/src/frontend/pages/instance/details.rs b/src/frontend/pages/instance/details.rs
index 5cc8c97..4ad98a1 100644
--- a/src/frontend/pages/instance/details.rs
+++ b/src/frontend/pages/instance/details.rs
@@ -7,15 +7,15 @@ use crate::{
         components::instance_follow_button::InstanceFollowButton,
     },
 };
-use leptos::*;
-use leptos_router::use_params_map;
+use leptos::prelude::*;
+use leptos_router::hooks::use_params_map;
 use url::Url;
 
 #[component]
 pub fn InstanceDetails() -> impl IntoView {
     let params = use_params_map();
-    let hostname = move || params.get().get("hostname").cloned().unwrap();
-    let instance_profile = create_resource(hostname, move |hostname| async move {
+    let hostname = move || params.get().get("hostname").clone().unwrap();
+    let instance_profile = Resource::new(hostname, move |hostname| async move {
         let url = Url::parse(&format!("{}://{hostname}", http_protocol_str())).unwrap();
         CLIENT.resolve_instance(url).await.unwrap()
     });
@@ -28,7 +28,7 @@ pub fn InstanceDetails() -> impl IntoView {
                 instance_profile
                     .get()
                     .map(|instance: DbInstance| {
-                        let articles = create_resource(
+                        let articles = Resource::new(
                             move || instance.id,
                             |instance_id| async move {
                                 CLIENT
diff --git a/src/frontend/pages/instance/list.rs b/src/frontend/pages/instance/list.rs
index 5b88e64..330984c 100644
--- a/src/frontend/pages/instance/list.rs
+++ b/src/frontend/pages/instance/list.rs
@@ -1,9 +1,9 @@
 use crate::frontend::{api::CLIENT, components::connect::ConnectView};
-use leptos::*;
+use leptos::prelude::*;
 
 #[component]
 pub fn ListInstances() -> impl IntoView {
-    let instances = create_resource(
+    let instances = Resource::new(
         move || (),
         |_| async move { CLIENT.list_instances().await.unwrap() },
     );
@@ -21,14 +21,14 @@ pub fn ListInstances() -> impl IntoView {
                             .get()
                             .map(|a| {
                                 a.into_iter()
-                                    .map(|i| {
+                                    .map(|ref i| {
                                         view! {
                                             <li>
                                                 <a
                                                     class="link text-lg"
                                                     href=format!("/instance/{}", i.domain)
                                                 >
-                                                    {i.domain}
+                                                    {i.domain.to_string()}
                                                 </a>
                                             </li>
                                         }
diff --git a/src/frontend/pages/login.rs b/src/frontend/pages/login.rs
index fe7779c..adf987c 100644
--- a/src/frontend/pages/login.rs
+++ b/src/frontend/pages/login.rs
@@ -2,16 +2,16 @@ use crate::{
     common::LoginUserForm,
     frontend::{api::CLIENT, app::site, components::credentials::*},
 };
-use leptos::*;
-use leptos_router::Redirect;
+use leptos::prelude::*;
+use leptos_router::components::Redirect;
 
 #[component]
 pub fn Login() -> impl IntoView {
-    let (login_response, set_login_response) = create_signal(None::<()>);
-    let (login_error, set_login_error) = create_signal(None::<String>);
-    let (wait_for_response, set_wait_for_response) = create_signal(false);
+    let (login_response, set_login_response) = signal(None::<()>);
+    let (login_error, set_login_error) = signal(None::<String>);
+    let (wait_for_response, set_wait_for_response) = signal(false);
 
-    let login_action = create_action(move |(email, password): &(String, String)| {
+    let login_action = Action::new(move |(email, password): &(String, String)| {
         let username = email.to_string();
         let password = password.to_string();
         let credentials = LoginUserForm { username, password };
diff --git a/src/frontend/pages/mod.rs b/src/frontend/pages/mod.rs
index 89f4dd0..232e8ba 100644
--- a/src/frontend/pages/mod.rs
+++ b/src/frontend/pages/mod.rs
@@ -2,8 +2,8 @@ use crate::{
     common::{ArticleView, GetArticleForm, MAIN_PAGE_NAME},
     frontend::api::CLIENT,
 };
-use leptos::{create_resource, Resource, SignalGet};
-use leptos_router::use_params_map;
+use leptos::prelude::*;
+use leptos_router::hooks::use_params_map;
 
 pub(crate) mod article;
 pub(crate) mod diff;
@@ -14,10 +14,10 @@ pub(crate) mod register;
 pub(crate) mod search;
 pub(crate) mod user_profile;
 
-fn article_resource() -> Resource<Option<String>, ArticleView> {
+fn article_resource() -> Resource<ArticleView> {
     let params = use_params_map();
-    let title = move || params.get().get("title").cloned();
-    create_resource(title, move |title| async move {
+    let title = move || params.get().get("title").clone();
+    Resource::new(title, move |title| async move {
         let mut title = title.unwrap_or(MAIN_PAGE_NAME.to_string());
         let mut domain = None;
         if let Some((title_, domain_)) = title.clone().split_once('@') {
diff --git a/src/frontend/pages/notifications.rs b/src/frontend/pages/notifications.rs
index 83bd66e..8a2826d 100644
--- a/src/frontend/pages/notifications.rs
+++ b/src/frontend/pages/notifications.rs
@@ -2,11 +2,11 @@ use crate::{
     common::Notification,
     frontend::{api::CLIENT, article_link, article_title},
 };
-use leptos::*;
+use leptos::prelude::*;
 
 #[component]
 pub fn Notifications() -> impl IntoView {
-    let notifications = create_resource(
+    let notifications = Resource::new(
         move || {},
         |_| async move { CLIENT.notifications_list().await.unwrap() },
     );
@@ -43,7 +43,7 @@ pub fn Notifications() -> impl IntoView {
                                         }
                                     };
                                     let notif_ = notif.clone();
-                                    let click_approve = create_action(move |_: &()| {
+                                    let click_approve = Action::new(move |_: &()| {
                                         let notif_ = notif_.clone();
                                         async move {
                                             if let ArticleApprovalRequired(a) = notif_ {
@@ -53,7 +53,7 @@ pub fn Notifications() -> impl IntoView {
                                         }
                                     });
                                     let notif_ = notif.clone();
-                                    let click_reject = create_action(move |_: &()| {
+                                    let click_reject = Action::new(move |_: &()| {
                                         let notif_ = notif_.clone();
                                         async move {
                                             match notif_ {
@@ -76,13 +76,17 @@ pub fn Notifications() -> impl IntoView {
                                                 <button
                                                     class="btn btn-sm btn-outline"
                                                     style=my_style
-                                                    on:click=move |_| click_approve.dispatch(())
+                                                    on:click=move |_| {
+                                                        click_approve.dispatch(());
+                                                    }
                                                 >
                                                     Approve
                                                 </button>
                                                 <button
                                                     class="btn btn-sm btn-outline"
-                                                    on:click=move |_| click_reject.dispatch(())
+                                                    on:click=move |_| {
+                                                        click_reject.dispatch(());
+                                                    }
                                                 >
                                                     Reject
                                                 </button>
diff --git a/src/frontend/pages/register.rs b/src/frontend/pages/register.rs
index 6713b7c..a9c32b8 100644
--- a/src/frontend/pages/register.rs
+++ b/src/frontend/pages/register.rs
@@ -2,19 +2,20 @@ use crate::{
     common::{LocalUserView, RegisterUserForm},
     frontend::{api::CLIENT, app::site, components::credentials::*, error::MyResult},
 };
-use leptos::{logging::log, *};
+use leptos::prelude::*;
+use log::info;
 
 #[component]
 pub fn Register() -> impl IntoView {
-    let (register_response, set_register_response) = create_signal(None::<()>);
-    let (register_error, set_register_error) = create_signal(None::<String>);
-    let (wait_for_response, set_wait_for_response) = create_signal(false);
+    let (register_response, set_register_response) = signal(None::<()>);
+    let (register_error, set_register_error) = signal(None::<String>);
+    let (wait_for_response, set_wait_for_response) = signal(false);
 
-    let register_action = create_action(move |(email, password): &(String, String)| {
+    let register_action = Action::new(move |(email, password): &(String, String)| {
         let username = email.to_string();
         let password = password.to_string();
         let credentials = RegisterUserForm { username, password };
-        log!("Try to register new account for {}", credentials.username);
+        info!("Try to register new account for {}", credentials.username);
         async move {
             set_wait_for_response.update(|w| *w = true);
             let result: MyResult<LocalUserView> = CLIENT.register(credentials).await;
diff --git a/src/frontend/pages/search.rs b/src/frontend/pages/search.rs
index ed6878e..dbc6d95 100644
--- a/src/frontend/pages/search.rs
+++ b/src/frontend/pages/search.rs
@@ -2,8 +2,8 @@ use crate::{
     common::{DbArticle, DbInstance, SearchArticleForm},
     frontend::{api::CLIENT, article_link, article_title},
 };
-use leptos::*;
-use leptos_router::use_query_map;
+use leptos::prelude::*;
+use leptos_router::hooks::use_query_map;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -22,9 +22,9 @@ impl SearchResults {
 #[component]
 pub fn Search() -> impl IntoView {
     let params = use_query_map();
-    let query = move || params.get().get("query").cloned().unwrap();
-    let (error, set_error) = create_signal(None::<String>);
-    let search_results = create_resource(query, move |query| async move {
+    let query = move || params.get().get("query").clone().unwrap();
+    let (error, set_error) = signal(None::<String>);
+    let search_results = Resource::new(query, move |query| async move {
         set_error.set(None);
         let mut search_results = SearchResults::default();
         let url = Url::parse(&query);
@@ -89,7 +89,7 @@ pub fn Search() -> impl IntoView {
                                             view! {
                                                 <li>
                                                     <a class="link text-lg" href=format!("/instance/{domain}")>
-                                                        {domain}
+                                                        {domain.to_string()}
                                                     </a>
                                                 </li>
                                             },
diff --git a/src/frontend/pages/user_profile.rs b/src/frontend/pages/user_profile.rs
index 5435220..38ea369 100644
--- a/src/frontend/pages/user_profile.rs
+++ b/src/frontend/pages/user_profile.rs
@@ -2,15 +2,15 @@ use crate::{
     common::{DbPerson, GetUserForm},
     frontend::{api::CLIENT, user_title},
 };
-use leptos::*;
-use leptos_router::use_params_map;
+use leptos::prelude::*;
+use leptos_router::hooks::use_params_map;
 
 #[component]
 pub fn UserProfile() -> impl IntoView {
     let params = use_params_map();
-    let name = move || params.get().get("name").cloned().unwrap();
-    let (error, set_error) = create_signal(None::<String>);
-    let user_profile = create_resource(name, move |mut name| async move {
+    let name = move || params.get().get("name").clone().unwrap();
+    let (error, set_error) = signal(None::<String>);
+    let user_profile = Resource::new(name, move |mut name| async move {
         set_error.set(None);
         let mut domain = None;
         if let Some((title_, domain_)) = name.clone().split_once('@') {

From 438115942637451bde0db3f4f46ee82736667921 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 15 Nov 2024 16:07:29 +0100
Subject: [PATCH 02/16] wip

---
 Cargo.lock                             | 443 ++++++++++++++++++++-----
 Cargo.toml                             |   3 +
 src/backend/mod.rs                     |   1 -
 src/common/mod.rs                      |  20 --
 src/frontend/api.rs                    | 422 ++++++++++++++---------
 src/frontend/app.rs                    |   6 +-
 src/frontend/components/article_nav.rs |   2 +-
 src/frontend/mod.rs                    |   2 +-
 src/frontend/pages/article/actions.rs  |   4 +-
 src/frontend/pages/article/create.rs   |   2 +-
 src/frontend/pages/article/edit.rs     |   2 +-
 src/frontend/pages/article/list.rs     |  13 +-
 src/frontend/pages/search.rs           |   2 +-
 13 files changed, 638 insertions(+), 284 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d76a59..0761aab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,7 +36,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tower 0.4.13",
  "tracing",
@@ -91,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "android-tzdata"
@@ -117,16 +117,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9747eb01aed7603aba23f7c869d5d7e5d37aab9c3501aced42d8fdb786f1f6e3"
 dependencies = [
  "futures",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.91"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "argparse"
@@ -424,9 +424,9 @@ checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 
 [[package]]
 name = "cc"
-version = "1.1.31"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "shlex",
 ]
@@ -482,7 +482,7 @@ checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
 dependencies = [
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -619,12 +619,13 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9"
 dependencies = [
  "cookie",
- "idna 0.5.0",
+ "document-features",
+ "idna 1.0.3",
  "log",
  "publicsuffix",
  "serde",
@@ -652,9 +653,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -1062,6 +1063,15 @@ dependencies = [
  "const-random",
 ]
 
+[[package]]
+name = "document-features"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "doku"
 version = "0.21.1"
@@ -1258,15 +1268,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1445,7 +1455,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1513,9 +1523,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "hashlink"
@@ -1615,7 +1625,7 @@ dependencies = [
  "reqwest",
  "reqwest-middleware",
  "sha2",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -1768,6 +1778,7 @@ dependencies = [
  "enum_delegate",
  "env_logger",
  "futures",
+ "getrandom",
  "hex",
  "jsonwebtoken",
  "katex",
@@ -1788,6 +1799,7 @@ dependencies = [
  "rand",
  "reqwest",
  "retry_future",
+ "send_wrapper",
  "serde",
  "serde_json",
  "sha2",
@@ -1800,6 +1812,125 @@ dependencies = [
  "tracing",
  "url",
  "uuid",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1820,12 +1951,23 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1835,7 +1977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -1935,7 +2077,7 @@ dependencies = [
  "ducc",
  "itertools 0.10.5",
  "js-sys",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-bindgen",
 ]
 
@@ -1977,7 +2119,7 @@ dependencies = [
  "server_fn",
  "slotmap",
  "tachys",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "throw_error",
  "typed-builder",
  "typed-builder-macro",
@@ -2044,7 +2186,7 @@ dependencies = [
  "config",
  "regex",
  "serde",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "typed-builder",
 ]
 
@@ -2153,7 +2295,7 @@ dependencies = [
  "reactive_graph",
  "send_wrapper",
  "tachys",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "url",
  "wasm-bindgen",
  "web-sys",
@@ -2192,9 +2334,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libm"
@@ -2229,6 +2371,18 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2444,7 +2598,7 @@ dependencies = [
  "rustc_version",
  "smallvec",
  "tagptr",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "triomphe",
  "uuid",
 ]
@@ -2587,7 +2741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64b94982fe39a861561cf67ff17a7849f2cedadbbad960a797634032b7abb998"
 dependencies = [
  "serde",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2729,7 +2883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
@@ -2980,20 +3134,20 @@ checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
 
 [[package]]
 name = "psm"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "publicsuffix"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf"
 dependencies = [
- "idna 0.3.0",
+ "idna 1.0.3",
  "psl-types",
 ]
 
@@ -3023,9 +3177,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -3034,33 +3188,36 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror 1.0.65",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror 1.0.65",
+ "thiserror 2.0.3",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
 dependencies = [
  "cfg_aliases",
  "libc",
@@ -3168,7 +3325,7 @@ dependencies = [
  "send_wrapper",
  "serde",
  "slotmap",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "web-sys",
 ]
 
@@ -3234,9 +3391,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3312,7 +3469,7 @@ dependencies = [
  "http",
  "reqwest",
  "serde",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tower-service",
 ]
 
@@ -3387,7 +3544,7 @@ dependencies = [
  "quote",
  "syn 2.0.87",
  "syn_derive",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3423,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.38"
+version = "0.38.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -3462,6 +3619,9 @@ name = "rustls-pki-types"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -3534,9 +3694,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3559,18 +3719,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3608,7 +3768,7 @@ checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3656,7 +3816,7 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "throw_error",
  "tower 0.4.13",
  "tower-layer",
@@ -3736,7 +3896,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3801,6 +3961,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "stacker"
 version = "0.1.17"
@@ -3881,6 +4047,17 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "syntect"
 version = "5.2.0"
@@ -3898,7 +4075,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "walkdir",
  "yaml-rust",
 ]
@@ -3964,9 +4141,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -3977,11 +4154,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.65",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
@@ -3995,9 +4172,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4071,6 +4248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
  "displaydoc",
+ "zerovec",
 ]
 
 [[package]]
@@ -4090,9 +4268,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4425,22 +4603,34 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
  "percent-encoding",
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
 version = "1.11.0"
@@ -4516,9 +4706,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4557,9 +4747,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -4578,6 +4768,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.6"
@@ -4748,6 +4948,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.12"
@@ -4780,6 +4992,30 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4801,8 +5037,51 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 29cf167..ed63e8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +67,7 @@ env_logger = { version = "0.11.5", default-features = false }
 futures = "0.3.30"
 hex = "0.4.3"
 rand = "0.8.5"
+getrandom = { version = "0.2", features = ["js"] }
 serde_json = "1.0.128"
 sha2 = "0.10.8"
 uuid = { version = "1.10.0", features = ["serde"] }
@@ -88,6 +89,7 @@ markdown-it-sub = "1.0.0"
 markdown-it-sup = "1.0.0"
 leptos-use = "0.14.0-rc2"
 codee = "0.2.0"
+wasm-bindgen = "0.2.95"
 
 # backend-only features
 axum = { version = "0.7.7", optional = true }
@@ -118,6 +120,7 @@ config = { version = "0.14.0", features = ["toml"], optional = true }
 tower = { version = "0.5.1", optional = true }
 tower-layer = { version = "0.3.3", optional = true }
 console_log = "1.0.0"
+send_wrapper = "0.6.0"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index e2933dd..b66dc57 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -131,7 +131,6 @@ async fn leptos_routes_handler(
     req: Request<Body>,
 ) -> Response {
     let handler = leptos_axum::render_app_async_with_context(
-        option.clone(),
         move || {
             let cookie = jar.get(AUTH_COOKIE).map(|c| c.value().to_string());
             provide_context(Auth(cookie));
diff --git a/src/common/mod.rs b/src/common/mod.rs
index be4666a..a7b9ae8 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -3,7 +3,6 @@ pub mod utils;
 pub mod validation;
 
 use chrono::{DateTime, Utc};
-use codee::{Decoder, Encoder};
 use newtypes::{ArticleId, ConflictId, EditId, InstanceId, PersonId};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -352,25 +351,6 @@ pub struct SiteView {
     pub config: Options,
 }
 
-// TODO: using () doesnt make much sense
-impl Encoder<()> for SiteView {
-    type Error = serde_json::Error;
-    type Encoded = String;
-
-    fn encode(val: &()) -> Result<Self::Encoded, Self::Error> {
-        serde_json::to_string(val)
-    }
-}
-
-impl Decoder<()> for SiteView {
-    type Error = serde_json::Error;
-    type Encoded = str;
-
-    fn decode(stored_value: &Self::Encoded) -> Result<(), Self::Error> {
-        serde_json::from_str(stored_value)
-    }
-}
-
 #[test]
 fn test_edit_versions() {
     let default = EditVersion::default();
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index b4cba97..034c455 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -31,8 +31,12 @@ use crate::{
 };
 use anyhow::anyhow;
 use reqwest::{Client, RequestBuilder, StatusCode};
+use send_wrapper::SendWrapper;
 use serde::{Deserialize, Serialize};
-use std::sync::LazyLock;
+use std::{
+    future::Future,
+    sync::{LazyLock},
+};
 use url::Url;
 
 pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| ApiClient::new(Client::new(), None));
@@ -84,189 +88,277 @@ impl ApiClient {
         handle_json_res::<T>(req).await
     }
 
-    pub async fn get_article(&self, data: GetArticleForm) -> MyResult<ArticleView> {
-        self.get_query("/api/v1/article", Some(data)).await
-    }
-
-    pub async fn list_articles(&self, data: ListArticlesForm) -> MyResult<Vec<DbArticle>> {
-        self.get_query("/api/v1/article/list", Some(data)).await
-    }
-
-    pub async fn register(&self, register_form: RegisterUserForm) -> MyResult<LocalUserView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/account/register"))
-            .form(&register_form);
-        handle_json_res::<LocalUserView>(req).await
-    }
-
-    pub async fn login(&self, login_form: LoginUserForm) -> MyResult<LocalUserView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/account/login"))
-            .form(&login_form);
-        handle_json_res::<LocalUserView>(req).await
-    }
-
-    pub async fn create_article(&self, data: &CreateArticleForm) -> MyResult<ArticleView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article"))
-            .form(data);
-        handle_json_res(req).await
-    }
-
-    pub async fn edit_article_with_conflict(
+    pub fn get_article(
         &self,
-        edit_form: &EditArticleForm,
-    ) -> MyResult<Option<ApiConflict>> {
-        let req = self
-            .client
-            .patch(self.request_endpoint("/api/v1/article"))
-            .form(edit_form);
-        handle_json_res(req).await
+        data: GetArticleForm,
+    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/article", Some(data)).await })
     }
 
-    pub async fn edit_article(&self, edit_form: &EditArticleForm) -> MyResult<ArticleView> {
-        let edit_res = self.edit_article_with_conflict(edit_form).await?;
-        assert!(edit_res.is_none());
+    pub fn list_articles(
+        &self,
+        data: ListArticlesForm,
+    ) -> impl Future<Output = MyResult<Vec<DbArticle>>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/article/list", Some(data)).await })
+    }
 
-        self.get_article(GetArticleForm {
-            title: None,
-            domain: None,
-            id: Some(edit_form.article_id),
+    pub fn register(
+        &self,
+        register_form: RegisterUserForm,
+    ) -> impl Future<Output = MyResult<LocalUserView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/account/register"))
+                .form(&register_form);
+            handle_json_res::<LocalUserView>(req).await
         })
-        .await
     }
 
-    pub async fn notifications_list(&self) -> MyResult<Vec<Notification>> {
-        let req = self
-            .client
-            .get(self.request_endpoint("/api/v1/user/notifications/list"));
-        handle_json_res(req).await
-    }
-
-    pub async fn notifications_count(&self) -> MyResult<usize> {
-        let req = self
-            .client
-            .get(self.request_endpoint("/api/v1/user/notifications/count"));
-        handle_json_res(req).await
-    }
-
-    pub async fn approve_article(&self, article_id: ArticleId, approve: bool) -> MyResult<()> {
-        let form = ApproveArticleForm {
-            article_id,
-            approve,
-        };
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/approve"))
-            .form(&form);
-        handle_json_res(req).await
-    }
-
-    pub async fn delete_conflict(&self, conflict_id: ConflictId) -> MyResult<()> {
-        let form = DeleteConflictForm { conflict_id };
-        let req = self
-            .client
-            .delete(self.request_endpoint("/api/v1/conflict"))
-            .form(&form);
-        handle_json_res(req).await
-    }
-
-    pub async fn search(&self, search_form: &SearchArticleForm) -> MyResult<Vec<DbArticle>> {
-        self.get_query("/api/v1/search", Some(search_form)).await
-    }
-
-    pub async fn get_local_instance(&self) -> MyResult<InstanceView> {
-        self.get_query("/api/v1/instance", None::<i32>).await
-    }
-
-    pub async fn get_instance(&self, get_form: &GetInstance) -> MyResult<InstanceView> {
-        self.get_query("/api/v1/instance", Some(get_form)).await
-    }
-
-    pub async fn list_instances(&self) -> MyResult<Vec<DbInstance>> {
-        self.get_query("/api/v1/instance/list", None::<i32>).await
-    }
-
-    pub async fn follow_instance_with_resolve(
+    pub fn login(
         &self,
-        follow_instance: &str,
-    ) -> MyResult<DbInstance> {
-        // fetch beta instance on alpha
-        let resolve_form = ResolveObject {
-            id: Url::parse(&format!("{}://{}", http_protocol_str(), follow_instance))?,
-        };
-        let instance_resolved: DbInstance = self
-            .get_query("/api/v1/instance/resolve", Some(resolve_form))
-            .await?;
-
-        // send follow
-        let follow_form = FollowInstance {
-            id: instance_resolved.id,
-        };
-        self.follow_instance(follow_form).await?;
-        Ok(instance_resolved)
+        login_form: LoginUserForm,
+    ) -> impl Future<Output = MyResult<LocalUserView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/account/login"))
+                .form(&login_form);
+            handle_json_res::<LocalUserView>(req).await
+        })
     }
 
-    pub async fn follow_instance(&self, follow_form: FollowInstance) -> MyResult<()> {
-        // cant use post helper because follow doesnt return json
-        let res = self
-            .client
-            .post(self.request_endpoint("/api/v1/instance/follow"))
-            .form(&follow_form)
-            .send()
-            .await?;
-        if res.status() == StatusCode::OK {
+    pub fn create_article(
+        &self,
+        data: CreateArticleForm,
+    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/article"))
+                .form(&data);
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn edit_article_with_conflict(
+        &self,
+        edit_form: EditArticleForm,
+    ) -> impl Future<Output = MyResult<Option<ApiConflict>>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .patch(self.request_endpoint("/api/v1/article"))
+                .form(&edit_form);
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn edit_article(
+        &self,
+        edit_form: EditArticleForm,
+    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let article_id = edit_form.article_id;
+            let edit_res = self.edit_article_with_conflict(edit_form).await?;
+            assert!(edit_res.is_none());
+
+            self.get_article(GetArticleForm {
+                title: None,
+                domain: None,
+                id: Some(article_id),
+            })
+            .await
+        })
+    }
+
+    pub fn notifications_list(
+        &self,
+    ) -> impl Future<Output = MyResult<Vec<Notification>>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .get(self.request_endpoint("/api/v1/user/notifications/list"));
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn notifications_count(&self) -> impl Future<Output = MyResult<usize>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .get(self.request_endpoint("/api/v1/user/notifications/count"));
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn approve_article(
+        &self,
+        article_id: ArticleId,
+        approve: bool,
+    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
+        SendWrapper::new(async move {
+            let form = ApproveArticleForm {
+                article_id,
+                approve,
+            };
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/article/approve"))
+                .form(&form);
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn delete_conflict(
+        &self,
+        conflict_id: ConflictId,
+    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
+        SendWrapper::new(async move {
+            let form = DeleteConflictForm { conflict_id };
+            let req = self
+                .client
+                .delete(self.request_endpoint("/api/v1/conflict"))
+                .form(&form);
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn search(
+        &self,
+        search_form: SearchArticleForm,
+    ) -> impl Future<Output = MyResult<Vec<DbArticle>>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/search", Some(search_form)).await })
+    }
+
+    pub fn get_local_instance(
+        &self,
+    ) -> impl Future<Output = MyResult<Vec<InstanceView>>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/instance", None::<i32>).await })
+    }
+
+    pub fn get_instance(
+        &self,
+        get_form: GetInstance,
+    ) -> impl Future<Output = MyResult<InstanceView>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/instance", Some(get_form)).await })
+    }
+
+    pub fn list_instances(&self) -> impl Future<Output = MyResult<Vec<DbInstance>>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/instance/list", None::<i32>).await })
+    }
+
+    pub fn follow_instance_with_resolve(
+        &self,
+        follow_instance: String,
+    ) -> impl Future<Output = MyResult<DbInstance>> + Send + '_ {
+        SendWrapper::new(async move {
+            // fetch beta instance on alpha
+            let resolve_form = ResolveObject {
+                id: Url::parse(&format!("{}://{}", http_protocol_str(), follow_instance))?,
+            };
+            let instance_resolved: DbInstance = self
+                .get_query("/api/v1/instance/resolve", Some(resolve_form))
+                .await?;
+
+            // send follow
+            let follow_form = FollowInstance {
+                id: instance_resolved.id,
+            };
+            self.follow_instance(follow_form).await?;
+            Ok(instance_resolved)
+        })
+    }
+
+    pub fn follow_instance(
+        &self,
+        follow_form: FollowInstance,
+    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
+        SendWrapper::new(async move {
+            // cant use post helper because follow doesnt return json
+            let res = self
+                .client
+                .post(self.request_endpoint("/api/v1/instance/follow"))
+                .form(&follow_form)
+                .send()
+                .await?;
+            if res.status() == StatusCode::OK {
+                Ok(())
+            } else {
+                Err(anyhow!("API error: {}", res.text().await?).into())
+            }
+        })
+    }
+
+    pub fn site(&self) -> impl Future<Output = MyResult<SiteView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self.client.get(self.request_endpoint("/api/v1/site"));
+            handle_json_res(req).await
+        })
+    }
+
+    pub fn logout(&self) -> impl Future<Output = MyResult<()>> + Send + '_ {
+        SendWrapper::new(async move {
+            self.client
+                .get(self.request_endpoint("/api/v1/account/logout"))
+                .send()
+                .await?;
             Ok(())
-        } else {
-            Err(anyhow!("API error: {}", res.text().await?).into())
-        }
+        })
     }
 
-    pub async fn site(&self) -> MyResult<SiteView> {
-        let req = self.client.get(self.request_endpoint("/api/v1/site"));
-        handle_json_res(req).await
+    pub fn fork_article(
+        &self,
+        form: ForkArticleForm,
+    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/article/fork"))
+                .form(&form);
+            Ok(handle_json_res(req).await.unwrap())
+        })
     }
 
-    pub async fn logout(&self) -> MyResult<()> {
-        self.client
-            .get(self.request_endpoint("/api/v1/account/logout"))
-            .send()
-            .await?;
-        Ok(())
+    pub fn protect_article(
+        &self,
+        params: ProtectArticleForm,
+    ) -> impl Future<Output = MyResult<DbArticle>> + Send + '_ {
+        SendWrapper::new(async move {
+            let req = self
+                .client
+                .post(self.request_endpoint("/api/v1/article/protect"))
+                .form(&params);
+            handle_json_res(req).await
+        })
     }
 
-    pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/fork"))
-            .form(form);
-        Ok(handle_json_res(req).await.unwrap())
+    pub fn resolve_article(
+        &self,
+        id: Url,
+    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
+        SendWrapper::new(async move {
+            let resolve_object = ResolveObject { id };
+            self.get_query("/api/v1/article/resolve", Some(resolve_object))
+                .await
+        })
     }
 
-    pub async fn protect_article(&self, params: &ProtectArticleForm) -> MyResult<DbArticle> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/protect"))
-            .form(params);
-        handle_json_res(req).await
+    pub fn resolve_instance(
+        &self,
+        id: Url,
+    ) -> impl Future<Output = MyResult<DbInstance>> + Send + '_ {
+        SendWrapper::new(async move {
+            let resolve_object = ResolveObject { id };
+            self.get_query("/api/v1/instance/resolve", Some(resolve_object))
+                .await
+        })
     }
-
-    pub async fn resolve_article(&self, id: Url) -> MyResult<ArticleView> {
-        let resolve_object = ResolveObject { id };
-        self.get_query("/api/v1/article/resolve", Some(resolve_object))
-            .await
-    }
-
-    pub async fn resolve_instance(&self, id: Url) -> MyResult<DbInstance> {
-        let resolve_object = ResolveObject { id };
-        self.get_query("/api/v1/instance/resolve", Some(resolve_object))
-            .await
-    }
-    pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
-        self.get_query("/api/v1/user", Some(data)).await
+    pub fn get_user(
+        &self,
+        data: GetUserForm,
+    ) -> impl Future<Output = MyResult<DbPerson>> + Send + '_ {
+        SendWrapper::new(async move { self.get_query("/api/v1/user", Some(data)).await })
     }
 
     fn request_endpoint(&self, path: &str) -> String {
@@ -275,7 +367,7 @@ impl ApiClient {
     }
 }
 
-async fn handle_json_res<T>(#[allow(unused_mut)] mut req: RequestBuilder) -> MyResult<T>
+async fn handle_json_res<T>(mut req: RequestBuilder) -> MyResult<T>
 where
     T: for<'de> Deserialize<'de>,
 {
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index bc69252..f08da2d 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -30,8 +30,8 @@ use leptos_router::{
     path,
 };
 
-pub fn site() -> Resource<(), SiteView> {
-    use_context::<Resource<(), SiteView>>().unwrap()
+pub fn site() -> Resource<SiteView> {
+    use_context::<Resource<SiteView>>().unwrap()
 }
 
 pub fn is_logged_in() -> bool {
@@ -51,7 +51,7 @@ pub trait DefaultResource<T> {
     fn with_default<O>(&self, f: impl FnOnce(&T) -> O) -> O;
 }
 
-impl<T: Default> DefaultResource<T> for Resource<(), T> {
+impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
     fn with_default<O>(&self, f: impl FnOnce(&T) -> O) -> O {
         self.with(|x| match x {
             Some(x) => f(x),
diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index d682a40..7aa04bc 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -35,7 +35,7 @@ pub fn ArticleNav(article: Resource<ArticleView>, active_tab: ActiveTab) -> impl
                                 let form = GetInstance {
                                     id: Some(instance_id),
                                 };
-                                CLIENT.get_instance(&form).await.unwrap()
+                                CLIENT.get_instance(form).await.unwrap()
                             },
                         );
                         let article_link = article_link(&article_.article);
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 5e81e1c..abd9abd 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -16,7 +16,7 @@ pub fn hydrate() {
     use crate::frontend::app::App;
     console_log::init_with_level(log::Level::Debug).expect("error initializing logger");
     console_error_panic_hook::set_once();
-    leptos::mount_to_body(App);
+    mount_to_body(App);
 }
 
 fn article_link(article: &DbArticle) -> String {
diff --git a/src/frontend/pages/article/actions.rs b/src/frontend/pages/article/actions.rs
index e40d8d1..1f0ef22 100644
--- a/src/frontend/pages/article/actions.rs
+++ b/src/frontend/pages/article/actions.rs
@@ -25,7 +25,7 @@ pub fn ArticleActions() -> impl IntoView {
         };
         async move {
             set_error.update(|e| *e = None);
-            let result = CLIENT.fork_article(&params).await;
+            let result = CLIENT.fork_article(params).await;
             match result {
                 Ok(res) => set_fork_response.set(Some(res.article)),
                 Err(err) => {
@@ -41,7 +41,7 @@ pub fn ArticleActions() -> impl IntoView {
         };
         async move {
             set_error.update(|e| *e = None);
-            let result = CLIENT.protect_article(&params).await;
+            let result = CLIENT.protect_article(params).await;
             match result {
                 Ok(_res) => article.refetch(),
                 Err(err) => {
diff --git a/src/frontend/pages/article/create.rs b/src/frontend/pages/article/create.rs
index 896e849..1c92f4b 100644
--- a/src/frontend/pages/article/create.rs
+++ b/src/frontend/pages/article/create.rs
@@ -32,7 +32,7 @@ pub fn CreateArticle() -> impl IntoView {
                 summary,
             };
             set_wait_for_response.update(|w| *w = true);
-            let res = CLIENT.create_article(&form).await;
+            let res = CLIENT.create_article(form).await;
             set_wait_for_response.update(|w| *w = false);
             match res {
                 Ok(_res) => {
diff --git a/src/frontend/pages/article/edit.rs b/src/frontend/pages/article/edit.rs
index 165f025..b81b5f6 100644
--- a/src/frontend/pages/article/edit.rs
+++ b/src/frontend/pages/article/edit.rs
@@ -89,7 +89,7 @@ pub fn EditArticle() -> impl IntoView {
                     resolve_conflict_id,
                 };
                 set_wait_for_response.update(|w| *w = true);
-                let res = CLIENT.edit_article_with_conflict(&form).await;
+                let res = CLIENT.edit_article_with_conflict(form).await;
                 set_wait_for_response.update(|w| *w = false);
                 match res {
                     Ok(Some(conflict)) => {
diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index dfa67e0..5415550 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -7,8 +7,8 @@ use leptos::{html::Input, prelude::*};
 #[component]
 pub fn ListArticles() -> impl IntoView {
     let (only_local, set_only_local) = signal(false);
-    let button_only_local = create_node_ref::<Input>();
-    let button_all = create_node_ref::<Input>();
+    let button_only_local = NodeRef::<Input>::new();
+    let button_all = NodeRef::<Input>::new();
     let articles = Resource::new(
         move || only_local.get(),
         |only_local| async move {
@@ -32,8 +32,9 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn rounded-r-none"
                     node_ref=button_only_local
                     on:click=move |_| {
-                        button_all.get().map(|c| c.class("btn-primary", false));
-                        button_only_local.get().map(|c| c.class("btn-primary", true));
+                        // TODO
+                        //button_all.get().map(|c| c.class("btn-primary", false));
+                        //button_only_local.get().map(|c| c.class("btn-primary", true));
                         set_only_local.set(true);
                     }
                 />
@@ -43,8 +44,8 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn btn-primary rounded-l-none"
                     node_ref=button_all
                     on:click=move |_| {
-                        button_all.get().map(|c| c.class("btn-primary", true));
-                        button_only_local.get().map(|c| c.class("btn-primary", false));
+                        //button_all.get().map(|c| c.class("btn-primary", true));
+                        //button_only_local.get().map(|c| c.class("btn-primary", false));
                         set_only_local.set(false);
                     }
                 />
diff --git a/src/frontend/pages/search.rs b/src/frontend/pages/search.rs
index dbc6d95..a0a3c6b 100644
--- a/src/frontend/pages/search.rs
+++ b/src/frontend/pages/search.rs
@@ -29,7 +29,7 @@ pub fn Search() -> impl IntoView {
         let mut search_results = SearchResults::default();
         let url = Url::parse(&query);
         let search_data = SearchArticleForm { query };
-        let search = CLIENT.search(&search_data);
+        let search = CLIENT.search(search_data);
 
         match search.await {
             Ok(mut a) => search_results.articles.append(&mut a),

From a32bb4bbce46071d21f4bce80ed6cd6b55e47168 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 15 Nov 2024 16:35:03 +0100
Subject: [PATCH 03/16] update deps

---
 Cargo.toml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ed63e8c..b3fb05f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,25 +58,25 @@ dbg_macro = "deny"
 unwrap_used = "deny"
 
 [dependencies]
-anyhow = "1.0.89"
+anyhow = "1.0.93"
 leptos = "0.7.0-rc1"
 leptos_meta = "0.7.0-rc1"
 leptos_router = "0.7.0-rc1"
 chrono = { version = "0.4.38", features = ["serde"] }
 env_logger = { version = "0.11.5", default-features = false }
-futures = "0.3.30"
+futures = "0.3.31"
 hex = "0.4.3"
 rand = "0.8.5"
 getrandom = { version = "0.2", features = ["js"] }
-serde_json = "1.0.128"
+serde_json = "1.0.132"
 sha2 = "0.10.8"
-uuid = { version = "1.10.0", features = ["serde"] }
-serde = { version = "1.0.210", features = ["derive"] }
-url = { version = "2.5.2", features = ["serde"] }
-reqwest = { version = "0.12.8", features = ["json", "cookies"] }
+uuid = { version = "1.11.0", features = ["serde"] }
+serde = { version = "1.0.215", features = ["derive"] }
+url = { version = "2.5.3", features = ["serde"] }
+reqwest = { version = "0.12.9", features = ["json", "cookies"] }
 log = "0.4"
 tracing = "0.1.40"
-once_cell = "1.20.1"
+once_cell = "1.20.2"
 console_error_panic_hook = "0.1.7"
 time = "0.3.36"
 markdown-it = "0.6.1"
@@ -87,15 +87,15 @@ markdown-it-heading-anchors = "0.3.0"
 markdown-it-footnote = "0.2.0"
 markdown-it-sub = "1.0.0"
 markdown-it-sup = "1.0.0"
-leptos-use = "0.14.0-rc2"
+leptos-use = "0.14.0-rc3"
 codee = "0.2.0"
-wasm-bindgen = "0.2.95"
+wasm-bindgen = "=0.2.95"
 
 # backend-only features
 axum = { version = "0.7.7", optional = true }
 axum-macros = { version = "0.4.2", optional = true }
 axum-extra = { version = "0.9.4", features = ["cookie"], optional = true }
-tokio = { version = "1.40.0", features = ["full"], optional = true }
+tokio = { version = "1.41.1", features = ["full"], optional = true }
 tower-http = { version = "0.6.1", features = ["cors", "fs"], optional = true }
 activitypub_federation = { version = "0.6.0", features = [
   "axum",
@@ -116,7 +116,7 @@ bcrypt = { version = "0.15.1", optional = true }
 diffy = { version = "0.4.0", optional = true }
 enum_delegate = { version = "0.2.0", optional = true }
 async-trait = { version = "0.1.83", optional = true }
-config = { version = "0.14.0", features = ["toml"], optional = true }
+config = { version = "0.14.1", features = ["toml"], optional = true }
 tower = { version = "0.5.1", optional = true }
 tower-layer = { version = "0.3.3", optional = true }
 console_log = "1.0.0"

From c2c77d8974bcab40c9095253cb5bf246cb050464 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 18 Nov 2024 16:02:05 +0100
Subject: [PATCH 04/16] fix

---
 src/backend/mod.rs             | 8 +-------
 src/frontend/api.rs            | 5 +----
 src/frontend/app.rs            | 7 ++++---
 src/frontend/components/nav.rs | 2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index b66dc57..a5d10b8 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -27,7 +27,6 @@ use api::api_routes;
 use assets::file_and_error_handler;
 use axum::{
     body::Body,
-    extract::State,
     http::{HeaderValue, Request},
     middleware::Next,
     response::{IntoResponse, Response},
@@ -102,7 +101,6 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
 
     let config = data.clone();
     let app = Router::new()
-        //.leptos_routes(&leptos_options, routes, App)
         .leptos_routes_with_handler(routes, get(leptos_routes_handler))
         .fallback(file_and_error_handler)
         .with_state(leptos_options)
@@ -125,11 +123,7 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
 }
 
 /// Make auth token available in hydrate mode
-async fn leptos_routes_handler(
-    jar: CookieJar,
-    State(option): State<LeptosOptions>,
-    req: Request<Body>,
-) -> Response {
+async fn leptos_routes_handler(jar: CookieJar, req: Request<Body>) -> Response {
     let handler = leptos_axum::render_app_async_with_context(
         move || {
             let cookie = jar.get(AUTH_COOKIE).map(|c| c.value().to_string());
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 034c455..522bbae 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -33,10 +33,7 @@ use anyhow::anyhow;
 use reqwest::{Client, RequestBuilder, StatusCode};
 use send_wrapper::SendWrapper;
 use serde::{Deserialize, Serialize};
-use std::{
-    future::Future,
-    sync::{LazyLock},
-};
+use std::{future::Future, sync::LazyLock};
 use url::Url;
 
 pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| ApiClient::new(Client::new(), None));
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index f08da2d..88f1593 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -62,11 +62,12 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
 
 #[component]
 pub fn App() -> impl IntoView {
-    // TODO: should Resource::new() but then things break
-    let site_resource = LocalResource::new(|| async move { CLIENT.site().await.unwrap() });
-    provide_context(site_resource);
     provide_meta_context();
 
+    // TODO: should Resource::new() but then things break
+    let site_resource = Resource::new(|| (), |_| async move { CLIENT.site().await.unwrap() });
+    provide_context(site_resource);
+
     let darkmode = DarkMode::init();
     provide_context(darkmode.clone());
 
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index cb29025..17bf87e 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -51,7 +51,7 @@ pub fn Nav() -> impl IntoView {
                             <A href="/article/list">"Articles"</A>
                         </li>
                         <Transition>
-                            <Show when=is_logged_in>
+                            <Show when=move || is_logged_in()>
                                 <li>
                                     <A href="/article/create">"Create Article"</A>
                                 </li>

From 10bbc9ed2b3ca6a2af50409bb07775041f3faf0f Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 19 Nov 2024 23:24:06 +0100
Subject: [PATCH 05/16] rename methods

---
 Cargo.lock          | 266 +++++++++++++++++++++++---
 Cargo.toml          |   1 +
 src/frontend/api.rs | 450 +++++++++++++++++---------------------------
 3 files changed, 416 insertions(+), 301 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0761aab..2fcf31d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,7 +20,7 @@ dependencies = [
  "enum_delegate",
  "futures",
  "futures-core",
- "http",
+ "http 1.1.0",
  "http-signature-normalization",
  "http-signature-normalization-reqwest",
  "httpdate",
@@ -214,7 +214,7 @@ dependencies = [
  "axum-core",
  "bytes",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -248,7 +248,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "mime",
@@ -271,7 +271,7 @@ dependencies = [
  "bytes",
  "cookie",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "mime",
@@ -1440,6 +1440,108 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "gloo"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372"
+dependencies = [
+ "gloo-console",
+ "gloo-dialogs",
+ "gloo-events",
+ "gloo-file",
+ "gloo-history",
+ "gloo-net 0.5.0",
+ "gloo-render",
+ "gloo-storage",
+ "gloo-timers",
+ "gloo-utils",
+ "gloo-worker",
+]
+
+[[package]]
+name = "gloo-console"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261"
+dependencies = [
+ "gloo-utils",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-dialogs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-events"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-file"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f"
+dependencies = [
+ "gloo-events",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-history"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6"
+dependencies = [
+ "getrandom",
+ "gloo-events",
+ "gloo-utils",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_urlencoded",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-net"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils",
+ "http 0.2.12",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-net"
 version = "0.6.0"
@@ -1450,7 +1552,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http",
+ "http 1.1.0",
  "js-sys",
  "pin-project",
  "serde",
@@ -1461,6 +1563,31 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-render"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-storage"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a"
+dependencies = [
+ "gloo-utils",
+ "js-sys",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
@@ -1486,6 +1613,37 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-worker"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d"
+dependencies = [
+ "bincode",
+ "futures",
+ "gloo-utils",
+ "gloo-worker-macros",
+ "js-sys",
+ "pinned",
+ "serde",
+ "thiserror 1.0.69",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-worker-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "guardian"
 version = "1.2.0"
@@ -1503,7 +1661,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http",
+ "http 1.1.0",
  "indexmap",
  "slab",
  "tokio",
@@ -1563,6 +1721,17 @@ dependencies = [
  "utf8-width",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http"
 version = "1.1.0"
@@ -1581,7 +1750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -1592,7 +1761,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "pin-project-lite",
 ]
@@ -1667,7 +1836,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "h2",
- "http",
+ "http 1.1.0",
  "http-body",
  "httparse",
  "httpdate",
@@ -1685,7 +1854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http",
+ "http 1.1.0",
  "hyper",
  "hyper-util",
  "rustls",
@@ -1721,7 +1890,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "hyper",
  "pin-project-lite",
@@ -1779,6 +1948,7 @@ dependencies = [
  "env_logger",
  "futures",
  "getrandom",
+ "gloo",
  "hex",
  "jsonwebtoken",
  "katex",
@@ -2139,7 +2309,7 @@ dependencies = [
  "default-struct-builder",
  "futures-util",
  "gloo-timers",
- "http",
+ "http 1.1.0",
  "js-sys",
  "lazy_static",
  "leptos",
@@ -2285,7 +2455,7 @@ dependencies = [
  "any_spawner",
  "either_of",
  "futures",
- "gloo-net",
+ "gloo-net 0.6.0",
  "js-sys",
  "leptos",
  "leptos_router_macro",
@@ -2612,7 +2782,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http",
+ "http 1.1.0",
  "httparse",
  "memchr",
  "mime",
@@ -2953,6 +3123,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pinned"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b"
+dependencies = [
+ "futures",
+ "rustversion",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -3037,6 +3218,16 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -3420,7 +3611,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -3466,7 +3657,7 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04"
 dependencies = [
  "anyhow",
  "async-trait",
- "http",
+ "http 1.1.0",
  "reqwest",
  "serde",
  "thiserror 1.0.69",
@@ -3726,6 +3917,17 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.215"
@@ -3803,8 +4005,8 @@ dependencies = [
  "const_format",
  "dashmap",
  "futures",
- "gloo-net",
- "http",
+ "gloo-net 0.6.0",
+ "http 1.1.0",
  "http-body-util",
  "hyper",
  "inventory",
@@ -4338,7 +4540,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -4350,6 +4552,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -4360,7 +4573,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -4403,7 +4616,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "http-range-header",
@@ -4428,7 +4641,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "http-range-header",
@@ -4939,6 +5152,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
 version = "0.6.20"
diff --git a/Cargo.toml b/Cargo.toml
index b3fb05f..05452e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,6 +121,7 @@ tower = { version = "0.5.1", optional = true }
 tower-layer = { version = "0.3.3", optional = true }
 console_log = "1.0.0"
 send_wrapper = "0.6.0"
+gloo = "0.11.0"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 522bbae..34fac6f 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -2,38 +2,18 @@ use crate::{
     common::{
         newtypes::{ArticleId, ConflictId},
         utils::http_protocol_str,
-        ApiConflict,
-        ApproveArticleForm,
-        ArticleView,
-        CreateArticleForm,
-        DbArticle,
-        DbInstance,
-        DbPerson,
-        DeleteConflictForm,
-        EditArticleForm,
-        FollowInstance,
-        ForkArticleForm,
-        GetArticleForm,
-        GetInstance,
-        GetUserForm,
-        InstanceView,
-        ListArticlesForm,
-        LocalUserView,
-        LoginUserForm,
-        Notification,
-        ProtectArticleForm,
-        RegisterUserForm,
-        ResolveObject,
-        SearchArticleForm,
-        SiteView,
+        ApiConflict, ApproveArticleForm, ArticleView, CreateArticleForm, DbArticle, DbInstance,
+        DbPerson, DeleteConflictForm, EditArticleForm, FollowInstance, ForkArticleForm,
+        GetArticleForm, GetInstance, GetUserForm, InstanceView, ListArticlesForm, LocalUserView,
+        LoginUserForm, Notification, ProtectArticleForm, RegisterUserForm, ResolveObject,
+        SearchArticleForm, SiteView,
     },
     frontend::error::MyResult,
 };
 use anyhow::anyhow;
 use reqwest::{Client, RequestBuilder, StatusCode};
-use send_wrapper::SendWrapper;
 use serde::{Deserialize, Serialize};
-use std::{future::Future, sync::LazyLock};
+use std::sync::LazyLock;
 use url::Url;
 
 pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| ApiClient::new(Client::new(), None));
@@ -73,7 +53,7 @@ impl ApiClient {
         }
     }
 
-    async fn get_query<T, R>(&self, endpoint: &str, query: Option<R>) -> MyResult<T>
+    async fn get<T, R>(&self, endpoint: &str, query: Option<R>) -> MyResult<T>
     where
         T: for<'de> Deserialize<'de>,
         R: Serialize,
@@ -82,280 +62,192 @@ impl ApiClient {
         if let Some(query) = query {
             req = req.query(&query);
         }
-        handle_json_res::<T>(req).await
+        send::<T>(req).await
     }
 
-    pub fn get_article(
-        &self,
-        data: GetArticleForm,
-    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/article", Some(data)).await })
+    pub async fn get_article(&self, data: GetArticleForm) -> MyResult<ArticleView> {
+        self.get("/api/v1/article", Some(data)).await
     }
 
-    pub fn list_articles(
-        &self,
-        data: ListArticlesForm,
-    ) -> impl Future<Output = MyResult<Vec<DbArticle>>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/article/list", Some(data)).await })
+    pub async fn list_articles(&self, data: ListArticlesForm) -> MyResult<Vec<DbArticle>> {
+        self.get("/api/v1/article/list", Some(data)).await
     }
 
-    pub fn register(
+    pub async fn register(&self, register_form: RegisterUserForm) -> MyResult<LocalUserView> {
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/account/register"))
+            .form(&register_form);
+        send::<LocalUserView>(req).await
+    }
+
+    pub async fn login(&self, login_form: LoginUserForm) -> MyResult<LocalUserView> {
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/account/login"))
+            .form(&login_form);
+        send::<LocalUserView>(req).await
+    }
+
+    pub async fn create_article(&self, data: &CreateArticleForm) -> MyResult<ArticleView> {
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/article"))
+            .form(data);
+        send(req).await
+    }
+
+    pub async fn edit_article_with_conflict(
         &self,
-        register_form: RegisterUserForm,
-    ) -> impl Future<Output = MyResult<LocalUserView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/account/register"))
-                .form(&register_form);
-            handle_json_res::<LocalUserView>(req).await
+        edit_form: &EditArticleForm,
+    ) -> MyResult<Option<ApiConflict>> {
+        let req = self
+            .client
+            .patch(self.request_endpoint("/api/v1/article"))
+            .form(edit_form);
+        send(req).await
+    }
+
+    pub async fn edit_article(&self, edit_form: &EditArticleForm) -> MyResult<ArticleView> {
+        let edit_res = self.edit_article_with_conflict(edit_form).await?;
+        assert!(edit_res.is_none());
+
+        self.get_article(GetArticleForm {
+            title: None,
+            domain: None,
+            id: Some(edit_form.article_id),
         })
+        .await
     }
 
-    pub fn login(
+    pub async fn notifications_list(&self) -> MyResult<Vec<Notification>> {
+        let req = self
+            .client
+            .get(self.request_endpoint("/api/v1/user/notifications/list"));
+        send(req).await
+    }
+
+    pub async fn notifications_count(&self) -> MyResult<usize> {
+        let req = self
+            .client
+            .get(self.request_endpoint("/api/v1/user/notifications/count"));
+        send(req).await
+    }
+
+    pub async fn approve_article(&self, article_id: ArticleId, approve: bool) -> MyResult<()> {
+        let form = ApproveArticleForm {
+            article_id,
+            approve,
+        };
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/article/approve"))
+            .form(&form);
+        send(req).await
+    }
+
+    pub async fn delete_conflict(&self, conflict_id: ConflictId) -> MyResult<()> {
+        let form = DeleteConflictForm { conflict_id };
+        let req = self
+            .client
+            .delete(self.request_endpoint("/api/v1/conflict"))
+            .form(&form);
+        send(req).await
+    }
+
+    pub async fn search(&self, search_form: &SearchArticleForm) -> MyResult<Vec<DbArticle>> {
+        self.get("/api/v1/search", Some(search_form)).await
+    }
+
+    pub async fn get_local_instance(&self) -> MyResult<InstanceView> {
+        self.get("/api/v1/instance", None::<i32>).await
+    }
+
+    pub async fn get_instance(&self, get_form: &GetInstance) -> MyResult<InstanceView> {
+        self.get("/api/v1/instance", Some(get_form)).await
+    }
+
+    pub async fn list_instances(&self) -> MyResult<Vec<DbInstance>> {
+        self.get("/api/v1/instance/list", None::<i32>).await
+    }
+
+    pub async fn follow_instance_with_resolve(
         &self,
-        login_form: LoginUserForm,
-    ) -> impl Future<Output = MyResult<LocalUserView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/account/login"))
-                .form(&login_form);
-            handle_json_res::<LocalUserView>(req).await
-        })
+        follow_instance: &str,
+    ) -> MyResult<DbInstance> {
+        // fetch beta instance on alpha
+        let resolve_form = ResolveObject {
+            id: Url::parse(&format!("{}://{}", http_protocol_str(), follow_instance))?,
+        };
+        let instance_resolved: DbInstance = self
+            .get("/api/v1/instance/resolve", Some(resolve_form))
+            .await?;
+
+        // send follow
+        let follow_form = FollowInstance {
+            id: instance_resolved.id,
+        };
+        self.follow_instance(follow_form).await?;
+        Ok(instance_resolved)
     }
 
-    pub fn create_article(
-        &self,
-        data: CreateArticleForm,
-    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/article"))
-                .form(&data);
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn edit_article_with_conflict(
-        &self,
-        edit_form: EditArticleForm,
-    ) -> impl Future<Output = MyResult<Option<ApiConflict>>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .patch(self.request_endpoint("/api/v1/article"))
-                .form(&edit_form);
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn edit_article(
-        &self,
-        edit_form: EditArticleForm,
-    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let article_id = edit_form.article_id;
-            let edit_res = self.edit_article_with_conflict(edit_form).await?;
-            assert!(edit_res.is_none());
-
-            self.get_article(GetArticleForm {
-                title: None,
-                domain: None,
-                id: Some(article_id),
-            })
-            .await
-        })
-    }
-
-    pub fn notifications_list(
-        &self,
-    ) -> impl Future<Output = MyResult<Vec<Notification>>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .get(self.request_endpoint("/api/v1/user/notifications/list"));
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn notifications_count(&self) -> impl Future<Output = MyResult<usize>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .get(self.request_endpoint("/api/v1/user/notifications/count"));
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn approve_article(
-        &self,
-        article_id: ArticleId,
-        approve: bool,
-    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
-        SendWrapper::new(async move {
-            let form = ApproveArticleForm {
-                article_id,
-                approve,
-            };
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/article/approve"))
-                .form(&form);
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn delete_conflict(
-        &self,
-        conflict_id: ConflictId,
-    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
-        SendWrapper::new(async move {
-            let form = DeleteConflictForm { conflict_id };
-            let req = self
-                .client
-                .delete(self.request_endpoint("/api/v1/conflict"))
-                .form(&form);
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn search(
-        &self,
-        search_form: SearchArticleForm,
-    ) -> impl Future<Output = MyResult<Vec<DbArticle>>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/search", Some(search_form)).await })
-    }
-
-    pub fn get_local_instance(
-        &self,
-    ) -> impl Future<Output = MyResult<Vec<InstanceView>>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/instance", None::<i32>).await })
-    }
-
-    pub fn get_instance(
-        &self,
-        get_form: GetInstance,
-    ) -> impl Future<Output = MyResult<InstanceView>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/instance", Some(get_form)).await })
-    }
-
-    pub fn list_instances(&self) -> impl Future<Output = MyResult<Vec<DbInstance>>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/instance/list", None::<i32>).await })
-    }
-
-    pub fn follow_instance_with_resolve(
-        &self,
-        follow_instance: String,
-    ) -> impl Future<Output = MyResult<DbInstance>> + Send + '_ {
-        SendWrapper::new(async move {
-            // fetch beta instance on alpha
-            let resolve_form = ResolveObject {
-                id: Url::parse(&format!("{}://{}", http_protocol_str(), follow_instance))?,
-            };
-            let instance_resolved: DbInstance = self
-                .get_query("/api/v1/instance/resolve", Some(resolve_form))
-                .await?;
-
-            // send follow
-            let follow_form = FollowInstance {
-                id: instance_resolved.id,
-            };
-            self.follow_instance(follow_form).await?;
-            Ok(instance_resolved)
-        })
-    }
-
-    pub fn follow_instance(
-        &self,
-        follow_form: FollowInstance,
-    ) -> impl Future<Output = MyResult<()>> + Send + '_ {
-        SendWrapper::new(async move {
-            // cant use post helper because follow doesnt return json
-            let res = self
-                .client
-                .post(self.request_endpoint("/api/v1/instance/follow"))
-                .form(&follow_form)
-                .send()
-                .await?;
-            if res.status() == StatusCode::OK {
-                Ok(())
-            } else {
-                Err(anyhow!("API error: {}", res.text().await?).into())
-            }
-        })
-    }
-
-    pub fn site(&self) -> impl Future<Output = MyResult<SiteView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self.client.get(self.request_endpoint("/api/v1/site"));
-            handle_json_res(req).await
-        })
-    }
-
-    pub fn logout(&self) -> impl Future<Output = MyResult<()>> + Send + '_ {
-        SendWrapper::new(async move {
-            self.client
-                .get(self.request_endpoint("/api/v1/account/logout"))
-                .send()
-                .await?;
+    pub async fn follow_instance(&self, follow_form: FollowInstance) -> MyResult<()> {
+        // cant use post helper because follow doesnt return json
+        let res = self
+            .client
+            .post(self.request_endpoint("/api/v1/instance/follow"))
+            .form(&follow_form)
+            .send()
+            .await?;
+        if res.status() == StatusCode::OK {
             Ok(())
-        })
+        } else {
+            Err(anyhow!("API error: {}", res.text().await?).into())
+        }
     }
 
-    pub fn fork_article(
-        &self,
-        form: ForkArticleForm,
-    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/article/fork"))
-                .form(&form);
-            Ok(handle_json_res(req).await.unwrap())
-        })
+    pub async fn site(&self) -> MyResult<SiteView> {
+        let req = self.client.get(self.request_endpoint("/api/v1/site"));
+        send(req).await
     }
 
-    pub fn protect_article(
-        &self,
-        params: ProtectArticleForm,
-    ) -> impl Future<Output = MyResult<DbArticle>> + Send + '_ {
-        SendWrapper::new(async move {
-            let req = self
-                .client
-                .post(self.request_endpoint("/api/v1/article/protect"))
-                .form(&params);
-            handle_json_res(req).await
-        })
+    pub async fn logout(&self) -> MyResult<()> {
+        self.client
+            .get(self.request_endpoint("/api/v1/account/logout"))
+            .send()
+            .await?;
+        Ok(())
     }
 
-    pub fn resolve_article(
-        &self,
-        id: Url,
-    ) -> impl Future<Output = MyResult<ArticleView>> + Send + '_ {
-        SendWrapper::new(async move {
-            let resolve_object = ResolveObject { id };
-            self.get_query("/api/v1/article/resolve", Some(resolve_object))
-                .await
-        })
+    pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/article/fork"))
+            .form(form);
+        Ok(send(req).await.unwrap())
     }
 
-    pub fn resolve_instance(
-        &self,
-        id: Url,
-    ) -> impl Future<Output = MyResult<DbInstance>> + Send + '_ {
-        SendWrapper::new(async move {
-            let resolve_object = ResolveObject { id };
-            self.get_query("/api/v1/instance/resolve", Some(resolve_object))
-                .await
-        })
+    pub async fn protect_article(&self, params: &ProtectArticleForm) -> MyResult<DbArticle> {
+        let req = self
+            .client
+            .post(self.request_endpoint("/api/v1/article/protect"))
+            .form(params);
+        send(req).await
     }
-    pub fn get_user(
-        &self,
-        data: GetUserForm,
-    ) -> impl Future<Output = MyResult<DbPerson>> + Send + '_ {
-        SendWrapper::new(async move { self.get_query("/api/v1/user", Some(data)).await })
+
+    pub async fn resolve_article(&self, id: Url) -> MyResult<ArticleView> {
+        let resolve_object = ResolveObject { id };
+        self.get("/api/v1/article/resolve", Some(resolve_object))
+            .await
+    }
+
+    pub async fn resolve_instance(&self, id: Url) -> MyResult<DbInstance> {
+        let resolve_object = ResolveObject { id };
+        self.get("/api/v1/instance/resolve", Some(resolve_object))
+            .await
+    }
+    pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
+        self.get("/api/v1/user", Some(data)).await
     }
 
     fn request_endpoint(&self, path: &str) -> String {
@@ -364,7 +256,7 @@ impl ApiClient {
     }
 }
 
-async fn handle_json_res<T>(mut req: RequestBuilder) -> MyResult<T>
+async fn send<T>(#[allow(unused_mut)] mut req: RequestBuilder) -> MyResult<T>
 where
     T: for<'de> Deserialize<'de>,
 {

From 5847e99128ddeb74f0f6589b963f1d21b1c7601d Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 19 Nov 2024 23:54:31 +0100
Subject: [PATCH 06/16] partial

---
 Cargo.lock                             | 268 +++----------------------
 Cargo.toml                             |   3 +-
 src/backend/mod.rs                     |  25 +--
 src/frontend/api.rs                    | 118 +++++++----
 src/frontend/app.rs                    |  25 ++-
 src/frontend/components/article_nav.rs |   2 +-
 src/frontend/pages/article/actions.rs  |   4 +-
 src/frontend/pages/article/create.rs   |   2 +-
 src/frontend/pages/article/edit.rs     |   2 +-
 src/frontend/pages/search.rs           |   2 +-
 10 files changed, 140 insertions(+), 311 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fcf31d..b8b4667 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,7 +20,7 @@ dependencies = [
  "enum_delegate",
  "futures",
  "futures-core",
- "http 1.1.0",
+ "http",
  "http-signature-normalization",
  "http-signature-normalization-reqwest",
  "httpdate",
@@ -214,7 +214,7 @@ dependencies = [
  "axum-core",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "hyper",
@@ -248,7 +248,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "mime",
@@ -271,7 +271,7 @@ dependencies = [
  "bytes",
  "cookie",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "mime",
@@ -1440,108 +1440,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "gloo"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372"
-dependencies = [
- "gloo-console",
- "gloo-dialogs",
- "gloo-events",
- "gloo-file",
- "gloo-history",
- "gloo-net 0.5.0",
- "gloo-render",
- "gloo-storage",
- "gloo-timers",
- "gloo-utils",
- "gloo-worker",
-]
-
-[[package]]
-name = "gloo-console"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261"
-dependencies = [
- "gloo-utils",
- "js-sys",
- "serde",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-dialogs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-events"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-file"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f"
-dependencies = [
- "gloo-events",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-history"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6"
-dependencies = [
- "getrandom",
- "gloo-events",
- "gloo-utils",
- "serde",
- "serde-wasm-bindgen",
- "serde_urlencoded",
- "thiserror 1.0.69",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-net"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-sink",
- "gloo-utils",
- "http 0.2.12",
- "js-sys",
- "pin-project",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "gloo-net"
 version = "0.6.0"
@@ -1552,7 +1450,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 1.1.0",
+ "http",
  "js-sys",
  "pin-project",
  "serde",
@@ -1563,31 +1461,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "gloo-render"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833"
-dependencies = [
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-storage"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a"
-dependencies = [
- "gloo-utils",
- "js-sys",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
@@ -1613,37 +1486,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "gloo-worker"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d"
-dependencies = [
- "bincode",
- "futures",
- "gloo-utils",
- "gloo-worker-macros",
- "js-sys",
- "pinned",
- "serde",
- "thiserror 1.0.69",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "gloo-worker-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "guardian"
 version = "1.2.0"
@@ -1661,7 +1503,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.1.0",
+ "http",
  "indexmap",
  "slab",
  "tokio",
@@ -1721,17 +1563,6 @@ dependencies = [
  "utf8-width",
 ]
 
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
 [[package]]
 name = "http"
 version = "1.1.0"
@@ -1750,7 +1581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http",
 ]
 
 [[package]]
@@ -1761,7 +1592,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "pin-project-lite",
 ]
@@ -1836,7 +1667,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "h2",
- "http 1.1.0",
+ "http",
  "http-body",
  "httparse",
  "httpdate",
@@ -1854,7 +1685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http 1.1.0",
+ "http",
  "hyper",
  "hyper-util",
  "rustls",
@@ -1890,7 +1721,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "hyper",
  "pin-project-lite",
@@ -1948,7 +1779,7 @@ dependencies = [
  "env_logger",
  "futures",
  "getrandom",
- "gloo",
+ "gloo-net",
  "hex",
  "jsonwebtoken",
  "katex",
@@ -1983,6 +1814,7 @@ dependencies = [
  "url",
  "uuid",
  "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -2309,7 +2141,7 @@ dependencies = [
  "default-struct-builder",
  "futures-util",
  "gloo-timers",
- "http 1.1.0",
+ "http",
  "js-sys",
  "lazy_static",
  "leptos",
@@ -2455,7 +2287,7 @@ dependencies = [
  "any_spawner",
  "either_of",
  "futures",
- "gloo-net 0.6.0",
+ "gloo-net",
  "js-sys",
  "leptos",
  "leptos_router_macro",
@@ -2782,7 +2614,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http 1.1.0",
+ "http",
  "httparse",
  "memchr",
  "mime",
@@ -3123,17 +2955,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pinned"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b"
-dependencies = [
- "futures",
- "rustversion",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -3218,16 +3039,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -3611,7 +3422,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "hyper",
@@ -3657,7 +3468,7 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04"
 dependencies = [
  "anyhow",
  "async-trait",
- "http 1.1.0",
+ "http",
  "reqwest",
  "serde",
  "thiserror 1.0.69",
@@ -3917,17 +3728,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.215"
@@ -4005,8 +3805,8 @@ dependencies = [
  "const_format",
  "dashmap",
  "futures",
- "gloo-net 0.6.0",
- "http 1.1.0",
+ "gloo-net",
+ "http",
  "http-body-util",
  "hyper",
  "inventory",
@@ -4540,7 +4340,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -4552,17 +4352,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -4573,7 +4362,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow",
 ]
 
 [[package]]
@@ -4616,7 +4405,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "http-range-header",
@@ -4641,7 +4430,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http",
  "http-body",
  "http-body-util",
  "http-range-header",
@@ -5152,15 +4941,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.20"
diff --git a/Cargo.toml b/Cargo.toml
index 05452e1..482d3f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,7 +121,8 @@ tower = { version = "0.5.1", optional = true }
 tower-layer = { version = "0.3.3", optional = true }
 console_log = "1.0.0"
 send_wrapper = "0.6.0"
-gloo = "0.11.0"
+gloo-net = "0.6.0"
+web-sys = "0.3.72"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index a5d10b8..34ca5ec 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -7,16 +7,10 @@ use crate::{
         utils::generate_activity_id,
     },
     common::{
-        utils::http_protocol_str,
-        Auth,
-        DbArticle,
-        DbInstance,
-        DbPerson,
-        EditVersion,
-        AUTH_COOKIE,
+        utils::http_protocol_str, Auth, DbArticle, DbInstance, DbPerson, EditVersion, AUTH_COOKIE,
         MAIN_PAGE_NAME,
     },
-    frontend::app::App,
+    frontend::app::{shell, App},
 };
 use activitypub_federation::{
     config::{Data, FederationConfig, FederationMiddleware},
@@ -27,12 +21,12 @@ use api::api_routes;
 use assets::file_and_error_handler;
 use axum::{
     body::Body,
+    extract::State,
     http::{HeaderValue, Request},
     middleware::Next,
     response::{IntoResponse, Response},
     routing::get,
-    Router,
-    ServiceExt,
+    Router, ServiceExt,
 };
 use axum_extra::extract::CookieJar;
 use axum_macros::debug_middleware;
@@ -43,8 +37,7 @@ use diesel::{
 };
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
 use federation::objects::{
-    articles_collection::local_articles_url,
-    instance_collection::linked_instances_url,
+    articles_collection::local_articles_url, instance_collection::linked_instances_url,
 };
 use leptos::prelude::*;
 use leptos_axum::{generate_route_list, LeptosRoutes};
@@ -123,13 +116,17 @@ pub async fn start(config: IbisConfig, override_hostname: Option<SocketAddr>) ->
 }
 
 /// Make auth token available in hydrate mode
-async fn leptos_routes_handler(jar: CookieJar, req: Request<Body>) -> Response {
+async fn leptos_routes_handler(
+    jar: CookieJar,
+    State(leptos_options): State<LeptosOptions>,
+    req: Request<Body>,
+) -> Response {
     let handler = leptos_axum::render_app_async_with_context(
         move || {
             let cookie = jar.get(AUTH_COOKIE).map(|c| c.value().to_string());
             provide_context(Auth(cookie));
         },
-        move || view! { <App /> },
+        move || shell(leptos_options.clone()),
     );
 
     handler(req).await.into_response()
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 34fac6f..6e0e21b 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -62,7 +62,7 @@ impl ApiClient {
         if let Some(query) = query {
             req = req.query(&query);
         }
-        send::<T>(req).await
+        self.send::<T>(req).await
     }
 
     pub async fn get_article(&self, data: GetArticleForm) -> MyResult<ArticleView> {
@@ -78,7 +78,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/account/register"))
             .form(&register_form);
-        send::<LocalUserView>(req).await
+        self.send::<LocalUserView>(req).await
     }
 
     pub async fn login(&self, login_form: LoginUserForm) -> MyResult<LocalUserView> {
@@ -86,7 +86,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/account/login"))
             .form(&login_form);
-        send::<LocalUserView>(req).await
+        self.send::<LocalUserView>(req).await
     }
 
     pub async fn create_article(&self, data: &CreateArticleForm) -> MyResult<ArticleView> {
@@ -94,7 +94,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/article"))
             .form(data);
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn edit_article_with_conflict(
@@ -105,7 +105,7 @@ impl ApiClient {
             .client
             .patch(self.request_endpoint("/api/v1/article"))
             .form(edit_form);
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn edit_article(&self, edit_form: &EditArticleForm) -> MyResult<ArticleView> {
@@ -124,14 +124,14 @@ impl ApiClient {
         let req = self
             .client
             .get(self.request_endpoint("/api/v1/user/notifications/list"));
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn notifications_count(&self) -> MyResult<usize> {
         let req = self
             .client
             .get(self.request_endpoint("/api/v1/user/notifications/count"));
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn approve_article(&self, article_id: ArticleId, approve: bool) -> MyResult<()> {
@@ -143,7 +143,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/article/approve"))
             .form(&form);
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn delete_conflict(&self, conflict_id: ConflictId) -> MyResult<()> {
@@ -152,7 +152,7 @@ impl ApiClient {
             .client
             .delete(self.request_endpoint("/api/v1/conflict"))
             .form(&form);
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn search(&self, search_form: &SearchArticleForm) -> MyResult<Vec<DbArticle>> {
@@ -192,6 +192,8 @@ impl ApiClient {
     }
 
     pub async fn follow_instance(&self, follow_form: FollowInstance) -> MyResult<()> {
+        todo!();
+        /*
         // cant use post helper because follow doesnt return json
         let res = self
             .client
@@ -204,19 +206,19 @@ impl ApiClient {
         } else {
             Err(anyhow!("API error: {}", res.text().await?).into())
         }
+        */
     }
 
     pub async fn site(&self) -> MyResult<SiteView> {
         let req = self.client.get(self.request_endpoint("/api/v1/site"));
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn logout(&self) -> MyResult<()> {
-        self.client
-            .get(self.request_endpoint("/api/v1/account/logout"))
-            .send()
-            .await?;
-        Ok(())
+        let req = self
+            .client
+            .get(self.request_endpoint("/api/v1/account/logout"));
+        Ok(self.send(req).await.unwrap())
     }
 
     pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
@@ -224,7 +226,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/article/fork"))
             .form(form);
-        Ok(send(req).await.unwrap())
+        Ok(self.send(req).await.unwrap())
     }
 
     pub async fn protect_article(&self, params: &ProtectArticleForm) -> MyResult<DbArticle> {
@@ -232,7 +234,7 @@ impl ApiClient {
             .client
             .post(self.request_endpoint("/api/v1/article/protect"))
             .form(params);
-        send(req).await
+        self.send(req).await
     }
 
     pub async fn resolve_article(&self, id: Url) -> MyResult<ArticleView> {
@@ -249,23 +251,10 @@ impl ApiClient {
     pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
         self.get("/api/v1/user", Some(data)).await
     }
-
-    fn request_endpoint(&self, path: &str) -> String {
-        let protocol = if self.ssl { "https" } else { "http" };
-        format!("{protocol}://{}{path}", &self.hostname)
-    }
-}
-
-async fn send<T>(#[allow(unused_mut)] mut req: RequestBuilder) -> MyResult<T>
-where
-    T: for<'de> Deserialize<'de>,
-{
-    #[cfg(not(feature = "ssr"))]
-    {
-        req = req.fetch_credentials_include();
-    }
-
     #[cfg(feature = "ssr")]
+    async fn send<T>(&self, mut req: RequestBuilder) -> MyResult<T>
+    where
+        T: for<'de> Deserialize<'de>,
     {
         use crate::common::{Auth, AUTH_COOKIE};
         use leptos::prelude::use_context;
@@ -275,13 +264,62 @@ where
         if let Some(Auth(Some(auth))) = auth {
             req = req.header(HeaderName::from_static(AUTH_COOKIE), auth);
         }
+        let res = req.send().await?;
+        let status = res.status();
+        let text = res.text().await?;
+        if status == StatusCode::OK {
+            Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
+        } else {
+            Err(anyhow!("API error: {text}").into())
+        }
     }
-    let res = req.send().await?;
-    let status = res.status();
-    let text = res.text().await?;
-    if status == StatusCode::OK {
-        Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
-    } else {
-        Err(anyhow!("API error: {text}").into())
+
+    #[cfg(feature = "hydrate")]
+    fn send<T>(
+        &self,
+        mut req: RequestBuilder,
+    ) -> impl std::future::Future<Output = MyResult<T>> + Send
+    where
+        T: for<'de> Deserialize<'de>,
+    {
+        use gloo_net::http::*;
+        use leptos::prelude::on_cleanup;
+        use send_wrapper::SendWrapper;
+        use web_sys::RequestCredentials;
+
+        SendWrapper::new(async move {
+            let abort_controller = SendWrapper::new(web_sys::AbortController::new().ok());
+            let abort_signal = abort_controller.as_ref().map(|a| a.signal());
+
+            // abort in-flight requests if, e.g., we've navigated away from this page
+            on_cleanup(move || {
+                if let Some(abort_controller) = abort_controller.take() {
+                    abort_controller.abort()
+                }
+            });
+
+            /*
+            if status == StatusCode::OK {
+                Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
+            } else {
+                Err(anyhow!("API error: {text}").into())
+            }
+            */
+            Ok(RequestBuilder::new("/api/v1/site")
+                .method(Method::GET)
+                .abort_signal(abort_signal.as_ref())
+                .credentials(RequestCredentials::Include)
+                .send()
+                .await
+                .unwrap()
+                .json()
+                .await
+                .unwrap())
+        })
+    }
+
+    fn request_endpoint(&self, path: &str) -> String {
+        let protocol = if self.ssl { "https" } else { "http" };
+        format!("{protocol}://{}{path}", &self.hostname)
     }
 }
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 88f1593..ebd5303 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -6,12 +6,8 @@ use crate::{
         dark_mode::DarkMode,
         pages::{
             article::{
-                actions::ArticleActions,
-                create::CreateArticle,
-                edit::EditArticle,
-                history::ArticleHistory,
-                list::ListArticles,
-                read::ReadArticle,
+                actions::ArticleActions, create::CreateArticle, edit::EditArticle,
+                history::ArticleHistory, list::ListArticles, read::ReadArticle,
             },
             diff::EditDiff,
             instance::{details::InstanceDetails, list::ListInstances},
@@ -59,6 +55,23 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
         })
     }
 }
+pub fn shell(options: LeptosOptions) -> impl IntoView {
+    view! {
+        <!DOCTYPE html>
+        <html lang="en">
+            <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <AutoReload options=options.clone() />
+                <HydrationScripts options />
+                <MetaTags />
+            </head>
+            <body>
+                <App />
+            </body>
+        </html>
+    }
+}
 
 #[component]
 pub fn App() -> impl IntoView {
diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index 7aa04bc..d682a40 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -35,7 +35,7 @@ pub fn ArticleNav(article: Resource<ArticleView>, active_tab: ActiveTab) -> impl
                                 let form = GetInstance {
                                     id: Some(instance_id),
                                 };
-                                CLIENT.get_instance(form).await.unwrap()
+                                CLIENT.get_instance(&form).await.unwrap()
                             },
                         );
                         let article_link = article_link(&article_.article);
diff --git a/src/frontend/pages/article/actions.rs b/src/frontend/pages/article/actions.rs
index 1f0ef22..e40d8d1 100644
--- a/src/frontend/pages/article/actions.rs
+++ b/src/frontend/pages/article/actions.rs
@@ -25,7 +25,7 @@ pub fn ArticleActions() -> impl IntoView {
         };
         async move {
             set_error.update(|e| *e = None);
-            let result = CLIENT.fork_article(params).await;
+            let result = CLIENT.fork_article(&params).await;
             match result {
                 Ok(res) => set_fork_response.set(Some(res.article)),
                 Err(err) => {
@@ -41,7 +41,7 @@ pub fn ArticleActions() -> impl IntoView {
         };
         async move {
             set_error.update(|e| *e = None);
-            let result = CLIENT.protect_article(params).await;
+            let result = CLIENT.protect_article(&params).await;
             match result {
                 Ok(_res) => article.refetch(),
                 Err(err) => {
diff --git a/src/frontend/pages/article/create.rs b/src/frontend/pages/article/create.rs
index 1c92f4b..896e849 100644
--- a/src/frontend/pages/article/create.rs
+++ b/src/frontend/pages/article/create.rs
@@ -32,7 +32,7 @@ pub fn CreateArticle() -> impl IntoView {
                 summary,
             };
             set_wait_for_response.update(|w| *w = true);
-            let res = CLIENT.create_article(form).await;
+            let res = CLIENT.create_article(&form).await;
             set_wait_for_response.update(|w| *w = false);
             match res {
                 Ok(_res) => {
diff --git a/src/frontend/pages/article/edit.rs b/src/frontend/pages/article/edit.rs
index b81b5f6..165f025 100644
--- a/src/frontend/pages/article/edit.rs
+++ b/src/frontend/pages/article/edit.rs
@@ -89,7 +89,7 @@ pub fn EditArticle() -> impl IntoView {
                     resolve_conflict_id,
                 };
                 set_wait_for_response.update(|w| *w = true);
-                let res = CLIENT.edit_article_with_conflict(form).await;
+                let res = CLIENT.edit_article_with_conflict(&form).await;
                 set_wait_for_response.update(|w| *w = false);
                 match res {
                     Ok(Some(conflict)) => {
diff --git a/src/frontend/pages/search.rs b/src/frontend/pages/search.rs
index a0a3c6b..dbc6d95 100644
--- a/src/frontend/pages/search.rs
+++ b/src/frontend/pages/search.rs
@@ -29,7 +29,7 @@ pub fn Search() -> impl IntoView {
         let mut search_results = SearchResults::default();
         let url = Url::parse(&query);
         let search_data = SearchArticleForm { query };
-        let search = CLIENT.search(search_data);
+        let search = CLIENT.search(&search_data);
 
         match search.await {
             Ok(mut a) => search_results.articles.append(&mut a),

From 688ead9217287cefe1f9e72eeee4945bfe8f8656 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 20 Nov 2024 10:21:26 +0100
Subject: [PATCH 07/16] finally compiling

---
 Cargo.lock          |   2 +
 Cargo.toml          |  16 +--
 src/common/mod.rs   |  18 ++--
 src/frontend/api.rs | 230 ++++++++++++++++++++++----------------------
 src/frontend/mod.rs |   2 +-
 5 files changed, 136 insertions(+), 132 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b8b4667..00f6046 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1781,6 +1781,7 @@ dependencies = [
  "getrandom",
  "gloo-net",
  "hex",
+ "http",
  "jsonwebtoken",
  "katex",
  "leptos",
@@ -1803,6 +1804,7 @@ dependencies = [
  "send_wrapper",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "sha2",
  "smart-default",
  "time",
diff --git a/Cargo.toml b/Cargo.toml
index 482d3f8..e50ddf2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,12 +29,9 @@ ssr = [
   "config",
   "tower",
   "tower-layer",
+  "reqwest","diesel-derive-newtype"
 ]
-hydrate = [
-  "leptos/hydrate",
-  "katex/wasm-js",
-]
-diesel-derive-newtype = ["dep:diesel-derive-newtype"]
+hydrate = ["leptos/hydrate", "katex/wasm-js", "gloo-net"]
 
 # This profile significantly speeds up build time. If debug info is needed you can comment the line
 # out temporarily, but make sure to leave this in the main branch.
@@ -73,7 +70,10 @@ sha2 = "0.10.8"
 uuid = { version = "1.11.0", features = ["serde"] }
 serde = { version = "1.0.215", features = ["derive"] }
 url = { version = "2.5.3", features = ["serde"] }
-reqwest = { version = "0.12.9", features = ["json", "cookies"] }
+reqwest = { version = "0.12.9", features = [
+  "json",
+  "cookies",
+], optional = true }
 log = "0.4"
 tracing = "0.1.40"
 once_cell = "1.20.2"
@@ -121,8 +121,10 @@ tower = { version = "0.5.1", optional = true }
 tower-layer = { version = "0.3.3", optional = true }
 console_log = "1.0.0"
 send_wrapper = "0.6.0"
-gloo-net = "0.6.0"
+gloo-net = { version = "0.6.0", optional = true }
 web-sys = "0.3.72"
+http = "1.1.0"
+serde_urlencoded = "0.7.1"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"
diff --git a/src/common/mod.rs b/src/common/mod.rs
index a7b9ae8..cb5f983 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -36,7 +36,7 @@ pub struct GetArticleForm {
     pub id: Option<ArticleId>,
 }
 
-#[derive(Deserialize, Serialize, Clone, Default)]
+#[derive(Deserialize, Serialize, Clone, Default, Debug)]
 pub struct ListArticlesForm {
     pub only_local: Option<bool>,
     pub instance_id: Option<InstanceId>,
@@ -128,13 +128,13 @@ impl Default for EditVersion {
     }
 }
 
-#[derive(Deserialize, Serialize, Clone)]
+#[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct RegisterUserForm {
     pub username: String,
     pub password: String,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct LoginUserForm {
     pub username: String,
     pub password: String,
@@ -188,7 +188,7 @@ impl DbPerson {
     }
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct CreateArticleForm {
     pub title: String,
     pub text: String,
@@ -217,19 +217,19 @@ pub struct ProtectArticleForm {
     pub protected: bool,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct ForkArticleForm {
     pub article_id: ArticleId,
     pub new_title: String,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct ApproveArticleForm {
     pub article_id: ArticleId,
     pub approve: bool,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct DeleteConflictForm {
     pub conflict_id: ConflictId,
 }
@@ -244,12 +244,12 @@ pub struct FollowInstance {
     pub id: InstanceId,
 }
 
-#[derive(Deserialize, Serialize, Clone)]
+#[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct SearchArticleForm {
     pub query: String,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct ResolveObject {
     pub id: Url,
 }
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 6e0e21b..4093748 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -11,37 +11,40 @@ use crate::{
     frontend::error::MyResult,
 };
 use anyhow::anyhow;
-use reqwest::{Client, RequestBuilder, StatusCode};
+use http::*;
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 use std::sync::LazyLock;
 use url::Url;
 
-pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| ApiClient::new(Client::new(), None));
+pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| {
+    #[cfg(feature = "ssr")]
+    {
+        ApiClient::new(reqwest::Client::new(), None)
+    }
+    #[cfg(not(feature = "ssr"))]
+    {
+        ApiClient::new()
+    }
+});
 
 #[derive(Clone)]
 pub struct ApiClient {
-    client: Client,
+    #[cfg(feature = "ssr")]
+    client: reqwest::Client,
     pub hostname: String,
     ssl: bool,
 }
 
 impl ApiClient {
-    pub fn new(client: Client, hostname_: Option<String>) -> Self {
+    #[cfg(feature = "ssr")]
+    pub fn new(client: reqwest::Client, hostname_: Option<String>) -> Self {
         let mut hostname;
         let ssl;
-        #[cfg(not(feature = "ssr"))]
-        {
-            use leptos_use::use_document;
-            hostname = use_document().location().unwrap().host().unwrap();
-            ssl = !cfg!(debug_assertions);
-        }
-        #[cfg(feature = "ssr")]
-        {
-            use leptos::config::get_config_from_str;
-            let leptos_options = get_config_from_str(include_str!("../../Cargo.toml")).unwrap();
-            hostname = leptos_options.site_addr.to_string();
-            ssl = false;
-        }
+        use leptos::config::get_config_from_str;
+        let leptos_options = get_config_from_str(include_str!("../../Cargo.toml")).unwrap();
+        hostname = leptos_options.site_addr.to_string();
+        ssl = false;
         // required for tests
         if let Some(hostname_) = hostname_ {
             hostname = hostname_;
@@ -52,17 +55,12 @@ impl ApiClient {
             ssl,
         }
     }
-
-    async fn get<T, R>(&self, endpoint: &str, query: Option<R>) -> MyResult<T>
-    where
-        T: for<'de> Deserialize<'de>,
-        R: Serialize,
-    {
-        let mut req = self.client.get(self.request_endpoint(endpoint));
-        if let Some(query) = query {
-            req = req.query(&query);
-        }
-        self.send::<T>(req).await
+    #[cfg(not(feature = "ssr"))]
+    pub fn new() -> Self {
+        use leptos_use::use_document;
+        let hostname = use_document().location().unwrap().host().unwrap();
+        let ssl = !cfg!(debug_assertions);
+        Self { hostname, ssl }
     }
 
     pub async fn get_article(&self, data: GetArticleForm) -> MyResult<ArticleView> {
@@ -74,38 +72,24 @@ impl ApiClient {
     }
 
     pub async fn register(&self, register_form: RegisterUserForm) -> MyResult<LocalUserView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/account/register"))
-            .form(&register_form);
-        self.send::<LocalUserView>(req).await
+        self.post("/api/v1/account/register", Some(&register_form))
+            .await
     }
 
     pub async fn login(&self, login_form: LoginUserForm) -> MyResult<LocalUserView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/account/login"))
-            .form(&login_form);
-        self.send::<LocalUserView>(req).await
+        self.post("/api/v1/account/login", Some(&login_form)).await
     }
 
     pub async fn create_article(&self, data: &CreateArticleForm) -> MyResult<ArticleView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article"))
-            .form(data);
-        self.send(req).await
+        self.send(Method::POST, "/api/v1/article", Some(&data))
+            .await
     }
 
     pub async fn edit_article_with_conflict(
         &self,
         edit_form: &EditArticleForm,
     ) -> MyResult<Option<ApiConflict>> {
-        let req = self
-            .client
-            .patch(self.request_endpoint("/api/v1/article"))
-            .form(edit_form);
-        self.send(req).await
+        self.get("/api/v1/article", Some(&edit_form)).await
     }
 
     pub async fn edit_article(&self, edit_form: &EditArticleForm) -> MyResult<ArticleView> {
@@ -121,17 +105,13 @@ impl ApiClient {
     }
 
     pub async fn notifications_list(&self) -> MyResult<Vec<Notification>> {
-        let req = self
-            .client
-            .get(self.request_endpoint("/api/v1/user/notifications/list"));
-        self.send(req).await
+        self.get("/api/v1/user/notifications/list", None::<()>)
+            .await
     }
 
     pub async fn notifications_count(&self) -> MyResult<usize> {
-        let req = self
-            .client
-            .get(self.request_endpoint("/api/v1/user/notifications/count"));
-        self.send(req).await
+        self.get("/api/v1/user/notifications/count", None::<()>)
+            .await
     }
 
     pub async fn approve_article(&self, article_id: ArticleId, approve: bool) -> MyResult<()> {
@@ -139,20 +119,13 @@ impl ApiClient {
             article_id,
             approve,
         };
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/approve"))
-            .form(&form);
-        self.send(req).await
+        self.post("/api/v1/article/approve", Some(&form)).await
     }
 
     pub async fn delete_conflict(&self, conflict_id: ConflictId) -> MyResult<()> {
         let form = DeleteConflictForm { conflict_id };
-        let req = self
-            .client
-            .delete(self.request_endpoint("/api/v1/conflict"))
-            .form(&form);
-        self.send(req).await
+        self.send(Method::DELETE, "/api/v1/conflict", Some(form))
+            .await
     }
 
     pub async fn search(&self, search_form: &SearchArticleForm) -> MyResult<Vec<DbArticle>> {
@@ -164,7 +137,7 @@ impl ApiClient {
     }
 
     pub async fn get_instance(&self, get_form: &GetInstance) -> MyResult<InstanceView> {
-        self.get("/api/v1/instance", Some(get_form)).await
+        self.get("/api/v1/instance", Some(&get_form)).await
     }
 
     pub async fn list_instances(&self) -> MyResult<Vec<DbInstance>> {
@@ -210,31 +183,22 @@ impl ApiClient {
     }
 
     pub async fn site(&self) -> MyResult<SiteView> {
-        let req = self.client.get(self.request_endpoint("/api/v1/site"));
-        self.send(req).await
+        self.get("/api/v1/site", None::<()>).await
     }
 
     pub async fn logout(&self) -> MyResult<()> {
-        let req = self
-            .client
-            .get(self.request_endpoint("/api/v1/account/logout"));
-        Ok(self.send(req).await.unwrap())
+        Ok(self
+            .get("/api/v1/account/logout", None::<()>)
+            .await
+            .unwrap())
     }
 
     pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/fork"))
-            .form(form);
-        Ok(self.send(req).await.unwrap())
+        Ok(self.post("/api/v1/article/fork", Some(form)).await.unwrap())
     }
 
     pub async fn protect_article(&self, params: &ProtectArticleForm) -> MyResult<DbArticle> {
-        let req = self
-            .client
-            .post(self.request_endpoint("/api/v1/article/protect"))
-            .form(params);
-        self.send(req).await
+        self.post("/api/v1/article/protect", Some(params)).await
     }
 
     pub async fn resolve_article(&self, id: Url) -> MyResult<ArticleView> {
@@ -245,47 +209,67 @@ impl ApiClient {
 
     pub async fn resolve_instance(&self, id: Url) -> MyResult<DbInstance> {
         let resolve_object = ResolveObject { id };
-        self.get("/api/v1/instance/resolve", Some(resolve_object))
-            .await
+        self.get("/api/v1/user", Some(resolve_object)).await
     }
     pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
         self.get("/api/v1/user", Some(data)).await
     }
-    #[cfg(feature = "ssr")]
-    async fn send<T>(&self, mut req: RequestBuilder) -> MyResult<T>
+
+    async fn get<T, R>(&self, endpoint: &str, query: Option<R>) -> MyResult<T>
     where
         T: for<'de> Deserialize<'de>,
+        R: Serialize + Debug,
+    {
+        self.send(Method::GET, endpoint, query).await
+    }
+
+    async fn post<T, R>(&self, endpoint: &str, query: Option<R>) -> MyResult<T>
+    where
+        T: for<'de> Deserialize<'de>,
+        R: Serialize + Debug,
+    {
+        self.send(Method::POST, endpoint, query).await
+    }
+
+    #[cfg(feature = "ssr")]
+    async fn send<P, T>(&self, method: Method, path: &str, params: Option<P>) -> MyResult<T>
+    where
+        P: Serialize + Debug,
+        T: for<'de> Deserialize<'de>,
     {
         use crate::common::{Auth, AUTH_COOKIE};
         use leptos::prelude::use_context;
         use reqwest::header::HeaderName;
-
+        let mut req = self
+            .client
+            .request(method, self.request_endpoint(path))
+            .query(&params);
         let auth = use_context::<Auth>();
         if let Some(Auth(Some(auth))) = auth {
             req = req.header(HeaderName::from_static(AUTH_COOKIE), auth);
         }
         let res = req.send().await?;
         let status = res.status();
-        let text = res.text().await?;
-        if status == StatusCode::OK {
-            Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
-        } else {
-            Err(anyhow!("API error: {text}").into())
-        }
+        let text = res.text().await?.to_string();
+        Self::response(status.into(), text)
     }
 
-    #[cfg(feature = "hydrate")]
-    fn send<T>(
-        &self,
-        mut req: RequestBuilder,
-    ) -> impl std::future::Future<Output = MyResult<T>> + Send
+    #[cfg(not(feature = "ssr"))]
+    fn send<'a, P, T>(
+        &'a self,
+        method: Method,
+        path: &'a str,
+        params: Option<P>,
+    ) -> impl std::future::Future<Output = MyResult<T>> + Send + 'a
     where
+        P: Serialize + Debug + 'a,
         T: for<'de> Deserialize<'de>,
     {
         use gloo_net::http::*;
         use leptos::prelude::on_cleanup;
         use send_wrapper::SendWrapper;
-        use web_sys::RequestCredentials;
+        use std::collections::HashMap;
+        use web_sys::{RequestCredentials, UrlSearchParams};
 
         SendWrapper::new(async move {
             let abort_controller = SendWrapper::new(web_sys::AbortController::new().ok());
@@ -298,26 +282,42 @@ impl ApiClient {
                 }
             });
 
-            /*
-            if status == StatusCode::OK {
-                Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
+            let path_with_endpoint = self.request_endpoint(path);
+            let path = if method == Method::GET {
+                let query = serde_urlencoded::to_string(&params).unwrap();
+                format!("{path_with_endpoint}?{query}")
             } else {
-                Err(anyhow!("API error: {text}").into())
-            }
-            */
-            Ok(RequestBuilder::new("/api/v1/site")
-                .method(Method::GET)
+                path_with_endpoint
+            };
+            log::info!("{path}");
+            let builder = RequestBuilder::new(&path)
+                .method(method.clone())
                 .abort_signal(abort_signal.as_ref())
-                .credentials(RequestCredentials::Include)
-                .send()
-                .await
-                .unwrap()
-                .json()
-                .await
-                .unwrap())
+                .credentials(RequestCredentials::Include);
+            let req = if method == Method::POST {
+                builder.json(&params)
+            } else {
+                builder.build()
+            }
+            .unwrap();
+            let res = req.send().await.unwrap();
+            let status = res.status();
+            let text = res.text().await.unwrap();
+            Self::response(status, text)
         })
     }
 
+    fn response<T>(status: u16, text: String) -> MyResult<T>
+    where
+        T: for<'de> Deserialize<'de>,
+    {
+        if status == StatusCode::OK {
+            Ok(serde_json::from_str(&text).map_err(|e| anyhow!("Json error on {text}: {e}"))?)
+        } else {
+            Err(anyhow!("API error: {text}").into())
+        }
+    }
+
     fn request_endpoint(&self, path: &str) -> String {
         let protocol = if self.ssl { "https" } else { "http" };
         format!("{protocol}://{}{path}", &self.hostname)
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index abd9abd..5558956 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -16,7 +16,7 @@ pub fn hydrate() {
     use crate::frontend::app::App;
     console_log::init_with_level(log::Level::Debug).expect("error initializing logger");
     console_error_panic_hook::set_once();
-    mount_to_body(App);
+    leptos::mount::hydrate_body(App);
 }
 
 fn article_link(article: &DbArticle) -> String {

From f9f83974d311b600fbf93c726a6f80e7e4b8e034 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 20 Nov 2024 10:25:28 +0100
Subject: [PATCH 08/16] change follow response

---
 src/backend/api/instance.rs |  9 ++++++---
 src/common/mod.rs           |  5 +++++
 src/frontend/api.rs         | 33 +++++++++++----------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/backend/api/instance.rs b/src/backend/api/instance.rs
index 6e04ec1..903300c 100644
--- a/src/backend/api/instance.rs
+++ b/src/backend/api/instance.rs
@@ -1,6 +1,9 @@
 use crate::{
     backend::{database::IbisData, error::MyResult, federation::activities::follow::Follow},
-    common::{DbInstance, FollowInstance, GetInstance, InstanceView, LocalUserView, ResolveObject},
+    common::{
+        DbInstance, FollowInstance, FollowInstanceResponse, GetInstance, InstanceView,
+        LocalUserView, ResolveObject,
+    },
 };
 use activitypub_federation::{config::Data, fetch::object_id::ObjectId};
 use axum::{extract::Query, Extension, Form, Json};
@@ -23,13 +26,13 @@ pub(in crate::backend::api) async fn follow_instance(
     Extension(user): Extension<LocalUserView>,
     data: Data<IbisData>,
     Form(query): Form<FollowInstance>,
-) -> MyResult<()> {
+) -> MyResult<Json<FollowInstanceResponse>> {
     let target = DbInstance::read(query.id, &data)?;
     let pending = !target.local;
     DbInstance::follow(&user.person, &target, pending, &data)?;
     let instance = DbInstance::read(query.id, &data)?;
     Follow::send(user.person, &instance, &data).await?;
-    Ok(())
+    Ok(Json(FollowInstanceResponse { success: true }))
 }
 
 /// Fetch a remote instance actor. This automatically synchronizes the remote articles collection to
diff --git a/src/common/mod.rs b/src/common/mod.rs
index cb5f983..6605fc2 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -244,6 +244,11 @@ pub struct FollowInstance {
     pub id: InstanceId,
 }
 
+#[derive(Deserialize, Serialize, Debug)]
+pub struct FollowInstanceResponse {
+    pub success: bool
+}
+
 #[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct SearchArticleForm {
     pub query: String,
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 4093748..5840d62 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -3,10 +3,10 @@ use crate::{
         newtypes::{ArticleId, ConflictId},
         utils::http_protocol_str,
         ApiConflict, ApproveArticleForm, ArticleView, CreateArticleForm, DbArticle, DbInstance,
-        DbPerson, DeleteConflictForm, EditArticleForm, FollowInstance, ForkArticleForm,
-        GetArticleForm, GetInstance, GetUserForm, InstanceView, ListArticlesForm, LocalUserView,
-        LoginUserForm, Notification, ProtectArticleForm, RegisterUserForm, ResolveObject,
-        SearchArticleForm, SiteView,
+        DbPerson, DeleteConflictForm, EditArticleForm, FollowInstance, FollowInstanceResponse,
+        ForkArticleForm, GetArticleForm, GetInstance, GetUserForm, InstanceView, ListArticlesForm,
+        LocalUserView, LoginUserForm, Notification, ProtectArticleForm, RegisterUserForm,
+        ResolveObject, SearchArticleForm, SiteView,
     },
     frontend::error::MyResult,
 };
@@ -164,22 +164,12 @@ impl ApiClient {
         Ok(instance_resolved)
     }
 
-    pub async fn follow_instance(&self, follow_form: FollowInstance) -> MyResult<()> {
-        todo!();
-        /*
-        // cant use post helper because follow doesnt return json
-        let res = self
-            .client
-            .post(self.request_endpoint("/api/v1/instance/follow"))
-            .form(&follow_form)
-            .send()
-            .await?;
-        if res.status() == StatusCode::OK {
-            Ok(())
-        } else {
-            Err(anyhow!("API error: {}", res.text().await?).into())
-        }
-        */
+    pub async fn follow_instance(
+        &self,
+        follow_form: FollowInstance,
+    ) -> MyResult<FollowInstanceResponse> {
+        self.post("/api/v1/instance/follow", Some(follow_form))
+            .await
     }
 
     pub async fn site(&self) -> MyResult<SiteView> {
@@ -268,8 +258,7 @@ impl ApiClient {
         use gloo_net::http::*;
         use leptos::prelude::on_cleanup;
         use send_wrapper::SendWrapper;
-        use std::collections::HashMap;
-        use web_sys::{RequestCredentials, UrlSearchParams};
+        use web_sys::RequestCredentials;
 
         SendWrapper::new(async move {
             let abort_controller = SendWrapper::new(web_sys::AbortController::new().ok());

From 14e6382765216fed3be375998ff1897fb4bdfb46 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 20 Nov 2024 10:48:07 +0100
Subject: [PATCH 09/16] clippy

---
 src/backend/api/instance.rs        |  9 ++++--
 src/backend/mod.rs                 | 14 +++++++--
 src/common/mod.rs                  |  2 +-
 src/frontend/api.rs                | 48 +++++++++++++++++++-----------
 src/frontend/app.rs                | 10 +++++--
 src/frontend/components/nav.rs     |  2 +-
 src/frontend/pages/article/list.rs |  5 ----
 7 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/src/backend/api/instance.rs b/src/backend/api/instance.rs
index 903300c..c7feaa1 100644
--- a/src/backend/api/instance.rs
+++ b/src/backend/api/instance.rs
@@ -1,8 +1,13 @@
 use crate::{
     backend::{database::IbisData, error::MyResult, federation::activities::follow::Follow},
     common::{
-        DbInstance, FollowInstance, FollowInstanceResponse, GetInstance, InstanceView,
-        LocalUserView, ResolveObject,
+        DbInstance,
+        FollowInstance,
+        FollowInstanceResponse,
+        GetInstance,
+        InstanceView,
+        LocalUserView,
+        ResolveObject,
     },
 };
 use activitypub_federation::{config::Data, fetch::object_id::ObjectId};
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index 34ca5ec..fa1b61c 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -7,7 +7,13 @@ use crate::{
         utils::generate_activity_id,
     },
     common::{
-        utils::http_protocol_str, Auth, DbArticle, DbInstance, DbPerson, EditVersion, AUTH_COOKIE,
+        utils::http_protocol_str,
+        Auth,
+        DbArticle,
+        DbInstance,
+        DbPerson,
+        EditVersion,
+        AUTH_COOKIE,
         MAIN_PAGE_NAME,
     },
     frontend::app::{shell, App},
@@ -26,7 +32,8 @@ use axum::{
     middleware::Next,
     response::{IntoResponse, Response},
     routing::get,
-    Router, ServiceExt,
+    Router,
+    ServiceExt,
 };
 use axum_extra::extract::CookieJar;
 use axum_macros::debug_middleware;
@@ -37,7 +44,8 @@ use diesel::{
 };
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
 use federation::objects::{
-    articles_collection::local_articles_url, instance_collection::linked_instances_url,
+    articles_collection::local_articles_url,
+    instance_collection::linked_instances_url,
 };
 use leptos::prelude::*;
 use leptos_axum::{generate_route_list, LeptosRoutes};
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 6605fc2..9042baa 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -246,7 +246,7 @@ pub struct FollowInstance {
 
 #[derive(Deserialize, Serialize, Debug)]
 pub struct FollowInstanceResponse {
-    pub success: bool
+    pub success: bool,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 5840d62..02f30b1 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -2,19 +2,38 @@ use crate::{
     common::{
         newtypes::{ArticleId, ConflictId},
         utils::http_protocol_str,
-        ApiConflict, ApproveArticleForm, ArticleView, CreateArticleForm, DbArticle, DbInstance,
-        DbPerson, DeleteConflictForm, EditArticleForm, FollowInstance, FollowInstanceResponse,
-        ForkArticleForm, GetArticleForm, GetInstance, GetUserForm, InstanceView, ListArticlesForm,
-        LocalUserView, LoginUserForm, Notification, ProtectArticleForm, RegisterUserForm,
-        ResolveObject, SearchArticleForm, SiteView,
+        ApiConflict,
+        ApproveArticleForm,
+        ArticleView,
+        CreateArticleForm,
+        DbArticle,
+        DbInstance,
+        DbPerson,
+        DeleteConflictForm,
+        EditArticleForm,
+        FollowInstance,
+        FollowInstanceResponse,
+        ForkArticleForm,
+        GetArticleForm,
+        GetInstance,
+        GetUserForm,
+        InstanceView,
+        ListArticlesForm,
+        LocalUserView,
+        LoginUserForm,
+        Notification,
+        ProtectArticleForm,
+        RegisterUserForm,
+        ResolveObject,
+        SearchArticleForm,
+        SiteView,
     },
     frontend::error::MyResult,
 };
 use anyhow::anyhow;
 use http::*;
 use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use std::sync::LazyLock;
+use std::{fmt::Debug, sync::LazyLock};
 use url::Url;
 
 pub static CLIENT: LazyLock<ApiClient> = LazyLock::new(|| {
@@ -39,12 +58,9 @@ pub struct ApiClient {
 impl ApiClient {
     #[cfg(feature = "ssr")]
     pub fn new(client: reqwest::Client, hostname_: Option<String>) -> Self {
-        let mut hostname;
-        let ssl;
         use leptos::config::get_config_from_str;
         let leptos_options = get_config_from_str(include_str!("../../Cargo.toml")).unwrap();
-        hostname = leptos_options.site_addr.to_string();
-        ssl = false;
+        let mut hostname = leptos_options.site_addr.to_string();
         // required for tests
         if let Some(hostname_) = hostname_ {
             hostname = hostname_;
@@ -52,7 +68,7 @@ impl ApiClient {
         Self {
             client,
             hostname,
-            ssl,
+            ssl: false,
         }
     }
     #[cfg(not(feature = "ssr"))]
@@ -177,10 +193,7 @@ impl ApiClient {
     }
 
     pub async fn logout(&self) -> MyResult<()> {
-        Ok(self
-            .get("/api/v1/account/logout", None::<()>)
-            .await
-            .unwrap())
+        self.get("/api/v1/account/logout", None::<()>).await
     }
 
     pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
@@ -273,12 +286,13 @@ impl ApiClient {
 
             let path_with_endpoint = self.request_endpoint(path);
             let path = if method == Method::GET {
+                // Cannot pass the struct directly but need to convert it manually
+                // https://github.com/rustwasm/gloo/issues/378
                 let query = serde_urlencoded::to_string(&params).unwrap();
                 format!("{path_with_endpoint}?{query}")
             } else {
                 path_with_endpoint
             };
-            log::info!("{path}");
             let builder = RequestBuilder::new(&path)
                 .method(method.clone())
                 .abort_signal(abort_signal.as_ref())
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index ebd5303..788acac 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -6,8 +6,12 @@ use crate::{
         dark_mode::DarkMode,
         pages::{
             article::{
-                actions::ArticleActions, create::CreateArticle, edit::EditArticle,
-                history::ArticleHistory, list::ListArticles, read::ReadArticle,
+                actions::ArticleActions,
+                create::CreateArticle,
+                edit::EditArticle,
+                history::ArticleHistory,
+                list::ListArticles,
+                read::ReadArticle,
             },
             diff::EditDiff,
             instance::{details::InstanceDetails, list::ListInstances},
@@ -57,7 +61,7 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
 }
 pub fn shell(options: LeptosOptions) -> impl IntoView {
     view! {
-        <!DOCTYPE html>
+        <!DOCTYPE html> 
         <html lang="en">
             <head>
                 <meta charset="utf-8" />
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index 17bf87e..cb29025 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -51,7 +51,7 @@ pub fn Nav() -> impl IntoView {
                             <A href="/article/list">"Articles"</A>
                         </li>
                         <Transition>
-                            <Show when=move || is_logged_in()>
+                            <Show when=is_logged_in>
                                 <li>
                                     <A href="/article/create">"Create Article"</A>
                                 </li>
diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index 5415550..1c4c70f 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -32,9 +32,6 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn rounded-r-none"
                     node_ref=button_only_local
                     on:click=move |_| {
-                        // TODO
-                        //button_all.get().map(|c| c.class("btn-primary", false));
-                        //button_only_local.get().map(|c| c.class("btn-primary", true));
                         set_only_local.set(true);
                     }
                 />
@@ -44,8 +41,6 @@ pub fn ListArticles() -> impl IntoView {
                     class="btn btn-primary rounded-l-none"
                     node_ref=button_all
                     on:click=move |_| {
-                        //button_all.get().map(|c| c.class("btn-primary", true));
-                        //button_only_local.get().map(|c| c.class("btn-primary", false));
                         set_only_local.set(false);
                     }
                 />

From 995106dfc1ec32c7278af18fde96c316bbe54941 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Nov 2024 11:19:00 +0100
Subject: [PATCH 10/16] fixes

---
 src/frontend/api.rs            | 3 ++-
 src/frontend/app.rs            | 8 ++++----
 src/frontend/components/nav.rs | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index 02f30b1..dcf50c7 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -212,7 +212,8 @@ impl ApiClient {
 
     pub async fn resolve_instance(&self, id: Url) -> MyResult<DbInstance> {
         let resolve_object = ResolveObject { id };
-        self.get("/api/v1/user", Some(resolve_object)).await
+        self.get("/api/v1/instance/resolve", Some(resolve_object))
+            .await
     }
     pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
         self.get("/api/v1/user", Some(data)).await
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 788acac..c39548a 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -61,7 +61,7 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
 }
 pub fn shell(options: LeptosOptions) -> impl IntoView {
     view! {
-        <!DOCTYPE html> 
+        <!DOCTYPE html>
         <html lang="en">
             <head>
                 <meta charset="utf-8" />
@@ -107,10 +107,10 @@ pub fn App() -> impl IntoView {
                         // TODO: use protected route, otherwise user can view
                         // /article/create without login
                         // https://github.com/leptos-rs/leptos/blob/leptos_0.7/examples/router/src/lib.rs#L51
-                        <Route path=path!("/article/create") view=CreateArticle />
-                        <Route path=path!("/article/list") view=ListArticles />
+                        <Route path=path!("/create-article") view=CreateArticle />
+                        <Route path=path!("/articles") view=ListArticles />
+                        <Route path=path!("/instances") view=ListInstances />
                         <Route path=path!("/instance/:hostname") view=InstanceDetails />
-                        <Route path=path!("/instance/list") view=ListInstances />
                         <Route path=path!("/user/:name") view=UserProfile />
                         <Route path=path!("/login") view=Login />
                         <Route path=path!("/register") view=Register />
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index cb29025..5fa91e5 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -45,15 +45,15 @@ pub fn Nav() -> impl IntoView {
                             <A href="/">"Main Page"</A>
                         </li>
                         <li>
-                            <A href="/instance/list">"Instances"</A>
+                            <A href="/instances">"Instances"</A>
                         </li>
                         <li>
-                            <A href="/article/list">"Articles"</A>
+                            <A href="/articles">"Articles"</A>
                         </li>
                         <Transition>
                             <Show when=is_logged_in>
                                 <li>
-                                    <A href="/article/create">"Create Article"</A>
+                                    <A href="/create-article">"Create Article"</A>
                                 </li>
                                 <li>
                                     <A href="/notifications">

From 53fce0db39f85fd69e8ed18ff745c334392f96f5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Nov 2024 13:12:37 +0100
Subject: [PATCH 11/16] fix article list buttons

---
 src/frontend/pages/article/list.rs | 32 +++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index 1c4c70f..3b49a4d 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -2,13 +2,11 @@ use crate::{
     common::ListArticlesForm,
     frontend::{api::CLIENT, article_link, article_title, components::connect::ConnectView},
 };
-use leptos::{html::Input, prelude::*};
+use leptos::prelude::*;
 
 #[component]
 pub fn ListArticles() -> impl IntoView {
     let (only_local, set_only_local) = signal(false);
-    let button_only_local = NodeRef::<Input>::new();
-    let button_all = NodeRef::<Input>::new();
     let articles = Resource::new(
         move || only_local.get(),
         |only_local| async move {
@@ -21,6 +19,28 @@ pub fn ListArticles() -> impl IntoView {
                 .unwrap()
         },
     );
+    let only_local_class = Resource::new(
+        move || only_local.get(),
+        |only_local| async move {
+            if only_local {
+                "btn rounded-r-none btn-primary"
+            } else {
+                "btn rounded-r-none"
+            }
+            .to_string()
+        },
+    );
+    let all_class = Resource::new(
+        move || only_local.get(),
+        |only_local| async move {
+            if !only_local {
+                "btn rounded-l-none btn-primary"
+            } else {
+                "btn rounded-l-none"
+            }
+            .to_string()
+        },
+    );
 
     view! {
         <h1 class="text-4xl font-bold font-serif my-4">Most recently edited Articles</h1>
@@ -29,8 +49,7 @@ pub fn ListArticles() -> impl IntoView {
                 <input
                     type="button"
                     value="Only Local"
-                    class="btn rounded-r-none"
-                    node_ref=button_only_local
+                    class=move || only_local_class.get()
                     on:click=move |_| {
                         set_only_local.set(true);
                     }
@@ -38,8 +57,7 @@ pub fn ListArticles() -> impl IntoView {
                 <input
                     type="button"
                     value="All"
-                    class="btn btn-primary rounded-l-none"
-                    node_ref=button_all
+                    class=move || all_class.get()
                     on:click=move |_| {
                         set_only_local.set(false);
                     }

From f022c56a6943e89bfd2360b09064e2ba866cdd7f Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Nov 2024 13:28:36 +0100
Subject: [PATCH 12/16] protected route

---
 .vscode/settings.json                      |  3 +++
 src/frontend/app.rs                        | 31 +++++++++++-----------
 src/frontend/components/mod.rs             |  1 +
 src/frontend/components/protected_route.rs | 28 +++++++++++++++++++
 4 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 src/frontend/components/protected_route.rs

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..2d695d6
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.rustfmt.overrideCommand": ["/home/felix/.cargo/bin/leptosfmt", "--stdin", "--rustfmt"]
+}
\ No newline at end of file
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index c39548a..429e537 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -1,3 +1,4 @@
+use crate::frontend::components::protected_route::IbisProtectedRoute;
 use crate::{
     common::SiteView,
     frontend::{
@@ -6,12 +7,8 @@ use crate::{
         dark_mode::DarkMode,
         pages::{
             article::{
-                actions::ArticleActions,
-                create::CreateArticle,
-                edit::EditArticle,
-                history::ArticleHistory,
-                list::ListArticles,
-                read::ReadArticle,
+                actions::ArticleActions, create::CreateArticle, edit::EditArticle,
+                history::ArticleHistory, list::ListArticles, read::ReadArticle,
             },
             diff::EditDiff,
             instance::{details::InstanceDetails, list::ListInstances},
@@ -35,7 +32,8 @@ pub fn site() -> Resource<SiteView> {
 }
 
 pub fn is_logged_in() -> bool {
-    site().with_default(|site| site.my_profile.is_some())
+    //site().with_default(|site| site.my_profile.is_some())
+    false
 }
 pub fn is_admin() -> bool {
     site().with_default(|site| {
@@ -61,7 +59,7 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
 }
 pub fn shell(options: LeptosOptions) -> impl IntoView {
     view! {
-        <!DOCTYPE html>
+        <!DOCTYPE html> 
         <html lang="en">
             <head>
                 <meta charset="utf-8" />
@@ -101,13 +99,16 @@ pub fn App() -> impl IntoView {
                         <Route path=path!("/") view=ReadArticle />
                         <Route path=path!("/article/:title") view=ReadArticle />
                         <Route path=path!("/article/:title/history") view=ArticleHistory />
-                        <Route path=path!("/article/:title/edit/:conflict_id?") view=EditArticle />
-                        <Route path=path!("/article/:title/actions") view=ArticleActions />
+                        <IbisProtectedRoute
+                            path=path!("/article/:title/edit/:conflict_id?")
+                            view=EditArticle
+                        />
+                        <IbisProtectedRoute
+                            path=path!("/article/:title/actions")
+                            view=ArticleActions
+                        />
                         <Route path=path!("/article/:title/diff/:hash") view=EditDiff />
-                        // TODO: use protected route, otherwise user can view
-                        // /article/create without login
-                        // https://github.com/leptos-rs/leptos/blob/leptos_0.7/examples/router/src/lib.rs#L51
-                        <Route path=path!("/create-article") view=CreateArticle />
+                        <IbisProtectedRoute path=path!("/create-article") view=CreateArticle />
                         <Route path=path!("/articles") view=ListArticles />
                         <Route path=path!("/instances") view=ListInstances />
                         <Route path=path!("/instance/:hostname") view=InstanceDetails />
@@ -115,7 +116,7 @@ pub fn App() -> impl IntoView {
                         <Route path=path!("/login") view=Login />
                         <Route path=path!("/register") view=Register />
                         <Route path=path!("/search") view=Search />
-                        <Route path=path!("/notifications") view=Notifications />
+                        <IbisProtectedRoute path=path!("/notifications") view=Notifications />
                     </Routes>
                 </main>
             </Router>
diff --git a/src/frontend/components/mod.rs b/src/frontend/components/mod.rs
index c8e65ae..6ee98a4 100644
--- a/src/frontend/components/mod.rs
+++ b/src/frontend/components/mod.rs
@@ -4,3 +4,4 @@ pub mod credentials;
 pub mod editor;
 pub mod instance_follow_button;
 pub mod nav;
+pub mod protected_route;
\ No newline at end of file
diff --git a/src/frontend/components/protected_route.rs b/src/frontend/components/protected_route.rs
new file mode 100644
index 0000000..1b4d591
--- /dev/null
+++ b/src/frontend/components/protected_route.rs
@@ -0,0 +1,28 @@
+use leptos::prelude::*;
+use leptos_router::{
+    components::{ProtectedRoute, ProtectedRouteProps},
+    NestedRoute, SsrMode,
+};
+use crate::frontend::app::is_logged_in;
+
+#[component(transparent)]
+pub fn IbisProtectedRoute<Segments, ViewFn, View>(
+    path: Segments,
+    view: ViewFn,
+    #[prop(optional)] ssr: SsrMode,
+) -> NestedRoute<Segments, (), (), impl Fn() -> AnyView + Send + Clone>
+where
+    ViewFn: Fn() -> View + Send + Clone + 'static,
+    View: IntoView + 'static,
+{
+    let condition = move || Some(is_logged_in());
+    let redirect_path = || "/";
+    let props = ProtectedRouteProps {
+        path,
+        view,
+        condition,
+        redirect_path,
+        ssr,
+    };
+    ProtectedRoute(props)
+}

From 7f1ecd3e5cf555f0e801277055a7c358e93ca2db Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Nov 2024 14:56:09 +0100
Subject: [PATCH 13/16] fix gloo post params

---
 src/frontend/api.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/frontend/api.rs b/src/frontend/api.rs
index dcf50c7..5687331 100644
--- a/src/frontend/api.rs
+++ b/src/frontend/api.rs
@@ -286,11 +286,11 @@ impl ApiClient {
             });
 
             let path_with_endpoint = self.request_endpoint(path);
+            let params_encoded = serde_urlencoded::to_string(&params).unwrap();
             let path = if method == Method::GET {
                 // Cannot pass the struct directly but need to convert it manually
                 // https://github.com/rustwasm/gloo/issues/378
-                let query = serde_urlencoded::to_string(&params).unwrap();
-                format!("{path_with_endpoint}?{query}")
+                format!("{path_with_endpoint}?{params_encoded}")
             } else {
                 path_with_endpoint
             };
@@ -299,7 +299,9 @@ impl ApiClient {
                 .abort_signal(abort_signal.as_ref())
                 .credentials(RequestCredentials::Include);
             let req = if method == Method::POST {
-                builder.json(&params)
+                builder
+                    .header("content-type", "application/x-www-form-urlencoded")
+                    .body(params_encoded)
             } else {
                 builder.build()
             }

From 59c0a3bf90733bbc40be2e996e9bc1a8cd18b317 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Nov 2024 14:56:32 +0100
Subject: [PATCH 14/16] add protected routes

---
 src/frontend/app.rs                        | 13 ++++++++-----
 src/frontend/components/mod.rs             |  2 +-
 src/frontend/components/protected_route.rs |  5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 429e537..1c4bca7 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -1,14 +1,17 @@
-use crate::frontend::components::protected_route::IbisProtectedRoute;
 use crate::{
     common::SiteView,
     frontend::{
         api::CLIENT,
-        components::nav::Nav,
+        components::{nav::Nav, protected_route::IbisProtectedRoute},
         dark_mode::DarkMode,
         pages::{
             article::{
-                actions::ArticleActions, create::CreateArticle, edit::EditArticle,
-                history::ArticleHistory, list::ListArticles, read::ReadArticle,
+                actions::ArticleActions,
+                create::CreateArticle,
+                edit::EditArticle,
+                history::ArticleHistory,
+                list::ListArticles,
+                read::ReadArticle,
             },
             diff::EditDiff,
             instance::{details::InstanceDetails, list::ListInstances},
@@ -59,7 +62,7 @@ impl<T: Default + Send + Sync> DefaultResource<T> for Resource<T> {
 }
 pub fn shell(options: LeptosOptions) -> impl IntoView {
     view! {
-        <!DOCTYPE html> 
+        <!DOCTYPE html>
         <html lang="en">
             <head>
                 <meta charset="utf-8" />
diff --git a/src/frontend/components/mod.rs b/src/frontend/components/mod.rs
index 6ee98a4..22ca03c 100644
--- a/src/frontend/components/mod.rs
+++ b/src/frontend/components/mod.rs
@@ -4,4 +4,4 @@ pub mod credentials;
 pub mod editor;
 pub mod instance_follow_button;
 pub mod nav;
-pub mod protected_route;
\ No newline at end of file
+pub mod protected_route;
diff --git a/src/frontend/components/protected_route.rs b/src/frontend/components/protected_route.rs
index 1b4d591..1135d44 100644
--- a/src/frontend/components/protected_route.rs
+++ b/src/frontend/components/protected_route.rs
@@ -1,9 +1,10 @@
+use crate::frontend::app::is_logged_in;
 use leptos::prelude::*;
 use leptos_router::{
     components::{ProtectedRoute, ProtectedRouteProps},
-    NestedRoute, SsrMode,
+    NestedRoute,
+    SsrMode,
 };
-use crate::frontend::app::is_logged_in;
 
 #[component(transparent)]
 pub fn IbisProtectedRoute<Segments, ViewFn, View>(

From 910c7b5d8f4080c62ecf9c1b2b29a83dc3acf325 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 25 Nov 2024 11:41:50 +0100
Subject: [PATCH 15/16] leptos 0.7.0-rc2

---
 Cargo.lock                                 | 191 +++++++++------------
 Cargo.toml                                 |   8 +-
 src/frontend/components/protected_route.rs |   1 +
 3 files changed, 86 insertions(+), 114 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00f6046..0b2ea81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -170,9 +170,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "attribute-derive"
-version = "0.9.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f1ee502851995027b06f99f5ffbeffa1406b38d0b318a1ebfa469332c6cbafd"
+checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
 dependencies = [
  "attribute-derive-macro",
  "derive-where",
@@ -184,14 +184,14 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive-macro"
-version = "0.9.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3601467f634cfe36c4780ca9c75dea9a5b34529c1f2810676a337e7e0997f954"
+checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
 dependencies = [
  "collection_literals",
  "interpolator",
  "manyhow",
- "proc-macro-utils 0.8.0",
+ "proc-macro-utils",
  "proc-macro2",
  "quote",
  "quote-use",
@@ -206,9 +206,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "axum"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -1352,6 +1352,7 @@ dependencies = [
  "futures-core",
  "futures-task",
  "futures-util",
+ "num_cpus",
 ]
 
 [[package]]
@@ -1643,9 +1644,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hydration_context"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571a2756b518de368146ba56d4feeba265b0b555d176d49b8debd9ce9b69a6fa"
+checksum = "8e578296c79066cdf7325259d8259b48adc311e324beecd801c43d953532c51b"
 dependencies = [
  "futures",
  "js-sys",
@@ -1810,7 +1811,7 @@ dependencies = [
  "time",
  "tokio",
  "tower 0.5.1",
- "tower-http 0.6.1",
+ "tower-http",
  "tower-layer",
  "tracing",
  "url",
@@ -2096,9 +2097,9 @@ dependencies = [
 
 [[package]]
 name = "leptos"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87a99b3ca2611376257a8b29466dc5ebf22c6bbed8715f86847808c269844785"
+checksum = "cc41e5764d7476efb929db94c1039752ccde5bea2ad40fddaaeeb9b94493fb0d"
 dependencies = [
  "any_spawner",
  "base64 0.22.1",
@@ -2123,7 +2124,7 @@ dependencies = [
  "server_fn",
  "slotmap",
  "tachys",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "throw_error",
  "typed-builder",
  "typed-builder-macro",
@@ -2159,9 +2160,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_axum"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f62374846ed04ab8b4e1ed27e0f276f692ef4f4955e0ba62509bc25fa392987"
+checksum = "15a7318603b14939a7332555ce8fd24a043047780dc6c9820359472ec4db6251"
 dependencies = [
  "any_spawner",
  "axum",
@@ -2177,28 +2178,28 @@ dependencies = [
  "parking_lot",
  "server_fn",
  "tokio",
- "tower 0.4.13",
- "tower-http 0.5.2",
+ "tower 0.5.1",
+ "tower-http",
 ]
 
 [[package]]
 name = "leptos_config"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c89503f59940cef245827075362107d4d53f9a710db31bfc361151866ba39e"
+checksum = "fe8f7f58ee40b2c0d7e1f0abdbf51ffd2343d281b3f16c1854c0218c152fbad8"
 dependencies = [
  "config",
  "regex",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "typed-builder",
 ]
 
 [[package]]
 name = "leptos_dom"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b108dc3960fac70b98d2302e568cd51c4d09255f1925bb797eba95575acc69b8"
+checksum = "3dccedefe9054b9ca09e027801557dc82cad64cb1f1a8061b114e7f6203bbe51"
 dependencies = [
  "js-sys",
  "or_poisoned",
@@ -2211,9 +2212,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10230c3b99bffd7490f192c54e02f0b35411d08089aba7f662d78be2adfbb736"
+checksum = "754d861dbdaf20b6da328112b68e1b2ea2da9a157aef748f53b15fd118972b85"
 dependencies = [
  "anyhow",
  "camino",
@@ -2229,9 +2230,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e66a88bbaf3f6689f7878c2a40bb80af84a9e23acfde483b34c811cdcc975a40"
+checksum = "30224324686ef508bc4a08fcfc16451410823b7d11b83325d2444221880bbbaa"
 dependencies = [
  "futures",
  "hydration_context",
@@ -2244,9 +2245,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e948a21600d13a6e91d9a0fb56de9c58692f79890caeaec7dabb1cd63e8ec92"
+checksum = "9c592d8e91148c73ee562f6d4b867d84d1995a5adb10d5a723f538b3dc173dfc"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -2266,9 +2267,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_meta"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15ad116cab8a1073bb6556d65c153d4c951ff06fa84387f723289ee16bb6a7b4"
+checksum = "7d95aec94d2c28120fe702182ec83e5402b9ad2c6fccaf3dbb98d0d94bf9f908"
 dependencies = [
  "futures",
  "indexmap",
@@ -2282,9 +2283,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9924f84cfc4dbe4440c2e58bf54694471e96b21557cb1e693e5bd73f3acae355"
+checksum = "123f2c0df5b3fd3025d1c26bc0dce1abd236409d9f031112ab5a0f871cfa6cbb"
 dependencies = [
  "any_spawner",
  "either_of",
@@ -2299,7 +2300,7 @@ dependencies = [
  "reactive_graph",
  "send_wrapper",
  "tachys",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "url",
  "wasm-bindgen",
  "web-sys",
@@ -2307,9 +2308,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf8fc6fbb1d1f8f3656b8e33265a2e92319fb877b38014407767d85362f528cb"
+checksum = "f84e0d92a7d6973682f02539b8de1f37651e72f557b1fd3f2d55460662669926"
 dependencies = [
  "proc-macro-error2",
  "proc-macro2",
@@ -2318,9 +2319,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd1abdb945660f19f7510bdf208069d3bc391aa9bb7183aa58e4af5429e6115"
+checksum = "a1387314dcb7f9547394a61b0cb41cdbd09e6c5dd5e154e304123f3d9b5b747b"
 dependencies = [
  "any_spawner",
  "base64 0.22.1",
@@ -2405,9 +2406,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "manyhow"
-version = "0.10.4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91ea592d76c0b6471965708ccff7e6a5d277f676b90ab31f4d3f3fc77fade64"
+checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587"
 dependencies = [
  "manyhow-macros",
  "proc-macro2",
@@ -2417,11 +2418,11 @@ dependencies = [
 
 [[package]]
 name = "manyhow-macros"
-version = "0.10.4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64621e2c08f2576e4194ea8be11daf24ac01249a4f53cd8befcbb7077120ead"
+checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495"
 dependencies = [
- "proc-macro-utils 0.8.0",
+ "proc-macro-utils",
  "proc-macro2",
  "quote",
 ]
@@ -2643,9 +2644,9 @@ dependencies = [
 
 [[package]]
 name = "next_tuple"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3615947b64839fe27e9ee557f282b04ad13ead564a543a6548b0cfd17457ff4"
+checksum = "cc6989c5af5a391cdc1c25aad10c6fb881b6e7ebd8df7c6fb29188acb5cba576"
 
 [[package]]
 name = "nom"
@@ -2729,6 +2730,16 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.36.5"
@@ -3086,17 +3097,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "proc-macro-utils"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f59e109e2f795a5070e69578c4dc101068139f74616778025ae1011d4cd41a8"
-dependencies = [
- "proc-macro2",
- "quote",
- "smallvec",
-]
-
 [[package]]
 name = "proc-macro-utils"
 version = "0.10.0"
@@ -3256,7 +3256,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35"
 dependencies = [
- "proc-macro-utils 0.10.0",
+ "proc-macro-utils",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -3314,9 +3314,9 @@ dependencies = [
 
 [[package]]
 name = "reactive_graph"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cdfe96bdf3d95c9bdd15af1cfc82252ef85c026ea960f83df53feca9fec61a"
+checksum = "49131fcf9733a991f3485f9a0d0c9b9f65f55df4bb9f9d37203d1f82efa9513c"
 dependencies = [
  "any_spawner",
  "async-lock",
@@ -3329,15 +3329,15 @@ dependencies = [
  "send_wrapper",
  "serde",
  "slotmap",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "web-sys",
 ]
 
 [[package]]
 name = "reactive_stores"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa994eaec6638c22faeedd4524cbd5a3653e7f32a67e130a60a0c8c9e1ee81"
+checksum = "2e722a72d10534f7613291bd2ef44cd2473ad70b2aa965d4bb7b940afb6f7257"
 dependencies = [
  "guardian",
  "itertools 0.13.0",
@@ -3350,9 +3350,9 @@ dependencies = [
 
 [[package]]
 name = "reactive_stores_macro"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d7cfe1c6d9f1005605ac7c928aef7e037d6808d6eda0429e73f0ca90cb9cb5"
+checksum = "b37fc52b98f16d437cdf5541cf60f661596b6e84a708e02b216a7bf864fe699b"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro-error2",
@@ -3798,9 +3798,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166689e862d227e838f359cce92681cf338e60a8cbcbd029bae03548d5a6d785"
+checksum = "bed94ec81d1b9ef2b28325bcf715461d861e90f41d249b70b561c6eefcb96afe"
 dependencies = [
  "axum",
  "bytes",
@@ -3820,9 +3820,9 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "throw_error",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tower-layer",
  "url",
  "wasm-bindgen",
@@ -3834,9 +3834,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4230cd52992681cc370885a613a5aad9fb56d61995b789de5c42dc55ff628e98"
+checksum = "4b7e77dd4f15d19a65019d24700963e40294b5a30c42c32bce2e532fbfe00b49"
 dependencies = [
  "const_format",
  "convert_case 0.6.0",
@@ -3848,9 +3848,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d4b8ee78096ff2b09c64afacb83f023f4edfdace60c00590b2aea215fea8a4"
+checksum = "295a3c3d01be1cf17d0c8b25a48b963a747f6ccdba0f62f657e8df37df4afaac"
 dependencies = [
  "server_fn_macro",
  "syn 2.0.87",
@@ -4107,9 +4107,9 @@ dependencies = [
 
 [[package]]
 name = "tachys"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b24784a27f391dedcc8160ea4b2ba7a6ad0f5484ca89ff88a10494f960aee270"
+checksum = "231b9e7ce516683c062dd2c8e4d30b81ae8d9a6d05f1e2a9c898e0b84ad728fe"
 dependencies = [
  "any_spawner",
  "const_str_slice_concat",
@@ -4198,9 +4198,9 @@ dependencies = [
 
 [[package]]
 name = "throw_error"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84bf87b0433891f1029e5868d4de3a11e794a206899082ebb4e82fca139b0d70"
+checksum = "0240909e3ad4ed2dab72b2861fc9a7930110c1d3a9a0a32c6dee0a747591d10a"
 dependencies = [
  "pin-project-lite",
 ]
@@ -4373,10 +4373,6 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -4400,34 +4396,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
-dependencies = [
- "bitflags 2.6.0",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "http-range-header",
- "httpdate",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
  "bitflags 2.6.0",
  "bytes",
@@ -4506,18 +4477,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typed-builder"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600"
+checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.19.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
+checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index e50ddf2..fa34605 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,9 +56,9 @@ unwrap_used = "deny"
 
 [dependencies]
 anyhow = "1.0.93"
-leptos = "0.7.0-rc1"
-leptos_meta = "0.7.0-rc1"
-leptos_router = "0.7.0-rc1"
+leptos = "0.7.0-rc2"
+leptos_meta = "0.7.0-rc2"
+leptos_router = "0.7.0-rc2"
 chrono = { version = "0.4.38", features = ["serde"] }
 env_logger = { version = "0.11.5", default-features = false }
 futures = "0.3.31"
@@ -111,7 +111,7 @@ diesel-derive-newtype = { version = "2.1.2", optional = true }
 diesel_migrations = { version = "2.2.0", optional = true }
 doku = { version = "0.21.1", optional = true }
 jsonwebtoken = { version = "9.3.0", optional = true }
-leptos_axum = { version = "0.7.0-rc1", optional = true }
+leptos_axum = { version = "0.7.0-rc2", optional = true }
 bcrypt = { version = "0.15.1", optional = true }
 diffy = { version = "0.4.0", optional = true }
 enum_delegate = { version = "0.2.0", optional = true }
diff --git a/src/frontend/components/protected_route.rs b/src/frontend/components/protected_route.rs
index 1135d44..d3182a7 100644
--- a/src/frontend/components/protected_route.rs
+++ b/src/frontend/components/protected_route.rs
@@ -24,6 +24,7 @@ where
         condition,
         redirect_path,
         ssr,
+        fallback: Default::default(),
     };
     ProtectedRoute(props)
 }

From 4e77e653624fcb12ccb52c56d8226e1359cd64f9 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 25 Nov 2024 12:00:36 +0100
Subject: [PATCH 16/16] replace <Transition> with <Suspense> to fix crash

---
 src/frontend/app.rs            |  3 +--
 src/frontend/components/nav.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 1c4bca7..807c804 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -35,8 +35,7 @@ pub fn site() -> Resource<SiteView> {
 }
 
 pub fn is_logged_in() -> bool {
-    //site().with_default(|site| site.my_profile.is_some())
-    false
+    site().with_default(|site| site.my_profile.is_some())
 }
 pub fn is_admin() -> bool {
     site().with_default(|site| {
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index 5fa91e5..6912ef4 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -50,7 +50,7 @@ pub fn Nav() -> impl IntoView {
                         <li>
                             <A href="/articles">"Articles"</A>
                         </li>
-                        <Transition>
+                        <Suspense>
                             <Show when=is_logged_in>
                                 <li>
                                     <A href="/create-article">"Create Article"</A>
@@ -59,12 +59,12 @@ pub fn Nav() -> impl IntoView {
                                     <A href="/notifications">
                                         "Notifications "
                                         <span class="indicator-item indicator-end badge badge-neutral">
-                                            {move || notification_count.get()}
+                                            <Suspense>{move || notification_count.get()}</Suspense>
                                         </span>
                                     </A>
                                 </li>
                             </Show>
-                        </Transition>
+                        </Suspense>
                         <li>
                             <form
                                 class="form-control m-0 p-1"
@@ -96,7 +96,7 @@ pub fn Nav() -> impl IntoView {
                         </li>
                     </ul>
                     <div class="divider"></div>
-                    <Transition>
+                    <Suspense>
                         <Show
                             when=is_logged_in
                             fallback=move || {
@@ -137,7 +137,7 @@ pub fn Nav() -> impl IntoView {
                             }
 
                         </Show>
-                    </Transition>
+                    </Suspense>
                     <div class="grow min-h-2"></div>
                     <div class="m-1 grid gap-2">
                         <label class="flex cursor-pointer gap-2">