mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 19:16:08 +00:00
feat(packing): a calmer packing list, with every item's choices in one window
A row now shows its box, its name and only what is set: the amount from two up, the pieces packed while packing, and who brings it. A click on the name opens a small window at the row with the list, amount, pieces packed, weight, bag, who brings it and who sees it, each as one pill, plus copy and delete, instead of fields, a bin and menus in menus on every row. Above the lists the Lists bar keeps Add list and gathers templates, import, export, the order, hiding packed items, the bags on a narrow screen and the clean-up in one menu; the progress moves next to the Shared/My list switch. The bag overview stays. The phone follows the same shape: one "..." sheet for the list's actions, a sheet per list for its own, a slim row and an item sheet that saves as you go. Who may change what about an item lives in one module both views read.
This commit is contained in:
@@ -1,34 +1,28 @@
|
||||
import { Users, UserRound, ArrowDownAZ } from 'lucide-react'
|
||||
import { Users, UserRound, CheckCheck } from 'lucide-react'
|
||||
import type { PackingState } from './usePackingListPanel'
|
||||
|
||||
/**
|
||||
* One tab row: the three-tier view switch (Gemeinsam / Meine Liste, #858) on the
|
||||
* left, then the all/open/done filter. Each sits in its own tinted track, the way
|
||||
* the phone shows them, so the row reads as two questions (whose list, which
|
||||
* state) rather than five pills of equal weight. The A-Z switch keeps to the far
|
||||
* end in a track of its own: it changes the order, not what is listed.
|
||||
* One row above the lists: whose list (Gemeinsam / Meine Liste, #858) on the
|
||||
* left in a tinted track, and how far the packing has come on the right as a
|
||||
* line of text with a slim bar. Showing packed items and the order live in the
|
||||
* Lists menu, so the row asks one question and answers one.
|
||||
*/
|
||||
export function PackingViewTabs(S: PackingState) {
|
||||
const { view, setView, filter, setFilter, sort, setSort, t, items } = S
|
||||
const { view, setView, t, items, abgehakt, viewTotal, fortschritt } = S
|
||||
const commonCount = items.filter(i => !i.is_private).length
|
||||
const personalCount = items.filter(i => !!i.is_private).length
|
||||
|
||||
const track: React.CSSProperties = {
|
||||
display: 'inline-flex', alignItems: 'center', gap: 2, padding: 3, borderRadius: 999, background: 'var(--bg-tertiary)',
|
||||
}
|
||||
const segment = (active: boolean): React.CSSProperties => ({
|
||||
display: 'inline-flex', alignItems: 'center', gap: 6, height: 28, padding: '0 13px', borderRadius: 999,
|
||||
border: 'none', cursor: 'pointer', fontFamily: 'inherit',
|
||||
fontSize: 'calc(12.5px * var(--fs-scale-body, 1))', fontWeight: 600, transition: 'all 0.12s',
|
||||
background: active ? 'var(--text-primary)' : 'transparent',
|
||||
color: active ? 'var(--bg-primary)' : 'var(--text-muted)',
|
||||
boxShadow: active ? '0 1px 2px rgba(0,0,0,0.12)' : 'none',
|
||||
})
|
||||
|
||||
const viewPill = (id: 'common' | 'personal', icon: React.ReactNode, label: string, count: number) => {
|
||||
const active = view === id
|
||||
return (
|
||||
<button type="button" onClick={() => setView(id)} style={segment(active)}>
|
||||
<button type="button" onClick={() => setView(id)} aria-pressed={active} style={{
|
||||
display: 'inline-flex', alignItems: 'center', gap: 6, height: 28, padding: '0 13px', borderRadius: 999,
|
||||
border: 'none', cursor: 'pointer', fontFamily: 'inherit',
|
||||
fontSize: 'calc(12.5px * var(--fs-scale-body, 1))', fontWeight: 600, transition: 'all 0.12s',
|
||||
background: active ? 'var(--text-primary)' : 'transparent',
|
||||
color: active ? 'var(--bg-primary)' : 'var(--text-muted)',
|
||||
boxShadow: active ? '0 1px 2px rgba(0,0,0,0.12)' : 'none',
|
||||
}}>
|
||||
{icon}{label}
|
||||
<span style={{
|
||||
fontSize: 'calc(10px * var(--fs-scale-caption, 1))', fontWeight: 700, borderRadius: 99, padding: '0 6px',
|
||||
@@ -39,30 +33,22 @@ export function PackingViewTabs(S: PackingState) {
|
||||
)
|
||||
}
|
||||
|
||||
const filterPill = (id: string, label: string) => (
|
||||
<button type="button" key={id} onClick={() => setFilter(id)} style={segment(filter === id)}>{label}</button>
|
||||
)
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 8, padding: '10px 0 0', flexShrink: 0, flexWrap: 'wrap' }}>
|
||||
<div style={track}>
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: '10px 0 0', flexShrink: 0, flexWrap: 'wrap' }}>
|
||||
<div style={{ display: 'inline-flex', alignItems: 'center', gap: 2, padding: 3, borderRadius: 999, background: 'var(--bg-tertiary)' }}>
|
||||
{viewPill('common', <Users size={14} />, t('packing.viewCommon'), commonCount)}
|
||||
{viewPill('personal', <UserRound size={14} />, t('packing.viewPersonal'), personalCount)}
|
||||
</div>
|
||||
{items.length > 0 && (
|
||||
<div style={track}>
|
||||
{filterPill('alle', t('packing.filterAll'))}
|
||||
{filterPill('offen', t('packing.filterOpen'))}
|
||||
{filterPill('erledigt', t('packing.filterDone'))}
|
||||
</div>
|
||||
)}
|
||||
{items.length > 0 && (
|
||||
// A second click on the active switch goes back to the manual order.
|
||||
<div role="group" aria-label={t('packing.sortBy')} style={{ ...track, marginInlineStart: 'auto' }}>
|
||||
<button type="button" aria-pressed={sort === 'name'} title={t('packing.sortByName')}
|
||||
onClick={() => setSort(sort === 'name' ? 'manual' : 'name')} style={segment(sort === 'name')}>
|
||||
<ArrowDownAZ size={14} /><span className="hidden sm:inline">{t('packing.sortByName')}</span>
|
||||
</button>
|
||||
{viewTotal > 0 && (
|
||||
<div className="ms-auto inline-flex items-center gap-2.5 text-caption tabular-nums text-content-muted">
|
||||
{fortschritt === 100 ? (
|
||||
<span className="inline-flex items-center gap-1.5 font-semibold text-success"><CheckCheck size={14} strokeWidth={2.5} />{t('packing.allPacked')}</span>
|
||||
) : (
|
||||
<span>{t('packing.packedCount', { packed: abgehakt, total: viewTotal })}</span>
|
||||
)}
|
||||
<span aria-hidden className="h-1.5 w-[120px] overflow-hidden rounded-full bg-surface-tertiary">
|
||||
<span className={`block h-full rounded-full transition-[width] duration-500 ${fortschritt === 100 ? 'bg-success' : 'bg-accent'}`} style={{ width: `${fortschritt}%` }} />
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user