refactor: drop toast + over-engineered extras, add inline admin feedback
CI / quality (push) Waiting to run

Phase 1 cleanup of the personal-site revamp. Backend/architecture untouched;
changes are limited to removing unused complexity and restoring feedback.

Removals
- Toast system: delete react-hot-toast, Toaster, QueryToastBridge, lib/toast,
  the toggle/easter-egg calls, related i18n keys and the dependency.
- Contact protection: remove Turnstile + per-IP rate limiting
  (lib/contact-guard, lib/contact-protection, admin screen, form widget,
  app-config wiring, nav entry, test).
- Speculative specs: delete orders, products, downloads, project-inquiry.

Inline feedback (replaces toast, no new deps)
- Add lib/admin-feedback (withFlash/readFlash) and components/admin/admin-flash,
  rendered centrally by AdminDashboardShell.
- Emit success/error messages for media, site-settings, portfolio, smtp,
  marquee and maintenance actions; pages read them via searchParams.
- Contact form shows validation/delivery errors inline; success still
  redirects to /success.

Docs
- Fix stale paths in frontend-system-* (components/root -> components/admin,
  lib/root-navigation -> lib/admin-navigation, drop phantom src/) and remove
  contact-protection references from docs and CLAUDE.md.
- Add docs/PHASE0_DIAGNOSIS.md (diagnosis report).

