{String(account.name)} — Dokumente und Rechnungen
++ {String(account.name)} — Dokumente und Rechnungen +
-
+
) : (
Keine Dokumente vorhanden
{documents.map((doc) => (
-
+
{getIcon(doc.type)}
-
{doc.title}
-{doc.type} — {new Date(doc.date).toLocaleDateString('de-DE')}
+{doc.title}
++ {doc.type} — {formatDate(doc.date)} +
{getStatusBadge(doc.status)}
diff --git a/apps/web/app/[locale]/club/[slug]/portal/invite/page.tsx b/apps/web/app/[locale]/club/[slug]/portal/invite/page.tsx
index 4343d5812..164f46867 100644
--- a/apps/web/app/[locale]/club/[slug]/portal/invite/page.tsx
+++ b/apps/web/app/[locale]/club/[slug]/portal/invite/page.tsx
@@ -1,18 +1,25 @@
-import { createClient } from '@supabase/supabase-js';
+import Link from 'next/link';
import { notFound } from 'next/navigation';
-import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { createClient } from '@supabase/supabase-js';
+
+import { UserPlus, Shield, CheckCircle } from 'lucide-react';
+
+import { formatDate } from '@kit/shared/dates';
import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
import { Input } from '@kit/ui/input';
import { Label } from '@kit/ui/label';
-import { UserPlus, Shield, CheckCircle } from 'lucide-react';
-import Link from 'next/link';
interface Props {
params: Promise<{ slug: string }>;
searchParams: Promise<{ token?: string }>;
}
-export default async function PortalInvitePage({ params, searchParams }: Props) {
+export default async function PortalInvitePage({
+ params,
+ searchParams,
+}: Props) {
const { slug } = await params;
const { token } = await searchParams;
@@ -24,28 +31,35 @@ export default async function PortalInvitePage({ params, searchParams }: Props)
);
// Resolve account
- const { data: account } = await supabase.from('accounts').select('id, name').eq('slug', slug).single();
+ const { data: account } = await supabase
+ .from('accounts')
+ .select('id, name')
+ .eq('slug', slug)
+ .single();
if (!account) notFound();
// Look up invitation
- const { data: invitation } = await supabase.from('member_portal_invitations')
+ const { data: invitation } = await supabase
+ .from('member_portal_invitations')
.select('id, email, status, expires_at, member_id')
.eq('invite_token', token)
.maybeSingle();
if (!invitation || invitation.status !== 'pending') {
return (
-
+
-
@@ -56,14 +70,14 @@ export default async function PortalInvitePage({ params, searchParams }: Props)
const expired = new Date(invitation.expires_at) < new Date();
if (expired) {
return (
-
Einladung ungültig
-- Diese Einladung ist abgelaufen, wurde bereits verwendet oder ist ungültig. - Bitte wenden Sie sich an Ihren Vereinsadministrator. +
+ Diese Einladung ist abgelaufen, wurde bereits verwendet oder ist + ungültig. Bitte wenden Sie sich an Ihren Vereinsadministrator.
- +
+
-
@@ -72,41 +86,67 @@ export default async function PortalInvitePage({ params, searchParams }: Props)
}
return (
-
Einladung abgelaufen
-- Diese Einladung ist am {new Date(invitation.expires_at).toLocaleDateString('de-DE')} abgelaufen. - Bitte fordern Sie eine neue Einladung an. +
+ Diese Einladung ist am {formatDate(invitation.expires_at)}{' '} + abgelaufen. Bitte fordern Sie eine neue Einladung an.
+
-
- Einladung zum Mitgliederbereich
-
-
+
{String(account.name)}
++ {String(account.name)} +
+
-
-
- Sie wurden eingeladen, ein Konto für den Mitgliederbereich zu erstellen. - Damit können Sie Ihr Profil einsehen, Dokumente herunterladen und Ihre Datenschutz-Einstellungen verwalten. + Sie wurden eingeladen, ein Konto für den Mitgliederbereich zu + erstellen. Damit können Sie Ihr Profil einsehen, Dokumente + herunterladen und Ihre Datenschutz-Einstellungen verwalten.
- Bereits ein Konto? Anmelden +
+ Bereits ein Konto?{' '} + + Anmelden +
diff --git a/apps/web/app/[locale]/club/[slug]/portal/page.tsx b/apps/web/app/[locale]/club/[slug]/portal/page.tsx index cedce27ec..f54a9b211 100644 --- a/apps/web/app/[locale]/club/[slug]/portal/page.tsx +++ b/apps/web/app/[locale]/club/[slug]/portal/page.tsx @@ -1,10 +1,12 @@ -import { createClient } from '@supabase/supabase-js'; -import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card'; -import { Button } from '@kit/ui/button'; -import { UserCircle, FileText, CreditCard, Shield } from 'lucide-react'; import Link from 'next/link'; +import { createClient } from '@supabase/supabase-js'; + +import { UserCircle, FileText, CreditCard, Shield } from 'lucide-react'; + import { PortalLoginForm } from '@kit/site-builder/components'; +import { Button } from '@kit/ui/button'; +import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card'; interface Props { params: Promise<{ slug: string }>; @@ -18,15 +20,23 @@ export default async function MemberPortalPage({ params }: Props) { process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY!, ); - const { data: account } = await supabase.from('accounts').select('id, name').eq('slug', slug).single(); - if (!account) returnOrganisation nicht gefunden
;
+ const { data: account } = await supabase
+ .from('accounts')
+ .select('id, name')
+ .eq('slug', slug)
+ .single();
+ if (!account)
+ return Organisation nicht gefunden
;
// Check if user is already logged in
- const { data: { user } } = await supabase.auth.getUser();
+ const {
+ data: { user },
+ } = await supabase.auth.getUser();
if (user) {
// Check if this user is a member of this club
- const { data: member } = await supabase.from('members')
+ const { data: member } = await supabase
+ .from('members')
.select('id, first_name, last_name, status')
.eq('account_id', account.id)
.eq('user_id', user.id)
@@ -35,45 +45,61 @@ export default async function MemberPortalPage({ params }: Props) {
if (member) {
// Logged in member — show portal dashboard
return (
-
-
-
+
+
+
-
-
+
-
Mitgliederbereich — {String(account.name)}
++ Mitgliederbereich — {String(account.name)} +
- {String(member.first_name)} {String(member.last_name)}
-
+
+ {String(member.first_name)} {String(member.last_name)}
+
+
+
+
Willkommen, {String(member.first_name)}!
++ Willkommen, {String(member.first_name)}! +
-
+
-
-
+
-
-
@@ -85,14 +111,18 @@ export default async function MemberPortalPage({ params }: Props) {
// Not logged in or not a member — show login form
return (
- Mein Profil
-Kontaktdaten und Datenschutz
++ Kontaktdaten und Datenschutz +
Dokumente
-Rechnungen und Bescheinigungen
++ Rechnungen und Bescheinigungen +
Mitgliedsausweis
-Digital anzeigen
++ Digital anzeigen +
-
-
+ = {
+ google: 'Google',
+ apple: 'Apple',
+ azure: 'Microsoft',
+ github: 'GitHub',
+};
+
+function getSupabaseClient() {
+ return createClient(
+ process.env.NEXT_PUBLIC_SUPABASE_URL!,
+ process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY!,
+ );
+}
+
+export function PortalLinkedAccounts({ slug }: { slug: string }) {
+ const [identities, setIdentities] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [actionLoading, setActionLoading] = useState(null);
+
+ const loadIdentities = useCallback(async () => {
+ const supabase = getSupabaseClient();
+ const {
+ data: { user },
+ } = await supabase.auth.getUser();
+
+ if (user?.identities) {
+ setIdentities(user.identities);
+ }
+
+ setLoading(false);
+ }, []);
+
+ useEffect(() => {
+ void loadIdentities();
+ }, [loadIdentities]);
+
+ const handleLink = async (provider: Provider) => {
+ setActionLoading(provider);
+
+ try {
+ const supabase = getSupabaseClient();
+ const redirectTo = `${window.location.origin}/club/${slug}/portal/profile`;
+
+ const { error } = await supabase.auth.linkIdentity({
+ provider,
+ options: { redirectTo },
+ });
+
+ if (error) {
+ toast.error(`Verknüpfung fehlgeschlagen: ${error.message}`);
+ setActionLoading(null);
+ }
+ } catch {
+ toast.error('Verbindungsfehler. Bitte versuchen Sie es erneut.');
+ setActionLoading(null);
+ }
+ };
+
+ const handleUnlink = async (identity: UserIdentity) => {
+ if (identities.length <= 1) {
+ toast.error('Sie benötigen mindestens eine Anmeldemethode.');
+ return;
+ }
+
+ setActionLoading(identity.id);
+
+ try {
+ const supabase = getSupabaseClient();
+ const { error } = await supabase.auth.unlinkIdentity(identity);
+
+ if (error) {
+ toast.error(`Trennung fehlgeschlagen: ${error.message}`);
+ } else {
+ toast.success(
+ `${PROVIDER_LABELS[identity.provider] ?? identity.provider} wurde getrennt.`,
+ );
+ await loadIdentities();
+ }
+ } catch {
+ toast.error('Verbindungsfehler. Bitte versuchen Sie es erneut.');
+ } finally {
+ setActionLoading(null);
+ }
+ };
+
+ if (loading) {
+ return (
+
+
+
-
+
diff --git a/apps/web/app/[locale]/club/[slug]/portal/profile/_components/portal-linked-accounts.tsx b/apps/web/app/[locale]/club/[slug]/portal/profile/_components/portal-linked-accounts.tsx
new file mode 100644
index 000000000..761e8c0a2
--- /dev/null
+++ b/apps/web/app/[locale]/club/[slug]/portal/profile/_components/portal-linked-accounts.tsx
@@ -0,0 +1,244 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+
+import type { Provider, UserIdentity } from '@supabase/supabase-js';
+import { createClient } from '@supabase/supabase-js';
+
+import { Link2, Link2Off, Loader2 } from 'lucide-react';
+
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from '@kit/ui/alert-dialog';
+import { Button } from '@kit/ui/button';
+import { OauthProviderLogoImage } from '@kit/ui/oauth-provider-logo-image';
+import { toast } from '@kit/ui/sonner';
+
+const PROVIDERS: Provider[] = ['google', 'apple', 'azure', 'github'];
+
+const PROVIDER_LABELS: RecordMitgliederbereich
- + + +
+
+ );
+ }
+
+ const connectedProviders = identities
+ .filter((i) => i.provider !== 'email')
+ .map((i) => i.provider);
+
+ const availableProviders = PROVIDERS.filter(
+ (p) => !connectedProviders.includes(p),
+ );
+
+ return (
+
+ {/* Connected accounts */}
+ {identities.filter((i) => i.provider !== 'email').length > 0 && (
+
+ );
+}
diff --git a/apps/web/app/[locale]/club/[slug]/portal/profile/page.tsx b/apps/web/app/[locale]/club/[slug]/portal/profile/page.tsx
index 0ba3b4ee2..f809a1c59 100644
--- a/apps/web/app/[locale]/club/[slug]/portal/profile/page.tsx
+++ b/apps/web/app/[locale]/club/[slug]/portal/profile/page.tsx
@@ -1,11 +1,25 @@
-import { createClient } from '@supabase/supabase-js';
+import Link from 'next/link';
import { redirect } from 'next/navigation';
-import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
+
+import { createClient } from '@supabase/supabase-js';
+
+import {
+ UserCircle,
+ Mail,
+ MapPin,
+ Phone,
+ Shield,
+ Calendar,
+ Link2,
+} from 'lucide-react';
+
+import { formatDate } from '@kit/shared/dates';
import { Button } from '@kit/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
import { Input } from '@kit/ui/input';
import { Label } from '@kit/ui/label';
-import { UserCircle, Mail, MapPin, Phone, Shield, Calendar } from 'lucide-react';
-import Link from 'next/link';
+
+import { PortalLinkedAccounts } from './_components/portal-linked-accounts';
interface Props {
params: Promise<{ slug: string }>;
@@ -19,15 +33,23 @@ export default async function PortalProfilePage({ params }: Props) {
process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY!,
);
- const { data: account } = await supabase.from('accounts').select('id, name').eq('slug', slug).single();
- if (!account) return
+
+ )}
+
+ {/* Available providers to link */}
+ {availableProviders.length > 0 && (
+ + Verknüpfte Konten +
+ + {identities + .filter((i) => i.provider !== 'email') + .map((identity) => ( +
+
+
+ {actionLoading === identity.id ? (
+
+
+ Konto trennen?
+
+ Möchten Sie die Verknüpfung mit{' '}
+ {PROVIDER_LABELS[identity.provider] ??
+ identity.provider}{' '}
+ wirklich aufheben? Sie können sich dann nicht mehr
+ darüber anmelden.
+
+
+
+ Abbrechen
+ handleUnlink(identity)}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ Trennen
+
+
+
+
+ )}
+
+ ))}
+
+
+
+ {identities.length > 1 && (
+
+
+
+
+ + {PROVIDER_LABELS[identity.provider] ?? identity.provider} +
+ {identity.identity_data?.email && ( ++ {identity.identity_data.email as string} +
+ )} +
+
+ )}
+
+ {/* Info text when email-only */}
+ {identities.length <= 1 && availableProviders.length > 0 && (
+ + Konto verknüpfen für schnellere Anmeldung +
+ +
+ {availableProviders.map((provider) => (
+
+ ))}
+
+ + Verknüpfen Sie ein Konto, um sich zukünftig schneller und ohne + Passwort anmelden zu können. +
+ )} +Organisation nicht gefunden
;
+ const { data: account } = await supabase
+ .from('accounts')
+ .select('id, name')
+ .eq('slug', slug)
+ .single();
+ if (!account)
+ return Organisation nicht gefunden
;
// Get current user
- const { data: { user } } = await supabase.auth.getUser();
+ const {
+ data: { user },
+ } = await supabase.auth.getUser();
if (!user) redirect(`/club/${slug}/portal`);
// Find member linked to this user
- const { data: member } = await supabase.from('members')
+ const { data: member } = await supabase
+ .from('members')
.select('*')
.eq('account_id', account.id)
.eq('user_id', user.id)
@@ -35,17 +57,20 @@ export default async function PortalProfilePage({ params }: Props) {
if (!member) {
return (
-
+
-
@@ -56,28 +81,35 @@ export default async function PortalProfilePage({ params }: Props) {
const m = member;
return (
-
Kein Mitglied
-- Ihr Benutzerkonto ist nicht mit einem Mitgliedsprofil in diesem Verein verknüpft. - Bitte wenden Sie sich an Ihren Vereinsadministrator. +
+ Ihr Benutzerkonto ist nicht mit einem Mitgliedsprofil in diesem + Verein verknüpft. Bitte wenden Sie sich an Ihren + Vereinsadministrator.
- +
-
-
@@ -144,7 +143,7 @@ export default async function BookingDetailPage({ params }: PageProps) {
{room ? (
+
+
+
-
+
-
-
+
+
+
Mein Profil
-
-
+
+
+
-
-
-
-
-
+
-
+
+
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
{[
- { key: 'gdpr_newsletter', label: 'Newsletter per E-Mail', value: m.gdpr_newsletter },
- { key: 'gdpr_internet', label: 'Veröffentlichung auf der Homepage', value: m.gdpr_internet },
- { key: 'gdpr_print', label: 'Veröffentlichung in der Vereinszeitung', value: m.gdpr_print },
- { key: 'gdpr_birthday_info', label: 'Geburtstagsinfo an Mitglieder', value: m.gdpr_birthday_info },
+ {
+ key: 'gdpr_newsletter',
+ label: 'Newsletter per E-Mail',
+ value: m.gdpr_newsletter,
+ },
+ {
+ key: 'gdpr_internet',
+ label: 'Veröffentlichung auf der Homepage',
+ value: m.gdpr_internet,
+ },
+ {
+ key: 'gdpr_print',
+ label: 'Veröffentlichung in der Vereinszeitung',
+ value: m.gdpr_print,
+ },
+ {
+ key: 'gdpr_birthday_info',
+ label: 'Geburtstagsinfo an Mitglieder',
+ value: m.gdpr_birthday_info,
+ },
].map(({ key, label, value }) => (
))}
diff --git a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
index 70d208c25..477c3892f 100644
--- a/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
+++ b/apps/web/app/[locale]/home/[account]/_components/team-account-layout-mobile-navigation.tsx
@@ -49,26 +49,24 @@ export const TeamAccountLayoutMobileNavigation = (
) => {
const signOut = useSignOut();
- const Links = props.config.routes.map(
- (item, index) => {
- if ('children' in item) {
- return item.children.map((child) => {
- return (
-
diff --git a/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
index 7fcb11e44..d2bc4a83f 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/[bookingId]/page.tsx
@@ -10,6 +10,7 @@ import {
User,
} from 'lucide-react';
+import { formatDate } from '@kit/shared/dates';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { Badge } from '@kit/ui/badge';
import { Button } from '@kit/ui/button';
@@ -21,8 +22,8 @@ import {
CardTitle,
} from '@kit/ui/card';
-import { CmsPageShell } from '~/components/cms-page-shell';
import { AccountNotFound } from '~/components/account-not-found';
+import { CmsPageShell } from '~/components/cms-page-shell';
interface PageProps {
params: Promise<{ account: string; bookingId: string }>;
@@ -124,9 +125,7 @@ export default async function BookingDetailPage({ params }: PageProps) {
{STATUS_LABEL[status] ?? status}
-
+
@@ -85,37 +117,111 @@ export default async function PortalProfilePage({ params }: Props) {
-
{String(m.first_name)} {String(m.last_name)}
-- Nr. {String(m.member_number ?? '—')} — Mitglied seit {m.entry_date ? new Date(String(m.entry_date)).toLocaleDateString('de-DE') : '—'} +
+ {String(m.first_name)} {String(m.last_name)} +
++ Nr. {String(m.member_number ?? '—')} — Mitglied seit{' '} + {formatDate(m.entry_date)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ID: {bookingId} -
+ID: {bookingId}
-
+
Zimmernummer
@@ -153,14 +152,14 @@ export default async function BookingDetailPage({ params }: PageProps) {
{room.name && (
-
+
Name
{String(room.name)}
)}
- Typ
+ Typ
{String(room.room_type ?? '—')}
@@ -186,29 +185,25 @@ export default async function BookingDetailPage({ params }: PageProps) {
{guest ? (
@@ -231,56 +226,30 @@ export default async function BookingDetailPage({ params }: PageProps) {
@@ -294,7 +263,7 @@ export default async function BookingDetailPage({ params }: PageProps) {
- Name
+ Name
{String(guest.first_name)} {String(guest.last_name)}
{guest.email && (
-
+
E-Mail
-
- {String(guest.email)}
-
+ {String(guest.email)}
)}
{guest.phone && (
-
+
Telefon
-
- {String(guest.phone)}
-
+ {String(guest.phone)}
)}
-
+
Check-in
- {booking.check_in
- ? new Date(String(booking.check_in)).toLocaleDateString(
- 'de-DE',
- {
- weekday: 'short',
- day: '2-digit',
- month: '2-digit',
- year: 'numeric',
- },
- )
- : '—'}
+ {formatDate(booking.check_in)}
-
+
Check-out
- {booking.check_out
- ? new Date(String(booking.check_out)).toLocaleDateString(
- 'de-DE',
- {
- weekday: 'short',
- day: '2-digit',
- month: '2-digit',
- year: 'numeric',
- },
- )
- : '—'}
+ {formatDate(booking.check_out)}
-
+
Erwachsene
-
- {booking.adults ?? '—'}
-
+ {booking.adults ?? '—'}
-
- Kinder
-
-
- {booking.children ?? 0}
-
+ Kinder
+ {booking.children ?? 0}
-
+
Gesamtpreis
@@ -305,7 +274,7 @@ export default async function BookingDetailPage({ params }: PageProps) {
{booking.notes && (
-
+
Notizen
Aktionen
-
- Status der Buchung ändern
-
+ Status der Buchung ändern
{/* Weekday Header */}
-
{String(booking.notes)}
@@ -320,9 +289,7 @@ export default async function BookingDetailPage({ params }: PageProps) {
@@ -350,10 +317,10 @@ export default async function BookingDetailPage({ params }: PageProps) {
)}
{status === 'cancelled' || status === 'checked_out' ? (
-
diff --git a/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
index 82221898d..df3e7e21b 100644
--- a/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
+++ b/apps/web/app/[locale]/home/[account]/bookings/calendar/page.tsx
@@ -2,15 +2,14 @@ import Link from 'next/link';
import { ArrowLeft, ChevronLeft, ChevronRight } from 'lucide-react';
+import { createBookingManagementApi } from '@kit/booking-management/api';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { Badge } from '@kit/ui/badge';
import { Button } from '@kit/ui/button';
import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
-import { createBookingManagementApi } from '@kit/booking-management/api';
-
-import { CmsPageShell } from '~/components/cms-page-shell';
import { AccountNotFound } from '~/components/account-not-found';
+import { CmsPageShell } from '~/components/cms-page-shell';
interface PageProps {
params: Promise<{ account: string }>;
@@ -43,7 +42,11 @@ function getFirstWeekday(year: number, month: number): number {
return day === 0 ? 6 : day - 1;
}
-function isDateInRange(date: string, checkIn: string, checkOut: string): boolean {
+function isDateInRange(
+ date: string,
+ checkIn: string,
+ checkOut: string,
+): boolean {
return date >= checkIn && date < checkOut;
}
@@ -101,7 +104,11 @@ export default async function BookingCalendarPage({ params }: PageProps) {
}
// Build calendar grid cells
- const cells: Array<{ day: number | null; occupied: boolean; isToday: boolean }> = [];
+ const cells: Array<{
+ day: number | null;
+ occupied: boolean;
+ isToday: boolean;
+ }> = [];
// Empty cells before first day
for (let i = 0; i < firstWeekday; i++) {
@@ -158,11 +165,11 @@ export default async function BookingCalendarPage({ params }: PageProps) {
+
Diese Buchung ist{' '} - {status === 'cancelled' ? 'storniert' : 'abgeschlossen'} — keine - weiteren Aktionen verfügbar. + {status === 'cancelled' ? 'storniert' : 'abgeschlossen'} — + keine weiteren Aktionen verfügbar.
) : null}
+
{WEEKDAYS.map((day) => (
{/* Legend */}
-
{day}
@@ -180,13 +187,13 @@ export default async function BookingCalendarPage({ params }: PageProps) {
: cell.occupied
? 'bg-primary/15 text-primary font-semibold'
: 'bg-muted/30 hover:bg-muted/50'
- } ${cell.isToday ? 'ring-2 ring-primary ring-offset-1' : ''}`}
+ } ${cell.isToday ? 'ring-primary ring-2 ring-offset-1' : ''}`}
>
{cell.day !== null && (
<>
{cell.day}
{cell.occupied && (
-
+
)}
)}
@@ -195,17 +202,17 @@ export default async function BookingCalendarPage({ params }: PageProps) {
+
@@ -217,7 +224,7 @@ export default async function BookingCalendarPage({ params }: PageProps) {
-
+
Belegt
-
+
Frei
-
+
Heute
-
-
+
Buchungen in diesem Monat
{bookings.data.length}
diff --git a/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx index 653a3a699..1a112fa48 100644 --- a/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx +++ b/apps/web/app/[locale]/home/[account]/bookings/guests/page.tsx @@ -1,14 +1,13 @@ import { UserCircle, Plus } from 'lucide-react'; +import { createBookingManagementApi } from '@kit/booking-management/api'; import { getSupabaseServerClient } from '@kit/supabase/server-client'; import { Button } from '@kit/ui/button'; import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card'; -import { createBookingManagementApi } from '@kit/booking-management/api'; - +import { AccountNotFound } from '~/components/account-not-found'; import { CmsPageShell } from '~/components/cms-page-shell'; import { EmptyState } from '~/components/empty-state'; -import { AccountNotFound } from '~/components/account-not-found'; interface PageProps { params: Promise<{ account: string }>; @@ -62,7 +61,7 @@ export default async function GuestsPage({ params }: PageProps) {| Name | Telefon | @@ -72,9 +71,13 @@ export default async function GuestsPage({ params }: PageProps) {|
|---|---|---|
| - {String(guest.last_name ?? '')}, {String(guest.first_name ?? '')} + {String(guest.last_name ?? '')},{' '} + {String(guest.first_name ?? '')} | {String(guest.email ?? '—')} | {String(guest.phone ?? '—')} | diff --git a/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx b/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx index 6cb7c4908..653bcd912 100644 --- a/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx +++ b/apps/web/app/[locale]/home/[account]/bookings/new/page.tsx @@ -1,15 +1,22 @@ -import { getSupabaseServerClient } from '@kit/supabase/server-client'; import { createBookingManagementApi } from '@kit/booking-management/api'; import { CreateBookingForm } from '@kit/booking-management/components'; -import { CmsPageShell } from '~/components/cms-page-shell'; -import { AccountNotFound } from '~/components/account-not-found'; +import { getSupabaseServerClient } from '@kit/supabase/server-client'; -interface Props { params: Promise<{ account: string }> } +import { AccountNotFound } from '~/components/account-not-found'; +import { CmsPageShell } from '~/components/cms-page-shell'; + +interface Props { + params: Promise<{ account: string }>; +} export default async function NewBookingPage({ params }: Props) { const { account } = await params; const client = getSupabaseServerClient(); - const { data: acct } = await client.from('accounts').select('id').eq('slug', account).single(); + const { data: acct } = await client + .from('accounts') + .select('id') + .eq('slug', account) + .single(); if (!acct) { return (