feat: Add gallery management to admin panel + system documentation

Features: - Gallery upload, delete, reorder (drag & drop) - Preview images in admin panel - Same upload flow as events (WebP conversion via sharp) - Complete system documentation explaining: - Architecture (Frontend/Backend/Volume) - Upload flow (Multipart → Sharp → WebP → Storage) - Why SQLite works on Fly.io (persistent volumes) - Troubleshooting guide Admin now has full CRUD for both Events and Gallery!
2025-12-09 17:08:36 +01:00
104 changed files with 1049 additions and 7215 deletions
@@ -1,29 +0,0 @@
-# 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
@@ -1,125 +1,4 @@
 steps:
-  audit_dependencies:
-    image: node:20
-    commands:
-      - 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
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: discord_webhook
-    commands:
-      - apk add --no-cache curl jq
-      - |
-        if [ -f audit-result.json ]; then
-          TOTAL=$(jq -r '.metadata.vulnerabilities.total // 0' audit-result.json 2>/dev/null || echo "0")
-          CRITICAL=$(jq -r '.metadata.vulnerabilities.critical // 0' audit-result.json 2>/dev/null || echo "0")
-          HIGH=$(jq -r '.metadata.vulnerabilities.high // 0' audit-result.json 2>/dev/null || echo "0")
-          MODERATE=$(jq -r '.metadata.vulnerabilities.moderate // 0' audit-result.json 2>/dev/null || echo "0")
-          LOW=$(jq -r '.metadata.vulnerabilities.low // 0' audit-result.json 2>/dev/null || echo "0")
-
-          if [ "$CRITICAL" -gt 0 ] || [ "$HIGH" -gt 0 ] || [ "$MODERATE" -gt 0 ]; then
-            COLOR=16744448
-            STATUS="⚠️ Vulnerabilities Found"
-          else
-            COLOR=3066993
-            STATUS="✅ No Vulnerabilities"
-          fi
-
-          if [ -f audit-output.txt ]; then
-            VULNS=$(head -50 audit-output.txt | tail -40 || echo "No details")
-          else
-            VULNS="No audit output available"
-          fi
-
-          printf '%s' "$VULNS" > /tmp/vulns.txt
-
-          PAYLOAD=$(jq -n \
-            --arg title "🔒 Security Audit - Build #${CI_BUILD_NUMBER}" \
-            --arg status "$STATUS" \
-            --arg total "$TOTAL" \
-            --arg critical "$CRITICAL" \
-            --arg high "$HIGH" \
-            --arg moderate "$MODERATE" \
-            --arg low "$LOW" \
-            --arg commit "${CI_COMMIT_SHA:0:7}" \
-            --rawfile details /tmp/vulns.txt \
-            --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%S.000Z)" \
-            --argjson color "$COLOR" \
-            '{
-              embeds: [{
-                title: $title,
-                description: $status,
-                color: $color,
-                fields: [
-                  { name: "Total", value: $total, inline: true },
-                  { name: "Critical", value: $critical, inline: true },
-                  { name: "High", value: $high, inline: true },
-                  { name: "Moderate", value: $moderate, inline: true },
-                  { name: "Low", value: $low, inline: true },
-                  { name: "Commit", value: ("`" + $commit + "`"), inline: true },
-                  { name: "Details", value: ("```\n" + ($details[:800]) + (if ($details | length) > 800 then "\n... (truncated)" else "" end) + "\n```"), inline: false }
-                ],
-                timestamp: $timestamp
-              }]
-            }')
-
-          curl -H "Content-Type: application/json" -X POST \
-            -d "$PAYLOAD" "$DISCORD_WEBHOOK"
-        else
-          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
    environment:
