Mehrsprachige Oberfläche + lokalisierte Gericht-/Bereichsnamen
Alle Seiten und Komponenten (öffentliche Speisekarte, Login, Kantinen- und Admin-Bereich, eigenes Konto) verwenden jetzt die Wörterbücher aus lib/i18n statt fest codierter deutscher Texte. Gerichte/Bereiche/ Allergene/Zusatzstoffe zeigen den Namen zur aktuell gewählten Sprache; Gerichte- und Kennzeichnungs-Formulare bekommen Englisch-/Polnisch- Felder mit Übersetzen-Button (siehe vorherigen Commit). Datumsformat- ierung (formatDateLong) nimmt jetzt ein locale-Argument statt fix 'de-DE'.
This commit is contained in:
@@ -3,16 +3,8 @@ import CodeListManager from "@/components/CodeListManager";
|
||||
export default function KennzeichnungPage() {
|
||||
return (
|
||||
<div className="grid gap-6 lg:grid-cols-2">
|
||||
<CodeListManager
|
||||
table="allergens"
|
||||
title="Allergene"
|
||||
codeLabel="Kürzel (z. B. A)"
|
||||
/>
|
||||
<CodeListManager
|
||||
table="additives"
|
||||
title="Zusatzstoffe"
|
||||
codeLabel="Kürzel (z. B. 1)"
|
||||
/>
|
||||
<CodeListManager table="allergens" />
|
||||
<CodeListManager table="additives" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
+26
-20
@@ -4,20 +4,25 @@ import { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
import { createClient } from "@/lib/supabase/client";
|
||||
import { formatMessage } from "@/lib/i18n/shared";
|
||||
import { useDict } from "@/components/i18n/LocaleProvider";
|
||||
import LanguageSwitcher from "@/components/i18n/LanguageSwitcher";
|
||||
import type { Dict } from "@/lib/i18n/shared";
|
||||
|
||||
function germanAuthError(message: string): string {
|
||||
function authErrorMessage(dict: Dict, message: string): string {
|
||||
if (/invalid login credentials/i.test(message))
|
||||
return "E-Mail-Adresse oder Passwort ist falsch.";
|
||||
return dict.login.errorInvalidCredentials;
|
||||
if (/email not confirmed/i.test(message))
|
||||
return "Die E-Mail-Adresse wurde noch nicht bestätigt.";
|
||||
return dict.login.errorEmailNotConfirmed;
|
||||
if (/cancelled|aborted|NotAllowedError/i.test(message))
|
||||
return "Passkey-Anmeldung wurde abgebrochen.";
|
||||
return `Anmeldung fehlgeschlagen: ${message}`;
|
||||
return dict.login.errorPasskeyCancelled;
|
||||
return formatMessage(dict.login.errorGeneric, { message });
|
||||
}
|
||||
|
||||
export default function LoginPage() {
|
||||
const router = useRouter();
|
||||
const supabase = createClient();
|
||||
const dict = useDict();
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -42,7 +47,7 @@ export default function LoginPage() {
|
||||
password,
|
||||
});
|
||||
if (error || !data.user) {
|
||||
setError(germanAuthError(error?.message ?? "Unbekannter Fehler"));
|
||||
setError(authErrorMessage(dict, error?.message ?? "Unbekannter Fehler"));
|
||||
setBusy(false);
|
||||
return;
|
||||
}
|
||||
@@ -54,9 +59,7 @@ export default function LoginPage() {
|
||||
.single();
|
||||
if (profile?.password_auth_enabled === false) {
|
||||
await supabase.auth.signOut();
|
||||
setError(
|
||||
"Die Anmeldung mit Passwort ist für dieses Konto deaktiviert. Bitte mit Passkey anmelden."
|
||||
);
|
||||
setError(dict.login.errorPasswordDisabled);
|
||||
setBusy(false);
|
||||
return;
|
||||
}
|
||||
@@ -71,14 +74,14 @@ export default function LoginPage() {
|
||||
const { data, error } = await supabase.auth.signInWithPasskey();
|
||||
if (error || !data?.user) {
|
||||
setError(
|
||||
germanAuthError(error?.message ?? "Passkey-Anmeldung fehlgeschlagen")
|
||||
authErrorMessage(dict, error?.message ?? "Passkey-Anmeldung fehlgeschlagen")
|
||||
);
|
||||
setBusy(false);
|
||||
return;
|
||||
}
|
||||
await redirectByRole(data.user.id);
|
||||
} catch (err) {
|
||||
setError(germanAuthError(err instanceof Error ? err.message : String(err)));
|
||||
setError(authErrorMessage(dict, err instanceof Error ? err.message : String(err)));
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
@@ -86,13 +89,16 @@ export default function LoginPage() {
|
||||
return (
|
||||
<div className="flex-1 flex items-center justify-center p-4">
|
||||
<div className="card w-full max-w-sm">
|
||||
<h1 className="text-xl font-bold text-[var(--c-primary)] mb-4">
|
||||
Anmeldung
|
||||
</h1>
|
||||
<div className="flex justify-between items-center mb-4">
|
||||
<h1 className="text-xl font-bold text-[var(--c-primary)]">
|
||||
{dict.login.title}
|
||||
</h1>
|
||||
<LanguageSwitcher variant="light" />
|
||||
</div>
|
||||
<form onSubmit={signInWithPassword} className="space-y-3">
|
||||
<div>
|
||||
<label className="label" htmlFor="email">
|
||||
E-Mail-Adresse
|
||||
{dict.common.email}
|
||||
</label>
|
||||
<input
|
||||
id="email"
|
||||
@@ -106,7 +112,7 @@ export default function LoginPage() {
|
||||
</div>
|
||||
<div>
|
||||
<label className="label" htmlFor="password">
|
||||
Passwort
|
||||
{dict.common.password}
|
||||
</label>
|
||||
<input
|
||||
id="password"
|
||||
@@ -120,13 +126,13 @@ export default function LoginPage() {
|
||||
</div>
|
||||
{error && <p className="text-sm text-[var(--c-del)]">{error}</p>}
|
||||
<button type="submit" className="btn btn-primary w-full" disabled={busy}>
|
||||
Anmelden
|
||||
{dict.login.submit}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div className="my-4 flex items-center gap-3 text-xs text-gray-400">
|
||||
<span className="h-px flex-1 bg-gray-200" />
|
||||
oder
|
||||
{dict.login.or}
|
||||
<span className="h-px flex-1 bg-gray-200" />
|
||||
</div>
|
||||
|
||||
@@ -136,12 +142,12 @@ export default function LoginPage() {
|
||||
className="btn btn-neutral w-full"
|
||||
disabled={busy}
|
||||
>
|
||||
Mit Passkey anmelden
|
||||
{dict.login.passkeyButton}
|
||||
</button>
|
||||
|
||||
<p className="mt-4 text-center text-sm">
|
||||
<Link href="/" className="text-gray-500 hover:text-[var(--c-primary)]">
|
||||
← Zur Speisekarte
|
||||
{dict.login.backToMenu}
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
+34
-20
@@ -8,11 +8,12 @@ import {
|
||||
formatPrice,
|
||||
mondayOf,
|
||||
todayISO,
|
||||
WEEKDAYS,
|
||||
} from "@/lib/menu";
|
||||
import { logoUrl, SITE_TITLE } from "@/lib/types";
|
||||
import { getDictionary, getLocale } from "@/lib/i18n";
|
||||
import { localized, logoUrl, SITE_TITLE } from "@/lib/types";
|
||||
import type { CodeItem, MenuEntry, Section } from "@/lib/types";
|
||||
import PublicMobileMenu from "@/components/PublicMobileMenu";
|
||||
import LanguageSwitcher from "@/components/i18n/LanguageSwitcher";
|
||||
|
||||
export default async function Home({
|
||||
searchParams,
|
||||
@@ -23,7 +24,9 @@ export default async function Home({
|
||||
const monday = mondayOf(woche);
|
||||
const friday = addDays(monday, 4);
|
||||
const currentWeek = mondayOf(todayISO());
|
||||
const days = WEEKDAYS.map((weekday, i) => ({
|
||||
const locale = await getLocale();
|
||||
const dict = getDictionary(locale);
|
||||
const days = dict.weekdays.long.map((weekday, i) => ({
|
||||
weekday,
|
||||
iso: addDays(monday, i),
|
||||
}));
|
||||
@@ -35,7 +38,7 @@ export default async function Home({
|
||||
supabase
|
||||
.from("menu_entries")
|
||||
.select(
|
||||
"id, menu_date, section_key, position, dish:dishes(id, name, price, allergens, additives)"
|
||||
"id, menu_date, section_key, position, dish:dishes(id, name, name_en, name_pl, price, allergens, additives)"
|
||||
)
|
||||
.gte("menu_date", monday)
|
||||
.lte("menu_date", friday)
|
||||
@@ -54,16 +57,18 @@ export default async function Home({
|
||||
|
||||
return (
|
||||
<div className="flex-1 px-4 py-6 max-w-[1600px] mx-auto w-full">
|
||||
{/* Kopfbereich: Login-Link eigene Zeile, Logo zentriert darunter.
|
||||
Kein absolutes Positionieren mehr – ein breites Logo (z. B. ein
|
||||
Banner-Format) konnte sonst mit dem Login-Link kollidieren. */}
|
||||
{/* Kopfbereich: Sprache + Login-Link eigene Zeile, Logo zentriert
|
||||
darunter. Kein absolutes Positionieren mehr – ein breites Logo
|
||||
(z. B. ein Banner-Format) konnte sonst mit dem Login-Link
|
||||
kollidieren. */}
|
||||
<header className="mb-6">
|
||||
<div className="flex justify-end mb-2">
|
||||
<div className="flex justify-end items-center gap-3 mb-2">
|
||||
<LanguageSwitcher variant="light" />
|
||||
<Link
|
||||
href="/login"
|
||||
className="text-sm text-gray-500 hover:text-[var(--c-primary)]"
|
||||
>
|
||||
Anmelden
|
||||
{dict.common.login}
|
||||
</Link>
|
||||
</div>
|
||||
<div className="flex justify-center">
|
||||
@@ -87,15 +92,18 @@ export default async function Home({
|
||||
|
||||
{/* Ab "sm": klassische Wochentabelle */}
|
||||
<div className="hidden sm:block">
|
||||
<div className="flex gap-3 mb-4">
|
||||
<div className="flex flex-wrap items-center gap-3 mb-4">
|
||||
<Link href={`/?woche=${addDays(monday, -7)}`} className="btn btn-add">
|
||||
← Vorherige Woche
|
||||
{dict.publicMenu.prevWeek}
|
||||
</Link>
|
||||
<Link href={`/?woche=${currentWeek}`} className="btn btn-primary">
|
||||
Heute
|
||||
{dict.publicMenu.today}
|
||||
</Link>
|
||||
<Link href={`/?woche=${addDays(monday, 7)}`} className="btn btn-add">
|
||||
Nächste Woche →
|
||||
{dict.publicMenu.nextWeek}
|
||||
</Link>
|
||||
<Link href="/vorschlag" className="btn btn-neutral ml-auto">
|
||||
{dict.publicMenu.suggestDish}
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
@@ -108,7 +116,7 @@ export default async function Home({
|
||||
<th key={d.iso} className="day-head">
|
||||
<span className="font-bold">{d.weekday}</span>
|
||||
<br />
|
||||
{formatDateLong(d.iso)}
|
||||
{formatDateLong(d.iso, dict.dateLocale)}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
@@ -117,7 +125,7 @@ export default async function Home({
|
||||
{sections.map((s) => (
|
||||
<tr key={s.key}>
|
||||
<th className="section-head">
|
||||
<div>{s.label}</div>
|
||||
<div>{localized(s, locale)}</div>
|
||||
<div className="time">{s.time_range}</div>
|
||||
</th>
|
||||
{days.map((d) => (
|
||||
@@ -126,7 +134,9 @@ export default async function Home({
|
||||
const codes = dishCodes(e.dish);
|
||||
return (
|
||||
<div key={e.id} className="dish">
|
||||
<span className="font-bold">{e.dish.name}</span>
|
||||
<span className="font-bold">
|
||||
{localized(e.dish, locale)}
|
||||
</span>
|
||||
{codes && <sup className="dish-codes">{codes}</sup>}
|
||||
{" – "}
|
||||
{formatPrice(e.dish.price)}
|
||||
@@ -145,23 +155,27 @@ export default async function Home({
|
||||
{/* Allergene & Zusatzstoffe: Legende zu den Kürzeln bei den Gerichten */}
|
||||
<section className="mt-8 grid gap-6 sm:grid-cols-2 text-sm text-gray-700">
|
||||
<div>
|
||||
<h2 className="font-bold text-[var(--c-primary)] mb-2">Allergene</h2>
|
||||
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
||||
{dict.publicMenu.allergens}
|
||||
</h2>
|
||||
<ul className="space-y-0.5">
|
||||
{allergens.map((a) => (
|
||||
<li key={a.code}>
|
||||
<span className="font-semibold">{a.code}</span> – {a.name}
|
||||
<span className="font-semibold">{a.code}</span> –{" "}
|
||||
{localized(a, locale)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
||||
Zusatzstoffe
|
||||
{dict.publicMenu.additives}
|
||||
</h2>
|
||||
<ul className="space-y-0.5">
|
||||
{additives.map((a) => (
|
||||
<li key={a.code}>
|
||||
<span className="font-semibold">{a.code}</span> – {a.name}
|
||||
<span className="font-semibold">{a.code}</span> –{" "}
|
||||
{localized(a, locale)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user