Compare commits
1
Commits
1a7a4f8a02
..
dev_2
| Author | SHA1 | Date | |
|---|---|---|---|
 Kenzo
|
6eea814fad |
@@ -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
|
|
||||||
+2
-218
@@ -1,125 +1,4 @@
|
|||||||
steps:
|
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:
|
deploy_frontend:
|
||||||
image: node:20
|
image: node:20
|
||||||
environment:
|
environment:
|
||||||
@@ -130,100 +9,5 @@ steps:
|
|||||||
- export PATH="$HOME/.fly/bin:$PATH"
|
- export PATH="$HOME/.fly/bin:$PATH"
|
||||||
- flyctl deploy --config fly.toml --app gallus-pub --remote-only
|
- flyctl deploy --config fly.toml --app gallus-pub --remote-only
|
||||||
when:
|
when:
|
||||||
- branch: main
|
branch: main
|
||||||
event: push
|
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
|
|
||||||
@@ -5,6 +5,9 @@ COPY package*.json ./
|
|||||||
# Fallback to npm install if no lockfile is present
|
# Fallback to npm install if no lockfile is present
|
||||||
RUN npm ci || npm install
|
RUN npm ci || npm install
|
||||||
COPY . .
|
COPY . .
|
||||||
|
# Ensure CSS variables are present
|
||||||
|
RUN mkdir -p public/styles
|
||||||
|
RUN cp -r styles/* public/styles/ || true
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM node:20-alpine AS production
|
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
|
||||||
+18
-20
@@ -1,46 +1,44 @@
|
|||||||
# Multi-stage build for Gallus CMS Backend
|
# Multi-stage build for Gallus CMS Backend
|
||||||
|
|
||||||
# Stage 1: Builder
|
# 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
|
FROM node:20-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Nur fuer better-sqlite3 - fuer musl gibt es davon keine Fertigbauten.
|
# Install build dependencies for native modules (better-sqlite3)
|
||||||
# sharp ab 0.33 bringt eigene Binaries samt libvips mit, vips-dev wird
|
|
||||||
# dadurch nicht mehr gebraucht.
|
|
||||||
RUN apk add --no-cache python3 make g++
|
RUN apk add --no-cache python3 make g++
|
||||||
|
|
||||||
# Eigener Layer: bleibt im Cache, solange sich das Lockfile nicht aendert
|
# Install dependencies
|
||||||
COPY package*.json ./
|
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 . .
|
COPY . .
|
||||||
|
|
||||||
|
# Build TypeScript
|
||||||
RUN npm run build
|
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
|
# Stage 2: Production
|
||||||
FROM node:20-alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# git fuer simple-git, sqlite fuer die CLI. Keine Build-Werkzeuge mehr -
|
# Install runtime dependencies (git for simple-git, sqlite3 CLI tool)
|
||||||
# die blieben vorher als Layer im Image liegen, auch nach dem apk del.
|
|
||||||
RUN apk add --no-cache git sqlite
|
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/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
|
# Copy built files from builder
|
||||||
RUN mkdir -p /app/workspace /app/data && chown -R node:node /app
|
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
|
# Switch to non-root user
|
||||||
USER node
|
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)})"
|
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
|
# 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"]
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ primary_region = "ams"
|
|||||||
GIT_WORKSPACE_DIR = "/app/data/workspace"
|
GIT_WORKSPACE_DIR = "/app/data/workspace"
|
||||||
# Cross-site frontend and OAuth
|
# Cross-site frontend and OAuth
|
||||||
FRONTEND_URL = "https://gallus-pub.ch"
|
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"
|
GITEA_REDIRECT_URI = "https://cms.gallus-pub.ch/api/auth/callback"
|
||||||
|
|
||||||
[http_service]
|
[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);
|
|
||||||
});
|
|
||||||
Generated
-4083
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,7 @@
|
|||||||
import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
|
import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
|
||||||
import { sql } from 'drizzle-orm';
|
import { sql } from 'drizzle-orm';
|
||||||
|
|
||||||
|
// Users table - stores Gitea user info for audit and access control
|
||||||
export const users = sqliteTable('users', {
|
export const users = sqliteTable('users', {
|
||||||
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
||||||
giteaId: text('gitea_id').notNull().unique(),
|
giteaId: text('gitea_id').notNull().unique(),
|
||||||
@@ -59,14 +60,3 @@ export const publishHistory = sqliteTable('publish_history', {
|
|||||||
commitMessage: text('commit_message'),
|
commitMessage: text('commit_message'),
|
||||||
publishedAt: integer('published_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
publishedAt: integer('published_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())`),
|
|
||||||
});
|
|
||||||
|
|||||||
+1
-44
@@ -8,7 +8,6 @@ import { env, validateEnv } from './config/env.js';
|
|||||||
import { db, initDatabase } from './config/database.js';
|
import { db, initDatabase } from './config/database.js';
|
||||||
import fastifyStatic from '@fastify/static';
|
import fastifyStatic from '@fastify/static';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import fs from 'fs';
|
|
||||||
|
|
||||||
// Import routes
|
// Import routes
|
||||||
import authRoute from './routes/auth.js';
|
import authRoute from './routes/auth.js';
|
||||||
@@ -17,8 +16,6 @@ import galleryRoute from './routes/gallery.js';
|
|||||||
import contentRoute from './routes/content.js';
|
import contentRoute from './routes/content.js';
|
||||||
import settingsRoute from './routes/settings.js';
|
import settingsRoute from './routes/settings.js';
|
||||||
import publishRoute from './routes/publish.js';
|
import publishRoute from './routes/publish.js';
|
||||||
import bannersRoute from './routes/banners.js';
|
|
||||||
import pdfRoute from './routes/pdf.js';
|
|
||||||
|
|
||||||
// Validate environment variables
|
// Validate environment variables
|
||||||
try {
|
try {
|
||||||
@@ -42,24 +39,8 @@ const fastify = Fastify({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Register plugins
|
// Register plugins
|
||||||
// Support multiple origins for CORS
|
|
||||||
const allowedOrigins = env.CORS_ORIGIN.split(',').map(o => o.trim());
|
|
||||||
fastify.register(cors, {
|
fastify.register(cors, {
|
||||||
origin: (origin, cb) => {
|
origin: env.CORS_ORIGIN,
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
credentials: true,
|
credentials: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -81,34 +62,12 @@ fastify.register(multipart, {
|
|||||||
|
|
||||||
// Serve static files (uploaded images, etc.) from persistent volume
|
// Serve static files (uploaded images, etc.) from persistent volume
|
||||||
const dataDir = env.GIT_WORKSPACE_DIR || path.join(process.cwd(), 'data');
|
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, {
|
fastify.register(fastifyStatic, {
|
||||||
root: dataDir,
|
root: dataDir,
|
||||||
prefix: '/static/',
|
prefix: '/static/',
|
||||||
decorateReply: false
|
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
|
// Decorate fastify with authenticate method
|
||||||
fastify.decorate('authenticate', authenticate);
|
fastify.decorate('authenticate', authenticate);
|
||||||
|
|
||||||
@@ -119,8 +78,6 @@ fastify.register(galleryRoute, { prefix: '/api' });
|
|||||||
fastify.register(contentRoute, { prefix: '/api' });
|
fastify.register(contentRoute, { prefix: '/api' });
|
||||||
fastify.register(settingsRoute, { prefix: '/api' });
|
fastify.register(settingsRoute, { prefix: '/api' });
|
||||||
fastify.register(publishRoute, { prefix: '/api' });
|
fastify.register(publishRoute, { prefix: '/api' });
|
||||||
fastify.register(bannersRoute, { prefix: '/api' });
|
|
||||||
fastify.register(pdfRoute, { prefix: '/api' });
|
|
||||||
|
|
||||||
// Health check
|
// Health check
|
||||||
fastify.get('/health', async () => {
|
fastify.get('/health', async () => {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { eq } from 'drizzle-orm';
|
|||||||
import { GiteaService } from '../services/gitea.service.js';
|
import { GiteaService } from '../services/gitea.service.js';
|
||||||
import { env } from '../config/env.js';
|
import { env } from '../config/env.js';
|
||||||
|
|
||||||
|
// Use explicit JSON schema for Fastify route validation to avoid provider issues
|
||||||
const callbackQueryJsonSchema = {
|
const callbackQueryJsonSchema = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
required: ['code', 'state'],
|
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 { db } from '../config/database.js';
|
||||||
import { contentSections } from '../db/schema.js';
|
import { contentSections } from '../db/schema.js';
|
||||||
import { eq } from 'drizzle-orm';
|
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
|
// Fastify JSON schema for content section body
|
||||||
const contentBodyJsonSchema = {
|
const contentBodyJsonSchema = {
|
||||||
@@ -80,20 +78,6 @@ const contentRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
.returning();
|
.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 {
|
return {
|
||||||
section: result.sectionName,
|
section: result.sectionName,
|
||||||
content: result.contentJson,
|
content: result.contentJson,
|
||||||
@@ -101,34 +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 saved = await saveUploadedImage(file, 'content', 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
|
// List all content sections
|
||||||
fastify.get('/content', {
|
fastify.get('/content', {
|
||||||
preHandler: [fastify.authenticate],
|
preHandler: [fastify.authenticate],
|
||||||
|
|||||||
@@ -2,19 +2,6 @@ import { FastifyPluginAsync } from 'fastify';
|
|||||||
import { db } from '../config/database.js';
|
import { db } from '../config/database.js';
|
||||||
import { events } from '../db/schema.js';
|
import { events } from '../db/schema.js';
|
||||||
import { eq } from 'drizzle-orm';
|
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
|
// Fastify JSON schema for event body
|
||||||
const eventBodyJsonSchema = {
|
const eventBodyJsonSchema = {
|
||||||
@@ -82,58 +69,16 @@ const eventsRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
fastify.put('/events/:id', { schema: { body: eventBodyJsonSchema }, preHandler: [fastify.authenticate] }, async (request, reply) => {
|
fastify.put('/events/:id', { schema: { body: eventBodyJsonSchema }, preHandler: [fastify.authenticate] }, async (request, reply) => {
|
||||||
const { id } = request.params as { id: string };
|
const { id } = request.params as { id: string };
|
||||||
const data = request.body as any;
|
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();
|
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' });
|
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 };
|
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' });
|
|
||||||
}
|
|
||||||
|
|
||||||
const saved = await saveUploadedImage(file, 'events', 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
|
// Delete event
|
||||||
fastify.delete('/events/:id', { preHandler: [fastify.authenticate] }, async (request, reply) => {
|
fastify.delete('/events/:id', { preHandler: [fastify.authenticate] }, async (request, reply) => {
|
||||||
const { id } = request.params as { id: string };
|
const { id } = request.params as { id: string };
|
||||||
const [row] = await db.delete(events).where(eq(events.id, id)).returning();
|
const [row] = await db.delete(events).where(eq(events.id, id)).returning();
|
||||||
if (!row) return reply.code(404).send({ error: 'Event not found' });
|
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' };
|
return { message: 'Event deleted successfully' };
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,19 +3,9 @@ import { z } from 'zod';
|
|||||||
import { db } from '../config/database.js';
|
import { db } from '../config/database.js';
|
||||||
import { galleryImages } from '../db/schema.js';
|
import { galleryImages } from '../db/schema.js';
|
||||||
import { eq } from 'drizzle-orm';
|
import { eq } from 'drizzle-orm';
|
||||||
import { dropImageIfUnused } from '../services/image-refs.service.js';
|
import fs from 'fs';
|
||||||
import { saveUploadedImage } from '../services/upload.service.js';
|
import path from 'path';
|
||||||
|
import sharp from 'sharp';
|
||||||
/** Raeumt eine Bilddatei weg, ohne dass ein Fehler die Antwort kippt. */
|
|
||||||
async function dropUnusedImage(fastify: any, url: string | null | undefined, reason: string) {
|
|
||||||
try {
|
|
||||||
if (await dropImageIfUnused(url)) {
|
|
||||||
fastify.log.info(`Removed ${reason} ${url}`);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
fastify.log.warn({ err }, `Could not remove ${reason}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fastify JSON schema for gallery image body
|
// Fastify JSON schema for gallery image body
|
||||||
const galleryBodyJsonSchema = {
|
const galleryBodyJsonSchema = {
|
||||||
@@ -95,22 +85,57 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
return reply.code(400).send({ error: 'Only image uploads are allowed' });
|
return reply.code(400).send({ error: 'Only image uploads are allowed' });
|
||||||
}
|
}
|
||||||
|
|
||||||
const saved = await saveUploadedImage(file, 'gallery', 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)
|
// Store in DB (optional but useful)
|
||||||
const [row] = await db.insert(galleryImages).values({
|
const [row] = await db.insert(galleryImages).values({
|
||||||
imageUrl: saved.imageUrl,
|
imageUrl: publicUrl,
|
||||||
altText: altText || saved.filename,
|
altText: altText || filename,
|
||||||
displayOrder,
|
displayOrder,
|
||||||
isPublished: true,
|
isPublished: true,
|
||||||
}).returning();
|
}).returning();
|
||||||
|
|
||||||
return reply.code(201).send({ image: row });
|
return reply.code(201).send({ image: row });
|
||||||
|
|
||||||
} catch (err: any) {
|
} catch (err) {
|
||||||
if (err?.statusCode === 413) {
|
|
||||||
return reply.code(413).send({ error: err.message });
|
|
||||||
}
|
|
||||||
fastify.log.error({ err }, 'Upload failed');
|
fastify.log.error({ err }, 'Upload failed');
|
||||||
return reply.code(500).send({ error: 'Failed to upload image' });
|
return reply.code(500).send({ error: 'Failed to upload image' });
|
||||||
}
|
}
|
||||||
@@ -126,8 +151,6 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
const { id } = request.params as { id: string };
|
const { id } = request.params as { id: string };
|
||||||
const data = request.body as any;
|
const data = request.body as any;
|
||||||
|
|
||||||
const [previous] = await db.select().from(galleryImages).where(eq(galleryImages.id, id)).limit(1);
|
|
||||||
|
|
||||||
const [updated] = await db
|
const [updated] = await db
|
||||||
.update(galleryImages)
|
.update(galleryImages)
|
||||||
.set(data)
|
.set(data)
|
||||||
@@ -138,11 +161,6 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
return reply.code(404).send({ error: 'Image not found' });
|
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 };
|
return { image: updated };
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -161,9 +179,6 @@ const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
return reply.code(404).send({ error: 'Image not found' });
|
return reply.code(404).send({ error: 'Image not found' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Zugehoerige Bilddatei mitnehmen
|
|
||||||
await dropUnusedImage(fastify, deleted.imageUrl, 'gallery image');
|
|
||||||
|
|
||||||
return { message: 'Image deleted successfully' };
|
return { message: 'Image deleted successfully' };
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,132 +0,0 @@
|
|||||||
import { FastifyPluginAsync } from 'fastify';
|
|
||||||
import fs from 'fs';
|
|
||||||
import path from 'path';
|
|
||||||
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 { 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 uploadDir = path.join(env.GIT_WORKSPACE_DIR, 'public', 'pdf');
|
|
||||||
fs.mkdirSync(uploadDir, { recursive: true });
|
|
||||||
|
|
||||||
const stamp = Date.now().toString(36);
|
|
||||||
const rand = Math.random().toString(36).slice(2, 8);
|
|
||||||
const filename = `${stamp}-${rand}.pdf`;
|
|
||||||
fs.writeFileSync(path.join(uploadDir, filename), buffer);
|
|
||||||
|
|
||||||
const pdfUrl = `/pdf/${filename}`;
|
|
||||||
|
|
||||||
// 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) {
|
|
||||||
try {
|
|
||||||
if (assets.deletePdf(previousUrl)) {
|
|
||||||
fastify.log.info(`Removed replaced PDF ${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,8 +2,6 @@ import { FastifyPluginAsync } from 'fastify';
|
|||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
import { GitService } from '../services/git.service.js';
|
import { GitService } from '../services/git.service.js';
|
||||||
import { FileGeneratorService } from '../services/file-generator.service.js';
|
import { FileGeneratorService } from '../services/file-generator.service.js';
|
||||||
import { AssetService } from '../services/asset.service.js';
|
|
||||||
import { collectReferencedImageUrls } from '../services/image-refs.service.js';
|
|
||||||
import { db } from '../config/database.js';
|
import { db } from '../config/database.js';
|
||||||
import { events, galleryImages, contentSections, publishHistory } from '../db/schema.js';
|
import { events, galleryImages, contentSections, publishHistory } from '../db/schema.js';
|
||||||
import { eq } from 'drizzle-orm';
|
import { eq } from 'drizzle-orm';
|
||||||
@@ -36,17 +34,6 @@ const publishRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
|
|
||||||
fastify.log.info('Git repository initialized');
|
fastify.log.info('Git repository initialized');
|
||||||
|
|
||||||
// Verwaiste Uploads entfernen, bevor committet wird. Die Referenzliste
|
|
||||||
// deckt bewusst alle Zeilen ab, auch unveroeffentlichte, und zusaetzlich
|
|
||||||
// die Bildpfade aus den Textbereichen.
|
|
||||||
const assetService = new AssetService();
|
|
||||||
const referencedImages = await collectReferencedImageUrls();
|
|
||||||
const removedImages = assetService.sweepOrphanedImages([...referencedImages]);
|
|
||||||
|
|
||||||
if (removedImages.length > 0) {
|
|
||||||
fastify.log.info(`Removed ${removedImages.length} orphaned image(s): ${removedImages.join(', ')}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch all content from database
|
// Fetch all content from database
|
||||||
const eventsData = await db
|
const eventsData = await db
|
||||||
.select()
|
.select()
|
||||||
@@ -91,23 +78,16 @@ const publishRoute: FastifyPluginAsync = async (fastify) => {
|
|||||||
|
|
||||||
fastify.log.info(`Changes committed: ${commitHash}`);
|
fastify.log.info(`Changes committed: ${commitHash}`);
|
||||||
|
|
||||||
// Record in history. Der Push ist an dieser Stelle bereits durch -
|
// Record in history
|
||||||
// ein Fehler im Protokoll darf die Veroeffentlichung nicht als
|
await db.insert(publishHistory).values({
|
||||||
// gescheitert melden und den Workspace zuruecksetzen.
|
userId,
|
||||||
try {
|
commitHash,
|
||||||
await db.insert(publishHistory).values({
|
commitMessage,
|
||||||
userId,
|
});
|
||||||
commitHash,
|
|
||||||
commitMessage,
|
|
||||||
});
|
|
||||||
} catch (historyError) {
|
|
||||||
fastify.log.warn({ err: historyError }, 'Could not record publish history');
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
commitHash,
|
commitHash,
|
||||||
removedImages: removedImages.length,
|
|
||||||
message: 'Changes published successfully',
|
message: 'Changes published successfully',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
import fs from 'fs';
|
|
||||||
import path from 'path';
|
|
||||||
import { env } from '../config/env.js';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Verwaltet die Dateien, die das CMS in den Git-Workspace schreibt.
|
|
||||||
*
|
|
||||||
* Grundregel: geloescht wird ausschliesslich, was das CMS selbst angelegt hat.
|
|
||||||
* Uploads bekommen den Namen <base36-zeitstempel>-<6 zufaellige zeichen>.<ext>
|
|
||||||
* (siehe events.ts / gallery.ts). Handgepflegte Assets aus dem Repo heissen
|
|
||||||
* anders - event_karaoke.jpg, Welcome.png, Gallery1.webp - und werden dadurch
|
|
||||||
* nie angefasst, auch wenn sie in keinem Datensatz mehr vorkommen.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Unterordner unterhalb von public/, in denen das CMS aufraeumen darf
|
|
||||||
const MANAGED_IMAGE_DIRS = ['images/events', 'images/gallery', 'images/content'];
|
|
||||||
const MANAGED_PDF_DIR = 'pdf';
|
|
||||||
|
|
||||||
// Namensmuster der CMS-Uploads
|
|
||||||
const GENERATED_NAME = /^[a-z0-9]{6,14}-[a-z0-9]{6}\.[a-z0-9]{2,5}$/i;
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pfad einer Datei, die das CMS loeschen darf.
|
|
||||||
* Liefert null fuer fremde Pfade und fuer handgepflegte Dateien.
|
|
||||||
*/
|
|
||||||
resolveDeletable(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('/');
|
|
||||||
if (!dirs.includes(dir)) return null;
|
|
||||||
|
|
||||||
if (!GENERATED_NAME.test(path.basename(absolute))) return null;
|
|
||||||
|
|
||||||
return absolute;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Loescht ein hochgeladenes Bild. Gibt zurueck, ob wirklich etwas weg ist. */
|
|
||||||
deleteImage(url: string): boolean {
|
|
||||||
return this.unlink(this.resolveDeletable(url, MANAGED_IMAGE_DIRS));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Loescht ein hochgeladenes PDF. */
|
|
||||||
deletePdf(url: string): boolean {
|
|
||||||
return this.unlink(this.resolveDeletable(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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Entfernt alle hochgeladenen Bilder, die in keiner der uebergebenen URLs
|
|
||||||
* mehr vorkommen. Die Liste muss ALLE Datensaetze abdecken, auch
|
|
||||||
* unveroeffentlichte - sonst verlieren die ihr Bild.
|
|
||||||
*/
|
|
||||||
sweepOrphanedImages(referencedUrls: string[]): string[] {
|
|
||||||
const keep = new Set<string>();
|
|
||||||
for (const url of referencedUrls) {
|
|
||||||
const absolute = this.resolveInPublic(url);
|
|
||||||
if (absolute) keep.add(absolute);
|
|
||||||
}
|
|
||||||
|
|
||||||
const removed: 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 (!GENERATED_NAME.test(name)) continue;
|
|
||||||
if (keep.has(absolute)) continue;
|
|
||||||
if (!fs.statSync(absolute).isFile()) continue;
|
|
||||||
|
|
||||||
fs.unlinkSync(absolute);
|
|
||||||
removed.push('/' + dir + '/' + name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return removed;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -27,27 +27,6 @@ export class FileGeneratorService {
|
|||||||
return str.replace(/`/g, '\\`').replace(/\${/g, '\\${');
|
return str.replace(/`/g, '\\`').replace(/\${/g, '\\${');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Texte aus dem Adminbereich landen direkt im Astro-Markup. Ohne Maskierung
|
|
||||||
* reicht ein "<" oder "&" in einem Feld, damit der Build der Seite scheitert
|
|
||||||
* und der Deploy stehen bleibt.
|
|
||||||
*/
|
|
||||||
escapeHtml(value: any): string {
|
|
||||||
if (value === undefined || value === null) return '';
|
|
||||||
return String(value)
|
|
||||||
.replace(/&/g, '&')
|
|
||||||
.replace(/</g, '<')
|
|
||||||
.replace(/>/g, '>')
|
|
||||||
.replace(/"/g, '"')
|
|
||||||
.replace(/'/g, ''');
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Wie escapeHtml, aber mit Rueckfallwert wenn nichts gesetzt ist. */
|
|
||||||
text(value: any, fallback = ''): string {
|
|
||||||
const raw = value === undefined || value === null || value === '' ? fallback : value;
|
|
||||||
return this.escapeHtml(raw);
|
|
||||||
}
|
|
||||||
|
|
||||||
generateIndexAstro(events: Event[], images: GalleryImage[]): string {
|
generateIndexAstro(events: Event[], images: GalleryImage[]): string {
|
||||||
const eventsCode = events.map(e => `\t{
|
const eventsCode = events.map(e => `\t{
|
||||||
\t\timage: "${e.imageUrl}",
|
\t\timage: "${e.imageUrl}",
|
||||||
@@ -64,7 +43,6 @@ export class FileGeneratorService {
|
|||||||
|
|
||||||
return `---
|
return `---
|
||||||
import Layout from "../components/Layout.astro";
|
import Layout from "../components/Layout.astro";
|
||||||
import Banner from "../components/Banner.astro";
|
|
||||||
import Hero from "../components/Hero.astro";
|
import Hero from "../components/Hero.astro";
|
||||||
import Welcome from "../components/Welcome.astro";
|
import Welcome from "../components/Welcome.astro";
|
||||||
import EventsGrid from "../components/EventsGrid.astro";
|
import EventsGrid from "../components/EventsGrid.astro";
|
||||||
@@ -84,7 +62,6 @@ ${imagesCode}
|
|||||||
|
|
||||||
<Layout>
|
<Layout>
|
||||||
\t<Hero id="hero" />
|
\t<Hero id="hero" />
|
||||||
\t<Banner />
|
|
||||||
\t<Welcome id="welcome" />
|
\t<Welcome id="welcome" />
|
||||||
\t<EventsGrid id="events" events={events} />
|
\t<EventsGrid id="events" events={events} />
|
||||||
\t<ImageCarousel id="gallery" images={images} />
|
\t<ImageCarousel id="gallery" images={images} />
|
||||||
@@ -107,9 +84,9 @@ const { id } = Astro.props;
|
|||||||
|
|
||||||
\t\t<div class="hero-content">
|
\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\t<a href="#" class="button">Aktuelles ↓</a>
|
||||||
\t\t</div>
|
\t\t</div>
|
||||||
@@ -126,7 +103,7 @@ const { id } = Astro.props;
|
|||||||
|
|
||||||
generateWelcomeComponent(content: ContentSection): string {
|
generateWelcomeComponent(content: ContentSection): string {
|
||||||
const highlightsList = (content.highlights || []).map((h: any) =>
|
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');
|
).join('\n\n');
|
||||||
|
|
||||||
return `---
|
return `---
|
||||||
@@ -140,11 +117,11 @@ const { id } = Astro.props;
|
|||||||
|
|
||||||
\t<div class="welcome-text">
|
\t<div class="welcome-text">
|
||||||
|
|
||||||
\t\t<h2>${this.text(content.heading1, 'Herzlich willkommen im')}</h2>
|
\t\t<h2>${content.heading1 || 'Herzlich willkommen im'}</h2>
|
||||||
\t\t<h2>${this.text(content.heading2, 'Gallus Pub!')}</h2>
|
\t\t<h2>${content.heading2 || 'Gallus Pub!'}</h2>
|
||||||
|
|
||||||
\t\t<p>
|
\t\t<p>
|
||||||
\t\t\t${this.text(content.introText)}
|
\t\t\t${content.introText || ''}
|
||||||
\t\t</p>
|
\t\t</p>
|
||||||
|
|
||||||
\t\t<p><b>Unsere Highlights:</b></p>
|
\t\t<p><b>Unsere Highlights:</b></p>
|
||||||
@@ -154,14 +131,14 @@ ${highlightsList}
|
|||||||
\t\t</ul>
|
\t\t</ul>
|
||||||
|
|
||||||
\t\t<p>
|
\t\t<p>
|
||||||
\t\t\t${this.text(content.closingText)}
|
\t\t\t${content.closingText || ''}
|
||||||
\t\t</p>
|
\t\t</p>
|
||||||
|
|
||||||
\t</div>
|
\t</div>
|
||||||
|
|
||||||
|
|
||||||
\t<div class="welcome-image">
|
\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>
|
\t</div>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
@@ -178,36 +155,36 @@ const { id } = Astro.props;
|
|||||||
<h2 class="title">Drinks</h2>
|
<h2 class="title">Drinks</h2>
|
||||||
|
|
||||||
<p class="note">
|
<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>
|
</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>
|
<h3 class="monats-hit">Monats Hit</h3>
|
||||||
|
|
||||||
<div class="mate-vodka">
|
<div class="mate-vodka">
|
||||||
<div class="circle" title="${this.text(content.monthlySpecialName, 'Mate Vodka')}">
|
<div class="circle" title="${content.monthlySpecialName || 'Mate Vodka'}">
|
||||||
<img src="${this.text(content.monthlySpecialImage, '/images/MonthlyHit.png')}" alt="Monats Hit" class="circle-image" />
|
<img src="${content.monthlySpecialImage || '/images/MonthlyHit.png'}" alt="Monats Hit" class="circle-image" />
|
||||||
<span class="circle-label"></span>
|
<span class="circle-label"></span>
|
||||||
</div>
|
</div>
|
||||||
<div>${this.text(content.monthlySpecialName, 'Mate Vodka')}</div>
|
<div>${content.monthlySpecialName || 'Mate Vodka'}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p class="note">
|
<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>
|
</p>
|
||||||
|
|
||||||
<div class="circle-row">
|
<div class="circle-row">
|
||||||
<div class="circle whiskey-circle" title="Whiskey 1">
|
<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>
|
<span class="circle-label"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="circle whiskey-circle" title="Whiskey 2">
|
<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>
|
<span class="circle-label"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="circle whiskey-circle" title="Whiskey 3">
|
<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>
|
<span class="circle-label"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,94 +1,43 @@
|
|||||||
import simpleGit, { SimpleGit } from 'simple-git';
|
import simpleGit, { SimpleGit } from 'simple-git';
|
||||||
import { mkdir, rm, cp } from 'fs/promises';
|
import { mkdir, rm } from 'fs/promises';
|
||||||
import { existsSync } from 'fs';
|
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { env } from '../config/env.js';
|
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 {
|
export class GitService {
|
||||||
private git: SimpleGit;
|
private git: SimpleGit;
|
||||||
private workspaceDir: string;
|
private workspaceDir: string;
|
||||||
private parentDir: string;
|
|
||||||
private repoUrl: string;
|
private repoUrl: string;
|
||||||
private token: string;
|
private token: string;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.workspaceDir = env.GIT_WORKSPACE_DIR;
|
this.workspaceDir = env.GIT_WORKSPACE_DIR;
|
||||||
this.parentDir = path.dirname(this.workspaceDir);
|
|
||||||
this.repoUrl = env.GIT_REPO_URL;
|
this.repoUrl = env.GIT_REPO_URL;
|
||||||
this.token = env.GIT_TOKEN;
|
this.token = env.GIT_TOKEN;
|
||||||
this.git = simpleGit();
|
this.git = simpleGit();
|
||||||
}
|
}
|
||||||
|
|
||||||
async initialize() {
|
async initialize() {
|
||||||
// Elternverzeichnis muss existieren - simple-git startet git von dort aus
|
// Ensure workspace directory exists
|
||||||
await mkdir(this.parentDir, { recursive: true });
|
await mkdir(this.workspaceDir, { recursive: true });
|
||||||
|
|
||||||
// Add token to repo URL for authentication
|
// Add token to repo URL for authentication
|
||||||
const authenticatedUrl = this.repoUrl.replace(
|
const authenticatedUrl = this.repoUrl.replace(
|
||||||
'https://',
|
'https://',
|
||||||
`https://oauth2:${encodeURIComponent(this.token)}@`
|
`https://oauth2:${this.token}@`
|
||||||
);
|
);
|
||||||
|
|
||||||
let usable = false;
|
try {
|
||||||
|
// Check if repo already exists
|
||||||
if (existsSync(path.join(this.workspaceDir, '.git'))) {
|
await this.git.cwd(this.workspaceDir);
|
||||||
try {
|
await this.git.status();
|
||||||
this.git = simpleGit(this.workspaceDir);
|
console.log('Repository already exists, pulling latest...');
|
||||||
await this.git.status();
|
await this.git.pull();
|
||||||
console.log('Repository already exists, pulling latest...');
|
} catch {
|
||||||
await this.git.pull();
|
// Clone if doesn't exist
|
||||||
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) {
|
|
||||||
console.log('Cloning repository...');
|
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 });
|
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);
|
await this.git.clone(authenticatedUrl, this.workspaceDir);
|
||||||
this.git = simpleGit(this.workspaceDir);
|
await this.git.cwd(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 });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure git user
|
// Configure git user
|
||||||
@@ -98,14 +47,6 @@ export class GitService {
|
|||||||
|
|
||||||
async commitAndPush(message: string): Promise<string> {
|
async commitAndPush(message: string): Promise<string> {
|
||||||
await this.git.add('.');
|
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.commit(message);
|
||||||
await this.git.push('origin', 'main');
|
await this.git.push('origin', 'main');
|
||||||
|
|
||||||
@@ -118,16 +59,7 @@ export class GitService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async reset() {
|
async reset() {
|
||||||
// Nur zuruecksetzen wenn wirklich ein Repo da ist - sonst laeuft git
|
await this.git.reset(['--hard', 'HEAD']);
|
||||||
// im Prozess-Arbeitsverzeichnis und raeumt dort auf
|
await this.git.clean('f', ['-d']);
|
||||||
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]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
import { db } from '../config/database.js';
|
|
||||||
import { events, galleryImages, contentSections } from '../db/schema.js';
|
|
||||||
import { AssetService } from './asset.service.js';
|
|
||||||
|
|
||||||
const assets = new AssetService();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loescht eine Bilddatei, sofern sie von keinem Datensatz mehr benutzt wird.
|
|
||||||
* Muss NACH dem Loeschen bzw. Aktualisieren der Zeile aufgerufen werden.
|
|
||||||
*/
|
|
||||||
export async function dropImageIfUnused(url: string | null | undefined): Promise<boolean> {
|
|
||||||
if (!url) return false;
|
|
||||||
const referenced = await collectReferencedImageUrls();
|
|
||||||
if (referenced.has(url)) return false;
|
|
||||||
return assets.deleteImage(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 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,67 +0,0 @@
|
|||||||
import fs from 'fs';
|
|
||||||
import path from 'path';
|
|
||||||
import { env } from '../config/env.js';
|
|
||||||
|
|
||||||
export type UploadSubdir = 'events' | 'gallery' | 'content';
|
|
||||||
|
|
||||||
export interface SavedImage {
|
|
||||||
filename: string;
|
|
||||||
imageUrl: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Nimmt einen Multipart-Upload entgegen, rechnet ihn nach WebP herunter und
|
|
||||||
* legt ihn unter public/images/<subdir> im Git-Workspace ab.
|
|
||||||
*
|
|
||||||
* Der Dateiname folgt dem Muster <zeitstempel>-<zufall>.<ext>. Daran erkennt
|
|
||||||
* der AssetService spaeter, dass er die Datei wieder loeschen darf.
|
|
||||||
*/
|
|
||||||
export async function saveUploadedImage(
|
|
||||||
file: any,
|
|
||||||
subdir: UploadSubdir,
|
|
||||||
log?: { warn: (obj: any, msg: string) => void }
|
|
||||||
): Promise<SavedImage> {
|
|
||||||
const uploadDir = path.join(env.GIT_WORKSPACE_DIR, 'public', 'images', subdir);
|
|
||||||
fs.mkdirSync(uploadDir, { recursive: true });
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
const stamp = Date.now().toString(36);
|
|
||||||
const rand = Math.random().toString(36).slice(2, 8);
|
|
||||||
|
|
||||||
let outBuffer: Buffer;
|
|
||||||
let outExt = '.webp';
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Sharp erst laden wenn wirklich gebraucht
|
|
||||||
const sharp = (await import('sharp')).default;
|
|
||||||
outBuffer = await sharp(inputBuffer)
|
|
||||||
.rotate()
|
|
||||||
.resize({ width: 1600, withoutEnlargement: true })
|
|
||||||
.webp({ quality: 82 })
|
|
||||||
.toBuffer();
|
|
||||||
} catch (err) {
|
|
||||||
log?.warn({ err }, 'Sharp processing failed, using original image');
|
|
||||||
outBuffer = inputBuffer;
|
|
||||||
const extFromMime = (file.mimetype || '').split('/')[1] || 'bin';
|
|
||||||
outExt = '.' + extFromMime.replace(/[^a-z0-9]/gi, '').toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
const filename = `${stamp}-${rand}${outExt}`;
|
|
||||||
fs.writeFileSync(path.join(uploadDir, filename), outBuffer);
|
|
||||||
|
|
||||||
return { filename, imageUrl: `/images/${subdir}/${filename}` };
|
|
||||||
}
|
|
||||||
Generated
+555
-788
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 76 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 156 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 117 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 116 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 157 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 157 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 124 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 138 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 170 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 83 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 153 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 162 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 168 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 168 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 523 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 523 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 523 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 523 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 469 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 523 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 398 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 604 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 128 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 116 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 567 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 469 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 728 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 128 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 161 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 167 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1021 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1021 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 488 KiB |
@@ -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>
|
|
||||||
|
Before Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
@@ -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>
|
<h2 class="title">Drinks</h2>
|
||||||
|
|
||||||
<p class="note">
|
<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>
|
</p>
|
||||||
|
|
||||||
<a href="/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>
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import "../styles/index.css"
|
|||||||
|
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<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>
|
<title>Gallus Pub</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|||||||
@@ -13,32 +13,41 @@ const { id } = Astro.props;
|
|||||||
<h2>Gallus Pub!</h2>
|
<h2>Gallus Pub!</h2>
|
||||||
|
|
||||||
<p>
|
<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>
|
</p>
|
||||||
<br />
|
|
||||||
<p><b>Unsere Highlights:</b></p>
|
<p><b>Unsere Highlights:</b></p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<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?
|
<b>Karaoke:</b> Von Mittwoch bis Samstag kannst du deine
|
||||||
Dann kannst du den Sangallerruum im 2.OG auch privat mieten.
|
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>
|
||||||
|
|
||||||
<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>
|
||||||
|
|
||||||
<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>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Wir freuen uns, euch bald bei uns zu begrüssen – auf viele unvergessliche Abende!
|
Wir freuen uns darauf, euch bald bei uns begrüssen zu können! Lasst
|
||||||
</p>
|
uns gemeinsam unvergessliche Abende feiern. - Sabrina & Raphael
|
||||||
<p>
|
|
||||||
Sabrina & Raphael
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
---
|
---
|
||||||
import Layout from "../components/Layout.astro";
|
import Layout from "../components/Layout.astro";
|
||||||
import Banner from "../components/Banner.astro";
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout>
|
||||||
<Banner />
|
|
||||||
|
|
||||||
<h1>Gallery</h1>
|
<h1>Gallery</h1>
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
---
|
---
|
||||||
import Layout from "../components/Layout.astro";
|
import Layout from "../components/Layout.astro";
|
||||||
import Banner from "../components/Banner.astro";
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout>
|
||||||
<Banner />
|
|
||||||
|
|
||||||
<h1>Openings</h1>
|
<h1>Openings</h1>
|
||||||
|
|
||||||
|
|||||||
+103
-430
@@ -22,21 +22,7 @@ const title = 'Admin';
|
|||||||
.card { border: 1px solid #eee; padding: 0.75rem; border-radius: 6px; }
|
.card { border: 1px solid #eee; padding: 0.75rem; border-radius: 6px; }
|
||||||
label { display:block; margin-top: 0.5rem; }
|
label { display:block; margin-top: 0.5rem; }
|
||||||
input, textarea { width: 100%; max-width: 600px; padding: 0.5rem; margin-top: 0.25rem; }
|
input, textarea { width: 100%; max-width: 600px; padding: 0.5rem; margin-top: 0.25rem; }
|
||||||
/* Feste Box: Uploads sind bis 1600px breit und wuerden die Liste sonst
|
img.thumb { max-width: 100%; height: auto; display: block; }
|
||||||
je nach Seitenverhaeltnis beliebig hoch ziehen. */
|
|
||||||
img.thumb { width: 100%; height: 160px; object-fit: cover; display: block;
|
|
||||||
border-radius: 4px; background: #f2f2f2; margin-top: 0.5rem; }
|
|
||||||
img.thumb-sm { width: 110px; height: 110px; object-fit: cover; display: block;
|
|
||||||
border-radius: 4px; background: #f2f2f2; border: 1px solid #e5e5e5;
|
|
||||||
margin-top: 0.25rem; }
|
|
||||||
.field-row { display: flex; gap: 1rem; align-items: flex-start; flex-wrap: wrap; }
|
|
||||||
.field-row > label { flex: 1 1 260px; }
|
|
||||||
.highlight-row { display: grid; grid-template-columns: 1fr 2fr auto; gap: .5rem;
|
|
||||||
align-items: end; margin-top: .5rem; }
|
|
||||||
@media (max-width: 700px){ .highlight-row { grid-template-columns: 1fr; } }
|
|
||||||
.stack > .card { margin-bottom: 1rem; }
|
|
||||||
.ok { color: #17692b; }
|
|
||||||
.err { color: #a11; }
|
|
||||||
.toolbar { display:flex; gap:.5rem; align-items:center; margin:.5rem 0; }
|
.toolbar { display:flex; gap:.5rem; align-items:center; margin:.5rem 0; }
|
||||||
.pill { font-size:.85rem; padding:.25rem .5rem; border:1px solid #ddd; border-radius:999px; background:#f7f7f7; }
|
.pill { font-size:.85rem; padding:.25rem .5rem; border:1px solid #ddd; border-radius:999px; background:#f7f7f7; }
|
||||||
.dragging { opacity:.5; }
|
.dragging { opacity:.5; }
|
||||||
@@ -65,6 +51,7 @@ const title = 'Admin';
|
|||||||
<label>Datum<input id="ev-date" type="date" placeholder="z. B. 2025-12-31" /></label>
|
<label>Datum<input id="ev-date" type="date" placeholder="z. B. 2025-12-31" /></label>
|
||||||
<label>Beschreibung<textarea id="ev-desc" rows="4"></textarea></label>
|
<label>Beschreibung<textarea id="ev-desc" rows="4"></textarea></label>
|
||||||
<label>Bild-Datei<input id="ev-file" type="file" accept="image/*" /></label>
|
<label>Bild-Datei<input id="ev-file" type="file" accept="image/*" /></label>
|
||||||
|
<label>Alt-Text<input id="ev-alt" placeholder="Bildbeschreibung" /></label>
|
||||||
<button id="btn-create-ev">Event anlegen</button>
|
<button id="btn-create-ev">Event anlegen</button>
|
||||||
<div id="ev-create-msg" class="muted"></div>
|
<div id="ev-create-msg" class="muted"></div>
|
||||||
</div>
|
</div>
|
||||||
@@ -92,96 +79,17 @@ const title = 'Admin';
|
|||||||
<div id="gal-create-msg" class="muted"></div>
|
<div id="gal-create-msg" class="muted"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card" style="min-width:380px;">
|
<div class="card" style="min-width:380px;">
|
||||||
<h3>Gallery-Liste</h3>
|
<h3>Liste</h3>
|
||||||
|
<div class="toolbar">
|
||||||
|
<button id="btn-toggle-gal-reorder">Reihenfolge bearbeiten</button>
|
||||||
|
<button id="btn-save-gal-order" style="display:none">Reihenfolge speichern</button>
|
||||||
|
<span id="gal-order-msg" class="muted"></span>
|
||||||
|
</div>
|
||||||
<div id="gallery-list" class="grid"></div>
|
<div id="gallery-list" class="grid"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section id="sec-banner" style="display:none">
|
|
||||||
<h2>Banner verwalten</h2>
|
|
||||||
<div class="events-row">
|
|
||||||
<div class="card">
|
|
||||||
<h3>Neuen Banner erstellen</h3>
|
|
||||||
<label>Text<textarea id="banner-text" rows="3" placeholder="z.B. Wir sind vom 24.12. bis 02.01. geschlossen"></textarea></label>
|
|
||||||
<label>Von (Datum)<input id="banner-start" type="date" /></label>
|
|
||||||
<label>Bis (Datum)<input id="banner-end" type="date" /></label>
|
|
||||||
<button id="btn-create-banner">Banner erstellen</button>
|
|
||||||
<div id="banner-create-msg" class="muted"></div>
|
|
||||||
</div>
|
|
||||||
<div class="card" style="min-width:380px;">
|
|
||||||
<h3>Banner-Liste</h3>
|
|
||||||
<div id="banner-list" class="grid"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="sec-content" style="display:none">
|
|
||||||
<h2>Texte bearbeiten</h2>
|
|
||||||
<div class="muted">Änderungen werden erst mit „Publish“ auf die Website übernommen.</div>
|
|
||||||
|
|
||||||
<div class="stack">
|
|
||||||
<div class="card">
|
|
||||||
<h3>Startseite oben (Hero)</h3>
|
|
||||||
<div class="field-row">
|
|
||||||
<label>Überschrift<input id="hero-heading" placeholder="Dein Irish Pub" /></label>
|
|
||||||
<label>Unterzeile<input id="hero-subheading" placeholder="Im Herzen von St.Gallen" /></label>
|
|
||||||
</div>
|
|
||||||
<button id="btn-save-hero">Hero speichern</button>
|
|
||||||
<span id="hero-msg" class="muted"></span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<h3>Willkommen</h3>
|
|
||||||
<div class="field-row">
|
|
||||||
<label>Überschrift Zeile 1<input id="wel-heading1" placeholder="Herzlich willkommen im" /></label>
|
|
||||||
<label>Überschrift Zeile 2<input id="wel-heading2" placeholder="Gallus Pub!" /></label>
|
|
||||||
</div>
|
|
||||||
<label>Einleitungstext<textarea id="wel-intro" rows="4"></textarea></label>
|
|
||||||
|
|
||||||
<label style="margin-top:1rem"><strong>Highlights</strong></label>
|
|
||||||
<div id="wel-highlights"></div>
|
|
||||||
<button id="btn-add-highlight" type="button">Highlight hinzufügen</button>
|
|
||||||
|
|
||||||
<label>Schlusstext<textarea id="wel-closing" rows="3"></textarea></label>
|
|
||||||
|
|
||||||
<label>Bild ersetzen<input id="wel-file" type="file" accept="image/*" /></label>
|
|
||||||
<img id="wel-preview" class="thumb-sm" alt="Aktuelles Willkommen-Bild" style="display:none" />
|
|
||||||
|
|
||||||
<button id="btn-save-welcome">Willkommen speichern</button>
|
|
||||||
<span id="wel-msg" class="muted"></span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<h3>Drinks</h3>
|
|
||||||
<label>Einleitungstext<textarea id="dr-intro" rows="3"></textarea></label>
|
|
||||||
|
|
||||||
<div class="field-row">
|
|
||||||
<label>Monats-Hit Name<input id="dr-special-name" placeholder="Mate Vodka" /></label>
|
|
||||||
<label>Monats-Hit Bild ersetzen<input id="dr-special-file" type="file" accept="image/*" /></label>
|
|
||||||
</div>
|
|
||||||
<img id="dr-special-preview" class="thumb-sm" alt="Aktuelles Monats-Hit-Bild" style="display:none" />
|
|
||||||
|
|
||||||
<label>Whiskey-Text<textarea id="dr-whiskey" rows="3"></textarea></label>
|
|
||||||
|
|
||||||
<div class="field-row">
|
|
||||||
<label>Whiskey-Bild 1<input id="dr-whiskey-file1" type="file" accept="image/*" />
|
|
||||||
<img id="dr-whiskey-preview1" class="thumb-sm" alt="Whiskey 1" style="display:none" /></label>
|
|
||||||
<label>Whiskey-Bild 2<input id="dr-whiskey-file2" type="file" accept="image/*" />
|
|
||||||
<img id="dr-whiskey-preview2" class="thumb-sm" alt="Whiskey 2" style="display:none" /></label>
|
|
||||||
<label>Whiskey-Bild 3<input id="dr-whiskey-file3" type="file" accept="image/*" />
|
|
||||||
<img id="dr-whiskey-preview3" class="thumb-sm" alt="Whiskey 3" style="display:none" /></label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<label style="margin-top:1rem">Getränkekarte (PDF) ersetzen<input id="dr-pdf-file" type="file" accept="application/pdf" /></label>
|
|
||||||
<div id="dr-pdf-current" class="muted"></div>
|
|
||||||
|
|
||||||
<button id="btn-save-drinks">Drinks speichern</button>
|
|
||||||
<span id="dr-msg" class="muted"></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="sec-publish" style="display:none">
|
<section id="sec-publish" style="display:none">
|
||||||
<h2>Veröffentlichen</h2>
|
<h2>Veröffentlichen</h2>
|
||||||
<label>Commit-Message<input id="pub-msg" placeholder="Änderungen beschreiben" value="Update events" /></label>
|
<label>Commit-Message<input id="pub-msg" placeholder="Änderungen beschreiben" value="Update events" /></label>
|
||||||
@@ -200,12 +108,6 @@ const title = 'Admin';
|
|||||||
return ct.includes('application/json') ? res.json() : res.text();
|
return ct.includes('application/json') ? res.json() : res.text();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Inhalte landen per innerHTML in der Seite - ohne Maskierung zerlegt
|
|
||||||
// ein Anführungszeichen im Titel die Darstellung
|
|
||||||
const esc = (v) => String(v ?? '')
|
|
||||||
.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
|
||||||
.replace(/"/g, '"').replace(/'/g, ''');
|
|
||||||
|
|
||||||
async function refreshAuth() {
|
async function refreshAuth() {
|
||||||
try {
|
try {
|
||||||
const me = await api('/api/auth/me');
|
const me = await api('/api/auth/me');
|
||||||
@@ -213,23 +115,16 @@ const title = 'Admin';
|
|||||||
// UI-Bereiche für eingeloggte Nutzer einblenden
|
// UI-Bereiche für eingeloggte Nutzer einblenden
|
||||||
document.getElementById('sec-events').style.display = '';
|
document.getElementById('sec-events').style.display = '';
|
||||||
document.getElementById('sec-gallery').style.display = '';
|
document.getElementById('sec-gallery').style.display = '';
|
||||||
document.getElementById('sec-banner').style.display = '';
|
|
||||||
document.getElementById('sec-content').style.display = '';
|
|
||||||
document.getElementById('sec-publish').style.display = '';
|
document.getElementById('sec-publish').style.display = '';
|
||||||
// Direkt Events laden und auf Sektion fokussieren
|
// Direkt Events laden und auf Sektion fokussieren
|
||||||
await loadEvents();
|
await loadEvents();
|
||||||
await loadGallery();
|
await loadGallery();
|
||||||
await loadBanners();
|
|
||||||
await loadContent();
|
|
||||||
document.getElementById('sec-events').scrollIntoView({ behavior: 'smooth' });
|
document.getElementById('sec-events').scrollIntoView({ behavior: 'smooth' });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const el = document.getElementById('auth-status');
|
const el = document.getElementById('auth-status');
|
||||||
el.textContent = 'Nicht angemeldet';
|
el.textContent = 'Nicht angemeldet';
|
||||||
// Kein Auto-Redirect, damit keine Schleife entsteht. Login-Button verwenden.
|
// Kein Auto-Redirect, damit keine Schleife entsteht. Login-Button verwenden.
|
||||||
document.getElementById('sec-events').style.display = 'none';
|
document.getElementById('sec-events').style.display = 'none';
|
||||||
document.getElementById('sec-gallery').style.display = 'none';
|
|
||||||
document.getElementById('sec-banner').style.display = 'none';
|
|
||||||
document.getElementById('sec-content').style.display = 'none';
|
|
||||||
document.getElementById('sec-publish').style.display = 'none';
|
document.getElementById('sec-publish').style.display = 'none';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -254,15 +149,7 @@ const title = 'Admin';
|
|||||||
});
|
});
|
||||||
|
|
||||||
// ========== Events & Publish ==========
|
// ========== Events & Publish ==========
|
||||||
async function uploadEventImage(file) {
|
async function uploadImage(file, altText) {
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('file', file);
|
|
||||||
const res = await fetch(API_BASE + '/api/events/upload', { method: 'POST', body: fd, credentials: 'include' });
|
|
||||||
if (!res.ok) throw new Error(await res.text());
|
|
||||||
return res.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function uploadGalleryImage(file, altText) {
|
|
||||||
const fd = new FormData();
|
const fd = new FormData();
|
||||||
fd.append('file', file);
|
fd.append('file', file);
|
||||||
if (altText) fd.append('altText', altText);
|
if (altText) fd.append('altText', altText);
|
||||||
@@ -307,12 +194,12 @@ const title = 'Admin';
|
|||||||
card.dataset.displayOrder = String(ev.displayOrder ?? idx);
|
card.dataset.displayOrder = String(ev.displayOrder ?? idx);
|
||||||
card.innerHTML = `
|
card.innerHTML = `
|
||||||
<div class="row" style="justify-content:space-between;align-items:center">
|
<div class="row" style="justify-content:space-between;align-items:center">
|
||||||
<div><strong>${esc(ev.title)}</strong></div>
|
<div><strong>${ev.title}</strong></div>
|
||||||
${reorderMode ? '<span class="drag-handle">⇅ Ziehen</span>' : ''}
|
${reorderMode ? '<span class="drag-handle">⇅ Ziehen</span>' : ''}
|
||||||
</div>
|
</div>
|
||||||
<div class="muted">${esc(ev.date)}</div>
|
<div class="muted">${ev.date}</div>
|
||||||
<div>${esc(ev.description || '')}</div>
|
<div>${ev.description || ''}</div>
|
||||||
${ev.imageUrl ? `<img src="${API_BASE}${esc(ev.imageUrl)}" alt="${esc(ev.title)}" class="thumb" />` : '<div class="muted">Kein Bild</div>'}
|
<div class="muted">Bild: ${ev.imageUrl || ''}</div>
|
||||||
<div class="row-buttons">
|
<div class="row-buttons">
|
||||||
<button data-id="${ev.id}" class="btn-del-ev">Löschen</button>
|
<button data-id="${ev.id}" class="btn-del-ev">Löschen</button>
|
||||||
</div>`;
|
</div>`;
|
||||||
@@ -367,13 +254,14 @@ const title = 'Admin';
|
|||||||
const date = (document.getElementById('ev-date')).value.trim();
|
const date = (document.getElementById('ev-date')).value.trim();
|
||||||
const desc = (document.getElementById('ev-desc')).value.trim();
|
const desc = (document.getElementById('ev-desc')).value.trim();
|
||||||
const file = /** @type {HTMLInputElement} */ (document.getElementById('ev-file')).files[0];
|
const file = /** @type {HTMLInputElement} */ (document.getElementById('ev-file')).files[0];
|
||||||
|
const alt = (document.getElementById('ev-alt')).value.trim();
|
||||||
const msg = document.getElementById('ev-create-msg');
|
const msg = document.getElementById('ev-create-msg');
|
||||||
msg.textContent = 'Lade Bild hoch...';
|
msg.textContent = 'Lade Bild hoch...';
|
||||||
try {
|
try {
|
||||||
let imageUrl = '';
|
let imageUrl = '';
|
||||||
if (file) {
|
if (file) {
|
||||||
const up = await uploadEventImage(file);
|
const up = await uploadImage(file, alt || title);
|
||||||
imageUrl = up?.imageUrl || '';
|
imageUrl = up?.image?.imageUrl || '';
|
||||||
}
|
}
|
||||||
msg.textContent = 'Lege Event an...';
|
msg.textContent = 'Lege Event an...';
|
||||||
await api('/api/events', {
|
await api('/api/events', {
|
||||||
@@ -385,6 +273,7 @@ const title = 'Admin';
|
|||||||
(document.getElementById('ev-date')).value = '';
|
(document.getElementById('ev-date')).value = '';
|
||||||
(document.getElementById('ev-desc')).value = '';
|
(document.getElementById('ev-desc')).value = '';
|
||||||
(document.getElementById('ev-file')).value = '';
|
(document.getElementById('ev-file')).value = '';
|
||||||
|
(document.getElementById('ev-alt')).value = '';
|
||||||
await loadEvents();
|
await loadEvents();
|
||||||
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
||||||
});
|
});
|
||||||
@@ -395,10 +284,7 @@ const title = 'Admin';
|
|||||||
s.textContent = 'Veröffentliche...';
|
s.textContent = 'Veröffentliche...';
|
||||||
try {
|
try {
|
||||||
const res = await api('/api/publish', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ commitMessage: m }) });
|
const res = await api('/api/publish', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ commitMessage: m }) });
|
||||||
const cleaned = res?.removedImages
|
s.textContent = res?.message || 'Veröffentlicht';
|
||||||
? ` (${res.removedImages} ungenutzte${res.removedImages === 1 ? 's Bild' : ' Bilder'} entfernt)`
|
|
||||||
: '';
|
|
||||||
s.textContent = (res?.message || 'Veröffentlicht') + cleaned;
|
|
||||||
} catch(e){ s.textContent = 'Fehler: '+e.message }
|
} catch(e){ s.textContent = 'Fehler: '+e.message }
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -426,344 +312,131 @@ const title = 'Admin';
|
|||||||
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
||||||
});
|
});
|
||||||
|
|
||||||
// ========== Gallery ==========
|
// ========== Gallery Management ==========
|
||||||
|
let galReorderMode = false;
|
||||||
|
let lastGallery = [];
|
||||||
|
|
||||||
async function loadGallery() {
|
async function loadGallery() {
|
||||||
const listEl = document.getElementById('gallery-list');
|
const listEl = document.getElementById('gallery-list');
|
||||||
listEl.innerHTML = '<div class="muted">Lade...</div>';
|
listEl.innerHTML = '<div class="muted">Lade...</div>';
|
||||||
try {
|
try {
|
||||||
const data = await api('/api/gallery');
|
const data = await api('/api/gallery');
|
||||||
listEl.innerHTML = '';
|
listEl.innerHTML = '';
|
||||||
const galleryImages = (data.images || []).slice();
|
lastGallery = (data.images || []).slice();
|
||||||
galleryImages.sort((a,b) => (a.displayOrder??0) - (b.displayOrder??0));
|
let renderList = lastGallery.slice();
|
||||||
|
|
||||||
galleryImages.forEach((img) => {
|
if (galReorderMode) {
|
||||||
|
renderList.sort((a,b) => (a.displayOrder??0) - (b.displayOrder??0));
|
||||||
|
}
|
||||||
|
|
||||||
|
renderList.forEach((img, idx) => {
|
||||||
const card = document.createElement('div');
|
const card = document.createElement('div');
|
||||||
card.className = 'card';
|
card.className = 'card';
|
||||||
|
card.setAttribute('draggable', String(galReorderMode));
|
||||||
|
card.dataset.id = img.id;
|
||||||
|
card.dataset.displayOrder = String(img.displayOrder ?? idx);
|
||||||
card.innerHTML = `
|
card.innerHTML = `
|
||||||
<img src="${API_BASE}${esc(img.imageUrl)}" alt="${esc(img.altText)}" class="thumb" />
|
<div class="row" style="justify-content:space-between;align-items:center">
|
||||||
<div class="muted">${esc(img.altText || '')}</div>
|
<div><strong>${img.altText}</strong></div>
|
||||||
|
${galReorderMode ? '<span class="drag-handle">⇅ Ziehen</span>' : ''}
|
||||||
|
</div>
|
||||||
|
<img src="${API_BASE}${img.imageUrl}" alt="${img.altText}" style="max-width:100%;height:auto;margin:0.5rem 0;" />
|
||||||
|
<div class="muted">URL: ${img.imageUrl}</div>
|
||||||
<div class="row-buttons">
|
<div class="row-buttons">
|
||||||
<button data-id="${img.id}" class="btn-del-gal">Löschen</button>
|
<button data-id="${img.id}" class="btn-del-gal">Löschen</button>
|
||||||
</div>`;
|
</div>`;
|
||||||
listEl.appendChild(card);
|
listEl.appendChild(card);
|
||||||
});
|
});
|
||||||
|
|
||||||
listEl.querySelectorAll('.btn-del-gal').forEach(btn => {
|
listEl.querySelectorAll('.btn-del-gal').forEach(btn => {
|
||||||
btn.addEventListener('click', async () => {
|
btn.addEventListener('click', async () => {
|
||||||
const id = btn.getAttribute('data-id');
|
const id = btn.getAttribute('data-id');
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
if (!confirm('Bild wirklich löschen?')) return;
|
if (!confirm('Bild wirklich löschen?')) return;
|
||||||
try { await api(`/api/gallery/${id}`, { method: 'DELETE' }); await loadGallery(); } catch(e){ alert('Fehler: '+e.message); }
|
try {
|
||||||
|
await api(`/api/gallery/${id}`, { method: 'DELETE' });
|
||||||
|
await loadGallery();
|
||||||
|
} catch(e){ alert('Fehler: '+e.message); }
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if (galReorderMode) {
|
||||||
|
enableGalleryDragAndDrop(listEl);
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
listEl.innerHTML = '<div class="muted">Fehler beim Laden</div>';
|
listEl.innerHTML = '<div class="muted">Fehler beim Laden</div>';
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function enableGalleryDragAndDrop(container){
|
||||||
|
let draggingEl = null;
|
||||||
|
container.querySelectorAll('.card').forEach(card => {
|
||||||
|
card.addEventListener('dragstart', (e) => {
|
||||||
|
draggingEl = card; card.classList.add('dragging');
|
||||||
|
e.dataTransfer.setData('text/plain', card.dataset.id || '');
|
||||||
|
});
|
||||||
|
card.addEventListener('dragend', () => { draggingEl = null; card.classList.remove('dragging'); });
|
||||||
|
card.addEventListener('dragover', (e) => { e.preventDefault(); });
|
||||||
|
card.addEventListener('drop', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const target = card;
|
||||||
|
if (!draggingEl || draggingEl === target) return;
|
||||||
|
const cards = Array.from(container.querySelectorAll('.card'));
|
||||||
|
const draggingIdx = cards.indexOf(draggingEl);
|
||||||
|
const targetIdx = cards.indexOf(target);
|
||||||
|
if (draggingIdx < targetIdx) {
|
||||||
|
target.after(draggingEl);
|
||||||
|
} else {
|
||||||
|
target.before(draggingEl);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
document.getElementById('btn-create-gal').addEventListener('click', async () => {
|
document.getElementById('btn-create-gal').addEventListener('click', async () => {
|
||||||
const file = /** @type {HTMLInputElement} */ (document.getElementById('gal-file')).files[0];
|
const file = document.getElementById('gal-file').files[0];
|
||||||
const alt = (document.getElementById('gal-alt')).value.trim();
|
const alt = document.getElementById('gal-alt').value.trim();
|
||||||
const msg = document.getElementById('gal-create-msg');
|
const msg = document.getElementById('gal-create-msg');
|
||||||
|
|
||||||
if (!file) {
|
if (!file) {
|
||||||
msg.textContent = 'Bitte Datei auswählen';
|
msg.textContent = 'Bitte wähle ein Bild aus';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.textContent = 'Lade Bild hoch...';
|
msg.textContent = 'Lade Bild hoch...';
|
||||||
try {
|
try {
|
||||||
await uploadGalleryImage(file, alt);
|
const up = await uploadImage(file, alt || 'Gallery Image');
|
||||||
msg.textContent = 'Bild hochgeladen';
|
msg.textContent = 'Bild hochgeladen';
|
||||||
(document.getElementById('gal-file')).value = '';
|
document.getElementById('gal-file').value = '';
|
||||||
(document.getElementById('gal-alt')).value = '';
|
document.getElementById('gal-alt').value = '';
|
||||||
|
await loadGallery();
|
||||||
|
} catch(e){
|
||||||
|
msg.textContent = 'Fehler: '+e.message
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('btn-toggle-gal-reorder').addEventListener('click', async () => {
|
||||||
|
galReorderMode = !galReorderMode;
|
||||||
|
document.getElementById('btn-save-gal-order').style.display = galReorderMode ? '' : 'none';
|
||||||
|
await loadGallery();
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('btn-save-gal-order').addEventListener('click', async () => {
|
||||||
|
const container = document.getElementById('gallery-list');
|
||||||
|
const cards = Array.from(container.querySelectorAll('.card'));
|
||||||
|
const orders = cards.map((c, idx) => ({ id: c.dataset.id, displayOrder: idx }));
|
||||||
|
const msg = document.getElementById('gal-order-msg');
|
||||||
|
msg.textContent = 'Speichere Reihenfolge...';
|
||||||
|
try {
|
||||||
|
await api('/api/gallery/reorder', { method:'PUT', headers:{'Content-Type':'application/json'}, body: JSON.stringify({ orders }) });
|
||||||
|
msg.textContent = 'Reihenfolge gespeichert';
|
||||||
|
galReorderMode = false;
|
||||||
|
document.getElementById('btn-save-gal-order').style.display = 'none';
|
||||||
await loadGallery();
|
await loadGallery();
|
||||||
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
||||||
});
|
});
|
||||||
|
|
||||||
// ========== Banner ==========
|
|
||||||
async function loadBanners() {
|
|
||||||
const listEl = document.getElementById('banner-list');
|
|
||||||
listEl.innerHTML = '<div class="muted">Lade...</div>';
|
|
||||||
try {
|
|
||||||
const data = await api('/api/banners');
|
|
||||||
listEl.innerHTML = '';
|
|
||||||
const bannersList = (data.banners || []).slice();
|
|
||||||
bannersList.sort((a,b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
|
|
||||||
|
|
||||||
bannersList.forEach((banner) => {
|
|
||||||
const card = document.createElement('div');
|
|
||||||
card.className = 'card';
|
|
||||||
const statusText = banner.isActive ? '✓ Aktiv' : '✗ Inaktiv';
|
|
||||||
card.innerHTML = `
|
|
||||||
<div><strong>${esc(banner.text.substring(0, 60))}${banner.text.length > 60 ? '...' : ''}</strong></div>
|
|
||||||
<div class="muted">Von: ${esc(banner.startDate)}</div>
|
|
||||||
<div class="muted">Bis: ${esc(banner.endDate)}</div>
|
|
||||||
<div class="pill">${statusText}</div>
|
|
||||||
<div class="row-buttons">
|
|
||||||
<button data-id="${banner.id}" class="btn-toggle-banner">${banner.isActive ? 'Deaktivieren' : 'Aktivieren'}</button>
|
|
||||||
<button data-id="${banner.id}" class="btn-del-banner">Löschen</button>
|
|
||||||
</div>`;
|
|
||||||
listEl.appendChild(card);
|
|
||||||
});
|
|
||||||
|
|
||||||
listEl.querySelectorAll('.btn-toggle-banner').forEach(btn => {
|
|
||||||
btn.addEventListener('click', async () => {
|
|
||||||
const id = btn.getAttribute('data-id');
|
|
||||||
if (!id) return;
|
|
||||||
const banner = bannersList.find(b => b.id === id);
|
|
||||||
if (!banner) return;
|
|
||||||
try {
|
|
||||||
await api(`/api/banners/${id}`, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({
|
|
||||||
text: banner.text,
|
|
||||||
startDate: banner.startDate,
|
|
||||||
endDate: banner.endDate,
|
|
||||||
isActive: !banner.isActive
|
|
||||||
})
|
|
||||||
});
|
|
||||||
await loadBanners();
|
|
||||||
} catch(e){ alert('Fehler: '+e.message); }
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
listEl.querySelectorAll('.btn-del-banner').forEach(btn => {
|
|
||||||
btn.addEventListener('click', async () => {
|
|
||||||
const id = btn.getAttribute('data-id');
|
|
||||||
if (!id) return;
|
|
||||||
if (!confirm('Banner wirklich löschen?')) return;
|
|
||||||
try { await api(`/api/banners/${id}`, { method: 'DELETE' }); await loadBanners(); } catch(e){ alert('Fehler: '+e.message); }
|
|
||||||
})
|
|
||||||
})
|
|
||||||
} catch (e) {
|
|
||||||
listEl.innerHTML = '<div class="muted">Fehler beim Laden</div>';
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('btn-create-banner').addEventListener('click', async () => {
|
|
||||||
const text = (document.getElementById('banner-text')).value.trim();
|
|
||||||
const startDate = (document.getElementById('banner-start')).value.trim();
|
|
||||||
const endDate = (document.getElementById('banner-end')).value.trim();
|
|
||||||
const msg = document.getElementById('banner-create-msg');
|
|
||||||
|
|
||||||
if (!text || !startDate || !endDate) {
|
|
||||||
msg.textContent = 'Bitte alle Felder ausfüllen';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
msg.textContent = 'Erstelle Banner...';
|
|
||||||
try {
|
|
||||||
await api('/api/banners', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ text, startDate, endDate, isActive: true })
|
|
||||||
});
|
|
||||||
msg.textContent = 'Banner erstellt';
|
|
||||||
(document.getElementById('banner-text')).value = '';
|
|
||||||
(document.getElementById('banner-start')).value = '';
|
|
||||||
(document.getElementById('banner-end')).value = '';
|
|
||||||
await loadBanners();
|
|
||||||
} catch(e){ msg.textContent = 'Fehler: '+e.message }
|
|
||||||
});
|
|
||||||
|
|
||||||
// ========== Texte (Content-Sections) ==========
|
|
||||||
// Der geladene Stand wird gemerkt, damit beim Speichern keine Felder
|
|
||||||
// verloren gehen, die die Oberfläche gar nicht anzeigt (z.B. pdfUrl).
|
|
||||||
let contentState = { hero: {}, welcome: {}, drinks: {} };
|
|
||||||
|
|
||||||
const byId = (id) => document.getElementById(id);
|
|
||||||
|
|
||||||
function setPreview(imgId, url) {
|
|
||||||
const img = byId(imgId);
|
|
||||||
if (url) {
|
|
||||||
img.src = API_BASE + url;
|
|
||||||
img.style.display = '';
|
|
||||||
} else {
|
|
||||||
img.removeAttribute('src');
|
|
||||||
img.style.display = 'none';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderHighlights(highlights) {
|
|
||||||
const box = byId('wel-highlights');
|
|
||||||
box.innerHTML = '';
|
|
||||||
(highlights || []).forEach((h, idx) => {
|
|
||||||
const row = document.createElement('div');
|
|
||||||
row.className = 'highlight-row';
|
|
||||||
row.innerHTML = `
|
|
||||||
<label>Titel<input class="hl-title" value="${esc(h?.title)}" /></label>
|
|
||||||
<label>Beschreibung<input class="hl-desc" value="${esc(h?.description)}" /></label>
|
|
||||||
<button type="button" class="hl-remove" data-idx="${idx}">Entfernen</button>`;
|
|
||||||
box.appendChild(row);
|
|
||||||
});
|
|
||||||
box.querySelectorAll('.hl-remove').forEach(btn => {
|
|
||||||
btn.addEventListener('click', () => {
|
|
||||||
btn.closest('.highlight-row').remove();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function readHighlights() {
|
|
||||||
return Array.from(byId('wel-highlights').querySelectorAll('.highlight-row'))
|
|
||||||
.map(row => ({
|
|
||||||
title: row.querySelector('.hl-title').value.trim(),
|
|
||||||
description: row.querySelector('.hl-desc').value.trim(),
|
|
||||||
}))
|
|
||||||
.filter(h => h.title || h.description);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadContent() {
|
|
||||||
try {
|
|
||||||
const data = await api('/api/content');
|
|
||||||
const map = {};
|
|
||||||
(data.sections || []).forEach(s => {
|
|
||||||
let c = s.content;
|
|
||||||
if (typeof c === 'string') { try { c = JSON.parse(c); } catch { c = {}; } }
|
|
||||||
map[s.section] = c || {};
|
|
||||||
});
|
|
||||||
contentState = {
|
|
||||||
hero: map.hero || {},
|
|
||||||
welcome: map.welcome || {},
|
|
||||||
drinks: map.drinks || {},
|
|
||||||
};
|
|
||||||
|
|
||||||
byId('hero-heading').value = contentState.hero.heading || '';
|
|
||||||
byId('hero-subheading').value = contentState.hero.subheading || '';
|
|
||||||
|
|
||||||
byId('wel-heading1').value = contentState.welcome.heading1 || '';
|
|
||||||
byId('wel-heading2').value = contentState.welcome.heading2 || '';
|
|
||||||
byId('wel-intro').value = contentState.welcome.introText || '';
|
|
||||||
byId('wel-closing').value = contentState.welcome.closingText || '';
|
|
||||||
renderHighlights(contentState.welcome.highlights);
|
|
||||||
setPreview('wel-preview', contentState.welcome.imageUrl);
|
|
||||||
|
|
||||||
byId('dr-intro').value = contentState.drinks.introText || '';
|
|
||||||
byId('dr-special-name').value = contentState.drinks.monthlySpecialName || '';
|
|
||||||
byId('dr-whiskey').value = contentState.drinks.whiskeyText || '';
|
|
||||||
setPreview('dr-special-preview', contentState.drinks.monthlySpecialImage);
|
|
||||||
setPreview('dr-whiskey-preview1', contentState.drinks.whiskeyImage1);
|
|
||||||
setPreview('dr-whiskey-preview2', contentState.drinks.whiskeyImage2);
|
|
||||||
setPreview('dr-whiskey-preview3', contentState.drinks.whiskeyImage3);
|
|
||||||
|
|
||||||
const pdf = contentState.drinks.pdfUrl;
|
|
||||||
byId('dr-pdf-current').innerHTML = pdf
|
|
||||||
? `Aktuell: <a href="${API_BASE}${esc(pdf)}" target="_blank" rel="noopener noreferrer">${esc(pdf.split('/').pop())}</a>`
|
|
||||||
: 'Noch keine eigene Getränkekarte hochgeladen (es gilt die im Repo hinterlegte).';
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function uploadContentImage(file) {
|
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('file', file);
|
|
||||||
const res = await fetch(API_BASE + '/api/content/upload', { method: 'POST', body: fd, credentials: 'include' });
|
|
||||||
if (!res.ok) throw new Error(await res.text());
|
|
||||||
return res.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Lädt die Datei aus einem Input hoch, sofern eine gewählt wurde. */
|
|
||||||
async function maybeUpload(inputId, current) {
|
|
||||||
const file = byId(inputId).files[0];
|
|
||||||
if (!file) return current;
|
|
||||||
const up = await uploadContentImage(file);
|
|
||||||
byId(inputId).value = '';
|
|
||||||
return up?.imageUrl || current;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveSection(name, content, msgId) {
|
|
||||||
const msg = byId(msgId);
|
|
||||||
msg.textContent = 'Speichere...';
|
|
||||||
msg.className = 'muted';
|
|
||||||
try {
|
|
||||||
await api(`/api/content/${name}`, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ contentJson: content }),
|
|
||||||
});
|
|
||||||
msg.textContent = 'Gespeichert. Mit „Publish“ übernehmen.';
|
|
||||||
msg.className = 'ok';
|
|
||||||
await loadContent();
|
|
||||||
} catch (e) {
|
|
||||||
msg.textContent = 'Fehler: ' + e.message;
|
|
||||||
msg.className = 'err';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
byId('btn-add-highlight').addEventListener('click', () => {
|
|
||||||
const current = readHighlights();
|
|
||||||
current.push({ title: '', description: '' });
|
|
||||||
renderHighlights(current);
|
|
||||||
});
|
|
||||||
|
|
||||||
byId('btn-save-hero').addEventListener('click', () => {
|
|
||||||
saveSection('hero', {
|
|
||||||
...contentState.hero,
|
|
||||||
heading: byId('hero-heading').value.trim(),
|
|
||||||
subheading: byId('hero-subheading').value.trim(),
|
|
||||||
}, 'hero-msg');
|
|
||||||
});
|
|
||||||
|
|
||||||
byId('btn-save-welcome').addEventListener('click', async () => {
|
|
||||||
const msg = byId('wel-msg');
|
|
||||||
msg.textContent = 'Lade Bild hoch...';
|
|
||||||
msg.className = 'muted';
|
|
||||||
try {
|
|
||||||
const imageUrl = await maybeUpload('wel-file', contentState.welcome.imageUrl);
|
|
||||||
await saveSection('welcome', {
|
|
||||||
...contentState.welcome,
|
|
||||||
heading1: byId('wel-heading1').value.trim(),
|
|
||||||
heading2: byId('wel-heading2').value.trim(),
|
|
||||||
introText: byId('wel-intro').value.trim(),
|
|
||||||
closingText: byId('wel-closing').value.trim(),
|
|
||||||
highlights: readHighlights(),
|
|
||||||
...(imageUrl ? { imageUrl } : {}),
|
|
||||||
}, 'wel-msg');
|
|
||||||
} catch (e) {
|
|
||||||
msg.textContent = 'Fehler: ' + e.message;
|
|
||||||
msg.className = 'err';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
byId('btn-save-drinks').addEventListener('click', async () => {
|
|
||||||
const msg = byId('dr-msg');
|
|
||||||
msg.textContent = 'Lade Dateien hoch...';
|
|
||||||
msg.className = 'muted';
|
|
||||||
try {
|
|
||||||
const special = await maybeUpload('dr-special-file', contentState.drinks.monthlySpecialImage);
|
|
||||||
const w1 = await maybeUpload('dr-whiskey-file1', contentState.drinks.whiskeyImage1);
|
|
||||||
const w2 = await maybeUpload('dr-whiskey-file2', contentState.drinks.whiskeyImage2);
|
|
||||||
const w3 = await maybeUpload('dr-whiskey-file3', contentState.drinks.whiskeyImage3);
|
|
||||||
|
|
||||||
// PDF geht über einen eigenen Endpunkt, der die URL selbst hinterlegt
|
|
||||||
const pdfFile = byId('dr-pdf-file').files[0];
|
|
||||||
if (pdfFile) {
|
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('file', pdfFile);
|
|
||||||
const res = await fetch(API_BASE + '/api/pdf/drinks', { method: 'POST', body: fd, credentials: 'include' });
|
|
||||||
if (!res.ok) throw new Error(await res.text());
|
|
||||||
const up = await res.json();
|
|
||||||
contentState.drinks.pdfUrl = up?.pdfUrl || contentState.drinks.pdfUrl;
|
|
||||||
byId('dr-pdf-file').value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
await saveSection('drinks', {
|
|
||||||
...contentState.drinks,
|
|
||||||
introText: byId('dr-intro').value.trim(),
|
|
||||||
monthlySpecialName: byId('dr-special-name').value.trim(),
|
|
||||||
whiskeyText: byId('dr-whiskey').value.trim(),
|
|
||||||
...(special ? { monthlySpecialImage: special } : {}),
|
|
||||||
...(w1 ? { whiskeyImage1: w1 } : {}),
|
|
||||||
...(w2 ? { whiskeyImage2: w2 } : {}),
|
|
||||||
...(w3 ? { whiskeyImage3: w3 } : {}),
|
|
||||||
}, 'dr-msg');
|
|
||||||
} catch (e) {
|
|
||||||
msg.textContent = 'Fehler: ' + e.message;
|
|
||||||
msg.className = 'err';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
refreshAuth();
|
refreshAuth();
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
+32
-67
@@ -1,6 +1,5 @@
|
|||||||
---
|
---
|
||||||
import Layout from "../components/Layout.astro";
|
import Layout from "../components/Layout.astro";
|
||||||
import Banner from "../components/Banner.astro";
|
|
||||||
import Hero from "../components/Hero.astro";
|
import Hero from "../components/Hero.astro";
|
||||||
import Welcome from "../components/Welcome.astro";
|
import Welcome from "../components/Welcome.astro";
|
||||||
import EventsGrid from "../components/EventsGrid.astro";
|
import EventsGrid from "../components/EventsGrid.astro";
|
||||||
@@ -9,77 +8,43 @@ import ImageCarousel from "../components/ImageCarousel.astro";
|
|||||||
import Contact from "../components/Contact.astro";
|
import Contact from "../components/Contact.astro";
|
||||||
import About from "../components/About.astro";
|
import About from "../components/About.astro";
|
||||||
|
|
||||||
const events = [
|
const API_BASE = 'https://cms.gallus-pub.ch';
|
||||||
{
|
|
||||||
image: "/images/events/mmnm5yob-w9xjor.jpeg",
|
|
||||||
title: "Karaoke",
|
|
||||||
date: "2026-03-12",
|
|
||||||
description: `
|
|
||||||
Du singst gerne, aber lieber für dich? Dann kannst du den Sangallerruum im 2OG auch privat mieten. (Optimal für 10-20Pers). Mehr Info's🍀via WA 077 232 27 70
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
image: "/images/events/mj67800i-6ng82x.jpeg",
|
|
||||||
title: "Pub Quiz",
|
|
||||||
date: "2025-12-02",
|
|
||||||
description: `
|
|
||||||
Jeden Freitag 20:00Uhr-ca 21:30Uhr.
|
|
||||||
Plätze sind begrenzt! Jetzt reservieren unter 🍀WA 077 232 27 70
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
image: "/images/events/msogsj4l-bmlcxc.jpeg",
|
|
||||||
title: "SG Fest",
|
|
||||||
date: "2026-08-14",
|
|
||||||
description: `
|
|
||||||
Das Stadt-Fest steht vor der Tür! Wir haben OFFEN ab 17:00Uhr mit Karaoke! Wir freuen uns auf euch!
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
image: "/images/events/mr82c7eh-yp87hy.jpeg",
|
|
||||||
title: "Richie Live",
|
|
||||||
date: "2026-08-27",
|
|
||||||
description: `
|
|
||||||
SOLD OUT! - Richie hat das Image eines Weltenbummlers und Musikkünstlers. In der Ostschweiz ist er bereits bestens bekannt.🍀Warteliste: WA 077 232 27 70
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
image: "/images/events/mrnpux59-b3075p.jpeg",
|
|
||||||
title: "Hannes LIVE",
|
|
||||||
date: "2026-09-10",
|
|
||||||
description: `
|
|
||||||
Er ist zurück!🥰🍀Johannes ist wieder bei uns! Eine weitere unvergessliche Irish-Night!!🍀Sei dabei! Reservationen🍀via WA 077 232 27 70
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
image: "/images/events/mrngoyyy-49rz7u.jpeg",
|
|
||||||
title: "Danielle&Nina",
|
|
||||||
date: "2026-09-24",
|
|
||||||
description: `
|
|
||||||
SOLD OUT! - First time on stage – und das direkt im Gallus Pub!🎤✨
|
|
||||||
Danielle & Nina bringen Irish Folk & liebevolle Cover Songs.🍀Warteliste: WA 077 232 27 70
|
|
||||||
`,
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
const images = [
|
// Fetch events from backend API
|
||||||
{ src: "/images/gallery/mndhrrtl-s4o8dn.png", alt: "mndhrrtl-s4o8dn.png" },
|
let events = [];
|
||||||
{ src: "/images/gallery/mndhtjvz-965yra.jpeg", alt: "mndhtjvz-965yra.jpeg" },
|
try {
|
||||||
{ src: "/images/gallery/mndi3625-lnnggc.jpeg", alt: "mndi3625-lnnggc.jpeg" },
|
const eventsResponse = await fetch(`${API_BASE}/api/events/public`);
|
||||||
{ src: "/images/gallery/mndi7upa-qxukqg.jpeg", alt: "mndi7upa-qxukqg.jpeg" },
|
if (eventsResponse.ok) {
|
||||||
{ src: "/images/gallery/mndi8kzg-oazjp8.jpeg", alt: "mndi8kzg-oazjp8.jpeg" },
|
const eventsData = await eventsResponse.json();
|
||||||
{ src: "/images/gallery/mndiabuo-m29xj0.jpeg", alt: "mndiabuo-m29xj0.jpeg" },
|
events = (eventsData.events || []).map((ev: any) => ({
|
||||||
{ src: "/images/gallery/mndicr59-n8suoy.jpeg", alt: "mndicr59-n8suoy.jpeg" },
|
image: `${API_BASE}${ev.imageUrl}`,
|
||||||
{ src: "/images/gallery/mndieqns-mjs7xe.jpeg", alt: "mndieqns-mjs7xe.jpeg" },
|
title: ev.title,
|
||||||
{ src: "/images/gallery/mndif8nv-aptjf6.jpeg", alt: "mndif8nv-aptjf6.jpeg" },
|
date: ev.date,
|
||||||
{ src: "/images/gallery/mndiggta-hnldkv.jpeg", alt: "mndiggta-hnldkv.jpeg" },
|
description: ev.description
|
||||||
{ src: "/images/gallery/mndih8lp-woprt4.webp", alt: "mndih8lp-woprt4.webp" }
|
}));
|
||||||
];
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch events:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch gallery images from backend API
|
||||||
|
let images = [];
|
||||||
|
try {
|
||||||
|
const galleryResponse = await fetch(`${API_BASE}/api/gallery/public`);
|
||||||
|
if (galleryResponse.ok) {
|
||||||
|
const galleryData = await galleryResponse.json();
|
||||||
|
images = (galleryData.images || []).map((img: any) => ({
|
||||||
|
src: `${API_BASE}${img.imageUrl}`,
|
||||||
|
alt: img.altText
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch gallery:', error);
|
||||||
|
}
|
||||||
---
|
---
|
||||||
|
|
||||||
<Layout>
|
<Layout>
|
||||||
<Hero id="hero" />
|
<Hero id="hero" />
|
||||||
<Banner />
|
|
||||||
<Welcome id="welcome" />
|
<Welcome id="welcome" />
|
||||||
<EventsGrid id="events" events={events} />
|
<EventsGrid id="events" events={events} />
|
||||||
<ImageCarousel id="gallery" images={images} />
|
<ImageCarousel id="gallery" images={images} />
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user