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

Represent the recipe state better

Browse Source
This commit is contained in:
Jeremy Wall 2022-01-26 19:15:43 -05:00
parent 74b432ad24
commit db62d63965
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/src/web.rs
View File

@ -21,7 +21,7 @@ use recipes::{parse, Recipe};
#[derive(Clone)] #[derive(Clone)]
struct AppService { struct AppService {
recipes: Signal<Vec<Recipe>>, recipes: Signal<Vec<(usize, Recipe)>>,
} }
impl AppService { impl AppService {
@ -31,7 +31,7 @@ impl AppService {
} }
} }
async fn fetch_recipes() -> Result<Vec<Recipe>, String> { async fn fetch_recipes() -> Result<Vec<(usize, Recipe)>, String> {
let resp = match http::Request::get("/api/v1/recipes").send().await { let resp = match http::Request::get("/api/v1/recipes").send().await {
Ok(resp) => resp, Ok(resp) => resp,
Err(e) => return Err(format!("Error: {}", e)), Err(e) => return Err(format!("Error: {}", e)),
@ -56,15 +56,15 @@ impl AppService {
console_debug!("We parsed a recipe {}", recipe.title); console_debug!("We parsed a recipe {}", recipe.title);
parsed_list.push(recipe); parsed_list.push(recipe);
} }
return Ok(parsed_list); return Ok(parsed_list.drain(0..).enumerate().collect());
} }
} }
fn get_recipes(&self) -> Signal<Vec<Recipe>> { fn get_recipes(&self) -> Signal<Vec<(usize, Recipe)>> {
self.recipes.clone() self.recipes.clone()
} }
fn set_recipes(&mut self, recipes: Vec<Recipe>) { fn set_recipes(&mut self, recipes: Vec<(usize, Recipe)>) {
self.recipes.set(recipes); self.recipes.set(recipes);
} }
} }
@ -74,13 +74,19 @@ impl AppService {
fn recipe_list() -> View<G> { fn recipe_list() -> View<G> {
let app_service = use_context::<AppService>(); let app_service = use_context::<AppService>();
let titles = create_memo(cloned!(app_service => move || {
app_service.get_recipes().get().iter().map(|(i, r)| (*i, r.title.clone())).collect::<Vec<(usize, String)>>()
}));
view! { view! {
ul { ul {
Indexed(IndexedProps{ Keyed(KeyedProps{
iterable: app_service.get_recipes().handle(), iterable: titles,
template: |recipe| { template: |(i, title)| {
view! { li { (recipe.title) } } view! { li(on:click=move |_| {
} console_log!("clicked item with index: {}", i)
}) { (title) } }
},
key: |(i, title)| (*i, title.clone()),
}) })
} }
} }