diff --git a/Cargo.lock b/Cargo.lock index 063adff..0c50be3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "activitypub_federation" @@ -112,12 +112,12 @@ dependencies = [ [[package]] name = "any_spawner" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9747eb01aed7603aba23f7c869d5d7e5d37aab9c3501aced42d8fdb786f1f6e3" +checksum = "41058deaa38c9d9dd933d6d238d825227cffa668e2839b52879f6619c63eee3b" dependencies = [ "futures", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "wasm-bindgen-futures", ] @@ -1644,9 +1644,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hydration_context" -version = "0.2.0-rc2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e578296c79066cdf7325259d8259b48adc311e324beecd801c43d953532c51b" +checksum = "ef13071fe13b55c85fe2b70246d2e3b49d2c6a764fd3e0edaf262cc385ff1854" dependencies = [ "futures", "js-sys", @@ -2097,9 +2097,9 @@ dependencies = [ [[package]] name = "leptos" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc41e5764d7476efb929db94c1039752ccde5bea2ad40fddaaeeb9b94493fb0d" +checksum = "ba5046c590aea121f6ad5e71fcb75453a933425d39527b9a3b1b295235afc8df" dependencies = [ "any_spawner", "base64 0.22.1", @@ -2160,9 +2160,9 @@ dependencies = [ [[package]] name = "leptos_axum" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a7318603b14939a7332555ce8fd24a043047780dc6c9820359472ec4db6251" +checksum = "7b0d388392939f629c45b8c7bcc83997cb6c6026813b57f50953651ad5be63d8" dependencies = [ "any_spawner", "axum", @@ -2184,9 +2184,9 @@ dependencies = [ [[package]] name = "leptos_config" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8f7f58ee40b2c0d7e1f0abdbf51ffd2343d281b3f16c1854c0218c152fbad8" +checksum = "5e2d64c43e2554108c26da3127f8384d92ca76c6f0b7288d1c09c8cc68152064" dependencies = [ "config", "regex", @@ -2197,9 +2197,9 @@ dependencies = [ [[package]] name = "leptos_dom" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dccedefe9054b9ca09e027801557dc82cad64cb1f1a8061b114e7f6203bbe51" +checksum = "6c15aca81dc2edd040b51c46734f65c6f36e6ba8a31347c1354c94b958044ae0" dependencies = [ "js-sys", "or_poisoned", @@ -2212,9 +2212,9 @@ dependencies = [ [[package]] name = "leptos_hot_reload" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754d861dbdaf20b6da328112b68e1b2ea2da9a157aef748f53b15fd118972b85" +checksum = "0445f3a62696d2d66bef288911af34405718880b4b8dd6c5cfb7751fd8ffcc6b" dependencies = [ "anyhow", "camino", @@ -2230,9 +2230,9 @@ dependencies = [ [[package]] name = "leptos_integration_utils" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30224324686ef508bc4a08fcfc16451410823b7d11b83325d2444221880bbbaa" +checksum = "d293a2f64a558d4ca10ef01125d055134f3582f27c407102c4259bb54ca8b55b" dependencies = [ "futures", "hydration_context", @@ -2245,9 +2245,9 @@ dependencies = [ [[package]] name = "leptos_macro" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c592d8e91148c73ee562f6d4b867d84d1995a5adb10d5a723f538b3dc173dfc" +checksum = "92f690c955274f1722ee6c66463ace79301d53a8c2bf7f6e4e61b978ca239e20" dependencies = [ "attribute-derive", "cfg-if", @@ -2267,9 +2267,9 @@ dependencies = [ [[package]] name = "leptos_meta" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d95aec94d2c28120fe702182ec83e5402b9ad2c6fccaf3dbb98d0d94bf9f908" +checksum = "7c651d788bbbf1c57ee95dd3835f9d433b85a409b6256f338c3c7146eb8b7f53" dependencies = [ "futures", "indexmap", @@ -2283,9 +2283,9 @@ dependencies = [ [[package]] name = "leptos_router" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123f2c0df5b3fd3025d1c26bc0dce1abd236409d9f031112ab5a0f871cfa6cbb" +checksum = "32a4f1784486ebf36805dac22faee21e3e610aa64b6662a7386f065eeec27ae8" dependencies = [ "any_spawner", "either_of", @@ -2308,9 +2308,9 @@ dependencies = [ [[package]] name = "leptos_router_macro" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84e0d92a7d6973682f02539b8de1f37651e72f557b1fd3f2d55460662669926" +checksum = "eee7ecef3f1c69b51864190c564e4873d84f200e44efb37934208f9525f02a5f" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -2319,9 +2319,9 @@ dependencies = [ [[package]] name = "leptos_server" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1387314dcb7f9547394a61b0cb41cdbd09e6c5dd5e154e304123f3d9b5b747b" +checksum = "93450589df3b3e398c7f5ea64d8f1c8369b1ba9b90e1f70f6cb996b8d443ca3e" dependencies = [ "any_spawner", "base64 0.22.1", @@ -2644,9 +2644,9 @@ dependencies = [ [[package]] name = "next_tuple" -version = "0.1.0-rc2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6989c5af5a391cdc1c25aad10c6fb881b6e7ebd8df7c6fb29188acb5cba576" +checksum = "60993920e071b0c9b66f14e2b32740a4e27ffc82854dcd72035887f336a09a28" [[package]] name = "nom" @@ -3314,9 +3314,9 @@ dependencies = [ [[package]] name = "reactive_graph" -version = "0.1.0-rc2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49131fcf9733a991f3485f9a0d0c9b9f65f55df4bb9f9d37203d1f82efa9513c" +checksum = "c27f54685c1416af1f323a0c40e71cbdae281a1ebc623591790d367222d0ac65" dependencies = [ "any_spawner", "async-lock", @@ -3335,9 +3335,9 @@ dependencies = [ [[package]] name = "reactive_stores" -version = "0.1.0-rc2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e722a72d10534f7613291bd2ef44cd2473ad70b2aa965d4bb7b940afb6f7257" +checksum = "efe3f866edc7647e19a68a229a2e5cc9730549836d722eeaa073116f2b07966e" dependencies = [ "guardian", "itertools 0.13.0", @@ -3350,9 +3350,9 @@ dependencies = [ [[package]] name = "reactive_stores_macro" -version = "0.1.0-rc2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37fc52b98f16d437cdf5541cf60f661596b6e84a708e02b216a7bf864fe699b" +checksum = "4d86e4f08f361b05d11422398cef4bc4cf356f2fdd2f06a96646b0e9cd902226" dependencies = [ "convert_case 0.6.0", "proc-macro-error2", @@ -3798,9 +3798,9 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed94ec81d1b9ef2b28325bcf715461d861e90f41d249b70b561c6eefcb96afe" +checksum = "033cb8014aa86a7ce0c6ee58d23dce1a078b2e320dc6c53bb439663993199b1f" dependencies = [ "axum", "bytes", @@ -3834,9 +3834,9 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7e77dd4f15d19a65019d24700963e40294b5a30c42c32bce2e532fbfe00b49" +checksum = "0249e8a55ca464a1e69f02a95d562f2c65e92e301093a02ebf15d21f68f2a99e" dependencies = [ "const_format", "convert_case 0.6.0", @@ -3848,9 +3848,9 @@ dependencies = [ [[package]] name = "server_fn_macro_default" -version = "0.7.0-rc2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295a3c3d01be1cf17d0c8b25a48b963a747f6ccdba0f62f657e8df37df4afaac" +checksum = "91c54a6d43cd0f3d2bdf0c85b6119f378b6b89d528159af9cde77f229faeecbc" dependencies = [ "server_fn_macro", "syn 2.0.87", @@ -4107,9 +4107,9 @@ dependencies = [ [[package]] name = "tachys" -version = "0.1.0-rc2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231b9e7ce516683c062dd2c8e4d30b81ae8d9a6d05f1e2a9c898e0b84ad728fe" +checksum = "8be68dfd4abf192e11a1bdd484239daa84ffa6fcd27c25cf4f011b2b0fb27ddb" dependencies = [ "any_spawner", "const_str_slice_concat", @@ -4198,9 +4198,9 @@ dependencies = [ [[package]] name = "throw_error" -version = "0.2.0-rc2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0240909e3ad4ed2dab72b2861fc9a7930110c1d3a9a0a32c6dee0a747591d10a" +checksum = "e4ef8bf264c6ae02a065a4a16553283f0656bd6266fc1fcb09fd2e6b5e91427b" dependencies = [ "pin-project-lite", ] diff --git a/Cargo.toml b/Cargo.toml index 0b2677c..0b33419 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,9 +32,9 @@ unwrap_used = "deny" # frontend and shared deps [dependencies] anyhow = "1.0.93" -leptos = "0.7.0-rc2" -leptos_meta = "0.7.0-rc2" -leptos_router = "0.7.0-rc2" +leptos = "0.7.0" +leptos_meta = "0.7.0" +leptos_router = "0.7.0" chrono = { version = "0.4.38", features = ["serde"] } hex = "0.4.3" rand = "0.8.5" @@ -88,7 +88,7 @@ diesel-derive-newtype = { version = "2.1.2" } diesel_migrations = { version = "2.2.0" } doku = { version = "0.21.1" } jsonwebtoken = { version = "9.3.0" } -leptos_axum = { version = "0.7.0-rc2" } +leptos_axum = { version = "0.7.0" } bcrypt = { version = "0.15.1" } diffy = { version = "0.4.0" } enum_delegate = { version = "0.2.0" } diff --git a/src/frontend/app.rs b/src/frontend/app.rs index 9b05eb5..ee0a410 100644 --- a/src/frontend/app.rs +++ b/src/frontend/app.rs @@ -6,12 +6,8 @@ use crate::{ dark_mode::DarkMode, pages::{ article::{ - actions::ArticleActions, - create::CreateArticle, - edit::EditArticle, - history::ArticleHistory, - list::ListArticles, - read::ReadArticle, + actions::ArticleActions, create::CreateArticle, edit::EditArticle, + history::ArticleHistory, list::ListArticles, read::ReadArticle, }, diff::EditDiff, instance::{details::InstanceDetails, list::ListInstances}, @@ -35,6 +31,8 @@ pub fn site() -> Resource { } pub fn is_logged_in() -> bool { + // TODO: this prevents crashes + // https://github.com/leptos-rs/leptos/issues/3283 //site().with_default(|site| site.my_profile.is_some()) false }