@@ -130,100 +9,5 @@ steps:
      - export PATH="$HOME/.fly/bin:$PATH"
      - flyctl deploy --config fly.toml --app gallus-pub --remote-only
    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
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: discord_webhook
-    commands:
-      - apk add --no-cache curl jq
-      - |
-        # Schreibe Commit-Message in Datei (sicher gegen Shell-Sonderzeichen)
-        printf '%s\n' "$CI_COMMIT_MESSAGE" > /tmp/commit_msg.txt
-
-        PAYLOAD=$(cat /tmp/commit_msg.txt | jq -Rs \
-          --arg title "✅ Build #${CI_BUILD_NUMBER} - Success" \
-          --arg repo "${CI_REPO}" \
-          --arg branch "${CI_COMMIT_BRANCH}" \
-          --arg commit "${CI_COMMIT_SHA:0:7}" \
-          --arg author "${CI_COMMIT_AUTHOR}" \
-          --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%S.000Z)" \
-          '. as $message | {
-            embeds: [{
-              title: $title,
-              description: "Build und Deployment erfolgreich abgeschlossen!",
-              color: 3066993,
-              fields: [
-                { name: "Repository", value: $repo, inline: true },
-                { name: "Branch", value: $branch, inline: true },
-                { name: "Commit", value: ("`" + $commit + "`"), inline: true },
-                { name: "Author", value: $author, inline: true },
-                { name: "Commit Message", value: $message, inline: false }
-              ],
-              timestamp: $timestamp
-            }]
-          }')
-
-        curl -H "Content-Type: application/json" -X POST \
-          -d "$PAYLOAD" "$DISCORD_WEBHOOK"
-    when:
-      - branch: main
-        event: push
-        status: success
-
-  notify_failure:
-    image: alpine:latest
-    environment:
-      DISCORD_WEBHOOK:
-        from_secret: discord_webhook
-    commands:
-      - apk add --no-cache curl jq
-      - |
-        # Schreibe Commit-Message in Datei (sicher gegen Shell-Sonderzeichen)
-        printf '%s\n' "$CI_COMMIT_MESSAGE" > /tmp/commit_msg.txt
-
-        PAYLOAD=$(cat /tmp/commit_msg.txt | jq -Rs \
-          --arg title "❌ Build #${CI_BUILD_NUMBER} - Failure" \
-          --arg repo "${CI_REPO}" \
-          --arg branch "${CI_COMMIT_BRANCH}" \
-          --arg commit "${CI_COMMIT_SHA:0:7}" \
-          --arg author "${CI_COMMIT_AUTHOR}" \
-          --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%S.000Z)" \
-          '. as $message | {
-            embeds: [{
-              title: $title,
-              description: "Build oder Deployment ist fehlgeschlagen!",
-              color: 15158332,
-              fields: [
-                { name: "Repository", value: $repo, inline: true },
-                { name: "Branch", value: $branch, inline: true },
-                { name: "Commit", value: ("`" + $commit + "`"), inline: true },
-                { name: "Author", value: $author, inline: true },
-                { name: "Commit Message", value: $message, inline: false }
-              ],
-              timestamp: $timestamp
-            }]
-          }')
-
-        curl -H "Content-Type: application/json" -X POST \
-          -d "$PAYLOAD" "$DISCORD_WEBHOOK"
-    when:
-      - branch: main
-        event: push
-        status: failure
+      branch: main
+      event: push
@@ -5,6 +5,9 @@ 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
@@ -0,0 +1,220 @@
+# 🎯 Gallus Pub CMS - System-Erklärung
+
+## 📐 Architektur-Überblick
+
+```
+┌─────────────────┐         ┌──────────────────┐         ┌─────────────────┐
+│   Frontend      │         │   Backend CMS    │         │  Fly.io Volume  │
+│  (Astro SSG)    │◄────────┤   (Fastify API)  │◄────────┤   /app/data/    │
+│ gallus-pub.ch   │  fetch  │ cms.gallus-pub.ch│  mount  │  - SQLite DB    │
+│                 │         │                  │         │  - images/      │
+└─────────────────┘         └──────────────────┘         └─────────────────┘
+```
+
+## 🔄 Wie funktioniert der Upload-Flow?
+
+### 1. **Admin lädt Bild hoch** (admin.astro)
+```
+User wählt Bild → uploadImage() → POST /api/gallery/upload
+```
+
+### 2. **Backend verarbeitet Upload** (backend/src/routes/gallery.ts)
+```javascript
+// Line 60-134 in gallery.ts
+1. Empfange Multipart-File
+2. Validiere Mimetype (nur images/*)
+3. Lese Stream in Buffer
+4. sharp() konvertiert zu WebP:
+   - Auto-rotate (EXIF)
+   - Resize auf max 1600px
+   - WebP quality 82%
+5. Speichere in /app/data/images/gallery/
+6. Erstelle DB-Eintrag mit imageUrl
+7. Return imageUrl an Frontend
+```
+
+### 3. **Bilder werden serviert** (backend/src/index.ts)
+```javascript
+// Line 63-69
+fastifyStatic → /static/ → /app/data/
+```
+
+Beispiel:
+- Bild liegt in: `/app/data/images/gallery/miyma9zc-8he1di.webp`
+- URL ist: `/images/gallery/miyma9zc-8he1di.webp`
+- Wird serviert als: `https://cms.gallus-pub.ch/static/images/gallery/miyma9zc-8he1di.webp`
+
+### 4. **Frontend zeigt Bilder** (src/pages/index.astro)
+```javascript
+// Line 30-43
+1. Fetch von /api/gallery/public
+2. Map imageUrl: `${API_BASE}${img.imageUrl}`
+3. Result: https://cms.gallus-pub.ch/static/images/gallery/xyz.webp
+```
+
+## 💾 Warum funktioniert SQLite mit Fly.io?
+
+**Fly.io Volumes** sind persistente Speicher:
+- Gemountet als: `/app/data/`
+- Konfiguration in: `backend/fly.toml` (Line 40-42)
+- Bleibt bei Restarts/Deploys erhalten
+
+```toml
+[mounts]
+  source = "gallus_data"
+  destination = "/app/data"
+```
+
+### Was liegt wo?
+
+```
+/app/data/
+├── gallus_cms.db          # SQLite Datenbank
+├── gallus_cms.db-wal      # Write-Ahead Log
+├── gallus_cms.db-shm      # Shared Memory
+└── images/
+    ├── events/
+    │   ├── event_karaoke.webp
+    │   └── ...
+    └── gallery/
+        ├── Gallery1.webp
+        └── ...
+```
+
+## 🔒 Datenfluss im Detail
+
+### Event erstellen:
+```
+1. Admin: Bild auswählen + Formular ausfüllen
+2. uploadImage(file) → /api/gallery/upload
+   ↓
+3. Backend:
+   - Sharp konvertiert → WebP
+   - Speichert in /app/data/images/gallery/
+   - Returnt: { image: { imageUrl: "/images/gallery/xyz.webp" } }
+   ↓
+4. Admin: POST /api/events
+   Body: { title, date, description, imageUrl: "/images/gallery/xyz.webp" }
+   ↓
+5. Backend:
+   - INSERT INTO events (imageUrl = "/images/gallery/xyz.webp")
+   ↓
+6. Frontend: GET /api/events/public
+   - Fetcht Events aus DB
+   - Mapped imageUrl zu voller URL
+   - Zeigt an: <img src="https://cms.gallus-pub.ch/static/images/gallery/xyz.webp">
+```
+
+### Warum separate Uploads für Gallery?
+
+Events nutzen den Gallery-Upload, weil:
+- Beide brauchen WebP-Konvertierung
+- Beide nutzen gleichen Storage
+- Vermeidet Code-Duplikation
+- Gallery kann eigenständige Bildergalerie haben
+
+## 🎨 Admin-Panel Features
+
+### Events-Verwaltung:
+- ✅ Event erstellen (mit Bild-Upload)
+- ✅ Events auflisten
+- ✅ Events löschen
+- ✅ Reihenfolge ändern (Drag & Drop)
+- ✅ Events veröffentlichen/verstecken (isPublished)
+
+### Gallery-Verwaltung: (NEU!)
+- ✅ Bild hochladen
+- ✅ Gallery auflisten
+- ✅ Bilder löschen
+- ✅ Reihenfolge ändern (Drag & Drop)
+- ✅ Bilder veröffentlichen/verstecken (isPublished)
+
+### Publish:
+- Git-Integration (für statische Seiten-Updates)
+- Commit & Push zu Repository
+
+## 🚀 Deployment-Prozess
+
+### Was passiert beim Deploy?
+
+1. **Woodpecker CI** triggered bei Push zu `main`
+2. **Frontend Deploy** (gallus-pub):
+   - Build Astro SSG
+   - Deploy zu Fly.io
+
+3. **Backend Deploy** (gallus-cms-backend):
+   - Docker Build:
+     ```dockerfile
+     # Backend-Code kompilieren
+     npm run build → dist/
+
+     # Migrierte Bilder einpacken
+     COPY backend/data/images → /app/migration-images
+
+     # Migration-Script kopieren
+     COPY migrate-production.js → /app/
+     ```
+   - Deploy zu Fly.io
+   - **Volume bleibt erhalten** (SQLite DB + hochgeladene Bilder)
+
+4. **Nach erstem Deploy**: Migration ausführen
+   ```bash
+   fly ssh console -a gallus-cms-backend
+   node migrate-production.js
+   ```
+   - Kopiert Bilder: `/app/migration-images/` → `/app/data/images/`
+   - Befüllt DB mit Event/Gallery-Einträgen
+
+## 🔍 Troubleshooting
+
+### "Bilder werden nicht angezeigt"
+
+**Prüfe:**
+1. Backend logs: `fly logs -a gallus-cms-backend`
+2. Bild existiert: `fly ssh console -a gallus-cms-backend`
+   ```bash
+   ls -la /app/data/images/gallery/
+   ```
+3. DB-Eintrag korrekt:
+   ```bash
+   sqlite3 /app/data/gallus_cms.db
+   SELECT * FROM gallery_images;
+   ```
+4. Static-Route funktioniert:
+   ```bash
+   curl https://cms.gallus-pub.ch/static/images/gallery/xyz.webp
+   ```
+
+### "SQLite locked" Fehler
+
+- Nur ein Writer zur Zeit erlaubt
+- Bei hohem Traffic: Wechsel zu PostgreSQL empfohlen
+- Für Gallus Pub: ausreichend (wenig Writes)
+
+### "Volume voll"
+
+```bash
+fly volumes list -a gallus-cms-backend
+fly volumes extend <volume-id> -s <new-size>
+```
+
+## 📁 Wichtige Dateien
+
+| Datei | Zweck |
+|-------|-------|
+| `backend/src/routes/gallery.ts` | Gallery-Upload & CRUD |
+| `backend/src/routes/events.ts` | Events CRUD + Public API |
+| `backend/src/index.ts` | Static File Serving |
+| `backend/migrate-production.js` | Initiale Daten-Migration |
+| `src/pages/admin.astro` | Admin-Interface |
+| `src/pages/index.astro` | Frontend (fetched von API) |
+| `backend/fly.toml` | Backend Fly.io Config |
+| `fly.toml` | Frontend Fly.io Config |
+
+## 🎯 Nächste Schritte
+
+1. ✅ Gallery-Verwaltung implementiert
+2. ⏳ Migration ausführen (nach Deploy)
+3. ⏳ Testen: Bild hochladen → Frontend anzeigen
+4. 📋 Optional: Image-Editing Features
+5. 📋 Optional: Bulk-Upload für Gallery
@@ -1,46 +1,44 @@
 # 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

