From ce83ade357c90d8dfb45614b42f12c4bb1f5511c Mon Sep 17 00:00:00 2001 From: Per Hoener Date: Sun, 27 Sep 2026 18:41:54 +0200 Subject: [PATCH] Erstelle Aktuelles-Meldungen und Flyer-Varianten --- .gitignore | 3 ++ content/news/erntefest-2026.json | 13 ++++++++ .../news/lebendiger-adventskalender-2026.json | 13 ++++++++ package.json | 5 +-- scripts/generate-event-flyer-variants.mjs | 21 ++++++++++++ src/app/aktuelles/[slug]/page.tsx | 32 +++++++++++++++++-- src/app/termine/[slug]/page.tsx | 4 +-- src/components/EventFlyer.tsx | 18 +++++++++++ src/lib/content/index.ts | 4 ++- src/lib/content/schemas.ts | 3 +- src/styles/goldebek.css | 1 + 11 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 content/news/erntefest-2026.json create mode 100644 content/news/lebendiger-adventskalender-2026.json create mode 100644 scripts/generate-event-flyer-variants.mjs create mode 100644 src/components/EventFlyer.tsx diff --git a/.gitignore b/.gitignore index 5c2bc84..43db90b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,9 @@ public/images/backgrounds/** !public/images/backgrounds/.gitkeep public/images/content/** !public/images/content/.gitkeep +# Event flyer source JPEGs are tracked; the build generates these variants. +public/images/events/*.avif +public/images/events/*.svg # Env files (nur .env.example tracken) .env diff --git a/content/news/erntefest-2026.json b/content/news/erntefest-2026.json new file mode 100644 index 0000000..d0ac768 --- /dev/null +++ b/content/news/erntefest-2026.json @@ -0,0 +1,13 @@ +{ + "id":"erntefest-2026", + "slug":"erntefest-2026", + "title":"Goldebeker Erntefest am 17. Oktober", + "teaser":"Am 17. Oktober 2026 um 19:30 Uhr ist das Goldebeker Erntefest geplant. Anmeldungen sind bis zum 9. Oktober möglich.", + "body":"Das Erntefest findet bei ausreichender Teilnehmerzahl statt. Gäste sind herzlich willkommen. Der Festbeitrag beträgt 20 Euro.", + "eventSlugs":["erntefest-2026"], + "publishedAt":"2026-09-27", + "sourceUrl":"/images/events/erntefest-adventskalender-2026.jpeg", + "sourceName":"Flyer zum Goldebeker Erntefest 2026", + "lastVerified":"2026-09-27", + "status":"published" +} diff --git a/content/news/lebendiger-adventskalender-2026.json b/content/news/lebendiger-adventskalender-2026.json new file mode 100644 index 0000000..ab149ea --- /dev/null +++ b/content/news/lebendiger-adventskalender-2026.json @@ -0,0 +1,13 @@ +{ + "id":"lebendiger-adventskalender-2026", + "slug":"lebendiger-adventskalender-2026", + "title":"Lebendiger Adventskalender startet am 1. Dezember", + "teaser":"Der Kulturausschuss plant den Auftakt des lebendigen Adventskalenders am 1. Dezember 2026 um 19 Uhr. Weitere Abende können noch vergeben werden.", + "body":"Der lebendige Adventskalender soll bei ausreichender Teilnehmerzahl wieder besinnliche vorweihnachtliche Abende ermöglichen. Für die Zahlen 2 bis 24 werden noch Teilnehmende gesucht; Anmeldeschluss ist der 8. November.", + "eventSlugs":["lebendiger-adventskalender-2026"], + "publishedAt":"2026-09-27", + "sourceUrl":"/images/events/erntefest-adventskalender-2026.jpeg", + "sourceName":"Flyer zum lebendigen Adventskalender 2026", + "lastVerified":"2026-09-27", + "status":"published" +} diff --git a/package.json b/package.json index 5aa12af..ef47452 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,13 @@ "images": "node scripts/optimize-images.mjs", "images:prune": "node scripts/optimize-images.mjs --prune", "images:strip-metadata": "node scripts/strip-image-metadata.mjs", + "images:events": "node scripts/generate-event-flyer-variants.mjs", "images:check-metadata": "node scripts/strip-image-metadata.mjs --check", "downloads:check-metadata": "node scripts/check-download-metadata.mjs", "media:migrate": "node scripts/migrate-media-sources.mjs", "post:new": "node scripts/new-trip-report.mjs", - "dev": "next dev", - "build": "npm run clean:public && if [ \"${SKIP_IMAGE_OPTIMIZATION:-false}\" != true ]; then npm run images:prune; fi && npm run images:strip-metadata && npm run downloads:check-metadata && next build", + "dev": "npm run images:events && next dev", + "build": "npm run clean:public && if [ \"${SKIP_IMAGE_OPTIMIZATION:-false}\" != true ]; then npm run images:prune; fi && npm run images:strip-metadata && npm run images:events && npm run downloads:check-metadata && next build", "build:with-images": "npm run build", "lint": "eslint .", "test": "vitest run", diff --git a/scripts/generate-event-flyer-variants.mjs b/scripts/generate-event-flyer-variants.mjs new file mode 100644 index 0000000..6ca1495 --- /dev/null +++ b/scripts/generate-event-flyer-variants.mjs @@ -0,0 +1,21 @@ +import fs from "node:fs/promises"; +import path from "node:path"; +import sharp from "sharp"; + +const imageDir = path.resolve(import.meta.dirname, "../public/images/events"); +const files = await fs.readdir(imageDir); + +for (const file of files.filter((name) => /\.jpe?g$/i.test(name))) { + const sourcePath = path.join(imageDir, file); + const baseName = path.basename(file, path.extname(file)); + const jpeg = await fs.readFile(sourcePath); + const { width, height } = await sharp(jpeg).metadata(); + if (!width || !height) throw new Error(`Bildabmessungen fehlen: ${file}`); + + const avifPath = path.join(imageDir, `${baseName}.avif`); + const svgPath = path.join(imageDir, `${baseName}.svg`); + await sharp(jpeg).avif({ quality: 75 }).toFile(avifPath); + const svg = `\n`; + await fs.writeFile(svgPath, svg); + console.log(`[images:events] ${file} → ${path.basename(avifPath)}, ${path.basename(svgPath)}`); +} diff --git a/src/app/aktuelles/[slug]/page.tsx b/src/app/aktuelles/[slug]/page.tsx index b4ee299..5996964 100644 --- a/src/app/aktuelles/[slug]/page.tsx +++ b/src/app/aktuelles/[slug]/page.tsx @@ -1,10 +1,36 @@ import type { Metadata } from "next"; +import Link from "next/link"; import { notFound } from "next/navigation"; +import EventFlyer from "@/components/EventFlyer"; import PageHeader from "@/components/PageHeader"; -import { getNews, getNewsItem } from "@/lib/content"; -import { formatShortDate } from "@/lib/dates/events"; +import { getEvent, getNews, getNewsItem } from "@/lib/content"; +import { formatGermanDate, formatShortDate } from "@/lib/dates/events"; import { createPageMetadata } from "@/lib/metadata"; export function generateStaticParams() { return getNews().map((item) => ({ slug:item.slug })); } export async function generateMetadata({ params }: { params:Promise<{slug:string}> }):Promise { const item=getNewsItem((await params).slug); return item ? { ...createPageMetadata({title:item.title,description:item.teaser,path:`/aktuelles/${item.slug}`,type:"article"}), openGraph:{title:item.title,description:item.teaser,type:"article",url:`/aktuelles/${item.slug}`,publishedTime:item.publishedAt,modifiedTime:item.updatedAt,images:[]},twitter:{title:item.title,description:item.teaser,images:[]} } : {}; } -export default async function NewsDetail({ params }: { params:Promise<{slug:string}> }) { const item=getNewsItem((await params).slug); if(!item) notFound(); return <>

Veröffentlicht am {formatShortDate(item.publishedAt)}

{item.body}

; } +export default async function NewsDetail({ params }: { params:Promise<{slug:string}> }) { + const item = getNewsItem((await params).slug); + if (!item) notFound(); + const events = item.eventSlugs?.map((slug) => { + const event = getEvent(slug); + if (!event) throw new Error(`Unbekannter Termin in Aktuelles: ${slug}`); + return event; + }) ?? []; + + return <> + +
+

Veröffentlicht am {formatShortDate(item.publishedAt)}

+

{item.body}

+ {events.map((event) =>
+

{event.title}

+

{formatGermanDate(event.startDate)}{event.startTime ? ` · ${event.startTime} Uhr` : ""}

+ {event.summary ?

{event.summary}

: null} + {event.details?.map((detail) =>

{detail}

)} + {event.flyer ? : null} + Termin und Kalenderdatei öffnen +
)} +
+ ; +} diff --git a/src/app/termine/[slug]/page.tsx b/src/app/termine/[slug]/page.tsx index dc3b207..652b1e6 100644 --- a/src/app/termine/[slug]/page.tsx +++ b/src/app/termine/[slug]/page.tsx @@ -1,7 +1,7 @@ import type { Metadata } from "next"; -import Image from "next/image"; import Link from "next/link"; import { notFound } from "next/navigation"; +import EventFlyer from "@/components/EventFlyer"; import JsonLd from "@/components/JsonLd"; import PageHeader from "@/components/PageHeader"; import { getEvent, getEvents } from "@/lib/content"; @@ -16,5 +16,5 @@ export default async function EventDetailPage({ params }: { params: Promise<{ sl const visibleLocation = event.location && event.privacyApproved === true ? event.location : undefined; const startDate = eventDateTimeIso(event.startDate, event.startTime); const endDate = event.endDate || event.endTime ? eventDateTimeIso(event.endDate ?? event.startDate, event.endTime) : undefined; - return <>
Datum
{formatGermanDate(event.startDate)}
{event.startTime ?
Zeit
{event.startTime}{event.endTime ? `–${event.endTime}` : ""} Uhr
: null}{visibleLocation ?
Ort
{visibleLocation}
: null}{event.organizer ?
Veranstalter
{event.organizer}
: null}
{event.details ?

Weitere Informationen

{event.details.map((detail) =>

{detail}

)}
: null}{event.flyer ?
{event.flyer.alt}
Vollständigen Flyer öffnen
: null}

Speichert diesen Termin als Kalenderdatei, die Sie in Ihrer Kalender-App öffnen können.

; + return <>
Datum
{formatGermanDate(event.startDate)}
{event.startTime ?
Zeit
{event.startTime}{event.endTime ? `–${event.endTime}` : ""} Uhr
: null}{visibleLocation ?
Ort
{visibleLocation}
: null}{event.organizer ?
Veranstalter
{event.organizer}
: null}
{event.details ?

Weitere Informationen

{event.details.map((detail) =>

{detail}

)}
: null}{event.flyer ? : null}

Speichert diesen Termin als Kalenderdatei, die Sie in Ihrer Kalender-App öffnen können.

; } diff --git a/src/components/EventFlyer.tsx b/src/components/EventFlyer.tsx new file mode 100644 index 0000000..27fc792 --- /dev/null +++ b/src/components/EventFlyer.tsx @@ -0,0 +1,18 @@ +import Image from "next/image"; +import type { Event } from "@/lib/content/schemas"; + +export default function EventFlyer({ flyer }: { flyer: NonNullable }) { + const avifSrc = flyer.src.replace(/\.jpe?g$/i, ".avif"); + + return ( +
+
+ + + {flyer.alt} + +
+
Vollständigen Flyer öffnen
+
+ ); +} diff --git a/src/lib/content/index.ts b/src/lib/content/index.ts index 8e36fc1..20b7402 100644 --- a/src/lib/content/index.ts +++ b/src/lib/content/index.ts @@ -1,10 +1,12 @@ import eventsJson from "../../../content/events/events.json"; import newsJson from "../../../content/news/spielplatz-am-langbarg.json"; +import harvestNewsJson from "../../../content/news/erntefest-2026.json"; +import adventNewsJson from "../../../content/news/lebendiger-adventskalender-2026.json"; import sourcesJson from "../../../data/sources.json"; import { assertUnique, eventSchema, newsSchema, sourceSchema, type Event, type NewsItem, type Source } from "./schemas"; const events = eventSchema.array().parse(eventsJson); -const news = newsSchema.array().parse([newsJson]); +const news = newsSchema.array().parse([newsJson, harvestNewsJson, adventNewsJson]); const sources = sourceSchema.array().parse(sourcesJson); assertUnique(events, (item) => item.slug, "Termin-Slug"); assertUnique(news, (item) => item.slug, "News-Slug"); diff --git a/src/lib/content/schemas.ts b/src/lib/content/schemas.ts index 3acdda9..a5c7f7c 100644 --- a/src/lib/content/schemas.ts +++ b/src/lib/content/schemas.ts @@ -24,9 +24,10 @@ export const eventSchema = z.object({ export const newsSchema = z.object({ id: z.string().min(1), slug: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/), title: z.string().min(1), teaser: z.string().min(1), body: z.string().min(1), + eventSlugs: z.array(z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/)).optional(), publishedAt: isoDate, updatedAt: isoDate.optional(), image: z.object({ src: z.string(), alt: z.string().min(1), copyright: z.string().optional() }).optional(), - sourceUrl: z.string().url().optional(), sourceName: z.string().optional(), lastVerified: isoDate, + sourceUrl: z.union([z.string().url(), z.string().regex(/^\/(?!\/)[^\s]*$/)]).optional(), sourceName: z.string().optional(), lastVerified: isoDate, status: z.enum(["published", "draft", "archived"]), }); diff --git a/src/styles/goldebek.css b/src/styles/goldebek.css index f72a223..c8c3486 100644 --- a/src/styles/goldebek.css +++ b/src/styles/goldebek.css @@ -60,6 +60,7 @@ a:focus-visible,button:focus-visible,summary:focus-visible { outline:3px solid w .news-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:1rem}.news-card{display:flex;flex-direction:column;padding:clamp(1.5rem,3vw,2.2rem);border:1px solid var(--line);border-radius:var(--radius);color:inherit;background:white;text-decoration:none;transition:transform .2s ease,box-shadow .2s ease}.news-card:hover{transform:translateY(-3px);box-shadow:var(--shadow)}.news-card h2,.news-card h3{font-size:clamp(1.3rem,2.2vw,1.8rem)}.news-card p{color:var(--muted)}.news-card .text-link{margin-top:auto;text-decoration:underline}.news-card:hover .text-link{color:var(--blue-950);text-decoration-thickness:2px}.news-date,.card-label{font-size:.72rem!important;text-transform:uppercase;letter-spacing:.12em;font-weight:700;color:var(--blue-700)!important} .detail-list{display:grid;gap:0;margin:0}.detail-list div{display:grid;grid-template-columns:minmax(130px,.35fr) 1fr;gap:1rem;padding:1.2rem 0;border-bottom:1px solid var(--line)}.detail-list dt{font-size:.76rem;text-transform:uppercase;letter-spacing:.1em;color:var(--muted);font-weight:700}.detail-list dd{margin:0;font-weight:600} .event-details{margin:2.5rem 0}.event-details h2{margin-bottom:1rem}.event-details p{color:var(--muted)}.event-flyer{margin:2.5rem 0}.event-flyer__image{position:relative;overflow:hidden;border:1px solid var(--line);border-radius:var(--radius);background:#faf9ef}.event-flyer__image--top{aspect-ratio:1024/802}.event-flyer__image--bottom{aspect-ratio:1024/734}.event-flyer__image img{object-fit:cover}.event-flyer__image--top img{object-position:top}.event-flyer__image--bottom img{object-position:bottom}.event-flyer figcaption{margin-top:.7rem;font-size:.9rem}.event-flyer figcaption a{text-decoration:underline} +.news-event{margin-top:3rem;padding-top:2.5rem;border-top:1px solid var(--line)}.news-event h2{margin-bottom:1rem}.news-event .event-flyer{margin-block:2rem}.news-event .button{margin-top:.5rem} .fee-section{padding-top:2.5rem}.fee-section h2{margin-bottom:1rem}.fee-grid{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:.65rem;margin:0}.fee-grid>div{display:flex;flex-direction:column;justify-content:space-between;min-height:104px;padding:1rem;border:1px solid var(--line);border-radius:var(--radius);background:white}.fee-grid dt{font-size:.72rem;line-height:1.35;color:var(--muted);font-weight:700;text-transform:uppercase;letter-spacing:.06em}.fee-grid dd{margin:.75rem 0 0;color:var(--blue-950);font-size:1.18rem;font-weight:700}.fee-grid small{margin-top:.45rem;color:var(--muted);font-size:.72rem;line-height:1.25} .home-section{padding-block:clamp(5rem,9vw,7.5rem)}.home-section--tinted{background:#f1f4f0}.home-section--blue{background:var(--blue-950);color:white}.home-section--blue h2{color:white} .quick-grid--four{grid-template-columns:repeat(4,1fr)}