bennot/church-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: version bump

Browse source
This commit is contained in:
Benno Tielen 2026-02-16 14:28:43 +01:00
parent c108f24de3
commit 48af8a0063
20 changed files with 27125 additions and 19049 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -45,3 +45,5 @@ next-env.d.ts
.env
/media
*storybook.log

17
.storybook/main.ts
View file

@ -1,17 +0,0 @@
import type { StorybookConfig } from '@storybook/nextjs'
const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
}
export default config

32
.storybook/preview.tsx
View file

@ -1,32 +0,0 @@
import type { Preview } from '@storybook/react'
import { defaultFont } from '@/assets/fonts'
const preview: Preview = {
decorators: [
(Story) => {
return (
<div className={defaultFont.className} style={{fontSize: 20}}>
<Story />
</div>
)
},
],
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
backgrounds: {
values: [
{ name: "light", value: "#ffffff" },
{ name: "shade2", value: "#CBD6D5" },
{ name: 'dark', value: "#728F8D" }
],
default: "light"
}
}
}
export default preview

7
Dockerfile
View file

@ -1,19 +1,18 @@
# From https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
FROM node:18-alpine AS base
FROM node:22-alpine AS base
RUN corepack enable;
RUN apk add --no-cache libc6-compat
# Install dependencies only when needed
FROM base AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* .yarnrc.yml package-lock.json* pnpm-lock.yaml* ./
RUN \
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
elif [ -f package-lock.json ]; then npm ci; \
elif [ -f package-lock.json ]; then npm ci && npm install --os=linux --libc=musl --cpu=x64 sharp; \
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
else echo "Lockfile not found." && exit 1; \
fi

70
Dockerfile-old
View file

@ -1,70 +0,0 @@
# From https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
FROM node:21-alpine AS base
# Install dependencies only when needed
FROM base AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json .yarnrc.yml yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN yarn set version stable
RUN \
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
elif [ -f package-lock.json ]; then npm ci; \
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
else echo "Lockfile not found." && exit 1; \
fi
# Rebuild the source code only when needed
FROM base AS builder
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
# Next.js collects completely anonymous telemetry data about general usage.
# Learn more here: https://nextjs.org/telemetry
# Uncomment the following line in case you want to disable telemetry during the build.
# ENV NEXT_TELEMETRY_DISABLED 1
RUN \
if [ -f yarn.lock ]; then yarn run build; \
elif [ -f package-lock.json ]; then npm run build; \
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
else echo "Lockfile not found." && exit 1; \
fi
# Production image, copy all the files and run next
FROM base AS runner
WORKDIR /app
ENV NODE_ENV production
# Uncomment the following line in case you want to disable telemetry during runtime.
# ENV NEXT_TELEMETRY_DISABLED 1
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
COPY --from=builder /app/public ./public
# Set the correct permission for prerender cache
RUN mkdir .next
RUN chown nextjs:nodejs .next
# Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs
EXPOSE 3000
ENV PORT 3000
# server.js is created by next build from the standalone output
# https://nextjs.org/docs/pages/api-reference/next-config-js/output
CMD HOSTNAME="0.0.0.0" node server.js

94
README.md
View file