Note: proxy.ts self-fetch kept intentionally; it also drives maintenance mode.
This commit is contained in:
MohFarawati
2026-07-14 21:03:51 +02:00
parent 1a7b3397f6
commit d48497b992
62 changed files with 443 additions and 1453 deletions
+9 -1
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getMaintenanceMode } from "@/lib/app-config";
@@ -28,7 +29,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminMaintenancePage() {
export default async function AdminMaintenancePage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
const authenticated = await isAdminAuthenticated();
if (!authenticated) {
@@ -47,6 +54,7 @@ export default async function AdminMaintenancePage() {
<AdminDashboardShell
copy={copy}
active="maintenance"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
+3 -8
View File
@@ -6,6 +6,7 @@ import { isRedirectError } from "next/dist/client/components/redirect-error";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { withFlash } from "@/lib/admin-feedback";
import { getSiteSettings, updateMarqueeSettings } from "@/lib/app-config";
import { routing } from "@/i18n/routing";
import { getLocalizedPath } from "@/lib/locale";
@@ -17,12 +18,6 @@ async function ensureAdmin() {
}
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
async function revalidateMarqueePages() {
revalidatePath(toInternalAdminPath("/"));
@@ -73,13 +68,13 @@ export async function saveMarqueeSettingsAction(formData: FormData) {
await updateMarqueeSettings(settings);
await revalidateMarqueePages();
redirect(withMessage(getAdminAppPath("/marquee"), "success", "Marquee gespeichert."));
redirect(withFlash(getAdminAppPath("/marquee"), { success: "Marquee gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
const message = error instanceof Error ? error.message : "Marquee konnte nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/marquee"), "error", message));
redirect(withFlash(getAdminAppPath("/marquee"), { error: message }));
}
}
+9 -1
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { MarqueeSettingsForm } from "@/components/admin/marquee-settings-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { MotionFade } from "@/components/motion-fade";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
@@ -26,7 +27,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminMarqueePage() {
export default async function AdminMarqueePage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -44,6 +51,7 @@ export default async function AdminMarqueePage() {
<AdminDashboardShell
copy={copy}
active="marquee"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
+7 -12
View File
@@ -7,6 +7,7 @@ import { isRedirectError } from "next/dist/client/components/redirect-error";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { withFlash } from "@/lib/admin-feedback";
import { countMediaUsageReferences, getMediaAssetById } from "@/lib/media";
import { createStandaloneMediaAsset, deleteMediaAssetAndFile } from "@/lib/media-service";
import { isManagedMediaFilePath } from "@/lib/media-storage";
@@ -19,12 +20,6 @@ async function ensureAdmin() {
}
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
function revalidateMediaPages() {
revalidatePath(toInternalAdminPath("/"));
@@ -47,14 +42,14 @@ export async function createMediaAssetAction(formData: FormData) {
});
revalidateMediaPages();
redirect(withMessage(getAdminAppPath("/media"), "success", "Datei gespeichert."));
redirect(withFlash(getAdminAppPath("/media"), { success: "Datei gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
const message = error instanceof Error ? error.message : "Datei konnte nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/media"), "error", message));
redirect(withFlash(getAdminAppPath("/media"), { error: message }));
}
}
@@ -67,13 +62,13 @@ export async function deleteMediaAssetAction(formData: FormData) {
const asset = await getMediaAssetById(assetId);
if (!asset) {
redirect(withMessage(getAdminAppPath("/media"), "error", "Datei nicht gefunden."));
redirect(withFlash(getAdminAppPath("/media"), { error: "Datei nicht gefunden." }));
}
const usageCount = await countMediaUsageReferences(asset.id);
if (usageCount > 0) {
redirect(withMessage(getAdminAppPath("/media"), "error", "Datei wird noch verwendet."));
redirect(withFlash(getAdminAppPath("/media"), { error: "Datei wird noch verwendet." }));
}
await prisma.mediaAsset.delete({
@@ -90,13 +85,13 @@ export async function deleteMediaAssetAction(formData: FormData) {
}
revalidateMediaPages();
redirect(withMessage(getAdminAppPath("/media"), "success", "Datei geloescht."));
redirect(withFlash(getAdminAppPath("/media"), { success: "Datei geloescht." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
const message = error instanceof Error ? error.message : "Datei konnte nicht geloescht werden.";
redirect(withMessage(getAdminAppPath("/media"), "error", message));
redirect(withFlash(getAdminAppPath("/media"), { error: message }));
}
}
+9 -1
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { MediaLibraryManager } from "@/components/admin/media-library-manager";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getAdminMediaAssets } from "@/lib/media";
@@ -21,7 +22,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminMediaPage() {
export default async function AdminMediaPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -39,6 +46,7 @@ export default async function AdminMediaPage() {
<AdminDashboardShell
copy={copy}
active="media"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
+4
View File
@@ -21,6 +21,7 @@ import {
setAdminSessionCookie,
} from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { readFlash } from "@/lib/admin-feedback";
import { getMaintenanceMode } from "@/lib/app-config";
import { getAdminMediaAssets } from "@/lib/media";
import { getAdminPortfolioCategories, getAdminPortfolioProjects } from "@/lib/portfolio";
@@ -28,6 +29,7 @@ import { getAdminPortfolioCategories, getAdminPortfolioProjects } from "@/lib/po
type AdminPageProps = {
searchParams?: Promise<{
error?: string;
success?: string;
}>;
};
@@ -63,6 +65,7 @@ const copy = {
export default async function AdminPage({ searchParams }: AdminPageProps) {
const resolvedSearchParams = await searchParams;
const flash = readFlash(resolvedSearchParams);
const authConfigured = isAdminAuthConfigured();
const basicConfigured = Boolean(
process.env.ADMIN_BASIC_AUTH_USER && process.env.ADMIN_BASIC_AUTH_PASS,
@@ -186,6 +189,7 @@ export default async function AdminPage({ searchParams }: AdminPageProps) {
<AdminDashboardShell
copy={copy}
active="overview"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
+13 -16
View File
@@ -8,6 +8,7 @@ import { ZodError } from "zod";
import { routing } from "@/i18n/routing";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { withFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { deleteEntityMediaUsages, replaceEntityMediaUsages } from "@/lib/media";
import { resolveMediaSelection } from "@/lib/media-service";
@@ -35,12 +36,6 @@ function getRedirectPath(formData: FormData, fallbackPath: string) {
return String(formData.get("redirectPath") ?? fallbackPath);
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
function normalizeCheckboxValue(formData: FormData, key: string) {
return isCheckedFormValue(formData.get(key));
@@ -139,7 +134,7 @@ export async function upsertCategoryAction(formData: FormData) {
}
await revalidatePortfolioPages();
redirect(withMessage(redirectPath, "success", "Kategorie gespeichert."));
redirect(withFlash(redirectPath, { success: "Kategorie gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
@@ -152,7 +147,7 @@ export async function upsertCategoryAction(formData: FormData) {
? "Kategorie Slug muss eindeutig sein."
: "Kategorie konnte nicht gespeichert werden.";
redirect(withMessage(redirectPath, "error", message));
redirect(withFlash(redirectPath, { error: message }));
}
}
@@ -170,7 +165,7 @@ export async function deleteCategoryAction(formData: FormData) {
});
if (projectCount > 0) {
redirect(withMessage(redirectPath, "error", "Kategorie mit Projekten kann nicht geloescht werden."));
redirect(withFlash(redirectPath, { error: "Kategorie mit Projekten kann nicht geloescht werden." }));
}
await prisma.category.delete({
@@ -180,13 +175,13 @@ export async function deleteCategoryAction(formData: FormData) {
});
await revalidatePortfolioPages();
redirect(withMessage(redirectPath, "success", "Kategorie geloescht."));
redirect(withFlash(redirectPath, { success: "Kategorie geloescht." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
redirect(withMessage(redirectPath, "error", "Kategorie konnte nicht geloescht werden."));
redirect(withFlash(redirectPath, { error: "Kategorie konnte nicht geloescht werden." }));
}
}
@@ -529,7 +524,9 @@ export async function saveProjectAction(formData: FormData) {
}
redirect(
withMessage(getAdminAppPath(`/portfolio/projects/${projectResult.project.id}`), "success", "Projekt gespeichert."),
withFlash(getAdminAppPath(`/portfolio/projects/${projectResult.project.id}`), {
success: "Projekt gespeichert.",
}),
);
} catch (error) {
if (isRedirectError(error)) {
@@ -562,7 +559,7 @@ export async function saveProjectAction(formData: FormData) {
},
});
}
redirect(withMessage(redirectPath, "error", message));
redirect(withFlash(redirectPath, { error: message }));
}
}
@@ -582,7 +579,7 @@ export async function deleteProjectAction(formData: FormData) {
});
if (!project) {
redirect(withMessage(getAdminAppPath("/portfolio"), "error", "Projekt nicht gefunden."));
redirect(withFlash(getAdminAppPath("/portfolio"), { error: "Projekt nicht gefunden." }));
}
await prisma.portfolioProject.delete({
@@ -600,12 +597,12 @@ export async function deleteProjectAction(formData: FormData) {
revalidatePath(getLocalizedPath(locale, `/portfolio/${project.slug}`, siteSettings.defaultLocale));
}
redirect(withMessage(getAdminAppPath("/portfolio"), "success", "Project deleted."));
redirect(withFlash(getAdminAppPath("/portfolio"), { success: "Projekt geloescht." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
redirect(withMessage(getAdminAppPath("/portfolio"), "error", "Unable to delete project."));
redirect(withFlash(getAdminAppPath("/portfolio"), { error: "Projekt konnte nicht geloescht werden." }));
}
}
+9 -1
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { PortfolioCategoriesManager } from "@/components/admin/portfolio-categories-manager";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getAdminPortfolioCategories } from "@/lib/portfolio";
@@ -23,7 +24,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminPortfolioCategoriesPage() {
export default async function AdminPortfolioCategoriesPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -43,6 +50,7 @@ export default async function AdminPortfolioCategoriesPage() {
<AdminDashboardShell
copy={copy}
active="portfolio"
flash={flash}
portfolioChild="categories"
logoutAction={logoutAction}
headerTitle={copy.title}
+3
View File
@@ -1,6 +1,7 @@
import { redirect } from "next/navigation";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { PortfolioProjectsOverview } from "@/components/admin/portfolio-projects-overview";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
@@ -32,6 +33,7 @@ type AdminPortfolioPageProps = {
export default async function AdminPortfolioPage({ searchParams }: AdminPortfolioPageProps) {
const resolvedSearchParams = await searchParams;
const flash = readFlash(resolvedSearchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
@@ -62,6 +64,7 @@ export default async function AdminPortfolioPage({ searchParams }: AdminPortfoli
<AdminDashboardShell
copy={copy}
active="portfolio"
flash={flash}
portfolioChild="overview"
logoutAction={logoutAction}
headerTitle={copy.title}
+7 -1
View File
@@ -3,6 +3,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { PortfolioProjectForm } from "@/components/admin/portfolio-project-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { AppCard } from "@/components/ui/app-card";
import { Button } from "@/components/ui/button";
import { CardContent } from "@/components/ui/card";
@@ -48,11 +49,15 @@ type AdminPortfolioProjectPageProps = {
params: Promise<{
id: string;
}>;
searchParams?: Promise<{ success?: string; error?: string }>;
};
export default async function AdminPortfolioProjectPage({
params,
searchParams,
}: AdminPortfolioProjectPageProps) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -73,13 +78,14 @@ export default async function AdminPortfolioProjectPage({
]);
if (!project) {
redirect(`${getAdminAppPath("/portfolio")}?error=Project+not+found.`);
redirect(getAdminAppPath("/portfolio"));
}
return (
<AdminDashboardShell
copy={copy}
active="portfolio"
flash={flash}
portfolioChild="projects"
logoutAction={logoutAction}
headerTitle={copy.title}
+9 -1
View File
@@ -3,6 +3,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { PortfolioProjectForm } from "@/components/admin/portfolio-project-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getMediaOptions } from "@/lib/media";
@@ -25,7 +26,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminNewPortfolioProjectPage() {
export default async function AdminNewPortfolioProjectPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -46,6 +53,7 @@ export default async function AdminNewPortfolioProjectPage() {
<AdminDashboardShell
copy={copy}
active="portfolio"
flash={flash}
portfolioChild="new-project"
logoutAction={logoutAction}
headerTitle={copy.title}
+5
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { PortfolioProjectsOverview } from "@/components/admin/portfolio-projects-overview";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getAdminPortfolioCategories, getAdminPortfolioProjects } from "@/lib/portfolio";
@@ -25,6 +26,8 @@ type AdminPortfolioProjectsPageProps = {
searchParams?: Promise<{
category?: string;
status?: "all" | "draft" | "published";
success?: string;
error?: string;
}>;
};
@@ -32,6 +35,7 @@ export default async function AdminPortfolioProjectsPage({
searchParams,
}: AdminPortfolioProjectsPageProps) {
const resolvedSearchParams = await searchParams;
const flash = readFlash(resolvedSearchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
@@ -62,6 +66,7 @@ export default async function AdminPortfolioProjectsPage({
<AdminDashboardShell
copy={copy}
active="portfolio"
flash={flash}
portfolioChild="projects"
logoutAction={logoutAction}
headerTitle={copy.title}
+5 -10
View File
@@ -16,6 +16,7 @@ import {
updateSiteSettings,
} from "@/lib/app-config";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { withFlash } from "@/lib/admin-feedback";
import {
PAGE_TITLE_TOKEN,
normalizeSiteDefaultLocale,
@@ -38,12 +39,6 @@ async function ensureAdmin() {
}
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
function parseJsonObject(rawValue: FormDataEntryValue | null, key: string) {
if (typeof rawValue !== "string" || rawValue.trim() === "") {
@@ -260,7 +255,7 @@ export async function saveSiteBrandSettingsAction(formData: FormData) {
});
await revalidateSiteSettingsPages(parsedSettings.defaultLocale);
redirect(withMessage(getAdminAppPath("/site-settings/brand"), "success", "Einstellungen gespeichert."));
redirect(withFlash(getAdminAppPath("/site-settings/brand"), { success: "Einstellungen gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
@@ -273,7 +268,7 @@ export async function saveSiteBrandSettingsAction(formData: FormData) {
? error.message
: "Einstellungen konnten nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/site-settings/brand"), "error", message));
redirect(withFlash(getAdminAppPath("/site-settings/brand"), { error: message }));
}
}
@@ -323,7 +318,7 @@ export async function saveSiteLocalizationSettingsAction(formData: FormData) {
await updateSiteSettings(parsedSettings);
await revalidateSiteSettingsPages(parsedSettings.defaultLocale);
redirect(withMessage(getAdminAppPath("/site-settings/localization"), "success", "Einstellungen gespeichert."));
redirect(withFlash(getAdminAppPath("/site-settings/localization"), { success: "Einstellungen gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
@@ -334,6 +329,6 @@ export async function saveSiteLocalizationSettingsAction(formData: FormData) {
? error.message
: "Einstellungen konnten nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/site-settings/localization"), "error", message));
redirect(withFlash(getAdminAppPath("/site-settings/localization"), { error: message }));
}
}
+9 -1
View File
@@ -4,6 +4,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { SiteSettingsForm } from "@/components/admin/site-settings-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import {
@@ -32,7 +33,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminSiteBrandSettingsPage() {
export default async function AdminSiteBrandSettingsPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -54,6 +61,7 @@ export default async function AdminSiteBrandSettingsPage() {
<AdminDashboardShell
copy={copy}
active="site-settings"
flash={flash}
siteSettingsChild="brand"
logoutAction={logoutAction}
headerTitle={copy.title}
@@ -3,6 +3,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { SiteSettingsForm } from "@/components/admin/site-settings-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import {
@@ -30,7 +31,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminSiteLocalizationSettingsPage() {
export default async function AdminSiteLocalizationSettingsPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -48,6 +55,7 @@ export default async function AdminSiteLocalizationSettingsPage() {
<AdminDashboardShell
copy={copy}
active="site-settings"
flash={flash}
siteSettingsChild="localization"
logoutAction={logoutAction}
headerTitle={copy.title}
+5 -10
View File
@@ -6,6 +6,7 @@ import { isRedirectError } from "next/dist/client/components/redirect-error";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { withFlash } from "@/lib/admin-feedback";
import { isCheckedFormValue } from "@/lib/form-data";
import {
getMailSettings,
@@ -21,12 +22,6 @@ async function ensureAdmin() {
}
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
function parsePort(value: string) {
const port = Number.parseInt(value, 10);
@@ -79,7 +74,7 @@ export async function saveMailSettingsAction(formData: FormData) {
await updateMailSettings(nextMailSettings);
revalidatePath(toInternalAdminPath("/smtp"));
redirect(withMessage(getAdminAppPath("/smtp"), "success", "SMTP Einstellungen gespeichert."));
redirect(withFlash(getAdminAppPath("/smtp"), { success: "SMTP Einstellungen gespeichert." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
@@ -90,7 +85,7 @@ export async function saveMailSettingsAction(formData: FormData) {
? error.message
: "SMTP Einstellungen konnten nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/smtp"), "error", message));
redirect(withFlash(getAdminAppPath("/smtp"), { error: message }));
}
}
@@ -99,7 +94,7 @@ export async function sendTestEmailAction() {
try {
await sendTestEmail();
redirect(withMessage(getAdminAppPath("/smtp"), "success", "Test-E-Mail gesendet."));
redirect(withFlash(getAdminAppPath("/smtp"), { success: "Test-E-Mail gesendet." }));
} catch (error) {
if (isRedirectError(error)) {
throw error;
@@ -110,6 +105,6 @@ export async function sendTestEmailAction() {
? error.message
: "Test-E-Mail konnte nicht gesendet werden.";
redirect(withMessage(getAdminAppPath("/smtp"), "error", message));
redirect(withFlash(getAdminAppPath("/smtp"), { error: message }));
}
}
@@ -1,112 +0,0 @@
"use server";
import { revalidatePath } from "next/cache";
import { redirect } from "next/navigation";
import { isRedirectError } from "next/dist/client/components/redirect-error";
import { getAdminAppPath, toInternalAdminPath } from "@/lib/admin-routing";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { isCheckedFormValue } from "@/lib/form-data";
import {
getContactProtectionSettings,
updateContactProtectionSettings,
} from "@/lib/app-config";
import type { ContactProtectionSettings } from "@/lib/contact-protection";
async function ensureAdmin() {
if (!(await isAdminAuthenticated())) {
await clearAdminSessionCookie();
redirect(getAdminAppPath("/"));
}
}
function withMessage(pathname: string, type: "success" | "error", message: string) {
const params = new URLSearchParams();
params.set(type, message);
return `${pathname}?${params.toString()}`;
}
function parseCount(value: string, fallback: number, label: string) {
const parsed = Number.parseInt(value || String(fallback), 10);
if (!Number.isInteger(parsed) || parsed <= 0) {
throw new Error(`${label} must be a positive number.`);
}
return parsed;
}
function parseContactProtectionFormData(
formData: FormData,
existingSettings: ContactProtectionSettings,
): ContactProtectionSettings {
const turnstileEnabled = isCheckedFormValue(formData.get("turnstileEnabled"));
const turnstileSiteKey = String(formData.get("turnstileSiteKey") ?? "").trim();
const turnstileSecretKey = String(formData.get("turnstileSecretKey") ?? "");
const rateLimitEnabled = isCheckedFormValue(formData.get("contactRateLimitEnabled"));
if (turnstileEnabled && !turnstileSiteKey) {
throw new Error("Turnstile site key is required when Turnstile is enabled.");
}
if (turnstileEnabled && !turnstileSecretKey.trim() && !existingSettings.turnstile.secretKey) {
throw new Error("Turnstile secret key is required when Turnstile is enabled.");
}
return {
turnstile: {
enabled: turnstileEnabled,
siteKey: turnstileSiteKey,
secretKey: turnstileSecretKey.trim()
? turnstileSecretKey
: existingSettings.turnstile.secretKey,
},
rateLimit: {
enabled: rateLimitEnabled,
maxRequests: parseCount(
String(formData.get("contactRateLimitMaxRequests") ?? ""),
existingSettings.rateLimit.maxRequests,
"Rate limit max requests",
),
windowMinutes: parseCount(
String(formData.get("contactRateLimitWindowMinutes") ?? ""),
existingSettings.rateLimit.windowMinutes,
"Rate limit window minutes",
),
},
};
}
export async function saveContactProtectionSettingsAction(formData: FormData) {
await ensureAdmin();
try {
const existingSettings = await getContactProtectionSettings();
const nextSettings = parseContactProtectionFormData(formData, existingSettings);
await updateContactProtectionSettings(nextSettings);
revalidatePath(toInternalAdminPath("/smtp/contact-protection"));
revalidatePath("/contact");
revalidatePath("/ar/contact");
revalidatePath("/en/contact");
redirect(
withMessage(
getAdminAppPath("/smtp/contact-protection"),
"success",
"Contact Protection gespeichert.",
),
);
} catch (error) {
if (isRedirectError(error)) {
throw error;
}
const message =
error instanceof Error
? error.message
: "Contact Protection konnte nicht gespeichert werden.";
redirect(withMessage(getAdminAppPath("/smtp/contact-protection"), "error", message));
}
}
@@ -1,62 +0,0 @@
import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { ContactProtectionForm } from "@/components/admin/contact-protection-form";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { getContactProtectionFormValues } from "@/lib/app-config";
import { saveContactProtectionSettingsAction } from "./actions";
export const dynamic = "force-dynamic";
const copy = {
title: "Contact Protection",
subtitle: "Turnstile und Rate Limiting fuer das Kontaktformular.",
overview: "Uebersicht",
maintenance: "Wartungsmodus",
uiKit: "UI Kit",
media: "Media",
siteSettings: "Settings",
smtp: "SMTP",
contactProtection: "Contact Protection",
portfolio: "Portfolio",
logout: "Ausloggen",
backToSite: "Zur Website",
};
export default async function AdminSMTPProtectionPage() {
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
async function logoutAction() {
"use server";
await clearAdminSessionCookie();
redirect(getAdminAppPath("/"));
}
const settings = await getContactProtectionFormValues();
return (
<AdminDashboardShell
copy={copy}
active="smtp"
smtpChild="contact-protection"
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
>
<div className="space-y-6">
<MotionFade delay={0.16}>
<ContactProtectionForm
action={saveContactProtectionSettingsAction}
initialSettings={settings}
/>
</MotionFade>
</div>
</AdminDashboardShell>
);
}
+9 -3
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { SMTPSettingsForm } from "@/components/admin/smtp-settings-form";
import { Button } from "@/components/ui/button";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
@@ -21,13 +22,18 @@ const copy = {
media: "Media",
siteSettings: "Settings",
smtp: "SMTP",
contactProtection: "Contact Protection",
portfolio: "Portfolio",
logout: "Ausloggen",
backToSite: "Zur Website",
};
export default async function AdminSMTPPage() {
export default async function AdminSMTPPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
if (!(await isAdminAuthenticated())) {
redirect(getAdminAppPath("/"));
}
@@ -45,7 +51,7 @@ export default async function AdminSMTPPage() {
<AdminDashboardShell
copy={copy}
active="smtp"
smtpChild="settings"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}
+9 -1
View File
@@ -2,6 +2,7 @@ import { redirect } from "next/navigation";
import { MotionFade } from "@/components/motion-fade";
import { AdminDashboardShell } from "@/components/admin/admin-dashboard-shell";
import { readFlash } from "@/lib/admin-feedback";
import { clearAdminSessionCookie, isAdminAuthenticated } from "@/lib/admin-auth";
import { getAdminAppPath } from "@/lib/admin-routing";
import { UiKitShowcase } from "@/components/ui/ui-kit-showcase";
@@ -21,7 +22,13 @@ const copy = {
backToSite: "Zur Website",
};
export default async function AdminUiKitPage() {
export default async function AdminUiKitPage({
searchParams,
}: {
searchParams?: Promise<{ success?: string; error?: string }>;
}) {
const flash = readFlash(await searchParams);
const authenticated = await isAdminAuthenticated();
if (!authenticated) {
@@ -39,6 +46,7 @@ export default async function AdminUiKitPage() {
<AdminDashboardShell
copy={copy}
active="ui-kit"
flash={flash}
logoutAction={logoutAction}
headerTitle={copy.title}
headerDescription={copy.subtitle}