diff --git a/Makefile b/Makefile index 7130961..281632d 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ deploy: check-ssh @COPYFILE_DISABLE=1 tar czf - $(TAR_EXCLUDE) . | ssh $(DS_HOST) "tar xzf - -C $(DS_PATH)/" @echo "→ .env auf DS aktualisieren..." @if [ -f .env ]; then \ - grep -E "BREVO_KEY" .env | ssh $(DS_HOST) "cat > $(DS_PATH)/.env"; \ + cat .env | ssh $(DS_HOST) "cat > $(DS_PATH)/.env"; \ fi @echo "→ PocketBase Hooks synchronisieren..." @if ls $(HOOKS_SRC)/*.pb.js 2>/dev/null | grep -q .; then \ diff --git a/app/package-lock.json b/app/package-lock.json index 7d728af..a298716 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -8,17 +8,21 @@ "name": "vereinshaus", "version": "0.1.0", "dependencies": { - "pocketbase": "^0.26.9" + "pocketbase": "^0.26.9", + "web-push": "^3.6.7" }, "devDependencies": { "@sveltejs/adapter-node": "^5.5.4", "@sveltejs/kit": "^2.57.0", "@sveltejs/vite-plugin-svelte": "^7.0.0", + "@types/web-push": "^3.6.4", "svelte": "^5.55.2", "svelte-check": "^4.4.6", "typescript": "^6.0.2", "vite": "^8.0.7", - "vite-plugin-pwa": "^1.3.0" + "vite-plugin-pwa": "^1.3.0", + "workbox-core": "^7.4.1", + "workbox-precaching": "^7.4.1" } }, "node_modules/@apideck/better-ajv-errors": { @@ -2639,6 +2643,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/node": { + "version": "25.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz", + "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": ">=7.24.0 <7.24.7" + } + }, "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", @@ -2653,6 +2667,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/web-push": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/@types/web-push/-/web-push-3.6.4.tgz", + "integrity": "sha512-GnJmSr40H3RAnj0s34FNTcJi1hmWFV5KXugE0mYWnYhgTAHLJ/dJKAwDmvPJYMke0RplY2XE9LnM4hqSqKIjhQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/acorn": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", @@ -2666,6 +2690,15 @@ "node": ">=0.4.0" } }, + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, "node_modules/ajv": { "version": "8.20.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", @@ -2732,6 +2765,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "license": "MIT", + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", @@ -2850,6 +2895,12 @@ "node": ">=6.0.0" } }, + "node_modules/bn.js": { + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", + "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "license": "MIT" + }, "node_modules/brace-expansion": { "version": "5.0.6", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", @@ -2897,6 +2948,12 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -3139,7 +3196,6 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -3231,6 +3287,15 @@ "node": ">= 0.4" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ejs": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", @@ -3879,6 +3944,28 @@ "node": ">= 0.4" } }, + "node_modules/http_ece": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.0.tgz", + "integrity": "sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==", + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/idb": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", @@ -3886,6 +3973,12 @@ "dev": true, "license": "ISC" }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -4421,6 +4514,27 @@ "node": ">=0.10.0" } }, + "node_modules/jwa": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "license": "MIT", + "dependencies": { + "jwa": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kleur": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", @@ -4753,6 +4867,12 @@ "node": ">= 0.4" } }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "license": "ISC" + }, "node_modules/minimatch": { "version": "10.2.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", @@ -4769,6 +4889,15 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -4803,7 +4932,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -5311,6 +5439,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/safe-push-apply": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", @@ -5346,6 +5494,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -6022,6 +6176,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici-types": { + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", + "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", + "dev": true, + "license": "MIT" + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz", @@ -6260,6 +6421,25 @@ } } }, + "node_modules/web-push": { + "version": "3.6.7", + "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz", + "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==", + "license": "MPL-2.0", + "dependencies": { + "asn1.js": "^5.3.0", + "http_ece": "1.2.0", + "https-proxy-agent": "^7.0.0", + "jws": "^4.0.0", + "minimist": "^1.2.5" + }, + "bin": { + "web-push": "src/cli.js" + }, + "engines": { + "node": ">= 16" + } + }, "node_modules/webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", diff --git a/app/package.json b/app/package.json index e0fc5a5..95ba95e 100644 --- a/app/package.json +++ b/app/package.json @@ -15,13 +15,17 @@ "@sveltejs/adapter-node": "^5.5.4", "@sveltejs/kit": "^2.57.0", "@sveltejs/vite-plugin-svelte": "^7.0.0", + "@types/web-push": "^3.6.4", "svelte": "^5.55.2", "svelte-check": "^4.4.6", "typescript": "^6.0.2", "vite": "^8.0.7", - "vite-plugin-pwa": "^1.3.0" + "vite-plugin-pwa": "^1.3.0", + "workbox-core": "^7.4.1", + "workbox-precaching": "^7.4.1" }, "dependencies": { - "pocketbase": "^0.26.9" + "pocketbase": "^0.26.9", + "web-push": "^3.6.7" } } diff --git a/app/src/lib/components/Icon.svelte b/app/src/lib/components/Icon.svelte new file mode 100644 index 0000000..3af0fc2 --- /dev/null +++ b/app/src/lib/components/Icon.svelte @@ -0,0 +1,20 @@ + + + + + diff --git a/app/src/lib/icons.ts b/app/src/lib/icons.ts new file mode 100644 index 0000000..ccac259 --- /dev/null +++ b/app/src/lib/icons.ts @@ -0,0 +1,15 @@ +import house from './icons/house.svg?raw'; +import users from './icons/users.svg?raw'; +import calendar from './icons/calendar.svg?raw'; +import currencyEur from './icons/currency-eur.svg?raw'; +import envelope from './icons/envelope.svg?raw'; + +export const icons = { + house, + users, + calendar, + 'currency-eur': currencyEur, + envelope, +} as const; + +export type IconName = keyof typeof icons; diff --git a/app/src/lib/icons/calendar.svg b/app/src/lib/icons/calendar.svg new file mode 100644 index 0000000..3b91cc4 --- /dev/null +++ b/app/src/lib/icons/calendar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/lib/icons/currency-eur.svg b/app/src/lib/icons/currency-eur.svg new file mode 100644 index 0000000..c23e136 --- /dev/null +++ b/app/src/lib/icons/currency-eur.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/lib/icons/envelope.svg b/app/src/lib/icons/envelope.svg new file mode 100644 index 0000000..f07a98b --- /dev/null +++ b/app/src/lib/icons/envelope.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/lib/icons/house.svg b/app/src/lib/icons/house.svg new file mode 100644 index 0000000..6346350 --- /dev/null +++ b/app/src/lib/icons/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/lib/icons/users.svg b/app/src/lib/icons/users.svg new file mode 100644 index 0000000..7f7b6ca --- /dev/null +++ b/app/src/lib/icons/users.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/lib/sepa.ts b/app/src/lib/sepa.ts new file mode 100644 index 0000000..a49ff21 --- /dev/null +++ b/app/src/lib/sepa.ts @@ -0,0 +1,109 @@ +export interface SepaKopf { + glaeubigerid: string; + vereinIban: string; + vereinBic: string; + vereinName: string; + einzugsdatum: string; // YYYY-MM-DD +} + +export interface SepaPosition { + endToEndId: string; + betrag: number; + mandatsreferenz: string; + mandatsdatum: string; // YYYY-MM-DD + debitorName: string; + debitorIban: string; + debitorBic: string; + verwendungszweck: string; +} + +function x(str: string): string { + return str + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"'); +} + +function iban(raw: string): string { + return raw.replace(/\s/g, '').toUpperCase(); +} + +export function generatePain008(kopf: SepaKopf, positionen: SepaPosition[]): string { + if (positionen.length === 0) throw new Error('Keine Positionen für den SEPA-Export.'); + + const now = new Date().toISOString().slice(0, 19); + const msgId = `VH-${Date.now()}`; + const ctrlSum = positionen.reduce((s, p) => s + p.betrag, 0).toFixed(2); + const nbOfTxs = positionen.length; + + const txXml = positionen.map((p) => ` + + ${x(p.endToEndId)} + ${p.betrag.toFixed(2)} + + + ${x(p.mandatsreferenz)} + ${p.mandatsdatum} + + + ${x(kopf.glaeubigerid)} + SEPA + + + ${p.debitorBic ? `${x(p.debitorBic)}` : 'NOTPROVIDED'} + ${x(p.debitorName)} + ${iban(p.debitorIban)} + ${x(p.verwendungszweck.slice(0, 140))} + `).join(''); + + return ` + + + + ${msgId} + ${now} + ${nbOfTxs} + ${ctrlSum} + ${x(kopf.vereinName)} + + + ${msgId}-PI + DD + ${nbOfTxs} + ${ctrlSum} + + SEPA + CORE + RCUR + + ${kopf.einzugsdatum} + ${x(kopf.vereinName)} + ${iban(kopf.vereinIban)} + ${x(kopf.vereinBic)} + + ${x(kopf.glaeubigerid)} + SEPA + ${txXml} + + +`; +} + +export function downloadXml(xml: string, dateiname: string) { + const blob = new Blob([xml], { type: 'application/xml;charset=utf-8' }); + const url = URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = dateiname; + a.click(); + URL.revokeObjectURL(url); +} + +export function minEinzugsdatum(): string { + // SEPA CORE RCUR: mindestens 2 Bankarbeitstage Vorlaufzeit (vereinfacht: +3 Tage) + const d = new Date(); + d.setDate(d.getDate() + 3); + return d.toISOString().slice(0, 10); +} diff --git a/app/src/lib/types.ts b/app/src/lib/types.ts index 07bad1f..b1d2122 100644 --- a/app/src/lib/types.ts +++ b/app/src/lib/types.ts @@ -1,18 +1,20 @@ export type Plan = 'free' | 'starter' | 'wachstum' | 'verband'; export type MitgliedStatus = 'aktiv' | 'passiv' | 'ausgetreten'; -export type EinzugStatus = 'ausstehend' | 'eingezogen' | 'fehlgeschlagen'; -export type Rhythmus = 'monatlich' | 'quartalsweise' | 'halbjaehrlich' | 'jaehrlich'; +export type EinzugStatus = 'ausstehend' | 'eingezogen' | 'fehlgeschlagen' | 'storniert'; +export type Rhythmus = 'monatlich' | 'quartalsweise' | 'halbjaehrlich' | 'jaehrlich' | 'einmalig'; export interface Verein { id: string; name: string; - adresse: string; - plz: string; - ort: string; - bundesland: string; + adresse?: string; + plz?: string; + ort?: string; + bundesland?: string; plan: Plan; - stripe_customer_id?: string; dosb_mitglied: boolean; + glaeubigerid?: string; + iban?: string; + bic?: string; } export interface Mitglied { @@ -20,19 +22,21 @@ export interface Mitglied { verein_id: string; vorname: string; nachname: string; - email: string; + email?: string; telefon?: string; geburtsdatum?: string; - eintrittsdatum: string; + eintrittsdatum?: string; austrittsdatum?: string; - strasse: string; - plz: string; - ort: string; + strasse?: string; + plz?: string; + ort?: string; iban?: string; bic?: string; gruppe_ids: string[]; status: MitgliedStatus; notizen?: string; + mandatsreferenz?: string; + mandatsdatum?: string; } export interface Gruppe { @@ -53,13 +57,11 @@ export interface Beitrag { export interface Einzug { id: string; - verein_id: string; mitglied_id: string; beitrag_id: string; betrag: number; - faelligkeitsdatum: string; + faellig_am?: string; status: EinzugStatus; - stripe_payment_intent_id?: string; } export interface Termin { @@ -80,5 +82,5 @@ export interface Nachricht { betreff: string; text: string; gruppe_ids: string[]; - gesendet_am: string; + gesendet_am?: string; } diff --git a/app/src/routes/(app)/+layout.svelte b/app/src/routes/(app)/+layout.svelte index b435cee..db37aa6 100644 --- a/app/src/routes/(app)/+layout.svelte +++ b/app/src/routes/(app)/+layout.svelte @@ -3,26 +3,81 @@ import { page } from '$app/stores'; import { onMount } from 'svelte'; import { pb } from '$lib/pb'; + import Icon from '$lib/components/Icon.svelte'; + import type { IconName } from '$lib/icons'; let { children } = $props(); onMount(() => { if (!pb.authStore.isValid) { goto('/login'); + return; } + if (!pb.authStore.record?.verein_id) { + goto('/onboarding'); + return; + } + registerPush(); }); + async function registerPush() { + if (!('serviceWorker' in navigator) || !('PushManager' in window)) return; + + const permission = await Notification.requestPermission(); + if (permission !== 'granted') return; + + try { + const reg = await navigator.serviceWorker.ready; + + // VAPID public key vom Server holen + const keyRes = await fetch('/api/push/key'); + const { publicKey } = await keyRes.json(); + if (!publicKey) return; + + // Bestehende oder neue Subscription + let sub = await reg.pushManager.getSubscription(); + if (!sub) { + sub = await reg.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: urlBase64ToUint8Array(publicKey) as BufferSource, + }); + } + + // In PocketBase speichern + await fetch('/api/push/subscribe', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: pb.authStore.token, + }, + body: JSON.stringify({ + subscription: sub.toJSON(), + userId: pb.authStore.record?.id, + }), + }); + } catch (e) { + console.warn('[push] Registrierung fehlgeschlagen:', e); + } + } + + function urlBase64ToUint8Array(base64String: string): Uint8Array { + const padding = '='.repeat((4 - (base64String.length % 4)) % 4); + const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/'); + const raw = atob(base64); + return Uint8Array.from([...raw].map((c) => c.charCodeAt(0))); + } + function logout() { pb.authStore.clear(); goto('/login'); } - const navItems = [ - { href: '/', label: 'Übersicht', icon: '⊞' }, - { href: '/mitglieder', label: 'Mitglieder', icon: '👥' }, - { href: '/termine', label: 'Termine', icon: '📅' }, - { href: '/beitraege', label: 'Beiträge', icon: '💶' }, - { href: '/nachrichten', label: 'Nachrichten', icon: '✉️' }, + const navItems: { href: string; label: string; icon: IconName }[] = [ + { href: '/', label: 'Übersicht', icon: 'house' }, + { href: '/mitglieder', label: 'Mitglieder', icon: 'users' }, + { href: '/termine', label: 'Termine', icon: 'calendar' }, + { href: '/beitraege', label: 'Beiträge', icon: 'currency-eur' }, + { href: '/nachrichten', label: 'Nachrichten', icon: 'envelope' }, ]; @@ -42,7 +97,7 @@ href={item.href} class:active={$page.url.pathname === item.href} > - {item.icon} + {item.label} {/each} @@ -126,11 +181,6 @@ color: #1e40af; } - .nav-icon { - font-size: 1.3rem; - line-height: 1; - } - .nav-label { font-size: 0.65rem; font-weight: 500; diff --git a/app/src/routes/(app)/+page.svelte b/app/src/routes/(app)/+page.svelte index 32a9972..a4bfea6 100644 --- a/app/src/routes/(app)/+page.svelte +++ b/app/src/routes/(app)/+page.svelte @@ -1,5 +1,6 @@ @@ -12,19 +13,19 @@
- 👥 + Mitglieder - 📅 + Termine - 💶 + Beiträge - ✉️ + Nachrichten
@@ -52,6 +53,7 @@ flex-direction: column; align-items: center; gap: 0.5rem; + color: #1e40af; transition: border-color .15s, box-shadow .15s; } @@ -60,10 +62,6 @@ box-shadow: 0 2px 8px rgba(30,64,175,.1); } - .card-icon { - font-size: 2rem; - } - .card-label { font-size: 0.9rem; font-weight: 600; diff --git a/app/src/routes/(app)/beitraege/+page.svelte b/app/src/routes/(app)/beitraege/+page.svelte index d1494b1..0383cba 100644 --- a/app/src/routes/(app)/beitraege/+page.svelte +++ b/app/src/routes/(app)/beitraege/+page.svelte @@ -1,27 +1,514 @@ Beiträge — vereins.haus -
+

Beiträge

- +
-

SEPA-Beitragseinzug — in Entwicklung

+{#if sepaFehlt && !loading} +
+ SEPA-Einzug nicht möglich: Gläubiger-ID, IBAN und BIC des Vereins fehlen noch in den Einstellungen. +
+{/if} + +{#if loading} +

Laden…

+{:else if beitraege.length === 0} +

Noch keine Beitragsarten — lege die erste an!

+{:else} + +{/if} + + +{#if showForm} + +{/if} + + +{#if sepaFor} + +{/if} diff --git a/app/src/routes/(app)/mitglieder/[id]/+page.svelte b/app/src/routes/(app)/mitglieder/[id]/+page.svelte index dbac7f8..25bd931 100644 --- a/app/src/routes/(app)/mitglieder/[id]/+page.svelte +++ b/app/src/routes/(app)/mitglieder/[id]/+page.svelte @@ -3,35 +3,70 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { onMount } from 'svelte'; + import type { Mitglied, Gruppe } from '$lib/types'; - const id = $derived($page.params.id); + const id = $derived($page.params.id as string); - let gruppen = $state([]); - let vorname = $state(''); - let nachname = $state(''); - let email = $state(''); - let iban = $state(''); - let status = $state('aktiv'); - let gruppe_ids = $state([]); + let gruppen = $state([]); let loading = $state(true); let saving = $state(false); let error = $state(''); let editMode = $state(false); let showDelete = $state(false); + // Felder + let vorname = $state(''); + let nachname = $state(''); + let email = $state(''); + let telefon = $state(''); + let geburtsdatum = $state(''); + let status = $state('aktiv'); + let eintrittsdatum = $state(''); + let austrittsdatum = $state(''); + let strasse = $state(''); + let plz = $state(''); + let ort = $state(''); + let iban = $state(''); + let bic = $state(''); + let mandatsreferenz = $state(''); + let mandatsdatum = $state(''); + let notizen = $state(''); + let gruppe_ids = $state([]); + + function pbDateToInput(val: string | undefined): string { + // PocketBase gibt "2026-05-20 00:00:00.000Z" zurück, input[type=date] braucht "2026-05-20" + if (!val) return ''; + return val.slice(0, 10); + } + + function loadRecord(m: Mitglied) { + vorname = m.vorname; + nachname = m.nachname; + email = m.email ?? ''; + telefon = m.telefon ?? ''; + geburtsdatum = pbDateToInput(m.geburtsdatum); + status = m.status; + eintrittsdatum = pbDateToInput(m.eintrittsdatum); + austrittsdatum = pbDateToInput(m.austrittsdatum); + strasse = m.strasse ?? ''; + plz = m.plz ?? ''; + ort = m.ort ?? ''; + iban = m.iban ?? ''; + bic = m.bic ?? ''; + mandatsreferenz = m.mandatsreferenz ?? ''; + mandatsdatum = pbDateToInput(m.mandatsdatum); + notizen = m.notizen ?? ''; + gruppe_ids = m.gruppe_ids ?? []; + } + onMount(async () => { const [m, g] = await Promise.all([ - pb.collection('mitglieder').getOne(id), - pb.collection('gruppen').getFullList({ sort: 'name' }) + pb.collection('mitglieder').getOne(id), + pb.collection('gruppen').getFullList({ sort: 'name' }), ]); - vorname = m.vorname; - nachname = m.nachname; - email = m.email ?? ''; - iban = m.iban ?? ''; - status = m.status; - gruppe_ids = m.gruppe_ids ?? []; - gruppen = g; - loading = false; + loadRecord(m); + gruppen = g; + loading = false; }); function toggleGruppe(gid: string) { @@ -41,16 +76,26 @@ } async function speichern() { - error = ''; - saving = true; + error = ''; saving = true; try { await pb.collection('mitglieder').update(id, { - vorname: vorname.trim(), - nachname: nachname.trim(), - email: email.trim(), - iban: iban.trim(), + vorname: vorname.trim(), + nachname: nachname.trim(), + email: email.trim() || null, + telefon: telefon.trim() || null, + geburtsdatum: geburtsdatum || null, status, - gruppe_ids + eintrittsdatum: eintrittsdatum || null, + austrittsdatum: austrittsdatum || null, + strasse: strasse.trim() || null, + plz: plz.trim() || null, + ort: ort.trim() || null, + iban: iban.trim() || null, + bic: bic.trim() || null, + mandatsreferenz: mandatsreferenz.trim() || null, + mandatsdatum: mandatsdatum || null, + notizen: notizen.trim() || null, + gruppe_ids, }); editMode = false; } catch (e: unknown) { @@ -70,15 +115,20 @@ } } - function gruppenName(ids: string[]) { + function gruppenName(ids: string[]): string { return (ids ?? []) .map(gid => gruppen.find(g => g.id === gid)?.name) .filter(Boolean) .join(', '); } + function formatDatum(iso: string): string { + if (!iso) return '—'; + return new Date(iso).toLocaleDateString('de-DE'); + } + const statusFarbe: Record = { - aktiv: '#16a34a', passiv: '#f59e0b', ausgetreten: '#94a3b8' + aktiv: '#16a34a', passiv: '#f59e0b', ausgetreten: '#94a3b8', }; @@ -87,7 +137,7 @@
← Mitglieder {#if !loading} - {/if} @@ -98,99 +148,223 @@ {:else if !editMode} -
+
{vorname[0]}{nachname[0]}

{vorname} {nachname}

- - {status} - + {status}
-
+
+

Kontakt

{#if email} -
- E-Mail - {email} +
+ E-Mail + {email}
{/if} - {#if iban} -
- IBAN - {iban} + {#if telefon} +
+ Telefon + {telefon}
{/if} - {#if gruppe_ids?.length > 0} -
- Gruppen - {gruppenName(gruppe_ids)} + {#if strasse || plz || ort} +
+ Adresse + {[strasse, [plz, ort].filter(Boolean).join(' ')].filter(Boolean).join(', ')} +
+ {/if} + {#if !email && !telefon && !strasse} +

Keine Kontaktdaten hinterlegt.

+ {/if} +
+ +
+

Mitgliedschaft

+ {#if eintrittsdatum} +
+ Eintritt + {formatDatum(eintrittsdatum)} +
+ {/if} + {#if geburtsdatum} +
+ Geburtsdatum + {formatDatum(geburtsdatum)} +
+ {/if} + {#if austrittsdatum} +
+ Austritt + {formatDatum(austrittsdatum)} +
+ {/if} + {#if gruppe_ids?.length} +
+ Gruppen + {gruppenName(gruppe_ids)}
{/if}
+ {#if iban || bic || mandatsreferenz} +
+

SEPA-Lastschrift

+ {#if iban} +
+ IBAN + {iban} +
+ {/if} + {#if bic} +
+ BIC + {bic} +
+ {/if} + {#if mandatsreferenz} +
+ Mandat + {mandatsreferenz}{mandatsdatum ? ' · ' + formatDatum(mandatsdatum) : ''} +
+ {/if} +
+ {/if} + + {#if notizen} +
+

Notizen

+

{notizen}

+
+ {/if} + {:else}
{ e.preventDefault(); speichern(); }}> -
+ +
+

Stammdaten

+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ +
+

Kontakt

- - + +
- - + +
-
+
+ + +
+
+
+ + +
+
+ + +
+
+ -
- - -
- -
- - -
- -
- - -
+
+

SEPA-Lastschrift

+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
{#if gruppen.length > 0} -
- +
+

Gruppen

{#each gruppen as g (g.id)} -
-
+ {/if} +
+

Notizen

+
+ + +
+
+ {#if error}

{error}

{/if} - +
+ +
{/if} - + {#if showDelete} + diff --git a/app/src/routes/(app)/nachrichten/+page.svelte b/app/src/routes/(app)/nachrichten/+page.svelte index 6956026..3a958ba 100644 --- a/app/src/routes/(app)/nachrichten/+page.svelte +++ b/app/src/routes/(app)/nachrichten/+page.svelte @@ -1,27 +1,328 @@ Nachrichten — vereins.haus -
+

Nachrichten

- +
-

Nachrichten & Push-Benachrichtigungen — in Entwicklung

+{#if sendSuccess} +
{sendSuccess}
+{/if} + +{#if loading} +

Laden…

+{:else if nachrichten.length === 0} +

Noch keine Nachrichten versendet.

+{:else} +
    + {#each nachrichten as n (n.id)} +
  • +
    + {n.betreff} + {formatDatum(n.gesendet_am)} +
    + {gruppenLabel(n.gruppe_ids ?? [])} + {#if n.text} +

    {n.text.slice(0, 120)}{n.text.length > 120 ? '…' : ''}

    + {/if} +
    • + {/each} +
+{/if} + + +{#if showForm} + +{/if} diff --git a/app/src/routes/(app)/termine/+page.svelte b/app/src/routes/(app)/termine/+page.svelte index 4f1f5ed..ed2d3fc 100644 --- a/app/src/routes/(app)/termine/+page.svelte +++ b/app/src/routes/(app)/termine/+page.svelte @@ -1,27 +1,395 @@ Termine — vereins.haus -
+

Termine

- +
-

Terminkalender — in Entwicklung

+{#if loading} +

Laden…

+{:else if termine.length === 0} +

Noch keine Termine – lege den ersten an!

+{:else} + {#if upcoming.length > 0} +
    + {#each upcoming as t (t.id)} +
  • +
    + {new Date(t.beginn).toLocaleDateString('de-DE', { weekday: 'short' })} + {new Date(t.beginn).getDate()} + {new Date(t.beginn).toLocaleDateString('de-DE', { month: 'short' })} +
    +
    + {t.titel} + + {formatZeit(t.beginn)}{t.ende ? ' – ' + formatZeit(t.ende) : ''}{t.ort ? ' · ' + t.ort : ''} + + {#if t.gruppe_ids?.length} + {gruppenLabel(t.gruppe_ids)} + {/if} +
    +
    + + +
    +
    • + {/each} +
+ {/if} + + {#if vergangen.length > 0} +
+ Vergangene Termine ({vergangen.length}) +
    + {#each vergangen as t (t.id)} +
  • +
    + {new Date(t.beginn).toLocaleDateString('de-DE', { weekday: 'short' })} + {new Date(t.beginn).getDate()} + {new Date(t.beginn).toLocaleDateString('de-DE', { month: 'short' })} +
    +
    + {t.titel} + {formatDatum(t.beginn)}{t.ort ? ' · ' + t.ort : ''} +
    +
    + +
    +
    • + {/each} +
+
+ {/if} +{/if} + + +{#if showForm} + +{/if} + + +{#if showDelete} + +{/if} diff --git a/app/src/routes/(auth)/register/+page.svelte b/app/src/routes/(auth)/register/+page.svelte index e86fc3a..32445cc 100644 --- a/app/src/routes/(auth)/register/+page.svelte +++ b/app/src/routes/(auth)/register/+page.svelte @@ -17,20 +17,9 @@ } loading = true; try { - const user = await pb.collection('users').create({ - email, - password, - passwordConfirm, - name: vereinsname - }); - await pb.collection('vereine').create({ - name: vereinsname, - plan: 'free', - dosb_mitglied: false, - user_id: user.id - }); + await pb.collection('users').create({ email, password, passwordConfirm, name: vereinsname }); await pb.collection('users').authWithPassword(email, password); - goto('/'); + goto('/onboarding'); } catch (e: unknown) { error = e instanceof Error ? e.message : 'Registrierung fehlgeschlagen.'; } finally { diff --git a/app/src/routes/api/push/key/+server.ts b/app/src/routes/api/push/key/+server.ts new file mode 100644 index 0000000..7399d91 --- /dev/null +++ b/app/src/routes/api/push/key/+server.ts @@ -0,0 +1,6 @@ +import { json } from '@sveltejs/kit'; +import { env } from '$env/dynamic/private'; + +export async function GET() { + return json({ publicKey: env.PUBLIC_VAPID_KEY ?? '' }); +} diff --git a/app/src/routes/api/push/senden/+server.ts b/app/src/routes/api/push/senden/+server.ts new file mode 100644 index 0000000..5e1e775 --- /dev/null +++ b/app/src/routes/api/push/senden/+server.ts @@ -0,0 +1,57 @@ +import { json } from '@sveltejs/kit'; +import { env } from '$env/dynamic/private'; +import webpush from 'web-push'; + +const PB_URL = () => env.PB_URL ?? 'http://localhost:8090'; + +export async function POST({ request }) { + const authHeader = request.headers.get('Authorization') ?? ''; + const { titel, body, url = '/nachrichten' } = await request.json(); + + if (!titel) return json({ error: 'Titel fehlt.' }, { status: 400 }); + + const vapidPublic = env.PUBLIC_VAPID_KEY ?? ''; + const vapidPrivate = env.VAPID_PRIVATE_KEY ?? ''; + const vapidSubject = env.VAPID_SUBJECT ?? 'mailto:info@vereins.haus'; + + if (!vapidPublic || !vapidPrivate) { + return json({ error: 'VAPID-Keys nicht konfiguriert.' }, { status: 500 }); + } + + webpush.setVapidDetails(vapidSubject, vapidPublic, vapidPrivate); + + // Alle Push-Subscriptions des Vereins laden (listRule erlaubt verein-weite Abfrage) + const subRes = await fetch( + `${PB_URL()}/api/collections/push_subscriptions/records?perPage=500`, + { headers: { Authorization: authHeader } }, + ); + + if (!subRes.ok) return json({ sent: 0 }); + const { items } = await subRes.json(); + if (!items?.length) return json({ sent: 0 }); + + const payload = JSON.stringify({ title: titel, body, url }); + let sent = 0; + + await Promise.allSettled( + items.map(async (sub: { endpoint: string; p256dh: string; auth: string; id: string }) => { + try { + await webpush.sendNotification( + { endpoint: sub.endpoint, keys: { p256dh: sub.p256dh, auth: sub.auth } }, + payload, + ); + sent++; + } catch (err: unknown) { + // 410 Gone = Subscription abgelaufen → löschen + if ((err as { statusCode?: number }).statusCode === 410) { + await fetch( + `${PB_URL()}/api/collections/push_subscriptions/records/${sub.id}`, + { method: 'DELETE', headers: { Authorization: authHeader } }, + ).catch(() => {}); + } + } + }), + ); + + return json({ sent }); +} diff --git a/app/src/routes/api/push/subscribe/+server.ts b/app/src/routes/api/push/subscribe/+server.ts new file mode 100644 index 0000000..834358d --- /dev/null +++ b/app/src/routes/api/push/subscribe/+server.ts @@ -0,0 +1,67 @@ +import { json } from '@sveltejs/kit'; +import { env } from '$env/dynamic/private'; + +const PB_URL = () => env.PB_URL ?? 'http://localhost:8090'; + +export async function POST({ request }) { + const authHeader = request.headers.get('Authorization') ?? ''; + const { subscription, userId } = await request.json(); + + if (!subscription?.endpoint || !userId) { + return json({ error: 'Ungültige Subscription.' }, { status: 400 }); + } + + // Alte Subscription dieses Users löschen (Gerätewechsel) + const listRes = await fetch( + `${PB_URL()}/api/collections/push_subscriptions/records?filter=user_id%3D"${userId}"&perPage=50`, + { headers: { Authorization: authHeader } }, + ); + if (listRes.ok) { + const { items } = await listRes.json(); + await Promise.all( + (items ?? []).map((r: { id: string }) => + fetch(`${PB_URL()}/api/collections/push_subscriptions/records/${r.id}`, { + method: 'DELETE', + headers: { Authorization: authHeader }, + }), + ), + ); + } + + // Neue Subscription speichern + const res = await fetch(`${PB_URL()}/api/collections/push_subscriptions/records`, { + method: 'POST', + headers: { 'Content-Type': 'application/json', Authorization: authHeader }, + body: JSON.stringify({ + user_id: userId, + endpoint: subscription.endpoint, + p256dh: subscription.keys.p256dh, + auth: subscription.keys.auth, + }), + }); + + if (!res.ok) return json({ error: 'Fehler beim Speichern.' }, { status: 500 }); + return json({ success: true }); +} + +export async function DELETE({ request }) { + const authHeader = request.headers.get('Authorization') ?? ''; + const { userId } = await request.json(); + + const listRes = await fetch( + `${PB_URL()}/api/collections/push_subscriptions/records?filter=user_id%3D"${userId}"&perPage=50`, + { headers: { Authorization: authHeader } }, + ); + if (!listRes.ok) return json({ success: true }); + + const { items } = await listRes.json(); + await Promise.all( + (items ?? []).map((r: { id: string }) => + fetch(`${PB_URL()}/api/collections/push_subscriptions/records/${r.id}`, { + method: 'DELETE', + headers: { Authorization: authHeader }, + }), + ), + ); + return json({ success: true }); +} diff --git a/app/src/routes/onboarding/+page.svelte b/app/src/routes/onboarding/+page.svelte new file mode 100644 index 0000000..215dda9 --- /dev/null +++ b/app/src/routes/onboarding/+page.svelte @@ -0,0 +1,331 @@ + + +Einrichtung — vereins.haus + +
+ + +
+ +
+ {#each [1, 2, 3] as s} + = s}> + {/each} +
+ + {#if schritt === 1} + +
+
👋
+

Schön, dass du dabei bist!

+

+ vereins.haus hilft deinem Vorstand, Mitglieder, Termine und + Beiträge zu verwalten – übersichtlich, mobil und ohne Excel. +

+

+ Die Einrichtung dauert weniger als eine Minute. +

+ +
+ + {:else if schritt === 2} + +
+

Dein Verein

+

Wie heißt dein Verein? Du kannst alle Angaben später noch ändern.

+ +
{ e.preventDefault(); vereinAnlegen(); }}> +
+ + +
+ +
+ + +
+ + {#if error} +

{error}

+ {/if} + +
+ + +
+
+
+ + {:else} + +
+
✓
+

Alles bereit!

+

+ „{fertigName}" wurde eingerichtet. Du kannst jetzt loslegen. +

+ +
    +
  • + 👤 +
    + Mitglieder anlegen + Namen, E-Mail und IBAN für den SEPA-Einzug +
    +
    • +
  • + 💶 +
    + Beitragsarten definieren + Jahresbeitrag, Sonderumlage – mit SEPA-Export +
    +
    • +
  • + 📅 +
    + Termine eintragen + Versammlung, Training, Ausflug +
    +
    • +
+ + +
+ {/if} +
+
+ + diff --git a/app/src/sw.ts b/app/src/sw.ts new file mode 100644 index 0000000..3144a2a --- /dev/null +++ b/app/src/sw.ts @@ -0,0 +1,45 @@ +/// +import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching'; +import { registerRoute } from 'workbox-routing'; +import { NetworkFirst } from 'workbox-strategies'; + +declare const self: ServiceWorkerGlobalScope; + +cleanupOutdatedCaches(); +precacheAndRoute(self.__WB_MANIFEST); + +// PocketBase API: NetworkFirst (offline-fähig aus Cache) +registerRoute( + ({ url }) => url.hostname === 'api.vereins.haus', + new NetworkFirst({ + cacheName: 'pocketbase-api', + networkTimeoutSeconds: 5, + }), +); + +self.addEventListener('push', (event) => { + const data = event.data?.json() ?? {}; + const title = data.title ?? 'vereins.haus'; + const options: NotificationOptions = { + body: data.body ?? '', + icon: '/icons/icon-192.png', + badge: '/icons/icon-192.png', + tag: data.tag ?? 'vereinshaus', + data: { url: data.url ?? '/nachrichten' }, + }; + event.waitUntil(self.registration.showNotification(title, options)); +}); + +self.addEventListener('notificationclick', (event) => { + event.notification.close(); + const url = (event.notification.data as { url: string })?.url ?? '/'; + event.waitUntil( + self.clients + .matchAll({ type: 'window', includeUncontrolled: true }) + .then((list) => { + const existing = list.find((c) => c.url.includes(url)); + if (existing) return existing.focus(); + return self.clients.openWindow(url); + }), + ); +}); diff --git a/app/vite.config.ts b/app/vite.config.ts index 78f8947..17965cc 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -6,6 +6,9 @@ export default defineConfig({ plugins: [ sveltekit(), VitePWA({ + strategies: 'injectManifest', + srcDir: 'src', + filename: 'sw.ts', registerType: 'autoUpdate', manifest: { name: 'vereins.haus', @@ -21,19 +24,9 @@ export default defineConfig({ { src: '/icons/apple-touch-icon.png', sizes: '180x180', type: 'image/png' } ] }, - workbox: { + injectManifest: { globPatterns: ['**/*.{js,css,html,svg,png,ico}'], - runtimeCaching: [ - { - urlPattern: /^https:\/\/api\.vereins\.haus\/.*/i, - handler: 'NetworkFirst', - options: { - cacheName: 'pocketbase-api', - expiration: { maxEntries: 100, maxAgeSeconds: 60 * 60 * 24 } - } - } - ] - } - }) - ] + }, + }), + ], }); diff --git a/docker-compose.yml b/docker-compose.yml index 2e1a044..4ae0392 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: environment: - TZ=Europe/Berlin - BREVO_KEY=${BREVO_KEY} + - BREVO_SENDER=${BREVO_SENDER:-noreply@vereins.haus} networks: - default - npm_bridge @@ -31,6 +32,10 @@ services: - TZ=Europe/Berlin - HOST=0.0.0.0 - PORT=3000 + - PUBLIC_VAPID_KEY=${PUBLIC_VAPID_KEY} + - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY} + - VAPID_SUBJECT=${VAPID_SUBJECT:-mailto:info@vereins.haus} + - PB_URL=http://pocketbase:8090 networks: - default - npm_bridge diff --git a/pocketbase/pb_hooks/nachrichten.pb.js b/pocketbase/pb_hooks/nachrichten.pb.js new file mode 100644 index 0000000..6201223 --- /dev/null +++ b/pocketbase/pb_hooks/nachrichten.pb.js @@ -0,0 +1,86 @@ +onRecordAfterCreateSuccess(function(e) { + if (!e.record) return; + + var key = $os.getenv("BREVO_KEY"); + if (!key) { + console.log("[nachrichten] BREVO_KEY nicht gesetzt – E-Mail übersprungen."); + return; + } + + var vereinId = e.record.getString("verein_id"); + var betreff = e.record.getString("betreff"); + var text = e.record.getString("text"); + var gruppeIds = e.record.getStringSlice("gruppe_ids"); + + // Vereinsname für Absender + var vereinName = "Ihr Verein"; + try { + var verein = $app.findRecordById("vereine", vereinId); + vereinName = verein.getString("name"); + } catch(err) {} + + // Mitglieder-Filter + var filter = 'verein_id = "' + vereinId + '" && status = "aktiv" && email != ""'; + if (gruppeIds && gruppeIds.length > 0) { + var gruppenParts = []; + for (var i = 0; i < gruppeIds.length; i++) { + gruppenParts.push('gruppe_ids ~ "' + gruppeIds[i] + '"'); + } + filter += " && (" + gruppenParts.join(" || ") + ")"; + } + + var mitglieder; + try { + mitglieder = $app.findRecordsByFilter("mitglieder", filter, "nachname", 500, 0); + } catch(err) { + console.error("[nachrichten] Mitglieder laden fehlgeschlagen: " + String(err)); + return; + } + + var empfaenger = []; + for (var j = 0; j < mitglieder.length; j++) { + var m = mitglieder[j]; + var email = m.getString("email"); + if (email) { + empfaenger.push({ + email: email, + name: m.getString("vorname") + " " + m.getString("nachname") + }); + } + } + + if (empfaenger.length === 0) { + console.log("[nachrichten] Keine Empfänger mit E-Mail gefunden."); + return; + } + + var sender = $os.getenv("BREVO_SENDER") || "noreply@vereins.haus"; + var htmlContent = text + ? text.replace(/\n/g, "
") + : "

