From 85e388455a09e307fea14e4c98ece65c463b7773 Mon Sep 17 00:00:00 2001 From: Baitinq Date: Sun, 30 Oct 2022 17:13:41 +0100 Subject: Frontend: Update yew to follow master This enables us to use the new Router API --- frontend/Cargo.toml | 5 +++-- frontend/src/app.rs | 2 +- frontend/src/main.rs | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'frontend') diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml index 7cc9e0b..3730022 100644 --- a/frontend/Cargo.toml +++ b/frontend/Cargo.toml @@ -6,8 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -yew = "0.19" -yew-router = "0.16" +# this is the development version of Yew +yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] } +yew-router = { git = "https://github.com/yewstack/yew.git" } gloo = "0.8.0" web-sys = "0.3.60" wasm-bindgen = "0.2.83" diff --git a/frontend/src/app.rs b/frontend/src/app.rs index a1f63de..d98b955 100644 --- a/frontend/src/app.rs +++ b/frontend/src/app.rs @@ -82,7 +82,7 @@ impl Component for OSSE { } fn view(&self, ctx: &Context) -> Html { - let onsubmit = ctx.link().callback(|event: FocusEvent| { + let onsubmit = ctx.link().callback(|event: SubmitEvent| { event.prevent_default(); OSSEMessage::SearchSubmitted diff --git a/frontend/src/main.rs b/frontend/src/main.rs index 95b52e5..fd5ef3c 100644 --- a/frontend/src/main.rs +++ b/frontend/src/main.rs @@ -13,7 +13,7 @@ enum Route { OSSESearch { query: String }, } -fn switch_routes(routes: &Route) -> Html { +fn switch_routes(routes: Route) -> Html { match routes { Route::OSSEHome => html! { @@ -29,12 +29,12 @@ fn yew_app() -> Html { html! { <> - render={Switch::render(switch_routes)} /> + render={switch_routes} /> } } fn main() { - yew::start_app::(); + yew::Renderer::::new().render(); } -- cgit 1.4.1