diff --git a/Cargo.lock b/Cargo.lock index e42b35c..3112917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "any_spawner" version = "0.1.1" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "futures", "thiserror", @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "const_str_slice_concat" version = "0.1.0" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" [[package]] name = "convert_case" @@ -313,41 +313,6 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "dashmap" version = "6.0.1" @@ -362,18 +327,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "default-struct-builder" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa90da96b8fd491f5754d1f7a731f73921e3b7aa0ce333c821a0e43666ac14" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "derive-where" version = "1.2.7" @@ -400,7 +353,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "either_of" version = "0.1.0" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "pin-project-lite", ] @@ -677,8 +630,8 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hydration_context" -version = "0.2.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.2.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "futures", "js-sys", @@ -724,12 +677,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -794,8 +741,8 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leptos" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "base64", @@ -829,31 +776,14 @@ dependencies = [ "web-sys", ] -[[package]] -name = "leptos-use" -version = "0.12.0" -source = "git+https://github.com/Synphonyte/leptos-use.git?branch=leptos-0.7#041bc7225429074d7759785f4e8e2c5090acf5a2" -dependencies = [ - "cfg-if", - "default-struct-builder", - "js-sys", - "lazy_static", - "leptos", - "paste", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "leptos_axum" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "axum", + "dashmap", "futures", "http", "http-body-util", @@ -863,6 +793,7 @@ dependencies = [ "leptos_macro", "leptos_meta", "leptos_router", + "once_cell", "parking_lot", "serde_json", "server_fn", @@ -873,8 +804,8 @@ dependencies = [ [[package]] name = "leptos_config" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "config", "regex", @@ -885,8 +816,8 @@ dependencies = [ [[package]] name = "leptos_dom" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "js-sys", "or_poisoned", @@ -899,8 +830,8 @@ dependencies = [ [[package]] name = "leptos_hot_reload" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "anyhow", "camino", @@ -916,8 +847,8 @@ dependencies = [ [[package]] name = "leptos_integration_utils" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "futures", "hydration_context", @@ -930,8 +861,8 @@ dependencies = [ [[package]] name = "leptos_macro" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "attribute-derive", "cfg-if", @@ -951,8 +882,8 @@ dependencies = [ [[package]] name = "leptos_meta" -version = "0.7.0-beta3" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "futures", "indexmap", @@ -966,8 +897,8 @@ dependencies = [ [[package]] name = "leptos_router" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "either_of", @@ -982,6 +913,7 @@ dependencies = [ "percent-encoding", "reactive_graph", "send_wrapper", + "serde", "tachys", "thiserror", "url", @@ -991,8 +923,8 @@ dependencies = [ [[package]] name = "leptos_router_macro" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1001,8 +933,8 @@ dependencies = [ [[package]] name = "leptos_server" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "base64", @@ -1141,8 +1073,8 @@ dependencies = [ [[package]] name = "next_tuple" -version = "0.1.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.1.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" [[package]] name = "nom" @@ -1166,7 +1098,7 @@ dependencies = [ [[package]] name = "oco_ref" version = "0.2.0" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "serde", "thiserror", @@ -1181,7 +1113,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "or_poisoned" version = "0.1.0" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" [[package]] name = "parking" @@ -1411,8 +1343,8 @@ dependencies = [ [[package]] name = "reactive_graph" -version = "0.1.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.1.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "async-lock", @@ -1606,8 +1538,8 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "axum", "bytes", @@ -1641,8 +1573,8 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "const_format", "convert_case", @@ -1654,8 +1586,8 @@ dependencies = [ [[package]] name = "server_fn_macro_default" -version = "0.7.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.7.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "server_fn_macro", "syn", @@ -1707,12 +1639,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "syn" version = "2.0.77" @@ -1750,8 +1676,8 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "tachys" -version = "0.1.0-beta3" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.1.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "any_spawner", "const_str_slice_concat", @@ -1801,8 +1727,8 @@ dependencies = [ [[package]] name = "throw_error" -version = "0.2.0-beta2" -source = "git+https://github.com/leptos-rs/leptos#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9" +version = "0.2.0-beta4" +source = "git+https://github.com/christopherbiscardi/leptos?branch=0.7-cdn#3c33028a2976f37a174151779cbd1d11a2e6197c" dependencies = [ "pin-project-lite", ] @@ -2289,7 +2215,6 @@ dependencies = [ "console_error_panic_hook", "http", "leptos", - "leptos-use", "leptos_axum", "leptos_meta", "leptos_router", diff --git a/crates/www/Cargo.toml b/crates/www/Cargo.toml index 750c147..d90e0c0 100644 --- a/crates/www/Cargo.toml +++ b/crates/www/Cargo.toml @@ -7,22 +7,37 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -leptos-use = { git = "https://github.com/Synphonyte/leptos-use.git", branch = "leptos-0.7", default-features = false, features = [ - "use_scroll", - "use_window", - "use_event_listener", -] } -leptos_meta = { git = "https://github.com/leptos-rs/leptos" } -axum = { version = "0.7", optional = true } -console_error_panic_hook = "0.1" -leptos = { git = "https://github.com/leptos-rs/leptos", features = [ +# leptos-use = { git = "https://github.com/Synphonyte/leptos-use.git", branch = "leptos-0.7", default-features = false, features = [ +# "use_scroll", +# "use_window", +# "use_event_listener", +# ] } +# leptos-use = { git = "https://github.com/christopherbiscardi/leptos-use.git", branch = "leptos-beta4", default-features = false, features = [ +# "use_scroll", +# "use_window", +# "use_event_listener", +# ] } +# leptos_meta = { git = "https://github.com/leptos-rs/leptos" } +# leptos = { git = "https://github.com/leptos-rs/leptos", features = [ +# "nightly", +# "experimental-islands", +# ] } +# leptos_axum = { git = "https://github.com/leptos-rs/leptos", optional = true } +# leptos_router = { git = "https://github.com/leptos-rs/leptos", features = [ +# "nightly", +# ] } +leptos_meta = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn" } +leptos = { git = "https://github.com/christopherbiscardi/leptos", features = [ "nightly", "experimental-islands", -] } -leptos_axum = { git = "https://github.com/leptos-rs/leptos", optional = true } -leptos_router = { git = "https://github.com/leptos-rs/leptos", features = [ +], branch = "0.7-cdn" } +leptos_axum = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", optional = true } +leptos_router = { git = "https://github.com/christopherbiscardi/leptos", branch = "0.7-cdn", features = [ "nightly", ] } +axum = { version = "0.7", optional = true } +console_error_panic_hook = "0.1" + tokio = { version = "1", features = ["rt-multi-thread"], optional = true } tower = { version = "0.4", optional = true } tower-http = { version = "0.5", features = ["fs"], optional = true } @@ -31,7 +46,6 @@ thiserror = "1" tracing = { version = "0.1", optional = true } http = "1" - [features] hydrate = ["leptos/hydrate"] ssr = [ diff --git a/crates/www/src/app.rs b/crates/www/src/app.rs index 14b7837..85c0875 100644 --- a/crates/www/src/app.rs +++ b/crates/www/src/app.rs @@ -1,8 +1,7 @@ use crate::{components::*, routes::index::IndexPage}; use leptos::prelude::*; use leptos_meta::{ - provide_meta_context, HashedStylesheet, MetaTags, - Stylesheet, Title, + provide_meta_context, HashedStylesheet, MetaTags, Title, }; use leptos_router::{ components::{Route, Router, Routes}, @@ -10,6 +9,7 @@ use leptos_router::{ }; pub fn shell(options: LeptosOptions) -> impl IntoView { + let root = std::env::var("CDN_PATH").unwrap(); view! { @@ -22,7 +22,7 @@ pub fn shell(options: LeptosOptions) -> impl IntoView { - + @@ -36,11 +36,11 @@ pub fn App() -> impl IntoView { // Provides context that manages stylesheets, // titles, meta tags, etc. provide_meta_context(); - + // view! { - <ProgressBar/> + <Router> <main class="relative textured-bg"> diff --git a/crates/www/src/components.rs b/crates/www/src/components.rs index 8762309..61bd4ec 100644 --- a/crates/www/src/components.rs +++ b/crates/www/src/components.rs @@ -1,6 +1,6 @@ pub mod button; pub mod footer; -pub mod progress_bar; +// pub mod progress_bar; pub use footer::Footer; -pub use progress_bar::ProgressBar; +// pub use progress_bar::ProgressBar;