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

Better printing and state handling for shopping

Browse Source
This commit is contained in:
Jeremy Wall 2022-02-15 15:27:50 -05:00
parent 98c9a699bd
commit 31abe0e519
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/index.html
View File

@ -19,6 +19,15 @@
<head> <head>
<meta content="text/html;charset=utf-8" http-equiv="Content-Type" name="viewport" <meta content="text/html;charset=utf-8" http-equiv="Content-Type" name="viewport"
content="width=device-width, initial-scale=1.0" charset="UTF-8"> content="width=device-width, initial-scale=1.0" charset="UTF-8">
<style>
@media print {
.no-print,
.no-print * {
display: none !important;
}
}
</style>
</head> </head>
<body> <body>

41
web/src/components/shopping.rs
View File

@ -14,7 +14,10 @@
use crate::components::Recipe; use crate::components::Recipe;
use crate::console_log; use crate::console_log;
use crate::service::AppService; use crate::service::AppService;
use std::{collections::HashSet, rc::Rc}; use std::{
collections::{BTreeMap, HashSet},
rc::Rc,
};
use recipes::{Ingredient, IngredientKey}; use recipes::{Ingredient, IngredientKey};
use sycamore::{context::use_context, prelude::*}; use sycamore::{context::use_context, prelude::*};
@ -50,7 +53,7 @@ pub fn recipe_selector() -> View<G> {
app_service.get_recipes().get().iter().map(|(i, r)| (*i, r.clone())).collect::<Vec<(usize, Signal<recipes::Recipe>)>>() app_service.get_recipes().get().iter().map(|(i, r)| (*i, r.clone())).collect::<Vec<(usize, Signal<recipes::Recipe>)>>()
})); }));
view! { view! {
fieldset(class="recipe_selector") { fieldset(class="recipe_selector", class="no-print") {
Indexed(IndexedProps{ Indexed(IndexedProps{
iterable: titles, iterable: titles,
template: |(i, recipe)| { template: |(i, recipe)| {
@ -67,42 +70,50 @@ pub fn recipe_selector() -> View<G> {
fn shopping_list() -> View<G> { fn shopping_list() -> View<G> {
let app_service = use_context::<AppService>(); let app_service = use_context::<AppService>();
let filtered_keys = Signal::new(HashSet::new()); let filtered_keys = Signal::new(HashSet::new());
let filter_signal = filtered_keys.clone(); let ingredients_map = Signal::new(BTreeMap::new());
let ingredients = create_memo(move || { create_effect(cloned!((app_service, ingredients_map) => move || {
let ingredients = app_service.get_shopping_list(); ingredients_map.set(app_service.get_shopping_list());
ingredients }));
let ingredients = create_memo(cloned!((ingredients_map, filtered_keys) => move || {
ingredients_map
.get()
.iter() .iter()
.map(|(k, v)| (k.clone(), v.clone())) .map(|(k, v)| (k.clone(), v.clone()))
.filter(|(k, _v)| !filter_signal.get().contains(k)) .filter(|(k, _v)| !filtered_keys.get().contains(k))
.collect::<Vec<(IngredientKey, Ingredient)>>() .collect::<Vec<(IngredientKey, Ingredient)>>()
}); }));
// TODO(jwall): Sort by categories and names. // TODO(jwall): Sort by categories and names.
view! { view! {
h1 { "Shopping List" } h1 { "Shopping List" }
table(class="shopping_list") { input(type="button", value="Reset List", class="no-print", on:click=cloned!((ingredients_map, filtered_keys, app_service) => move |_| {
// trigger the shopping list generation
ingredients_map.set(app_service.get_shopping_list());
// clear the filter_signal
filtered_keys.set(HashSet::new());
}))
table(class="shopping_list", style="page-break-after: always;") {
tr { tr {
th { "Quantity" } th { "Quantity" }
th { "Ingredient" } th { "Ingredient" }
} }
Indexed(IndexedProps{ Indexed(IndexedProps{
iterable: ingredients, iterable: ingredients,
template: move |(k, i)| { template: cloned!((filtered_keys) => move |(k, i)| {
let amt = Signal::new(format!("{}", i.amt.normalize())); let amt = Signal::new(format!("{}", i.amt.normalize()));
// TODO(jwall): Create effect to reset this amount if it diverges.
let name = i.name; let name = i.name;
let form = i.form.map(|form| format!("({})", form)).unwrap_or_default(); let form = i.form.map(|form| format!("({})", form)).unwrap_or_default();
let filtered_keys = filtered_keys.clone();
view! { view! {
tr { tr {
td { input(bind:value=amt.clone(), type="text") } td { input(bind:value=amt.clone(), type="text") }
td {input(type="button", value="X", on:click=move |_| { td {input(type="button", class="no-print", value="X", on:click=cloned!((filtered_keys) => move |_| {
let mut keyset = (*filtered_keys.get()).clone(); let mut keyset = (*filtered_keys.get()).clone();
keyset.insert(k.clone()); keyset.insert(k.clone());
filtered_keys.set(keyset); filtered_keys.set(keyset);
}) " " (name) " " (form) } })) " " (name) " " (form) }
} }
} }
}, }),
}) })
} }
} }