UI: Modal-Basis + Confirm-Infrastruktur + Feierabend-Tagesabschluss
Fundament für Paket B (UI/UX-Härtung):
- Modal: barrierearmer Basis-Dialog (role/aria-modal, Fokus-Trap, Escape,
Fokus-Rückgabe, Body-Scroll-Lock, Portal). Basis für alle App-Dialoge.
- ConfirmProvider/useConfirm: imperative Bestaetigung (await confirm({...}))
statt window.confirm(); wird als Naechstes an die Loeschpfade gehaengt.
- Feierabend-Dialog: Tagesabschluss mit Zusammenfassung (erledigt/offen/
verworfen) + Hinweis auf offene/unreflektierte ToDos und fehlende Reflexion.
Check-Out feuert erst nach Bestaetigung; bleibt reversibel.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
7285ed9cae
commit
00b611fa3b
4 files changed
+325
-29
No files matched your search
+142
-27
@@ -4,6 +4,7 @@ import { trpc } from '../lib/trpc';
|
||||
import { voice } from '../lib/voice';
|
||||
import { Card } from '../components/ui/Card';
|
||||
import { Button } from '../components/ui/Button';
|
||||
import { Modal } from '../components/ui/Modal';
|
||||
import { SkeletonCard } from '../components/ui/SkeletonCard';
|
||||
import { toast } from 'sonner';
|
||||
import { X, Plus, RotateCw, BellRing, Play, Clock, Check, LogOut } from 'lucide-react';
|
||||
@@ -320,13 +321,19 @@ function AddTodoInline() {
|
||||
function CheckInOutBar({
|
||||
checkedInAt,
|
||||
checkedOutAt,
|
||||
todos,
|
||||
reflected,
|
||||
}: {
|
||||
checkedInAt: string | Date | null;
|
||||
checkedOutAt: string | Date | null;
|
||||
todos: Array<{ id: string; title: string; status: 'open' | 'done' | 'dropped' }>;
|
||||
reflected: boolean;
|
||||
}) {
|
||||
const utils = trpc.useUtils();
|
||||
const [confirmOpen, setConfirmOpen] = useState(false);
|
||||
const checkOut = trpc.dayEntry.checkOut.useMutation({
|
||||
onSuccess: async () => {
|
||||
setConfirmOpen(false);
|
||||
toast('Feierabend — Check-Out gespeichert.');
|
||||
await utils.dayEntry.today.invalidate();
|
||||
await utils.dashboard.overview.invalidate();
|
||||
@@ -356,38 +363,141 @@ function CheckInOutBar({
|
||||
: null;
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-x-3 gap-y-1 rounded-[var(--radius-md)] border border-[var(--color-border)] px-4 py-2 text-sm">
|
||||
<span>
|
||||
Arbeitsantritt <span className="font-mono">{hhmm(checkedInAt)}</span>
|
||||
</span>
|
||||
{checkedOutAt ? (
|
||||
<>
|
||||
<span className="text-[var(--color-ink-muted)]">
|
||||
· Feierabend <span className="font-mono">{hhmm(checkedOutAt)}</span>
|
||||
{duration && ` · ${duration}`}
|
||||
</span>
|
||||
<>
|
||||
<div className="flex flex-wrap items-center gap-x-3 gap-y-1 rounded-[var(--radius-md)] border border-[var(--color-border)] px-4 py-2 text-sm">
|
||||
<span>
|
||||
Arbeitsantritt <span className="font-mono">{hhmm(checkedInAt)}</span>
|
||||
</span>
|
||||
{checkedOutAt ? (
|
||||
<>
|
||||
<span className="text-[var(--color-ink-muted)]">
|
||||
· Feierabend <span className="font-mono">{hhmm(checkedOutAt)}</span>
|
||||
{duration && ` · ${duration}`}
|
||||
</span>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
className="ml-auto"
|
||||
disabled={reopen.isPending}
|
||||
onClick={() => reopen.mutate()}
|
||||
>
|
||||
<Play size={14} /> Arbeit fortsetzen
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
variant="secondary"
|
||||
className="ml-auto"
|
||||
disabled={reopen.isPending}
|
||||
onClick={() => reopen.mutate()}
|
||||
onClick={() => setConfirmOpen(true)}
|
||||
>
|
||||
<Play size={14} /> Arbeit fortsetzen
|
||||
<LogOut size={14} /> Feierabend / Check-Out
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="secondary"
|
||||
className="ml-auto"
|
||||
disabled={checkOut.isPending}
|
||||
onClick={() => checkOut.mutate()}
|
||||
>
|
||||
<LogOut size={14} /> Feierabend / Check-Out
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
<FeierabendDialog
|
||||
open={confirmOpen}
|
||||
onClose={() => setConfirmOpen(false)}
|
||||
todos={todos}
|
||||
reflected={reflected}
|
||||
pending={checkOut.isPending}
|
||||
onConfirm={() => checkOut.mutate()}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tagesabschluss vor dem Feierabend: kurze Zusammenfassung (erledigt/offen/
|
||||
* verworfen) und ein Hinweis, falls noch ToDos offen oder die Reflexion fehlt.
|
||||
* Feierabend ist reversibel ("Arbeit fortsetzen") — der Dialog ist daher Info,
|
||||
* keine harte Sperre.
|
||||
*/
|
||||
function FeierabendDialog({
|
||||
open,
|
||||
onClose,
|
||||
todos,
|
||||
reflected,
|
||||
pending,
|
||||
onConfirm,
|
||||
}: {
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
todos: Array<{ id: string; title: string; status: 'open' | 'done' | 'dropped' }>;
|
||||
reflected: boolean;
|
||||
pending: boolean;
|
||||
onConfirm: () => void;
|
||||
}) {
|
||||
const navigate = useNavigate();
|
||||
const done = todos.filter((t) => t.status === 'done');
|
||||
const dropped = todos.filter((t) => t.status === 'dropped');
|
||||
const offen = todos.filter((t) => t.status === 'open');
|
||||
const reflexionEmpfohlen = !reflected || offen.length > 0;
|
||||
|
||||
return (
|
||||
<Modal open={open} onClose={onClose} title="Feierabend?" size="md">
|
||||
<p className="mt-1 text-sm text-[var(--color-ink-muted)]">
|
||||
Kurzer Blick auf den Tag, bevor du abschließt.
|
||||
</p>
|
||||
|
||||
<div className="mt-4 flex flex-wrap gap-x-4 gap-y-1 text-sm">
|
||||
<span>
|
||||
<strong>{done.length}</strong> erledigt
|
||||
</span>
|
||||
<span>
|
||||
<strong>{offen.length}</strong> offen
|
||||
</span>
|
||||
{dropped.length > 0 && (
|
||||
<span>
|
||||
<strong>{dropped.length}</strong> verworfen
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{done.length > 0 && (
|
||||
<ul className="mt-3 space-y-1 text-sm">
|
||||
{done.map((t) => (
|
||||
<li key={t.id} className="flex items-center gap-2 text-[var(--color-ink-muted)]">
|
||||
<Check size={14} className="shrink-0 text-[var(--color-ampel-green-fg)]" />
|
||||
<span className="truncate">{t.title}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{offen.length > 0 && (
|
||||
<div className="mt-4 rounded-[var(--radius-md)] border border-[var(--color-ampel-amber-fg)] bg-[var(--color-ampel-amber-bg)] px-3 py-2 text-sm">
|
||||
<strong className="block">Noch offen — nicht reflektiert:</strong>
|
||||
<ul className="mt-1 space-y-0.5">
|
||||
{offen.map((t) => (
|
||||
<li key={t.id} className="truncate">
|
||||
· {t.title}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!reflected && (
|
||||
<p className="mt-3 text-sm text-[var(--color-ink-muted)]">
|
||||
Du hast heute noch nicht reflektiert.
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="mt-5 flex flex-wrap justify-end gap-2">
|
||||
<Button variant="ghost" onClick={onClose}>
|
||||
Abbrechen
|
||||
</Button>
|
||||
{reflexionEmpfohlen && (
|
||||
<Button variant="secondary" onClick={() => navigate('/reflexion')}>
|
||||
Zur Reflexion
|
||||
</Button>
|
||||
)}
|
||||
<Button variant="primary" disabled={pending} onClick={onConfirm}>
|
||||
Tag abschließen
|
||||
</Button>
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -455,7 +565,12 @@ function EinstempeltView({
|
||||
<p className="mt-1 text-[var(--color-ink-muted)]">{subtitle}</p>
|
||||
</header>
|
||||
|
||||
<CheckInOutBar checkedInAt={entry.checkedInAt} checkedOutAt={entry.checkedOutAt} />
|
||||
<CheckInOutBar
|
||||
checkedInAt={entry.checkedInAt}
|
||||
checkedOutAt={entry.checkedOutAt}
|
||||
todos={todos}
|
||||
reflected={entry.status === 'full'}
|
||||
/>
|
||||
|
||||
{reflectionDue && (
|
||||
<div
|
||||
|
||||
Reference in new issue
Block a user