@ -1,50 +1,82 @@
# Heilige Drei Könige Website
This is the repository for the Heilige Drei Könige Catholic Church website, built using
Payload CMS v3, NextJS, React and Postges.
## Getting Started
This repository contains the source code for the Heilige Drei Könige Catholic Church website, built with:
### Prerequisites
- Node.js and npm: Make sure you have Node.js and npm installed on your machine.
- Postgres: You'll need a PostgresSQL database to store the website data.
- Next.js
- React
- Payload CMS v3
- PostgreSQL
## Quick start
### Postgres Database
You will need the an Postgres database including the postgis extension
1) Requirements
- Node.js 22+ (see `engines` in `package.json`)
- npm (or your preferred package manager)
- Database PostgreSQL with PostGIS extension
2) Install dependencies
```bash
docker pull postgis/postgis
npm install
```
#### Migration
To create a new database migration use:
```bash
yarn payload migrate:create [name]
```
After the changes are pushed to the production server, the migration has to be
executed on the production database with `yarn payload migrate`
Todo: integrate this step in Continious Deployment
### Environment variables
Please set the environment variables in the `.env` file
3) Configure environment
```bash
cp .env.example .env
```
Then update the values as needed. Example keys from `.env.example`:
- `DATABASE_URI` — database connection string (Mongo example provided). For Postgres, use a URL like `postgres://user:password@host:5432/dbname`.
- `PAYLOAD_SECRET` — secret used by Payload
- `GOOGLE_BUCKET` — GCS bucket name (if using @payloadcms/storage-gcs)
- `RESEND_API_KEY` — API key for Resend (emails)
### Development server
4) Run the development server
```bash
npm run dev
```
By default the app runs at http://localhost:3000
## Database options
### PostgreSQL + PostGIS
You can run a Postgres image with PostGIS locally:
```bash
docker pull postgis/postgis
```
Create and run a container, then set your `DATABASE_URI` to the Postgres URL. Ensure the PostGIS extension is enabled in your database.
Alternatively, you can enable the Postgres service in `docker-compose.yml` (currently commented out) and use that as your local DB.
## Migrations (Payload)
Create a new migration:
```bash
npm run payload migrate:create --<name>
```
Apply pending migrations:
```bash
npm run payload migrate
```
Note: After deploying changes to production, ensure migrations are executed against the production database. (Todo: Integrate this step into Continuous Deployment.)
## Admin panel (Payload)
Once the server is running, open:
- http://localhost:3000/admin
## Scripts
Common scripts available in `package.json`:
- `npm run dev` — start Next.js dev server
- `npm run build` — build for production
- `npm start` — start the production server
- `npm test` — run tests (Vitest)
- `npm run storybook` — start Storybook on port 6006
## Storybook
Storybook is a popular open-source tool used for building UI components and pages in isolation. Think of it as a playground for your user interface elements. It allows developers to create, test, and document components independently from the main application.
Storybook lets you develop and preview UI components in isolation.
Run `yarn storybook` to view the storybook
Start Storybook:
```bash
npm run storybook
```
Open http://localhost:6006

5
next.config.mjs
View file

