Un nouvel article prend le panier ; l'icône reste modifiable depuis l'éditeur de l'article. Closes #4 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
504 lines
21 KiB
Rust
504 lines
21 KiB
Rust
use leptos::ev;
|
|
use leptos::prelude::*;
|
|
use leptos_router::hooks::use_navigate;
|
|
|
|
use super::Ctx;
|
|
use super::icons::{IconSvg, icon_label};
|
|
use crate::api::get_members;
|
|
use crate::model::{Category, Icon, Item, ItemInput, ItemOp, ListColor, Quantity, ShoppingList, Unit};
|
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
|
pub enum ItemEditor {
|
|
New,
|
|
Edit(Item),
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
|
pub enum ListEditor {
|
|
New,
|
|
Edit(ShoppingList),
|
|
}
|
|
|
|
/// Bottom sheet with a backdrop; `on_close` runs on backdrop tap or Escape.
|
|
#[component]
|
|
pub fn Sheet(title: String, on_close: impl Fn() + Copy + Send + Sync + 'static, children: Children) -> impl IntoView {
|
|
let handle = window_event_listener(ev::keydown, move |ev| {
|
|
if ev.key() == "Escape" {
|
|
on_close();
|
|
}
|
|
});
|
|
on_cleanup(move || handle.remove());
|
|
|
|
view! {
|
|
<div class="fixed inset-0 z-20 flex items-end justify-center" role="dialog" aria-modal="true">
|
|
<div class="absolute inset-0 bg-ink/50" on:click=move |_| on_close()></div>
|
|
<div class="relative max-h-[90dvh] w-full max-w-md overflow-y-auto rounded-t-3xl border-2 border-b-0 border-ink bg-paper px-5 pt-3 pb-[max(1.5rem,env(safe-area-inset-bottom))]">
|
|
<div class="mx-auto mb-4 h-1.5 w-12 rounded-full bg-ink/20"></div>
|
|
<h2 class="font-display text-2xl font-bold">{title}</h2>
|
|
{children()}
|
|
</div>
|
|
</div>
|
|
}
|
|
}
|
|
|
|
#[component]
|
|
pub fn ItemSheet(#[prop(into)] list_id: Signal<Option<i64>>) -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
move || {
|
|
let editor = ctx.item_editor.get()?;
|
|
let list_id = list_id.get()?;
|
|
Some(view! { <ItemForm editor list_id /> })
|
|
}
|
|
}
|
|
|
|
#[component]
|
|
fn ItemForm(editor: ItemEditor, list_id: i64) -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
let close = move || ctx.item_editor.set(None);
|
|
|
|
let existing = match &editor {
|
|
ItemEditor::Edit(item) => Some(item.clone()),
|
|
ItemEditor::New => None,
|
|
};
|
|
let name = RwSignal::new(existing.as_ref().map(|i| i.name.clone()).unwrap_or_default());
|
|
let amount = RwSignal::new(
|
|
existing
|
|
.as_ref()
|
|
.and_then(|i| i.quantity)
|
|
.map(|q| q.amount.to_string().replace('.', ","))
|
|
.unwrap_or_default(),
|
|
);
|
|
let unit = RwSignal::new(existing.as_ref().and_then(|i| i.quantity).map_or(Unit::Piece, |q| q.unit));
|
|
let icon = RwSignal::new(existing.as_ref().map_or(Icon::Basket, |i| i.icon));
|
|
let category = RwSignal::new(existing.as_ref().map_or(Category::Autre, |i| i.category));
|
|
let item_id = existing.as_ref().map(|i| i.id);
|
|
|
|
let invalid_amount = Memo::new(move |_| amount.with(|a| !a.trim().is_empty() && parse_amount(a).is_none()));
|
|
|
|
let submit = move |ev: ev::SubmitEvent| {
|
|
ev.prevent_default();
|
|
if invalid_amount.get() {
|
|
return;
|
|
}
|
|
let input = ItemInput {
|
|
name: name.get(),
|
|
quantity: parse_amount(&amount.get()).map(|amount| Quantity { amount, unit: unit.get() }),
|
|
icon: icon.get(),
|
|
category: category.get(),
|
|
};
|
|
ctx.change(match item_id {
|
|
Some(id) => ItemOp::Update { id, input },
|
|
None => ItemOp::Add { id: 0, list_id, input },
|
|
});
|
|
close();
|
|
};
|
|
let delete = move |_| {
|
|
if let Some(id) = item_id {
|
|
ctx.change(ItemOp::Delete { id });
|
|
close();
|
|
}
|
|
};
|
|
|
|
let title = if item_id.is_some() { "Modifier l'article" } else { "Nouvel article" };
|
|
|
|
view! {
|
|
<Sheet title=title.to_owned() on_close=close>
|
|
<form class="mt-4 flex flex-col gap-5" on:submit=submit>
|
|
<label class="flex flex-col gap-1.5">
|
|
<span class="font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">"Nom"</span>
|
|
<input
|
|
class="field"
|
|
required
|
|
maxlength="60"
|
|
autofocus
|
|
placeholder="Avocats"
|
|
bind:value=name
|
|
/>
|
|
</label>
|
|
|
|
<div class="flex flex-col gap-1.5">
|
|
<span class="font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">
|
|
"Quantité (facultatif)"
|
|
</span>
|
|
<div class="flex gap-2">
|
|
<input
|
|
class="field w-28"
|
|
inputmode="decimal"
|
|
placeholder="3"
|
|
aria-label="Quantité"
|
|
aria-invalid=move || invalid_amount.get().to_string()
|
|
bind:value=amount
|
|
/>
|
|
<select
|
|
class="field flex-1"
|
|
aria-label="Unité"
|
|
on:change=move |ev| {
|
|
if let Some(u) = Unit::parse(&event_target_value(&ev)) {
|
|
unit.set(u);
|
|
}
|
|
}
|
|
>
|
|
{Unit::ALL
|
|
.iter()
|
|
.map(|&u| {
|
|
view! {
|
|
<option value=u.as_str() selected=move || unit.get() == u>
|
|
{u.label()}
|
|
</option>
|
|
}
|
|
})
|
|
.collect_view()}
|
|
</select>
|
|
</div>
|
|
<Show when=move || invalid_amount.get()>
|
|
<p class="text-sm text-red-700">"Quantité invalide."</p>
|
|
</Show>
|
|
</div>
|
|
|
|
<fieldset class="flex flex-col gap-1.5">
|
|
<legend class="mb-1.5 font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">
|
|
"Rayon"
|
|
</legend>
|
|
<div class="flex flex-wrap gap-2">
|
|
{Category::ALL
|
|
.iter()
|
|
.map(|&c| {
|
|
view! {
|
|
<button
|
|
type="button"
|
|
class=move || {
|
|
format!(
|
|
"rounded-full border-2 px-3 py-1.5 text-sm font-semibold {} {}",
|
|
c.tile_class(),
|
|
if category.get() == c { "border-ink" } else { "border-transparent opacity-70" },
|
|
)
|
|
}
|
|
aria-pressed=move || (category.get() == c).to_string()
|
|
on:click=move |_| category.set(c)
|
|
>
|
|
{c.label()}
|
|
</button>
|
|
}
|
|
})
|
|
.collect_view()}
|
|
</div>
|
|
</fieldset>
|
|
|
|
// New items keep the basket: the icon can be changed when editing.
|
|
{item_id
|
|
.map(|_| {
|
|
view! {
|
|
<fieldset class="flex flex-col gap-1.5">
|
|
<legend class="mb-1.5 font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">
|
|
"Icône"
|
|
</legend>
|
|
<div class="grid grid-cols-6 gap-2">
|
|
{Icon::ALL
|
|
.iter()
|
|
.map(|&i| {
|
|
view! {
|
|
<button
|
|
type="button"
|
|
class=move || {
|
|
format!(
|
|
"grid aspect-square place-items-center rounded-xl border-2 {}",
|
|
if icon.get() == i {
|
|
"border-ink bg-lime"
|
|
} else {
|
|
"border-ink/10 bg-mist"
|
|
},
|
|
)
|
|
}
|
|
title=icon_label(i)
|
|
aria-label=icon_label(i)
|
|
aria-pressed=move || (icon.get() == i).to_string()
|
|
on:click=move |_| icon.set(i)
|
|
>
|
|
<IconSvg icon=i class="size-7" />
|
|
</button>
|
|
}
|
|
})
|
|
.collect_view()}
|
|
</div>
|
|
</fieldset>
|
|
}
|
|
})}
|
|
|
|
<div class="flex gap-3">
|
|
{item_id
|
|
.map(|_| {
|
|
view! {
|
|
<button
|
|
type="button"
|
|
class="rounded-2xl border-2 border-ink px-4 py-3 font-semibold"
|
|
on:click=delete
|
|
>
|
|
"Supprimer"
|
|
</button>
|
|
}
|
|
})}
|
|
<button
|
|
type="submit"
|
|
class="tile-shadow flex-1 rounded-2xl border-2 border-ink bg-pink px-4 py-3 font-display text-lg font-bold active:translate-y-1 active:shadow-none"
|
|
>
|
|
{if item_id.is_some() { "Enregistrer" } else { "Ajouter" }}
|
|
</button>
|
|
</div>
|
|
</form>
|
|
</Sheet>
|
|
}
|
|
}
|
|
|
|
/// "1,5" / "1.5" / "3" → Some; empty or non-positive → None.
|
|
fn parse_amount(text: &str) -> Option<f64> {
|
|
let value = text.trim().replace(',', ".").parse::<f64>().ok()?;
|
|
(value.is_finite() && value > 0.0).then_some(value)
|
|
}
|
|
|
|
#[component]
|
|
pub fn ListSheet() -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
move || {
|
|
ctx.list_editor.get().map(|editor| match editor {
|
|
ListEditor::Edit(list) if !list.is_owner => view! { <SharedListInfo list /> }.into_any(),
|
|
editor => view! { <ListForm editor /> }.into_any(),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[component]
|
|
fn ListForm(editor: ListEditor) -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
let navigate = use_navigate();
|
|
let close = move || ctx.list_editor.set(None);
|
|
|
|
let existing = match &editor {
|
|
ListEditor::Edit(list) => Some(list.clone()),
|
|
ListEditor::New => None,
|
|
};
|
|
let list_id = existing.as_ref().map(|l| l.id);
|
|
let name = RwSignal::new(existing.map(|l| l.name).unwrap_or_default());
|
|
let color = RwSignal::new(ListColor::Pink);
|
|
|
|
let submit = {
|
|
let navigate = navigate.clone();
|
|
move |ev: ev::SubmitEvent| {
|
|
ev.prevent_default();
|
|
match list_id {
|
|
Some(id) => ctx.mutate(crate::api::rename_list(id, name.get()), move |_| close()),
|
|
None => {
|
|
let navigate = navigate.clone();
|
|
ctx.mutate(crate::api::create_list(name.get(), color.get()), move |id| {
|
|
close();
|
|
navigate(&format!("/l/{id}"), Default::default());
|
|
})
|
|
}
|
|
}
|
|
}
|
|
};
|
|
let delete = move |_| {
|
|
let Some(id) = list_id else { return };
|
|
let confirmed = window()
|
|
.confirm_with_message("Supprimer cette liste et tous ses articles ?")
|
|
.unwrap_or(false);
|
|
if confirmed {
|
|
let navigate = navigate.clone();
|
|
ctx.mutate(crate::api::delete_list(id), move |_| {
|
|
close();
|
|
navigate("/", Default::default());
|
|
});
|
|
}
|
|
};
|
|
|
|
let title = if list_id.is_some() { "Modifier la liste" } else { "Nouvelle liste" };
|
|
|
|
view! {
|
|
<Sheet title=title.to_owned() on_close=close>
|
|
<form class="mt-4 flex flex-col gap-5" on:submit=submit>
|
|
<label class="flex flex-col gap-1.5">
|
|
<span class="font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">"Nom"</span>
|
|
<input
|
|
class="field"
|
|
required
|
|
maxlength="60"
|
|
autofocus
|
|
placeholder="Apéro de samedi"
|
|
bind:value=name
|
|
/>
|
|
</label>
|
|
|
|
<Show when=move || list_id.is_none()>
|
|
<fieldset>
|
|
<legend class="mb-1.5 font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">
|
|
"Couleur"
|
|
</legend>
|
|
<div class="flex gap-3">
|
|
{ListColor::ALL
|
|
.iter()
|
|
.map(|&c| {
|
|
view! {
|
|
<button
|
|
type="button"
|
|
class=move || {
|
|
format!(
|
|
"size-11 rounded-full border-2 {} {}",
|
|
c.dot_class(),
|
|
if color.get() == c { "border-ink ring-2 ring-ink ring-offset-2 ring-offset-paper" } else { "border-ink/40" },
|
|
)
|
|
}
|
|
aria-label=c.as_str()
|
|
aria-pressed=move || (color.get() == c).to_string()
|
|
on:click=move |_| color.set(c)
|
|
></button>
|
|
}
|
|
})
|
|
.collect_view()}
|
|
</div>
|
|
</fieldset>
|
|
</Show>
|
|
|
|
<div class="flex gap-3">
|
|
{list_id
|
|
.map(|_| {
|
|
view! {
|
|
<button
|
|
type="button"
|
|
class="rounded-2xl border-2 border-ink px-4 py-3 font-semibold"
|
|
on:click=delete
|
|
>
|
|
"Supprimer"
|
|
</button>
|
|
}
|
|
})}
|
|
<button
|
|
type="submit"
|
|
class="tile-shadow flex-1 rounded-2xl border-2 border-ink bg-pink px-4 py-3 font-display text-lg font-bold active:translate-y-1 active:shadow-none"
|
|
>
|
|
{if list_id.is_some() { "Enregistrer" } else { "Créer" }}
|
|
</button>
|
|
</div>
|
|
</form>
|
|
{list_id.map(|list_id| view! { <SharePanel list_id /> })}
|
|
</Sheet>
|
|
}
|
|
}
|
|
|
|
/// Owner view: who the list is shared with, and share it by email.
|
|
#[component]
|
|
fn SharePanel(list_id: i64) -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
let version = RwSignal::new(0);
|
|
let members = Resource::new(move || version.get(), move |_| get_members(list_id));
|
|
let email = RwSignal::new(String::new());
|
|
let bump = move || version.update(|v| *v += 1);
|
|
|
|
let share = move |ev: ev::SubmitEvent| {
|
|
ev.prevent_default();
|
|
ctx.mutate(crate::api::share_list(list_id, email.get()), move |_| {
|
|
email.set(String::new());
|
|
bump();
|
|
});
|
|
};
|
|
|
|
view! {
|
|
<section class="mt-6 border-t-2 border-dashed border-ink/15 pt-5">
|
|
<h3 class="font-mono text-xs tracking-[0.2em] text-ink/60 uppercase">"Partagée avec"</h3>
|
|
<Transition fallback=|| view! { <p class="mt-2 text-ink/50">"…"</p> }>
|
|
{move || Suspend::new(async move {
|
|
let members = members.await.unwrap_or_default();
|
|
if members.is_empty() {
|
|
return view! { <p class="mt-2 text-ink/60">"Personne pour l'instant."</p> }.into_any();
|
|
}
|
|
view! {
|
|
<ul class="mt-2 flex flex-col gap-2">
|
|
{members
|
|
.into_iter()
|
|
.map(|member| {
|
|
let user_id = member.user_id;
|
|
view! {
|
|
<li class="flex items-center justify-between gap-3 rounded-xl bg-mist px-3 py-2">
|
|
<div class="min-w-0">
|
|
<p class="truncate font-semibold">{member.name}</p>
|
|
<p class="truncate text-sm text-ink/60">{member.email}</p>
|
|
</div>
|
|
<button
|
|
type="button"
|
|
class="shrink-0 rounded-lg px-2 py-1 text-sm font-semibold underline"
|
|
on:click=move |_| {
|
|
ctx.mutate(crate::api::remove_member(list_id, user_id), move |_| bump())
|
|
}
|
|
>
|
|
"Retirer"
|
|
</button>
|
|
</li>
|
|
}
|
|
})
|
|
.collect_view()}
|
|
</ul>
|
|
}
|
|
.into_any()
|
|
})}
|
|
</Transition>
|
|
<form class="mt-3 flex gap-2" on:submit=share>
|
|
<input
|
|
class="field min-w-0 flex-1"
|
|
type="email"
|
|
required
|
|
placeholder="email@exemple.fr"
|
|
aria-label="Email de la personne"
|
|
bind:value=email
|
|
/>
|
|
<button type="submit" class="shrink-0 rounded-2xl border-2 border-ink bg-lime px-4 font-semibold">
|
|
"Partager"
|
|
</button>
|
|
</form>
|
|
</section>
|
|
}
|
|
}
|
|
|
|
/// Member view of a list someone shared: who owns it, and leave it.
|
|
#[component]
|
|
fn SharedListInfo(list: ShoppingList) -> impl IntoView {
|
|
let ctx = expect_context::<Ctx>();
|
|
let navigate = use_navigate();
|
|
let close = move || ctx.list_editor.set(None);
|
|
let list_id = list.id;
|
|
|
|
let leave = move |_| {
|
|
let confirmed = window().confirm_with_message("Quitter cette liste ?").unwrap_or(false);
|
|
if confirmed {
|
|
let navigate = navigate.clone();
|
|
ctx.mutate(crate::api::remove_member(list_id, ctx.user_id), move |_| {
|
|
close();
|
|
navigate("/", Default::default());
|
|
});
|
|
}
|
|
};
|
|
|
|
view! {
|
|
<Sheet title=list.name.clone() on_close=close>
|
|
<p class="mt-1 text-ink/70">{format!("Liste de {}, partagée avec toi.", list.owner_name)}</p>
|
|
<button
|
|
type="button"
|
|
class="mt-6 w-full rounded-2xl border-2 border-ink px-4 py-3 font-semibold"
|
|
on:click=leave
|
|
>
|
|
"Quitter la liste"
|
|
</button>
|
|
</Sheet>
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::parse_amount;
|
|
|
|
#[test]
|
|
fn parses_amounts() {
|
|
assert_eq!(parse_amount("1,5"), Some(1.5));
|
|
assert_eq!(parse_amount(" 3 "), Some(3.0));
|
|
assert_eq!(parse_amount("0"), None);
|
|
assert_eq!(parse_amount("abc"), None);
|
|
}
|
|
}
|