diff --git a/Cargo.lock b/Cargo.lock index d62f15b..b707470 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,9 +337,9 @@ dependencies = [ [[package]] name = "codee" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af40247be877a1e3353fb406aa27ab3ef4bd3ff18cef91e75e667bfa3fde701d" +checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445" dependencies = [ "thiserror", ] @@ -988,18 +988,16 @@ dependencies = [ [[package]] name = "leptos-use" -version = "0.12.0" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268b9df23d8c68ed0518c39d6f0d3b99fcbe30190a6dce4a7e5f342027ab0033" +checksum = "293a4efcd9c2dfc003e6a9ae39763f0d07928a995d531354dbc80276a7e9d53c" dependencies = [ - "async-trait", "cfg-if", "codee", "cookie", "default-struct-builder", "futures-util", "gloo-timers", - "gloo-utils", "js-sys", "lazy_static", "leptos", @@ -1781,9 +1779,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2164,9 +2162,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", diff --git a/client/Cargo.toml b/client/Cargo.toml index b385fc0..d278a4a 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,15 +7,17 @@ authors = ["Adam Doyle "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -codee = "0.1" -console_error_panic_hook = "0.1" -console_log = "1" leptos = { version = "0.6", features = ["csr", "nightly"] } -leptos-use = "0.12" leptos_meta = { version = "0.6", features = ["csr", "nightly"] } leptos_router = { version = "0.6", features = ["csr", "nightly"] } -lib = { workspace = true } +console_error_panic_hook = "0.1" +console_log = "1" log = "0.4" + +leptos-use = "0.13" +codee = "0.2" + +lib = { workspace = true } serde_json = "1.0" [dev-dependencies] diff --git a/client/src/components/websocket.rs b/client/src/components/websocket.rs index d027c7b..334b0d4 100644 --- a/client/src/components/websocket.rs +++ b/client/src/components/websocket.rs @@ -9,7 +9,7 @@ use std::rc::Rc; pub struct WebSocketContext { pub ready_state: Signal, // pub message: Signal>, - pub send: Rc, + send: Rc, pub open: Rc, pub close: Rc, } @@ -24,6 +24,7 @@ impl WebSocketContext { ) -> Self { Self { ready_state, + // message, send, open, close, @@ -53,11 +54,11 @@ pub fn Websocket() -> impl IntoView { open, close, .. - // } = use_websocket::("wss://cards.doordesk.net/websocket"); - } = use_websocket::(url); + } = use_websocket::(url); provide_context(WebSocketContext::new( ready_state, + // message, Rc::new(send.clone()), Rc::new(open.clone()), Rc::new(close.clone()), diff --git a/server/Cargo.toml b/server/Cargo.toml index 7edef48..d44d773 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -18,4 +18,4 @@ tower = { version = "0.5", features = ["util"] } tower-http = { version = "0.5", features = ["fs", "trace", "compression-full"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -uuid = { version = "1.10", features = ["v7", "serde", "fast-rng"] } +uuid = { version = "1", features = ["v7", "serde", "fast-rng"] }