zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move our route matcher into a function

Browse Source
This commit is contained in:
Jeremy Wall 2022-02-10 17:11:27 -05:00
parent 11dcf7e26d
commit 1b969f9355
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
web/src/web.rs
View File

@ -1,3 +1,5 @@
use std::rc::Rc;
// Copyright 2022 Jeremy Wall
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -33,12 +35,29 @@ enum AppRoutes {
NotFound,
}
fn route_switch<G: Html>(route: ReadSignal<AppRoutes>) -> View<G> {
view! {
(match route.get().as_ref() {
AppRoutes::Root => view! {
Start()
},
AppRoutes::Recipe { index: idx } => view! {
RecipeView(*idx)
},
AppRoutes::Menu => view! {
"TODO!!"
},
AppRoutes::NotFound => view! {
"NotFound"
},
})
}
}
#[component(UI<G>)]
pub fn ui() -> View<G> {
let app_service = AppService::new();
console_log!("Starting UI");
// TODO(jwall): We need to ensure that this happens before
// we render the UI below.
view! {
// NOTE(jwall): Set the app_service in our toplevel scope. Children will be able
// to find the service as long as they are a child of this scope.
@ -58,23 +77,7 @@ pub fn ui() -> View<G> {
Err(msg) => console_error!("Failed to get recipes {}", msg),
}
console_debug!("Determining route.");
let route = routes.get();
console_debug!("Route {:?}", route);
let t = match route.as_ref() {
AppRoutes::Root => view! {
Start()
},
AppRoutes::Recipe{index:idx} => view! {
RecipeView(*idx)
},
AppRoutes::Menu => view! {
"TODO!!"
},
AppRoutes::NotFound => view! {
"NotFound"
}
};
view.set(t);
view.set(route_switch(routes));
console_debug!("Created our route view effect.");
}
}));