@ -4,11 +4,6 @@ import { withPayload } from '@payloadcms/next/withPayload'
const nextConfig = {
// Your Next.js config here
output: 'standalone',
eslint: {
// Warning: This allows production builds to successfully complete even if
// your project has ESLint errors.
ignoreDuringBuilds: true,
},
images: {
remotePatterns: [
{

19010
package-lock.json generated Normal file
View file

File diff suppressed because it is too large Load diff

71
package.json
View file

@ -15,55 +15,46 @@
"serve": "cross-env NODE_OPTIONS=--no-deprecation next start",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build",
"chromatic": "npx chromatic --project-token=chpt_70d6a2e05af185a",
"test": "vitest"
},
"dependencies": {
"@nyariv/sandboxjs": "0.8.24",
"@payloadcms/db-postgres": "^3.53.0",
"@payloadcms/next": "^3.53.0",
"@payloadcms/richtext-lexical": "^3.53.0",
"@payloadcms/storage-gcs": "^3.53.0",
"@nyariv/sandboxjs": "0.8.28",
"@payloadcms/db-postgres": "^3.74.0",
"@payloadcms/next": "^3.74.0",
"@payloadcms/richtext-lexical": "^3.74.0",
"@payloadcms/storage-gcs": "^3.74.0",
"classnames": "^2.5.1",
"cross-env": "^7.0.3",
"graphql": "^16.8.1",
"cross-env": "^10.1.0",
"graphql": "^16.12.0",
"languagedetect": "^2.0.0",
"moment": "^2.30.1",
"next": "15.3.8",
"payload": "^3.53.0",
"qs-esm": "^7.0.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"resend": "^4.1.2",
"sharp": "0.32.6",
"zod": "^3.24.1"
"next": "16.1.6",
"payload": "^3.74.0",
"qs-esm": "^7.0.3",
"react": "19.2.4",
"react-dom": "19.2.4",
"resend": "^6.9.1",
"sharp": "0.34.5",
"zod": "^4.3.6"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.6.1",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/addon-onboarding": "^8.2.9",
"@storybook/blocks": "^8.2.9",
"@storybook/nextjs": "^8.2.9",
"@storybook/react": "^8.2.9",
"@storybook/test": "^8.2.9",
"@swc/cli": "^0.4.0",
"@swc/core": "^1.7.10",
"@types/node": "^20.12.12",
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"chromatic": "^11.12.0",
"eslint": "^8",
"eslint-config-next": "15.1.7",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-storybook": "^0.8.0",
"storybook": "^8.2.9",
"typescript": "5.5.4",
"vitest": "^3.1.1"
"@swc/cli": "^0.7.10",
"@swc/core": "^1.15.11",
"@types/node": "^20.19.32",
"@types/react": "19.2.13",
"@types/react-dom": "19.2.3",
"eslint": "9.26.0",
"eslint-config-next": "16.1.6",
"eslint-config-prettier": "^10.1.8",
"typescript": "5.9.3",
"vitest": "^4.0.18",
"storybook": "^10.2.7",
"@storybook/nextjs-vite": "^10.2.7",
"vite": "^7.3.1",
"eslint-plugin-storybook": "^10.2.7"
},
"engines": {
"node": "^18.20.2 || >=20.9.0"
"node": ">=22.0.0"
},
"packageManager": "yarn@4.4.1"
"packageManager": "npm@10.9.0"
}

2
src/app/(home)/gottesdienst/page.tsx
View file

@ -6,7 +6,7 @@ import { NextPrevButtons } from '@/components/NextPrevButtons/NextPrevButtons'
import moment from 'moment'
import { weekNumber } from '@/utils/week'
import { EventRow } from '@/components/EventRow/EventRow'
import Error from '@/pages/_error'
import Error from '@/components/Error/Error'
import { fetchWorship } from '@/fetch/worship'
import { tranformWorship } from '@/utils/dto/worship'
import { AdminMenu } from '@/components/AdminMenu/AdminMenu'

2
src/app/(home)/veranstaltungen/page.tsx
View file

@ -12,7 +12,7 @@ import { fetchHighlightsBetweenDates } from '@/fetch/highlights'
import { Row } from '@/components/Flex/Row'
import { Col } from '@/components/Flex/Col'
import { highlightLink } from '@/utils/dto/highlight'
import Error from '@/pages/_error'
import Error from '@/components/Error/Error'
import { AdminMenu } from '@/components/AdminMenu/AdminMenu'
import { isAuthenticated } from '@/utils/auth'

4
src/app/(payload)/admin/importMap.js
View file

@ -12,6 +12,7 @@ import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864
import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
import { default as default_9bcae99938dc292be0063ce32055e14c } from '../../../components/Logo/Logo'
import { GcsClientUploadHandler as GcsClientUploadHandler_06e62ca02c7c441053a9b643e5545934 } from '@payloadcms/storage-gcs/client'
import { CollectionCards as CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1 } from '@payloadcms/next/rsc'
export const importMap = {
"@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell": RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
@ -27,5 +28,6 @@ export const importMap = {
"@payloadcms/richtext-lexical/client#BoldFeatureClient": BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
"@payloadcms/richtext-lexical/client#ItalicFeatureClient": ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
"/components/Logo/Logo#default": default_9bcae99938dc292be0063ce32055e14c,
"@payloadcms/storage-gcs/client#GcsClientUploadHandler": GcsClientUploadHandler_06e62ca02c7c441053a9b643e5545934
"@payloadcms/storage-gcs/client#GcsClientUploadHandler": GcsClientUploadHandler_06e62ca02c7c441053a9b643e5545934,
"@payloadcms/next/rsc#CollectionCards": CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1
}

0
src/pages/_error.tsx → src/components/Error/Error.tsx
View file

2
src/globals/Menu.ts
View file

@ -140,6 +140,6 @@ export const MenuGlobal: GlobalConfig = {
update: isAdmin()
},
hooks: {
afterChange: [() => revalidateTag("menu")]
afterChange: [() => revalidateTag("menu", "max")]
}
}

7923
src/migrations/20260205_155735_version_bump.json Normal file
View file

File diff suppressed because it is too large Load diff

24
src/migrations/20260205_155735_version_bump.ts Normal file
View file

@ -0,0 +1,24 @@
import { MigrateUpArgs, MigrateDownArgs, sql } from '@payloadcms/db-postgres'
export async function up({ db, payload, req }: MigrateUpArgs): Promise<void> {
await db.execute(sql`
CREATE TABLE "payload_kv" (
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"key" varchar NOT NULL,
"data" jsonb NOT NULL
);
ALTER TABLE "announcement" ALTER COLUMN "date" SET DEFAULT '2026-02-08T15:57:34.492Z';
ALTER TABLE "calendar" ALTER COLUMN "date" SET DEFAULT '2026-02-08T15:57:34.801Z';
ALTER TABLE "classifieds" ALTER COLUMN "until" SET DEFAULT '2026-03-07T15:57:34.871Z';
CREATE UNIQUE INDEX "payload_kv_key_idx" ON "payload_kv" USING btree ("key");`)
}
export async function down({ db, payload, req }: MigrateDownArgs): Promise<void> {
await db.execute(sql`
ALTER TABLE "payload_kv" DISABLE ROW LEVEL SECURITY;
DROP TABLE "payload_kv" CASCADE;
ALTER TABLE "announcement" ALTER COLUMN "date" SET DEFAULT '2026-01-11T10:35:28.881Z';
ALTER TABLE "calendar" ALTER COLUMN "date" SET DEFAULT '2026-01-11T10:35:28.965Z';
ALTER TABLE "classifieds" ALTER COLUMN "until" SET DEFAULT '2026-02-05T10:35:29.018Z';`)
}

8
src/migrations/index.ts
View file

@ -15,6 +15,7 @@ import * as migration_20250915_075218 from './20250915_075218';
import * as migration_20251118_150529_youtube_player from './20251118_150529_youtube_player';
import * as migration_20260106_085445_donationforms from './20260106_085445_donationforms';
import * as migration_20260106_103529_donation_appeal from './20260106_103529_donation_appeal';
import * as migration_20260205_155735_version_bump from './20260205_155735_version_bump';
export const migrations = [
{
@ -100,6 +101,11 @@ export const migrations = [
{
up: migration_20260106_103529_donation_appeal.up,
down: migration_20260106_103529_donation_appeal.down,
name: '20260106_103529_donation_appeal'
name: '20260106_103529_donation_appeal',
},
{
up: migration_20260205_155735_version_bump.up,
down: migration_20260205_155735_version_bump.down,
name: '20260205_155735_version_bump'
},
];

40
src/payload-types.ts
View file

@ -85,6 +85,7 @@ export interface Config {
documents: Document;
media: Media;
users: User;
'payload-kv': PayloadKv;
'payload-locked-documents': PayloadLockedDocument;
'payload-preferences': PayloadPreference;
'payload-migrations': PayloadMigration;
@ -109,6 +110,7 @@ export interface Config {
documents: DocumentsSelect<false> | DocumentsSelect<true>;
media: MediaSelect<false> | MediaSelect<true>;
users: UsersSelect<false> | UsersSelect<true>;
'payload-kv': PayloadKvSelect<false> | PayloadKvSelect<true>;
'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
@ -116,6 +118,7 @@ export interface Config {
db: {
defaultIDType: string;
};
fallbackLocale: null;
globals: {
menu: Menu;
};
@ -174,7 +177,7 @@ export interface Parish {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -391,7 +394,7 @@ export interface Blog {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -541,7 +544,7 @@ export interface Group {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -560,7 +563,7 @@ export interface Group {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -650,7 +653,7 @@ export interface Classified {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -676,7 +679,7 @@ export interface DonationForm {
root: {
type: string;
children: {
type: string;
type: any;
version: number;
[k: string]: unknown;
}[];
@ -730,6 +733,23 @@ export interface User {
| null;
password?: string | null;
}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "payload-kv".
*/
export interface PayloadKv {
id: string;
key: string;
data:
| {
[k: string]: unknown;
}
| unknown[]
| string
| number
| boolean
| null;
}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "payload-locked-documents".
@ -1348,6 +1368,14 @@ export interface UsersSelect<T extends boolean = true> {
expiresAt?: T;
};
}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "payload-kv_select".
*/
export interface PayloadKvSelect<T extends boolean = true> {
key?: T;
data?: T;
}
/**
* This interface was referenced by `Config`'s JSON-Schema
* via the `definition` "payload-locked-documents_select".

28
tsconfig.json
View file

@ -1,7 +1,11 @@
{
"compilerOptions": {
"baseUrl": ".",
"lib": ["dom", "dom.iterable", "esnext"],
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
@ -11,7 +15,7 @@
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"jsx": "react-jsx",
"incremental": true,
"plugins": [
{
@ -19,11 +23,23 @@
}
],
"paths": {
"@/*": ["./src/*"],
"@payload-config": ["./src/payload.config.ts"]
"@/*": [
"./src/*"
],
"@payload-config": [
"./src/payload.config.ts"
]
},
"target": "ES2017"
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts",
".next/dev/types/**/*.ts"
],
"exclude": [
"node_modules"
]
}

18833
yarn.lock
View file

File diff suppressed because it is too large Load diff