-# 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.
+# Install build dependencies for native modules (better-sqlite3)
 RUN apk add --no-cache python3 make g++

-# Eigener Layer: bleibt im Cache, solange sich das Lockfile nicht aendert
+# Install dependencies
 COPY package*.json ./
-RUN npm ci
+# Use npm ci when lockfile exists, fallback to npm install for local/dev
+RUN npm ci || npm install

+# 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

-# 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.
+# Install runtime dependencies (git for simple-git, sqlite3 CLI tool)
 RUN apk add --no-cache git sqlite

-COPY --from=builder /app/package*.json ./
+# Copy production dependencies from builder (already compiled native modules)
 COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/dist ./dist
-COPY --from=builder /app/migrate-production.js ./migrate-production.js
-COPY --from=builder /app/data/images ./data/images

-# Create directories and ensure proper permissions
-RUN mkdir -p /app/workspace /app/data && chown -R node:node /app
+# Copy built files from builder
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/src/db/migrations ./dist/db/migrations
+
+# Create directories
+RUN mkdir -p /app/workspace /app/data
+
+# Ensure proper permissions
+RUN chown -R node:node /app

 # Switch to non-root user
 USER node
@@ -58,4 +56,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
  CMD node -e "require('http').get('http://localhost:8080/health', (r) => {process.exit(r.statusCode === 200 ? 0 : 1)})"

 # Run DB migrations if present, then start application
-CMD ["/bin/sh", "-lc", "mkdir -p /app/data/images/events /app/data/images/gallery && [ -f dist/migrate.js ] && node dist/migrate.js || true; node dist/index.js"]
+CMD ["/bin/sh", "-lc", "[ -f dist/migrate.js ] && node dist/migrate.js || true; node dist/index.js"]
@@ -14,7 +14,7 @@ primary_region = "ams"
  GIT_WORKSPACE_DIR = "/app/data/workspace"
  # Cross-site frontend and OAuth
  FRONTEND_URL = "https://gallus-pub.ch"
-  CORS_ORIGIN = "https://gallus-pub.ch,https://www.gallus-pub.ch"
+  CORS_ORIGIN = "https://gallus-pub.ch"
  GITEA_REDIRECT_URI = "https://cms.gallus-pub.ch/api/auth/callback"

 [http_service]
