feat: pre-existing local changes — fischerei, verband, modules, members, packages
Some checks failed
Workflow / ʦ TypeScript (push) Failing after 6m20s
Workflow / ⚫️ Test (push) Has been skipped

Commits all remaining uncommitted local work:

- apps/web: fischerei, verband, modules, members-cms, documents,
  newsletter, meetings, site-builder, courses, bookings, events,
  finance pages and components
- apps/web: marketing page updates, layout, paths config,
  next.config.mjs, styles/makerkit.css
- apps/web/i18n: documents, fischerei, marketing, verband (de+en)
- packages/features: finance, fischerei, member-management,
  module-builder, newsletter, sitzungsprotokolle, verbandsverwaltung
  server APIs and components
- packages/ui: button.tsx updates
- pnpm-lock.yaml
This commit is contained in:
Zaid Marzguioui
2026-04-02 01:19:54 +02:00
parent a1719671df
commit b26e5aaafa
153 changed files with 2329 additions and 1227 deletions

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface Props {
export default async function EditClubPage({ params }: Props) {
const { account, clubId } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -35,7 +38,7 @@ export default async function EditClubPage({ params }: Props) {
return (
<CmsPageShell
account={account}
title={`${String((club as Record<string, unknown>).name)}Bearbeiten`}
title={`${String((club as Record<string, unknown>).name)}${t('pages.editClubTitle')}`}
>
<VerbandTabNavigation account={account} activeTab="clubs" />
<CreateClubForm

View File

@@ -1,6 +1,7 @@
import Link from 'next/link';
import { Pencil } from 'lucide-react';
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { Button } from '@kit/ui/button';
@@ -22,6 +23,7 @@ interface Props {
export default async function ClubDetailPage({ params }: Props) {
const { account, clubId } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -44,29 +46,28 @@ export default async function ClubDetailPage({ params }: Props) {
if (!detail?.club) return <AccountNotFound />;
return (
<CmsPageShell account={account} title={`Verein ${detail.club.name}`}>
<CmsPageShell
account={account}
title={`${t('pages.clubDetailTitle')} ${detail.club.name}`}
>
<VerbandTabNavigation account={account} activeTab="clubs" />
<div className="space-y-6">
{/* Club Header */}
<div className="flex items-start justify-between">
<div>
<h1 className="text-2xl font-bold">{detail.club.name}</h1>
{detail.club.short_name && (
<p className="text-muted-foreground">{detail.club.short_name}</p>
)}
<div className="text-muted-foreground mt-2 flex flex-wrap gap-4 text-sm">
{detail.club.city && (
{detail.club.address_city && (
<span>
{detail.club.zip} {detail.club.city}
{detail.club.address_zip} {detail.club.address_city}
</span>
)}
{detail.club.member_count != null && (
<span>{detail.club.member_count} Mitglieder</span>
)}
{detail.club.founded_year && (
<span>Gegr. {detail.club.founded_year}</span>
)}
</div>
</div>
<Button asChild variant="outline" size="sm">

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface Props {
export default async function NewClubPage({ params }: Props) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -28,7 +31,7 @@ export default async function NewClubPage({ params }: Props) {
const types = await api.listTypes(acct.id);
return (
<CmsPageShell account={account} title="Neuer Verein">
<CmsPageShell account={account} title={t('pages.newClubTitle')}>
<VerbandTabNavigation account={account} activeTab="clubs" />
<CreateClubForm
accountId={acct.id}

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -17,6 +19,7 @@ export default async function ClubsPage({ params, searchParams }: Props) {
const { account } = await params;
const search = await searchParams;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -42,7 +45,7 @@ export default async function ClubsPage({ params, searchParams }: Props) {
]);
return (
<CmsPageShell account={account} title="Verbandsverwaltung - Vereine">
<CmsPageShell account={account} title={t('pages.clubsTitle')}>
<VerbandTabNavigation account={account} activeTab="clubs" />
<ClubsDataTable
data={result.data}

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -25,6 +27,7 @@ export default async function HierarchyEventsPage({
const { account } = await params;
const sp = await searchParams;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -49,8 +52,8 @@ export default async function HierarchyEventsPage({
return (
<CmsPageShell
account={account}
title="Verbandsverwaltung - Veranstaltungen"
description="Veranstaltungen aller verknüpften Organisationen anzeigen und filtern"
title={t('pages.eventsTitle')}
description={t('pages.eventsDescription')}
>
<VerbandTabNavigation account={account} activeTab="events" />
<HierarchyEvents

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface PageProps {
export default async function HierarchyPage({ params }: PageProps) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -34,8 +37,8 @@ export default async function HierarchyPage({ params }: PageProps) {
return (
<CmsPageShell
account={account}
title="Verbandsverwaltung - Hierarchie"
description="Verwalten Sie die Organisationsstruktur Ihres Verbands"
title={t('pages.hierarchyTitle')}
description={t('pages.hierarchyDescription')}
>
<VerbandTabNavigation account={account} activeTab="hierarchy" />
<HierarchyTree

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -25,6 +27,7 @@ export default async function CrossOrgMembersPage({
const { account } = await params;
const sp = await searchParams;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -75,8 +78,8 @@ export default async function CrossOrgMembersPage({
return (
<CmsPageShell
account={account}
title="Verbandsverwaltung - Mitgliedersuche"
description="Suchen Sie Mitglieder in allen verknüpften Organisationen"
title={t('pages.memberSearchTitle')}
description={t('pages.memberSearchDescription')}
>
<VerbandTabNavigation account={account} activeTab="members" />
<CrossOrgMemberSearch

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface PageProps {
export default async function VerbandPage({ params }: PageProps) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -28,7 +31,7 @@ export default async function VerbandPage({ params }: PageProps) {
const stats = await api.getDashboardStats(acct.id);
return (
<CmsPageShell account={account} title="Verbandsverwaltung">
<CmsPageShell account={account} title={t('pages.overviewTitle')}>
<VerbandTabNavigation account={account} activeTab="overview" />
<VerbandDashboard stats={stats} account={account} />
</CmsPageShell>

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface PageProps {
export default async function ReportingPage({ params }: PageProps) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -34,8 +37,8 @@ export default async function ReportingPage({ params }: PageProps) {
return (
<CmsPageShell
account={account}
title="Verbandsverwaltung - Berichte"
description="Aggregierte Berichte und Kennzahlen aller Organisationen im Verband"
title={t('pages.reportingTitle')}
description={t('pages.reportingDescription')}
>
<VerbandTabNavigation account={account} activeTab="reporting" />
<HierarchyReport summary={summary} report={report} />

View File

@@ -3,6 +3,7 @@
import { useState } from 'react';
import { Plus, Pencil, Trash2, Settings } from 'lucide-react';
import { useTranslations } from 'next-intl';
import { Button } from '@kit/ui/button';
import { Card, CardContent, CardHeader, CardTitle } from '@kit/ui/card';
@@ -141,7 +142,7 @@ function SettingsSection({
<>
<div>
<span className="font-medium">{String(item.name)}</span>
{item.description && (
{Boolean(item.description) && (
<p className="text-muted-foreground text-xs">
{String(item.description)}
</p>
@@ -183,6 +184,7 @@ export default function SettingsContent({
types,
feeTypes,
}: SettingsContentProps) {
const t = useTranslations('verband');
// Roles
const { execute: execCreateRole, isPending: isCreatingRole } =
useActionWithToast(createRole, {
@@ -228,14 +230,13 @@ export default function SettingsContent({
return (
<div className="space-y-6">
<div>
<h1 className="text-2xl font-bold">Einstellungen</h1>
<p className="text-muted-foreground">
Funktionen, Vereinstypen und Beitragsarten verwalten
{t('settings.subtitle')}
</p>
</div>
<SettingsSection
title="Funktionen (Rollen)"
title={t('settings.roles')}
items={roles}
onAdd={(name, description) =>
execCreateRole({ accountId, name, description, sortOrder: 0 })
@@ -247,7 +248,7 @@ export default function SettingsContent({
/>
<SettingsSection
title="Vereinstypen"
title={t('settings.types')}
items={types}
onAdd={(name, description) =>
execCreateType({ accountId, name, description, sortOrder: 0 })
@@ -259,7 +260,7 @@ export default function SettingsContent({
/>
<SettingsSection
title="Beitragsarten"
title={t('settings.feeTypes')}
items={feeTypes}
onAdd={(name, description) =>
execCreateFeeType({ accountId, name, description, isActive: true })

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import { VerbandTabNavigation } from '@kit/verbandsverwaltung/components';
@@ -14,6 +16,7 @@ interface Props {
export default async function SettingsPage({ params }: Props) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -31,7 +34,7 @@ export default async function SettingsPage({ params }: Props) {
]);
return (
<CmsPageShell account={account} title="Verbandsverwaltung - Einstellungen">
<CmsPageShell account={account} title={t('pages.settingsTitle')}>
<VerbandTabNavigation account={account} activeTab="settings" />
<SettingsContent
accountId={acct.id}

View File

@@ -26,7 +26,6 @@ export default function StatisticsContent() {
return (
<div className="space-y-6">
<div>
<h1 className="text-2xl font-bold">Statistik</h1>
<p className="text-muted-foreground">
Entwicklung der Mitgliedsvereine und Gesamtmitglieder im Zeitverlauf
</p>

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { VerbandTabNavigation } from '@kit/verbandsverwaltung/components';
import { CmsPageShell } from '~/components/cms-page-shell';
@@ -10,9 +12,10 @@ interface Props {
export default async function StatisticsPage({ params }: Props) {
const { account } = await params;
const t = await getTranslations('verband');
return (
<CmsPageShell account={account} title="Verbandsverwaltung - Statistik">
<CmsPageShell account={account} title={t('pages.statisticsTitle')}>
<VerbandTabNavigation account={account} activeTab="statistics" />
<StatisticsContent />
</CmsPageShell>

View File

@@ -1,3 +1,5 @@
import { getTranslations } from 'next-intl/server';
import { getSupabaseServerClient } from '@kit/supabase/server-client';
import { createVerbandApi } from '@kit/verbandsverwaltung/api';
import {
@@ -15,6 +17,7 @@ interface PageProps {
export default async function TemplatesPage({ params }: PageProps) {
const { account } = await params;
const client = getSupabaseServerClient();
const t = await getTranslations('verband');
const { data: acct } = await client
.from('accounts')
@@ -30,8 +33,8 @@ export default async function TemplatesPage({ params }: PageProps) {
return (
<CmsPageShell
account={account}
title="Verbandsverwaltung - Vorlagen"
description="Geteilte Vorlagen aus der Verbandshierarchie klonen und verwenden"
title={t('pages.templatesTitle')}
description={t('pages.templatesDescription')}
>
<VerbandTabNavigation account={account} activeTab="templates" />
<SharedTemplates accountId={acct.id} templates={templates} />