(Kein Inhalt)

"; + + // In 50er-Batches senden (Brevo-Limit) + var BATCH = 50; + for (var b = 0; b < empfaenger.length; b += BATCH) { + var batch = empfaenger.slice(b, b + BATCH); + var body = JSON.stringify({ + sender: { name: vereinName, email: sender }, + to: [batch[0]], + bcc: batch.slice(1), + subject: betreff, + htmlContent: htmlContent + }); + + try { + $http.send({ + url: "https://api.brevo.com/v3/smtp/email", + method: "POST", + headers: { "api-key": key, "Content-Type": "application/json" }, + body: body + }); + console.log("[nachrichten] Batch " + (b / BATCH + 1) + " gesendet (" + batch.length + " Empfänger)."); + } catch(err) { + console.error("[nachrichten] Brevo Fehler Batch " + (b / BATCH + 1) + ": " + String(err)); + } + } +}, "nachrichten"); diff --git a/pocketbase/pb_migrations/1779230000_align_schema.js b/pocketbase/pb_migrations/1779230000_align_schema.js new file mode 100644 index 0000000..5499ebe --- /dev/null +++ b/pocketbase/pb_migrations/1779230000_align_schema.js @@ -0,0 +1,194 @@ +/// +migrate((app) => { + + // vereine: +adresse, +dosb_mitglied; -stripe_customer_id + { + const c = app.findCollectionByNameOrId("pbc_3589557411") + c.fields.removeById("text1888339527") // stripe_customer_id + c.fields.addAt(2, new Field({ + "type": "text", "id": "text2001000001", "name": "adresse", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "bool", "id": "bool2001000002", "name": "dosb_mitglied", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false + })) + app.save(c) + } + + // gruppen: +beschreibung + { + const c = app.findCollectionByNameOrId("pbc_3099069179") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000003", "name": "beschreibung", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // mitglieder: +telefon, geburtsdatum, eintrittsdatum, austrittsdatum, strasse, plz, ort, bic, notizen + { + const c = app.findCollectionByNameOrId("pbc_2707111162") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000010", "name": "telefon", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "date", "id": "date2001000011", "name": "geburtsdatum", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "min": "", "max": "" + })) + c.fields.addAt(99, new Field({ + "type": "date", "id": "date2001000012", "name": "eintrittsdatum", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "min": "", "max": "" + })) + c.fields.addAt(99, new Field({ + "type": "date", "id": "date2001000013", "name": "austrittsdatum", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "min": "", "max": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000014", "name": "strasse", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000015", "name": "plz", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000016", "name": "ort", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000017", "name": "bic", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000018", "name": "notizen", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // beitraege: +beschreibung; rhythmus +halbjaehrlich (einmalig bleibt) + { + const c = app.findCollectionByNameOrId("pbc_3218207135") + const rhythmus = c.fields.getById("select917011370") + rhythmus.values = ["monatlich", "quartalsweise", "halbjaehrlich", "jaehrlich", "einmalig"] + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000020", "name": "beschreibung", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // einzuege: -stripe_payment_intent_id; status bezahlt→eingezogen + { + const c = app.findCollectionByNameOrId("pbc_659326735") + c.fields.removeById("text4235393406") // stripe_payment_intent_id + const status = c.fields.getById("select2063623452") + status.values = ["ausstehend", "eingezogen", "fehlgeschlagen", "storniert"] + app.save(c) + } + + // termine: +beschreibung + { + const c = app.findCollectionByNameOrId("pbc_2279568741") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000030", "name": "beschreibung", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // nachrichten: +autor_id (relation zu users) + { + const c = app.findCollectionByNameOrId("pbc_1415911511") + c.fields.addAt(2, new Field({ + "type": "relation", "id": "relation2001000040", "name": "autor_id", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "cascadeDelete": false, "collectionId": "_pb_users_auth_", "maxSelect": 1, "minSelect": 0 + })) + app.save(c) + } + +}, (app) => { + + // vereine rollback + { + const c = app.findCollectionByNameOrId("pbc_3589557411") + c.fields.removeById("text2001000001") + c.fields.removeById("bool2001000002") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text1888339527", "name": "stripe_customer_id", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // gruppen rollback + { + const c = app.findCollectionByNameOrId("pbc_3099069179") + c.fields.removeById("text2001000003") + app.save(c) + } + + // mitglieder rollback + { + const c = app.findCollectionByNameOrId("pbc_2707111162") + for (const id of ["text2001000010","date2001000011","date2001000012","date2001000013", + "text2001000014","text2001000015","text2001000016","text2001000017","text2001000018"]) { + c.fields.removeById(id) + } + app.save(c) + } + + // beitraege rollback + { + const c = app.findCollectionByNameOrId("pbc_3218207135") + const rhythmus = c.fields.getById("select917011370") + rhythmus.values = ["monatlich", "quartalsweise", "jaehrlich", "einmalig"] + c.fields.removeById("text2001000020") + app.save(c) + } + + // einzuege rollback + { + const c = app.findCollectionByNameOrId("pbc_659326735") + const status = c.fields.getById("select2063623452") + status.values = ["ausstehend", "bezahlt", "fehlgeschlagen", "storniert"] + c.fields.addAt(99, new Field({ + "type": "text", "id": "text4235393406", "name": "stripe_payment_intent_id", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // termine rollback + { + const c = app.findCollectionByNameOrId("pbc_2279568741") + c.fields.removeById("text2001000030") + app.save(c) + } + + // nachrichten rollback + { + const c = app.findCollectionByNameOrId("pbc_1415911511") + c.fields.removeById("relation2001000040") + app.save(c) + } + +}) diff --git a/pocketbase/pb_migrations/1779230100_sepa_fields.js b/pocketbase/pb_migrations/1779230100_sepa_fields.js new file mode 100644 index 0000000..f64ad90 --- /dev/null +++ b/pocketbase/pb_migrations/1779230100_sepa_fields.js @@ -0,0 +1,58 @@ +/// +migrate((app) => { + + // vereine: +glaeubigerid, +iban, +bic (Vereinskonto für SEPA-Einzug) + { + const c = app.findCollectionByNameOrId("pbc_3589557411") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000050", "name": "glaeubigerid", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000051", "name": "iban", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000052", "name": "bic", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + app.save(c) + } + + // mitglieder: +mandatsreferenz, +mandatsdatum (SEPA-Mandat des Mitglieds) + { + const c = app.findCollectionByNameOrId("pbc_2707111162") + c.fields.addAt(99, new Field({ + "type": "text", "id": "text2001000053", "name": "mandatsreferenz", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "autogeneratePattern": "", "min": 0, "max": 0, "pattern": "" + })) + c.fields.addAt(99, new Field({ + "type": "date", "id": "date2001000054", "name": "mandatsdatum", + "help": "", "hidden": false, "presentable": false, "required": false, "system": false, + "min": "", "max": "" + })) + app.save(c) + } + +}, (app) => { + + { + const c = app.findCollectionByNameOrId("pbc_3589557411") + c.fields.removeById("text2001000050") + c.fields.removeById("text2001000051") + c.fields.removeById("text2001000052") + app.save(c) + } + + { + const c = app.findCollectionByNameOrId("pbc_2707111162") + c.fields.removeById("text2001000053") + c.fields.removeById("date2001000054") + app.save(c) + } + +}) diff --git a/pocketbase/pb_migrations/1779230200_push_subscriptions_vereinrule.js b/pocketbase/pb_migrations/1779230200_push_subscriptions_vereinrule.js new file mode 100644 index 0000000..31c9122 --- /dev/null +++ b/pocketbase/pb_migrations/1779230200_push_subscriptions_vereinrule.js @@ -0,0 +1,14 @@ +/// +// Erlaubt allen Usern desselben Vereins, die Subscriptions ihrer Vereinsmitglieder zu lesen +// (notwendig damit die /api/push/senden Route alle Geräte des Vereins erreicht) +migrate((app) => { + const c = app.findCollectionByNameOrId("pbc_1438754935") // push_subscriptions + c.listRule = '@request.auth.verein_id = user_id.verein_id' + c.viewRule = '@request.auth.id = user_id' + app.save(c) +}, (app) => { + const c = app.findCollectionByNameOrId("pbc_1438754935") + c.listRule = '@request.auth.id = user_id' + c.viewRule = '@request.auth.id = user_id' + app.save(c) +}) diff --git a/pocketbase/pb_migrations/1779230300_vereine_create_rule.js b/pocketbase/pb_migrations/1779230300_vereine_create_rule.js new file mode 100644 index 0000000..434db4f --- /dev/null +++ b/pocketbase/pb_migrations/1779230300_vereine_create_rule.js @@ -0,0 +1,11 @@ +/// +// Erlaubt eingeloggten Nutzern, einen Verein anzulegen (Onboarding) +migrate((app) => { + const c = app.findCollectionByNameOrId("pbc_3589557411") // vereine + c.createRule = "@request.auth.id != ''" + app.save(c) +}, (app) => { + const c = app.findCollectionByNameOrId("pbc_3589557411") + c.createRule = null + app.save(c) +})