@@ -1,183 +0,0 @@
-// Production migration script - can be run directly with node
-import Database from 'better-sqlite3';
-import { drizzle } from 'drizzle-orm/better-sqlite3';
-import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
-import { sql } from 'drizzle-orm';
-import fs from 'fs';
-import path from 'path';
-import sharp from 'sharp';
-
-// Database schema
-const events = sqliteTable('events', {
-  id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
-  title: text('title').notNull(),
-  date: text('date').notNull(),
-  description: text('description').notNull(),
-  imageUrl: text('image_url').notNull(),
-  displayOrder: integer('display_order').notNull(),
-  isPublished: integer('is_published', { mode: 'boolean' }).default(true),
-  createdAt: integer('created_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
-});
-
-const galleryImages = sqliteTable('gallery_images', {
-  id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
-  imageUrl: text('image_url').notNull(),
-  altText: text('alt_text').notNull(),
-  displayOrder: integer('display_order').notNull(),
-  isPublished: integer('is_published', { mode: 'boolean' }).default(true),
-  createdAt: integer('created_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
-});
-
-// Old events data
-const oldEvents = [
-  {
-    title: "Karaoke",
-    date: "2025-12-31",
-    description: `Bei uns gibt es Karaoke Mi-Sa!! <br>Seid ihr eine Gruppe und lieber unter euch? ..unseren 2.Stock kannst du auch mieten ;) <br>Reserviere am besten gleich per Whatsapp <a href="tel:+41772322770">077 232 27 70</a>`,
-    imageUrl: "/images/events/event_karaoke.webp",
-    displayOrder: 0,
-  },
-  {
-    title: "Pub Quiz",
-    date: "2025-12-31",
-    description: `Jeden Freitag findet unser <b>Pub Quiz</b> statt. Gespielt wird tischweise in 3-4 Runden. <br>Jede Woche gibt es ein anderes Thema. Es geht um Ruhm und Ehre und zusätzlich werden die Sieger der Herzen durch das Publikum gekürt! <3 <br>Auch Einzelpersonen sind herzlich willkommen! <br>*zum mitmachen minimum 1 Getränk konsumieren oder 5CHF`,
-    displayOrder: 1,
-  },
-  {
-    title: "Schlager Hüttenzauber Karaoke",
-    date: "2025-11-27",
-    description: `Ab 19:00 Uhr Eintritt ist Frei! Reservieren unter <a href="tel:+41772322770">077 232 27 70</a>`,
-    imageUrl: "/images/events/event_schlager-karaoke.webp",
-    displayOrder: 2,
-  },
-  {
-    title: "Adventskalender",
-    date: "2025-12-20",
-    description: `Jeden Tag neue Überraschungen! Check unsere Social Media Stories!`,
-    imageUrl: "/images/events/event_advents-kalender.webp",
-    displayOrder: 3,
-  },
-  {
-    title: "Santa Karaoke-Party",
-    date: "2025-12-06",
-    description: `🤶🏻🎅🏻Komme als Weihnachts-Mann/-Frau und bekomme einen Shot auf's Haus!🤶🏻🎅🏻`,
-    imageUrl: "/images/events/event_santa_karaoke.webp",
-    displayOrder: 4,
-  },
-  {
-    title: "Weihnachtsferien",
-    date: "2025-12-21",
-    description: `Wir sind ab 02.01.2026 wieder wie gewohnt für euch da! 🍀. <br> Für Anfragen WA <a href="tel:+41772322770">077 232 27 70</a> Antwort innerhalb 48h`,
-    imageUrl: "/images/events/event_ferien.webp",
-    displayOrder: 5,
-  },
-  {
-    title: "Neujahrs-Apero",
-    date: "2026-01-02",
-    description: `18:00-20:00 Uhr`,
-    imageUrl: "/images/events/event_neujahrs-apero.webp",
-    displayOrder: 6,
-  },
-];
-
-// Old gallery images
-const oldGalleryImages = [
-  { imageUrl: "/images/gallery/Gallery7.webp", alt: "Gallery 7", order: 0 },
-  { imageUrl: "/images/gallery/Gallery8.webp", alt: "Gallery 8", order: 1 },
-  { imageUrl: "/images/gallery/Gallery9.webp", alt: "Gallery 9", order: 2 },
-  { imageUrl: "/images/gallery/Gallery6.webp", alt: "Gallery 6", order: 3 },
-  { imageUrl: "/images/gallery/Gallery1.webp", alt: "Gallery 1", order: 4 },
-  { imageUrl: "/images/gallery/Gallery2.webp", alt: "Gallery 2", order: 5 },
-  { imageUrl: "/images/gallery/Gallery3.webp", alt: "Gallery 3", order: 6 },
-  { imageUrl: "/images/gallery/Gallery4.webp", alt: "Gallery 4", order: 7 },
-  { imageUrl: "/images/gallery/Gallery5.webp", alt: "Gallery 5", order: 8 },
-];
-
-async function main() {
-  console.log('=== Production Migration Script ===\n');
-
-  const dbPath = process.env.DATABASE_PATH || '/app/data/gallus_cms.db';
-  console.log('Database path:', dbPath);
-
-  // Check if database exists
-  if (!fs.existsSync(dbPath)) {
-    console.error('ERROR: Database not found at:', dbPath);
-    console.error('Please ensure the backend has been started at least once to create the database.');
-    process.exit(1);
-  }
-
-  // Check if images exist
-  const dataDir = process.env.GIT_WORKSPACE_DIR || '/app/data';
-  const eventsDir = path.join(dataDir, 'images', 'events');
-  const galleryDir = path.join(dataDir, 'images', 'gallery');
-
-  console.log('Events images directory:', eventsDir);
-  console.log('Gallery images directory:', galleryDir);
-
-  if (!fs.existsSync(eventsDir)) {
-    console.error('ERROR: Events images directory not found:', eventsDir);
-    process.exit(1);
-  }
-
-  if (!fs.existsSync(galleryDir)) {
-    console.error('ERROR: Gallery images directory not found:', galleryDir);
-    process.exit(1);
-  }
-
-  // List available images
-  console.log('\nAvailable event images:', fs.readdirSync(eventsDir));
-  console.log('Available gallery images:', fs.readdirSync(galleryDir));
-
-  // Connect to database
-  const sqlite = new Database(dbPath);
-  const db = drizzle(sqlite);
-
-  console.log('\n=== Migrating Events ===\n');
-
-  for (const event of oldEvents) {
-    try {
-      const [newEvent] = await db.insert(events).values({
-        title: event.title,
-        date: event.date,
-        description: event.description,
-        imageUrl: event.imageUrl,
-        displayOrder: event.displayOrder,
-        isPublished: true,
-      }).returning();
-
-      console.log(`✓ Migrated event: ${newEvent.title}`);
-    } catch (error) {
-      console.error(`✗ Failed to migrate event "${event.title}":`, error.message);
-    }
-  }
-
-  console.log('\n=== Migrating Gallery Images ===\n');
-
-  for (const img of oldGalleryImages) {
-    try {
-      const [newImage] = await db.insert(galleryImages).values({
-        imageUrl: img.imageUrl,
-        altText: img.alt,
-        displayOrder: img.order,
-        isPublished: true,
-      }).returning();
-
-      console.log(`✓ Migrated gallery image: ${newImage.altText}`);
-    } catch (error) {
-      console.error(`✗ Failed to migrate gallery image "${img.alt}":`, error.message);
-    }
-  }
-
-  sqlite.close();
-
-  console.log('\n✓ Migration completed successfully!');
-  console.log('\nYou can verify the migration by visiting:');
-  console.log('- Frontend: https://gallus-pub.ch/');
-  console.log('- Admin: https://gallus-pub.ch/admin');
-}
-
-main().catch(error => {
-  console.error('\n✗ Migration failed:', error);
-  process.exit(1);
-});
@@ -27,16 +27,14 @@ export function initDatabase() {
  console.log('🔧 Initializing database...');

  try {
-    // Nur zur Protokollierung - angelegt wird immer, siehe unten
+    // Check if users table exists (acts as a sentinel for initial setup)
    const tableCheck = sqlite
      .prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='users'")
      .get();

-    console.log(tableCheck ? '📝 Checking database schema...' : '📝 Creating database schema...');
+    if (!tableCheck) {
+      console.log('📝 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;

@@ -86,11 +84,6 @@ 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),
@@ -100,7 +93,9 @@ export function initDatabase() {
        );
      `);

-      console.log('✅ Database schema is up to date.');
+      console.log('✅ Database schema created successfully!');
+    } else {
+      console.log('✅ Database already initialized.');
    }
  } catch (error) {
    console.error('❌ Error initializing database:', error);
@@ -1,6 +1,7 @@
 import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
 import { sql } from 'drizzle-orm';

+// Users table - stores Gitea user info for audit and access control
 export const users = sqliteTable('users', {
  id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
  giteaId: text('gitea_id').notNull().unique(),
@@ -59,26 +60,3 @@ export const publishHistory = sqliteTable('publish_history', {
  commitMessage: text('commit_message'),
  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()),
-  text: text('text').notNull(),
-  startDate: text('start_date').notNull(), // ISO date string
-  endDate: text('end_date').notNull(), // ISO date string
-  isActive: integer('is_active', { mode: 'boolean' }).default(true),
-  createdAt: integer('created_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
-});
@@ -8,7 +8,6 @@ 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,8 +16,6 @@ import galleryRoute from './routes/gallery.js';
 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 {
@@ -42,24 +39,8 @@ const fastify = Fastify({
 });

 // Register plugins
-// Support multiple origins for CORS
-const allowedOrigins = env.CORS_ORIGIN.split(',').map(o => o.trim());
 fastify.register(cors, {
-  origin: (origin, cb) => {
-    // Allow requests with no origin (like mobile apps or curl)
-    if (!origin) {
-      return cb(null, true);
-    }
-
-    // Check if origin is in allowed list
-    const isAllowed = allowedOrigins.includes(origin);
-
-    if (isAllowed) {
-      return cb(null, true);
-    } else {
-      return cb(null, false);
-    }
-  },
+  origin: env.CORS_ORIGIN,
  credentials: true,
 });

@@ -81,34 +62,12 @@ 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);

@@ -119,8 +78,6 @@ fastify.register(galleryRoute, { prefix: '/api' });
 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 () => {
@@ -6,6 +6,7 @@ import { eq } from 'drizzle-orm';
 import { GiteaService } from '../services/gitea.service.js';
 import { env } from '../config/env.js';

+// Use explicit JSON schema for Fastify route validation to avoid provider issues
 const callbackQueryJsonSchema = {
  type: 'object',
  required: ['code', 'state'],
@@ -1,152 +0,0 @@
-import { FastifyPluginAsync } from 'fastify';
-import { db } from '../config/database.js';
-import { banners } from '../db/schema.js';
-import { eq, and, lte, gte, desc } from 'drizzle-orm';
-
-const bannerBodyJsonSchema = {
-  type: 'object',
-  required: ['text', 'startDate', 'endDate'],
-  properties: {
-    text: { type: 'string' },
-    startDate: { type: 'string' },
-    endDate: { type: 'string' },
-    isActive: { type: 'boolean' },
-  },
-} as const;
-
-const bannersRoute: FastifyPluginAsync = async (fastify) => {
-
-  // Get active banner (public endpoint)
-  fastify.get('/banners/active', async (request, reply) => {
-    // Use local date to avoid timezone issues
-    const now = new Date();
-    const today = new Date(now.getTime() - (now.getTimezoneOffset() * 60000))
-      .toISOString()
-      .split('T')[0]; // YYYY-MM-DD
-
-    const [activeBanner] = await db
-      .select()
-      .from(banners)
-      .where(
-        and(
-          eq(banners.isActive, true),
-          lte(banners.startDate, today),
-          gte(banners.endDate, today)
-        )
-      )
-      .orderBy(desc(banners.createdAt))
-      .limit(1);
-
-    if (!activeBanner) {
-      return { banner: null };
-    }
-
-    return {
-      banner: {
-        id: activeBanner.id,
-        text: activeBanner.text,
-        startDate: activeBanner.startDate,
-        endDate: activeBanner.endDate,
-      },
-    };
-  });
-
-  // Get all banners (admin only)
-  fastify.get('/banners', {
-    preHandler: [fastify.authenticate],
-  }, async (request, reply) => {
-    const allBanners = await db.select().from(banners);
-
-    return {
-      banners: allBanners.map((b: any) => ({
-        id: b.id,
-        text: b.text,
-        startDate: b.startDate,
-        endDate: b.endDate,
-        isActive: b.isActive,
-        createdAt: b.createdAt,
-        updatedAt: b.updatedAt,
-      })),
-    };
-  });
-
-  // Create banner (admin only)
-  fastify.post('/banners', {
-    schema: {
-      body: bannerBodyJsonSchema,
-    },
-    preHandler: [fastify.authenticate],
-  }, async (request, reply) => {
-    const { text, startDate, endDate, isActive = true } = request.body as any;
-
-    const [newBanner] = await db
-      .insert(banners)
-      .values({
-        text,
-        startDate,
-        endDate,
-        isActive,
-      })
-      .returning();
-
-    return {
-      banner: {
-        id: newBanner.id,
-        text: newBanner.text,
-        startDate: newBanner.startDate,
-        endDate: newBanner.endDate,
-        isActive: newBanner.isActive,
-      },
-    };
-  });
-
-  // Update banner (admin only)
-  fastify.put('/banners/:id', {
-    schema: {
-      body: bannerBodyJsonSchema,
-    },
-    preHandler: [fastify.authenticate],
-  }, async (request, reply) => {
-    const { id } = request.params as { id: string };
-    const { text, startDate, endDate, isActive } = request.body as any;
-
-    const [updated] = await db
-      .update(banners)
-      .set({
-        text,
-        startDate,
-        endDate,
-        isActive,
-        updatedAt: new Date(),
-      })
-      .where(eq(banners.id, id))
-      .returning();
-
-    if (!updated) {
-      return reply.code(404).send({ error: 'Banner not found' });
-    }
-
-    return {
-      banner: {
-        id: updated.id,
-        text: updated.text,
-        startDate: updated.startDate,
-        endDate: updated.endDate,
-        isActive: updated.isActive,
-      },
-    };
-  });
-
-  // Delete banner (admin only)
-  fastify.delete('/banners/:id', {
-    preHandler: [fastify.authenticate],
-  }, async (request, reply) => {
-    const { id } = request.params as { id: string };
-
-    await db.delete(banners).where(eq(banners.id, id));
-
-    return { success: true };
-  });
-};
-
-export default bannersRoute;
@@ -3,8 +3,6 @@ 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 = {
@@ -80,20 +78,6 @@ 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,
@@ -101,39 +85,6 @@ 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,19 +2,6 @@ import { FastifyPluginAsync } from 'fastify';
 import { db } from '../config/database.js';
 import { events } from '../db/schema.js';
 import { eq } from 'drizzle-orm';
-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 = {
@@ -82,65 +69,16 @@ 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 };
  });

-  // Upload event image file (multipart)
-  fastify.post('/events/upload', {
-    preHandler: [fastify.authenticate],
-  }, async (request, reply) => {
-    try {
-      // Expect a single file field named "file"
-      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' });
-      }
-
-      // Der Titel kommt als Formularfeld VOR der Datei, sonst ist er hier
-      // noch nicht geparst
-      const preferredName = (file.fields?.title?.value as string | undefined) || '';
-
-      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 });
-      }
-      fastify.log.error({ err }, 'Upload failed');
-      return reply.code(500).send({ error: 'Failed to upload image' });
-    }
-  });
-
  // Delete event
  fastify.delete('/events/:id', { preHandler: [fastify.authenticate] }, async (request, reply) => {
    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,19 +3,9 @@ import { z } from 'zod';
 import { db } from '../config/database.js';
 import { galleryImages } from '../db/schema.js';
 import { eq } from 'drizzle-orm';
-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}`);
-  }
-}
+import fs from 'fs';
+import path from 'path';
+import sharp from 'sharp';

 // Fastify JSON schema for gallery image body
 const galleryBodyJsonSchema = {
@@ -95,25 +85,57 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
        return reply.code(400).send({ error: 'Only image uploads are allowed' });
      }

-      const saved = await saveUploadedImage(file, 'gallery', {
-        preferredName: altText,
-        log: fastify.log,
-      });
+      // 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, '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 {
+        outBuffer = await sharp(inputBuffer)
+          .rotate()
+          .resize({ width: 1600, withoutEnlargement: true })
+          .webp({ quality: 82 })
+          .toBuffer();
+      } catch {
+        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 = `/static/images/gallery/${filename}`;

      // Store in DB (optional but useful)
      const [row] = await db.insert(galleryImages).values({
-        imageUrl: saved.imageUrl,
-        altText: altText || saved.filename,
+        imageUrl: publicUrl,
+        altText: altText || filename,
        displayOrder,
        isPublished: true,
      }).returning();

      return reply.code(201).send({ image: row });

-    } catch (err: any) {
-      if (err?.statusCode === 413) {
-        return reply.code(413).send({ error: err.message });
-      }
+    } catch (err) {
      fastify.log.error({ err }, 'Upload failed');
      return reply.code(500).send({ error: 'Failed to upload image' });
    }
@@ -129,8 +151,6 @@ 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)
@@ -141,11 +161,6 @@ 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 };
  });

