Compare commits
6
Commits
d59b20d4ba
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bfd32d1aa7 | ||
|
|
32594c2dd8 | ||
|
|
5c7112ecd2 | ||
|
|
2a62d07dc4 | ||
|
|
0dbf89dfa2 | ||
|
|
41a6508b89 |
+1
-1
@@ -2,7 +2,7 @@
|
||||
"version": "0.0.1",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "speisekarte-dev",
|
||||
"name": "canteen-menu-dev",
|
||||
"runtimeExecutable": "C:\\Program Files\\nodejs\\npm.cmd",
|
||||
"runtimeArgs": ["run", "dev"],
|
||||
"port": 3000
|
||||
|
||||
@@ -9,3 +9,10 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=<anon-key>
|
||||
|
||||
# Service-Role-Key (GEHEIM! Nur serverseitig, für die Benutzerverwaltung)
|
||||
SUPABASE_SERVICE_ROLE_KEY=<service-role-key>
|
||||
|
||||
# Öffentliche URL, unter der die App erreichbar ist (Schema + Domain).
|
||||
# Wird für den CSRF-Origin-Check hinter Reverse-Proxies genutzt und ist
|
||||
# zugleich die Passkey-Domain: nach einer Änderung einmalig
|
||||
# SUPABASE_ACCESS_TOKEN=<token> node scripts/configure-passkeys.mjs
|
||||
# ausführen, damit Passkeys auf der neuen Domain funktionieren.
|
||||
APP_URL=http://localhost:3000
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Speisekarte – Betriebskantine
|
||||
# Canteen Menu – Speisekarte für die Betriebskantine
|
||||
|
||||
Digitale Speisekarte für eine Firmenkantine (ca. 250 Mitarbeiter) mit
|
||||
öffentlicher Wochenansicht, Kantinen-Bereich zur Pflege der Gerichte und
|
||||
@@ -53,7 +53,7 @@ docker compose --env-file .env.local --profile dev up dev
|
||||
|
||||
```bash
|
||||
npm install
|
||||
npm run dev # http://localhost:3000
|
||||
npm run dev # http://localhost:3000 (bindet an 0.0.0.0, auch im LAN erreichbar)
|
||||
```
|
||||
|
||||
## Umgebungsvariablen (Live-Betrieb)
|
||||
@@ -66,6 +66,7 @@ Beim Webserver/Hoster müssen genau diese drei Variablen hinterlegt werden
|
||||
| `NEXT_PUBLIC_SUPABASE_URL` | URL des Supabase-Projekts, z. B. `https://hvzikwjoyhoakedlywhj.supabase.co` | nein |
|
||||
| `NEXT_PUBLIC_SUPABASE_ANON_KEY` | Öffentlicher anon-Key (RLS schützt die Daten) | nein |
|
||||
| `SUPABASE_SERVICE_ROLE_KEY` | Service-Role-Key für die Benutzerverwaltung | **ja – niemals im Browser/Repo!** |
|
||||
| `APP_URL` | Öffentliche URL der App, z. B. `https://menu.example.de` (Origin-Check hinter Reverse-Proxy; zugleich Passkey-Domain) | nein |
|
||||
|
||||
Build & Start auf dem Server – **mit Docker** (empfohlen, Node.js und
|
||||
PostgreSQL müssen nicht installiert sein):
|
||||
@@ -81,18 +82,29 @@ Oder klassisch ohne Docker:
|
||||
```bash
|
||||
npm ci
|
||||
npm run build
|
||||
npm run start # Port 3000 (hinter Reverse-Proxy betreiben)
|
||||
npm run start # Port 3000, bindet an 0.0.0.0 (hinter Reverse-Proxy betreiben)
|
||||
```
|
||||
|
||||
### Passkeys für die Produktions-Domain freischalten
|
||||
|
||||
Passkeys sind an die Domain gebunden. Aktuell ist `localhost` konfiguriert.
|
||||
Vor dem Livegang in der Supabase-Konfiguration (Management API oder
|
||||
Dashboard → Authentication → Settings) anpassen:
|
||||
Vor dem Livegang: `APP_URL` auf die öffentliche URL setzen und einmalig
|
||||
|
||||
- `webauthn_rp_id` = `speisekarte.example.de` (die echte Domain, ohne Protokoll)
|
||||
- `webauthn_rp_origins` = `https://speisekarte.example.de`
|
||||
- `passkey_enabled` = `true` (bereits aktiv)
|
||||
```bash
|
||||
SUPABASE_ACCESS_TOKEN=<personal-access-token> node scripts/configure-passkeys.mjs
|
||||
```
|
||||
|
||||
ausführen (liest `APP_URL` aus der Umgebung; die URL kann alternativ als
|
||||
Argument übergeben werden). Ohne lokales Node.js geht es auch über Docker:
|
||||
|
||||
```bash
|
||||
docker run --rm -v .:/app -w /app \
|
||||
-e SUPABASE_ACCESS_TOKEN=<token> -e APP_URL=https://menu.example.de \
|
||||
node:24-alpine node scripts/configure-passkeys.mjs
|
||||
```
|
||||
|
||||
Achtung: Bereits registrierte Passkeys der alten Domain verlieren dabei
|
||||
ihre Gültigkeit und müssen neu registriert werden.
|
||||
|
||||
## Datenbank
|
||||
|
||||
@@ -116,7 +128,7 @@ Sicherheitsmodell (Row Level Security):
|
||||
|
||||
### Lokale PostgreSQL-Kopie
|
||||
|
||||
Die Datenbank `speisekarte` (Kopie von Schema + Daten aus Supabase, inkl.
|
||||
Die Datenbank `canteen_menu` (Kopie von Schema + Daten aus Supabase, inkl.
|
||||
Minimal-Stubs für `auth`/`storage`) gibt es in zwei Varianten:
|
||||
|
||||
**Per Docker:** Der Dienst `db` aus `docker-compose.yml` spielt die
|
||||
|
||||
+5
-30
@@ -1,6 +1,6 @@
|
||||
import Link from "next/link";
|
||||
import { redirect } from "next/navigation";
|
||||
import { createClient } from "@/lib/supabase/server";
|
||||
import AppHeader from "@/components/AppHeader";
|
||||
|
||||
export default async function AdminLayout({
|
||||
children,
|
||||
@@ -22,35 +22,10 @@ export default async function AdminLayout({
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex flex-col">
|
||||
<header className="bg-[var(--c-primary-dark)] text-white">
|
||||
<div className="max-w-[1600px] mx-auto w-full px-4 py-3 flex flex-wrap items-center gap-x-5 gap-y-2">
|
||||
<span className="font-bold">Verwaltung</span>
|
||||
<nav className="flex flex-wrap gap-x-4 gap-y-1 text-sm">
|
||||
<Link href="/admin" className="hover:underline">
|
||||
Benutzer
|
||||
</Link>
|
||||
<Link href="/admin/design" className="hover:underline">
|
||||
Design
|
||||
</Link>
|
||||
<Link href="/intern" className="hover:underline">
|
||||
Kantinen-Bereich
|
||||
</Link>
|
||||
<Link href="/" className="hover:underline">
|
||||
Zur Speisekarte
|
||||
</Link>
|
||||
</nav>
|
||||
<div className="ml-auto flex items-center gap-3 text-sm">
|
||||
<Link href="/konto" className="text-white/70 hover:underline">
|
||||
{profile.full_name || user.email}
|
||||
</Link>
|
||||
<form action="/logout" method="post">
|
||||
<button type="submit" className="btn btn-del">
|
||||
Abmelden
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
<AppHeader
|
||||
role="admin"
|
||||
displayName={profile.full_name || user.email || ""}
|
||||
/>
|
||||
<main className="max-w-[1600px] mx-auto w-full px-4 py-6 flex-1">
|
||||
{children}
|
||||
</main>
|
||||
|
||||
+5
-35
@@ -1,6 +1,6 @@
|
||||
import Link from "next/link";
|
||||
import { redirect } from "next/navigation";
|
||||
import { createClient } from "@/lib/supabase/server";
|
||||
import AppHeader from "@/components/AppHeader";
|
||||
|
||||
export default async function InternLayout({
|
||||
children,
|
||||
@@ -22,40 +22,10 @@ export default async function InternLayout({
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex flex-col">
|
||||
<header className="bg-[var(--c-primary-dark)] text-white">
|
||||
<div className="max-w-[1600px] mx-auto w-full px-4 py-3 flex flex-wrap items-center gap-x-5 gap-y-2">
|
||||
<span className="font-bold">Kantinen-Bereich</span>
|
||||
<nav className="flex flex-wrap gap-x-4 gap-y-1 text-sm">
|
||||
<Link href="/intern" className="hover:underline">
|
||||
Wochenplan
|
||||
</Link>
|
||||
<Link href="/intern/gerichte" className="hover:underline">
|
||||
Gerichte
|
||||
</Link>
|
||||
<Link href="/intern/kennzeichnung" className="hover:underline">
|
||||
Allergene & Zusatzstoffe
|
||||
</Link>
|
||||
{profile.role === "admin" && (
|
||||
<Link href="/admin" className="hover:underline">
|
||||
Verwaltung
|
||||
</Link>
|
||||
)}
|
||||
<Link href="/" className="hover:underline">
|
||||
Zur Speisekarte
|
||||
</Link>
|
||||
</nav>
|
||||
<div className="ml-auto flex items-center gap-3 text-sm">
|
||||
<Link href="/konto" className="text-white/70 hover:underline">
|
||||
{profile.full_name || user.email}
|
||||
</Link>
|
||||
<form action="/logout" method="post">
|
||||
<button type="submit" className="btn btn-del">
|
||||
Abmelden
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
<AppHeader
|
||||
role={profile.role}
|
||||
displayName={profile.full_name || user.email || ""}
|
||||
/>
|
||||
<main className="max-w-[1600px] mx-auto w-full px-4 py-6 flex-1">
|
||||
{children}
|
||||
</main>
|
||||
|
||||
+5
-14
@@ -1,6 +1,6 @@
|
||||
import { redirect } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
import { createClient } from "@/lib/supabase/server";
|
||||
import AppHeader from "@/components/AppHeader";
|
||||
import AccountManager from "@/components/AccountManager";
|
||||
|
||||
export default async function KontoPage() {
|
||||
@@ -19,19 +19,10 @@ export default async function KontoPage() {
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex flex-col">
|
||||
<header className="bg-[var(--c-primary-dark)] text-white">
|
||||
<div className="max-w-[1600px] mx-auto w-full px-4 py-3 flex flex-wrap items-center gap-x-5 gap-y-2">
|
||||
<span className="font-bold">Mein Konto</span>
|
||||
<nav className="ml-auto flex flex-wrap gap-x-4 gap-y-1 text-sm">
|
||||
<Link
|
||||
href={profile.role === "admin" ? "/admin" : "/intern"}
|
||||
className="hover:underline"
|
||||
>
|
||||
← Zurück
|
||||
</Link>
|
||||
</nav>
|
||||
</div>
|
||||
</header>
|
||||
<AppHeader
|
||||
role={profile.role}
|
||||
displayName={profile.full_name || user.email || ""}
|
||||
/>
|
||||
<main className="max-w-[1600px] mx-auto w-full px-4 py-6 flex-1">
|
||||
<AccountManager
|
||||
role={profile.role}
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ const geistSans = Geist({
|
||||
});
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Speisekarte",
|
||||
title: "Canteen Menu",
|
||||
description: "Speisekarte der Betriebskantine",
|
||||
};
|
||||
|
||||
|
||||
+7
-1
@@ -8,5 +8,11 @@ export async function POST(request: Request) {
|
||||
}
|
||||
const supabase = await createClient();
|
||||
await supabase.auth.signOut();
|
||||
return NextResponse.redirect(new URL("/login", request.url), { status: 303 });
|
||||
// Relative Weiterleitung: bei einer absoluten URL aus request.url landet
|
||||
// sonst die Server-Bindung (0.0.0.0) statt des aufgerufenen Hosts im
|
||||
// Location-Header.
|
||||
return new NextResponse(null, {
|
||||
status: 303,
|
||||
headers: { Location: "/login" },
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
"use client";
|
||||
|
||||
// Gemeinsamer Kopfbereich für alle internen Seiten. Statt zweier
|
||||
// getrennter Bereiche (Kantine/Verwaltung) gibt es eine Navigation:
|
||||
// Admins sehen zusätzlich die Verwaltungs-Links, der aktive Punkt
|
||||
// wird hervorgehoben.
|
||||
|
||||
import Link from "next/link";
|
||||
import { usePathname } from "next/navigation";
|
||||
import type { Role } from "@/lib/types";
|
||||
|
||||
const MENU_LINKS = [
|
||||
{ href: "/intern", label: "Wochenplan" },
|
||||
{ href: "/intern/gerichte", label: "Gerichte" },
|
||||
{ href: "/intern/kennzeichnung", label: "Allergene & Zusatzstoffe" },
|
||||
];
|
||||
|
||||
const ADMIN_LINKS = [
|
||||
{ href: "/admin", label: "Benutzer" },
|
||||
{ href: "/admin/design", label: "Design" },
|
||||
];
|
||||
|
||||
export default function AppHeader({
|
||||
role,
|
||||
displayName,
|
||||
}: {
|
||||
role: Role;
|
||||
displayName: string;
|
||||
}) {
|
||||
const pathname = usePathname();
|
||||
|
||||
const linkClass = (href: string) =>
|
||||
`rounded px-2 py-0.5 transition-colors hover:bg-white/10 ${
|
||||
pathname === href ? "bg-white/20 font-semibold" : "text-white/90"
|
||||
}`;
|
||||
|
||||
return (
|
||||
<header className="bg-[var(--c-primary-dark)] text-white">
|
||||
<div className="max-w-[1600px] mx-auto w-full px-4 py-3 flex flex-wrap items-center gap-x-6 gap-y-2 text-sm">
|
||||
<span className="font-bold text-base">Kantine</span>
|
||||
|
||||
<nav
|
||||
className="flex flex-wrap items-center gap-x-1 gap-y-1"
|
||||
aria-label="Speiseplan"
|
||||
>
|
||||
<span className="mr-1 text-xs uppercase tracking-wider text-white/50">
|
||||
Speiseplan
|
||||
</span>
|
||||
{MENU_LINKS.map((l) => (
|
||||
<Link key={l.href} href={l.href} className={linkClass(l.href)}>
|
||||
{l.label}
|
||||
</Link>
|
||||
))}
|
||||
</nav>
|
||||
|
||||
{role === "admin" && (
|
||||
<nav
|
||||
className="flex flex-wrap items-center gap-x-1 gap-y-1"
|
||||
aria-label="Verwaltung"
|
||||
>
|
||||
<span className="mr-1 text-xs uppercase tracking-wider text-white/50">
|
||||
Verwaltung
|
||||
</span>
|
||||
{ADMIN_LINKS.map((l) => (
|
||||
<Link key={l.href} href={l.href} className={linkClass(l.href)}>
|
||||
{l.label}
|
||||
</Link>
|
||||
))}
|
||||
</nav>
|
||||
)}
|
||||
|
||||
<Link
|
||||
href="/"
|
||||
className="rounded px-2 py-0.5 text-white/70 hover:bg-white/10"
|
||||
>
|
||||
Speisekarte ansehen
|
||||
</Link>
|
||||
|
||||
<div className="ml-auto flex items-center gap-3">
|
||||
<Link
|
||||
href="/konto"
|
||||
title="Mein Konto"
|
||||
className={`rounded px-2 py-0.5 hover:bg-white/10 ${
|
||||
pathname === "/konto"
|
||||
? "bg-white/20 font-semibold"
|
||||
: "text-white/80"
|
||||
}`}
|
||||
>
|
||||
{displayName}
|
||||
</Link>
|
||||
<form action="/logout" method="post">
|
||||
<button type="submit" className="btn btn-del">
|
||||
Abmelden
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
}
|
||||
+133
-29
@@ -19,6 +19,15 @@ export default function DishManager() {
|
||||
const [form, setForm] = useState<DishForm | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||
const [bulkBusy, setBulkBusy] = useState(false);
|
||||
const [search, setSearch] = useState("");
|
||||
|
||||
// Live-Suche: filtert die Liste bereits während des Tippens
|
||||
const visible = useMemo(() => {
|
||||
const q = search.trim().toLowerCase();
|
||||
return q ? dishes.filter((d) => d.name.toLowerCase().includes(q)) : dishes;
|
||||
}, [dishes, search]);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
const { data, error } = await supabase
|
||||
@@ -64,9 +73,58 @@ export default function DishManager() {
|
||||
return;
|
||||
const { error } = await supabase.from("dishes").delete().eq("id", dish.id);
|
||||
if (error) setError(`Löschen fehlgeschlagen: ${error.message}`);
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
next.delete(dish.id);
|
||||
return next;
|
||||
});
|
||||
await load();
|
||||
}
|
||||
|
||||
function toggleOne(id: string) {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
if (next.has(id)) next.delete(id);
|
||||
else next.add(id);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
// "Alle auswählen" bezieht sich auf die aktuell gefilterte Liste
|
||||
function toggleAll() {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
const everyVisibleSelected = visible.every((d) => next.has(d.id));
|
||||
visible.forEach((d) =>
|
||||
everyVisibleSelected ? next.delete(d.id) : next.add(d.id)
|
||||
);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
async function removeSelected() {
|
||||
if (selected.size === 0) return;
|
||||
if (
|
||||
!window.confirm(
|
||||
`${selected.size} Gericht(e) wirklich löschen? Sie werden auch aus allen Wochenplänen entfernt.`
|
||||
)
|
||||
)
|
||||
return;
|
||||
setBulkBusy(true);
|
||||
setError(null);
|
||||
const { error } = await supabase
|
||||
.from("dishes")
|
||||
.delete()
|
||||
.in("id", Array.from(selected));
|
||||
if (error) setError(`Löschen fehlgeschlagen: ${error.message}`);
|
||||
setSelected(new Set());
|
||||
setBulkBusy(false);
|
||||
await load();
|
||||
}
|
||||
|
||||
const allSelected =
|
||||
visible.length > 0 && visible.every((d) => selected.has(d.id));
|
||||
|
||||
return (
|
||||
<div className="max-w-3xl">
|
||||
<div className="flex items-center gap-3 mb-4">
|
||||
@@ -137,41 +195,87 @@ export default function DishManager() {
|
||||
{loading ? (
|
||||
<p className="text-gray-500">Lade Gerichte…</p>
|
||||
) : (
|
||||
<ul className="divide-y divide-gray-200 border border-gray-200 rounded-md bg-white">
|
||||
{dishes.map((dish) => (
|
||||
<li key={dish.id} className="flex items-center gap-3 px-4 py-2">
|
||||
<span className="mr-auto">
|
||||
<span className="font-semibold">{dish.name}</span>{" "}
|
||||
<span className="text-gray-500">– {formatPrice(dish.price)}</span>
|
||||
<>
|
||||
{dishes.length > 0 && (
|
||||
<input
|
||||
type="search"
|
||||
className="input mb-3"
|
||||
placeholder="Gericht suchen…"
|
||||
value={search}
|
||||
onChange={(e) => setSearch(e.target.value)}
|
||||
aria-label="Gerichte durchsuchen"
|
||||
/>
|
||||
)}
|
||||
{dishes.length > 0 && (
|
||||
<div className="flex items-center gap-3 mb-2 text-sm">
|
||||
<label className="flex items-center gap-2 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={allSelected}
|
||||
onChange={toggleAll}
|
||||
/>
|
||||
Alle auswählen
|
||||
</label>
|
||||
<span className="text-gray-500">
|
||||
{selected.size} ausgewählt
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-primary"
|
||||
onClick={() =>
|
||||
setForm({
|
||||
id: dish.id,
|
||||
name: dish.name,
|
||||
price: String(dish.price).replace(".", ","),
|
||||
})
|
||||
}
|
||||
className="btn btn-del ml-auto"
|
||||
onClick={removeSelected}
|
||||
disabled={selected.size === 0 || bulkBusy}
|
||||
>
|
||||
Bearbeiten
|
||||
Ausgewählte löschen{selected.size > 0 ? ` (${selected.size})` : ""}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-del"
|
||||
onClick={() => remove(dish)}
|
||||
>
|
||||
Löschen
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
{dishes.length === 0 && (
|
||||
<li className="px-4 py-3 text-gray-500">
|
||||
Noch keine Gerichte angelegt.
|
||||
</li>
|
||||
</div>
|
||||
)}
|
||||
</ul>
|
||||
<ul className="divide-y divide-gray-200 border border-gray-200 rounded-md bg-white">
|
||||
{visible.map((dish) => (
|
||||
<li key={dish.id} className="flex items-center gap-3 px-4 py-2">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={selected.has(dish.id)}
|
||||
onChange={() => toggleOne(dish.id)}
|
||||
aria-label={`${dish.name} auswählen`}
|
||||
/>
|
||||
<span className="mr-auto">
|
||||
<span className="font-semibold">{dish.name}</span>{" "}
|
||||
<span className="text-gray-500">– {formatPrice(dish.price)}</span>
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-primary"
|
||||
onClick={() =>
|
||||
setForm({
|
||||
id: dish.id,
|
||||
name: dish.name,
|
||||
price: String(dish.price).replace(".", ","),
|
||||
})
|
||||
}
|
||||
>
|
||||
Bearbeiten
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-del"
|
||||
onClick={() => remove(dish)}
|
||||
>
|
||||
Löschen
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
{dishes.length === 0 && (
|
||||
<li className="px-4 py-3 text-gray-500">
|
||||
Noch keine Gerichte angelegt.
|
||||
</li>
|
||||
)}
|
||||
{dishes.length > 0 && visible.length === 0 && (
|
||||
<li className="px-4 py-3 text-gray-500">
|
||||
Keine Treffer für „{search}“.
|
||||
</li>
|
||||
)}
|
||||
</ul>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
+17
-13
@@ -1,5 +1,5 @@
|
||||
# =============================================================
|
||||
# Speisekarte – Docker-Setup
|
||||
# Canteen Menu – Docker-Setup
|
||||
#
|
||||
# Produktion (App + lokale PostgreSQL-Kopie):
|
||||
# docker compose --env-file .env.local up -d --build
|
||||
@@ -10,12 +10,11 @@
|
||||
# Die --env-file-Angabe speist NEXT_PUBLIC_* in den Build und
|
||||
# SUPABASE_SERVICE_ROLE_KEY in die Laufzeit-Umgebung.
|
||||
#
|
||||
# "name" fixiert den Compose-Projektnamen explizit auf "speisekarte" –
|
||||
# ohne diese Angabe leitet Compose ihn aus dem Ordnernamen ab und wirft
|
||||
# dabei nicht-alphanumerische Zeichen (das "ß" in "Speißekarte") weg.
|
||||
# "name" fixiert den Compose-Projektnamen explizit auf "canteen-menu" –
|
||||
# ohne diese Angabe leitet Compose ihn aus dem Ordnernamen ab.
|
||||
# =============================================================
|
||||
|
||||
name: speisekarte
|
||||
name: canteen-menu
|
||||
|
||||
services:
|
||||
# ---------- Next.js-App (Produktions-Build) ----------
|
||||
@@ -25,14 +24,18 @@ services:
|
||||
args:
|
||||
NEXT_PUBLIC_SUPABASE_URL: ${NEXT_PUBLIC_SUPABASE_URL}
|
||||
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${NEXT_PUBLIC_SUPABASE_ANON_KEY}
|
||||
image: speisekarte-app
|
||||
container_name: speisekarte-app
|
||||
image: canteen-menu-app
|
||||
container_name: canteen-menu-app
|
||||
environment:
|
||||
NEXT_PUBLIC_SUPABASE_URL: ${NEXT_PUBLIC_SUPABASE_URL}
|
||||
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${NEXT_PUBLIC_SUPABASE_ANON_KEY}
|
||||
SUPABASE_SERVICE_ROLE_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
|
||||
# Öffentliche URL der App (Domain hinter dem Reverse-Proxy).
|
||||
# Wird für den CSRF-Origin-Check genutzt; dieselbe URL ist die
|
||||
# Passkey-Domain (siehe scripts/configure-passkeys.mjs).
|
||||
APP_URL: ${APP_URL:-http://localhost:3000}
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "0.0.0.0:3000:3000"
|
||||
restart: unless-stopped
|
||||
|
||||
# ---------- Lokale PostgreSQL-Kopie (Ablage/Auswertungen) ----------
|
||||
@@ -40,10 +43,10 @@ services:
|
||||
# automatisch in alphabetischer Reihenfolge eingespielt.
|
||||
db:
|
||||
image: postgres:17-alpine
|
||||
container_name: speisekarte-db
|
||||
container_name: canteen-menu-db
|
||||
environment:
|
||||
POSTGRES_DB: speisekarte
|
||||
POSTGRES_PASSWORD: ${LOCAL_PG_PASSWORD:-speisekarte}
|
||||
POSTGRES_DB: canteen_menu
|
||||
POSTGRES_PASSWORD: ${LOCAL_PG_PASSWORD:-canteen_menu}
|
||||
ports:
|
||||
# Host-Port 5433, da 5432 meist schon von einer nativen
|
||||
# PostgreSQL-Installation belegt ist.
|
||||
@@ -56,7 +59,7 @@ services:
|
||||
# ---------- Dev-Server (nur mit --profile dev) ----------
|
||||
dev:
|
||||
image: node:24-alpine
|
||||
container_name: speisekarte-dev
|
||||
container_name: canteen-menu-dev
|
||||
profiles: ["dev"]
|
||||
working_dir: /app
|
||||
command: sh -c "npm install && npm run dev"
|
||||
@@ -64,8 +67,9 @@ services:
|
||||
NEXT_PUBLIC_SUPABASE_URL: ${NEXT_PUBLIC_SUPABASE_URL}
|
||||
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${NEXT_PUBLIC_SUPABASE_ANON_KEY}
|
||||
SUPABASE_SERVICE_ROLE_KEY: ${SUPABASE_SERVICE_ROLE_KEY}
|
||||
APP_URL: ${APP_URL:-http://localhost:3000}
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "0.0.0.0:3000:3000"
|
||||
volumes:
|
||||
- .:/app
|
||||
- dev_node_modules:/app/node_modules
|
||||
|
||||
+6
-1
@@ -10,7 +10,12 @@ export function isSameOrigin(request: Request): boolean {
|
||||
if (!origin) return true;
|
||||
const host = request.headers.get("host");
|
||||
try {
|
||||
return new URL(origin).host === host;
|
||||
const originUrl = new URL(origin);
|
||||
if (originUrl.host === host) return true;
|
||||
// Hinter einem Reverse-Proxy, der den Host-Header umschreibt, gilt
|
||||
// zusätzlich die öffentlich konfigurierte App-URL als eigene Origin.
|
||||
const appUrl = process.env.APP_URL;
|
||||
return !!appUrl && originUrl.origin === new URL(appUrl).origin;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
|
||||
Generated
+2
-2
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "speisekarte",
|
||||
"name": "canteen-menu",
|
||||
"version": "0.1.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "speisekarte",
|
||||
"name": "canteen-menu",
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"@supabase/ssr": "^0.12.3",
|
||||
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "speisekarte",
|
||||
"name": "canteen-menu",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
"dev": "next dev -H 0.0.0.0",
|
||||
"build": "next build",
|
||||
"start": "next start",
|
||||
"start": "next start -H 0.0.0.0",
|
||||
"lint": "eslint"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
@@ -31,10 +31,14 @@ export async function proxy(request: NextRequest) {
|
||||
} = await supabase.auth.getUser();
|
||||
|
||||
if (!user) {
|
||||
const url = request.nextUrl.clone();
|
||||
url.pathname = "/login";
|
||||
url.search = "";
|
||||
return NextResponse.redirect(url);
|
||||
// Absolute URL aus dem Host-Header des Browsers bauen: request.nextUrl
|
||||
// trägt bei "-H 0.0.0.0" die Server-Bindung statt des aufgerufenen
|
||||
// Hosts, und relative Location-Header lehnt die Middleware ab.
|
||||
const host = request.headers.get("host") ?? request.nextUrl.host;
|
||||
const proto =
|
||||
request.headers.get("x-forwarded-proto") ??
|
||||
request.nextUrl.protocol.replace(":", "");
|
||||
return NextResponse.redirect(`${proto}://${host}/login`, 303);
|
||||
}
|
||||
|
||||
return response;
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
// Konfiguriert die Passkey-Domain (WebAuthn Relying Party) des
|
||||
// Supabase-Projekts auf die öffentliche App-URL. Passkeys sind an die
|
||||
// Domain gebunden – nach einem Domain-Wechsel einmal ausführen.
|
||||
//
|
||||
// Aufruf:
|
||||
// SUPABASE_ACCESS_TOKEN=... APP_URL=https://menu.example.de node scripts/configure-passkeys.mjs
|
||||
// oder mit der URL als Argument:
|
||||
// SUPABASE_ACCESS_TOKEN=... node scripts/configure-passkeys.mjs https://menu.example.de
|
||||
|
||||
const PROJECT_REF = "hvzikwjoyhoakedlywhj";
|
||||
const token = process.env.SUPABASE_ACCESS_TOKEN;
|
||||
const rawUrl = process.argv[2] ?? process.env.APP_URL;
|
||||
|
||||
if (!token || !rawUrl) {
|
||||
console.error(
|
||||
"Nutzung: SUPABASE_ACCESS_TOKEN=... [APP_URL=https://…] node scripts/configure-passkeys.mjs [url]"
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const url = new URL(rawUrl);
|
||||
const res = await fetch(
|
||||
`https://api.supabase.com/v1/projects/${PROJECT_REF}/config/auth`,
|
||||
{
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
passkey_enabled: true,
|
||||
webauthn_rp_id: url.hostname,
|
||||
webauthn_rp_display_name: "Canteen Menu",
|
||||
webauthn_rp_origins: url.origin,
|
||||
}),
|
||||
}
|
||||
);
|
||||
|
||||
if (!res.ok) {
|
||||
console.error(`Fehler ${res.status}: ${await res.text()}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`Passkey-Domain gesetzt: rp_id=${url.hostname}, origin=${url.origin}`);
|
||||
console.log(
|
||||
"Hinweis: Bereits auf einer anderen Domain registrierte Passkeys verlieren ihre Gültigkeit."
|
||||
);
|
||||
@@ -37,11 +37,11 @@ $SchemaFile = Join-Path $LocalDir "10_schema.sql"
|
||||
|
||||
# 2. Lokale Datenbank neu aufbauen
|
||||
$env:PGPASSWORD = $env:LOCAL_PG_PASSWORD
|
||||
& "$PgBin\psql" -h localhost -U postgres -c "drop database if exists speisekarte;"
|
||||
& "$PgBin\psql" -h localhost -U postgres -c "create database speisekarte;"
|
||||
& "$PgBin\psql" -h localhost -U postgres -c "drop database if exists canteen_menu;"
|
||||
& "$PgBin\psql" -h localhost -U postgres -c "create database canteen_menu;"
|
||||
|
||||
foreach ($file in @("00_stubs.sql", "10_schema.sql", "15_auth_users.sql", "20_data.sql")) {
|
||||
& "$PgBin\psql" -h localhost -U postgres -d speisekarte -q -f (Join-Path $LocalDir $file)
|
||||
& "$PgBin\psql" -h localhost -U postgres -d canteen_menu -q -f (Join-Path $LocalDir $file)
|
||||
}
|
||||
|
||||
Write-Host "Lokale Datenbank 'speisekarte' wurde aktualisiert."
|
||||
Write-Host "Lokale Datenbank 'canteen_menu' wurde aktualisiert."
|
||||
|
||||
Reference in New Issue
Block a user