From 83167153966f21eded6600b00ea74c70e41dba2e Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 26 Sep 2023 13:06:44 +0100
Subject: [PATCH 01/16] align api with 'voyager' test server and icon bug to
 get dev homepage working

---
 Cargo.lock                              | 310 ++++++++++++------------
 Cargo.toml                              |   4 +-
 src/ui/components/common/nav.rs         |  11 +-
 src/ui/components/home/home_activity.rs |   4 +-
 src/ui/components/post/post_activity.rs |   4 +-
 5 files changed, 174 insertions(+), 159 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c709508e..97a20032 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,7 +53,7 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "ahash 0.8.3",
- "base64 0.21.3",
+ "base64 0.21.4",
  "bitflags 2.4.0",
  "brotli",
  "bytes",
@@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -126,7 +126,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "mio",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "tokio",
  "tracing",
 ]
@@ -187,7 +187,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "time",
  "url",
 ]
@@ -201,7 +201,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -244,9 +244,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
 dependencies = [
  "memchr",
 ]
@@ -304,13 +304,13 @@ checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
 
 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -321,7 +321,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -333,7 +333,7 @@ dependencies = [
  "attribute-derive-macro",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -349,7 +349,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -381,9 +381,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bitflags"
@@ -441,9 +441,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytecheck"
@@ -470,9 +470,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "bytestring"
@@ -539,9 +539,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.28"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -774,7 +774,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -796,7 +796,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -810,13 +810,13 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.2.3"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875a0460143f2dbcc71fd8a63f34b7c83ac66f14bead94054e7cd619c57bbb27"
+checksum = "146398d62142a0f35248a608f17edf0dde57338354966d6e41d0eb2d16980ccb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -898,9 +898,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "flate2"
@@ -1004,7 +1004,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -1157,9 +1157,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -1304,9 +1304,9 @@ checksum = "1640a4c1d5ddd08ab1d9854ffa7a2fa3dc52339492676b6d3031e77ca579f434"
 
 [[package]]
 name = "icondata_macros"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "764e3608a0f21fa9f43f9d9237c524a9e10316d97d89b413a9c45e5dddb9b162"
+checksum = "ec327fa14753d8bb89a56159d617b2eee49a7d1df6575bf9e8ef524009298395"
 
 [[package]]
 name = "ident_case"
@@ -1472,8 +1472,8 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_common"
-version = "0.18.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#a57658d99c385522328ba8ae5ddaf5d85ffa1475"
+version = "0.18.4"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.18.4#3dd4f74cb6b9e790f1756dba9c0bf72b2911e55b"
 dependencies = [
  "anyhow",
  "getrandom",
@@ -1489,8 +1489,8 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_schema"
-version = "0.18.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#a57658d99c385522328ba8ae5ddaf5d85ffa1475"
+version = "0.18.4"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.18.4#3dd4f74cb6b9e790f1756dba9c0bf72b2911e55b"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1507,28 +1507,30 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views"
-version = "0.18.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#a57658d99c385522328ba8ae5ddaf5d85ffa1475"
+version = "0.18.4"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.18.4#3dd4f74cb6b9e790f1756dba9c0bf72b2911e55b"
 dependencies = [
  "lemmy_db_schema",
  "serde",
  "serde_with",
+ "typed-builder 0.15.2",
 ]
 
 [[package]]
 name = "lemmy_db_views_actor"
-version = "0.18.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#a57658d99c385522328ba8ae5ddaf5d85ffa1475"
+version = "0.18.4"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.18.4#3dd4f74cb6b9e790f1756dba9c0bf72b2911e55b"
 dependencies = [
  "lemmy_db_schema",
  "serde",
  "serde_with",
+ "typed-builder 0.15.2",
 ]
 
 [[package]]
 name = "lemmy_db_views_moderator"
-version = "0.18.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#a57658d99c385522328ba8ae5ddaf5d85ffa1475"
+version = "0.18.4"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.18.4#3dd4f74cb6b9e790f1756dba9c0bf72b2911e55b"
 dependencies = [
  "lemmy_db_schema",
  "serde",
@@ -1549,8 +1551,8 @@ dependencies = [
  "leptos_server",
  "server_fn",
  "tracing",
- "typed-builder 0.16.0",
- "typed-builder-macro 0.16.0",
+ "typed-builder 0.16.2",
+ "typed-builder-macro 0.16.2",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -1585,7 +1587,7 @@ dependencies = [
  "regex",
  "serde",
  "thiserror",
- "typed-builder 0.16.0",
+ "typed-builder 0.16.2",
 ]
 
 [[package]]
@@ -1632,14 +1634,14 @@ dependencies = [
  "quote",
  "rstml",
  "serde",
- "syn 2.0.29",
+ "syn 2.0.37",
  "walkdir",
 ]
 
 [[package]]
 name = "leptos_icons"
 version = "0.0.16-rc3"
-source = "git+https://github.com/Carlosted/leptos-icons.git#84a3a2b799c4e891499c42e50e2a90ee2e87b6da"
+source = "git+https://github.com/Carlosted/leptos-icons.git#120961e8863dbc4e4faaa3e9697f6bb8274c1528"
 dependencies = [
  "icondata",
  "leptos",
@@ -1678,7 +1680,7 @@ dependencies = [
  "quote",
  "rstml",
  "server_fn_macro",
- "syn 2.0.29",
+ "syn 2.0.37",
  "tracing",
  "uuid",
 ]
@@ -1703,7 +1705,7 @@ version = "0.5.0-rc3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8c17b7b5bec80d72430acdbf37e736230ec199c520dfd023e53264e62734e7"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
  "cfg-if",
  "futures",
  "indexmap 2.0.0",
@@ -1772,9 +1774,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "linear-map"
@@ -1794,19 +1796,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
 
 [[package]]
 name = "local-channel"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c"
+checksum = "e0a493488de5f18c8ffcba89eebb8532ffc562dc400490eb65b84893fae0b178"
 dependencies = [
  "futures-core",
  "futures-sink",
- "futures-util",
  "local-waker",
 ]
 
@@ -1843,9 +1844,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.2"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "mime"
@@ -1938,9 +1939,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -1974,7 +1975,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -1985,9 +1986,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
 dependencies = [
  "cc",
  "libc",
@@ -2054,9 +2055,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.7.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33"
+checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4"
 dependencies = [
  "memchr",
  "thiserror",
@@ -2065,9 +2066,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a"
+checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2075,22 +2076,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141"
+checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f"
+checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d"
 dependencies = [
  "once_cell",
  "pest",
@@ -2114,7 +2115,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2143,12 +2144,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2188,9 +2189,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
@@ -2203,7 +2204,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "version_check",
  "yansi",
 ]
@@ -2239,14 +2240,25 @@ dependencies = [
 
 [[package]]
 name = "quote-use"
-version = "0.7.1"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7b5abe3fe82fdeeb93f44d66a7b444dedf2e4827defb0a8e69c437b2de2ef94"
+dependencies = [
+ "quote",
+ "quote-use-macros",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "quote-use-macros"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e9a38ef862d7fec635661503289062bc5b3035e61859a8de3d3f81823accd2"
+checksum = "97ea44c7e20f16017a76a245bb42188517e13d16dcb1aa18044bc406cdc3f4af"
 dependencies = [
  "derive-where",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2296,9 +2308,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2308,9 +2320,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2325,9 +2337,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "rend"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
 dependencies = [
  "bytecheck",
 ]
@@ -2338,7 +2350,7 @@ version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2417,7 +2429,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "syn_derive",
  "thiserror",
 ]
@@ -2455,9 +2467,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.11"
+version = "0.38.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
+checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2539,9 +2551,9 @@ checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6"
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
 
 [[package]]
 name = "serde"
@@ -2571,14 +2583,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -2623,7 +2635,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -2643,7 +2655,7 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2666,7 +2678,7 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "syn 2.0.29",
+ "syn 2.0.37",
  "thiserror",
  "xxhash-rust",
 ]
@@ -2682,7 +2694,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.29",
+ "syn 2.0.37",
  "xxhash-rust",
 ]
 
@@ -2693,14 +2705,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d4c3cc8868c30df0ce938f1a31c49125869cd553d89ed95334839aab3280a0c"
 dependencies = [
  "server_fn_macro",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2766,9 +2778,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "socket2"
@@ -2782,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -2812,7 +2824,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2828,9 +2840,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2839,14 +2851,14 @@ dependencies = [
 
 [[package]]
 name = "syn_derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8128874d02f9a114ade6d9ad252078cb32d3cb240e26477ac73d7e9c495c605e"
+checksum = "ae6eef0000c4a12ecdfd7873ea84a8b5aab5e44db72e38e07b028a25386f29a5"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -2870,29 +2882,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
 dependencies = [
  "deranged",
  "itoa",
@@ -2905,15 +2917,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -2946,7 +2958,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "windows-sys 0.48.0",
 ]
 
@@ -2962,9 +2974,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3010,7 +3022,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -3039,11 +3051,11 @@ dependencies = [
 
 [[package]]
 name = "typed-builder"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6605aaa56cce0947127ffa0675a8a1b181f87773364390174de60a86ab9085f1"
+checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16"
 dependencies = [
- "typed-builder-macro 0.16.0",
+ "typed-builder-macro 0.16.2",
 ]
 
 [[package]]
@@ -3054,25 +3066,25 @@ checksum = "29a3151c41d0b13e3d011f98adc24434560ef06673a155a6c7f66b9879eecce2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a6a6884f6a890a012adcc20ce498f30ebdc70fb1ea242c333cc5f435b0b3871"
+checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
@@ -3097,9 +3109,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -3164,9 +3176,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -3208,7 +3220,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "wasm-bindgen-shared",
 ]
 
@@ -3242,7 +3254,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.37",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3281,9 +3293,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -3447,9 +3459,9 @@ dependencies = [
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70"
+checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
 
 [[package]]
 name = "yaml-rust"
diff --git a/Cargo.toml b/Cargo.toml
index e718c09d..766eb9e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,8 +27,8 @@ log = "0.4"
 cfg-if = "1.0"
 tracing = "0.1"
 reqwest = { version = "0.11", features = ["json"] }
-getrandom = { version = "0.2.10", features = ["js"] }
-lemmy_api_common = { git = "https://github.com/LemmyNet/lemmy.git", default-features = false }
+getrandom = { version = "0.2", features = ["js"] }
+lemmy_api_common = { tag = "0.18.4", git = "https://github.com/LemmyNet/lemmy.git", default-features = false }
 
 serde_urlencoded = "0.7"
 thiserror = "1.0"
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 27f39072..6c4f08bc 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,5 +1,5 @@
 use leptos::{component, view, IntoView};
-use leptos_icons::*;
+use leptos_icons::{Icon,ChIcon::*};
 use leptos_router::*;
 
 #[component]
@@ -9,7 +9,8 @@ pub fn TopNav() -> impl IntoView {
       <div class="navbar-start">
         <div class="dropdown">
           <label tabindex="0" class="btn btn-ghost btn-circle">
-            <Icon icon=icon!(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
+            <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
+            // <Icon icon=icon!(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
           </label>
           <ul
             tabindex="0"
@@ -26,11 +27,13 @@ pub fn TopNav() -> impl IntoView {
       </div>
       <div class="navbar-end gap-3">
         <button class="btn btn-ghost btn-circle">
-          <Icon icon=icon!(ChSearch) width="1.25rem" height="1.25rem"/>
+          <Icon icon=Icon::from(ChSearch) width="1.25rem" height="1.25rem"/>
+          // <Icon icon=icon!(ChSearch) width="1.25rem" height="1.25rem"/>
         </button>
         <button class="btn btn-ghost btn-circle">
           <div class="indicator">
-            <Icon icon=icon!(ChBell) width="1.25rem" height="1.25rem"/>
+            <Icon icon=Icon::from(ChBell) width="1.25rem" height="1.25rem"/>
+            // <Icon icon=icon!(ChBell) width="1.25rem" height="1.25rem"/>
             <span class="badge badge-xs badge-primary indicator-item"></span>
           </div>
         </button>
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index f281f5b1..ab8158da 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -24,8 +24,8 @@ pub fn HomeActivity() -> impl IntoView {
       page: Some(page),
       limit: None,
       saved_only: None,
-      disliked_only: None,
-      liked_only: None,
+      // disliked_only: None,
+      // liked_only: None,
       // moderator_view: None,
       auth: None,
     };
diff --git a/src/ui/components/post/post_activity.rs b/src/ui/components/post/post_activity.rs
index e81092d8..cb19f785 100644
--- a/src/ui/components/post/post_activity.rs
+++ b/src/ui/components/post/post_activity.rs
@@ -45,8 +45,8 @@ pub fn PostActivity() -> impl IntoView {
             community_name: None,
             parent_id: None,
             saved_only: None,
-            disliked_only: None,
-            liked_only: None,
+            // disliked_only: None,
+            // liked_only: None,
             auth: None,
           };
           get_comments(&form).await

From ee85c2a3b0dde21d0acfaa4b1d6354199c0246e4 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 26 Sep 2023 13:23:18 +0100
Subject: [PATCH 02/16] fmt fix

---
 src/ui/components/common/nav.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 6c4f08bc..32e3d8bd 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,5 +1,5 @@
 use leptos::{component, view, IntoView};
-use leptos_icons::{Icon,ChIcon::*};
+use leptos_icons::{ChIcon::*, Icon};
 use leptos_router::*;
 
 #[component]

From a982d7ad349035cf3c858717a77e67066d5bf193 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 26 Sep 2023 13:26:46 +0100
Subject: [PATCH 03/16] lep fmt fix

---
 src/ui/components/common/nav.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 32e3d8bd..a09a8467 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -10,12 +10,8 @@ pub fn TopNav() -> impl IntoView {
         <div class="dropdown">
           <label tabindex="0" class="btn btn-ghost btn-circle">
             <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
-            // <Icon icon=icon!(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
           </label>
-          <ul
-            tabindex="0"
-            class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52"
-          >
+          <ul tabindex="0" class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52" >
             <li>
               <a>"Homepage"</a>
             </li>
@@ -28,12 +24,10 @@ pub fn TopNav() -> impl IntoView {
       <div class="navbar-end gap-3">
         <button class="btn btn-ghost btn-circle">
           <Icon icon=Icon::from(ChSearch) width="1.25rem" height="1.25rem"/>
-          // <Icon icon=icon!(ChSearch) width="1.25rem" height="1.25rem"/>
         </button>
         <button class="btn btn-ghost btn-circle">
           <div class="indicator">
             <Icon icon=Icon::from(ChBell) width="1.25rem" height="1.25rem"/>
-            // <Icon icon=icon!(ChBell) width="1.25rem" height="1.25rem"/>
             <span class="badge badge-xs badge-primary indicator-item"></span>
           </div>
         </button>

From bd5cac0d96e1d664bea89a455ae84911dea9c516 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 26 Sep 2023 13:29:17 +0100
Subject: [PATCH 04/16] line length

---
 src/ui/components/common/nav.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index a09a8467..23598a18 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -11,7 +11,10 @@ pub fn TopNav() -> impl IntoView {
           <label tabindex="0" class="btn btn-ghost btn-circle">
             <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
           </label>
-          <ul tabindex="0" class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52" >
+          <ul 
+            tabindex="0" 
+            class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52" 
+          >
             <li>
               <a>"Homepage"</a>
             </li>

From a5be1875f1542132e748282b8b122fc7f05e04e9 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 26 Sep 2023 13:34:00 +0100
Subject: [PATCH 05/16] whitespace

---
 src/ui/components/common/nav.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 23598a18..009054e4 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -11,9 +11,9 @@ pub fn TopNav() -> impl IntoView {
           <label tabindex="0" class="btn btn-ghost btn-circle">
             <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
           </label>
-          <ul 
-            tabindex="0" 
-            class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52" 
+          <ul
+            tabindex="0"
+            class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52"
           >
             <li>
               <a>"Homepage"</a>

From cb2725d8becc1a70cfddc5c54a4ea5a2306f83aa Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Thu, 28 Sep 2023 10:55:41 +0100
Subject: [PATCH 06/16] debug icondata

---
 Cargo.lock                      | 24 +++++++++++++++++-------
 Cargo.toml                      |  2 ++
 src/ui/components/common/nav.rs |  7 +++++--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97a20032..648c1a06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1287,6 +1287,15 @@ dependencies = [
  "icondata_macros",
 ]
 
+[[package]]
+name = "icondata"
+version = "0.0.8"
+source = "git+https://github.com/Carlosted/icondata#0e4df418543494acbd054a16996bafdb14525952"
+dependencies = [
+ "icondata_core",
+ "icondata_macros",
+]
+
 [[package]]
 name = "icondata_ch"
 version = "0.0.7"
@@ -1452,6 +1461,7 @@ dependencies = [
  "futures",
  "getrandom",
  "gloo-net",
+ "icondata 0.0.8",
  "lemmy_api_common",
  "leptos",
  "leptos_actix",
@@ -1643,7 +1653,7 @@ name = "leptos_icons"
 version = "0.0.16-rc3"
 source = "git+https://github.com/Carlosted/leptos-icons.git#120961e8863dbc4e4faaa3e9697f6bb8274c1528"
 dependencies = [
- "icondata",
+ "icondata 0.0.7",
  "leptos",
  "tracing",
 ]
@@ -2721,9 +2731,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2882,18 +2892,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 766eb9e2..eca23db7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,8 @@ leptos_icons = { git = "https://github.com/Carlosted/leptos-icons.git", features
   "ChSearch",
   "ChMenuHamburger",
 ] }
+# icondata = { version = "0.0.8", features = ["macros"] }
+icondata = { git = "https://github.com/Carlosted/icondata", features = ["macros"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 009054e4..fd1ec9ff 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,6 +1,8 @@
 use leptos::{component, view, IntoView};
 use leptos_icons::{ChIcon::*, Icon};
 use leptos_router::*;
+// use leptos_icons::*;
+use icondata::*;
 
 #[component]
 pub fn TopNav() -> impl IntoView {
@@ -9,8 +11,9 @@ pub fn TopNav() -> impl IntoView {
       <div class="navbar-start">
         <div class="dropdown">
           <label tabindex="0" class="btn btn-ghost btn-circle">
-            <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
-          </label>
+            // <Icon icon=Icon::from(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
+            <Icon icon=icon!(ChMenuHamburger) width="1.25rem" height="1.25rem"/>
+            </label>
           <ul
             tabindex="0"
             class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52"

From 0993ed53ae05623910262fb26b9531bed92c34af Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Thu, 28 Sep 2023 11:22:30 +0100
Subject: [PATCH 07/16] changes for 19 RC

---
 Cargo.lock                              | 24 ++++++------------------
 Cargo.toml                              |  6 +-----
 src/ui/components/common/nav.rs         |  4 +---
 src/ui/components/home/home_activity.rs |  5 ++---
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 49957365..1c8b46fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1287,15 +1287,6 @@ dependencies = [
  "icondata_macros",
 ]
 
-[[package]]
-name = "icondata"
-version = "0.0.8"
-source = "git+https://github.com/Carlosted/icondata#0e4df418543494acbd054a16996bafdb14525952"
-dependencies = [
- "icondata_core",
- "icondata_macros",
-]
-
 [[package]]
 name = "icondata_ch"
 version = "0.0.7"
@@ -1461,7 +1452,6 @@ dependencies = [
  "futures",
  "getrandom",
  "gloo-net",
- "icondata 0.0.8",
  "lemmy_api_common",
  "leptos",
  "leptos_actix",
@@ -1483,7 +1473,7 @@ dependencies = [
 [[package]]
 name = "lemmy_api_common"
 version = "0.19.0-rc.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#9275041f4251c72e8387a6a180256252df001b89"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.19.0-rc.1#9275041f4251c72e8387a6a180256252df001b89"
 dependencies = [
  "anyhow",
  "getrandom",
@@ -1500,7 +1490,7 @@ dependencies = [
 [[package]]
 name = "lemmy_db_schema"
 version = "0.19.0-rc.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#9275041f4251c72e8387a6a180256252df001b89"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.19.0-rc.1#9275041f4251c72e8387a6a180256252df001b89"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1518,30 +1508,28 @@ dependencies = [
 [[package]]
 name = "lemmy_db_views"
 version = "0.19.0-rc.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#9275041f4251c72e8387a6a180256252df001b89"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.19.0-rc.1#9275041f4251c72e8387a6a180256252df001b89"
 dependencies = [
  "lemmy_db_schema",
  "serde",
  "serde_with",
- "typed-builder 0.15.2",
 ]
 
 [[package]]
 name = "lemmy_db_views_actor"
 version = "0.19.0-rc.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#9275041f4251c72e8387a6a180256252df001b89"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.19.0-rc.1#9275041f4251c72e8387a6a180256252df001b89"
 dependencies = [
  "chrono",
  "lemmy_db_schema",
  "serde",
  "serde_with",
- "typed-builder 0.15.2",
 ]
 
 [[package]]
 name = "lemmy_db_views_moderator"
 version = "0.19.0-rc.1"
-source = "git+https://github.com/LemmyNet/lemmy.git#9275041f4251c72e8387a6a180256252df001b89"
+source = "git+https://github.com/LemmyNet/lemmy.git?tag=0.19.0-rc.1#9275041f4251c72e8387a6a180256252df001b89"
 dependencies = [
  "lemmy_db_schema",
  "serde",
@@ -1654,7 +1642,7 @@ name = "leptos_icons"
 version = "0.0.16-rc3"
 source = "git+https://github.com/Carlosted/leptos-icons.git#120961e8863dbc4e4faaa3e9697f6bb8274c1528"
 dependencies = [
- "icondata 0.0.7",
+ "icondata",
  "leptos",
  "tracing",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index eca23db7..85f2cd48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,8 +6,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 leptos = { version = "0.5.0-rc3", features = ["nightly"] }
 leptos_actix = { version = "0.5.0-rc3", optional = true }
@@ -19,8 +17,6 @@ leptos_icons = { git = "https://github.com/Carlosted/leptos-icons.git", features
   "ChSearch",
   "ChMenuHamburger",
 ] }
-# icondata = { version = "0.0.8", features = ["macros"] }
-icondata = { git = "https://github.com/Carlosted/icondata", features = ["macros"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
@@ -30,7 +26,7 @@ cfg-if = "1.0"
 tracing = "0.1"
 reqwest = { version = "0.11", features = ["json"] }
 getrandom = { version = "0.2", features = ["js"] }
-lemmy_api_common = { tag = "0.18.4", git = "https://github.com/LemmyNet/lemmy.git", default-features = false }
+lemmy_api_common = { tag = "0.19.0-rc.1", git = "https://github.com/LemmyNet/lemmy.git", default-features = false }
 
 serde_urlencoded = "0.7"
 thiserror = "1.0"
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index d963605f..45cde413 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,8 +1,6 @@
 use leptos::{component, view, IntoView};
-use leptos_icons::{ChIcon::*, Icon};
+use leptos_icons::*;
 use leptos_router::*;
-// use leptos_icons::*;
-use icondata::*;
 
 #[component]
 pub fn TopNav() -> impl IntoView {
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index bf0f9669..263cef61 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -24,9 +24,8 @@ pub fn HomeActivity() -> impl IntoView {
       page: Some(page),
       limit: None,
       saved_only: None,
-      // disliked_only: None,
-      // liked_only: None,
-      // moderator_view: None,
+      disliked_only: None,
+      liked_only: None,
       page_cursor: None,
     };
     list_posts(&form).await.ok()

From 7816dd0dad2e81018338a8f92f70ea0948c8cd36 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Sun, 1 Oct 2023 19:10:30 +0100
Subject: [PATCH 08/16] update navigation and crate versions

---
 Cargo.lock                                 | 377 ++++++++++-----------
 Cargo.toml                                 |  20 +-
 locales/en.json                            |  22 ++
 locales/fr.json                            |  22 ++
 src/lib.rs                                 |  69 ++--
 src/ui/components/comment/comment_nodes.rs |   2 +-
 src/ui/components/common/nav.rs            | 161 ++++++---
 src/ui/components/home/home_activity.rs    |  41 ++-
 src/ui/components/post/post_listings.rs    |   2 +-
 9 files changed, 426 insertions(+), 290 deletions(-)
 create mode 100644 locales/en.json
 create mode 100644 locales/fr.json

diff --git a/Cargo.lock b/Cargo.lock
index 1c8b46fb..9d12b1de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,7 +53,7 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "ahash 0.8.3",
- "base64 0.21.4",
+ "base64",
  "bitflags 2.4.0",
  "brotli",
  "bytes",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive"
-version = "0.6.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c124f12ade4e670107b132722d0ad1a5c9790bcbc1b265336369ea05626b4498"
+checksum = "0c94f43ede6f25dab1dea046bff84d85dea61bd49aba7a9011ad66c0d449077b"
 dependencies = [
  "attribute-derive-macro",
  "proc-macro2",
@@ -338,13 +338,13 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive-macro"
-version = "0.6.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b217a07446e0fb086f83401a98297e2d81492122f5874db5391bd270a185f88"
+checksum = "b409e2b2d2dc206d2c0ad3575a93f001ae21a1593e2d0c69b69c308e63f3b422"
 dependencies = [
  "collection_literals",
  "interpolator",
- "proc-macro-error",
+ "manyhow",
  "proc-macro-utils",
  "proc-macro2",
  "quote",
@@ -373,12 +373,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.4"
@@ -420,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -431,9 +425,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -607,16 +601,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
 dependencies = [
  "async-trait",
- "json5",
  "lazy_static",
  "nom",
  "pathdiff",
- "ron",
- "rust-ini",
  "serde",
- "serde_json",
- "toml",
- "yaml-rust",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -842,12 +831,6 @@ dependencies = [
  "crypto-common",
 ]
 
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
 [[package]]
 name = "drain_filter_polyfill"
 version = "0.1.3"
@@ -1141,9 +1124,9 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
  "ahash 0.8.3",
  "allocator-api2",
@@ -1337,12 +1320,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "serde",
 ]
 
@@ -1393,6 +1376,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -1417,17 +1409,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
 [[package]]
 name = "language-tags"
 version = "0.3.2"
@@ -1455,6 +1436,7 @@ dependencies = [
  "lemmy_api_common",
  "leptos",
  "leptos_actix",
+ "leptos_i18n",
  "leptos_icons",
  "leptos_meta",
  "leptos_router",
@@ -1538,9 +1520,9 @@ dependencies = [
 
 [[package]]
 name = "leptos"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51449460b7a8bf5c54a2a8ec36b124e1881223a6ffcb888aca53f1864164ad8e"
+checksum = "4d3885e75a25bbf43c95350cf2f6b9f5228a3d911e28512c44c2a6c8aa49e9c9"
 dependencies = [
  "cfg-if",
  "leptos_config",
@@ -1558,9 +1540,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_actix"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542555df2e5ca7777d859596be52723bf9c10c471babacdcdd8c67b96e6f0ef5"
+checksum = "bd04ab9afac818fe45695b8e1f103714e612135b42519a21761c730fc9223c14"
 dependencies = [
  "actix-http",
  "actix-web",
@@ -1578,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0db44fff2a9c640aa0f449e42f8c951caf89e8ca2d73611766dce421705f91"
+checksum = "d3936a83035a4ec03487792d8c9c2c5ad00c269d09701d102630ac5c31caa463"
 dependencies = [
  "config",
  "regex",
@@ -1591,9 +1573,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9f22463829f0120654270f054c4657b46040aee4a4fdb963949b5909b6ee1d"
+checksum = "6cbea8aeea07633b3559818fa963c03857751fbafc6bb4a73c995662836070e1"
 dependencies = [
  "async-recursion",
  "cfg-if",
@@ -1601,8 +1583,8 @@ dependencies = [
  "futures",
  "getrandom",
  "html-escape",
- "indexmap 2.0.1",
- "itertools",
+ "indexmap 2.0.2",
+ "itertools 0.10.5",
  "js-sys",
  "leptos_reactive",
  "once_cell",
@@ -1621,13 +1603,13 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5150fc7672c39169cf66db7de9badc07a7a878ea8952e5dd4ad67260d74d9f26"
+checksum = "b56ec18e255737108b4f4d570c1c4f036f54a9989befe2658758500b636ebda4"
 dependencies = [
  "anyhow",
  "camino",
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
  "parking_lot",
  "proc-macro2",
  "quote",
@@ -1637,6 +1619,34 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "leptos_i18n"
+version = "0.2.0-rc"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed3b5f74d0c85543505efaf8c7cae3df01c98bfc3b469f5f0cd0741b68b713f"
+dependencies = [
+ "actix-web",
+ "leptos",
+ "leptos_i18n_macro",
+ "leptos_meta",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "leptos_i18n_macro"
+version = "0.2.0-rc"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2054c839e6c553e808524a047095e360cd4a68a573bfa15727531621831deae7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 2.0.37",
+ "toml 0.7.8",
+]
+
 [[package]]
 name = "leptos_icons"
 version = "0.0.16-rc3"
@@ -1649,9 +1659,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9093c0cf5db07ebcd4e175a4a03d485165d3af2ffbbae747b4df50e3b16acb"
+checksum = "77e1faf41644272929c47993af12928a51c0a03a1ed7ee55afcacf4a3a02073c"
 dependencies = [
  "futures",
  "leptos",
@@ -1663,15 +1673,15 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10fc6a3eafa38ad56e43ba328723a153f700978cdbfecfc3be705ace0a283212"
+checksum = "dae8be584ba63e002cec113e0a831f2ba17ad452104781a2b1b65555db049779"
 dependencies = [
  "attribute-derive",
  "cfg-if",
  "convert_case 0.6.0",
  "html-escape",
- "itertools",
+ "itertools 0.11.0",
  "leptos_hot_reload",
  "prettyplease",
  "proc-macro-error",
@@ -1686,12 +1696,12 @@ dependencies = [
 
 [[package]]
 name = "leptos_meta"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c723352b5beed21eee9442e5b01fe177fecd195baa7beed2a4d619d6e4368f"
+checksum = "013e23a79d48c6eee6063b162e5ba0beb7d1a42c07361e4c16effb916160a5f0"
 dependencies = [
  "cfg-if",
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
  "leptos",
  "tracing",
  "wasm-bindgen",
@@ -1700,15 +1710,16 @@ dependencies = [
 
 [[package]]
 name = "leptos_reactive"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8c17b7b5bec80d72430acdbf37e736230ec199c520dfd023e53264e62734e7"
+checksum = "90ec5366c79892fa8232dcfa6f05d610d0fd780af155fea8c466e77da18e744f"
 dependencies = [
- "base64 0.21.4",
+ "base64",
  "cfg-if",
  "futures",
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
  "js-sys",
+ "pin-project",
  "rkyv",
  "rustc-hash",
  "self_cell",
@@ -1726,9 +1737,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139e1b32813fbac87e4f9e4f4cd06ba86b3776ccad8f5315704e1b7f7e7d40e"
+checksum = "f55951a1e4ee0b9c26e4ebc0c09ecc4b7fffbefecb912c72db0c5dfa33b1584c"
 dependencies = [
  "cached",
  "cfg-if",
@@ -1757,9 +1768,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f39ef644407f5631ee52904c3ca5e402cf556eefe8899e4ef7c5cf4678db51a"
+checksum = "520f4f7221a323c029877ffb09e97d38cc805f1a5821f9554ecf0e7f6852100c"
 dependencies = [
  "inventory",
  "lazy_static",
@@ -1787,17 +1798,11 @@ dependencies = [
  "serde_test",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
 
 [[package]]
 name = "local-channel"
@@ -1838,7 +1843,30 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
+]
+
+[[package]]
+name = "manyhow"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "516b76546495d933baa165075b95c0a15e8f7ef75e53f56b19b7144d80fd52bd"
+dependencies = [
+ "manyhow-macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "manyhow-macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba072c0eadade3160232e70893311f1f8903974488096e2eb8e48caba2f0cf1"
+dependencies = [
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -1995,16 +2023,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "pad-adapter"
 version = "0.1.1"
@@ -2052,51 +2070,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
-[[package]]
-name = "pest"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.3"
@@ -2160,7 +2133,6 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
  "version_check",
 ]
 
@@ -2307,9 +2279,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2319,9 +2291,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2349,7 +2321,7 @@ version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
- "base64 0.21.4",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2408,17 +2380,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "ron"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
-dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
- "serde",
-]
-
 [[package]]
 name = "rstml"
 version = "0.11.2"
@@ -2433,16 +2394,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -2466,9 +2417,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.14"
+version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2607,6 +2558,15 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_test"
 version = "1.0.176"
@@ -2634,11 +2594,11 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
- "base64 0.21.4",
+ "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
  "serde",
  "serde_json",
  "serde_with_macros",
@@ -2659,9 +2619,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf19764597bac09847308983d33db643036ee1056127a8d6caf976b23cce1fb6"
+checksum = "29eefae61211e81059a092a3428612c475a3a28e0ea4fb3fd49b0a940d837f84"
 dependencies = [
  "ciborium",
  "const_format",
@@ -2684,9 +2644,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b1883aa18ec727f93ea5b8280c756cff5bbb8e128cc966b6505c3059ba4af5"
+checksum = "f68140099f8e55bd526dc176d17d341189bf669d45216c4797ddc344610a84a4"
 dependencies = [
  "const_format",
  "proc-macro-error",
@@ -2699,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.5.0-rc3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d4c3cc8868c30df0ce938f1a31c49125869cd553d89ed95334839aab3280a0c"
+checksum = "eee874f357d640ad221ba0c27c2559fa3d1434f7f7bbf688a34118518c5924b7"
 dependencies = [
  "server_fn_macro",
  "syn 2.0.37",
@@ -2718,17 +2678,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -2994,6 +2943,40 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.0.2",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -3085,12 +3068,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
 [[package]]
 name = "unicase"
 version = "2.7.0"
@@ -3437,6 +3414,15 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "winnow"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -3462,15 +3448,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
 
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "yansi"
 version = "1.0.0-rc.1"
diff --git a/Cargo.toml b/Cargo.toml
index 85f2cd48..b4e514e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,16 +7,20 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-leptos = { version = "0.5.0-rc3", features = ["nightly"] }
-leptos_actix = { version = "0.5.0-rc3", optional = true }
-leptos_meta = { version = "0.5.0-rc3", features = ["nightly"] }
-leptos_router = { version = "0.5.0-rc3", features = ["nightly"] }
+leptos = { version = "0.5", features = ["nightly"] }
+leptos_actix = { version = "0.5", optional = true }
+leptos_meta = { version = "0.5", features = ["nightly"] }
+leptos_router = { version = "0.5", features = ["nightly"] }
 leptos_icons = { git = "https://github.com/Carlosted/leptos-icons.git", features = [
   "macros",
   "ChBell",
   "ChSearch",
   "ChMenuHamburger",
+  "ChHeart",
 ] }
+# leptos_i18n = { version = "0.2.0-rc"/*, features = ["debug_interpolations", "csr", "hydrate"] */}
+leptos_i18n = { version = "0.2.0-rc" }
+
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
@@ -42,10 +46,16 @@ actix-web = { version = "4", features = ["macros"], optional = true }
 futures = { version = "0.3", optional = true }
 simple_logger = { version = "4.2", optional = true }
 
+
+[package.metadata.leptos-i18n]
+default = "en"
+locales = ["en", "fr"]
+
 [features]
 default = ["csr"]
 hydrate = [
   "leptos/hydrate",
+  "leptos_i18n/hydrate",
   "leptos_meta/hydrate",
   "leptos_router/hydrate",
   "dep:wasm-bindgen",
@@ -54,6 +64,7 @@ hydrate = [
 ]
 csr = [
   "leptos/csr",
+  # "leptos_i18n/csr",
   "leptos_meta/csr",
   "leptos_router/csr",
   "dep:wasm-bindgen",
@@ -62,6 +73,7 @@ csr = [
 ]
 ssr = [
   "leptos/ssr",
+  "leptos_i18n/actix",
   "leptos_meta/ssr",
   "leptos_router/ssr",
   "dep:leptos_actix",
diff --git a/locales/en.json b/locales/en.json
new file mode 100644
index 00000000..05825b61
--- /dev/null
+++ b/locales/en.json
@@ -0,0 +1,22 @@
+{
+    "nav_communities": "Communities",
+    "nav_create_post": "Create post",
+    "nav_create_community": "Create community",
+    "nav_donate": "Donate",
+    "nav_search": "Search",
+    "nav_login": "Login",
+    "nav_signup": "Sign Up",
+    "nav_unread_messages": "unread messages",
+
+    "nav_profile": "Profile",
+    "nav_settings": "Settings",
+    "nav_logout": "Logout",
+
+    "nav_modlog": "Modlog",
+    "nav_instances": "Instances",
+    "nav_docs": "Docs",
+    "nav_code": "Code",
+
+
+    "term": "term"
+}
\ No newline at end of file
diff --git a/locales/fr.json b/locales/fr.json
new file mode 100644
index 00000000..05825b61
--- /dev/null
+++ b/locales/fr.json
@@ -0,0 +1,22 @@
+{
+    "nav_communities": "Communities",
+    "nav_create_post": "Create post",
+    "nav_create_community": "Create community",
+    "nav_donate": "Donate",
+    "nav_search": "Search",
+    "nav_login": "Login",
+    "nav_signup": "Sign Up",
+    "nav_unread_messages": "unread messages",
+
+    "nav_profile": "Profile",
+    "nav_settings": "Settings",
+    "nav_logout": "Logout",
+
+    "nav_modlog": "Modlog",
+    "nav_instances": "Instances",
+    "nav_docs": "Docs",
+    "nav_code": "Code",
+
+
+    "term": "term"
+}
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 24c99522..546aad86 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,11 @@
-use crate::ui::components::{
-  common::nav::{BottomNav, TopNav},
-  home::home_activity::HomeActivity,
-  login::login_activity::LoginActivity,
-  post::post_activity::PostActivity,
+use crate::{
+  i18n::*,
+  ui::components::{
+    common::nav::{BottomNav, TopNav},
+    home::home_activity::HomeActivity,
+    login::login_activity::LoginActivity,
+    post::post_activity::PostActivity,
+  },
 };
 use cfg_if::cfg_if;
 use leptos::*;
@@ -12,9 +15,13 @@ mod api;
 mod errors;
 mod ui;
 
+leptos_i18n::load_locales!();
+
 #[component]
 pub fn App() -> impl IntoView {
   provide_meta_context();
+  provide_i18n_context();
+
   let (is_routing, set_is_routing) = create_signal(false);
 
   view! {
@@ -24,23 +31,47 @@ pub fn App() -> impl IntoView {
     <Meta name="viewport" content="viewport-fit=cover"/>
     <Script src="//cdn.jsdelivr.net/npm/eruda"/>
     <Script>eruda.init();</Script>
+    <Title text="Brand from env"/>
 
     // adding `set_is_routing` causes the router to wait for async data to load on new pages
     <Router set_is_routing>
-      // shows a progress bar while async data are loading
-      <RoutingProgress is_routing max_time=std::time::Duration::from_millis(250)/>
-      <TopNav/>
-      <main>
-        <Routes>
-          <Route path="home" view=HomeActivity/>
-          <Route path="" view=HomeActivity/>
-          <Route path="login" view=LoginActivity/>
-          <Route path="post/:id" view=PostActivity/>
-        // <Route path="stories/:id" view=Story/>
-        // <Route path=":stories?" view=Stories/>
-        </Routes>
-      </main>
-      <BottomNav/>
+      <div class="flex flex-col h-screen">
+        // shows a progress bar while async data are loading
+        <RoutingProgress is_routing max_time=std::time::Duration::from_millis(250)/>
+        <TopNav/>
+        <main class="container mx-auto">
+          <Routes>
+            <Route path="" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="home" view=HomeActivity ssr=SsrMode::Async/>
+
+            <Route path="communities" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="create_post" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="create_community" view=HomeActivity ssr=SsrMode::Async/>
+            // <Route path="donate" view=HomeActivity ssr=SsrMode::Async/>
+
+            <Route path="search" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="login" view=LoginActivity ssr=SsrMode::Async/>
+            <Route path="signup" view=LoginActivity ssr=SsrMode::Async/>
+
+            <Route path="inbox" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="u/:id" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="settings" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="logout" view=HomeActivity ssr=SsrMode::Async/>
+
+            <Route path="modlog" view=HomeActivity ssr=SsrMode::Async/>
+            <Route path="instances" view=HomeActivity ssr=SsrMode::Async/>
+
+            <Route path="post/:id" view=PostActivity ssr=SsrMode::Async/>
+          // <Route path="home" view=HomeActivity/>
+          // <Route path="" view=HomeActivity/>
+          // <Route path="login" view=LoginActivity/>
+          // <Route path="post/:id" view=PostActivity/>
+          // <Route path="stories/:id" view=Story/>
+          // <Route path=":stories?" view=Stories/>
+          </Routes>
+        </main>
+        <BottomNav/>
+      </div>
     </Router>
   }
 }
diff --git a/src/ui/components/comment/comment_nodes.rs b/src/ui/components/comment/comment_nodes.rs
index 3ac007ec..2b2e1a4a 100644
--- a/src/ui/components/comment/comment_nodes.rs
+++ b/src/ui/components/comment/comment_nodes.rs
@@ -9,7 +9,7 @@ pub fn CommentNodes(comments: MaybeSignal<Vec<CommentView>>) -> impl IntoView {
       <For
         each=comments
         key=|cv| cv.comment.id
-        view=move |cv| {
+        children=move |cv| {
             view! {
               <li>
                 <CommentNode comment_view=cv.into()/>
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 45cde413..bdc3b85f 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,61 +1,136 @@
-use leptos::{component, view, IntoView};
+use crate::i18n::*;
+use leptos::{component, view, IntoAttribute, IntoView};
 use leptos_icons::*;
 use leptos_router::*;
 
 #[component]
 pub fn TopNav() -> impl IntoView {
+  let i18n = use_i18n();
+
   view! {
-    <div class="navbar bg-base-300">
+    <nav class="container navbar mx-auto">
       <div class="navbar-start">
-        <div class="dropdown">
-          <label tabindex="0" class="btn btn-ghost btn-circle">
-            <Icon icon=Icon::from(ChIcon::ChMenuHamburger) width="1.25rem" height="1.25rem"/>
-          </label>
-          <ul
-            tabindex="0"
-            class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52"
-          >
-            <li>
-              <a>"Homepage"</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <div class="navbar-center">
-        <a class="btn btn-ghost normal-case text-xl">"Lemmy"</a>
+        <ul class="menu menu-horizontal flex-nowrap">
+          <li>
+            <A href="/" class="text-xl whitespace-nowrap">
+              "Brand from env"
+            </A>
+          </li>
+          <li>
+            <A href="/communities" class="text-md">
+              {t!(i18n, nav_communities)}
+            </A>
+          </li>
+          <li>
+            <A href="/create_post" class="text-md">
+              {t!(i18n, nav_create_post)}
+            </A>
+          </li>
+          <li>
+            <A href="/create_community" class="text-md">
+              {t!(i18n, nav_create_community)}
+            </A>
+          </li>
+          <li>
+            <a href="//join-lemmy.org/donate" title=t!(i18n, nav_donate)>
+              <Icon icon=Icon::from(ChIcon::ChHeart) class="h-6 w-6"/>
+            </a>
+          </li>
+        </ul>
       </div>
-      <div class="navbar-end gap-3">
-        <button class="btn btn-ghost btn-circle">
-          <Icon icon=Icon::from(ChIcon::ChSearch) width="1.25rem" height="1.25rem"/>
-        </button>
-        <button class="btn btn-ghost btn-circle">
-          <div class="indicator">
-            <Icon icon=Icon::from(ChIcon::ChBell) width="1.25rem" height="1.25rem"/>
-            <span class="badge badge-xs badge-primary indicator-item"></span>
-          </div>
-        </button>
-        <A href="/login">"Login"</A>
+      <div class="navbar-end">
+        <ul class="menu menu-horizontal flex-nowrap">
+          <li>
+            <A href="/search">
+              <span title=t!(i18n, nav_search)>
+                <Icon icon=Icon::from(ChIcon::ChSearch) class="h-6 w-6"/>
+              </span>
+            </A>
+          </li>
+          <li>
+            <A href="/login">{t!(i18n, nav_login)}</A>
+          </li>
+          <li>
+            <A href="/signup">{t!(i18n, nav_signup)}</A>
+          </li>
+          <li>
+            <A href="/inbox">
+              <span title=t!(i18n, nav_unread_messages)>
+                <Icon icon=Icon::from(ChIcon::ChBell) class="h-6 w-6"/>
+              </span>
+            </A>
+          </li>
+          <li>
+            <details>
+              <summary>"User name"</summary>
+              <ul>
+                <li>
+                  <A href="/u/jimmy90">{t!(i18n, nav_profile)}</A>
+                </li>
+                <li>
+                  <A href="/settings">{t!(i18n, nav_settings)}</A>
+                </li>
+                <li>
+                  <hr/>
+                </li>
+                <li>
+                  <A href="/logout">{t!(i18n, nav_logout)}</A>
+                </li>
+              </ul>
+            </details>
+          </li>
+        </ul>
       </div>
-    </div>
+    </nav>
   }
 }
 
 #[component]
 pub fn BottomNav() -> impl IntoView {
+  let i18n = use_i18n();
+
   view! {
-    <footer class="sticky bottom-0">
-      <div class="btm-nav btm-nav-lg">
-        <A href="/" class="active">
-          // TODO put svg's here
-          <span class="btm-nav-label">"Home"</span>
-        </A>
-        <button>
-          <span class="btm-nav-label">"TODO 1"</span>
-        </button>
-        <button>
-          <span class="btm-nav-label">"TODO 2"</span>
-        </button>
+    <nav class="container navbar mx-auto">
+      <div class="navbar-start"></div>
+      <div class="navbar-end ">
+        <ul class="menu menu-horizontal flex-nowrap">
+          <li>
+            <a href="//github.com/LemmyNet/lemmy-ui-leptos/releases" class="text-md">
+              "f/e from env"
+            </a>
+          </li>
+          <li>
+            <a href="//github.com/LemmyNet/lemmy/releases" class="text-md">
+              "b/e from env"
+            </a>
+          </li>
+          <li>
+            <A href="/modlog" class="text-md">
+              {t!(i18n, nav_modlog)}
+            </A>
+          </li>
+          <li>
+            <A href="/instances" class="text-md">
+              {t!(i18n, nav_instances)}
+            </A>
+          </li>
+          <li>
+            <a href="join-lemmy.org/docs/en/index.html" class="text-md">
+              {t!(i18n, nav_docs)}
+            </a>
+          </li>
+          <li>
+            <a href="//github.com/LemmyNet" class="text-md">
+              {t!(i18n, nav_code)}
+            </a>
+          </li>
+          <li>
+            <a href="//join-lemmy.org" class="text-md">
+              "join-lemmy.org"
+            </a>
+          </li>
+        </ul>
       </div>
-    </footer>
+    </nav>
   }
 }
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index 263cef61..6cd34498 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -34,28 +34,25 @@ pub fn HomeActivity() -> impl IntoView {
   let err_msg = " Error loading this post.";
 
   view! {
-    <main class="mx-auto">
-      <h2 class="p-6 text-4xl">"Home activity"</h2>
-      <Suspense fallback=|| {
-          view! { "Loading..." }
-      }>
-        {move || {
-            posts()
-                .map(|res| match res {
-                    None => {
-                        view! { <div>{err_msg}</div> }
-                    }
-                    Some(res) => {
-                        view! {
-                          <div>
-                            <PostListings posts=res.posts.into()/>
-                          </div>
-                        }
-                    }
-                })
-        }}
+    <Suspense fallback=|| {
+        view! { "Loading..." }
+    }>
+      {move || {
+          posts()
+              .map(|res| match res {
+                  None => {
+                      view! { <div>{err_msg}</div> }
+                  }
+                  Some(res) => {
+                      view! {
+                        <div>
+                          <PostListings posts=res.posts.into()/>
+                        </div>
+                      }
+                  }
+              })
+      }}
 
-      </Suspense>
-    </main>
+    </Suspense>
   }
 }
diff --git a/src/ui/components/post/post_listings.rs b/src/ui/components/post/post_listings.rs
index d24042c5..3ff47fcf 100644
--- a/src/ui/components/post/post_listings.rs
+++ b/src/ui/components/post/post_listings.rs
@@ -9,7 +9,7 @@ pub fn PostListings(posts: MaybeSignal<Vec<PostView>>) -> impl IntoView {
       <For
         each=posts
         key=|pv| pv.post.id
-        view=move |pv| {
+        children=move |pv| {
             view! {
               <li>
                 <PostListing post_view=pv.into()/>

From aa82f0761dd1d2aef0b2b752d039765c68d5b9e7 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Sun, 1 Oct 2023 19:20:13 +0100
Subject: [PATCH 09/16] unused code

---
 Cargo.lock      | 16 ++++++++--------
 Cargo.toml      |  2 --
 locales/en.json |  5 +----
 locales/fr.json |  5 +----
 src/lib.rs      |  7 -------
 5 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d12b1de..bc05e293 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -860,9 +860,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -1621,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_i18n"
-version = "0.2.0-rc"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed3b5f74d0c85543505efaf8c7cae3df01c98bfc3b469f5f0cd0741b68b713f"
+checksum = "5b1f5938c4bd20bb46de24440313112c199e6fec01938d80e7c214d21f1d0d4d"
 dependencies = [
  "actix-web",
  "leptos",
@@ -1635,9 +1635,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_i18n_macro"
-version = "0.2.0-rc"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054c839e6c553e808524a047095e360cd4a68a573bfa15727531621831deae7"
+checksum = "eb8a9510418389133f50411219df4e72e0ff25e5e743acb2f35e2e98a2b67aad"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1871,9 +1871,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "mime"
diff --git a/Cargo.toml b/Cargo.toml
index b4e514e1..e20042a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,6 @@ leptos_icons = { git = "https://github.com/Carlosted/leptos-icons.git", features
   "ChMenuHamburger",
   "ChHeart",
 ] }
-# leptos_i18n = { version = "0.2.0-rc"/*, features = ["debug_interpolations", "csr", "hydrate"] */}
 leptos_i18n = { version = "0.2.0-rc" }
 
 serde = { version = "1", features = ["derive"] }
@@ -64,7 +63,6 @@ hydrate = [
 ]
 csr = [
   "leptos/csr",
-  # "leptos_i18n/csr",
   "leptos_meta/csr",
   "leptos_router/csr",
   "dep:wasm-bindgen",
diff --git a/locales/en.json b/locales/en.json
index 05825b61..dfed1125 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -15,8 +15,5 @@
     "nav_modlog": "Modlog",
     "nav_instances": "Instances",
     "nav_docs": "Docs",
-    "nav_code": "Code",
-
-
-    "term": "term"
+    "nav_code": "Code"
 }
\ No newline at end of file
diff --git a/locales/fr.json b/locales/fr.json
index 05825b61..dfed1125 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -15,8 +15,5 @@
     "nav_modlog": "Modlog",
     "nav_instances": "Instances",
     "nav_docs": "Docs",
-    "nav_code": "Code",
-
-
-    "term": "term"
+    "nav_code": "Code"
 }
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 546aad86..43f86bfe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,7 +47,6 @@ pub fn App() -> impl IntoView {
             <Route path="communities" view=HomeActivity ssr=SsrMode::Async/>
             <Route path="create_post" view=HomeActivity ssr=SsrMode::Async/>
             <Route path="create_community" view=HomeActivity ssr=SsrMode::Async/>
-            // <Route path="donate" view=HomeActivity ssr=SsrMode::Async/>
 
             <Route path="search" view=HomeActivity ssr=SsrMode::Async/>
             <Route path="login" view=LoginActivity ssr=SsrMode::Async/>
@@ -62,12 +61,6 @@ pub fn App() -> impl IntoView {
             <Route path="instances" view=HomeActivity ssr=SsrMode::Async/>
 
             <Route path="post/:id" view=PostActivity ssr=SsrMode::Async/>
-          // <Route path="home" view=HomeActivity/>
-          // <Route path="" view=HomeActivity/>
-          // <Route path="login" view=LoginActivity/>
-          // <Route path="post/:id" view=PostActivity/>
-          // <Route path="stories/:id" view=Story/>
-          // <Route path=":stories?" view=Stories/>
           </Routes>
         </main>
         <BottomNav/>

From 25a3f0e87e6ebc4114a264d7dffc4a8bd21158ef Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Sun, 1 Oct 2023 19:48:19 +0100
Subject: [PATCH 10/16] pretty json

---
 locales/en.json | 32 ++++++++++++++++----------------
 locales/fr.json | 32 ++++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index dfed1125..9dd0ce50 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,19 +1,19 @@
 {
-    "nav_communities": "Communities",
-    "nav_create_post": "Create post",
-    "nav_create_community": "Create community",
-    "nav_donate": "Donate",
-    "nav_search": "Search",
-    "nav_login": "Login",
-    "nav_signup": "Sign Up",
-    "nav_unread_messages": "unread messages",
+  "nav_communities": "Communities",
+  "nav_create_post": "Create post",
+  "nav_create_community": "Create community",
+  "nav_donate": "Donate",
+  "nav_search": "Search",
+  "nav_login": "Login",
+  "nav_signup": "Sign Up",
+  "nav_unread_messages": "unread messages",
 
-    "nav_profile": "Profile",
-    "nav_settings": "Settings",
-    "nav_logout": "Logout",
+  "nav_profile": "Profile",
+  "nav_settings": "Settings",
+  "nav_logout": "Logout",
 
-    "nav_modlog": "Modlog",
-    "nav_instances": "Instances",
-    "nav_docs": "Docs",
-    "nav_code": "Code"
-}
\ No newline at end of file
+  "nav_modlog": "Modlog",
+  "nav_instances": "Instances",
+  "nav_docs": "Docs",
+  "nav_code": "Code"
+}
diff --git a/locales/fr.json b/locales/fr.json
index dfed1125..9dd0ce50 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -1,19 +1,19 @@
 {
-    "nav_communities": "Communities",
-    "nav_create_post": "Create post",
-    "nav_create_community": "Create community",
-    "nav_donate": "Donate",
-    "nav_search": "Search",
-    "nav_login": "Login",
-    "nav_signup": "Sign Up",
-    "nav_unread_messages": "unread messages",
+  "nav_communities": "Communities",
+  "nav_create_post": "Create post",
+  "nav_create_community": "Create community",
+  "nav_donate": "Donate",
+  "nav_search": "Search",
+  "nav_login": "Login",
+  "nav_signup": "Sign Up",
+  "nav_unread_messages": "unread messages",
 
-    "nav_profile": "Profile",
-    "nav_settings": "Settings",
-    "nav_logout": "Logout",
+  "nav_profile": "Profile",
+  "nav_settings": "Settings",
+  "nav_logout": "Logout",
 
-    "nav_modlog": "Modlog",
-    "nav_instances": "Instances",
-    "nav_docs": "Docs",
-    "nav_code": "Code"
-}
\ No newline at end of file
+  "nav_modlog": "Modlog",
+  "nav_instances": "Instances",
+  "nav_docs": "Docs",
+  "nav_code": "Code"
+}

From 8abe98f88d2c32d92ec4ff378ef183b5974ca61d Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 3 Oct 2023 10:29:52 +0100
Subject: [PATCH 11/16] get login fully working

---
 Cargo.lock                                |  64 ++++-
 Cargo.toml                                |   3 +-
 locales/en.json                           |   1 +
 locales/fr.json                           |   1 +
 src/api/mod.rs                            | 297 +++++++++++++++++-----
 src/ui/components/common/nav.rs           |  29 ++-
 src/ui/components/login/login_activity.rs |  81 +++---
 src/ui/components/login/login_form.rs     |  56 +++-
 8 files changed, 407 insertions(+), 125 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bc05e293..e60efa3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -539,8 +539,10 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
+ "js-sys",
  "num-traits",
  "serde",
+ "wasm-bindgen",
  "windows-targets",
 ]
 
@@ -1058,7 +1060,28 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-sink",
- "gloo-utils",
+ "gloo-utils 0.1.7",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-net"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ac9e8288ae2c632fa9f8657ac70bfe38a1530f345282d7ba66a1f70b72b7dc4"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils 0.2.0",
+ "http",
  "js-sys",
  "pin-project",
  "serde",
@@ -1082,6 +1105,19 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gloo-utils"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
+dependencies = [
+ "js-sys",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "h2"
 version = "0.3.21"
@@ -1432,7 +1468,7 @@ dependencies = [
  "console_log",
  "futures",
  "getrandom",
- "gloo-net",
+ "gloo-net 0.4.0",
  "lemmy_api_common",
  "leptos",
  "leptos_actix",
@@ -1449,6 +1485,7 @@ dependencies = [
  "thiserror",
  "tracing",
  "wasm-bindgen",
+ "wasm-cookies",
  "web-sys",
 ]
 
@@ -1744,7 +1781,7 @@ dependencies = [
  "cached",
  "cfg-if",
  "common_macros",
- "gloo-net",
+ "gloo-net 0.2.6",
  "js-sys",
  "lazy_static",
  "leptos",
@@ -2625,7 +2662,7 @@ checksum = "29eefae61211e81059a092a3428612c475a3a28e0ea4fb3fd49b0a940d837f84"
 dependencies = [
  "ciborium",
  "const_format",
- "gloo-net",
+ "gloo-net 0.2.6",
  "inventory",
  "js-sys",
  "lazy_static",
@@ -3122,6 +3159,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb"
+
 [[package]]
 name = "utf8-width"
 version = "0.1.6"
@@ -3241,6 +3284,19 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
+[[package]]
+name = "wasm-cookies"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "792b7c4fd62cde421f0e757620053efa7b0c23441c05c6ec02baf96cd74973be"
+dependencies = [
+ "chrono",
+ "js-sys",
+ "urlencoding",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.64"
diff --git a/Cargo.toml b/Cargo.toml
index e20042a9..f2c608bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ leptos_i18n = { version = "0.2.0-rc" }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
-gloo-net = { version = "0.2", features = ["http"] }
+gloo-net = { version = "0.4", features = ["http"] }
 log = "0.4"
 cfg-if = "1.0"
 tracing = "0.1"
@@ -38,6 +38,7 @@ thiserror = "1.0"
 wasm-bindgen = { version = "0.2", optional = true }
 console_log = { version = "1", optional = true }
 console_error_panic_hook = { version = "0.1", optional = true }
+wasm-cookies = "0.2"
 
 # dependecies for server (enable when ssr set)
 actix-files = { version = "0.6", optional = true }
diff --git a/locales/en.json b/locales/en.json
index 9dd0ce50..63e1889e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -3,6 +3,7 @@
   "nav_create_post": "Create post",
   "nav_create_community": "Create community",
   "nav_donate": "Donate",
+
   "nav_search": "Search",
   "nav_login": "Login",
   "nav_signup": "Sign Up",
diff --git a/locales/fr.json b/locales/fr.json
index 9dd0ce50..63e1889e 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -3,6 +3,7 @@
   "nav_create_post": "Create post",
   "nav_create_community": "Create community",
   "nav_donate": "Donate",
+
   "nav_search": "Search",
   "nav_login": "Login",
   "nav_signup": "Sign Up",
diff --git a/src/api/mod.rs b/src/api/mod.rs
index d5dbaddd..f8b2d823 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,6 +1,6 @@
 use crate::errors::LemmyAppError;
 use cfg_if::cfg_if;
-use leptos::Serializable;
+use leptos::{Serializable};
 use serde::Serialize;
 use serde_json::Value;
 
@@ -13,7 +13,6 @@ const ENDPOINT: &str = "https://voyager.lemmy.ml/api/v3";
 pub enum HttpType {
   Get,
   Post,
-  #[allow(dead_code)]
   Put,
 }
 
@@ -32,7 +31,7 @@ pub async fn api_wrapper<Response, Form>(
 ) -> Result<Response, LemmyAppError>
 where
   Response: Serializable,
-  Form: Serialize,
+  Form: Serialize + std::fmt::Debug,
 {
   let route = &build_route(path);
   #[allow(clippy::needless_late_init)]
@@ -40,65 +39,88 @@ where
 
   cfg_if! {
     if #[cfg(feature = "ssr")] {
-     let client = reqwest::Client::new();
-
-     json = match type_ {
-       HttpType::Get => {
-         client
-           .get(&build_fetch_query(route, form))
-           .send()
-           .await?
-           .text()
-           .await?
-       }
-       HttpType::Post => client.post(path).json(form).send().await?.text().await?,
-       HttpType::Put => client.put(path).json(form).send().await?.text().await?,
-     };
-   } else {
-     use wasm_bindgen::UnwrapThrowExt;
-
-     let abort_controller = web_sys::AbortController::new().ok();
-     let abort_signal = abort_controller.as_ref().map(|a| a.signal());
-
-     json = match type_ {
-       HttpType::Get => {
-         gloo_net::http::Request::get(&build_fetch_query(route, form))
-           .abort_signal(abort_signal.as_ref())
-           .send()
-           .await?
-           .text()
-           .await?
-       }
-       HttpType::Post => {
-         gloo_net::http::Request::post(route)
-           .json(form)
-           .expect_throw("Could not parse json body")
-           .abort_signal(abort_signal.as_ref())
-           .send()
-           .await?
-           .text()
-           .await?
-       }
-       HttpType::Put => {
-         gloo_net::http::Request::put(route)
-           .json(form)
-           .expect_throw("Could not parse json body")
-           .abort_signal(abort_signal.as_ref())
-           .send()
-           .await?
-           .text()
-           .await?
-       }
-     };
-
-     // abort in-flight requests if the Scope is disposed
-     // i.e., if we've navigated away from this page
-     leptos::on_cleanup( move || {
-       if let Some(abort_controller) = abort_controller {
-         abort_controller.abort()
-       }
-     });
-   }
+      let client = reqwest::Client::new();
+
+      let mut request_builder = match type_ {
+        HttpType::Get => client.get(&build_fetch_query(route, form)),
+        HttpType::Post => client.post(route),
+        HttpType::Put => client.put(route),
+      };
+
+      match get_cookie_wrapper("jwt").await {
+        Ok(jwt) => {
+          if jwt.len() > 0 {
+            request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+          }
+        },
+        Err(_) => {
+        },
+      };
+
+      json = match type_ {
+        HttpType::Get => request_builder.send().await?.text().await?,
+        HttpType::Post => request_builder.json(form).send().await?.text().await?,
+        HttpType::Put => request_builder.json(form).send().await?.text().await?,
+      };
+    } else {
+      use wasm_bindgen::UnwrapThrowExt;
+
+      let abort_controller = web_sys::AbortController::new().ok();
+      let abort_signal = abort_controller.as_ref().map(|a| a.signal());
+
+      let mut request_builder = match type_ {
+        HttpType::Get => gloo_net::http::Request::get(&build_fetch_query(route, form)),
+        HttpType::Post => gloo_net::http::Request::post(route),
+        HttpType::Put => gloo_net::http::Request::put(route),
+      };
+
+      match get_cookie_wrapper("jwt").await {
+        Ok(jwt) => {
+          if jwt.len() > 0 {
+            request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+          }
+        },
+        Err(_e) => {
+        },
+      };
+
+      json = match type_ {
+        HttpType::Get => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+        HttpType::Post => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .json(form)
+            .expect_throw("Could not parse json body")
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+        HttpType::Put => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .json(form)
+            .expect_throw("Could not parse json body")
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+      };
+
+      leptos::on_cleanup( move || {
+        if let Some(abort_controller) = abort_controller {
+          abort_controller.abort()
+        }
+      });
+    }
   }
 
   // Return the error response json as an error
@@ -115,3 +137,154 @@ fn build_fetch_query<T: Serialize>(path: &str, form: T) -> String {
   let form_str = serde_urlencoded::to_string(&form).unwrap_or(path.to_string());
   format!("{path}?{form_str}")
 }
+
+#[cfg(not(feature = "ssr"))]
+pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
+  use leptos::window;
+  use wasm_bindgen::JsCast;
+
+  let r = window()
+    .document()
+    .ok_or(LemmyAppError::APIError {
+      error: String::from("DOM document is None"),
+    })?
+    .dyn_into::<web_sys::HtmlDocument>()
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("DOM document could not be cast"),
+    })?
+    .cookie()
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("Cookie could not be set"),
+    })?;
+
+  wasm_cookies::cookies::get(&r, path)
+    .ok_or(LemmyAppError::APIError {
+      error: String::from("DOM cookie is None"),
+    })?
+    .map_err(|e| LemmyAppError::APIError {
+      error: e.to_string(),
+    })
+}
+
+#[cfg(not(feature = "ssr"))]
+pub async fn set_cookie_wrapper(path: &str, value: &str) -> Result<(), LemmyAppError> {
+  use leptos::window;
+  use wasm_bindgen::JsCast;
+  use wasm_cookies::CookieOptions;
+
+  let r = window()
+    .document()
+    .ok_or(LemmyAppError::APIError {
+      error: String::from("DOM document is None"),
+    })?
+    .dyn_into::<web_sys::HtmlDocument>()
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("DOM document could not be cast"),
+    })?
+    .set_cookie(&wasm_cookies::cookies::set(path, value, &CookieOptions::default())[..])
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("Cookie could not be set"),
+    });
+
+  r
+}
+
+#[cfg(not(feature = "ssr"))]
+pub async fn remove_cookie_wrapper(path: &str) -> Result<(), LemmyAppError> {
+  use leptos::window;
+  use wasm_bindgen::JsCast;
+
+  let r = window()
+    .document()
+    .ok_or(LemmyAppError::APIError {
+      error: String::from("DOM document is None"),
+    })?
+    .dyn_into::<web_sys::HtmlDocument>()
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("DOM document could not be cast"),
+    })?
+    .set_cookie(&wasm_cookies::cookies::delete(path))
+    .map_err(|_| LemmyAppError::APIError {
+      error: String::from("Cookie could not be set"),
+    });
+
+  r
+}
+
+#[cfg(feature = "ssr")]
+pub async fn set_cookie_wrapper(path: &str, value: &str) -> Result<(), LemmyAppError> {
+  use actix_web::{
+    cookie::{
+      time::{Duration, OffsetDateTime},
+      Cookie,
+    },
+    http::{header, header::HeaderValue},
+  };
+  use leptos::expect_context;
+  use leptos_actix::ResponseOptions;
+
+  let response = expect_context::<ResponseOptions>();
+
+  let mut cookie = Cookie::build(path, value).finish();
+  let mut now = OffsetDateTime::now_utc();
+  now += Duration::weeks(1);
+  cookie.set_expires(now);
+  cookie.set_path("/");
+
+  if let Ok(cookie) = HeaderValue::from_str(&cookie.to_string()) {
+    response.insert_header(header::SET_COOKIE, cookie);
+  }
+
+  Ok(())
+}
+
+#[cfg(feature = "ssr")]
+#[allow(dead_code)]
+pub async fn remove_cookie_wrapper(path: &str) -> Result<(), LemmyAppError> {
+  use actix_web::{
+    cookie::{
+      time::{Duration, OffsetDateTime},
+      Cookie,
+    },
+    http::{header, header::HeaderValue},
+  };
+  use leptos::expect_context;
+  use leptos_actix::ResponseOptions;
+
+  let response = expect_context::<ResponseOptions>();
+
+  let mut cookie = Cookie::build(path, "").finish();
+  let mut now = OffsetDateTime::now_utc();
+  now += Duration::weeks(-1);
+  cookie.set_expires(now);
+  cookie.set_path("/");
+
+  if let Ok(cookie) = HeaderValue::from_str(&cookie.to_string()) {
+    response.insert_header(header::SET_COOKIE, cookie);
+  }
+
+  Ok(())
+}
+
+#[cfg(feature = "ssr")]
+pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
+  use actix_web::HttpRequest;
+  use leptos_actix::extract;
+
+  let path_string = path.to_string().clone();
+
+  let cookie_value = extract(|req: HttpRequest| async move {
+    if let Some(c) = req.cookie(&path_string) {
+      let s = c.clone();
+      s.value().to_string()
+    } else {
+      "".to_string()
+    }
+  })
+  .await
+  .map_err(|e| LemmyAppError::APIError {
+    error: e.to_string(),
+  })?;
+
+  Ok(cookie_value)
+}
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index bdc3b85f..520acbd6 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,12 +1,27 @@
 use crate::i18n::*;
-use leptos::{component, view, IntoAttribute, IntoView};
+use leptos::{component, create_server_action, server, view, IntoView, ServerFnError};
 use leptos_icons::*;
 use leptos_router::*;
 
+#[server(LogoutFormFn, "/api")]
+pub async fn logout_form_fn() -> Result<(), ServerFnError> {
+  use leptos_actix::redirect;
+  use crate::api::set_cookie_wrapper;
+
+  redirect("/");
+
+  match set_cookie_wrapper("jwt", "").await {
+    Ok(o) => Ok(o),
+    Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+  }
+}
+
 #[component]
 pub fn TopNav() -> impl IntoView {
   let i18n = use_i18n();
 
+  let logout_form_action = create_server_action::<LogoutFormFn>();
+
   view! {
     <nav class="container navbar mx-auto">
       <div class="navbar-start">
@@ -32,9 +47,11 @@ pub fn TopNav() -> impl IntoView {
             </A>
           </li>
           <li>
-            <a href="//join-lemmy.org/donate" title=t!(i18n, nav_donate)>
-              <Icon icon=Icon::from(ChIcon::ChHeart) class="h-6 w-6"/>
-            </a>
+            <A href="//join-lemmy.org/donate">
+              <span title=t!(i18n, nav_donate)>
+                <Icon icon=Icon::from(ChIcon::ChHeart) class="h-6 w-6"/>
+              </span>
+            </A>
           </li>
         </ul>
       </div>
@@ -74,7 +91,9 @@ pub fn TopNav() -> impl IntoView {
                   <hr/>
                 </li>
                 <li>
-                  <A href="/logout">{t!(i18n, nav_logout)}</A>
+                  <ActionForm action=logout_form_action>
+                    <button type="submit">{t!(i18n, nav_logout)}</button>
+                  </ActionForm>
                 </li>
               </ul>
             </details>
diff --git a/src/ui/components/login/login_activity.rs b/src/ui/components/login/login_activity.rs
index 959e87f9..86c8cd66 100644
--- a/src/ui/components/login/login_activity.rs
+++ b/src/ui/components/login/login_activity.rs
@@ -1,55 +1,54 @@
-use crate::{api::login::login, ui::components::login::login_form::LoginForm};
-use lemmy_api_common::person::Login;
+use crate::{ui::components::login::login_form::LoginForm};
+
 use leptos::{logging::*, *};
 
 #[component]
 pub fn LoginActivity() -> impl IntoView {
-  let (login_error, set_login_error) = create_signal(None::<String>);
-  let (wait_for_response, set_wait_for_response) = create_signal(false);
+  let (login_error, _set_login_error) = create_signal(None::<String>);
+  let (wait_for_response, _set_wait_for_response) = create_signal(false);
 
-  let login_action = create_action(move |(name, password): &(String, String)| {
-    log::debug!("Try to login with {name}");
-    let name = name.to_string();
-    let password = password.to_string();
-    // let on_success = on_success.clone();
-    async move {
-      set_wait_for_response.update(|w| *w = true);
-      let form = Login {
-        username_or_email: name.into(),
-        password: password.into(),
-        totp_2fa_token: None,
-      };
-      let result = login(&form).await;
-      set_wait_for_response.update(|w| *w = false);
-      // TODO figure out how to handle errors
-      log::debug!("Login res: {:?}", result);
-      // JWT can be extracted using into_inner()
-      match result {
-        Ok(res) => {
-          log::debug!("jwt: {:?}", res.jwt.unwrap().into_inner());
-          set_login_error.update(|e| *e = None);
-          // on_success(res);
-        }
-        Err(err) => {
-          let err_str = err.to_string();
-          error!(
-            "Unable to login with {}: {}",
-            form.username_or_email.into_inner(),
-            err_str,
-          );
-          set_login_error.update(|e| *e = Some(err_str));
-        }
-      }
-    }
-  });
+  // let login_action = create_action(move |(name, password): &(String, String)| {
+  //   log::debug!("Try to login with {name}");
+  //   let name = name.to_string();
+  //   let password = password.to_string();
+  //   // let on_success = on_success.clone();
+  //   async move {
+  //     set_wait_for_response.update(|w| *w = true);
+  //     let form = Login {
+  //       username_or_email: name.into(),
+  //       password: password.into(),
+  //       totp_2fa_token: None,
+  //     };
+  //     let result = login(&form).await;
+  //     set_wait_for_response.update(|w| *w = false);
+  //     // TODO figure out how to handle errors
+  //     log::debug!("Login res: {:?}", result);
+  //     // JWT can be extracted using into_inner()
+  //     match result {
+  //       Ok(res) => {
+  //         log::debug!("jwt: {:?}", res.jwt.unwrap().into_inner());
+  //         set_login_error.update(|e| *e = None);
+  //         // on_success(res);
+  //       }
+  //       Err(err) => {
+  //         let err_str = err.to_string();
+  //         error!(
+  //           "Unable to login with {}: {}",
+  //           form.username_or_email.into_inner(),
+  //           err_str,
+  //         );
+  //         set_login_error.update(|e| *e = Some(err_str));
+  //       }
+  //     }
+  //   }
+  // });
 
   let disabled = Signal::derive(move || wait_for_response.get());
 
   view! {
     <main class="mx-auto">
       <h2 class="p-6 text-4xl">"Login Activity"</h2>
-      <LoginForm action=login_action error=login_error.into() disabled/>
-
+      <LoginForm error=login_error.into() disabled/>
     </main>
   }
 }
diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index 0e52991b..c7fdf1fc 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -1,21 +1,56 @@
-use leptos::{ev, *};
+
+use lemmy_api_common::person::LoginResponse;
+use leptos::{ev, logging::*, *};
+use leptos_router::ActionForm;
+
+#[server(LoginFormFn, "/api")]
+pub async fn login_form_fn(
+  username: String,
+  password: String,
+) -> Result<LoginResponse, ServerFnError> {
+  use leptos_actix::redirect;
+  use lemmy_api_common::person::Login;
+  use crate::api::{login::login, set_cookie_wrapper};
+
+  let form = Login {
+    username_or_email: username.into(),
+    password: password.into(),
+    totp_2fa_token: None,
+  };
+  let result = login(&form).await;
+  redirect("/");
+
+  match result {
+    Ok(res) => {
+      match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
+        Ok(_) => {
+          Ok(res)
+        }
+        Err(e) => {
+          Err(ServerFnError::ServerError(e.to_string()))
+        }
+      }
+
+    }
+    Err(err) => Err(ServerFnError::ServerError(err.to_string())),
+  }
+}
 
 #[component]
 pub fn LoginForm(
-  action: Action<(String, String), ()>,
   error: Signal<Option<String>>,
   disabled: Signal<bool>,
 ) -> impl IntoView {
   let (password, set_password) = create_signal(String::new());
   let (name, set_name) = create_signal(String::new());
 
-  let dispatch_action = move || action.dispatch((name.get(), password.get()));
-
   let button_is_disabled =
     Signal::derive(move || disabled.get() || password.get().is_empty() || name.get().is_empty());
 
+  let login_form_action = create_server_action::<LoginFormFn>();
+
   view! {
-    <form on:submit=|ev| ev.prevent_default()>
+    <ActionForm action=login_form_action>
       <p>"LoginForm"</p>
       {move || {
           error
@@ -26,6 +61,7 @@ pub fn LoginForm(
       }}
 
       <input
+        name="username"
         type="text"
         required
         placeholder="Username"
@@ -42,15 +78,13 @@ pub fn LoginForm(
       />
 
       <input
+        name="password"
         type="password"
         required
         placeholder="Password"
         prop:disabled=move || disabled.get()
         on:keyup=move |ev: ev::KeyboardEvent| {
             match &*ev.key() {
-                "Enter" => {
-                    dispatch_action();
-                }
                 _ => {
                     let val = event_target_value(&ev);
                     set_password.update(|p| *p = val);
@@ -64,9 +98,7 @@ pub fn LoginForm(
         }
       />
 
-      <button prop:disabled=move || button_is_disabled.get() on:click=move |_| dispatch_action()>
-        "Login"
-      </button>
-    </form>
+      <button type="submit" prop:disabled=move || button_is_disabled.get()>"Login"</button>
+    </ActionForm>
   }
 }

From 6b48d753a36256668736d1e4ce9ec93fa044e231 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Tue, 3 Oct 2023 10:34:53 +0100
Subject: [PATCH 12/16] formatting for PR

---
 src/api/mod.rs                            |  2 +-
 src/ui/components/common/nav.rs           |  2 +-
 src/ui/components/login/login_activity.rs |  3 +--
 src/ui/components/login/login_form.rs     | 29 ++++++++---------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/api/mod.rs b/src/api/mod.rs
index f8b2d823..25ae0ad2 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,6 +1,6 @@
 use crate::errors::LemmyAppError;
 use cfg_if::cfg_if;
-use leptos::{Serializable};
+use leptos::Serializable;
 use serde::Serialize;
 use serde_json::Value;
 
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 520acbd6..09f22958 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -5,8 +5,8 @@ use leptos_router::*;
 
 #[server(LogoutFormFn, "/api")]
 pub async fn logout_form_fn() -> Result<(), ServerFnError> {
-  use leptos_actix::redirect;
   use crate::api::set_cookie_wrapper;
+  use leptos_actix::redirect;
 
   redirect("/");
 
diff --git a/src/ui/components/login/login_activity.rs b/src/ui/components/login/login_activity.rs
index 86c8cd66..7f712846 100644
--- a/src/ui/components/login/login_activity.rs
+++ b/src/ui/components/login/login_activity.rs
@@ -1,5 +1,4 @@
-use crate::{ui::components::login::login_form::LoginForm};
-
+use crate::ui::components::login::login_form::LoginForm;
 use leptos::{logging::*, *};
 
 #[component]
diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index c7fdf1fc..f114a68c 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -1,4 +1,3 @@
-
 use lemmy_api_common::person::LoginResponse;
 use leptos::{ev, logging::*, *};
 use leptos_router::ActionForm;
@@ -8,9 +7,9 @@ pub async fn login_form_fn(
   username: String,
   password: String,
 ) -> Result<LoginResponse, ServerFnError> {
-  use leptos_actix::redirect;
-  use lemmy_api_common::person::Login;
   use crate::api::{login::login, set_cookie_wrapper};
+  use lemmy_api_common::person::Login;
+  use leptos_actix::redirect;
 
   let form = Login {
     username_or_email: username.into(),
@@ -21,26 +20,16 @@ pub async fn login_form_fn(
   redirect("/");
 
   match result {
-    Ok(res) => {
-      match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
-        Ok(_) => {
-          Ok(res)
-        }
-        Err(e) => {
-          Err(ServerFnError::ServerError(e.to_string()))
-        }
-      }
-
-    }
+    Ok(res) => match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
+      Ok(_) => Ok(res),
+      Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+    },
     Err(err) => Err(ServerFnError::ServerError(err.to_string())),
   }
 }
 
 #[component]
-pub fn LoginForm(
-  error: Signal<Option<String>>,
-  disabled: Signal<bool>,
-) -> impl IntoView {
+pub fn LoginForm(error: Signal<Option<String>>, disabled: Signal<bool>) -> impl IntoView {
   let (password, set_password) = create_signal(String::new());
   let (name, set_name) = create_signal(String::new());
 
@@ -98,7 +87,9 @@ pub fn LoginForm(
         }
       />
 
-      <button type="submit" prop:disabled=move || button_is_disabled.get()>"Login"</button>
+      <button type="submit" prop:disabled=move || button_is_disabled.get()>
+        "Login"
+      </button>
     </ActionForm>
   }
 }

From 2f7d18ef93327d10e1b993bb082c9a35cba65097 Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Fri, 6 Oct 2023 09:53:29 +0100
Subject: [PATCH 13/16] fixing most merge issues and SSR homepage

---
 src/api/mod.rs                          |  31 ++---
 src/config.rs                           |   2 +-
 src/lemmy_client.rs                     | 147 ++++++++++--------------
 src/lib.rs                              |  25 +++-
 src/ui/components/common/nav.rs         | 138 +++++++++++++++-------
 src/ui/components/home/home_activity.rs | 130 +++++++++++++--------
 src/ui/components/login/login_form.rs   |  55 +++++----
 7 files changed, 311 insertions(+), 217 deletions(-)

diff --git a/src/api/mod.rs b/src/api/mod.rs
index 6588cc02..0dd7e6b6 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,8 +1,4 @@
 use crate::errors::LemmyAppError;
-use cfg_if::cfg_if;
-use leptos::Serializable;
-use serde::Serialize;
-use serde_json::Value;
 
 const ENDPOINT: &str = "https://voyager.lemmy.ml/api/v3";
 
@@ -131,11 +127,11 @@ pub enum HttpType {
 // }
 
 #[cfg(not(feature = "ssr"))]
-pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
-  use leptos::window;
+pub async fn get_cookie_wrapper(name: &str) -> Result<Option<String>, LemmyAppError> {
   use crate::wasm_bindgen::JsCast;
+  use leptos::window;
 
-  let r = window()
+  let cookie_string = window()
     .document()
     .ok_or(LemmyAppError::APIError {
       error: String::from("DOM document is None"),
@@ -146,22 +142,27 @@ pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
     })?
     .cookie()
     .map_err(|_| LemmyAppError::APIError {
-      error: String::from("Cookie could not be set"),
+      error: String::from("Could not get cookie string"),
     })?;
 
-  wasm_cookies::cookies::get(&r, path)
+  if let Ok(value) = wasm_cookies::cookies::get(&cookie_string, name)
     .ok_or(LemmyAppError::APIError {
       error: String::from("DOM cookie is None"),
     })?
     .map_err(|e| LemmyAppError::APIError {
       error: e.to_string(),
     })
+  {
+    Ok(Some(value))
+  } else {
+    Ok(None)
+  }
 }
 
 #[cfg(not(feature = "ssr"))]
 pub async fn set_cookie_wrapper(path: &str, value: &str) -> Result<(), LemmyAppError> {
-  use leptos::window;
   use crate::wasm_bindgen::JsCast;
+  use leptos::window;
   use wasm_cookies::CookieOptions;
 
   let r = window()
@@ -183,8 +184,8 @@ pub async fn set_cookie_wrapper(path: &str, value: &str) -> Result<(), LemmyAppE
 
 #[cfg(not(feature = "ssr"))]
 pub async fn remove_cookie_wrapper(path: &str) -> Result<(), LemmyAppError> {
-  use leptos::window;
   use crate::wasm_bindgen::JsCast;
+  use leptos::window;
 
   let r = window()
     .document()
@@ -258,7 +259,7 @@ pub async fn remove_cookie_wrapper(path: &str) -> Result<(), LemmyAppError> {
 }
 
 #[cfg(feature = "ssr")]
-pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
+pub async fn get_cookie_wrapper(path: &str) -> Result<Option<String>, LemmyAppError> {
   use actix_web::HttpRequest;
   use leptos_actix::extract;
 
@@ -267,9 +268,11 @@ pub async fn get_cookie_wrapper(path: &str) -> Result<String, LemmyAppError> {
   let cookie_value = extract(|req: HttpRequest| async move {
     if let Some(c) = req.cookie(&path_string) {
       let s = c.clone();
-      s.value().to_string()
+      Some(s.value().to_string())
     } else {
-      "".to_string()
+      None
+      // Err("no existy")
+      // "".to_string()
     }
   })
   .await
diff --git a/src/config.rs b/src/config.rs
index b1785342..9550d182 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1 +1 @@
-pub const TEST_HOST: &str = "0.0.0.0:8536";
+pub const TEST_HOST: &str = "voyager.lemmy.ml";
diff --git a/src/lemmy_client.rs b/src/lemmy_client.rs
index ba0a4ecb..31620e9c 100644
--- a/src/lemmy_client.rs
+++ b/src/lemmy_client.rs
@@ -69,26 +69,6 @@ cfg_if! {
 
                 let route = &build_route(path);
 
-                // let mut request_builder = match type_ {
-                //   HttpType::Get => self.get(&build_fetch_query(route, form)),
-                //   HttpType::Post => self.post(route),
-                //   HttpType::Put => self.put(route),
-                // };
-
-                // match get_cookie_wrapper("jwt").await {
-                //   Ok(jwt) => {
-                //     request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
-                //   },
-                //   Err(_) => {
-                //   },
-                // };
-
-                // json = match type_ {
-                //   HttpType::Get => request_builder.send().await?.text().await?,
-                //   HttpType::Post => request_builder.json(form).send().await?.text().await?,
-                //   HttpType::Put => request_builder.json(form).send().await?.text().await?,
-                // };
-
                 let mut request_builder = match method {
                     HttpType::Get => self.get(route).query(form)?,
                     HttpType::Post => self.post(route),
@@ -96,22 +76,13 @@ cfg_if! {
                 };
 
                 match get_cookie_wrapper("jwt").await {
-                  Ok(jwt) => {
+                  Ok(Some(jwt)) => {
                     request_builder = request_builder.insert_header(("Authorization", &format!("Bearer {}", jwt)[..]));
                   },
-                  Err(_) => {
+                  _ => {
                   },
                 };
 
-                // match method {
-                //   HttpType::Get => self.get(route).query(form)?,
-                //   HttpType::Post => self.post(route),
-                //   HttpType::Put => self.put(route),
-                // };
-
-
-                // request_builder.await?.json::<Response>().await.map_err(Into::into)
-
                 match method {
                   HttpType::Get => request_builder.send(),
                   HttpType::Post => request_builder.send_json(form),
@@ -162,64 +133,64 @@ cfg_if! {
                    }
                });
 
-               let mut request_builder = match method {
-                  HttpType::Get => {
-                      Request::get(&build_fetch_query(path, form))
-                        .abort_signal(abort_signal.as_ref())
-                  }
-                  HttpType::Post => {
-                      Request::post(route)
-                      .abort_signal(abort_signal.as_ref())
-                  }
-                  HttpType::Put => {
-                      Request::put(route)
-                      .abort_signal(abort_signal.as_ref())
-                  }
-                };
-
-                match get_cookie_wrapper("jwt").await {
-                  Ok(jwt) => {
-                    request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
-                  },
-                  Err(_e) => {
-                  },
-                };
-
-                match method {
-                  HttpType::Get => {
-                      request_builder.send().await
-                  }
-                  HttpType::Post => {
-                      request_builder.json(form)
-                      .expect_throw("Could not parse json body").send().await
-                  }
-                  HttpType::Put => {
-                      request_builder.json(form)
-                      .expect_throw("Could not parse json body").send().await
-                  }
-                }?.json::<Response>().await.map_err(Into::into)
-
-              //  match method {
-              //      HttpType::Get => {
-              //          Request::get(&build_fetch_query(path, form))
-              //            .abort_signal(abort_signal.as_ref())
-              //            .send().await
-              //      }
-              //      HttpType::Post => {
-              //          Request::post(route)
-              //           .abort_signal(abort_signal.as_ref())
-              //           .json(form)
-              //              .expect_throw("Could not parse json body")
-              //           .send().await
-              //      }
-              //      HttpType::Put => {
-              //          Request::put(route)
+              //  let mut request_builder = match method {
+              //     HttpType::Get => {
+              //         Request::get(&build_fetch_query(path, form))
               //           .abort_signal(abort_signal.as_ref())
-              //           .json(form)
-              //              .expect_throw("Could not parse json body")
-              //           .send().await
-              //      }
-              //  }?.json::<Response>().await.map_err(Into::into)
+              //     }
+              //     HttpType::Post => {
+              //         Request::post(route)
+              //         .abort_signal(abort_signal.as_ref())
+              //     }
+              //     HttpType::Put => {
+              //         Request::put(route)
+              //         .abort_signal(abort_signal.as_ref())
+              //     }
+              //   };
+
+              //   match get_cookie_wrapper("jwt").await {
+              //     Ok(Some(jwt)) => {
+              //       request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+              //     },
+              //     _ => {
+              //     },
+              //   };
+
+              //   match method {
+              //     HttpType::Get => {
+              //         request_builder.send().await
+              //     }
+              //     HttpType::Post => {
+              //         request_builder.json(form)
+              //         .expect_throw("Could not parse json body").send().await
+              //     }
+              //     HttpType::Put => {
+              //         request_builder.json(form)
+              //         .expect_throw("Could not parse json body").send().await
+              //     }
+              //   }?.json::<Response>().await.map_err(Into::into)
+
+               match method {
+                   HttpType::Get => {
+                       Request::get(&build_fetch_query(path, form))
+                         .abort_signal(abort_signal.as_ref())
+                         .send().await
+                   }
+                   HttpType::Post => {
+                       Request::post(route)
+                        .abort_signal(abort_signal.as_ref())
+                        .json(form)
+                           .expect_throw("Could not parse json body")
+                        .send().await
+                   }
+                   HttpType::Put => {
+                       Request::put(route)
+                        .abort_signal(abort_signal.as_ref())
+                        .json(form)
+                           .expect_throw("Could not parse json body")
+                        .send().await
+                   }
+               }?.json::<Response>().await.map_err(Into::into)
            }
        }
 
diff --git a/src/lib.rs b/src/lib.rs
index 06a3885a..abf31365 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,13 +11,13 @@ use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
+mod api;
 pub mod api_service;
 mod config;
 mod errors;
 mod host;
 mod lemmy_client;
 mod ui;
-mod api;
 
 leptos_i18n::load_locales!();
 
@@ -26,6 +26,29 @@ pub fn App() -> impl IntoView {
   provide_meta_context();
   provide_i18n_context();
 
+  let authenticated = create_rw_signal::<bool>(false);
+
+  // let reso = create_resource(|| (), move |()| async move {
+  //   log!("here");
+  //   match cookie_wrapper("jwt").await {
+  //       Ok(jwt) => {
+  //         log!("here 5");
+
+  //         // auth.set(Some(Sensitive::new(jwt.clone())));
+  //         Some(Sensitive::new(jwt.clone()))
+  //         // log!("NPT {:#?}", jwt.clone());
+  //       },
+  //       Err(e) => {
+  //         log!("no auth thingy {}", e);
+  //         None
+  //       },
+  //   }
+  //   // log!("here 4");
+
+  // });
+
+  provide_context(authenticated);
+
   let (is_routing, set_is_routing) = create_signal(false);
 
   view! {
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index f8814ff6..78d83593 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,9 +1,25 @@
-use crate::i18n::*;
-use leptos::{component, create_server_action, server, view, IntoView, ServerFnError};
+use crate::{api::get_cookie_wrapper, i18n::*};
+use leptos::{
+  component,
+  create_resource,
+  create_server_action,
+  server,
+  use_context,
+  view,
+  ErrorBoundary,
+  IntoView,
+  RwSignal,
+  ServerFnError,
+  SignalGet,
+  SignalSet,
+  Suspense,
+};
 use leptos_icons::*;
 use leptos_router::*;
+#[cfg(feature = "ssr")]
+use leptos::IntoAttribute;
 
-#[server(LogoutFormFn, "/srv")]
+#[server(LogoutFormFn, "/serverfn")]
 pub async fn logout_form_fn() -> Result<(), ServerFnError> {
   use crate::api::remove_cookie_wrapper;
   use leptos_actix::redirect;
@@ -20,6 +36,29 @@ pub async fn logout_form_fn() -> Result<(), ServerFnError> {
 pub fn TopNav() -> impl IntoView {
   let i18n = use_i18n();
 
+  let authenticated = use_context::<RwSignal<bool>>().expect("still going to get an option");
+
+  let auth_resource = create_resource(
+    || (),
+    move |()| async move {
+      match get_cookie_wrapper("jwt").await {
+        Ok(Some(_jwt)) => {
+          leptos::logging::log!("sdfkvln");
+          authenticated.set(true);
+          true
+        }
+        Ok(None) => {
+          authenticated.set(false);
+          false
+        }
+        Err(_e) => {
+          authenticated.set(false);
+          false
+        }
+      }
+    },
+  );
+
   let logout_form_action = create_server_action::<LogoutFormFn>();
 
   view! {
@@ -47,11 +86,11 @@ pub fn TopNav() -> impl IntoView {
             </A>
           </li>
           <li>
-            <A href="//join-lemmy.org/donate">
+            <a href="//join-lemmy.org/donate">
               <span title=t!(i18n, nav_donate)>
                 <Icon icon=Icon::from(ChIcon::ChHeart) class="h-6 w-6"/>
               </span>
-            </A>
+            </a>
           </li>
         </ul>
       </div>
@@ -64,40 +103,61 @@ pub fn TopNav() -> impl IntoView {
               </span>
             </A>
           </li>
-          <li>
-            <A href="/login">{t!(i18n, nav_login)}</A>
-          </li>
-          <li>
-            <A href="/signup">{t!(i18n, nav_signup)}</A>
-          </li>
-          <li>
-            <A href="/inbox">
-              <span title=t!(i18n, nav_unread_messages)>
-                <Icon icon=Icon::from(ChIcon::ChBell) class="h-6 w-6"/>
-              </span>
-            </A>
-          </li>
-          <li>
-            <details>
-              <summary>"User name"</summary>
-              <ul>
-                <li>
-                  <A href="/u/jimmy90">{t!(i18n, nav_profile)}</A>
-                </li>
-                <li>
-                  <A href="/settings">{t!(i18n, nav_settings)}</A>
-                </li>
-                <li>
-                  <hr/>
-                </li>
-                <li>
-                  <ActionForm action=logout_form_action>
-                    <button type="submit">{t!(i18n, nav_logout)}</button>
-                  </ActionForm>
-                </li>
-              </ul>
-            </details>
-          </li>
+          <Suspense fallback=move || view! { <p>"Loading User"</p> }>
+            <ErrorBoundary fallback=|_| {
+                view! { <p>"Something went wrong"</p> }
+            }>
+              {move || {
+                  auth_resource
+                      .get()
+                      .map(move |x| {
+                          if !x {
+                              view! {
+                                <li>
+                                  <A href="/login">{t!(i18n, nav_login)}</A>
+                                </li>
+                                <li>
+                                  <A href="/signup">{t!(i18n, nav_signup)}</A>
+                                </li>
+                              }
+                          } else {
+                              view! {
+                                <li>
+                                  <A href="/inbox">
+                                    <span title=t!(i18n, nav_unread_messages)>
+                                      <Icon icon=Icon::from(ChIcon::ChBell) class="h-6 w-6"/>
+                                    </span>
+                                  </A>
+                                </li>
+                                <li>
+                                  <details>
+                                    <summary>"User name"</summary>
+                                    <ul>
+                                      <li>
+                                        <A href="/u/jimmy90">{t!(i18n, nav_profile)}</A>
+                                      </li>
+                                      <li>
+                                        <A href="/settings">{t!(i18n, nav_settings)}</A>
+                                      </li>
+                                      <li>
+                                        <hr/>
+                                      </li>
+                                      <li>
+                                        <ActionForm action=logout_form_action>
+                                          <button type="submit">{t!(i18n, nav_logout)}</button>
+                                        </ActionForm>
+                                      </li>
+                                    </ul>
+                                  </details>
+                                </li>
+                              }
+                          }
+                      })
+              }}
+
+            </ErrorBoundary>
+          </Suspense>
+
         </ul>
       </div>
     </nav>
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index d67fdbfb..71f0c28d 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -1,59 +1,99 @@
+// use actix_web::web;
+use lemmy_api_common::lemmy_db_views::structs::PostView;
+use lemmy_api_common::post::{GetPosts, GetPostsResponse};
 use leptos::*;
+use leptos_router::use_query_map;
+use cfg_if::cfg_if;
+use async_trait::async_trait;
+
+
+// use crate::lemmy_client::LemmyClient;
+use crate::ui::components::post::post_listings::PostListings;
+// use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
+
 
 // This is helpful:
 // https://github.com/leptos-rs/leptos/blob/main/examples/hackernews/src/routes/stories.rs
 
 #[component]
 pub fn HomeActivity() -> impl IntoView {
-  // let query = use_query_map();
-  // let page = move || {
-  //   query
-  //     .with(|q| q.get("page").and_then(|page| page.parse::<i64>().ok()))
-  //     .unwrap_or(1)
-  // };
-
-  // let posts = create_resource(page, move |page| async move {
-  //   let form = GetPosts {
-  //     type_: None,
-  //     sort: None,
-  //     community_name: None,
-  //     community_id: None,
-  //     page: Some(page),
-  //     limit: None,
-  //     saved_only: None,
-  //     disliked_only: None,
-  //     liked_only: None,
-  //     // moderator_view: None,
-  //     auth: None,
-  //   };
-  //   list_posts(&form).await.ok()
-  // });
-
-  // let err_msg = " Error loading this post.";
+  let query = use_query_map();
+  let page = move || {
+    query
+      .with(|q| q.get("page").and_then(|page| page.parse::<i64>().ok()))
+      .unwrap_or(1)
+  };
+
+  let posts = create_resource(page, move |page| async move {
+    let form = GetPosts {
+      type_: None,
+      sort: None,
+      community_name: None,
+      community_id: None,
+      page: Some(page),
+      limit: None,
+      saved_only: None,
+      disliked_only: None,
+      liked_only: None,
+      // moderator_view: None,
+      // auth: None,
+      page_cursor: None,
+    };
+
+    // let c = Client::new();
+
+    // LemmyClient::list_posts(&form).await.ok()
+    cfg_if! {
+    if #[cfg(feature = "ssr")] {
+      use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
+      use awc::Client;
+    
+      // let c: LemmyClient = awc::Client::new().into();
+
+      awc::Client::new().list_posts(&form).await.ok()
+    } else {
+      use crate::lemmy_client::Fetch;
+      use crate::lemmy_client::LemmyClient;
+      // use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
+      // use reqwest::Client;
+      // let c = Fetch::new();
+      // c.list_posts(&form).await.ok()
+      let v: Vec<PostView> = vec![];
+      Some(GetPostsResponse { next_page: None, posts: v } )
+    }
+    }
+
+    // let l = LemmyClient
+    // ::list_posts(&form).await.ok()
+    // let v: Vec<PostView> = vec![];
+    // Some(v)
+  });
+
+  let err_msg = " Error loading this post.";
 
   view! {
     <main class="mx-auto">
       <h2 class="p-6 text-4xl">"Home activity"</h2>
-    // <Suspense fallback=|| {
-    // view! { "Loading..." }
-    // }>
-    // {move || {
-    // posts()
-    // .map(|res| match res {
-    // None => {
-    // view! { <div>{err_msg}</div> }
-    // }
-    // Some(res) => {
-    // view! {
-    // <div>
-    // <PostListings posts=res.posts.into()/>
-    // </div>
-    // }
-    // }
-    // })
-    // }}
-
-    // </Suspense>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            posts.get()
+                .map(|res| match res {
+                    None => {
+                        view! { <div>{err_msg}</div> }
+                    }
+                    Some(res) => {
+                        view! {
+                          <div>
+                            <PostListings posts=res.posts.into()/>
+                          </div>
+                        }
+                    }
+                })
+        }}
+
+      </Suspense>
     </main>
   }
 }
diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index ea1cfce3..89a701fc 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -1,54 +1,53 @@
 // use actix_web::web;
+
 use lemmy_api_common::person::LoginResponse;
 use leptos::{ev, logging::*, *};
 // use leptos_actix::extract;
 use leptos_router::ActionForm;
 
-use crate::ui::components::common::password_input::PasswordInput;
-
-#[server(LoginFormFn, "/srv")]
+#[server(LoginFormFn, "/serverfn")]
 pub async fn login_form_fn(
   username: String,
   password: String,
 ) -> Result<LoginResponse, ServerFnError> {
   // use crate::lemmy_client::LemmyClient;
-  use crate::api::set_cookie_wrapper;
-  // use lemmy_api_common::person::Login;
-  use leptos_actix::redirect;
-  use crate::lemmy_client::LemmyClient;
+  use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
   use actix_web::web;
   use awc::Client;
   use lemmy_api_common::person::Login;
   // use leptos::logging::log;
   use leptos_actix::extract;
-
+  // use lemmy_api_common::person::Login;
+  use leptos_actix::redirect;
 
   let form = Login {
     username_or_email: username.into(),
     password: password.into(),
     totp_2fa_token: None,
   };
-  let result = extract(|client: web::Data<Client>| async move { client.login(&form).await }).await?;
-  // let result = login(&form).await;
-  redirect("/");
+  // let result =
+  //   extract(|client: web::Data<Client>| async move { client.login(&form).await }).await?;
+  // // let result = login(&form).await;
+  // redirect("/");
 
-  match result {
-    Ok(res) => match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
-      Ok(_) => Ok(res),
-      Err(e) => Err(ServerFnError::ServerError(e.to_string())),
-    },
-    Err(err) => Err(ServerFnError::ServerError(err.to_string())),
-  }
+  // match result {
+  //   Ok(res) => match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
+  //     Ok(_) => Ok(res),
+  //     Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+  //   },
+  //   Err(err) => Err(ServerFnError::ServerError(err.to_string())),
+  // }
+  Ok(LoginResponse { jwt: Some("()".to_string().into()), registration_created: false, verify_email_sent: false })
 }
 
 #[component]
 pub fn LoginForm() -> impl IntoView {
   let (password, set_password) = create_signal(String::new());
   let (name, set_name) = create_signal(String::new());
-  let (error, set_error) = create_signal::<Option<String>>(None);
-  let (disabled, set_disabled) = create_signal(false);
+  let (error, _set_error) = create_signal::<Option<String>>(None);
+  let (disabled, _set_disabled) = create_signal(false);
 
-  let button_is_disabled =
+  let _button_is_disabled =
     Signal::derive(move || disabled.get() || password.get().is_empty() || name.get().is_empty());
 
   let login_form_action = create_server_action::<LoginFormFn>();
@@ -97,15 +96,13 @@ pub fn LoginForm() -> impl IntoView {
         }
       />
 
-      <PasswordInput
-        id="password"
-        name="password"
-        on_input=move |s| set_password.update(|p| *p = s)
-      />
+      // <PasswordInput
+      // id="password"
+      // name="password"
+      // on_input=move |s| set_password.update(|p| *p = s)
+      // />
 
-      <button type="submit" prop:disabled=move || button_is_disabled.get()>
-        "Login"
-      </button>
+      <button type="submit">"Login"</button>
     </ActionForm>
   }
 }

From 4e9f5cfc2a633e993a182c3c974f0c58a5accabf Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Fri, 6 Oct 2023 12:47:50 +0100
Subject: [PATCH 14/16] get api calls working browser and server

---
 src/api/mod.rs                          | 237 ++++++++++++------------
 src/errors.rs                           |   8 +
 src/lemmy_client.rs                     |   3 +
 src/ui/components/common/nav.rs         |   1 -
 src/ui/components/home/home_activity.rs |  51 ++---
 src/ui/components/login/login_form.rs   |  50 ++++-
 6 files changed, 191 insertions(+), 159 deletions(-)

diff --git a/src/api/mod.rs b/src/api/mod.rs
index 0dd7e6b6..989bd0a1 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,3 +1,8 @@
+use leptos::Serializable;
+use serde::Serialize;
+use cfg_if::cfg_if;
+use serde_json::Value;
+
 use crate::errors::LemmyAppError;
 
 const ENDPOINT: &str = "https://voyager.lemmy.ml/api/v3";
@@ -8,123 +13,121 @@ pub enum HttpType {
   Put,
 }
 
-/// Used if you hit a deser error, which usually means a LemmyAPI error
-/// Of type {error: string}
-// fn json_deser_err(json: &str) -> String {
-//   serde_json::from_str(json)
-//     .map(|v: Value| v["error"].as_str().unwrap_or("Unknown").to_string())
-//     .unwrap_or("Unknown".to_string())
-// }
-
-// pub async fn api_wrapper<Response, Form>(
-//   type_: HttpType,
-//   path: &str,
-//   form: &Form,
-// ) -> Result<Response, LemmyAppError>
-// where
-//   Response: Serializable,
-//   Form: Serialize + std::fmt::Debug,
-// {
-//   let route = &build_route(path);
-//   #[allow(clippy::needless_late_init)]
-//   let json;
-
-//   cfg_if! {
-//     if #[cfg(feature = "ssr")] {
-//       let client = reqwest::Client::new();
-
-//       let mut request_builder = match type_ {
-//         HttpType::Get => client.get(&build_fetch_query(route, form)),
-//         HttpType::Post => client.post(route),
-//         HttpType::Put => client.put(route),
-//       };
-
-//       match get_cookie_wrapper("jwt").await {
-//         Ok(jwt) => {
-//           request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
-//         },
-//         Err(_) => {
-//         },
-//       };
-
-//       json = match type_ {
-//         HttpType::Get => request_builder.send().await?.text().await?,
-//         HttpType::Post => request_builder.json(form).send().await?.text().await?,
-//         HttpType::Put => request_builder.json(form).send().await?.text().await?,
-//       };
-//     } else {
-//       use wasm_bindgen::UnwrapThrowExt;
-
-//       let abort_controller = web_sys::AbortController::new().ok();
-//       let abort_signal = abort_controller.as_ref().map(|a| a.signal());
-
-//       let mut request_builder = match type_ {
-//         HttpType::Get => gloo_net::http::Request::get(&build_fetch_query(route, form)),
-//         HttpType::Post => gloo_net::http::Request::post(route),
-//         HttpType::Put => gloo_net::http::Request::put(route),
-//       };
-
-//       match get_cookie_wrapper("jwt").await {
-//         Ok(jwt) => {
-//           request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
-//         },
-//         Err(_e) => {
-//         },
-//       };
-
-//       json = match type_ {
-//         HttpType::Get => {
-//           request_builder
-//             .abort_signal(abort_signal.as_ref())
-//             .send()
-//             .await?
-//             .text()
-//             .await?
-//         }
-//         HttpType::Post => {
-//           request_builder
-//             .abort_signal(abort_signal.as_ref())
-//             .json(form)
-//             .expect_throw("Could not parse json body")
-//             .send()
-//             .await?
-//             .text()
-//             .await?
-//         }
-//         HttpType::Put => {
-//           request_builder
-//             .abort_signal(abort_signal.as_ref())
-//             .json(form)
-//             .expect_throw("Could not parse json body")
-//             .send()
-//             .await?
-//             .text()
-//             .await?
-//         }
-//       };
-
-//       leptos::on_cleanup( move || {
-//         if let Some(abort_controller) = abort_controller {
-//           abort_controller.abort()
-//         }
-//       });
-//     }
-//   }
-
-//   // Return the error response json as an error
-//   Response::de(&json).map_err(|_| LemmyAppError::APIError {
-//     error: json_deser_err(&json),
-//   })
-// }
-
-// fn build_route(route: &str) -> String {
-//   format!("{ENDPOINT}/{route}")
-// }
-
-// fn build_fetch_query<T: Serialize>(path: &str, form: T) -> String {
-//   let form_str = serde_urlencoded::to_string(&form).unwrap_or(path.to_string());
-//   format!("{path}?{form_str}")
-// }
+fn json_deser_err(json: &str) -> String {
+  serde_json::from_str(json)
+    .map(|v: Value| v["error"].as_str().unwrap_or("Unknown").to_string())
+    .unwrap_or("Unknown".to_string())
+}
+
+pub async fn api_wrapper<Response, Form>(
+  type_: HttpType,
+  path: &str,
+  form: &Form,
+) -> Result<Response, LemmyAppError>
+where
+  Response: Serializable,
+  Form: Serialize + std::fmt::Debug,
+{
+  let route = &build_route(path);
+  #[allow(clippy::needless_late_init)]
+  let json;
+
+  cfg_if! {
+    if #[cfg(feature = "ssr")] {
+      let client = reqwest::Client::new();
+
+      let mut request_builder = match type_ {
+        HttpType::Get => client.get(&build_fetch_query(route, form)),
+        HttpType::Post => client.post(route),
+        HttpType::Put => client.put(route),
+      };
+
+      match get_cookie_wrapper("jwt").await {
+        Ok(Some(jwt)) => {
+          request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+        },
+        _ => {
+        },
+      };
+
+      json = match type_ {
+        HttpType::Get => request_builder.send().await?.text().await?,
+        HttpType::Post => request_builder.json(form).send().await?.text().await?,
+        HttpType::Put => request_builder.json(form).send().await?.text().await?,
+      };
+    } else {
+      use crate::wasm_bindgen::UnwrapThrowExt;
+
+      let abort_controller = web_sys::AbortController::new().ok();
+      let abort_signal = abort_controller.as_ref().map(|a| a.signal());
+
+      let mut request_builder = match type_ {
+        HttpType::Get => gloo_net::http::Request::get(&build_fetch_query(route, form)),
+        HttpType::Post => gloo_net::http::Request::post(route),
+        HttpType::Put => gloo_net::http::Request::put(route),
+      };
+
+      match get_cookie_wrapper("jwt").await {
+        Ok(Some(jwt)) => {
+          request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+        },
+        _ => {
+        },
+      };
+
+      json = match type_ {
+        HttpType::Get => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+        HttpType::Post => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .json(form)?
+            // .expect_throw("Could not parse json body")
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+        HttpType::Put => {
+          request_builder
+            .abort_signal(abort_signal.as_ref())
+            .json(form)?
+            // .expect_throw("Could not parse json body")
+            .send()
+            .await?
+            .text()
+            .await?
+        }
+      };
+
+      leptos::on_cleanup( move || {
+        if let Some(abort_controller) = abort_controller {
+          abort_controller.abort()
+        }
+      });
+    }
+  }
+
+  // Return the error response json as an error
+  Response::de(&json).map_err(|_| LemmyAppError::APIError {
+    error: json_deser_err(&json),
+  })
+}
+
+fn build_route(route: &str) -> String {
+  format!("{ENDPOINT}/{route}")
+}
+
+fn build_fetch_query<T: Serialize>(path: &str, form: T) -> String {
+  let form_str = serde_urlencoded::to_string(&form).unwrap_or(path.to_string());
+  format!("{path}?{form_str}")
+}
 
 #[cfg(not(feature = "ssr"))]
 pub async fn get_cookie_wrapper(name: &str) -> Result<Option<String>, LemmyAppError> {
diff --git a/src/errors.rs b/src/errors.rs
index b2cc992c..d4a25d42 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -33,6 +33,14 @@ impl From<ser::Error> for LemmyAppError {
   }
 }
 
+impl From<reqwest::Error> for LemmyAppError {
+  fn from(value: reqwest::Error) -> Self {
+    Self::APIError {
+      error: value.to_string(),
+    }
+  }
+}
+
 impl From<ParseIntError> for LemmyAppError {
   fn from(_value: ParseIntError) -> Self {
     Self::ParamsError
diff --git a/src/lemmy_client.rs b/src/lemmy_client.rs
index 31620e9c..bc1f8990 100644
--- a/src/lemmy_client.rs
+++ b/src/lemmy_client.rs
@@ -7,6 +7,7 @@ use lemmy_api_common::{
   post::{GetPost, GetPostResponse, GetPosts, GetPostsResponse},
 };
 use leptos::Serializable;
+use log::logger;
 use serde::{Deserialize, Serialize};
 
 pub enum HttpType {
@@ -83,6 +84,8 @@ cfg_if! {
                   },
                 };
 
+                leptos::logging::log!("{:#?}", route);
+
                 match method {
                   HttpType::Get => request_builder.send(),
                   HttpType::Post => request_builder.send_json(form),
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index 78d83593..b9e9d914 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -43,7 +43,6 @@ pub fn TopNav() -> impl IntoView {
     move |()| async move {
       match get_cookie_wrapper("jwt").await {
         Ok(Some(_jwt)) => {
-          leptos::logging::log!("sdfkvln");
           authenticated.set(true);
           true
         }
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index 71f0c28d..3739296d 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -7,13 +7,14 @@ use cfg_if::cfg_if;
 use async_trait::async_trait;
 
 
-// use crate::lemmy_client::LemmyClient;
+use crate::api::{api_wrapper, HttpType};
+use crate::errors::LemmyAppError;
 use crate::ui::components::post::post_listings::PostListings;
-// use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
 
 
-// This is helpful:
-// https://github.com/leptos-rs/leptos/blob/main/examples/hackernews/src/routes/stories.rs
+pub async fn list_posts(form: &GetPosts) -> Result<GetPostsResponse, LemmyAppError> {
+  api_wrapper::<GetPostsResponse, GetPosts>(HttpType::Get, "post/list", form).await
+}
 
 #[component]
 pub fn HomeActivity() -> impl IntoView {
@@ -40,33 +41,21 @@ pub fn HomeActivity() -> impl IntoView {
       page_cursor: None,
     };
 
-    // let c = Client::new();
-
-    // LemmyClient::list_posts(&form).await.ok()
-    cfg_if! {
-    if #[cfg(feature = "ssr")] {
-      use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
-      use awc::Client;
-    
-      // let c: LemmyClient = awc::Client::new().into();
-
-      awc::Client::new().list_posts(&form).await.ok()
-    } else {
-      use crate::lemmy_client::Fetch;
-      use crate::lemmy_client::LemmyClient;
-      // use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
-      // use reqwest::Client;
-      // let c = Fetch::new();
-      // c.list_posts(&form).await.ok()
-      let v: Vec<PostView> = vec![];
-      Some(GetPostsResponse { next_page: None, posts: v } )
-    }
-    }
-
-    // let l = LemmyClient
-    // ::list_posts(&form).await.ok()
-    // let v: Vec<PostView> = vec![];
-    // Some(v)
+    list_posts(&form).await.ok()
+    // cfg_if! {
+    //   if #[cfg(feature = "ssr")] {
+    //     use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
+    //     use awc::Client;
+    //     awc::Client::new().list_posts(&form).await.ok()
+    //   } else {
+    //     use crate::lemmy_client::Fetch;
+    //     use crate::lemmy_client::LemmyClient;
+    //     // let c = Fetch::new();
+    //     // c.list_posts(&form).await.ok()
+    //     let v: Vec<PostView> = vec![];
+    //     Some(GetPostsResponse { next_page: None, posts: v } )
+    //   }
+    // }
   });
 
   let err_msg = " Error loading this post.";
diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index 89a701fc..345d9c34 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -1,10 +1,19 @@
 // use actix_web::web;
 
-use lemmy_api_common::person::LoginResponse;
+use lemmy_api_common::person::{LoginResponse, Login};
 use leptos::{ev, logging::*, *};
 // use leptos_actix::extract;
 use leptos_router::ActionForm;
 
+use crate::{errors::LemmyAppError, api::{api_wrapper, HttpType}};
+// use leptos::wasm_bindgen::UnwrapThrowExt;
+
+
+pub async fn login(form: &Login) -> Result<LoginResponse, LemmyAppError> {
+  api_wrapper::<LoginResponse, Login>(HttpType::Post, "user/login", form).await
+}
+
+
 #[server(LoginFormFn, "/serverfn")]
 pub async fn login_form_fn(
   username: String,
@@ -25,19 +34,24 @@ pub async fn login_form_fn(
     password: password.into(),
     totp_2fa_token: None,
   };
+  // let result: Result<LoginResponse, LemmyAppError> = Ok(LoginResponse { jwt: Some("lajdnaksdj".to_string().into()), registration_created: false, verify_email_sent: false });
   // let result =
   //   extract(|client: web::Data<Client>| async move { client.login(&form).await }).await?;
-  // // let result = login(&form).await;
+  let result = login(&form).await;
   // redirect("/");
 
-  // match result {
-  //   Ok(res) => match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
-  //     Ok(_) => Ok(res),
-  //     Err(e) => Err(ServerFnError::ServerError(e.to_string())),
-  //   },
-  //   Err(err) => Err(ServerFnError::ServerError(err.to_string())),
-  // }
-  Ok(LoginResponse { jwt: Some("()".to_string().into()), registration_created: false, verify_email_sent: false })
+  // let result = awc::Client::new().login(&form).await;
+
+  match result {
+    Ok(res) => {
+      match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
+        Ok(_) => Ok(res),
+        Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+      }
+    },
+    Err(err) => Err(ServerFnError::ServerError(err.to_string())),
+  }
+  // Ok(LoginResponse { jwt: Some("()".to_string().into()), registration_created: false, verify_email_sent: false })
 }
 
 #[component]
@@ -52,6 +66,22 @@ pub fn LoginForm() -> impl IntoView {
 
   let login_form_action = create_server_action::<LoginFormFn>();
 
+  create_effect(move |_| {
+
+    match login_form_action.value().get() {
+      None => {
+        leptos::logging::log!("none");
+      },
+      Some(Ok(o)) => {
+        leptos::logging::log!("ok");
+      },
+      Some(Err(e)) => {
+        leptos::logging::log!("error");
+      },
+    }
+
+  });
+
   view! {
     <ActionForm action=login_form_action>
       <p>"LoginForm"</p>

From 0d3adc7476776c172970f3fa496de2bb9442aeaf Mon Sep 17 00:00:00 2001
From: jim-taylor-business <jim.taylor.business@gmail.com>
Date: Fri, 6 Oct 2023 14:01:57 +0100
Subject: [PATCH 15/16] minimise warnings

---
 src/api/mod.rs                          |  11 +--
 src/lemmy_client.rs                     | 120 ++++++++++++------------
 src/lib.rs                              |  22 -----
 src/main.rs                             |   3 -
 src/ui/components/common/nav.rs         |  31 ++++--
 src/ui/components/home/home_activity.rs |  84 +++++++++--------
 src/ui/components/login/login_form.rs   |  80 +++++++---------
 7 files changed, 160 insertions(+), 191 deletions(-)

diff --git a/src/api/mod.rs b/src/api/mod.rs
index 989bd0a1..52f15a01 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,10 +1,9 @@
+use crate::errors::LemmyAppError;
+use cfg_if::cfg_if;
 use leptos::Serializable;
 use serde::Serialize;
-use cfg_if::cfg_if;
 use serde_json::Value;
 
-use crate::errors::LemmyAppError;
-
 const ENDPOINT: &str = "https://voyager.lemmy.ml/api/v3";
 
 pub enum HttpType {
@@ -56,7 +55,7 @@ where
         HttpType::Put => request_builder.json(form).send().await?.text().await?,
       };
     } else {
-      use crate::wasm_bindgen::UnwrapThrowExt;
+
 
       let abort_controller = web_sys::AbortController::new().ok();
       let abort_signal = abort_controller.as_ref().map(|a| a.signal());
@@ -88,7 +87,6 @@ where
           request_builder
             .abort_signal(abort_signal.as_ref())
             .json(form)?
-            // .expect_throw("Could not parse json body")
             .send()
             .await?
             .text()
@@ -98,7 +96,6 @@ where
           request_builder
             .abort_signal(abort_signal.as_ref())
             .json(form)?
-            // .expect_throw("Could not parse json body")
             .send()
             .await?
             .text()
@@ -274,8 +271,6 @@ pub async fn get_cookie_wrapper(path: &str) -> Result<Option<String>, LemmyAppEr
       Some(s.value().to_string())
     } else {
       None
-      // Err("no existy")
-      // "".to_string()
     }
   })
   .await
diff --git a/src/lemmy_client.rs b/src/lemmy_client.rs
index bc1f8990..11259cc6 100644
--- a/src/lemmy_client.rs
+++ b/src/lemmy_client.rs
@@ -7,7 +7,6 @@ use lemmy_api_common::{
   post::{GetPost, GetPostResponse, GetPosts, GetPostsResponse},
 };
 use leptos::Serializable;
-use log::logger;
 use serde::{Deserialize, Serialize};
 
 pub enum HttpType {
@@ -111,6 +110,7 @@ cfg_if! {
         use crate::wasm_bindgen::UnwrapThrowExt;
         use web_sys::AbortController;
         use gloo_net::http::Request;
+        use crate::api::get_cookie_wrapper;
 
         pub struct Fetch;
 
@@ -122,78 +122,74 @@ cfg_if! {
                path: &str,
                form: &Form,
            ) -> Result<Response, LemmyAppError> {
-              use crate::api::get_cookie_wrapper;
-
                let route = &build_route(path);
                let abort_controller = AbortController::new().ok();
                let abort_signal = abort_controller.as_ref().map(AbortController::signal);
 
-               // abort in-flight requests if the Scope is disposed
-               // i.e., if we've navigated away from this page
                leptos::on_cleanup( move || {
                    if let Some(abort_controller) = abort_controller {
                        abort_controller.abort()
                    }
                });
 
-              //  let mut request_builder = match method {
-              //     HttpType::Get => {
-              //         Request::get(&build_fetch_query(path, form))
-              //           .abort_signal(abort_signal.as_ref())
-              //     }
-              //     HttpType::Post => {
-              //         Request::post(route)
-              //         .abort_signal(abort_signal.as_ref())
-              //     }
-              //     HttpType::Put => {
-              //         Request::put(route)
-              //         .abort_signal(abort_signal.as_ref())
-              //     }
-              //   };
-
-              //   match get_cookie_wrapper("jwt").await {
-              //     Ok(Some(jwt)) => {
-              //       request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
-              //     },
-              //     _ => {
-              //     },
-              //   };
-
-              //   match method {
-              //     HttpType::Get => {
-              //         request_builder.send().await
-              //     }
-              //     HttpType::Post => {
-              //         request_builder.json(form)
-              //         .expect_throw("Could not parse json body").send().await
-              //     }
-              //     HttpType::Put => {
-              //         request_builder.json(form)
-              //         .expect_throw("Could not parse json body").send().await
-              //     }
-              //   }?.json::<Response>().await.map_err(Into::into)
-
-               match method {
-                   HttpType::Get => {
-                       Request::get(&build_fetch_query(path, form))
-                         .abort_signal(abort_signal.as_ref())
-                         .send().await
-                   }
-                   HttpType::Post => {
-                       Request::post(route)
-                        .abort_signal(abort_signal.as_ref())
-                        .json(form)
-                           .expect_throw("Could not parse json body")
-                        .send().await
-                   }
-                   HttpType::Put => {
-                       Request::put(route)
+               let mut request_builder = match method {
+                  HttpType::Get => {
+                      Request::get(&build_fetch_query(path, form))
                         .abort_signal(abort_signal.as_ref())
-                        .json(form)
-                           .expect_throw("Could not parse json body")
-                        .send().await
-                   }
-               }?.json::<Response>().await.map_err(Into::into)
+                  }
+                  HttpType::Post => {
+                      Request::post(route)
+                      .abort_signal(abort_signal.as_ref())
+                  }
+                  HttpType::Put => {
+                      Request::put(route)
+                      .abort_signal(abort_signal.as_ref())
+                  }
+                };
+
+                match get_cookie_wrapper("jwt").await {
+                  Ok(Some(jwt)) => {
+                    request_builder = request_builder.header("Authorization", &format!("Bearer {}", jwt)[..]);
+                  },
+                  _ => {
+                  },
+                };
+
+                match method {
+                  HttpType::Get => {
+                      request_builder.send().await
+                  }
+                  HttpType::Post => {
+                      request_builder.json(form)
+                      .expect_throw("Could not parse json body").send().await
+                  }
+                  HttpType::Put => {
+                      request_builder.json(form)
+                      .expect_throw("Could not parse json body").send().await
+                  }
+                }?.json::<Response>().await.map_err(Into::into)
+
+              //  match method {
+              //      HttpType::Get => {
+              //          Request::get(&build_fetch_query(path, form))
+              //            .abort_signal(abort_signal.as_ref())
+              //            .send().await
+              //      }
+              //      HttpType::Post => {
+              //          Request::post(route)
+              //           .abort_signal(abort_signal.as_ref())
+              //           .json(form)
+              //              .expect_throw("Could not parse json body")
+              //           .send().await
+              //      }
+              //      HttpType::Put => {
+              //          Request::put(route)
+              //           .abort_signal(abort_signal.as_ref())
+              //           .json(form)
+              //              .expect_throw("Could not parse json body")
+              //           .send().await
+              //      }
+              //  }?.json::<Response>().await.map_err(Into::into)
            }
        }
 
diff --git a/src/lib.rs b/src/lib.rs
index abf31365..ed5bde63 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,26 +27,6 @@ pub fn App() -> impl IntoView {
   provide_i18n_context();
 
   let authenticated = create_rw_signal::<bool>(false);
-
-  // let reso = create_resource(|| (), move |()| async move {
-  //   log!("here");
-  //   match cookie_wrapper("jwt").await {
-  //       Ok(jwt) => {
-  //         log!("here 5");
-
-  //         // auth.set(Some(Sensitive::new(jwt.clone())));
-  //         Some(Sensitive::new(jwt.clone()))
-  //         // log!("NPT {:#?}", jwt.clone());
-  //       },
-  //       Err(e) => {
-  //         log!("no auth thingy {}", e);
-  //         None
-  //       },
-  //   }
-  //   // log!("here 4");
-
-  // });
-
   provide_context(authenticated);
 
   let (is_routing, set_is_routing) = create_signal(false);
@@ -102,8 +82,6 @@ cfg_if! {
 
         #[wasm_bindgen]
         pub fn hydrate() {
-            // _ = console_log::init_with_level(log::Level::Debug);
-            // console_error_panic_hook::set_once();
             leptos::mount_to_body(App);
         }
     }
diff --git a/src/main.rs b/src/main.rs
index af8d1635..3dfbeee3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -63,9 +63,6 @@ cfg_if! {
         fn main() {
             use lemmy_ui_leptos::App;
             use leptos::*;
-
-            // _ = console_log::init_with_level(log::Level::Debug);
-            // console_error_panic_hook::set_once();
             mount_to_body(App)
         }
     }
diff --git a/src/ui/components/common/nav.rs b/src/ui/components/common/nav.rs
index b9e9d914..d9b44524 100644
--- a/src/ui/components/common/nav.rs
+++ b/src/ui/components/common/nav.rs
@@ -1,7 +1,11 @@
 use crate::{api::get_cookie_wrapper, i18n::*};
+#[cfg(feature = "ssr")]
+use leptos::IntoAttribute;
 use leptos::{
   component,
+  create_effect,
   create_resource,
+  create_rw_signal,
   create_server_action,
   server,
   use_context,
@@ -16,15 +20,13 @@ use leptos::{
 };
 use leptos_icons::*;
 use leptos_router::*;
-#[cfg(feature = "ssr")]
-use leptos::IntoAttribute;
 
 #[server(LogoutFormFn, "/serverfn")]
 pub async fn logout_form_fn() -> Result<(), ServerFnError> {
   use crate::api::remove_cookie_wrapper;
   use leptos_actix::redirect;
 
-  redirect("/");
+  // redirect("/");
 
   match remove_cookie_wrapper("jwt").await {
     Ok(o) => Ok(o),
@@ -36,7 +38,7 @@ pub async fn logout_form_fn() -> Result<(), ServerFnError> {
 pub fn TopNav() -> impl IntoView {
   let i18n = use_i18n();
 
-  let authenticated = use_context::<RwSignal<bool>>().expect("still going to get an option");
+  let authenticated = use_context::<RwSignal<bool>>().unwrap_or(create_rw_signal(false));
 
   let auth_resource = create_resource(
     || (),
@@ -60,6 +62,16 @@ pub fn TopNav() -> impl IntoView {
 
   let logout_form_action = create_server_action::<LogoutFormFn>();
 
+  create_effect(move |_| match logout_form_action.value().get() {
+    None => {}
+    Some(Ok(_o)) => {
+      authenticated.set(false);
+      let navigate = leptos_router::use_navigate();
+      navigate("/", Default::default());
+    }
+    Some(Err(_e)) => {}
+  });
+
   view! {
     <nav class="container navbar mx-auto">
       <div class="navbar-start">
@@ -102,15 +114,20 @@ pub fn TopNav() -> impl IntoView {
               </span>
             </A>
           </li>
-          <Suspense fallback=move || view! { <p>"Loading User"</p> }>
+          <Suspense fallback=move || {
+              view! {
+                <li></li>
+                <li></li>
+              }
+          }>
             <ErrorBoundary fallback=|_| {
                 view! { <p>"Something went wrong"</p> }
             }>
               {move || {
                   auth_resource
                       .get()
-                      .map(move |x| {
-                          if !x {
+                      .map(move |_| {
+                          if !authenticated.get() {
                               view! {
                                 <li>
                                   <A href="/login">{t!(i18n, nav_login)}</A>
diff --git a/src/ui/components/home/home_activity.rs b/src/ui/components/home/home_activity.rs
index 3739296d..78740ffe 100644
--- a/src/ui/components/home/home_activity.rs
+++ b/src/ui/components/home/home_activity.rs
@@ -1,16 +1,12 @@
 // use actix_web::web;
-use lemmy_api_common::lemmy_db_views::structs::PostView;
+use crate::{
+  api::{api_wrapper, HttpType},
+  errors::LemmyAppError,
+  ui::components::post::post_listings::PostListings,
+};
 use lemmy_api_common::post::{GetPosts, GetPostsResponse};
 use leptos::*;
 use leptos_router::use_query_map;
-use cfg_if::cfg_if;
-use async_trait::async_trait;
-
-
-use crate::api::{api_wrapper, HttpType};
-use crate::errors::LemmyAppError;
-use crate::ui::components::post::post_listings::PostListings;
-
 
 pub async fn list_posts(form: &GetPosts) -> Result<GetPostsResponse, LemmyAppError> {
   api_wrapper::<GetPostsResponse, GetPosts>(HttpType::Get, "post/list", form).await
@@ -25,38 +21,43 @@ pub fn HomeActivity() -> impl IntoView {
       .unwrap_or(1)
   };
 
-  let posts = create_resource(page, move |page| async move {
-    let form = GetPosts {
-      type_: None,
-      sort: None,
-      community_name: None,
-      community_id: None,
-      page: Some(page),
-      limit: None,
-      saved_only: None,
-      disliked_only: None,
-      liked_only: None,
-      // moderator_view: None,
-      // auth: None,
-      page_cursor: None,
-    };
+  let authenticated = use_context::<RwSignal<bool>>().unwrap_or(create_rw_signal(false));
+
+  let posts = create_resource(
+    move || (page(), authenticated()),
+    move |(page, _authenticated)| async move {
+      let form = GetPosts {
+        type_: None,
+        sort: None,
+        community_name: None,
+        community_id: None,
+        page: Some(page),
+        limit: None,
+        saved_only: None,
+        disliked_only: None,
+        liked_only: None,
+        // moderator_view: None,
+        // auth: None,
+        page_cursor: None,
+      };
 
-    list_posts(&form).await.ok()
-    // cfg_if! {
-    //   if #[cfg(feature = "ssr")] {
-    //     use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
-    //     use awc::Client;
-    //     awc::Client::new().list_posts(&form).await.ok()
-    //   } else {
-    //     use crate::lemmy_client::Fetch;
-    //     use crate::lemmy_client::LemmyClient;
-    //     // let c = Fetch::new();
-    //     // c.list_posts(&form).await.ok()
-    //     let v: Vec<PostView> = vec![];
-    //     Some(GetPostsResponse { next_page: None, posts: v } )
-    //   }
-    // }
-  });
+      list_posts(&form).await.ok()
+      // cfg_if! {
+      //   if #[cfg(feature = "ssr")] {
+      //     use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
+      //     use awc::Client;
+      //     awc::Client::new().list_posts(&form).await.ok()
+      //   } else {
+      //     use crate::lemmy_client::Fetch;
+      //     use crate::lemmy_client::LemmyClient;
+      //     // let c = Fetch::new();
+      //     // c.list_posts(&form).await.ok()
+      //     let v: Vec<PostView> = vec![];
+      //     Some(GetPostsResponse { next_page: None, posts: v } )
+      //   }
+      // }
+    },
+  );
 
   let err_msg = " Error loading this post.";
 
@@ -67,7 +68,8 @@ pub fn HomeActivity() -> impl IntoView {
           view! { "Loading..." }
       }>
         {move || {
-            posts.get()
+            posts
+                .get()
                 .map(|res| match res {
                     None => {
                         view! { <div>{err_msg}</div> }
diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index 345d9c34..3b8eb8a7 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -1,64 +1,50 @@
-// use actix_web::web;
-
-use lemmy_api_common::person::{LoginResponse, Login};
+use crate::{
+  api::{api_wrapper, HttpType},
+  errors::LemmyAppError,
+};
+use lemmy_api_common::person::{Login, LoginResponse};
 use leptos::{ev, logging::*, *};
-// use leptos_actix::extract;
 use leptos_router::ActionForm;
 
-use crate::{errors::LemmyAppError, api::{api_wrapper, HttpType}};
-// use leptos::wasm_bindgen::UnwrapThrowExt;
-
-
 pub async fn login(form: &Login) -> Result<LoginResponse, LemmyAppError> {
   api_wrapper::<LoginResponse, Login>(HttpType::Post, "user/login", form).await
 }
 
-
 #[server(LoginFormFn, "/serverfn")]
 pub async fn login_form_fn(
   username: String,
   password: String,
 ) -> Result<LoginResponse, ServerFnError> {
-  // use crate::lemmy_client::LemmyClient;
   use crate::{api::set_cookie_wrapper, lemmy_client::LemmyClient};
   use actix_web::web;
   use awc::Client;
   use lemmy_api_common::person::Login;
-  // use leptos::logging::log;
-  use leptos_actix::extract;
-  // use lemmy_api_common::person::Login;
-  use leptos_actix::redirect;
+  use leptos_actix::{extract, redirect};
 
   let form = Login {
     username_or_email: username.into(),
     password: password.into(),
     totp_2fa_token: None,
   };
-  // let result: Result<LoginResponse, LemmyAppError> = Ok(LoginResponse { jwt: Some("lajdnaksdj".to_string().into()), registration_created: false, verify_email_sent: false });
   // let result =
   //   extract(|client: web::Data<Client>| async move { client.login(&form).await }).await?;
   let result = login(&form).await;
   // redirect("/");
 
-  // let result = awc::Client::new().login(&form).await;
-
   match result {
-    Ok(res) => {
-      match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
-        Ok(_) => Ok(res),
-        Err(e) => Err(ServerFnError::ServerError(e.to_string())),
-      }
+    Ok(res) => match set_cookie_wrapper("jwt", &res.jwt.clone().unwrap().into_inner()[..]).await {
+      Ok(_) => Ok(res),
+      Err(e) => Err(ServerFnError::ServerError(e.to_string())),
     },
     Err(err) => Err(ServerFnError::ServerError(err.to_string())),
   }
-  // Ok(LoginResponse { jwt: Some("()".to_string().into()), registration_created: false, verify_email_sent: false })
 }
 
 #[component]
 pub fn LoginForm() -> impl IntoView {
   let (password, set_password) = create_signal(String::new());
   let (name, set_name) = create_signal(String::new());
-  let (error, _set_error) = create_signal::<Option<String>>(None);
+  let error = create_rw_signal::<Option<String>>(None);
   let (disabled, _set_disabled) = create_signal(false);
 
   let _button_is_disabled =
@@ -66,33 +52,33 @@ pub fn LoginForm() -> impl IntoView {
 
   let login_form_action = create_server_action::<LoginFormFn>();
 
-  create_effect(move |_| {
+  let authenticated = use_context::<RwSignal<bool>>().unwrap_or(create_rw_signal(false));
 
-    match login_form_action.value().get() {
-      None => {
-        leptos::logging::log!("none");
-      },
-      Some(Ok(o)) => {
-        leptos::logging::log!("ok");
-      },
-      Some(Err(e)) => {
-        leptos::logging::log!("error");
-      },
+  create_effect(move |_| match login_form_action.value().get() {
+    None => {}
+    Some(Ok(_o)) => {
+      authenticated.set(true);
+      let navigate = leptos_router::use_navigate();
+      navigate("/", Default::default());
+    }
+    Some(Err(e)) => {
+      error.set(Some(e.to_string()));
     }
-
   });
 
   view! {
     <ActionForm action=login_form_action>
-      <p>"LoginForm"</p>
       {move || {
           error
               .get()
               .map(|err| {
-                  view! { <p style="color:red;">{err}</p> }
+                  view! {
+                    <div class="alert shadow-lg">
+                      <span>{err}</span>
+                    </div>
+                  }
               })
       }}
-
       <input
         name="username"
         type="text"
@@ -108,8 +94,9 @@ pub fn LoginForm() -> impl IntoView {
             let val = event_target_value(&ev);
             set_name.update(|v| *v = val);
         }
-      />
 
+        class="input input-bordered"
+      />
       <input
         name="password"
         type="password"
@@ -124,15 +111,12 @@ pub fn LoginForm() -> impl IntoView {
                 }
             }
         }
-      />
-
-      // <PasswordInput
-      // id="password"
-      // name="password"
-      // on_input=move |s| set_password.update(|p| *p = s)
-      // />
 
-      <button type="submit">"Login"</button>
+        class="input input-bordered"
+      />
+      <button type="submit" class="btn">
+        "Login"
+      </button>
     </ActionForm>
   }
 }

From b54a87a7c5c6ddc2924ca4230a0506095f482997 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 6 Oct 2023 09:08:50 -0400
Subject: [PATCH 16/16] Running leptosfmt.

---
 src/ui/components/login/login_form.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ui/components/login/login_form.rs b/src/ui/components/login/login_form.rs
index 3b8eb8a7..9d37637c 100644
--- a/src/ui/components/login/login_form.rs
+++ b/src/ui/components/login/login_form.rs
@@ -113,8 +113,7 @@ pub fn LoginForm() -> impl IntoView {
         }
 
         class="input input-bordered"
-      />
-      <button type="submit" class="btn">
+      /> <button type="submit" class="btn">
         "Login"
       </button>
     </ActionForm>