Merge w10/settingsmisc into release/v1.18.10

Align the Vorsorge settings card to the canonical pattern, neutralize the danger
zone card, mark the bug-report feature deprecated, make ipwho.is the default geo
resolver, and keep the mobile More-hub labels on one line.
This commit is contained in:
Marc-André Bombeck committed 2026-06-20 16:57:55 +02:00
commit 28dd3b10af
12 files changed
+266 -162

No files matched your search

+21 -1
View File
@@ -3,6 +3,7 @@
import { useState } from "react";
import { Bug, Loader2 } from "lucide-react";
import { SettingsCardHeader } from "@/components/settings/_card-header";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
@@ -54,7 +55,26 @@ export function BugReportSection() {
<SettingsCardHeader
icon={Bug}
title={t("admin.bugReportGithub")}
description={t("admin.bugReportGithubDescription")}
titleAccessory={
// v1.18.10 (W7) — the feedback / bug-report feature is deprecated.
// The badge + note signal the upcoming removal without pulling the
// functionality yet, so existing operators keep the surface working.
<Badge
variant="outline"
data-testid="bug-report-deprecated-badge"
className="border-amber-500/50 text-amber-600 dark:text-amber-400"
>
{t("admin.bugReportDeprecatedBadge")}
</Badge>
}
description={
<>
<p>{t("admin.bugReportGithubDescription")}</p>
<p className="text-amber-600 dark:text-amber-400">
{t("admin.bugReportDeprecatedNote")}
</p>
</>
}
status={configured ? <ConfiguredBadge /> : null}
/>
+9 -8
View File
@@ -17,6 +17,7 @@ import {
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { SettingsCard } from "@/components/settings/settings-card";
import { SettingsCardHeader } from "@/components/settings/_card-header";
import { useTranslations } from "@/lib/i18n/context";
import { apiDelete } from "@/lib/api/api-fetch";
@@ -83,13 +84,13 @@ export function DangerZoneSection() {
});
return (
// v1.18.1 E4 — adopt the shared card shape (rounded-xl border + the
// `SettingsCardHeader` icon/title/description/status layout) so the
// Danger Zone reads like every other admin section. The destructive
// tint + AlertTriangle icon keep it visually flagged as dangerous;
// the delete affordance now sits in the header status slot, properly
// aligned beside its label rather than floating below a lone icon.
<div className="bg-destructive/5 border-destructive/30 rounded-xl border p-4 sm:p-6">
// v1.18.10 (W7) — the card SURFACE is neutral like every other admin /
// settings section (`SettingsCard`: bg-card + border-border): a red card
// edge reads as alarming, not premium. The danger signal lives ONLY in
// the destructive delete button + its typed-confirmation dialog, which
// are alarm enough. The header keeps the `AlertTriangle` icon so the
// section still flags its intent.
<SettingsCard>
<SettingsCardHeader
icon={AlertTriangle}
title={t("admin.deleteAllData")}
@@ -176,6 +177,6 @@ export function DangerZoneSection() {
{wipeMsg}
</p>
)}
</div>
</SettingsCard>
);
}
+12 -9
View File
@@ -247,15 +247,18 @@ export function BottomNav() {
)}
>
<item.icon className="h-5 w-5 shrink-0" aria-hidden="true" />
{/* v1.18.0 — the label must stay inside the tile across all
six locales. The longest single-word label (German
"Benachrichtigungen") has no natural break opportunity, so
`min-w-0` alone is not enough — the unbroken word forces the
span past the grid track and overflows the tile. `min-w-0`
lets the flex child shrink below its content width,
`break-words` introduces a break inside the long word, and
the auto-height tile (`min-h-14`) absorbs the second line. */}
<span className="min-w-0 text-sm leading-tight font-medium break-words">
{/* v1.18.10 (W7) — keep every label on ONE line. The longest
single-word label (German "Benachrichtigungen") used to
wrap to two lines via `break-words`, which left the tile
visually unbalanced beside its single-line neighbours.
`min-w-0` lets the flex child shrink below its content
width and `truncate` (nowrap + ellipsis) trims the
overflow instead of breaking the word. `title` keeps the
full label discoverable on hover/long-press. */}
<span
className="min-w-0 truncate text-sm leading-tight font-medium"
title={t(item.tKey)}
>
{t(item.tKey)}
</span>
</Link>
@@ -10,10 +10,14 @@
* `useModuleListPrefs("vorsorge")`; the toggles persist through the existing
* reminder PATCH route.
*/
import { ArrowUpDown, LayoutGrid, ListChecks } from "lucide-react";
import { Card, CardContent } from "@/components/ui/card";
import { Switch } from "@/components/ui/switch";
import { Skeleton } from "@/components/ui/skeleton";
import { useTranslations } from "@/lib/i18n/context";
import { SettingsCard } from "@/components/settings/settings-card";
import { SettingsCardHeader } from "@/components/settings/_card-header";
import { ModuleViewToggle } from "@/components/module-list/module-view-toggle";
import {
ModuleOrderEditor,
@@ -52,82 +56,89 @@ export function VorsorgeSettings() {
: t("measurementReminders.selfPlanned"),
}));
// v1.18.10 (W7) — the three Vorsorge settings groups adopt the shared
// `SettingsCard` + `SettingsCardHeader` contract (rounded-xl bordered
// surface, neutral muted icon, `text-lg` title, short muted description)
// so this surface reads like every other Settings section instead of bare
// `<section>` blocks with `text-sm` headings.
return (
<div className="space-y-8">
<section className="space-y-3">
<div className="flex items-center justify-between gap-3">
<h2 className="text-sm font-semibold">
{t("moduleList.viewHeading")}
</h2>
<ModuleViewToggle view={prefs.view} onChange={setView} />
</div>
<p className="text-muted-foreground text-sm">
{t("moduleList.viewDescription")}
</p>
</section>
<div className="space-y-6">
<SettingsCard>
<SettingsCardHeader
icon={LayoutGrid}
title={t("moduleList.viewHeading")}
description={t("moduleList.viewDescription")}
status={<ModuleViewToggle view={prefs.view} onChange={setView} />}
/>
</SettingsCard>
<section className="space-y-3">
<h2 className="text-sm font-semibold">
{t("moduleList.reorder.heading")}
</h2>
{isLoading ? (
<div className="space-y-2">
{Array.from({ length: 3 }, (_, i) => (
<Skeleton key={i} className="h-12 w-full" />
))}
</div>
) : (
<ModuleOrderEditor items={reorderItems} onChange={setOrder} />
)}
</section>
<section className="space-y-3">
<h2 className="text-sm font-semibold">
{t("measurementReminders.manage.title")}
</h2>
<p className="text-muted-foreground text-sm">
{t("measurementReminders.manage.description")}
</p>
{isLoading ? (
<Skeleton className="h-24 w-full" />
) : (reminders?.length ?? 0) === 0 ? (
<p className="text-muted-foreground text-sm">
{t("measurementReminders.manage.empty")}
</p>
) : (
<Card>
<CardContent className="divide-border divide-y p-0">
{ordered.map((reminder) => (
<div
key={reminder.id}
className="flex items-center justify-between gap-3 px-4 py-3"
>
<span
id={`vorsorge-reminder-label-${reminder.id}`}
className="min-w-0 truncate text-sm"
>
{resolveLabel(reminder, t)}
</span>
<Switch
checked={reminder.enabled}
onCheckedChange={(next) =>
update.mutate({
id: reminder.id,
body: { enabled: next },
})
}
disabled={update.isPending}
// L3 — label each row's Switch by its own name span so SR
// users hear the reminder name (plus the switch role's
// on/off state) instead of N identical generic labels.
aria-labelledby={`vorsorge-reminder-label-${reminder.id}`}
/>
</div>
<SettingsCard>
<SettingsCardHeader
icon={ArrowUpDown}
title={t("moduleList.reorder.heading")}
description={t("moduleList.reorder.description")}
/>
<div className="mt-4 pl-7">
{isLoading ? (
<div className="space-y-2">
{Array.from({ length: 3 }, (_, i) => (
<Skeleton key={i} className="h-12 w-full" />
))}
</CardContent>
</Card>
)}
</section>
</div>
) : (
<ModuleOrderEditor items={reorderItems} onChange={setOrder} />
)}
</div>
</SettingsCard>
<SettingsCard>
<SettingsCardHeader
icon={ListChecks}
title={t("measurementReminders.manage.title")}
description={t("measurementReminders.manage.description")}
/>
<div className="mt-4 pl-7">
{isLoading ? (
<Skeleton className="h-24 w-full" />
) : (reminders?.length ?? 0) === 0 ? (
<p className="text-muted-foreground text-sm">
{t("measurementReminders.manage.empty")}
</p>
) : (
<Card>
<CardContent className="divide-border divide-y p-0">
{ordered.map((reminder) => (
<div
key={reminder.id}
className="flex items-center justify-between gap-3 px-4 py-3"
>
<span
id={`vorsorge-reminder-label-${reminder.id}`}
className="min-w-0 truncate text-sm"
>
{resolveLabel(reminder, t)}
</span>
<Switch
checked={reminder.enabled}
onCheckedChange={(next) =>
update.mutate({
id: reminder.id,
body: { enabled: next },
})
}
disabled={update.isPending}
// L3 — label each row's Switch by its own name span so SR
// users hear the reminder name (plus the switch role's
// on/off state) instead of N identical generic labels.
aria-labelledby={`vorsorge-reminder-label-${reminder.id}`}
/>
</div>
))}
</CardContent>
</Card>
)}
</div>
</SettingsCard>
</div>
);
}