@@ -164,9 +179,6 @@ 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' };
  });

@@ -1,125 +0,0 @@
-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,7 +2,6 @@ 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';
@@ -35,13 +34,6 @@ 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()
@@ -86,23 +78,16 @@ const publishRoute: FastifyPluginAsync = async (fastify) => {

      fastify.log.info(`Changes committed: ${commitHash}`);

-      // 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');
-      }
+      // Record in history
+      await db.insert(publishHistory).values({
+        userId,
+        commitHash,
+        commitMessage,
+      });

      return {
        success: true,
        commitHash,
-        removedImages: removedImages.length,
        message: 'Changes published successfully',
      };

@@ -1,218 +0,0 @@
-/**
- * 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);
-  });
@@ -1,94 +0,0 @@
-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,27 +27,6 @@ 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, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;');
-  }
-
-  /** 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}",
@@ -64,7 +43,6 @@ export class FileGeneratorService {

    return `---
 import Layout from "../components/Layout.astro";
-import Banner from "../components/Banner.astro";
 import Hero from "../components/Hero.astro";
 import Welcome from "../components/Welcome.astro";
 import EventsGrid from "../components/EventsGrid.astro";
@@ -84,7 +62,6 @@ ${imagesCode}

 <Layout>
 \t<Hero id="hero" />
-\t<Banner />
 \t<Welcome id="welcome" />
 \t<EventsGrid id="events" events={events} />
 \t<ImageCarousel id="gallery" images={images} />
@@ -107,9 +84,9 @@ const { id } = Astro.props;

 \t\t<div class="hero-content">

-\t\t\t<h1>${this.text(content.heading, 'Dein Irish Pub')}</h1>
+\t\t\t<h1>${content.heading || 'Dein Irish Pub'}</h1>

-\t\t\t<p>${this.text(content.subheading, 'Im Herzen von St.Gallen')}</p>
+\t\t\t<p>${content.subheading || 'Im Herzen von St.Gallen'}</p>

 \t\t\t<a href="#" class="button">Aktuelles ↓</a>
 \t\t</div>
@@ -126,7 +103,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>${this.escapeHtml(h?.title)}:</b> ${this.escapeHtml(h?.description)}\n\t\t\t</li>`
+      `\t\t\t<li>\n\t\t\t\t<b>${h.title}:</b> ${h.description}\n\t\t\t</li>`
    ).join('\n\n');

    return `---
@@ -140,11 +117,11 @@ const { id } = Astro.props;

 \t<div class="welcome-text">

-\t\t<h2>${this.text(content.heading1, 'Herzlich willkommen im')}</h2>
-\t\t<h2>${this.text(content.heading2, 'Gallus Pub!')}</h2>
+\t\t<h2>${content.heading1 || 'Herzlich willkommen im'}</h2>
+\t\t<h2>${content.heading2 || 'Gallus Pub!'}</h2>

 \t\t<p>
-\t\t\t${this.text(content.introText)}
+\t\t\t${content.introText || ''}
 \t\t</p>

 \t\t<p><b>Unsere Highlights:</b></p>
@@ -154,14 +131,14 @@ ${highlightsList}
 \t\t</ul>

 \t\t<p>
-\t\t\t${this.text(content.closingText)}
+\t\t\t${content.closingText || ''}
 \t\t</p>

 \t</div>


 \t<div class="welcome-image">
-\t\t<img src="${this.text(content.imageUrl, '/images/Welcome.png')}" alt="Welcome background image" />
+\t\t<img src="${content.imageUrl || '/images/Welcome.png'}" alt="Welcome background image" />
 \t</div>

 </section>
@@ -178,36 +155,36 @@ const { id } = Astro.props;
    <h2 class="title">Drinks</h2>

    <p class="note">
-        ${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.')}
+        ${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="${this.text(content.pdfUrl, '/pdf/Getraenke_Gallus_2025.pdf')}" class="card-link" target="_blank" rel="noopener noreferrer">Getränkekarte</a>
+    <a href="/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="${this.text(content.monthlySpecialName, 'Mate Vodka')}">
-            <img src="${this.text(content.monthlySpecialImage, '/images/MonthlyHit.png')}" alt="Monats Hit" class="circle-image" />
+        <div class="circle" title="${content.monthlySpecialName || 'Mate Vodka'}">
+            <img src="${content.monthlySpecialImage || '/images/MonthlyHit.png'}" alt="Monats Hit" class="circle-image" />
            <span class="circle-label"></span>
        </div>
-        <div>${this.text(content.monthlySpecialName, 'Mate Vodka')}</div>
+        <div>${content.monthlySpecialName || 'Mate Vodka'}</div>
    </div>

    <p class="note">
-        ${this.text(content.whiskeyText, 'Für Whisky-Liebhaber haben wir erlesene Sorten aus Schottland und Irland im Angebot.')}
+        ${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="${this.text(content.whiskeyImage1, '/images/Whiskey1.png')}" alt="Whiskey 1" class="circle-image" />
+            <img src="${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="${this.text(content.whiskeyImage2, '/images/Whiskey2.png')}" alt="Whiskey 2" class="circle-image" />
+            <img src="${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="${this.text(content.whiskeyImage3, '/images/Whiskey3.png')}" alt="Whiskey 3" class="circle-image" />
+            <img src="${content.whiskeyImage3 || '/images/Whiskey3.png'}" alt="Whiskey 3" class="circle-image" />
            <span class="circle-label"></span>
        </div>
    </div>
@@ -1,94 +1,43 @@
 import simpleGit, { SimpleGit } from 'simple-git';
-import { mkdir, rm, cp } from 'fs/promises';
-import { existsSync } from 'fs';
+import { mkdir, rm } from 'fs/promises';
 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;
-  private parentDir: string;
  private repoUrl: string;
  private token: string;

  constructor() {
    this.workspaceDir = env.GIT_WORKSPACE_DIR;
-    this.parentDir = path.dirname(this.workspaceDir);
    this.repoUrl = env.GIT_REPO_URL;
    this.token = env.GIT_TOKEN;
    this.git = simpleGit();
  }

  async initialize() {
-    // Elternverzeichnis muss existieren - simple-git startet git von dort aus
-    await mkdir(this.parentDir, { recursive: true });
+    // Ensure workspace directory exists
+    await mkdir(this.workspaceDir, { recursive: true });

    // Add token to repo URL for authentication
    const authenticatedUrl = this.repoUrl.replace(
      'https://',
-      `https://oauth2:${encodeURIComponent(this.token)}@`
+      `https://oauth2:${this.token}@`
    );

-    let usable = false;
-
-    if (existsSync(path.join(this.workspaceDir, '.git'))) {
-      try {
-        this.git = simpleGit(this.workspaceDir);
-        await this.git.status();
-        console.log('Repository already exists, pulling latest...');
-        await this.git.pull();
-        usable = true;
-      } catch (error) {
-        // Token aus der Meldung entfernen - git gibt die Remote-URL mit aus
-        const msg = error instanceof Error ? error.message : String(error);
-        console.warn(
-          'Existing workspace unusable, re-cloning:',
-          msg.replace(/\/\/[^@\s/]*@/g, '//***@')
-        );
-      }
-    }
-
-    if (!usable) {
+    try {
+      // Check if repo already exists
+      await this.git.cwd(this.workspaceDir);
+      await this.git.status();
+      console.log('Repository already exists, pulling latest...');
+      await this.git.pull();
+    } catch {
+      // Clone if doesn't exist
      console.log('Cloning repository...');
-
-      // Hochgeladene Dateien liegen im Workspace und wuerden beim Loeschen
-      // verschwinden - vorher wegsichern, nach dem Clone zurueckspielen
-      const backupRoot = path.join(this.parentDir, '.workspace-upload-backup');
-      await rm(backupRoot, { recursive: true, force: 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 });
-
-      // Aus dem existierenden Elternverzeichnis klonen, nicht aus dem
-      // soeben geloeschten Zielverzeichnis (sonst: spawn git ENOENT)
-      this.git = simpleGit(this.parentDir);
      await this.git.clone(authenticatedUrl, this.workspaceDir);
-      this.git = simpleGit(this.workspaceDir);
-
-      for (const relative of saved) {
-        // force: false -> was schon im Repo liegt, bleibt unangetastet
-        await cp(path.join(backupRoot, relative), path.join(this.workspaceDir, relative), {
-          recursive: true,
-          force: false,
-          errorOnExist: false,
-        });
-      }
-
-      await rm(backupRoot, { recursive: true, force: true });
+      await this.git.cwd(this.workspaceDir);
    }

    // Configure git user
@@ -98,14 +47,6 @@ export class GitService {

  async commitAndPush(message: string): Promise<string> {
    await this.git.add('.');
-
-    const status = await this.git.status();
-    if (status.isClean()) {
-      // Nichts zu committen - aktuellen Stand zurueckgeben statt zu scheitern
-      const current = await this.git.log({ maxCount: 1 });
-      return current.latest?.hash || '';
-    }
-
    await this.git.commit(message);
    await this.git.push('origin', 'main');

@@ -118,16 +59,7 @@ export class GitService {
  }

  async reset() {
-    // Nur zuruecksetzen wenn wirklich ein Repo da ist - sonst laeuft git
-    // im Prozess-Arbeitsverzeichnis und raeumt dort auf
-    if (!existsSync(path.join(this.workspaceDir, '.git'))) {
-      return;
-    }
-
-    const git = simpleGit(this.workspaceDir);
-    await git.reset(['--hard', 'HEAD']);
-    // Uploads ausnehmen - die sind noch nicht committed und waeren sonst weg
-    const excludes = UPLOAD_DIRS.flatMap((dir) => ['-e', dir.split(path.sep).join('/')]);
-    await git.clean('f', ['-d', ...excludes]);
+    await this.git.reset(['--hard', 'HEAD']);
+    await this.git.clean('f', ['-d']);
  }
 }
@@ -1,128 +0,0 @@
-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);
-  }
-}
@@ -1,54 +0,0 @@
-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));
-}
@@ -1,161 +0,0 @@
-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;
-}
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="f68ef4028f"><path d="M 47.203125 40 L 322 40 L 322 335 L 47.203125 335 Z M 47.203125 40 " clip-rule="nonzero"/></clipPath></defs><g clip-path="url(#f68ef4028f)"><path fill="#1d6b32" d="M 48.097656 139.574219 C 48.097656 128.285156 48.660156 119.429688 55.417969 109.972656 C 60.960938 102.21875 68.625 96.976562 75.371094 90.4375 C 90.03125 76.242188 102.058594 52.597656 122.386719 45.964844 C 140.441406 40.078125 161.71875 50.683594 170.175781 67.148438 C 174.488281 75.5625 175.570312 84.835938 176.609375 94.097656 C 178.023438 106.769531 179.671875 119.417969 181.199219 132.078125 C 186.097656 127.304688 184.324219 113.089844 184.800781 106.679688 C 185.414062 98.355469 185.589844 89.773438 187.167969 81.554688 C 190.136719 66.023438 202.230469 53.867188 215.535156 46.148438 C 230.378906 37.53125 245.867188 37.894531 259.476562 48.902344 C 265.457031 53.734375 269.027344 59.921875 273.558594 65.980469 C 278.105469 72.058594 283.742188 77.164062 289.878906 81.59375 C 301.03125 89.632812 313.222656 97.105469 314.707031 111.992188 C 315.859375 123.574219 312.664062 136.851562 306.261719 146.585938 C 298.824219 157.886719 283.566406 165.484375 271.140625 169.84375 C 263.703125 172.453125 256.171875 173.589844 248.375 174.402344 C 243.988281 174.855469 239.605469 175.347656 235.230469 175.863281 C 233.320312 176.085938 220.464844 177.1875 222.21875 178.914062 C 223.414062 180.097656 232.449219 178.90625 234.25 178.929688 C 238.816406 178.984375 243.378906 179.058594 247.9375 179.101562 C 258.195312 179.199219 268.472656 179.238281 278.703125 179.984375 C 294.078125 181.101562 308.125 186.960938 316.167969 200.828125 C 324.128906 214.566406 322.324219 235.332031 313.648438 248.554688 C 309.550781 254.800781 302.960938 258.933594 298.382812 264.773438 C 292.863281 271.808594 289.753906 280.417969 284.703125 287.777344 C 277.070312 298.902344 265.578125 308.597656 251.328125 307.664062 C 237.253906 306.738281 223.84375 295.984375 214.992188 285.644531 C 204.679688 273.609375 202.425781 260.40625 198.433594 245.617188 C 197.992188 243.980469 196.5 234.824219 195.105469 234.082031 C 192.15625 232.503906 193.15625 242.25 193.140625 243.652344 C 193.039062 252.289062 193.183594 260.898438 194.160156 269.492188 C 195.984375 285.542969 200.703125 301.367188 211.675781 313.625 C 215.640625 318.050781 226.738281 326.539062 219.757812 333.71875 C 216.042969 337.535156 203.546875 329.980469 199.726562 326.988281 C 169.355469 303.21875 175.738281 257.648438 175.738281 223.953125 C 158.667969 247.144531 172.769531 289.511719 141.984375 304.472656 C 130.417969 310.089844 113.792969 310.679688 102.148438 305.070312 C 88.4375 298.476562 81.277344 282.652344 73.429688 270.453125 C 69.234375 263.933594 63.84375 258.296875 58.707031 252.453125 C 55.953125 249.324219 52.542969 246.261719 50.21875 242.816406 C 47.457031 238.734375 47.503906 233.292969 48.097656 228.109375 C 49.5 215.78125 54.359375 203.136719 63.367188 194.40625 C 72.792969 185.277344 84.792969 181.804688 97.621094 181.160156 C 106.09375 180.734375 114.582031 180.5625 123.0625 180.191406 C 127.40625 180.003906 131.675781 179.730469 135.988281 179.113281 C 141.285156 178.359375 145.921875 177.105469 138.335938 175.230469 C 109.652344 168.167969 59.332031 176.03125 48.097656 139.574219 C 48.097656 135.066406 52.933594 155.265625 48.097656 139.574219 " fill-opacity="1" fill-rule="nonzero"/></g></svg>
@@ -1,40 +0,0 @@
---
-// src/components/Banner.astro
-import "../styles/components/Banner.css"
---
-
-<div id="banner-container"></div>
-
-<script>
-  const API_BASE = 'https://cms.gallus-pub.ch';
-
-  async function loadBanner() {
-    try {
-      const response = await fetch(`${API_BASE}/api/banners/active`);
-      if (response.ok) {
-        const data = await response.json();
-        if (data.banner) {
-          const container = document.getElementById('banner-container');
-          if (container) {
-            container.innerHTML = `
-              <div class="banner-wrapper">
-                <div class="banner container">
-                  <p>${data.banner.text}</p>
-                </div>
-              </div>
-            `;
-          }
-        }
-      }
-    } catch (error) {
-      console.error('Failed to fetch banner:', error);
-    }
-  }
-
-  // Load banner when DOM is ready
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', loadBanner);
-  } else {
-    loadBanner();
-  }
-</script>
@@ -7,7 +7,8 @@ const { id } = Astro.props;
    <h2 class="title">Drinks</h2>

    <p class="note">
-        Ob frisch gezapftes Pint, edler Whisky oder ein gemütliches Glas Wein – bei uns genießt du das Leben in entspannter Atmosphäre. Auch Cocktails dürfen nicht fehlen: Vieles kreieren wir selbst. Sláinte!
+        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. Natürlich dürfen auch Cocktails nicht fehlen. Vieles kreieren wir auch selber - Sláinte!
    </p>

    <a href="/pdf/Getraenke_Gallus_2025.pdf" class="card-link" target="_blank" rel="noopener noreferrer">Getränkekarte</a>
@@ -15,7 +15,6 @@ import "../styles/index.css"

 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<link rel="icon" type="image/svg+xml" href="/logo.svg" />
 		<title>Gallus Pub</title>
 	</head>

@@ -13,32 +13,41 @@ const { id } = Astro.props;
 		<h2>Gallus Pub!</h2>

 		<p>
-			Bei uns ist jede*r willkommen – ob jung oder alt, Rocker, Nerd, Meerjungfrau oder einfach du selbst. Unsere Türen stehen allen offen, die Spass und gute Gesellschaft suchen.
+			Wie die meisten bereits wissen, ist hier jeder willkommen - ob jung
+			oder alt, Rocker, Elf, Nerd, Meerjungfrau oder einfach nur du
+			selbst. Unsere Türen stehen offen für alle, die Spass haben wollen
+			und gute Gesellschaft suchen!
 		</p>
-		<br />
+
 		<p><b>Unsere Highlights:</b></p>

 		<ul>
 			<li>
-				<b>Karaoke:</b> Von Mittwoch bis Samstag kannst du auf zwei Stockwerken deine Stimme zum Besten geben – ganz ohne Perfektionsdruck, Hauptsache Spass. Du singst lieber im kleinen Rahmen?
-				Dann kannst du den Sangallerruum im 2.OG auch privat mieten.
+				<b>Karaoke:</b> Von Mittwoch bis Samstag kannst du deine
+				Stimme auf zwei Stockwerken zum Besten geben. Keine Sorge, es geht
+				nicht darum, perfekt zu sein, sondern einfach Spass zu haben! Du singst
+				gerne, aber lieber für dich? Dann kannst du den 2. OG auch privat
+				mieten.
 			</li>

 			<li>
-				<b>Pub Quiz:</b> Jeden Freitag ab 20:00 Uhr testet ihr euer Wissen in mehreren Runden. Jede Woche warten ein neues Thema und ein neuer Sieger der Herzen.
+				<b>Pub Quiz:</b> Jeden Freitag ab 20:00 Uhr testet ihr
+				euer Wissen in verschiedenen Runden. Jede Woche gibt es ein neues
+				Thema und einen neuen Champion.
 			</li>

 			<li>
-				<b>Getränke:</b> Geniesst frisches Guinness, Smithwick’s, Gallus Old Style Ale, leckere Cocktails und ausgewählte Whiskys aus Schottland und Irland.
+				<b>Getränke:</b> Geniesst frisches Guinness, Smithwicks,
+				Gallus Old Style Ale und unsere leckeren Cocktails. Für Whisky-Liebhaber
+				haben wir erlesene Sorten aus Schottland und Irland im Angebot.
 			</li>
 		</ul>

 		<p>
-			Wir freuen uns, euch bald bei uns zu begrüssen – auf viele unvergessliche Abende!
-		</p>
-		<p>
-			Sabrina & Raphael
+			Wir freuen uns darauf, euch bald bei uns begrüssen zu können! Lasst
+			uns gemeinsam unvergessliche Abende feiern. - Sabrina & Raphael
 		</p>
+
 	</div>


@@ -1,11 +1,9 @@
 ---
 import Layout from "../components/Layout.astro";
-import Banner from "../components/Banner.astro";
 ---

 <Layout>
-	<Banner />
-
+	
 	<h1>Gallery</h1>

 	<p>Hier findest du alle aktuellen und kommenden Gallery im Gallus Pub.</p>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="f68ef4028f"><path d="M 47.203125 40 L 322 40 L 322 335 L 47.203125 335 Z M 47.203125 40 " clip-rule="nonzero"/></clipPath></defs><g clip-path="url(#f68ef4028f)"><path fill="#1d6b32" d="M 48.097656 139.574219 C 48.097656 128.285156 48.660156 119.429688 55.417969 109.972656 C 60.960938 102.21875 68.625 96.976562 75.371094 90.4375 C 90.03125 76.242188 102.058594 52.597656 122.386719 45.964844 C 140.441406 40.078125 161.71875 50.683594 170.175781 67.148438 C 174.488281 75.5625 175.570312 84.835938 176.609375 94.097656 C 178.023438 106.769531 179.671875 119.417969 181.199219 132.078125 C 186.097656 127.304688 184.324219 113.089844 184.800781 106.679688 C 185.414062 98.355469 185.589844 89.773438 187.167969 81.554688 C 190.136719 66.023438 202.230469 53.867188 215.535156 46.148438 C 230.378906 37.53125 245.867188 37.894531 259.476562 48.902344 C 265.457031 53.734375 269.027344 59.921875 273.558594 65.980469 C 278.105469 72.058594 283.742188 77.164062 289.878906 81.59375 C 301.03125 89.632812 313.222656 97.105469 314.707031 111.992188 C 315.859375 123.574219 312.664062 136.851562 306.261719 146.585938 C 298.824219 157.886719 283.566406 165.484375 271.140625 169.84375 C 263.703125 172.453125 256.171875 173.589844 248.375 174.402344 C 243.988281 174.855469 239.605469 175.347656 235.230469 175.863281 C 233.320312 176.085938 220.464844 177.1875 222.21875 178.914062 C 223.414062 180.097656 232.449219 178.90625 234.25 178.929688 C 238.816406 178.984375 243.378906 179.058594 247.9375 179.101562 C 258.195312 179.199219 268.472656 179.238281 278.703125 179.984375 C 294.078125 181.101562 308.125 186.960938 316.167969 200.828125 C 324.128906 214.566406 322.324219 235.332031 313.648438 248.554688 C 309.550781 254.800781 302.960938 258.933594 298.382812 264.773438 C 292.863281 271.808594 289.753906 280.417969 284.703125 287.777344 C 277.070312 298.902344 265.578125 308.597656 251.328125 307.664062 C 237.253906 306.738281 223.84375 295.984375 214.992188 285.644531 C 204.679688 273.609375 202.425781 260.40625 198.433594 245.617188 C 197.992188 243.980469 196.5 234.824219 195.105469 234.082031 C 192.15625 232.503906 193.15625 242.25 193.140625 243.652344 C 193.039062 252.289062 193.183594 260.898438 194.160156 269.492188 C 195.984375 285.542969 200.703125 301.367188 211.675781 313.625 C 215.640625 318.050781 226.738281 326.539062 219.757812 333.71875 C 216.042969 337.535156 203.546875 329.980469 199.726562 326.988281 C 169.355469 303.21875 175.738281 257.648438 175.738281 223.953125 C 158.667969 247.144531 172.769531 289.511719 141.984375 304.472656 C 130.417969 310.089844 113.792969 310.679688 102.148438 305.070312 C 88.4375 298.476562 81.277344 282.652344 73.429688 270.453125 C 69.234375 263.933594 63.84375 258.296875 58.707031 252.453125 C 55.953125 249.324219 52.542969 246.261719 50.21875 242.816406 C 47.457031 238.734375 47.503906 233.292969 48.097656 228.109375 C 49.5 215.78125 54.359375 203.136719 63.367188 194.40625 C 72.792969 185.277344 84.792969 181.804688 97.621094 181.160156 C 106.09375 180.734375 114.582031 180.5625 123.0625 180.191406 C 127.40625 180.003906 131.675781 179.730469 135.988281 179.113281 C 141.285156 178.359375 145.921875 177.105469 138.335938 175.230469 C 109.652344 168.167969 59.332031 176.03125 48.097656 139.574219 C 48.097656 135.066406 52.933594 155.265625 48.097656 139.574219 " fill-opacity="1" fill-rule="nonzero"/></g></svg>