Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6fc557fad | ||
|
|
a2bdbf9035 | ||
|
|
f9193eebfd | ||
|
|
1a7a4f8a02 | ||
|
|
60246f3941 | ||
|
|
2af70c238b | ||
|
|
30f4b9d8c5 | ||
|
|
390b016cc2 | ||
|
|
e9d7ce262d | ||
|
|
fdd3793ee1 |
@@ -0,0 +1,29 @@
|
||||
# Ohne diese Datei wandert das komplette Repo zum Fly-Remote-Builder,
|
||||
# inklusive der ~50 MB Git-Historie und des gesamten Backends. Der
|
||||
# Frontend-Build braucht davon nichts.
|
||||
|
||||
.git
|
||||
.gitignore
|
||||
|
||||
node_modules
|
||||
dist
|
||||
.astro
|
||||
|
||||
# Das Backend wird als eigene Fly-App aus backend/ heraus gebaut
|
||||
backend
|
||||
|
||||
# Nicht vom Frontend-Build verwendet
|
||||
.woodpecker.yml
|
||||
Dockerfile.caddy
|
||||
docker-compose.yml
|
||||
pnpm-lock.yaml
|
||||
pnpm-workspace.yaml
|
||||
MIGRATION_README.md
|
||||
|
||||
.vscode
|
||||
.idea
|
||||
.DS_Store
|
||||
|
||||
.env
|
||||
.env.*
|
||||
*.log
|
||||
@@ -5,9 +5,17 @@ steps:
|
||||
- npm install --package-lock-only
|
||||
- npm audit --audit-level=moderate --json > audit-result.json 2>&1 || echo "Audit completed"
|
||||
- npm audit --audit-level=moderate > audit-output.txt 2>&1 || echo "Audit completed"
|
||||
# Nur wenn sich Abhaengigkeiten geaendert haben - bei reinen
|
||||
# Inhaltsaenderungen kaeme sonst jedes Mal derselbe Bericht
|
||||
when:
|
||||
- branch: main
|
||||
event: push
|
||||
path:
|
||||
include:
|
||||
- 'package.json'
|
||||
- 'package-lock.json'
|
||||
- '.woodpecker.yml'
|
||||
ignore_message: '[ALL]'
|
||||
|
||||
discord_notify_audit:
|
||||
image: alpine:latest
|
||||
@@ -76,9 +84,41 @@ steps:
|
||||
echo "No audit results found - listing workspace files:"
|
||||
ls -la
|
||||
fi
|
||||
# Gleicher Filter wie der Audit-Schritt, sonst meldet Discord bei jedem
|
||||
# Inhalts-Commit "keine Ergebnisse gefunden"
|
||||
when:
|
||||
- branch: main
|
||||
event: push
|
||||
path:
|
||||
include:
|
||||
- 'package.json'
|
||||
- 'package-lock.json'
|
||||
- '.woodpecker.yml'
|
||||
ignore_message: '[ALL]'
|
||||
|
||||
# Backend zuerst - die Admin-Seite braucht die API.
|
||||
# Laeuft nur, wenn sich am Backend etwas geaendert hat. Die haeufigsten
|
||||
# Commits sind Inhaltsaenderungen aus dem CMS und fassen nur src/ und
|
||||
# public/ an - die brauchen kein Backend-Deployment.
|
||||
deploy_backend:
|
||||
image: node:20
|
||||
environment:
|
||||
FLY_API_TOKEN:
|
||||
from_secret: FLY_API_TOKEN
|
||||
commands:
|
||||
- curl -L https://fly.io/install.sh | sh
|
||||
- export PATH="$HOME/.fly/bin:$PATH"
|
||||
# aus backend/ heraus, damit Build-Kontext und Dockerfile stimmen
|
||||
- cd backend && flyctl deploy --app gallus-cms-backend --remote-only
|
||||
when:
|
||||
- branch: main
|
||||
event: push
|
||||
path:
|
||||
include:
|
||||
- 'backend/**'
|
||||
- '.woodpecker.yml'
|
||||
# "[ALL]" in der Commit-Message erzwingt den vollen Durchlauf
|
||||
ignore_message: '[ALL]'
|
||||
|
||||
deploy_frontend:
|
||||
image: node:20
|
||||
@@ -92,6 +132,19 @@ steps:
|
||||
when:
|
||||
- branch: main
|
||||
event: push
|
||||
path:
|
||||
include:
|
||||
- 'src/**'
|
||||
- 'public/**'
|
||||
- 'package.json'
|
||||
- 'package-lock.json'
|
||||
- 'astro.config.mjs'
|
||||
- 'tsconfig.json'
|
||||
- 'Dockerfile'
|
||||
- '.dockerignore'
|
||||
- 'fly.toml'
|
||||
- '.woodpecker.yml'
|
||||
ignore_message: '[ALL]'
|
||||
|
||||
notify_success:
|
||||
image: alpine:latest
|
||||
|
||||
@@ -5,9 +5,6 @@ COPY package*.json ./
|
||||
# Fallback to npm install if no lockfile is present
|
||||
RUN npm ci || npm install
|
||||
COPY . .
|
||||
# Ensure CSS variables are present
|
||||
RUN mkdir -p public/styles
|
||||
RUN cp -r styles/* public/styles/ || true
|
||||
RUN npm run build
|
||||
|
||||
FROM node:20-alpine AS production
|
||||
|
||||
+18
-29
@@ -1,57 +1,46 @@
|
||||
# Multi-stage build for Gallus CMS Backend
|
||||
|
||||
# Stage 1: Builder
|
||||
# Hier werden die nativen Module EINMAL uebersetzt. Vorher lief npm ci in
|
||||
# beiden Stages, better-sqlite3 wurde also doppelt kompiliert.
|
||||
FROM node:20-alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install build dependencies for native modules (better-sqlite3, sharp)
|
||||
RUN apk add --no-cache python3 make g++ vips-dev
|
||||
# Nur fuer better-sqlite3 - fuer musl gibt es davon keine Fertigbauten.
|
||||
# sharp ab 0.33 bringt eigene Binaries samt libvips mit, vips-dev wird
|
||||
# dadurch nicht mehr gebraucht.
|
||||
RUN apk add --no-cache python3 make g++
|
||||
|
||||
# Install dependencies
|
||||
# Eigener Layer: bleibt im Cache, solange sich das Lockfile nicht aendert
|
||||
COPY package*.json ./
|
||||
# Use npm ci when lockfile exists, fallback to npm install for local/dev
|
||||
RUN npm ci || npm install
|
||||
RUN npm ci
|
||||
|
||||
# Copy source
|
||||
COPY . .
|
||||
|
||||
# Build TypeScript
|
||||
RUN npm run build
|
||||
|
||||
# Dev-Abhaengigkeiten entfernen. Was uebrig bleibt, ist fertig uebersetzt
|
||||
# und wandert unveraendert ins Laufzeit-Image.
|
||||
RUN npm prune --omit=dev
|
||||
|
||||
# Stage 2: Production
|
||||
FROM node:20-alpine
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install runtime dependencies (git for simple-git, sqlite3 CLI tool, vips for sharp)
|
||||
# Note: python3, make, g++ are needed for native module compilation
|
||||
RUN apk add --no-cache git sqlite vips vips-dev python3 make g++
|
||||
# git fuer simple-git, sqlite fuer die CLI. Keine Build-Werkzeuge mehr -
|
||||
# die blieben vorher als Layer im Image liegen, auch nach dem apk del.
|
||||
RUN apk add --no-cache git sqlite
|
||||
|
||||
# Copy package files first
|
||||
COPY --from=builder /app/package*.json ./
|
||||
|
||||
# Install all production dependencies and rebuild sharp for linuxmusl-x64
|
||||
RUN npm ci --omit=dev || npm install --production && \
|
||||
npm rebuild sharp
|
||||
|
||||
# Clean up build dependencies after installation to reduce image size
|
||||
RUN apk del python3 make g++ vips-dev
|
||||
|
||||
# Copy built files from builder
|
||||
# Hinweis: Drizzle-Migrationen werden nicht kopiert - das Schema wird zur
|
||||
# Laufzeit von initDatabase() angelegt, src/db/migrations existiert nicht.
|
||||
COPY --from=builder /app/node_modules ./node_modules
|
||||
COPY --from=builder /app/dist ./dist
|
||||
|
||||
# Copy migration script and migrated images
|
||||
COPY --from=builder /app/migrate-production.js ./migrate-production.js
|
||||
COPY --from=builder /app/data/images ./data/images
|
||||
|
||||
# Create directories
|
||||
RUN mkdir -p /app/workspace /app/data
|
||||
|
||||
# Ensure proper permissions
|
||||
RUN chown -R node:node /app
|
||||
# Create directories and ensure proper permissions
|
||||
RUN mkdir -p /app/workspace /app/data && chown -R node:node /app
|
||||
|
||||
# Switch to non-root user
|
||||
USER node
|
||||
|
||||
Generated
+1530
-151
File diff suppressed because it is too large
Load Diff
@@ -27,14 +27,16 @@ export function initDatabase() {
|
||||
console.log('🔧 Initializing database...');
|
||||
|
||||
try {
|
||||
// Check if users table exists (acts as a sentinel for initial setup)
|
||||
// Nur zur Protokollierung - angelegt wird immer, siehe unten
|
||||
const tableCheck = sqlite
|
||||
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='users'")
|
||||
.get();
|
||||
|
||||
if (!tableCheck) {
|
||||
console.log('📝 Creating database schema...');
|
||||
console.log(tableCheck ? '📝 Checking database schema...' : '📝 Creating database schema...');
|
||||
|
||||
// Laeuft bei JEDEM Start. Alle Anweisungen sind IF NOT EXISTS, und nur so
|
||||
// bekommen bestehende Datenbanken spaeter ergaenzte Tabellen ueberhaupt.
|
||||
{
|
||||
sqlite.exec(`
|
||||
PRAGMA foreign_keys = ON;
|
||||
|
||||
@@ -84,6 +86,11 @@ export function initDatabase() {
|
||||
updated_at INTEGER DEFAULT (unixepoch())
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS managed_assets (
|
||||
path TEXT PRIMARY KEY,
|
||||
created_at INTEGER DEFAULT (unixepoch())
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS publish_history (
|
||||
id TEXT PRIMARY KEY,
|
||||
user_id TEXT REFERENCES users(id),
|
||||
@@ -93,9 +100,7 @@ export function initDatabase() {
|
||||
);
|
||||
`);
|
||||
|
||||
console.log('✅ Database schema created successfully!');
|
||||
} else {
|
||||
console.log('✅ Database already initialized.');
|
||||
console.log('✅ Database schema is up to date.');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ Error initializing database:', error);
|
||||
|
||||
@@ -60,6 +60,18 @@ export const publishHistory = sqliteTable('publish_history', {
|
||||
publishedAt: integer('published_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
});
|
||||
|
||||
// Vom CMS selbst angelegte Dateien.
|
||||
//
|
||||
// Frueher wurde am Dateinamen erkannt, ob das CMS eine Datei loeschen darf.
|
||||
// Seit die Namen aus Alt-Text bzw. Original-Dateiname abgeleitet werden,
|
||||
// traegt der Name diese Information nicht mehr - ein hochgeladenes
|
||||
// karaoke-abend.avif sieht aus wie ein handgepflegtes event_karaoke.jpg.
|
||||
// Deshalb wird der Besitz hier festgehalten.
|
||||
export const managedAssets = sqliteTable('managed_assets', {
|
||||
path: text('path').primaryKey(), // z.B. /images/events/karaoke-abend.avif
|
||||
createdAt: integer('created_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
});
|
||||
|
||||
// Banner table (for announcements like holidays, special info)
|
||||
export const banners = sqliteTable('banners', {
|
||||
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
||||
|
||||
@@ -8,6 +8,7 @@ import { env, validateEnv } from './config/env.js';
|
||||
import { db, initDatabase } from './config/database.js';
|
||||
import fastifyStatic from '@fastify/static';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
|
||||
// Import routes
|
||||
import authRoute from './routes/auth.js';
|
||||
@@ -17,6 +18,7 @@ import contentRoute from './routes/content.js';
|
||||
import settingsRoute from './routes/settings.js';
|
||||
import publishRoute from './routes/publish.js';
|
||||
import bannersRoute from './routes/banners.js';
|
||||
import pdfRoute from './routes/pdf.js';
|
||||
|
||||
// Validate environment variables
|
||||
try {
|
||||
@@ -79,12 +81,34 @@ fastify.register(multipart, {
|
||||
|
||||
// Serve static files (uploaded images, etc.) from persistent volume
|
||||
const dataDir = env.GIT_WORKSPACE_DIR || path.join(process.cwd(), 'data');
|
||||
// Muss existieren, sonst verweigert @fastify/static die Registrierung
|
||||
fs.mkdirSync(dataDir, { recursive: true });
|
||||
fastify.register(fastifyStatic, {
|
||||
root: dataDir,
|
||||
prefix: '/static/',
|
||||
decorateReply: false
|
||||
});
|
||||
|
||||
// Uploads liegen unter <workspace>/public/images. In der DB stehen sie als
|
||||
// /images/... - das ist die URL auf der publizierten Astro-Seite. Damit die
|
||||
// Admin-Oberflaeche dieselben Pfade verwenden kann, hier ebenso ausliefern.
|
||||
const imagesDir = path.join(dataDir, 'public', 'images');
|
||||
fs.mkdirSync(imagesDir, { recursive: true });
|
||||
fastify.register(fastifyStatic, {
|
||||
root: imagesDir,
|
||||
prefix: '/images/',
|
||||
decorateReply: false
|
||||
});
|
||||
|
||||
// Dasselbe fuer die hochgeladenen PDFs (Getraenkekarte)
|
||||
const pdfDir = path.join(dataDir, 'public', 'pdf');
|
||||
fs.mkdirSync(pdfDir, { recursive: true });
|
||||
fastify.register(fastifyStatic, {
|
||||
root: pdfDir,
|
||||
prefix: '/pdf/',
|
||||
decorateReply: false
|
||||
});
|
||||
|
||||
// Decorate fastify with authenticate method
|
||||
fastify.decorate('authenticate', authenticate);
|
||||
|
||||
@@ -96,6 +120,7 @@ fastify.register(contentRoute, { prefix: '/api' });
|
||||
fastify.register(settingsRoute, { prefix: '/api' });
|
||||
fastify.register(publishRoute, { prefix: '/api' });
|
||||
fastify.register(bannersRoute, { prefix: '/api' });
|
||||
fastify.register(pdfRoute, { prefix: '/api' });
|
||||
|
||||
// Health check
|
||||
fastify.get('/health', async () => {
|
||||
|
||||
@@ -3,6 +3,8 @@ import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { contentSections } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { saveUploadedImage } from '../services/upload.service.js';
|
||||
import { dropImageIfUnused, extractImageUrls } from '../services/image-refs.service.js';
|
||||
|
||||
// Fastify JSON schema for content section body
|
||||
const contentBodyJsonSchema = {
|
||||
@@ -78,6 +80,20 @@ const contentRoute: FastifyPluginAsync = async (fastify) => {
|
||||
.returning();
|
||||
}
|
||||
|
||||
// Bilder, die durch die Aenderung herausgefallen sind, wegraeumen
|
||||
const before = extractImageUrls((existing as any)?.contentJson);
|
||||
const after = extractImageUrls(result.contentJson);
|
||||
for (const url of before) {
|
||||
if (after.has(url)) continue;
|
||||
try {
|
||||
if (await dropImageIfUnused(url)) {
|
||||
fastify.log.info(`Removed unused content image ${url}`);
|
||||
}
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, 'Could not remove unused content image');
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
section: result.sectionName,
|
||||
content: result.contentJson,
|
||||
@@ -85,6 +101,39 @@ const contentRoute: FastifyPluginAsync = async (fastify) => {
|
||||
};
|
||||
});
|
||||
|
||||
// Bild fuer einen Textbereich hochladen (Welcome-Bild, Monatshit, Whiskey)
|
||||
fastify.post('/content/upload', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
try {
|
||||
const file = await (request as any).file();
|
||||
if (!file) {
|
||||
return reply.code(400).send({ error: 'No file uploaded' });
|
||||
}
|
||||
|
||||
const mime = file.mimetype as string | undefined;
|
||||
if (!mime || !mime.startsWith('image/')) {
|
||||
return reply.code(400).send({ error: 'Only image uploads are allowed' });
|
||||
}
|
||||
|
||||
const preferredName = (file.fields?.name?.value as string | undefined) || '';
|
||||
|
||||
const saved = await saveUploadedImage(file, 'content', {
|
||||
preferredName,
|
||||
log: fastify.log,
|
||||
});
|
||||
|
||||
return reply.code(201).send({ imageUrl: saved.imageUrl });
|
||||
|
||||
} catch (err: any) {
|
||||
if (err?.statusCode === 413) {
|
||||
return reply.code(413).send({ error: err.message });
|
||||
}
|
||||
fastify.log.error({ err }, 'Upload failed');
|
||||
return reply.code(500).send({ error: 'Failed to upload image' });
|
||||
}
|
||||
});
|
||||
|
||||
// List all content sections
|
||||
fastify.get('/content', {
|
||||
preHandler: [fastify.authenticate],
|
||||
|
||||
@@ -2,8 +2,19 @@ import { FastifyPluginAsync } from 'fastify';
|
||||
import { db } from '../config/database.js';
|
||||
import { events } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { dropImageIfUnused } from '../services/image-refs.service.js';
|
||||
import { saveUploadedImage } from '../services/upload.service.js';
|
||||
|
||||
/** Raeumt eine Bilddatei weg, ohne dass ein Fehler die Antwort kippt. */
|
||||
async function dropUnusedImage(fastify: any, url: string | null | undefined, reason: string) {
|
||||
try {
|
||||
if (await dropImageIfUnused(url)) {
|
||||
fastify.log.info(`Removed ${reason} ${url}`);
|
||||
}
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, `Could not remove ${reason}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Fastify JSON schema for event body
|
||||
const eventBodyJsonSchema = {
|
||||
@@ -71,8 +82,17 @@ const eventsRoute: FastifyPluginAsync = async (fastify) => {
|
||||
fastify.put('/events/:id', { schema: { body: eventBodyJsonSchema }, preHandler: [fastify.authenticate] }, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const data = request.body as any;
|
||||
|
||||
const [previous] = await db.select().from(events).where(eq(events.id, id)).limit(1);
|
||||
|
||||
const [row] = await db.update(events).set({ ...data, updatedAt: new Date() }).where(eq(events.id, id)).returning();
|
||||
if (!row) return reply.code(404).send({ error: 'Event not found' });
|
||||
|
||||
// Ausgetauschtes Bild wegraeumen, sonst bleibt es fuer immer liegen
|
||||
if (previous && previous.imageUrl !== row.imageUrl) {
|
||||
await dropUnusedImage(fastify, previous.imageUrl, 'replaced event image');
|
||||
}
|
||||
|
||||
return { event: row };
|
||||
});
|
||||
|
||||
@@ -92,52 +112,21 @@ const eventsRoute: FastifyPluginAsync = async (fastify) => {
|
||||
return reply.code(400).send({ error: 'Only image uploads are allowed' });
|
||||
}
|
||||
|
||||
// Prepare directories - use persistent volume for Fly.io
|
||||
const dataDir = process.env.GIT_WORKSPACE_DIR || path.join(process.cwd(), 'data');
|
||||
const uploadDir = path.join(dataDir, 'public', 'images', 'events');
|
||||
if (!fs.existsSync(uploadDir)) fs.mkdirSync(uploadDir, { recursive: true });
|
||||
// Der Titel kommt als Formularfeld VOR der Datei, sonst ist er hier
|
||||
// noch nicht geparst
|
||||
const preferredName = (file.fields?.title?.value as string | undefined) || '';
|
||||
|
||||
// Read uploaded stream into buffer
|
||||
const chunks: Buffer[] = [];
|
||||
for await (const chunk of file.file) {
|
||||
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
||||
const saved = await saveUploadedImage(file, 'events', {
|
||||
preferredName,
|
||||
log: fastify.log,
|
||||
});
|
||||
|
||||
return reply.code(201).send({ imageUrl: saved.imageUrl });
|
||||
|
||||
} catch (err: any) {
|
||||
if (err?.statusCode === 413) {
|
||||
return reply.code(413).send({ error: err.message });
|
||||
}
|
||||
const inputBuffer = Buffer.concat(chunks);
|
||||
|
||||
// Generate filename
|
||||
const stamp = Date.now().toString(36);
|
||||
const rand = Math.random().toString(36).slice(2, 8);
|
||||
const baseName = `${stamp}-${rand}`;
|
||||
|
||||
// Try to convert to webp and limit size; fallback to original
|
||||
let outBuffer: Buffer | null = null;
|
||||
let outExt = '.webp';
|
||||
try {
|
||||
// Lazy load sharp only when needed
|
||||
const sharp = (await import('sharp')).default;
|
||||
outBuffer = await sharp(inputBuffer)
|
||||
.rotate()
|
||||
.resize({ width: 1600, withoutEnlargement: true })
|
||||
.webp({ quality: 82 })
|
||||
.toBuffer();
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, 'Sharp processing failed, using original image');
|
||||
outBuffer = inputBuffer;
|
||||
// naive extension from mimetype
|
||||
const extFromMime = mime.split('/')[1] || 'bin';
|
||||
outExt = '.' + extFromMime.replace(/[^a-z0-9]/gi, '').toLowerCase();
|
||||
}
|
||||
|
||||
const filename = baseName + outExt;
|
||||
const destPath = path.join(uploadDir, filename);
|
||||
fs.writeFileSync(destPath, outBuffer);
|
||||
|
||||
// Public URL (served via /static)
|
||||
const publicUrl = `/images/events/${filename}`;
|
||||
|
||||
return reply.code(201).send({ imageUrl: publicUrl });
|
||||
|
||||
} catch (err) {
|
||||
fastify.log.error({ err }, 'Upload failed');
|
||||
return reply.code(500).send({ error: 'Failed to upload image' });
|
||||
}
|
||||
@@ -148,6 +137,10 @@ const eventsRoute: FastifyPluginAsync = async (fastify) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const [row] = await db.delete(events).where(eq(events.id, id)).returning();
|
||||
if (!row) return reply.code(404).send({ error: 'Event not found' });
|
||||
|
||||
// Zugehoerige Bilddatei mitnehmen
|
||||
await dropUnusedImage(fastify, row.imageUrl, 'event image');
|
||||
|
||||
return { message: 'Event deleted successfully' };
|
||||
});
|
||||
|
||||
|
||||
@@ -3,8 +3,19 @@ import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { galleryImages } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { dropImageIfUnused } from '../services/image-refs.service.js';
|
||||
import { saveUploadedImage } from '../services/upload.service.js';
|
||||
|
||||
/** Raeumt eine Bilddatei weg, ohne dass ein Fehler die Antwort kippt. */
|
||||
async function dropUnusedImage(fastify: any, url: string | null | undefined, reason: string) {
|
||||
try {
|
||||
if (await dropImageIfUnused(url)) {
|
||||
fastify.log.info(`Removed ${reason} ${url}`);
|
||||
}
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, `Could not remove ${reason}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Fastify JSON schema for gallery image body
|
||||
const galleryBodyJsonSchema = {
|
||||
@@ -84,60 +95,25 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
||||
return reply.code(400).send({ error: 'Only image uploads are allowed' });
|
||||
}
|
||||
|
||||
// Prepare directories - use persistent volume for Fly.io
|
||||
const dataDir = process.env.GIT_WORKSPACE_DIR || path.join(process.cwd(), 'data');
|
||||
const uploadDir = path.join(dataDir, 'public', 'images', 'gallery');
|
||||
if (!fs.existsSync(uploadDir)) fs.mkdirSync(uploadDir, { recursive: true });
|
||||
|
||||
// Read uploaded stream into buffer
|
||||
const chunks: Buffer[] = [];
|
||||
for await (const chunk of file.file) {
|
||||
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
||||
}
|
||||
const inputBuffer = Buffer.concat(chunks);
|
||||
|
||||
// Generate filename
|
||||
const stamp = Date.now().toString(36);
|
||||
const rand = Math.random().toString(36).slice(2, 8);
|
||||
const baseName = `${stamp}-${rand}`;
|
||||
|
||||
// Try to convert to webp and limit size; fallback to original
|
||||
let outBuffer: Buffer | null = null;
|
||||
let outExt = '.webp';
|
||||
try {
|
||||
// Lazy load sharp only when needed
|
||||
const sharp = (await import('sharp')).default;
|
||||
outBuffer = await sharp(inputBuffer)
|
||||
.rotate()
|
||||
.resize({ width: 1600, withoutEnlargement: true })
|
||||
.webp({ quality: 82 })
|
||||
.toBuffer();
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, 'Sharp processing failed, using original image');
|
||||
outBuffer = inputBuffer;
|
||||
// naive extension from mimetype
|
||||
const extFromMime = mime.split('/')[1] || 'bin';
|
||||
outExt = '.' + extFromMime.replace(/[^a-z0-9]/gi, '').toLowerCase();
|
||||
}
|
||||
|
||||
const filename = baseName + outExt;
|
||||
const destPath = path.join(uploadDir, filename);
|
||||
fs.writeFileSync(destPath, outBuffer);
|
||||
|
||||
// Public URL (served via /static)
|
||||
const publicUrl = `/images/gallery/${filename}`;
|
||||
const saved = await saveUploadedImage(file, 'gallery', {
|
||||
preferredName: altText,
|
||||
log: fastify.log,
|
||||
});
|
||||
|
||||
// Store in DB (optional but useful)
|
||||
const [row] = await db.insert(galleryImages).values({
|
||||
imageUrl: publicUrl,
|
||||
altText: altText || filename,
|
||||
imageUrl: saved.imageUrl,
|
||||
altText: altText || saved.filename,
|
||||
displayOrder,
|
||||
isPublished: true,
|
||||
}).returning();
|
||||
|
||||
return reply.code(201).send({ image: row });
|
||||
|
||||
} catch (err) {
|
||||
} catch (err: any) {
|
||||
if (err?.statusCode === 413) {
|
||||
return reply.code(413).send({ error: err.message });
|
||||
}
|
||||
fastify.log.error({ err }, 'Upload failed');
|
||||
return reply.code(500).send({ error: 'Failed to upload image' });
|
||||
}
|
||||
@@ -153,6 +129,8 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const data = request.body as any;
|
||||
|
||||
const [previous] = await db.select().from(galleryImages).where(eq(galleryImages.id, id)).limit(1);
|
||||
|
||||
const [updated] = await db
|
||||
.update(galleryImages)
|
||||
.set(data)
|
||||
@@ -163,6 +141,11 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
||||
return reply.code(404).send({ error: 'Image not found' });
|
||||
}
|
||||
|
||||
// Ausgetauschte Datei wegraeumen
|
||||
if (previous && previous.imageUrl !== updated.imageUrl) {
|
||||
await dropUnusedImage(fastify, previous.imageUrl, 'replaced gallery image');
|
||||
}
|
||||
|
||||
return { image: updated };
|
||||
});
|
||||
|
||||
@@ -181,6 +164,9 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
||||
return reply.code(404).send({ error: 'Image not found' });
|
||||
}
|
||||
|
||||
// Zugehoerige Bilddatei mitnehmen
|
||||
await dropUnusedImage(fastify, deleted.imageUrl, 'gallery image');
|
||||
|
||||
return { message: 'Image deleted successfully' };
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { db } from '../config/database.js';
|
||||
import { contentSections } from '../db/schema.js';
|
||||
import { AssetService } from '../services/asset.service.js';
|
||||
import { isManagedAsset, forgetManagedAsset } from '../services/managed-assets.service.js';
|
||||
import { saveUploadedPdf } from '../services/upload.service.js';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
const assets = new AssetService();
|
||||
|
||||
/**
|
||||
* Feste PDF-Plaetze. Die URL landet jeweils in einer Content-Section, damit
|
||||
* der Generator sie beim Publish in die Astro-Komponente schreiben kann.
|
||||
*/
|
||||
const PDF_SLOTS: Record<string, { section: string; field: string }> = {
|
||||
drinks: { section: 'drinks', field: 'pdfUrl' },
|
||||
};
|
||||
|
||||
/** contentJson kommt je nach Treiber als Objekt oder als String zurueck. */
|
||||
function asObject(value: any): Record<string, any> {
|
||||
if (!value) return {};
|
||||
if (typeof value === 'string') {
|
||||
try {
|
||||
const parsed = JSON.parse(value);
|
||||
return parsed && typeof parsed === 'object' ? parsed : {};
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
return typeof value === 'object' ? value : {};
|
||||
}
|
||||
|
||||
const pdfRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
// PDF fuer einen festen Platz hochladen und verlinken
|
||||
fastify.post('/pdf/:slot', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { slot } = request.params as { slot: string };
|
||||
const target = PDF_SLOTS[slot];
|
||||
|
||||
if (!target) {
|
||||
return reply.code(404).send({ error: `Unknown PDF slot "${slot}"` });
|
||||
}
|
||||
|
||||
try {
|
||||
const file = await (request as any).file();
|
||||
if (!file) {
|
||||
return reply.code(400).send({ error: 'No file uploaded' });
|
||||
}
|
||||
|
||||
const mime = file.mimetype as string | undefined;
|
||||
const originalName = (file.filename as string | undefined) || '';
|
||||
if (mime !== 'application/pdf' && !originalName.toLowerCase().endsWith('.pdf')) {
|
||||
return reply.code(400).send({ error: 'Only PDF uploads are allowed' });
|
||||
}
|
||||
|
||||
const chunks: Buffer[] = [];
|
||||
for await (const chunk of file.file) {
|
||||
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
||||
}
|
||||
const buffer = Buffer.concat(chunks);
|
||||
|
||||
if ((file.file as any)?.truncated) {
|
||||
const limit = Math.round(env.MAX_FILE_SIZE / 1024 / 1024);
|
||||
return reply.code(413).send({ error: `PDF too large. Maximum is ${limit} MB` });
|
||||
}
|
||||
|
||||
// Inhalt gegenpruefen, damit nicht irgendetwas mit .pdf-Endung landet
|
||||
if (buffer.subarray(0, 5).toString('latin1') !== '%PDF-') {
|
||||
return reply.code(400).send({ error: 'File is not a valid PDF' });
|
||||
}
|
||||
|
||||
const pdfUrl = await saveUploadedPdf(file, buffer);
|
||||
|
||||
// URL in der Content-Section hinterlegen
|
||||
const [existing] = await db
|
||||
.select()
|
||||
.from(contentSections)
|
||||
.where(eq(contentSections.sectionName, target.section))
|
||||
.limit(1);
|
||||
|
||||
const previousContent = asObject((existing as any)?.contentJson);
|
||||
const previousUrl = previousContent[target.field];
|
||||
const content = { ...previousContent, [target.field]: pdfUrl };
|
||||
|
||||
if (existing) {
|
||||
await db
|
||||
.update(contentSections)
|
||||
.set({ contentJson: content, updatedAt: new Date() })
|
||||
.where(eq(contentSections.sectionName, target.section));
|
||||
} else {
|
||||
await db
|
||||
.insert(contentSections)
|
||||
.values({ sectionName: target.section, contentJson: content });
|
||||
}
|
||||
|
||||
// Vorgaenger wegraeumen - greift nur bei frueher hochgeladenen PDFs,
|
||||
// die mitgelieferte Getraenkekarte aus dem Repo bleibt liegen
|
||||
if (previousUrl && previousUrl !== pdfUrl && (await isManagedAsset(previousUrl))) {
|
||||
try {
|
||||
if (assets.deletePdf(previousUrl)) {
|
||||
fastify.log.info(`Removed replaced PDF ${previousUrl}`);
|
||||
}
|
||||
await forgetManagedAsset(previousUrl);
|
||||
} catch (err) {
|
||||
fastify.log.warn({ err }, 'Could not remove replaced PDF');
|
||||
}
|
||||
}
|
||||
|
||||
return reply.code(201).send({ pdfUrl, section: target.section });
|
||||
|
||||
} catch (err: any) {
|
||||
if (err?.code === 'FST_REQ_FILE_TOO_LARGE') {
|
||||
const limit = Math.round(env.MAX_FILE_SIZE / 1024 / 1024);
|
||||
return reply.code(413).send({ error: `PDF too large. Maximum is ${limit} MB` });
|
||||
}
|
||||
fastify.log.error({ err }, 'PDF upload failed');
|
||||
return reply.code(500).send({ error: 'Failed to upload PDF' });
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
export default pdfRoute;
|
||||
@@ -2,6 +2,7 @@ import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { GitService } from '../services/git.service.js';
|
||||
import { FileGeneratorService } from '../services/file-generator.service.js';
|
||||
import { sweepOrphanedImages } from '../services/image-refs.service.js';
|
||||
import { db } from '../config/database.js';
|
||||
import { events, galleryImages, contentSections, publishHistory } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
@@ -34,6 +35,13 @@ const publishRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
fastify.log.info('Git repository initialized');
|
||||
|
||||
// Verwaiste Uploads entfernen, bevor committet wird
|
||||
const removedImages = await sweepOrphanedImages();
|
||||
|
||||
if (removedImages.length > 0) {
|
||||
fastify.log.info(`Removed ${removedImages.length} orphaned image(s): ${removedImages.join(', ')}`);
|
||||
}
|
||||
|
||||
// Fetch all content from database
|
||||
const eventsData = await db
|
||||
.select()
|
||||
@@ -78,16 +86,23 @@ const publishRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
fastify.log.info(`Changes committed: ${commitHash}`);
|
||||
|
||||
// Record in history
|
||||
await db.insert(publishHistory).values({
|
||||
userId,
|
||||
commitHash,
|
||||
commitMessage,
|
||||
});
|
||||
// Record in history. Der Push ist an dieser Stelle bereits durch -
|
||||
// ein Fehler im Protokoll darf die Veroeffentlichung nicht als
|
||||
// gescheitert melden und den Workspace zuruecksetzen.
|
||||
try {
|
||||
await db.insert(publishHistory).values({
|
||||
userId,
|
||||
commitHash,
|
||||
commitMessage,
|
||||
});
|
||||
} catch (historyError) {
|
||||
fastify.log.warn({ err: historyError }, 'Could not record publish history');
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
commitHash,
|
||||
removedImages: removedImages.length,
|
||||
message: 'Changes published successfully',
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,218 @@
|
||||
/**
|
||||
* Einmalige Umwandlung des Altbestands nach AVIF.
|
||||
*
|
||||
* Bilder, die vor der Umstellung hochgeladen wurden, liegen unverkleinert
|
||||
* und im Originalformat im Repo - damals war sharp im Container kaputt, es
|
||||
* gab also weder Verkleinerung noch Formatwandlung. Dieses Skript schickt
|
||||
* sie durch dieselbe Verarbeitung wie einen frischen Upload, benennt sie
|
||||
* nach ihrem Inhalt und zieht die Verweise in der Datenbank mit.
|
||||
*
|
||||
* Aufruf im Container:
|
||||
* node dist/scripts/convert-images-to-avif.js # nur anzeigen
|
||||
* node dist/scripts/convert-images-to-avif.js --apply # wirklich tun
|
||||
*
|
||||
* Ohne --apply wird nichts geschrieben.
|
||||
*/
|
||||
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { db, initDatabase } from '../config/database.js';
|
||||
import { events, galleryImages, contentSections } from '../db/schema.js';
|
||||
import { GitService } from '../services/git.service.js';
|
||||
import { AssetService, MANAGED_IMAGE_DIRS } from '../services/asset.service.js';
|
||||
import { saveImageBuffer, UploadSubdir } from '../services/upload.service.js';
|
||||
import { replaceImageUrls, dropImageIfUnused } from '../services/image-refs.service.js';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
const APPLY = process.argv.includes('--apply');
|
||||
|
||||
const assets = new AssetService();
|
||||
|
||||
interface Candidate {
|
||||
url: string;
|
||||
preferredName: string;
|
||||
}
|
||||
|
||||
/** /images/events/foo.jpg -> events */
|
||||
function subdirOf(url: string): UploadSubdir | null {
|
||||
const match = /^\/images\/(events|gallery|content)\//.exec(url);
|
||||
return match ? (match[1] as UploadSubdir) : null;
|
||||
}
|
||||
|
||||
function absolutePathOf(url: string): string {
|
||||
return path.join(env.GIT_WORKSPACE_DIR, 'public', url.replace(/^\/+/, ''));
|
||||
}
|
||||
|
||||
/** Sprechender Name fuer ein Bild aus einem Textbereich. */
|
||||
function contentImageName(section: string, key: string, content: any): string {
|
||||
if (section === 'welcome' && key === 'imageUrl') return 'willkommen';
|
||||
if (section === 'drinks' && key === 'monthlySpecialImage') {
|
||||
return content?.monthlySpecialName || 'monats-hit';
|
||||
}
|
||||
const whiskey = /^whiskeyImage(\d)$/.exec(key);
|
||||
if (whiskey) return `whiskey-${whiskey[1]}`;
|
||||
return `${section}-bild`;
|
||||
}
|
||||
|
||||
function asObject(value: any): Record<string, any> {
|
||||
if (!value) return {};
|
||||
if (typeof value === 'string') {
|
||||
try {
|
||||
const parsed = JSON.parse(value);
|
||||
return parsed && typeof parsed === 'object' ? parsed : {};
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
return typeof value === 'object' ? value : {};
|
||||
}
|
||||
|
||||
async function collectCandidates(): Promise<Candidate[]> {
|
||||
const byUrl = new Map<string, string>();
|
||||
|
||||
const remember = (url: any, name: string) => {
|
||||
if (typeof url !== 'string' || !url.startsWith('/images/')) return;
|
||||
if (!byUrl.has(url)) byUrl.set(url, name);
|
||||
};
|
||||
|
||||
for (const row of (await db.select().from(events)) as any[]) {
|
||||
remember(row.imageUrl, row.title);
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(galleryImages)) as any[]) {
|
||||
remember(row.imageUrl, row.altText);
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(contentSections)) as any[]) {
|
||||
const content = asObject(row.contentJson);
|
||||
for (const [key, value] of Object.entries(content)) {
|
||||
remember(value, contentImageName(row.sectionName, key, content));
|
||||
}
|
||||
}
|
||||
|
||||
return [...byUrl.entries()].map(([url, preferredName]) => ({ url, preferredName }));
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log(APPLY ? '=== Umwandlung nach AVIF ===' : '=== Vorschau (nichts wird geschrieben) ===\n');
|
||||
|
||||
initDatabase();
|
||||
|
||||
// Workspace auf den Stand des Repos bringen
|
||||
const git = new GitService();
|
||||
await git.initialize();
|
||||
console.log(`Workspace: ${env.GIT_WORKSPACE_DIR}\n`);
|
||||
|
||||
const candidates = await collectCandidates();
|
||||
const mapping = new Map<string, string>();
|
||||
|
||||
let bytesBefore = 0;
|
||||
let bytesAfter = 0;
|
||||
let skipped = 0;
|
||||
let missing = 0;
|
||||
|
||||
for (const { url, preferredName } of candidates) {
|
||||
const subdir = subdirOf(url);
|
||||
|
||||
if (!subdir) {
|
||||
console.log(` uebersprungen (ausserhalb der Upload-Ordner): ${url}`);
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (url.toLowerCase().endsWith('.avif')) {
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
|
||||
const source = absolutePathOf(url);
|
||||
if (!assets.resolveInDirs(url, MANAGED_IMAGE_DIRS) || !fs.existsSync(source)) {
|
||||
console.log(` FEHLT auf der Platte, Verweis bleibt: ${url}`);
|
||||
missing++;
|
||||
continue;
|
||||
}
|
||||
|
||||
const input = fs.readFileSync(source);
|
||||
bytesBefore += input.length;
|
||||
|
||||
if (!APPLY) {
|
||||
console.log(` ${url} (${(input.length / 1024).toFixed(0)} KB) -> benannt nach "${preferredName}"`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const saved = await saveImageBuffer(input, subdir, { preferredName });
|
||||
const outSize = fs.statSync(absolutePathOf(saved.imageUrl)).size;
|
||||
bytesAfter += outSize;
|
||||
mapping.set(url, saved.imageUrl);
|
||||
|
||||
console.log(
|
||||
` ${url} ${(input.length / 1024).toFixed(0)} KB -> ${saved.imageUrl} ${(outSize / 1024).toFixed(0)} KB`
|
||||
);
|
||||
}
|
||||
|
||||
if (!APPLY) {
|
||||
console.log(`\n${candidates.length - skipped - missing} Bild(er) wuerden umgewandelt.`);
|
||||
console.log(`Gesamtgroesse aktuell: ${(bytesBefore / 1024 / 1024).toFixed(2)} MB`);
|
||||
console.log('\nZum Ausfuehren: node dist/scripts/convert-images-to-avif.js --apply');
|
||||
return;
|
||||
}
|
||||
|
||||
if (mapping.size === 0) {
|
||||
console.log('\nNichts umzuwandeln.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Verweise in der Datenbank nachziehen
|
||||
for (const row of (await db.select().from(events)) as any[]) {
|
||||
const next = mapping.get(row.imageUrl);
|
||||
if (next) await db.update(events).set({ imageUrl: next }).where(eq(events.id, row.id));
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(galleryImages)) as any[]) {
|
||||
const next = mapping.get(row.imageUrl);
|
||||
if (next) await db.update(galleryImages).set({ imageUrl: next }).where(eq(galleryImages.id, row.id));
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(contentSections)) as any[]) {
|
||||
const updated = replaceImageUrls(asObject(row.contentJson), mapping);
|
||||
await db
|
||||
.update(contentSections)
|
||||
.set({ contentJson: updated, updatedAt: new Date() })
|
||||
.where(eq(contentSections.sectionName, row.sectionName));
|
||||
}
|
||||
|
||||
console.log('\nVerweise in der Datenbank aktualisiert.');
|
||||
|
||||
// Vorgaenger wegraeumen - dropImageIfUnused loescht nur, was das CMS
|
||||
// selbst angelegt hat. Handgepflegte Dateien wie event_karaoke.jpg
|
||||
// bleiben liegen, obwohl jetzt eine AVIF-Fassung existiert.
|
||||
let removed = 0;
|
||||
let kept = 0;
|
||||
|
||||
for (const oldUrl of mapping.keys()) {
|
||||
if (await dropImageIfUnused(oldUrl)) {
|
||||
removed++;
|
||||
} else if (fs.existsSync(absolutePathOf(oldUrl))) {
|
||||
console.log(` Original behalten (nicht vom CMS angelegt): ${oldUrl}`);
|
||||
kept++;
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`\n${mapping.size} Bild(er) umgewandelt, ${removed} Original(e) entfernt, ${kept} behalten.`);
|
||||
console.log(
|
||||
`Groesse: ${(bytesBefore / 1024 / 1024).toFixed(2)} MB -> ${(bytesAfter / 1024 / 1024).toFixed(2)} MB` +
|
||||
` (${(100 - (bytesAfter / bytesBefore) * 100).toFixed(1)} % gespart)`
|
||||
);
|
||||
|
||||
const hash = await git.commitAndPush('Bestandsbilder nach AVIF umgewandelt');
|
||||
console.log(`\nCommit: ${hash}`);
|
||||
console.log('Fertig. Woodpecker baut die Seite jetzt neu.');
|
||||
}
|
||||
|
||||
main()
|
||||
.then(() => process.exit(0))
|
||||
.catch((err) => {
|
||||
console.error('\nFehlgeschlagen:', err);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -0,0 +1,94 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
/**
|
||||
* Kennt die Verzeichnisse, in die das CMS schreibt, und sorgt dafuer, dass
|
||||
* kein Pfad ausserhalb davon angefasst wird.
|
||||
*
|
||||
* Ob eine konkrete Datei geloescht werden DARF, entscheidet diese Klasse
|
||||
* bewusst nicht - das steht in managed-assets.service.ts.
|
||||
*/
|
||||
|
||||
// Unterordner unterhalb von public/
|
||||
export const MANAGED_IMAGE_DIRS = ['images/events', 'images/gallery', 'images/content'];
|
||||
export const MANAGED_PDF_DIR = 'pdf';
|
||||
|
||||
export class AssetService {
|
||||
private publicDir: string;
|
||||
|
||||
constructor() {
|
||||
this.publicDir = path.join(env.GIT_WORKSPACE_DIR, 'public');
|
||||
}
|
||||
|
||||
/** Absoluter Pfad im public-Verzeichnis, oder null wenn ausserhalb. */
|
||||
private resolveInPublic(url: string): string | null {
|
||||
if (!url || typeof url !== 'string' || !url.startsWith('/')) return null;
|
||||
|
||||
const relative = url.replace(/^\/+/, '').split('?')[0].split('#')[0];
|
||||
const absolute = path.resolve(this.publicDir, relative);
|
||||
|
||||
// Traversal-Schutz: muss unterhalb von public/ bleiben
|
||||
if (absolute !== this.publicDir && !absolute.startsWith(this.publicDir + path.sep)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return absolute;
|
||||
}
|
||||
|
||||
/** Absoluter Pfad, sofern die Datei in einem der erlaubten Ordner liegt. */
|
||||
resolveInDirs(url: string, dirs: string[]): string | null {
|
||||
const absolute = this.resolveInPublic(url);
|
||||
if (!absolute) return null;
|
||||
|
||||
const relative = path.relative(this.publicDir, absolute);
|
||||
const dir = path.dirname(relative).split(path.sep).join('/');
|
||||
|
||||
return dirs.includes(dir) ? absolute : null;
|
||||
}
|
||||
|
||||
/** Existiert die Datei bereits? Fuer die Namensvergabe. */
|
||||
exists(url: string, dirs: string[]): boolean {
|
||||
const absolute = this.resolveInDirs(url, dirs);
|
||||
return absolute ? fs.existsSync(absolute) : false;
|
||||
}
|
||||
|
||||
/** Loescht eine Bilddatei. Die Besitzfrage muss vorher geklaert sein. */
|
||||
deleteImage(url: string): boolean {
|
||||
return this.unlink(this.resolveInDirs(url, MANAGED_IMAGE_DIRS));
|
||||
}
|
||||
|
||||
/** Loescht ein PDF. Die Besitzfrage muss vorher geklaert sein. */
|
||||
deletePdf(url: string): boolean {
|
||||
return this.unlink(this.resolveInDirs(url, [MANAGED_PDF_DIR]));
|
||||
}
|
||||
|
||||
private unlink(absolute: string | null): boolean {
|
||||
if (!absolute) return false;
|
||||
try {
|
||||
fs.unlinkSync(absolute);
|
||||
return true;
|
||||
} catch (err: any) {
|
||||
if (err?.code === 'ENOENT') return false;
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/** Alle Bilddateien, die in den verwalteten Ordnern liegen, als URL-Pfade. */
|
||||
listImageFiles(): string[] {
|
||||
const found: string[] = [];
|
||||
|
||||
for (const dir of MANAGED_IMAGE_DIRS) {
|
||||
const absoluteDir = path.join(this.publicDir, dir);
|
||||
if (!fs.existsSync(absoluteDir)) continue;
|
||||
|
||||
for (const name of fs.readdirSync(absoluteDir)) {
|
||||
const absolute = path.join(absoluteDir, name);
|
||||
if (!fs.statSync(absolute).isFile()) continue;
|
||||
found.push(`/${dir}/${name}`);
|
||||
}
|
||||
}
|
||||
|
||||
return found;
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,27 @@ export class FileGeneratorService {
|
||||
return str.replace(/`/g, '\\`').replace(/\${/g, '\\${');
|
||||
}
|
||||
|
||||
/**
|
||||
* Texte aus dem Adminbereich landen direkt im Astro-Markup. Ohne Maskierung
|
||||
* reicht ein "<" oder "&" in einem Feld, damit der Build der Seite scheitert
|
||||
* und der Deploy stehen bleibt.
|
||||
*/
|
||||
escapeHtml(value: any): string {
|
||||
if (value === undefined || value === null) return '';
|
||||
return String(value)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
/** Wie escapeHtml, aber mit Rueckfallwert wenn nichts gesetzt ist. */
|
||||
text(value: any, fallback = ''): string {
|
||||
const raw = value === undefined || value === null || value === '' ? fallback : value;
|
||||
return this.escapeHtml(raw);
|
||||
}
|
||||
|
||||
generateIndexAstro(events: Event[], images: GalleryImage[]): string {
|
||||
const eventsCode = events.map(e => `\t{
|
||||
\t\timage: "${e.imageUrl}",
|
||||
@@ -86,9 +107,9 @@ const { id } = Astro.props;
|
||||
|
||||
\t\t<div class="hero-content">
|
||||
|
||||
\t\t\t<h1>${content.heading || 'Dein Irish Pub'}</h1>
|
||||
\t\t\t<h1>${this.text(content.heading, 'Dein Irish Pub')}</h1>
|
||||
|
||||
\t\t\t<p>${content.subheading || 'Im Herzen von St.Gallen'}</p>
|
||||
\t\t\t<p>${this.text(content.subheading, 'Im Herzen von St.Gallen')}</p>
|
||||
|
||||
\t\t\t<a href="#" class="button">Aktuelles ↓</a>
|
||||
\t\t</div>
|
||||
@@ -105,7 +126,7 @@ const { id } = Astro.props;
|
||||
|
||||
generateWelcomeComponent(content: ContentSection): string {
|
||||
const highlightsList = (content.highlights || []).map((h: any) =>
|
||||
`\t\t\t<li>\n\t\t\t\t<b>${h.title}:</b> ${h.description}\n\t\t\t</li>`
|
||||
`\t\t\t<li>\n\t\t\t\t<b>${this.escapeHtml(h?.title)}:</b> ${this.escapeHtml(h?.description)}\n\t\t\t</li>`
|
||||
).join('\n\n');
|
||||
|
||||
return `---
|
||||
@@ -119,11 +140,11 @@ const { id } = Astro.props;
|
||||
|
||||
\t<div class="welcome-text">
|
||||
|
||||
\t\t<h2>${content.heading1 || 'Herzlich willkommen im'}</h2>
|
||||
\t\t<h2>${content.heading2 || 'Gallus Pub!'}</h2>
|
||||
\t\t<h2>${this.text(content.heading1, 'Herzlich willkommen im')}</h2>
|
||||
\t\t<h2>${this.text(content.heading2, 'Gallus Pub!')}</h2>
|
||||
|
||||
\t\t<p>
|
||||
\t\t\t${content.introText || ''}
|
||||
\t\t\t${this.text(content.introText)}
|
||||
\t\t</p>
|
||||
|
||||
\t\t<p><b>Unsere Highlights:</b></p>
|
||||
@@ -133,14 +154,14 @@ ${highlightsList}
|
||||
\t\t</ul>
|
||||
|
||||
\t\t<p>
|
||||
\t\t\t${content.closingText || ''}
|
||||
\t\t\t${this.text(content.closingText)}
|
||||
\t\t</p>
|
||||
|
||||
\t</div>
|
||||
|
||||
|
||||
\t<div class="welcome-image">
|
||||
\t\t<img src="${content.imageUrl || '/images/Welcome.png'}" alt="Welcome background image" />
|
||||
\t\t<img src="${this.text(content.imageUrl, '/images/Welcome.png')}" alt="Welcome background image" />
|
||||
\t</div>
|
||||
|
||||
</section>
|
||||
@@ -157,36 +178,36 @@ const { id } = Astro.props;
|
||||
<h2 class="title">Drinks</h2>
|
||||
|
||||
<p class="note">
|
||||
${content.introText || 'Ob ein frisch gezapftes Pint, ein edler Tropfen Whiskey oder ein gemütliches Glas Wein – hier kannst du in entspannter Atmosphäre das Leben genießen.'}
|
||||
${this.text(content.introText, 'Ob ein frisch gezapftes Pint, ein edler Tropfen Whiskey oder ein gemütliches Glas Wein – hier kannst du in entspannter Atmosphäre das Leben genießen.')}
|
||||
</p>
|
||||
|
||||
<a href="/pdf/Getraenke_Gallus_2025.pdf" class="card-link" target="_blank" rel="noopener noreferrer">Getränkekarte</a>
|
||||
<a href="${this.text(content.pdfUrl, '/pdf/Getraenke_Gallus_2025.pdf')}" class="card-link" target="_blank" rel="noopener noreferrer">Getränkekarte</a>
|
||||
|
||||
<h3 class="monats-hit">Monats Hit</h3>
|
||||
|
||||
<div class="mate-vodka">
|
||||
<div class="circle" title="${content.monthlySpecialName || 'Mate Vodka'}">
|
||||
<img src="${content.monthlySpecialImage || '/images/MonthlyHit.png'}" alt="Monats Hit" class="circle-image" />
|
||||
<div class="circle" title="${this.text(content.monthlySpecialName, 'Mate Vodka')}">
|
||||
<img src="${this.text(content.monthlySpecialImage, '/images/MonthlyHit.png')}" alt="Monats Hit" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div>${content.monthlySpecialName || 'Mate Vodka'}</div>
|
||||
<div>${this.text(content.monthlySpecialName, 'Mate Vodka')}</div>
|
||||
</div>
|
||||
|
||||
<p class="note">
|
||||
${content.whiskeyText || 'Für Whisky-Liebhaber haben wir erlesene Sorten aus Schottland und Irland im Angebot.'}
|
||||
${this.text(content.whiskeyText, 'Für Whisky-Liebhaber haben wir erlesene Sorten aus Schottland und Irland im Angebot.')}
|
||||
</p>
|
||||
|
||||
<div class="circle-row">
|
||||
<div class="circle whiskey-circle" title="Whiskey 1">
|
||||
<img src="${content.whiskeyImage1 || '/images/Whiskey1.png'}" alt="Whiskey 1" class="circle-image" />
|
||||
<img src="${this.text(content.whiskeyImage1, '/images/Whiskey1.png')}" alt="Whiskey 1" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 2">
|
||||
<img src="${content.whiskeyImage2 || '/images/Whiskey2.png'}" alt="Whiskey 2" class="circle-image" />
|
||||
<img src="${this.text(content.whiskeyImage2, '/images/Whiskey2.png')}" alt="Whiskey 2" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 3">
|
||||
<img src="${content.whiskeyImage3 || '/images/Whiskey3.png'}" alt="Whiskey 3" class="circle-image" />
|
||||
<img src="${this.text(content.whiskeyImage3, '/images/Whiskey3.png')}" alt="Whiskey 3" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,6 +4,13 @@ import { existsSync } from 'fs';
|
||||
import path from 'path';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
// Verzeichnisse, in die das CMS hochlaedt. Die muessen einen Neu-Clone des
|
||||
// Workspace ueberleben, sonst sind Bilder und Getraenkekarte weg.
|
||||
const UPLOAD_DIRS = [
|
||||
path.join('public', 'images'),
|
||||
path.join('public', 'pdf'),
|
||||
];
|
||||
|
||||
export class GitService {
|
||||
private git: SimpleGit;
|
||||
private workspaceDir: string;
|
||||
@@ -51,15 +58,17 @@ export class GitService {
|
||||
if (!usable) {
|
||||
console.log('Cloning repository...');
|
||||
|
||||
// Hochgeladene Bilder liegen im Workspace und wuerden beim Loeschen
|
||||
// Hochgeladene Dateien liegen im Workspace und wuerden beim Loeschen
|
||||
// verschwinden - vorher wegsichern, nach dem Clone zurueckspielen
|
||||
const imagesDir = path.join(this.workspaceDir, 'public', 'images');
|
||||
const backupDir = path.join(this.parentDir, '.workspace-images-backup');
|
||||
const hasImages = existsSync(imagesDir);
|
||||
const backupRoot = path.join(this.parentDir, '.workspace-upload-backup');
|
||||
await rm(backupRoot, { recursive: true, force: true });
|
||||
|
||||
await rm(backupDir, { recursive: true, force: true });
|
||||
if (hasImages) {
|
||||
await cp(imagesDir, backupDir, { recursive: true });
|
||||
const saved: string[] = [];
|
||||
for (const relative of UPLOAD_DIRS) {
|
||||
const source = path.join(this.workspaceDir, relative);
|
||||
if (!existsSync(source)) continue;
|
||||
await cp(source, path.join(backupRoot, relative), { recursive: true });
|
||||
saved.push(relative);
|
||||
}
|
||||
|
||||
await rm(this.workspaceDir, { recursive: true, force: true });
|
||||
@@ -70,15 +79,16 @@ export class GitService {
|
||||
await this.git.clone(authenticatedUrl, this.workspaceDir);
|
||||
this.git = simpleGit(this.workspaceDir);
|
||||
|
||||
if (hasImages) {
|
||||
for (const relative of saved) {
|
||||
// force: false -> was schon im Repo liegt, bleibt unangetastet
|
||||
await cp(backupDir, imagesDir, {
|
||||
await cp(path.join(backupRoot, relative), path.join(this.workspaceDir, relative), {
|
||||
recursive: true,
|
||||
force: false,
|
||||
errorOnExist: false,
|
||||
});
|
||||
await rm(backupDir, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
await rm(backupRoot, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
// Configure git user
|
||||
@@ -117,6 +127,7 @@ export class GitService {
|
||||
const git = simpleGit(this.workspaceDir);
|
||||
await git.reset(['--hard', 'HEAD']);
|
||||
// Uploads ausnehmen - die sind noch nicht committed und waeren sonst weg
|
||||
await git.clean('f', ['-d', '-e', 'public/images']);
|
||||
const excludes = UPLOAD_DIRS.flatMap((dir) => ['-e', dir.split(path.sep).join('/')]);
|
||||
await git.clean('f', ['-d', ...excludes]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
import { db } from '../config/database.js';
|
||||
import { events, galleryImages, contentSections } from '../db/schema.js';
|
||||
import { AssetService } from './asset.service.js';
|
||||
import { isManagedAsset, forgetManagedAsset } from './managed-assets.service.js';
|
||||
|
||||
const assets = new AssetService();
|
||||
|
||||
/**
|
||||
* Loescht eine Bilddatei, sofern das CMS sie selbst angelegt hat und kein
|
||||
* Datensatz sie mehr benutzt. Muss NACH dem Loeschen bzw. Aktualisieren der
|
||||
* Zeile aufgerufen werden.
|
||||
*/
|
||||
export async function dropImageIfUnused(url: string | null | undefined): Promise<boolean> {
|
||||
if (!url) return false;
|
||||
if (!(await isManagedAsset(url))) return false;
|
||||
|
||||
const referenced = await collectReferencedImageUrls();
|
||||
if (referenced.has(url)) return false;
|
||||
|
||||
const deleted = assets.deleteImage(url);
|
||||
await forgetManagedAsset(url);
|
||||
return deleted;
|
||||
}
|
||||
|
||||
/**
|
||||
* Entfernt alle vom CMS angelegten Bilder, die nirgends mehr referenziert
|
||||
* werden. Die Referenzliste deckt bewusst ALLE Zeilen ab, auch
|
||||
* unveroeffentlichte - sonst verlieren die ihr Bild.
|
||||
*/
|
||||
export async function sweepOrphanedImages(): Promise<string[]> {
|
||||
const referenced = await collectReferencedImageUrls();
|
||||
const removed: string[] = [];
|
||||
|
||||
for (const url of assets.listImageFiles()) {
|
||||
if (referenced.has(url)) continue;
|
||||
if (!(await isManagedAsset(url))) continue;
|
||||
|
||||
if (assets.deleteImage(url)) removed.push(url);
|
||||
await forgetManagedAsset(url);
|
||||
}
|
||||
|
||||
return removed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sammelt jede Bild-URL, die irgendwo in der Datenbank vorkommt.
|
||||
*
|
||||
* Bewusst ueber ALLE Zeilen, nicht nur die veroeffentlichten - sonst wuerde
|
||||
* ein unveroeffentlichtes Event sein Bild verlieren, sobald jemand publisht.
|
||||
*
|
||||
* Die Content-Sections enthalten beliebiges JSON (Welcome-Bild, Monatshit,
|
||||
* Whiskey-Bilder), deshalb wird es rekursiv nach Bildpfaden durchsucht.
|
||||
*/
|
||||
export async function collectReferencedImageUrls(): Promise<Set<string>> {
|
||||
const urls = new Set<string>();
|
||||
|
||||
for (const row of (await db.select().from(events)) as any[]) {
|
||||
if (row.imageUrl) urls.add(row.imageUrl);
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(galleryImages)) as any[]) {
|
||||
if (row.imageUrl) urls.add(row.imageUrl);
|
||||
}
|
||||
|
||||
for (const row of (await db.select().from(contentSections)) as any[]) {
|
||||
collectFromJson(row.contentJson, urls);
|
||||
}
|
||||
|
||||
return urls;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ersetzt Bildpfade in einem beliebigen Content-JSON anhand einer Zuordnung
|
||||
* alt -> neu. Die Struktur bleibt dabei unveraendert.
|
||||
*/
|
||||
export function replaceImageUrls(value: any, mapping: Map<string, string>): any {
|
||||
if (typeof value === 'string') {
|
||||
return mapping.get(value) ?? value;
|
||||
}
|
||||
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((entry) => replaceImageUrls(entry, mapping));
|
||||
}
|
||||
|
||||
if (value && typeof value === 'object') {
|
||||
const out: Record<string, any> = {};
|
||||
for (const [key, entry] of Object.entries(value)) {
|
||||
out[key] = replaceImageUrls(entry, mapping);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
/** Alle Bildpfade aus einem beliebigen Content-JSON. */
|
||||
export function extractImageUrls(value: any): Set<string> {
|
||||
const out = new Set<string>();
|
||||
collectFromJson(value, out);
|
||||
return out;
|
||||
}
|
||||
|
||||
function collectFromJson(value: any, out: Set<string>): void {
|
||||
if (typeof value === 'string') {
|
||||
if (value.startsWith('/images/')) {
|
||||
out.add(value);
|
||||
return;
|
||||
}
|
||||
// Je nach Treiber kommt das JSON als String zurueck
|
||||
if (value.startsWith('{') || value.startsWith('[')) {
|
||||
try {
|
||||
collectFromJson(JSON.parse(value), out);
|
||||
} catch {
|
||||
// kein JSON - ignorieren
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (Array.isArray(value)) {
|
||||
for (const entry of value) collectFromJson(entry, out);
|
||||
return;
|
||||
}
|
||||
|
||||
if (value && typeof value === 'object') {
|
||||
for (const entry of Object.values(value)) collectFromJson(entry, out);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { db } from '../config/database.js';
|
||||
import { managedAssets } from '../db/schema.js';
|
||||
|
||||
/**
|
||||
* Fuehrt Buch darueber, welche Dateien das CMS selbst angelegt hat.
|
||||
* Nur diese darf es spaeter wieder loeschen.
|
||||
*/
|
||||
|
||||
// Altbestand: vor der Umstellung auf sprechende Namen hiessen Uploads
|
||||
// <base36-zeitstempel>-<6 zeichen>.<ext>. Diese Dateien stehen nicht in der
|
||||
// Tabelle, sollen aber weiterhin aufgeraeumt werden koennen. Handgepflegte
|
||||
// Assets wie event_karaoke.jpg oder Gallery1.webp passen nicht auf das Muster.
|
||||
const LEGACY_NAME = /^[a-z0-9]{6,14}-[a-z0-9]{6}\.[a-z0-9]{2,5}$/i;
|
||||
|
||||
function basename(urlPath: string): string {
|
||||
return urlPath.split('/').pop() || '';
|
||||
}
|
||||
|
||||
/** Merkt sich eine neu angelegte Datei. */
|
||||
export async function registerManagedAsset(urlPath: string): Promise<void> {
|
||||
await db.insert(managedAssets).values({ path: urlPath }).onConflictDoNothing();
|
||||
}
|
||||
|
||||
/** Vergisst eine Datei wieder (nach dem Loeschen). */
|
||||
export async function forgetManagedAsset(urlPath: string): Promise<void> {
|
||||
await db.delete(managedAssets).where(eq(managedAssets.path, urlPath));
|
||||
}
|
||||
|
||||
/** Darf das CMS diese Datei loeschen? */
|
||||
export async function isManagedAsset(urlPath: string): Promise<boolean> {
|
||||
if (!urlPath) return false;
|
||||
|
||||
const [row] = await db
|
||||
.select()
|
||||
.from(managedAssets)
|
||||
.where(eq(managedAssets.path, urlPath))
|
||||
.limit(1);
|
||||
|
||||
if (row) return true;
|
||||
|
||||
return LEGACY_NAME.test(basename(urlPath));
|
||||
}
|
||||
|
||||
/** Alle vom CMS angelegten Pfade aus der Tabelle. */
|
||||
export async function listManagedAssets(): Promise<string[]> {
|
||||
const rows = (await db.select().from(managedAssets)) as any[];
|
||||
return rows.map((row) => row.path as string);
|
||||
}
|
||||
|
||||
/** Trifft der Altbestands-Namensstil zu? */
|
||||
export function hasLegacyName(urlPath: string): boolean {
|
||||
return LEGACY_NAME.test(basename(urlPath));
|
||||
}
|
||||
@@ -0,0 +1,161 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { env } from '../config/env.js';
|
||||
import { AssetService, MANAGED_IMAGE_DIRS, MANAGED_PDF_DIR } from './asset.service.js';
|
||||
import { registerManagedAsset } from './managed-assets.service.js';
|
||||
|
||||
export type UploadSubdir = 'events' | 'gallery' | 'content';
|
||||
|
||||
export interface SavedImage {
|
||||
filename: string;
|
||||
imageUrl: string;
|
||||
}
|
||||
|
||||
const assets = new AssetService();
|
||||
|
||||
/**
|
||||
* Macht aus "Karaoke-Abend im Gallus Pub!" -> "karaoke-abend-im-gallus-pub".
|
||||
* Umlaute werden ausgeschrieben, nicht entfernt, damit aus "Getränke" nicht
|
||||
* "getrnke" wird.
|
||||
*/
|
||||
export function slugify(value: string): string {
|
||||
const slug = String(value || '')
|
||||
.replace(/ä/g, 'ae').replace(/ö/g, 'oe').replace(/ü/g, 'ue')
|
||||
.replace(/Ä/g, 'Ae').replace(/Ö/g, 'Oe').replace(/Ü/g, 'Ue')
|
||||
.replace(/ß/g, 'ss')
|
||||
.normalize('NFD').replace(/[̀-ͯ]/g, '')
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9]+/g, '-')
|
||||
.replace(/^-+|-+$/g, '')
|
||||
.slice(0, 60)
|
||||
.replace(/-+$/, '');
|
||||
|
||||
return slug;
|
||||
}
|
||||
|
||||
/** Dateiname ohne Endung, wie er vor dem Upload hiess. */
|
||||
function originalBaseName(file: any): string {
|
||||
const name = (file?.filename as string | undefined) || '';
|
||||
return name.replace(/\.[^.]+$/, '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Sucht einen freien Namen. Gibt es <basis>.avif schon, wird -2, -3, ...
|
||||
* angehaengt, damit zwei Events namens "Karaoke" sich nicht ueberschreiben.
|
||||
*/
|
||||
function findFreeName(base: string, ext: string, urlDir: string, dirs: string[]): string {
|
||||
const safeBase = base || `datei-${Date.now().toString(36)}`;
|
||||
|
||||
for (let attempt = 1; attempt <= 500; attempt++) {
|
||||
const candidate = attempt === 1 ? `${safeBase}${ext}` : `${safeBase}-${attempt}${ext}`;
|
||||
if (!assets.exists(`${urlDir}/${candidate}`, dirs)) return candidate;
|
||||
}
|
||||
|
||||
// Sollte nie eintreten - lieber ein haesslicher Name als eine Endlosschleife
|
||||
return `${safeBase}-${Date.now().toString(36)}${ext}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Nimmt einen Multipart-Upload entgegen, rechnet ihn auf 1600px herunter,
|
||||
* wandelt nach AVIF und legt ihn unter public/images/<subdir> ab.
|
||||
*
|
||||
* Der Name kommt aus preferredName (Event-Titel bzw. Alt-Text) und faellt
|
||||
* sonst auf den urspruenglichen Dateinamen zurueck.
|
||||
*/
|
||||
export async function saveUploadedImage(
|
||||
file: any,
|
||||
subdir: UploadSubdir,
|
||||
options: { preferredName?: string; log?: { warn: (obj: any, msg: string) => void } } = {}
|
||||
): Promise<SavedImage> {
|
||||
const { preferredName, log } = options;
|
||||
|
||||
const chunks: Buffer[] = [];
|
||||
for await (const chunk of file.file) {
|
||||
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
||||
}
|
||||
const inputBuffer = Buffer.concat(chunks);
|
||||
|
||||
// Ohne diese Pruefung landet bei zu grossen Dateien ein abgeschnittenes,
|
||||
// kaputtes Bild auf der Platte
|
||||
if (file.file?.truncated) {
|
||||
const limit = Math.round(env.MAX_FILE_SIZE / 1024 / 1024);
|
||||
const error: any = new Error(`Image too large. Maximum is ${limit} MB`);
|
||||
error.statusCode = 413;
|
||||
throw error;
|
||||
}
|
||||
|
||||
return saveImageBuffer(inputBuffer, subdir, {
|
||||
preferredName: preferredName || originalBaseName(file),
|
||||
fallbackExtension: '.' + ((file.mimetype || '').split('/')[1] || 'bin')
|
||||
.replace(/[^a-z0-9]/gi, '').toLowerCase(),
|
||||
log,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Kern der Bildverarbeitung: verkleinern, nach AVIF wandeln, unter einem
|
||||
* sprechenden Namen ablegen und als CMS-eigene Datei vermerken.
|
||||
*
|
||||
* Wird sowohl vom Upload als auch vom Umwandlungsskript fuer den Altbestand
|
||||
* benutzt, damit beide Wege identisch arbeiten.
|
||||
*/
|
||||
export async function saveImageBuffer(
|
||||
inputBuffer: Buffer,
|
||||
subdir: UploadSubdir,
|
||||
options: {
|
||||
preferredName?: string;
|
||||
fallbackExtension?: string;
|
||||
log?: { warn: (obj: any, msg: string) => void };
|
||||
} = {}
|
||||
): Promise<SavedImage> {
|
||||
const { preferredName, fallbackExtension = '.bin', log } = options;
|
||||
|
||||
const uploadDir = path.join(env.GIT_WORKSPACE_DIR, 'public', 'images', subdir);
|
||||
fs.mkdirSync(uploadDir, { recursive: true });
|
||||
|
||||
let outBuffer: Buffer;
|
||||
let outExt = '.avif';
|
||||
|
||||
try {
|
||||
// Sharp erst laden wenn wirklich gebraucht
|
||||
const sharp = (await import('sharp')).default;
|
||||
outBuffer = await sharp(inputBuffer)
|
||||
.rotate()
|
||||
.resize({ width: 1600, withoutEnlargement: true })
|
||||
.avif({ quality: 55 })
|
||||
.toBuffer();
|
||||
} catch (err) {
|
||||
log?.warn({ err }, 'Sharp processing failed, using original image');
|
||||
outBuffer = inputBuffer;
|
||||
outExt = fallbackExtension;
|
||||
}
|
||||
|
||||
const urlDir = `/images/${subdir}`;
|
||||
const filename = findFreeName(slugify(preferredName || ''), outExt, urlDir, MANAGED_IMAGE_DIRS);
|
||||
|
||||
fs.writeFileSync(path.join(uploadDir, filename), outBuffer);
|
||||
|
||||
const imageUrl = `${urlDir}/${filename}`;
|
||||
await registerManagedAsset(imageUrl);
|
||||
|
||||
return { filename, imageUrl };
|
||||
}
|
||||
|
||||
/**
|
||||
* Legt ein hochgeladenes PDF unter public/pdf ab, benannt nach dem
|
||||
* urspruenglichen Dateinamen.
|
||||
*/
|
||||
export async function saveUploadedPdf(file: any, buffer: Buffer, preferredName?: string): Promise<string> {
|
||||
const uploadDir = path.join(env.GIT_WORKSPACE_DIR, 'public', 'pdf');
|
||||
fs.mkdirSync(uploadDir, { recursive: true });
|
||||
|
||||
const base = slugify(preferredName || '') || slugify(originalBaseName(file)) || 'dokument';
|
||||
const filename = findFreeName(base, '.pdf', '/pdf', [MANAGED_PDF_DIR]);
|
||||
|
||||
fs.writeFileSync(path.join(uploadDir, filename), buffer);
|
||||
|
||||
const pdfUrl = `/pdf/${filename}`;
|
||||
await registerManagedAsset(pdfUrl);
|
||||
|
||||
return pdfUrl;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
+317
-15
@@ -7,7 +7,14 @@ const title = 'Admin';
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>{title}</title>
|
||||
<style>
|
||||
{/*
|
||||
is:global ist hier zwingend. Astro wuerde die Regeln sonst auf
|
||||
[data-astro-cid-...] einschraenken, und dieses Attribut setzt es nur auf
|
||||
Elemente, die zur Bauzeit im Template stehen. Die Karten und Bilder der
|
||||
Listen entstehen aber erst zur Laufzeit per innerHTML - fuer die haette
|
||||
kein einziger Selektor gegriffen.
|
||||
*/}
|
||||
<style is:global>
|
||||
body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, 'Helvetica Neue', Arial, 'Noto Sans', 'Liberation Sans', sans-serif; margin: 1rem; }
|
||||
h1, h2 { margin: 0.5rem 0; }
|
||||
section { border: 1px solid #ddd; padding: 1rem; border-radius: 8px; margin-bottom: 1rem; }
|
||||
@@ -22,7 +29,21 @@ const title = 'Admin';
|
||||
.card { border: 1px solid #eee; padding: 0.75rem; border-radius: 6px; }
|
||||
label { display:block; margin-top: 0.5rem; }
|
||||
input, textarea { width: 100%; max-width: 600px; padding: 0.5rem; margin-top: 0.25rem; }
|
||||
img.thumb { max-width: 100%; height: auto; display: block; }
|
||||
/* Feste Box: Uploads sind bis 1600px breit und wuerden die Liste sonst
|
||||
je nach Seitenverhaeltnis beliebig hoch ziehen. */
|
||||
img.thumb { width: 100%; height: 160px; object-fit: cover; display: block;
|
||||
border-radius: 4px; background: #f2f2f2; margin-top: 0.5rem; }
|
||||
img.thumb-sm { width: 110px; height: 110px; object-fit: cover; display: block;
|
||||
border-radius: 4px; background: #f2f2f2; border: 1px solid #e5e5e5;
|
||||
margin-top: 0.25rem; }
|
||||
.field-row { display: flex; gap: 1rem; align-items: flex-start; flex-wrap: wrap; }
|
||||
.field-row > label { flex: 1 1 260px; }
|
||||
.highlight-row { display: grid; grid-template-columns: 1fr 2fr auto; gap: .5rem;
|
||||
align-items: end; margin-top: .5rem; }
|
||||
@media (max-width: 700px){ .highlight-row { grid-template-columns: 1fr; } }
|
||||
.stack > .card { margin-bottom: 1rem; }
|
||||
.ok { color: #17692b; }
|
||||
.err { color: #a11; }
|
||||
.toolbar { display:flex; gap:.5rem; align-items:center; margin:.5rem 0; }
|
||||
.pill { font-size:.85rem; padding:.25rem .5rem; border:1px solid #ddd; border-radius:999px; background:#f7f7f7; }
|
||||
.dragging { opacity:.5; }
|
||||
@@ -102,6 +123,72 @@ const title = 'Admin';
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section id="sec-content" style="display:none">
|
||||
<h2>Texte bearbeiten</h2>
|
||||
<div class="muted">Änderungen werden erst mit „Publish“ auf die Website übernommen.</div>
|
||||
|
||||
<div class="stack">
|
||||
<div class="card">
|
||||
<h3>Startseite oben (Hero)</h3>
|
||||
<div class="field-row">
|
||||
<label>Überschrift<input id="hero-heading" placeholder="Dein Irish Pub" /></label>
|
||||
<label>Unterzeile<input id="hero-subheading" placeholder="Im Herzen von St.Gallen" /></label>
|
||||
</div>
|
||||
<button id="btn-save-hero">Hero speichern</button>
|
||||
<span id="hero-msg" class="muted"></span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>Willkommen</h3>
|
||||
<div class="field-row">
|
||||
<label>Überschrift Zeile 1<input id="wel-heading1" placeholder="Herzlich willkommen im" /></label>
|
||||
<label>Überschrift Zeile 2<input id="wel-heading2" placeholder="Gallus Pub!" /></label>
|
||||
</div>
|
||||
<label>Einleitungstext<textarea id="wel-intro" rows="4"></textarea></label>
|
||||
|
||||
<label style="margin-top:1rem"><strong>Highlights</strong></label>
|
||||
<div id="wel-highlights"></div>
|
||||
<button id="btn-add-highlight" type="button">Highlight hinzufügen</button>
|
||||
|
||||
<label>Schlusstext<textarea id="wel-closing" rows="3"></textarea></label>
|
||||
|
||||
<label>Bild ersetzen<input id="wel-file" type="file" accept="image/*" /></label>
|
||||
<img id="wel-preview" class="thumb-sm" alt="Aktuelles Willkommen-Bild" style="display:none" />
|
||||
|
||||
<button id="btn-save-welcome">Willkommen speichern</button>
|
||||
<span id="wel-msg" class="muted"></span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>Drinks</h3>
|
||||
<label>Einleitungstext<textarea id="dr-intro" rows="3"></textarea></label>
|
||||
|
||||
<div class="field-row">
|
||||
<label>Monats-Hit Name<input id="dr-special-name" placeholder="Mate Vodka" /></label>
|
||||
<label>Monats-Hit Bild ersetzen<input id="dr-special-file" type="file" accept="image/*" /></label>
|
||||
</div>
|
||||
<img id="dr-special-preview" class="thumb-sm" alt="Aktuelles Monats-Hit-Bild" style="display:none" />
|
||||
|
||||
<label>Whiskey-Text<textarea id="dr-whiskey" rows="3"></textarea></label>
|
||||
|
||||
<div class="field-row">
|
||||
<label>Whiskey-Bild 1<input id="dr-whiskey-file1" type="file" accept="image/*" />
|
||||
<img id="dr-whiskey-preview1" class="thumb-sm" alt="Whiskey 1" style="display:none" /></label>
|
||||
<label>Whiskey-Bild 2<input id="dr-whiskey-file2" type="file" accept="image/*" />
|
||||
<img id="dr-whiskey-preview2" class="thumb-sm" alt="Whiskey 2" style="display:none" /></label>
|
||||
<label>Whiskey-Bild 3<input id="dr-whiskey-file3" type="file" accept="image/*" />
|
||||
<img id="dr-whiskey-preview3" class="thumb-sm" alt="Whiskey 3" style="display:none" /></label>
|
||||
</div>
|
||||
|
||||
<label style="margin-top:1rem">Getränkekarte (PDF) ersetzen<input id="dr-pdf-file" type="file" accept="application/pdf" /></label>
|
||||
<div id="dr-pdf-current" class="muted"></div>
|
||||
|
||||
<button id="btn-save-drinks">Drinks speichern</button>
|
||||
<span id="dr-msg" class="muted"></span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section id="sec-publish" style="display:none">
|
||||
<h2>Veröffentlichen</h2>
|
||||
<label>Commit-Message<input id="pub-msg" placeholder="Änderungen beschreiben" value="Update events" /></label>
|
||||
@@ -120,6 +207,12 @@ const title = 'Admin';
|
||||
return ct.includes('application/json') ? res.json() : res.text();
|
||||
};
|
||||
|
||||
// Inhalte landen per innerHTML in der Seite - ohne Maskierung zerlegt
|
||||
// ein Anführungszeichen im Titel die Darstellung
|
||||
const esc = (v) => String(v ?? '')
|
||||
.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
||||
.replace(/"/g, '"').replace(/'/g, ''');
|
||||
|
||||
async function refreshAuth() {
|
||||
try {
|
||||
const me = await api('/api/auth/me');
|
||||
@@ -128,11 +221,13 @@ const title = 'Admin';
|
||||
document.getElementById('sec-events').style.display = '';
|
||||
document.getElementById('sec-gallery').style.display = '';
|
||||
document.getElementById('sec-banner').style.display = '';
|
||||
document.getElementById('sec-content').style.display = '';
|
||||
document.getElementById('sec-publish').style.display = '';
|
||||
// Direkt Events laden und auf Sektion fokussieren
|
||||
await loadEvents();
|
||||
await loadGallery();
|
||||
await loadBanners();
|
||||
await loadContent();
|
||||
document.getElementById('sec-events').scrollIntoView({ behavior: 'smooth' });
|
||||
} catch (e) {
|
||||
const el = document.getElementById('auth-status');
|
||||
@@ -141,6 +236,7 @@ const title = 'Admin';
|
||||
document.getElementById('sec-events').style.display = 'none';
|
||||
document.getElementById('sec-gallery').style.display = 'none';
|
||||
document.getElementById('sec-banner').style.display = 'none';
|
||||
document.getElementById('sec-content').style.display = 'none';
|
||||
document.getElementById('sec-publish').style.display = 'none';
|
||||
}
|
||||
}
|
||||
@@ -165,8 +261,11 @@ const title = 'Admin';
|
||||
});
|
||||
|
||||
// ========== Events & Publish ==========
|
||||
async function uploadEventImage(file) {
|
||||
// Wichtig: Textfelder IMMER vor der Datei anhaengen. Der Server liest
|
||||
// sie beim Empfang der Datei aus; was danach kommt, ist zu spaet.
|
||||
async function uploadEventImage(file, title) {
|
||||
const fd = new FormData();
|
||||
fd.append('title', title || '');
|
||||
fd.append('file', file);
|
||||
const res = await fetch(API_BASE + '/api/events/upload', { method: 'POST', body: fd, credentials: 'include' });
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
@@ -175,9 +274,9 @@ const title = 'Admin';
|
||||
|
||||
async function uploadGalleryImage(file, altText) {
|
||||
const fd = new FormData();
|
||||
fd.append('file', file);
|
||||
if (altText) fd.append('altText', altText);
|
||||
fd.append('displayOrder', '0');
|
||||
fd.append('file', file);
|
||||
const res = await fetch(API_BASE + '/api/gallery/upload', { method: 'POST', body: fd, credentials: 'include' });
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
return res.json();
|
||||
@@ -218,12 +317,12 @@ const title = 'Admin';
|
||||
card.dataset.displayOrder = String(ev.displayOrder ?? idx);
|
||||
card.innerHTML = `
|
||||
<div class="row" style="justify-content:space-between;align-items:center">
|
||||
<div><strong>${ev.title}</strong></div>
|
||||
<div><strong>${esc(ev.title)}</strong></div>
|
||||
${reorderMode ? '<span class="drag-handle">⇅ Ziehen</span>' : ''}
|
||||
</div>
|
||||
<div class="muted">${ev.date}</div>
|
||||
<div>${ev.description || ''}</div>
|
||||
${ev.imageUrl ? `<img src="${API_BASE}${ev.imageUrl}" alt="${ev.title}" class="thumb" style="margin-top:0.5rem;" />` : '<div class="muted">Kein Bild</div>'}
|
||||
<div class="muted">${esc(ev.date)}</div>
|
||||
<div>${esc(ev.description || '')}</div>
|
||||
${ev.imageUrl ? `<img src="${API_BASE}${esc(ev.imageUrl)}" alt="${esc(ev.title)}" class="thumb" />` : '<div class="muted">Kein Bild</div>'}
|
||||
<div class="row-buttons">
|
||||
<button data-id="${ev.id}" class="btn-del-ev">Löschen</button>
|
||||
</div>`;
|
||||
@@ -283,7 +382,8 @@ const title = 'Admin';
|
||||
try {
|
||||
let imageUrl = '';
|
||||
if (file) {
|
||||
const up = await uploadEventImage(file);
|
||||
// Titel mitgeben, damit die Datei danach benannt wird
|
||||
const up = await uploadEventImage(file, title);
|
||||
imageUrl = up?.imageUrl || '';
|
||||
}
|
||||
msg.textContent = 'Lege Event an...';
|
||||
@@ -306,7 +406,10 @@ const title = 'Admin';
|
||||
s.textContent = 'Veröffentliche...';
|
||||
try {
|
||||
const res = await api('/api/publish', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ commitMessage: m }) });
|
||||
s.textContent = res?.message || 'Veröffentlicht';
|
||||
const cleaned = res?.removedImages
|
||||
? ` (${res.removedImages} ungenutzte${res.removedImages === 1 ? 's Bild' : ' Bilder'} entfernt)`
|
||||
: '';
|
||||
s.textContent = (res?.message || 'Veröffentlicht') + cleaned;
|
||||
} catch(e){ s.textContent = 'Fehler: '+e.message }
|
||||
});
|
||||
|
||||
@@ -348,8 +451,8 @@ const title = 'Admin';
|
||||
const card = document.createElement('div');
|
||||
card.className = 'card';
|
||||
card.innerHTML = `
|
||||
<img src="${API_BASE}${img.imageUrl}" alt="${img.altText}" class="thumb" />
|
||||
<div class="muted">${img.altText || ''}</div>
|
||||
<img src="${API_BASE}${esc(img.imageUrl)}" alt="${esc(img.altText)}" class="thumb" />
|
||||
<div class="muted">${esc(img.altText || '')}</div>
|
||||
<div class="row-buttons">
|
||||
<button data-id="${img.id}" class="btn-del-gal">Löschen</button>
|
||||
</div>`;
|
||||
@@ -402,9 +505,9 @@ const title = 'Admin';
|
||||
card.className = 'card';
|
||||
const statusText = banner.isActive ? '✓ Aktiv' : '✗ Inaktiv';
|
||||
card.innerHTML = `
|
||||
<div><strong>${banner.text.substring(0, 60)}${banner.text.length > 60 ? '...' : ''}</strong></div>
|
||||
<div class="muted">Von: ${banner.startDate}</div>
|
||||
<div class="muted">Bis: ${banner.endDate}</div>
|
||||
<div><strong>${esc(banner.text.substring(0, 60))}${banner.text.length > 60 ? '...' : ''}</strong></div>
|
||||
<div class="muted">Von: ${esc(banner.startDate)}</div>
|
||||
<div class="muted">Bis: ${esc(banner.endDate)}</div>
|
||||
<div class="pill">${statusText}</div>
|
||||
<div class="row-buttons">
|
||||
<button data-id="${banner.id}" class="btn-toggle-banner">${banner.isActive ? 'Deaktivieren' : 'Aktivieren'}</button>
|
||||
@@ -475,6 +578,205 @@ const title = 'Admin';
|
||||
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
||||
});
|
||||
|
||||
// ========== Texte (Content-Sections) ==========
|
||||
// Der geladene Stand wird gemerkt, damit beim Speichern keine Felder
|
||||
// verloren gehen, die die Oberfläche gar nicht anzeigt (z.B. pdfUrl).
|
||||
let contentState = { hero: {}, welcome: {}, drinks: {} };
|
||||
|
||||
const byId = (id) => document.getElementById(id);
|
||||
|
||||
function setPreview(imgId, url) {
|
||||
const img = byId(imgId);
|
||||
if (url) {
|
||||
img.src = API_BASE + url;
|
||||
img.style.display = '';
|
||||
} else {
|
||||
img.removeAttribute('src');
|
||||
img.style.display = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
function renderHighlights(highlights) {
|
||||
const box = byId('wel-highlights');
|
||||
box.innerHTML = '';
|
||||
(highlights || []).forEach((h, idx) => {
|
||||
const row = document.createElement('div');
|
||||
row.className = 'highlight-row';
|
||||
row.innerHTML = `
|
||||
<label>Titel<input class="hl-title" value="${esc(h?.title)}" /></label>
|
||||
<label>Beschreibung<input class="hl-desc" value="${esc(h?.description)}" /></label>
|
||||
<button type="button" class="hl-remove" data-idx="${idx}">Entfernen</button>`;
|
||||
box.appendChild(row);
|
||||
});
|
||||
box.querySelectorAll('.hl-remove').forEach(btn => {
|
||||
btn.addEventListener('click', () => {
|
||||
btn.closest('.highlight-row').remove();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function readHighlights() {
|
||||
return Array.from(byId('wel-highlights').querySelectorAll('.highlight-row'))
|
||||
.map(row => ({
|
||||
title: row.querySelector('.hl-title').value.trim(),
|
||||
description: row.querySelector('.hl-desc').value.trim(),
|
||||
}))
|
||||
.filter(h => h.title || h.description);
|
||||
}
|
||||
|
||||
async function loadContent() {
|
||||
try {
|
||||
const data = await api('/api/content');
|
||||
const map = {};
|
||||
(data.sections || []).forEach(s => {
|
||||
let c = s.content;
|
||||
if (typeof c === 'string') { try { c = JSON.parse(c); } catch { c = {}; } }
|
||||
map[s.section] = c || {};
|
||||
});
|
||||
contentState = {
|
||||
hero: map.hero || {},
|
||||
welcome: map.welcome || {},
|
||||
drinks: map.drinks || {},
|
||||
};
|
||||
|
||||
byId('hero-heading').value = contentState.hero.heading || '';
|
||||
byId('hero-subheading').value = contentState.hero.subheading || '';
|
||||
|
||||
byId('wel-heading1').value = contentState.welcome.heading1 || '';
|
||||
byId('wel-heading2').value = contentState.welcome.heading2 || '';
|
||||
byId('wel-intro').value = contentState.welcome.introText || '';
|
||||
byId('wel-closing').value = contentState.welcome.closingText || '';
|
||||
renderHighlights(contentState.welcome.highlights);
|
||||
setPreview('wel-preview', contentState.welcome.imageUrl);
|
||||
|
||||
byId('dr-intro').value = contentState.drinks.introText || '';
|
||||
byId('dr-special-name').value = contentState.drinks.monthlySpecialName || '';
|
||||
byId('dr-whiskey').value = contentState.drinks.whiskeyText || '';
|
||||
setPreview('dr-special-preview', contentState.drinks.monthlySpecialImage);
|
||||
setPreview('dr-whiskey-preview1', contentState.drinks.whiskeyImage1);
|
||||
setPreview('dr-whiskey-preview2', contentState.drinks.whiskeyImage2);
|
||||
setPreview('dr-whiskey-preview3', contentState.drinks.whiskeyImage3);
|
||||
|
||||
const pdf = contentState.drinks.pdfUrl;
|
||||
byId('dr-pdf-current').innerHTML = pdf
|
||||
? `Aktuell: <a href="${API_BASE}${esc(pdf)}" target="_blank" rel="noopener noreferrer">${esc(pdf.split('/').pop())}</a>`
|
||||
: 'Noch keine eigene Getränkekarte hochgeladen (es gilt die im Repo hinterlegte).';
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
async function uploadContentImage(file, name) {
|
||||
const fd = new FormData();
|
||||
fd.append('name', name || '');
|
||||
fd.append('file', file);
|
||||
const res = await fetch(API_BASE + '/api/content/upload', { method: 'POST', body: fd, credentials: 'include' });
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
return res.json();
|
||||
}
|
||||
|
||||
/** Lädt die Datei aus einem Input hoch, sofern eine gewählt wurde. */
|
||||
async function maybeUpload(inputId, current, name) {
|
||||
const file = byId(inputId).files[0];
|
||||
if (!file) return current;
|
||||
const up = await uploadContentImage(file, name);
|
||||
byId(inputId).value = '';
|
||||
return up?.imageUrl || current;
|
||||
}
|
||||
|
||||
async function saveSection(name, content, msgId) {
|
||||
const msg = byId(msgId);
|
||||
msg.textContent = 'Speichere...';
|
||||
msg.className = 'muted';
|
||||
try {
|
||||
await api(`/api/content/${name}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ contentJson: content }),
|
||||
});
|
||||
msg.textContent = 'Gespeichert. Mit „Publish“ übernehmen.';
|
||||
msg.className = 'ok';
|
||||
await loadContent();
|
||||
} catch (e) {
|
||||
msg.textContent = 'Fehler: ' + e.message;
|
||||
msg.className = 'err';
|
||||
}
|
||||
}
|
||||
|
||||
byId('btn-add-highlight').addEventListener('click', () => {
|
||||
const current = readHighlights();
|
||||
current.push({ title: '', description: '' });
|
||||
renderHighlights(current);
|
||||
});
|
||||
|
||||
byId('btn-save-hero').addEventListener('click', () => {
|
||||
saveSection('hero', {
|
||||
...contentState.hero,
|
||||
heading: byId('hero-heading').value.trim(),
|
||||
subheading: byId('hero-subheading').value.trim(),
|
||||
}, 'hero-msg');
|
||||
});
|
||||
|
||||
byId('btn-save-welcome').addEventListener('click', async () => {
|
||||
const msg = byId('wel-msg');
|
||||
msg.textContent = 'Lade Bild hoch...';
|
||||
msg.className = 'muted';
|
||||
try {
|
||||
const imageUrl = await maybeUpload('wel-file', contentState.welcome.imageUrl, 'willkommen');
|
||||
await saveSection('welcome', {
|
||||
...contentState.welcome,
|
||||
heading1: byId('wel-heading1').value.trim(),
|
||||
heading2: byId('wel-heading2').value.trim(),
|
||||
introText: byId('wel-intro').value.trim(),
|
||||
closingText: byId('wel-closing').value.trim(),
|
||||
highlights: readHighlights(),
|
||||
...(imageUrl ? { imageUrl } : {}),
|
||||
}, 'wel-msg');
|
||||
} catch (e) {
|
||||
msg.textContent = 'Fehler: ' + e.message;
|
||||
msg.className = 'err';
|
||||
}
|
||||
});
|
||||
|
||||
byId('btn-save-drinks').addEventListener('click', async () => {
|
||||
const msg = byId('dr-msg');
|
||||
msg.textContent = 'Lade Dateien hoch...';
|
||||
msg.className = 'muted';
|
||||
try {
|
||||
const specialName = byId('dr-special-name').value.trim();
|
||||
const special = await maybeUpload('dr-special-file', contentState.drinks.monthlySpecialImage, specialName || 'monats-hit');
|
||||
const w1 = await maybeUpload('dr-whiskey-file1', contentState.drinks.whiskeyImage1, 'whiskey-1');
|
||||
const w2 = await maybeUpload('dr-whiskey-file2', contentState.drinks.whiskeyImage2, 'whiskey-2');
|
||||
const w3 = await maybeUpload('dr-whiskey-file3', contentState.drinks.whiskeyImage3, 'whiskey-3');
|
||||
|
||||
// PDF geht über einen eigenen Endpunkt, der die URL selbst hinterlegt
|
||||
const pdfFile = byId('dr-pdf-file').files[0];
|
||||
if (pdfFile) {
|
||||
const fd = new FormData();
|
||||
fd.append('file', pdfFile);
|
||||
const res = await fetch(API_BASE + '/api/pdf/drinks', { method: 'POST', body: fd, credentials: 'include' });
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
const up = await res.json();
|
||||
contentState.drinks.pdfUrl = up?.pdfUrl || contentState.drinks.pdfUrl;
|
||||
byId('dr-pdf-file').value = '';
|
||||
}
|
||||
|
||||
await saveSection('drinks', {
|
||||
...contentState.drinks,
|
||||
introText: byId('dr-intro').value.trim(),
|
||||
monthlySpecialName: byId('dr-special-name').value.trim(),
|
||||
whiskeyText: byId('dr-whiskey').value.trim(),
|
||||
...(special ? { monthlySpecialImage: special } : {}),
|
||||
...(w1 ? { whiskeyImage1: w1 } : {}),
|
||||
...(w2 ? { whiskeyImage2: w2 } : {}),
|
||||
...(w3 ? { whiskeyImage3: w3 } : {}),
|
||||
}, 'dr-msg');
|
||||
} catch (e) {
|
||||
msg.textContent = 'Fehler: ' + e.message;
|
||||
msg.className = 'err';
|
||||
}
|
||||
});
|
||||
|
||||
refreshAuth();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@@ -27,6 +27,14 @@ const events = [
|
||||
Plätze sind begrenzt! Jetzt reservieren unter 🍀WA 077 232 27 70
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/msogsj4l-bmlcxc.jpeg",
|
||||
title: "SG Fest",
|
||||
date: "2026-08-14",
|
||||
description: `
|
||||
Das Stadt-Fest steht vor der Tür! Wir haben OFFEN ab 17:00Uhr mit Karaoke! Wir freuen uns auf euch!
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/mr82c7eh-yp87hy.jpeg",
|
||||
title: "Richie Live",
|
||||
|
||||
Reference in New Issue
Block a user