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

Adding to the shoping list works.

Browse Source
This commit is contained in:
Jeremy Wall 2022-05-06 21:18:39 -04:00
parent d1f16afb93
commit a0d8c07a4b
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
web/src/components/shopping_list.rs
View File

@ -15,6 +15,7 @@ use crate::service::AppService;
use std::collections::HashMap;
use std::collections::{BTreeMap, HashSet};
use crate::console_debug;
use sycamore::{context::use_context, prelude::*};
#[component(ShoppingList<G>)]
@ -22,10 +23,12 @@ pub fn shopping_list() -> View<G> {
let app_service = use_context::<AppService>();
let filtered_keys = Signal::new(HashSet::new());
let ingredients_map = Signal::new(BTreeMap::new());
let extras = Signal::new(Vec::<(usize, (Signal<String>, Signal<String>))>::new());
let modified_amts = Signal::new(HashMap::new());
create_effect(cloned!((app_service, ingredients_map) => move || {
ingredients_map.set(app_service.get_shopping_list());
}));
console_debug!("Ingredients map: {:?}", ingredients_map.get_untracked());
let ingredients = create_memo(cloned!((ingredients_map, filtered_keys) => move || {
let mut ingredients = Vec::new();
// This has the effect of sorting the ingredients by category
@ -38,10 +41,11 @@ pub fn shopping_list() -> View<G> {
}
ingredients
}));
console_debug!("Ingredients: {:?}", ingredients.get_untracked());
let table_view = Signal::new(View::empty());
create_effect(
cloned!((table_view, ingredients, filtered_keys, modified_amts) => move || {
if ingredients.get().len() > 0 {
cloned!((table_view, ingredients, filtered_keys, modified_amts, extras) => move || {
if (ingredients.get().len() > 0) || (extras.get().len() > 0) {
let t = view ! {
table(class="pad-top shopping-list page-breaker container-fluid", role="grid") {
tr {
@ -50,7 +54,8 @@ pub fn shopping_list() -> View<G> {
th { " Ingredient " }
th { " Recipes " }
}
tbody {Indexed(IndexedProps{
tbody {
Indexed(IndexedProps{
iterable: ingredients.clone(),
template: cloned!((filtered_keys, modified_amts) => move |(k, (i, rs))| {
let mut modified_amt_set = (*modified_amts.get()).clone();
@ -77,7 +82,33 @@ pub fn shopping_list() -> View<G> {
}
}
}),
})}
})
Indexed(IndexedProps{
iterable: extras.handle(),
template: cloned!((extras) => move |(idx, (amt, name))| {
view! {
tr {
td {
input(bind:value=amt.clone(), type="text")
}
td {
input(type="button", class="no-print destructive", value="X", on:click=cloned!((extras) => move |_| {
extras.set(extras.get().iter()
.filter(|(i, _)| *i != idx)
.map(|(_, v)| v.clone())
.enumerate()
.collect())
}))
}
td {
input(bind:value=name.clone(), type="text")
}
td { "Misc" }
}
}
})
})
}
}
};
table_view.set(t);
@ -89,11 +120,18 @@ pub fn shopping_list() -> View<G> {
view! {
h1 { "Shopping List " }
(table_view.get().as_ref().clone())
input(type="button", value="Reset", class="no-print", on:click=cloned!((ingredients_map, filtered_keys, app_service, modified_amts) => move |_| {
input(type="button", value="Add Item", class="no-print", on:click=cloned!((extras) => move |_| {
let mut cloned_extras: Vec<(Signal<String>, Signal<String>)> = (*extras.get()).iter().map(|(_, v)| v.clone()).collect();
cloned_extras.push((Signal::new("".to_owned()), Signal::new("".to_owned())));
extras.set(cloned_extras.drain(0..).enumerate().collect());
}))
input(type="button", value="Reset", class="no-print", on:click=cloned!((ingredients_map, filtered_keys, app_service, modified_amts, extras) => move |_| {
// TODO(jwall): We should actually pop up a modal here or use a different set of items.
ingredients_map.set(app_service.get_shopping_list());
// clear the filter_signal
filtered_keys.set(HashSet::new());
modified_amts.set(HashMap::new());
extras.set(Vec::new());
}))
}
}

3
web/src/service.rs
View File

@ -31,6 +31,7 @@ pub struct AppService {
impl AppService {
pub fn new() -> Self {
let mut category_map = BTreeMap::new();
Self {
recipes: Signal::new(Vec::new()),
staples: Signal::new(None),
@ -206,7 +207,7 @@ impl AppService {
.push((i.clone(), recipes.clone()));
}
});
console_debug!("{:?}", self.category_map);
console_debug!("Category map {:?}", self.category_map);
// FIXM(jwall): Sort by categories and names.
groups
}