Compare commits
6 Commits
bc6c1e95d3
...
main-backu
| Author | SHA1 | Date | |
|---|---|---|---|
| cb43b4a7b5 | |||
| cbcb17a35c | |||
| 5922d5d274 | |||
| 96322a4776 | |||
| a5bdf7b4f5 | |||
| 03671a4d3e |
31
.env.example
Normal file
@ -0,0 +1,31 @@
|
||||
# Copy this file to .env.local for local development
|
||||
# Then run: npm run dev:local
|
||||
|
||||
# Public base URL for your local dev server
|
||||
PUBLIC_BASE_URL=http://localhost:4321
|
||||
|
||||
# OAuth (Gitea) settings for local development
|
||||
# Create an OAuth2 Application in your Gitea with Redirect URI:
|
||||
# http://localhost:4321/api/auth/callback
|
||||
# Then paste the resulting Client ID/Secret below
|
||||
OAUTH_PROVIDER=gitea
|
||||
OAUTH_CLIENT_ID=
|
||||
OAUTH_CLIENT_SECRET=
|
||||
OAUTH_AUTHORIZE_URL=https://git.bookageek.ch/login/oauth/authorize
|
||||
OAUTH_TOKEN_URL=https://git.bookageek.ch/login/oauth/access_token
|
||||
OAUTH_USERINFO_URL=https://git.bookageek.ch/api/v1/user
|
||||
|
||||
# Optional access control
|
||||
# OAUTH_ALLOWED_USERS=user1,user2
|
||||
# OAUTH_ALLOWED_ORG=your-org
|
||||
|
||||
# Gitea API for committing content changes (service account PAT)
|
||||
GITEA_BASE=https://git.bookageek.ch
|
||||
GITEA_OWNER=
|
||||
GITEA_REPO=
|
||||
GITEA_TOKEN=
|
||||
GIT_BRANCH=main
|
||||
|
||||
# Session and CSRF secrets (use random long strings in .env.local)
|
||||
SESSION_SECRET=
|
||||
CSRF_SECRET=
|
||||
1
.gitignore
vendored
@ -16,6 +16,7 @@ pnpm-debug.log*
|
||||
# environment variables
|
||||
.env
|
||||
.env.production
|
||||
.env.local
|
||||
|
||||
# macOS-specific files
|
||||
.DS_Store
|
||||
|
||||
40
CLAUDE.md
@ -1,40 +0,0 @@
|
||||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
|
||||
## Project Overview
|
||||
|
||||
This is a website for Gallus Pub, a bar/pub in Switzerland. The site is built with Astro, a static site generator, and uses component-based architecture with .astro files. Content is in German.
|
||||
|
||||
## Development Commands
|
||||
|
||||
```bash
|
||||
npm install # Install dependencies
|
||||
npm run dev # Start dev server at localhost:4321
|
||||
npm run build # Build production site to ./dist/
|
||||
npm run preview # Preview production build locally
|
||||
npm run astro ... # Run Astro CLI commands
|
||||
```
|
||||
|
||||
## Architecture
|
||||
|
||||
### Component Structure
|
||||
- **Layout.astro**: Base layout template that wraps all pages. Imports global styles (variables.css, index.css) and includes Header/Footer components
|
||||
- **Pages** (`src/pages/`): File-based routing where each .astro file becomes a route
|
||||
- `index.astro`: Main landing page that composes multiple sections (Hero, Welcome, EventsGrid, ImageCarousel, Drinks)
|
||||
- `Gallery.astro`, `Openings.astro`: Additional pages
|
||||
- **Components** (`src/components/`): Reusable UI components
|
||||
- Most components have corresponding CSS files in `src/styles/components/`
|
||||
- EventsGrid uses HoverCard components to display event information
|
||||
- Event data is defined directly in page files (e.g., events array in index.astro)
|
||||
|
||||
### Content Management Pattern
|
||||
Event data and image galleries are defined as JavaScript arrays in the frontmatter of page files (see index.astro:11-55). This is the current pattern for managing dynamic content rather than using a separate CMS or data files.
|
||||
|
||||
### Styling
|
||||
- Global styles: `src/styles/variables.css` (CSS custom properties) and `src/styles/index.css`
|
||||
- Component styles: `src/styles/components/[ComponentName].css`
|
||||
- All styles are imported in component files, not centrally
|
||||
|
||||
### Static Assets
|
||||
Images and other static files are in `/public/images/` and referenced with absolute paths (e.g., "/images/Gallery1.png")
|
||||
21
Dockerfile
@ -1,22 +1,29 @@
|
||||
FROM node:20-alpine AS build
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package*.json ./
|
||||
RUN npm ci
|
||||
RUN npm install
|
||||
|
||||
COPY . .
|
||||
# Ensure CSS variables are present
|
||||
RUN mkdir -p public/styles
|
||||
RUN cp -r styles/* public/styles/ || true
|
||||
|
||||
RUN npm run build
|
||||
|
||||
FROM node:20-alpine AS production
|
||||
|
||||
ENV NODE_ENV=production
|
||||
WORKDIR /app
|
||||
RUN npm install -g serve
|
||||
COPY --from=build /app/dist ./dist
|
||||
|
||||
# Copy built app and minimal runtime files
|
||||
COPY --from=build /app/dist /app/dist
|
||||
COPY --from=build /app/package*.json /app/
|
||||
|
||||
RUN npm pkg delete devDependencies || true
|
||||
|
||||
EXPOSE 3000
|
||||
CMD ["serve", "-s", "dist", "-l", "3000"]
|
||||
|
||||
# Run Astro server entry (node adapter standalone)
|
||||
CMD ["node", "dist/server/entry.mjs"]
|
||||
|
||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
||||
CMD wget -qO- http://localhost:3000/ || exit 1
|
||||
78
README.md
@ -1,47 +1,55 @@
|
||||
# Astro Starter Kit: Minimal
|
||||
# Gallus Pub Website
|
||||
|
||||
```sh
|
||||
npm create astro@latest -- --template minimal
|
||||
This is the Gallus Pub website built with Astro. It includes an admin area at `/admin` for editing content (events, gallery, texts). Changes are committed back to the Git repository via the Gitea API which triggers your Woodpecker + Fly.io deployment pipeline.
|
||||
|
||||
## Local development
|
||||
|
||||
To run the site locally with OAuth login (Gitea):
|
||||
|
||||
1. Copy the example env file and fill values:
|
||||
```bash
|
||||
cp .env.example .env.local
|
||||
```
|
||||
- Create a Gitea OAuth application with Redirect URI: `http://localhost:4321/api/auth/callback`.
|
||||
- Set `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` from Gitea.
|
||||
- Set `GITEA_OWNER`, `GITEA_REPO`, and a `GITEA_TOKEN` (PAT) with write access to the repo.
|
||||
- Generate random secrets for sessions/CSRF (e.g. `openssl rand -hex 32`).
|
||||
|
||||
2. Install dependencies:
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
[](https://stackblitz.com/github/withastro/astro/tree/latest/examples/minimal)
|
||||
[](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/minimal)
|
||||
[](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/minimal/devcontainer.json)
|
||||
3. Start dev server using your local env file:
|
||||
```bash
|
||||
npm run dev:local
|
||||
```
|
||||
The site runs at http://localhost:4321. Visit http://localhost:4321/admin to log in via Gitea OAuth.
|
||||
|
||||
> 🧑🚀 **Seasoned astronaut?** Delete this file. Have fun!
|
||||
Notes:
|
||||
- If OAuth variables are missing or malformed, the auth endpoints return a clear 500 with guidance instead of crashing.
|
||||
- Production secrets are configured on Fly.io; `.env.local` is ignored by Git.
|
||||
|
||||
## 🚀 Project Structure
|
||||
## Project structure
|
||||
|
||||
Inside of your Astro project, you'll see the following folders and files:
|
||||
|
||||
```text
|
||||
```
|
||||
/
|
||||
├── public/
|
||||
├── public/ # static assets
|
||||
├── src/
|
||||
│ └── pages/
|
||||
│ └── index.astro
|
||||
│ ├── content/ # editable JSON content (events, gallery)
|
||||
│ ├── pages/ # Astro pages, includes /admin and API routes
|
||||
│ ├── components/ # UI components
|
||||
│ └── utils/ # session helpers
|
||||
├── .env.example # template for local env
|
||||
├── fly.toml # Fly.io config
|
||||
├── Dockerfile
|
||||
└── package.json
|
||||
```
|
||||
|
||||
Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
|
||||
## Commands
|
||||
|
||||
There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
|
||||
|
||||
Any static assets, like images, can be placed in the `public/` directory.
|
||||
|
||||
## 🧞 Commands
|
||||
|
||||
All commands are run from the root of the project, from a terminal:
|
||||
|
||||
| Command | Action |
|
||||
| :------------------------ | :----------------------------------------------- |
|
||||
| `npm install` | Installs dependencies |
|
||||
| `npm run dev` | Starts local dev server at `localhost:4321` |
|
||||
| `npm run build` | Build your production site to `./dist/` |
|
||||
| `npm run preview` | Preview your build locally, before deploying |
|
||||
| `npm run astro ...` | Run CLI commands like `astro add`, `astro check` |
|
||||
| `npm run astro -- --help` | Get help using the Astro CLI |
|
||||
|
||||
## 👀 Want to learn more?
|
||||
|
||||
Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
|
||||
- `npm install` – install deps
|
||||
- `npm run dev` – dev server without loading .env.local (expects env to be present in the shell)
|
||||
- `npm run dev:local` – dev server loading `.env.local` via dotenv-cli
|
||||
- `npm run build` – production build (SSR via @astrojs/node)
|
||||
- `npm run preview` – preview the production build
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
// @ts-check
|
||||
import { defineConfig } from 'astro/config';
|
||||
import node from '@astrojs/node';
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({});
|
||||
export default defineConfig({
|
||||
output: 'server',
|
||||
adapter: node({ mode: 'standalone' })
|
||||
});
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
node_modules
|
||||
dist
|
||||
.env
|
||||
.env.local
|
||||
.env.*.local
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
.git
|
||||
.gitignore
|
||||
.vscode
|
||||
.idea
|
||||
.DS_Store
|
||||
*.md
|
||||
!README.md
|
||||
tmp
|
||||
/tmp
|
||||
coverage
|
||||
.nyc_output
|
||||
@ -1,29 +0,0 @@
|
||||
# Database (SQLite)
|
||||
DATABASE_PATH=./data/gallus_cms.db
|
||||
|
||||
# Gitea OAuth
|
||||
GITEA_URL=https://git.bookageek.ch
|
||||
GITEA_CLIENT_ID=your-oauth-client-id-here
|
||||
GITEA_CLIENT_SECRET=your-oauth-client-secret-here
|
||||
GITEA_REDIRECT_URI=http://localhost:3000/api/auth/callback
|
||||
GITEA_ALLOWED_USERS=sabrina,raphael,admin
|
||||
|
||||
# Git Configuration (use Gitea repository)
|
||||
GIT_REPO_URL=https://git.bookageek.ch/yourusername/Gallus_Pub.git
|
||||
GIT_TOKEN=your-gitea-personal-access-token-here
|
||||
GIT_USER_NAME=Gallus CMS
|
||||
GIT_USER_EMAIL=cms@galluspub.ch
|
||||
GIT_WORKSPACE_DIR=./data/workspace
|
||||
|
||||
# JWT & Session
|
||||
JWT_SECRET=your-super-secret-jwt-key-change-this
|
||||
SESSION_SECRET=your-session-secret-change-this
|
||||
|
||||
# Server
|
||||
PORT=3000
|
||||
NODE_ENV=development
|
||||
CORS_ORIGIN=http://localhost:5173
|
||||
FRONTEND_URL=http://localhost:5173
|
||||
|
||||
# Upload
|
||||
MAX_FILE_SIZE=5242880
|
||||
10
backend/.gitignore
vendored
@ -1,10 +0,0 @@
|
||||
node_modules
|
||||
dist
|
||||
.env
|
||||
*.log
|
||||
.DS_Store
|
||||
/tmp
|
||||
/data
|
||||
*.db
|
||||
*.db-wal
|
||||
*.db-shm
|
||||
@ -1,195 +0,0 @@
|
||||
# Deployment Guide
|
||||
|
||||
## Prerequisites
|
||||
|
||||
1. Fly.io CLI installed: `curl -L https://fly.io/install.sh | sh`
|
||||
2. Fly.io account: `flyctl auth login`
|
||||
3. Gitea OAuth app configured at git.bookageek.ch
|
||||
4. Gitea Personal Access Token for git operations
|
||||
|
||||
## Initial Setup
|
||||
|
||||
### 1. Create Fly.io App
|
||||
|
||||
```bash
|
||||
cd backend
|
||||
flyctl apps create gallus-cms-backend
|
||||
```
|
||||
|
||||
### 2. Create Volume for Data (SQLite DB + Git Workspace)
|
||||
|
||||
```bash
|
||||
flyctl volumes create gallus_data --size 2 --region ams
|
||||
```
|
||||
|
||||
This volume will store:
|
||||
- SQLite database at `/app/data/gallus_cms.db`
|
||||
- Git workspace at `/app/data/workspace`
|
||||
|
||||
### 3. Set Secrets
|
||||
|
||||
```bash
|
||||
flyctl secrets set \
|
||||
GITEA_CLIENT_ID="<your-gitea-oauth-client-id>" \
|
||||
GITEA_CLIENT_SECRET="<your-gitea-oauth-client-secret>" \
|
||||
GIT_TOKEN="<your-gitea-personal-access-token>" \
|
||||
JWT_SECRET="$(openssl rand -base64 32)" \
|
||||
SESSION_SECRET="$(openssl rand -base64 32)" \
|
||||
GIT_REPO_URL="https://git.bookageek.ch/yourusername/Gallus_Pub.git" \
|
||||
GIT_USER_NAME="Gallus CMS" \
|
||||
GIT_USER_EMAIL="cms@galluspub.ch" \
|
||||
GITEA_REDIRECT_URI="https://gallus-cms-backend.fly.dev/api/auth/callback" \
|
||||
FRONTEND_URL="https://cms.galluspub.ch" \
|
||||
CORS_ORIGIN="https://cms.galluspub.ch" \
|
||||
GITEA_ALLOWED_USERS="sabrina,raphael"
|
||||
```
|
||||
|
||||
### 4. Deploy
|
||||
|
||||
```bash
|
||||
flyctl deploy
|
||||
```
|
||||
|
||||
### 5. Initialize Database
|
||||
|
||||
After first deployment, SSH into the container and run migrations:
|
||||
```bash
|
||||
flyctl ssh console
|
||||
cd /app
|
||||
node dist/index.js # Start once to create the database file
|
||||
# Then exit (Ctrl+C) and run migrations
|
||||
npm run db:migrate
|
||||
exit
|
||||
```
|
||||
|
||||
Or simply let the app run - the database will be created automatically on first start.
|
||||
|
||||
## Gitea OAuth Configuration
|
||||
|
||||
Update your Gitea OAuth application redirect URI to include:
|
||||
```
|
||||
https://gallus-cms-backend.fly.dev/api/auth/callback
|
||||
```
|
||||
|
||||
## Useful Commands
|
||||
|
||||
### View Logs
|
||||
```bash
|
||||
flyctl logs
|
||||
```
|
||||
|
||||
### Check Status
|
||||
```bash
|
||||
flyctl status
|
||||
```
|
||||
|
||||
### SSH into Container
|
||||
```bash
|
||||
flyctl ssh console
|
||||
```
|
||||
|
||||
### Scale App
|
||||
```bash
|
||||
flyctl scale count 2
|
||||
```
|
||||
|
||||
### View Secrets
|
||||
```bash
|
||||
flyctl secrets list
|
||||
```
|
||||
|
||||
### Update a Secret
|
||||
```bash
|
||||
flyctl secrets set KEY=VALUE
|
||||
```
|
||||
|
||||
### Restart App
|
||||
```bash
|
||||
flyctl apps restart
|
||||
```
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Health Check
|
||||
```bash
|
||||
curl https://gallus-cms-backend.fly.dev/health
|
||||
```
|
||||
|
||||
### View Metrics
|
||||
```bash
|
||||
flyctl dashboard
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Deployment Fails
|
||||
- Check logs: `flyctl logs`
|
||||
- Verify all secrets are set: `flyctl secrets list`
|
||||
- Ensure Docker builds locally: `docker build -t test .`
|
||||
|
||||
### OAuth Not Working
|
||||
- Verify GITEA_REDIRECT_URI matches Gitea settings exactly
|
||||
- Check CORS_ORIGIN includes frontend domain
|
||||
- Review logs for authentication errors
|
||||
|
||||
### Git Push Fails
|
||||
- Verify GIT_TOKEN has correct permissions
|
||||
- Check GIT_REPO_URL is accessible
|
||||
- Ensure workspace volume is mounted
|
||||
|
||||
### Database Issues
|
||||
- Verify DATABASE_PATH is set correctly
|
||||
- Check volume is mounted: `flyctl ssh console` then `ls -la /app/data`
|
||||
- Verify database file permissions
|
||||
- Run migrations if needed: `flyctl ssh console` then `npm run db:migrate`
|
||||
|
||||
## Cost Optimization
|
||||
|
||||
Current configuration uses:
|
||||
- `shared-cpu-1x` with 512MB RAM
|
||||
- Auto-suspend when idle
|
||||
- 2GB volume for SQLite database + git workspace
|
||||
|
||||
Estimated cost: ~$5-10/month (no separate database cost with SQLite!)
|
||||
|
||||
## Updating
|
||||
|
||||
To deploy updates:
|
||||
```bash
|
||||
git pull
|
||||
flyctl deploy
|
||||
```
|
||||
|
||||
## Rollback
|
||||
|
||||
To rollback to previous version:
|
||||
```bash
|
||||
flyctl releases list
|
||||
flyctl releases rollback <version-number>
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
All sensitive environment variables should be set as Fly.io secrets (not in fly.toml):
|
||||
|
||||
Note: DATABASE_PATH and GIT_WORKSPACE_DIR are set in fly.toml as they're not sensitive.
|
||||
- `GITEA_CLIENT_ID` - OAuth client ID
|
||||
- `GITEA_CLIENT_SECRET` - OAuth client secret
|
||||
- `GIT_TOKEN` - Gitea personal access token
|
||||
- `JWT_SECRET` - JWT signing secret
|
||||
- `SESSION_SECRET` - Session cookie secret
|
||||
- `GIT_REPO_URL` - Full git repository URL
|
||||
- `GITEA_REDIRECT_URI` - OAuth callback URL
|
||||
- `FRONTEND_URL` - Frontend application URL
|
||||
- `CORS_ORIGIN` - Allowed CORS origin
|
||||
- `GITEA_ALLOWED_USERS` - Comma-separated list of allowed usernames
|
||||
|
||||
## Security Checklist
|
||||
|
||||
- [ ] All secrets set and not exposed in logs
|
||||
- [ ] HTTPS enforced (fly.toml: force_https = true)
|
||||
- [ ] CORS configured correctly
|
||||
- [ ] GITEA_ALLOWED_USERS whitelist configured
|
||||
- [ ] Database backups enabled
|
||||
- [ ] Health checks configured
|
||||
- [ ] Monitoring and alerts set up
|
||||
@ -1,67 +0,0 @@
|
||||
# Multi-stage build for Gallus CMS Backend
|
||||
|
||||
# Stage 1: Builder
|
||||
FROM node:20-alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install build dependencies for native modules (better-sqlite3)
|
||||
RUN apk add --no-cache python3 make g++
|
||||
|
||||
# Install dependencies
|
||||
COPY package*.json ./
|
||||
RUN npm ci
|
||||
|
||||
# Copy source
|
||||
COPY . .
|
||||
|
||||
# Build TypeScript
|
||||
RUN npm run build
|
||||
|
||||
# Stage 2: Production
|
||||
FROM node:20-alpine
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install runtime dependencies (git for simple-git, sqlite3 CLI tool)
|
||||
RUN apk add --no-cache git sqlite
|
||||
|
||||
# Install build dependencies for better-sqlite3 (needed for npm ci)
|
||||
RUN apk add --no-cache python3 make g++
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
|
||||
# Install production dependencies only
|
||||
RUN npm ci --production
|
||||
|
||||
# Remove build dependencies after install
|
||||
RUN apk del python3 make g++
|
||||
|
||||
# Copy built files from builder
|
||||
COPY --from=builder /app/dist ./dist
|
||||
COPY --from=builder /app/src/db/migrations ./dist/db/migrations
|
||||
|
||||
# Create directories
|
||||
RUN mkdir -p /app/workspace /app/data
|
||||
|
||||
# Ensure proper permissions
|
||||
RUN chown -R node:node /app
|
||||
|
||||
# Switch to non-root user
|
||||
USER node
|
||||
|
||||
# Expose port
|
||||
EXPOSE 8080
|
||||
|
||||
# Set environment
|
||||
ENV NODE_ENV=production
|
||||
ENV PORT=8080
|
||||
ENV DATABASE_PATH=/app/data/gallus_cms.db
|
||||
|
||||
# Health check
|
||||
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)})"
|
||||
|
||||
# Start application
|
||||
CMD ["node", "dist/index.js"]
|
||||
@ -1,55 +0,0 @@
|
||||
# Gallus Pub CMS Backend
|
||||
|
||||
Headless CMS backend for managing Gallus Pub website content with Gitea OAuth authentication.
|
||||
|
||||
## Setup
|
||||
|
||||
1. Install dependencies:
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
2. Create `.env` file from `.env.example`:
|
||||
```bash
|
||||
cp .env.example .env
|
||||
```
|
||||
|
||||
3. Update environment variables in `.env`:
|
||||
- Set Gitea OAuth credentials
|
||||
- Set Git repository URL and token
|
||||
- JWT secrets are already generated
|
||||
|
||||
4. Create data directory and run migrations:
|
||||
```bash
|
||||
mkdir -p data
|
||||
```
|
||||
|
||||
5. Generate and run migrations:
|
||||
```bash
|
||||
npm run db:generate
|
||||
npm run db:migrate
|
||||
```
|
||||
|
||||
6. Start development server:
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
|
||||
Server will run at http://localhost:3000
|
||||
|
||||
## Available Scripts
|
||||
|
||||
- `npm run dev` - Start development server with watch mode
|
||||
- `npm run build` - Build for production
|
||||
- `npm run start` - Start production server
|
||||
- `npm run db:generate` - Generate database migrations
|
||||
- `npm run db:migrate` - Run database migrations
|
||||
- `npm run db:studio` - Open Drizzle Studio
|
||||
|
||||
## Documentation
|
||||
|
||||
See parent directory for complete documentation:
|
||||
- `CMS_CONCEPT.md` - System architecture
|
||||
- `CMS_GITEA_AUTH.md` - Authentication details
|
||||
- `CMS_IMPLEMENTATION_EXAMPLE.md` - Code examples
|
||||
- `CMS_SETUP_GUIDE.md` - Deployment guide
|
||||
@ -1,216 +0,0 @@
|
||||
# Quick Start Guide - SQLite Version
|
||||
|
||||
## ✅ Migration Complete: PostgreSQL → SQLite
|
||||
|
||||
The backend now uses **SQLite** instead of PostgreSQL for simplified deployment and lower costs.
|
||||
|
||||
## 🚀 Quick Start (3 Steps)
|
||||
|
||||
### 1. Configure Environment
|
||||
|
||||
Edit `.env` file (already created):
|
||||
```bash
|
||||
# Required: Update these values
|
||||
GITEA_CLIENT_ID=<your-gitea-oauth-client-id>
|
||||
GITEA_CLIENT_SECRET=<your-gitea-oauth-client-secret>
|
||||
GIT_REPO_URL=https://git.bookageek.ch/<yourusername>/Gallus_Pub.git
|
||||
GIT_TOKEN=<your-gitea-personal-access-token>
|
||||
GITEA_ALLOWED_USERS=sabrina,raphael
|
||||
|
||||
# Already set (JWT secrets generated)
|
||||
JWT_SECRET=dOrvUqifjBLvk68kkDOvWPQper/gjsNMlAbWlVBQIrc=
|
||||
SESSION_SECRET=SD0ZrvLkv9GrtI8+3GDkxZXA1UnCN4CE3c4+2vA/fIM=
|
||||
|
||||
# Database (SQLite - no changes needed)
|
||||
DATABASE_PATH=./data/gallus_cms.db
|
||||
```
|
||||
|
||||
### 2. Initialize Database
|
||||
|
||||
```bash
|
||||
# Generate migration files from schema
|
||||
pnpm run db:generate
|
||||
|
||||
# Run migrations to create tables
|
||||
pnpm run db:migrate
|
||||
```
|
||||
|
||||
### 3. Start Development Server
|
||||
|
||||
```bash
|
||||
pnpm run dev
|
||||
```
|
||||
|
||||
Server will start at **http://localhost:3000**
|
||||
|
||||
## 📝 What Changed?
|
||||
|
||||
### Before (PostgreSQL)
|
||||
- Required PostgreSQL installation
|
||||
- Separate database service
|
||||
- Connection string configuration
|
||||
- ~$15/month hosting cost on Fly.io
|
||||
|
||||
### After (SQLite)
|
||||
- Single file database (`./data/gallus_cms.db`)
|
||||
- No separate database service needed
|
||||
- Works out of the box
|
||||
- **$0 database cost** (included in app volume)
|
||||
|
||||
## 🗂️ Database Location
|
||||
|
||||
- **Local:** `./data/gallus_cms.db`
|
||||
- **Production (Fly.io):** `/app/data/gallus_cms.db` (on persistent volume)
|
||||
- **Git Workspace:** Same `data/` directory
|
||||
|
||||
## 🧪 Test Authentication Flow
|
||||
|
||||
1. Make sure you have Gitea OAuth credentials configured
|
||||
2. Start dev server: `pnpm run dev`
|
||||
3. Visit: http://localhost:3000/api/auth/gitea
|
||||
4. Login with your Gitea credentials
|
||||
5. Should redirect back with JWT token
|
||||
|
||||
## 📚 Available Endpoints
|
||||
|
||||
### Health Check
|
||||
```bash
|
||||
curl http://localhost:3000/health
|
||||
```
|
||||
|
||||
### OAuth Flow
|
||||
```
|
||||
GET /api/auth/gitea - Initiate OAuth
|
||||
GET /api/auth/callback - OAuth callback
|
||||
GET /api/auth/me - Get current user (requires JWT)
|
||||
```
|
||||
|
||||
### Content Management (all require JWT)
|
||||
```
|
||||
GET/POST/PUT/DELETE /api/events
|
||||
GET/POST/PUT/DELETE /api/gallery
|
||||
GET/PUT /api/content/:section
|
||||
GET/PUT /api/settings/:key
|
||||
POST /api/publish
|
||||
```
|
||||
|
||||
## 🔐 Getting Gitea OAuth Credentials
|
||||
|
||||
1. Go to https://git.bookageek.ch/user/settings/applications
|
||||
2. Click "Manage OAuth2 Applications"
|
||||
3. Create new OAuth2 application:
|
||||
- **Name:** Gallus Pub CMS
|
||||
- **Redirect URI:** `http://localhost:3000/api/auth/callback`
|
||||
- **Confidential:** Yes
|
||||
4. Copy Client ID and Client Secret to `.env`
|
||||
|
||||
## 🎫 Getting Gitea Personal Access Token
|
||||
|
||||
1. Go to https://git.bookageek.ch/user/settings/applications
|
||||
2. Generate New Token
|
||||
3. **Name:** Gallus CMS Backend
|
||||
4. **Scopes:** Select `repo` (full repository access)
|
||||
5. Copy token to `.env` as `GIT_TOKEN`
|
||||
|
||||
## 📦 Project Structure
|
||||
|
||||
```
|
||||
backend/
|
||||
├── data/ # SQLite database & git workspace (gitignored)
|
||||
│ ├── gallus_cms.db # Database file
|
||||
│ └── workspace/ # Git repository clone
|
||||
├── src/
|
||||
│ ├── config/
|
||||
│ │ ├── database.ts # SQLite connection (updated)
|
||||
│ │ └── env.ts # DATABASE_PATH instead of URL
|
||||
│ ├── db/
|
||||
│ │ └── schema.ts # SQLite schema (updated)
|
||||
│ ├── routes/ # API routes
|
||||
│ ├── services/ # Core services
|
||||
│ └── index.ts # Main server
|
||||
├── .env # Your configuration
|
||||
├── package.json # Updated with better-sqlite3
|
||||
└── drizzle.config.ts # SQLite dialect
|
||||
```
|
||||
|
||||
## ⚙️ Scripts
|
||||
|
||||
```bash
|
||||
pnpm install # Install dependencies (done)
|
||||
pnpm run dev # Start dev server with watch
|
||||
pnpm run build # Build TypeScript
|
||||
pnpm run start # Start production server
|
||||
pnpm run db:generate # Generate migrations
|
||||
pnpm run db:migrate # Run migrations
|
||||
pnpm run db:studio # Open Drizzle Studio
|
||||
```
|
||||
|
||||
## 🚀 Deploy to Fly.io
|
||||
|
||||
See `DEPLOYMENT.md` for full deployment guide.
|
||||
|
||||
**Quick version:**
|
||||
```bash
|
||||
# Create volume for database & git workspace
|
||||
flyctl volumes create gallus_data --size 2 --region ams
|
||||
|
||||
# Set secrets
|
||||
flyctl secrets set GITEA_CLIENT_ID=... GITEA_CLIENT_SECRET=... # etc
|
||||
|
||||
# Deploy
|
||||
flyctl deploy
|
||||
```
|
||||
|
||||
**Cost:** ~$5-10/month (no separate database!)
|
||||
|
||||
## 🐛 Troubleshooting
|
||||
|
||||
### "tsx: command not found"
|
||||
```bash
|
||||
pnpm install
|
||||
```
|
||||
|
||||
### "DATABASE_PATH not set"
|
||||
Check `.env` file exists and has `DATABASE_PATH=./data/gallus_cms.db`
|
||||
|
||||
### "Database file not found"
|
||||
```bash
|
||||
mkdir -p data
|
||||
pnpm run db:migrate
|
||||
```
|
||||
|
||||
### "better-sqlite3" build errors
|
||||
Make sure you have build tools:
|
||||
- **Linux:** `apt-get install python3 make g++`
|
||||
- **macOS:** Install Xcode Command Line Tools
|
||||
- **Windows:** Install windows-build-tools
|
||||
|
||||
Then rebuild:
|
||||
```bash
|
||||
pnpm rebuild better-sqlite3
|
||||
```
|
||||
|
||||
## ✨ Benefits of SQLite
|
||||
|
||||
1. **Simpler** - No database server to manage
|
||||
2. **Faster** - No network overhead
|
||||
3. **Portable** - Single file, easy backups
|
||||
4. **Cost-effective** - No hosting fees
|
||||
5. **Perfect fit** - Low concurrency, simple queries
|
||||
|
||||
## 📖 Documentation
|
||||
|
||||
- `SQLITE_MIGRATION.md` - Detailed migration notes
|
||||
- `DEPLOYMENT.md` - Fly.io deployment guide
|
||||
- `README.md` - General setup instructions
|
||||
- `CMS_GITEA_AUTH.md` - OAuth authentication details (parent dir)
|
||||
- `CMS_CONCEPT.md` - Full system architecture (parent dir)
|
||||
|
||||
## ✅ Ready to Go!
|
||||
|
||||
Your backend is now configured for SQLite. Just:
|
||||
1. Add your Gitea credentials to `.env`
|
||||
2. Run `pnpm run db:generate && pnpm run db:migrate`
|
||||
3. Start with `pnpm run dev`
|
||||
|
||||
Happy coding! 🎉
|
||||
@ -1,217 +0,0 @@
|
||||
# SQLite Migration Summary
|
||||
|
||||
## Changes Made
|
||||
|
||||
The backend has been migrated from PostgreSQL to SQLite for both local development and production (Fly.io).
|
||||
|
||||
### Benefits of SQLite
|
||||
|
||||
1. **Simplified Deployment** - No separate database service needed
|
||||
2. **Lower Cost** - Save ~$15/month (no Postgres hosting)
|
||||
3. **Easier Development** - No need to install/run PostgreSQL locally
|
||||
4. **Single File Database** - Easy backups and migrations
|
||||
5. **Perfect for this use case** - Low concurrent writes, simple queries
|
||||
|
||||
## Modified Files
|
||||
|
||||
### Dependencies
|
||||
- **package.json**
|
||||
- Removed: `pg`, `@types/pg`
|
||||
- Added: `better-sqlite3`, `@types/better-sqlite3`
|
||||
|
||||
### Database Configuration
|
||||
- **src/config/database.ts**
|
||||
- Changed from `drizzle-orm/node-postgres` to `drizzle-orm/better-sqlite3`
|
||||
- Uses `DATABASE_PATH` instead of `DATABASE_URL`
|
||||
- Enabled WAL mode for better concurrent access
|
||||
|
||||
- **src/config/env.ts**
|
||||
- Changed `DATABASE_URL` to `DATABASE_PATH`
|
||||
- Default: `./data/gallus_cms.db`
|
||||
|
||||
- **src/db/schema.ts**
|
||||
- Changed from `pgTable` to `sqliteTable`
|
||||
- Changed `uuid()` to `text()` with `crypto.randomUUID()`
|
||||
- Changed `jsonb()` to `text(..., { mode: 'json' })`
|
||||
- Changed `timestamp()` to `integer(..., { mode: 'timestamp' })`
|
||||
- Changed `boolean()` to `integer(..., { mode: 'boolean' })`
|
||||
- Uses `sql\`(unixepoch())\`` for default timestamps
|
||||
|
||||
- **drizzle.config.ts**
|
||||
- Changed dialect from `postgresql` to `sqlite`
|
||||
- Uses `DATABASE_PATH` instead of `DATABASE_URL`
|
||||
|
||||
### Environment Files
|
||||
- **.env** and **.env.example**
|
||||
- Changed `DATABASE_URL=postgresql://...` to `DATABASE_PATH=./data/gallus_cms.db`
|
||||
- Changed `GIT_WORKSPACE_DIR=/tmp/gallus-repo` to `./data/workspace`
|
||||
|
||||
### Docker Configuration
|
||||
- **Dockerfile**
|
||||
- Added build tools for `better-sqlite3` native module (python3, make, g++)
|
||||
- Added `sqlite` CLI tool
|
||||
- Creates `/app/data` directory for database
|
||||
- Sets `DATABASE_PATH=/app/data/gallus_cms.db`
|
||||
- Proper permissions for non-root user
|
||||
|
||||
- **fly.toml**
|
||||
- Added `DATABASE_PATH` and `GIT_WORKSPACE_DIR` to [env]
|
||||
- Changed volume mount from `gallus_repo_workspace` to `gallus_data`
|
||||
- Mount destination: `/app/data` (contains both DB and git workspace)
|
||||
|
||||
### Documentation
|
||||
- **README.md** - Updated setup instructions
|
||||
- **DEPLOYMENT.md** - Removed Postgres setup, updated volume creation
|
||||
- **SQLITE_MIGRATION.md** - This file!
|
||||
|
||||
## Local Development
|
||||
|
||||
### Setup
|
||||
```bash
|
||||
# Dependencies already installed
|
||||
pnpm install
|
||||
|
||||
# Create data directory (done)
|
||||
mkdir -p data
|
||||
|
||||
# Database will be created automatically at ./data/gallus_cms.db
|
||||
```
|
||||
|
||||
### Generate and Run Migrations
|
||||
```bash
|
||||
# Generate migration files from schema
|
||||
pnpm run db:generate
|
||||
|
||||
# Run migrations to create tables
|
||||
pnpm run db:migrate
|
||||
```
|
||||
|
||||
### Start Development Server
|
||||
```bash
|
||||
pnpm run dev
|
||||
```
|
||||
|
||||
The database file will be created at `./data/gallus_cms.db` on first run.
|
||||
|
||||
## Production (Fly.io)
|
||||
|
||||
### Volume Setup
|
||||
```bash
|
||||
# Create single volume for both database and git workspace
|
||||
flyctl volumes create gallus_data --size 2 --region ams
|
||||
```
|
||||
|
||||
### Environment Variables
|
||||
Set in fly.toml (non-sensitive):
|
||||
- `DATABASE_PATH=/app/data/gallus_cms.db`
|
||||
- `GIT_WORKSPACE_DIR=/app/data/workspace`
|
||||
|
||||
Set as secrets (sensitive):
|
||||
- All other env vars (OAuth credentials, tokens, etc.)
|
||||
|
||||
### Deployment
|
||||
```bash
|
||||
flyctl deploy
|
||||
```
|
||||
|
||||
Database will be created automatically on first start. No need for separate database service!
|
||||
|
||||
## Database Location
|
||||
|
||||
### Local Development
|
||||
- **Database:** `./data/gallus_cms.db`
|
||||
- **WAL files:** `./data/gallus_cms.db-wal`, `./data/gallus_cms.db-shm`
|
||||
- **Git workspace:** `./data/workspace/`
|
||||
|
||||
### Production (Fly.io)
|
||||
- **Database:** `/app/data/gallus_cms.db` (on volume)
|
||||
- **Git workspace:** `/app/data/workspace/` (on volume)
|
||||
- **Volume name:** `gallus_data` (2GB)
|
||||
|
||||
## Backup Strategy
|
||||
|
||||
### Manual Backup
|
||||
```bash
|
||||
# Local
|
||||
cp data/gallus_cms.db data/gallus_cms.backup.db
|
||||
|
||||
# Production (Fly.io)
|
||||
flyctl ssh console
|
||||
sqlite3 /app/data/gallus_cms.db ".backup /app/data/backup.db"
|
||||
# Then copy back: flyctl ssh sftp get /app/data/backup.db
|
||||
```
|
||||
|
||||
### Automated Backup (Optional)
|
||||
Consider setting up a cron job or Fly.io machine to periodically:
|
||||
1. Create SQLite backup
|
||||
2. Upload to S3/Backblaze/etc.
|
||||
|
||||
## Performance Notes
|
||||
|
||||
SQLite is perfect for this use case because:
|
||||
- **Low write concurrency** - Single admin user making changes
|
||||
- **Read-heavy** - Mostly reading content for publish operations
|
||||
- **Small dataset** - Events, gallery images, content sections
|
||||
- **Simple queries** - No complex joins or aggregations
|
||||
|
||||
WAL mode is enabled for:
|
||||
- Better concurrent read access
|
||||
- Safer writes (crash recovery)
|
||||
- Improved performance
|
||||
|
||||
## Migration from Existing Data
|
||||
|
||||
If you had PostgreSQL data to migrate:
|
||||
|
||||
1. Export from Postgres:
|
||||
```sql
|
||||
\copy events TO 'events.csv' CSV HEADER;
|
||||
\copy gallery_images TO 'gallery.csv' CSV HEADER;
|
||||
-- etc.
|
||||
```
|
||||
|
||||
2. Import to SQLite:
|
||||
```sql
|
||||
.mode csv
|
||||
.import events.csv events
|
||||
.import gallery.csv gallery_images
|
||||
-- etc.
|
||||
```
|
||||
|
||||
## Known Limitations
|
||||
|
||||
1. **No native UUID type** - Using TEXT with UUID format
|
||||
2. **No native JSON type** - Using TEXT with JSON serialization (Drizzle handles this)
|
||||
3. **No native TIMESTAMP** - Using INTEGER with Unix epoch (Drizzle handles this)
|
||||
4. **Single writer** - Only one write transaction at a time (not an issue for this use case)
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "Database is locked" error
|
||||
- WAL mode should prevent this
|
||||
- Check if multiple processes are accessing the database
|
||||
- Ensure proper file permissions
|
||||
|
||||
### Native module build errors
|
||||
- Make sure build tools are installed: `apt-get install python3 make g++` (Linux)
|
||||
- On Alpine: `apk add python3 make g++`
|
||||
- Try rebuilding: `pnpm rebuild better-sqlite3`
|
||||
|
||||
### Database file not found
|
||||
- Check `DATABASE_PATH` is set correctly
|
||||
- Ensure `data/` directory exists
|
||||
- Check file permissions
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. ✅ Update dependencies
|
||||
2. ✅ Update database configuration
|
||||
3. ✅ Update schema
|
||||
4. ✅ Update Docker configuration
|
||||
5. ⏳ Generate migrations: `pnpm run db:generate`
|
||||
6. ⏳ Run migrations: `pnpm run db:migrate`
|
||||
7. ⏳ Test development server: `pnpm run dev`
|
||||
8. ⏳ Test publish flow
|
||||
9. ⏳ Deploy to Fly.io
|
||||
|
||||
The migration is complete! Just need to generate/run migrations and test.
|
||||
@ -1,10 +0,0 @@
|
||||
import type { Config } from 'drizzle-kit';
|
||||
|
||||
export default {
|
||||
schema: './src/db/schema.ts',
|
||||
out: './src/db/migrations',
|
||||
dialect: 'sqlite',
|
||||
dbCredentials: {
|
||||
url: process.env.DATABASE_PATH || './data/gallus_cms.db',
|
||||
},
|
||||
} satisfies Config;
|
||||
@ -1,35 +0,0 @@
|
||||
# Fly.io configuration for Gallus CMS Backend
|
||||
app = "gallus-cms-backend"
|
||||
primary_region = "ams"
|
||||
|
||||
[build]
|
||||
|
||||
[env]
|
||||
PORT = "8080"
|
||||
NODE_ENV = "production"
|
||||
GITEA_URL = "https://git.bookageek.ch"
|
||||
DATABASE_PATH = "/app/data/gallus_cms.db"
|
||||
GIT_WORKSPACE_DIR = "/app/data/workspace"
|
||||
|
||||
[http_service]
|
||||
internal_port = 8080
|
||||
force_https = true
|
||||
auto_stop_machines = "suspend"
|
||||
auto_start_machines = true
|
||||
min_machines_running = 0
|
||||
processes = ["app"]
|
||||
|
||||
[[http_service.checks]]
|
||||
grace_period = "10s"
|
||||
interval = "30s"
|
||||
method = "GET"
|
||||
timeout = "5s"
|
||||
path = "/health"
|
||||
|
||||
[[vm]]
|
||||
size = "shared-cpu-1x"
|
||||
memory = "512mb"
|
||||
|
||||
[mounts]
|
||||
source = "gallus_data"
|
||||
destination = "/app/data"
|
||||
@ -1,36 +0,0 @@
|
||||
{
|
||||
"name": "gallus-cms-backend",
|
||||
"version": "1.0.0",
|
||||
"type": "module",
|
||||
"description": "Headless CMS backend for Gallus Pub website",
|
||||
"scripts": {
|
||||
"dev": "tsx watch src/index.ts",
|
||||
"build": "tsc",
|
||||
"start": "node dist/index.js",
|
||||
"db:generate": "drizzle-kit generate",
|
||||
"db:migrate": "drizzle-kit migrate",
|
||||
"db:studio": "drizzle-kit studio"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastify/cookie": "^9.3.1",
|
||||
"@fastify/cors": "^9.0.1",
|
||||
"@fastify/jwt": "^8.0.0",
|
||||
"@fastify/multipart": "^8.1.0",
|
||||
"@fastify/session": "^10.8.0",
|
||||
"bcrypt": "^5.1.1",
|
||||
"better-sqlite3": "^11.10.0",
|
||||
"drizzle-orm": "^0.33.0",
|
||||
"fastify": "^4.26.0",
|
||||
"sharp": "^0.33.2",
|
||||
"simple-git": "^3.22.0",
|
||||
"zod": "^3.22.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bcrypt": "^5.0.2",
|
||||
"@types/better-sqlite3": "^7.6.9",
|
||||
"@types/node": "^20.11.16",
|
||||
"drizzle-kit": "^0.24.0",
|
||||
"tsx": "^4.20.6",
|
||||
"typescript": "^5.3.3"
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
import { drizzle } from 'drizzle-orm/better-sqlite3';
|
||||
import Database from 'better-sqlite3';
|
||||
import * as schema from '../db/schema.js';
|
||||
import { env } from './env.js';
|
||||
|
||||
if (!env.DATABASE_PATH) {
|
||||
throw new Error('DATABASE_PATH environment variable is not set');
|
||||
}
|
||||
|
||||
const sqlite = new Database(env.DATABASE_PATH);
|
||||
|
||||
// Enable WAL mode for better concurrent access
|
||||
sqlite.pragma('journal_mode = WAL');
|
||||
|
||||
export const db = drizzle(sqlite, { schema });
|
||||
@ -1,51 +0,0 @@
|
||||
// Environment configuration with validation
|
||||
export const env = {
|
||||
// Database
|
||||
DATABASE_PATH: process.env.DATABASE_PATH || './data/gallus_cms.db',
|
||||
|
||||
// Gitea OAuth
|
||||
GITEA_URL: process.env.GITEA_URL || 'https://git.bookageek.ch',
|
||||
GITEA_CLIENT_ID: process.env.GITEA_CLIENT_ID || '',
|
||||
GITEA_CLIENT_SECRET: process.env.GITEA_CLIENT_SECRET || '',
|
||||
GITEA_REDIRECT_URI: process.env.GITEA_REDIRECT_URI || 'http://localhost:3000/api/auth/callback',
|
||||
GITEA_ALLOWED_USERS: process.env.GITEA_ALLOWED_USERS || '',
|
||||
|
||||
// Git Configuration
|
||||
GIT_REPO_URL: process.env.GIT_REPO_URL || '',
|
||||
GIT_TOKEN: process.env.GIT_TOKEN || '',
|
||||
GIT_USER_NAME: process.env.GIT_USER_NAME || 'Gallus CMS',
|
||||
GIT_USER_EMAIL: process.env.GIT_USER_EMAIL || 'cms@galluspub.ch',
|
||||
GIT_WORKSPACE_DIR: process.env.GIT_WORKSPACE_DIR || '/tmp/gallus-repo',
|
||||
|
||||
// JWT & Session
|
||||
JWT_SECRET: process.env.JWT_SECRET || '',
|
||||
SESSION_SECRET: process.env.SESSION_SECRET || '',
|
||||
|
||||
// Server
|
||||
PORT: parseInt(process.env.PORT || '3000', 10),
|
||||
NODE_ENV: process.env.NODE_ENV || 'development',
|
||||
CORS_ORIGIN: process.env.CORS_ORIGIN || 'http://localhost:5173',
|
||||
FRONTEND_URL: process.env.FRONTEND_URL || 'http://localhost:5173',
|
||||
|
||||
// Upload
|
||||
MAX_FILE_SIZE: parseInt(process.env.MAX_FILE_SIZE || '5242880', 10),
|
||||
};
|
||||
|
||||
// Validate required environment variables
|
||||
export function validateEnv() {
|
||||
const required = [
|
||||
'DATABASE_PATH',
|
||||
'GITEA_CLIENT_ID',
|
||||
'GITEA_CLIENT_SECRET',
|
||||
'GIT_REPO_URL',
|
||||
'GIT_TOKEN',
|
||||
'JWT_SECRET',
|
||||
'SESSION_SECRET',
|
||||
];
|
||||
|
||||
const missing = required.filter(key => !env[key as keyof typeof env]);
|
||||
|
||||
if (missing.length > 0) {
|
||||
throw new Error(`Missing required environment variables: ${missing.join(', ')}`);
|
||||
}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
|
||||
import { sql } from 'drizzle-orm';
|
||||
|
||||
// Users table - stores Gitea user info for audit and access control
|
||||
export const users = sqliteTable('users', {
|
||||
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
||||
giteaId: text('gitea_id').notNull().unique(),
|
||||
giteaUsername: text('gitea_username').notNull(),
|
||||
giteaEmail: text('gitea_email'),
|
||||
displayName: text('display_name'),
|
||||
avatarUrl: text('avatar_url'),
|
||||
role: text('role').default('admin'),
|
||||
createdAt: integer('created_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
lastLogin: integer('last_login', { mode: 'timestamp' }),
|
||||
});
|
||||
|
||||
// Events table
|
||||
export 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())`),
|
||||
});
|
||||
|
||||
// Gallery images table
|
||||
export 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())`),
|
||||
});
|
||||
|
||||
// Content sections table (for text-based sections)
|
||||
export const contentSections = sqliteTable('content_sections', {
|
||||
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
||||
sectionName: text('section_name').notNull().unique(),
|
||||
contentJson: text('content_json', { mode: 'json' }).notNull(),
|
||||
updatedAt: integer('updated_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
});
|
||||
|
||||
// Site settings table (global config)
|
||||
export const siteSettings = sqliteTable('site_settings', {
|
||||
key: text('key').primaryKey(),
|
||||
value: text('value').notNull(),
|
||||
updatedAt: integer('updated_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
});
|
||||
|
||||
// Publish history (audit log)
|
||||
export const publishHistory = sqliteTable('publish_history', {
|
||||
id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
|
||||
userId: text('user_id').references(() => users.id),
|
||||
commitHash: text('commit_hash'),
|
||||
commitMessage: text('commit_message'),
|
||||
publishedAt: integer('published_at', { mode: 'timestamp' }).default(sql`(unixepoch())`),
|
||||
});
|
||||
@ -1,118 +0,0 @@
|
||||
import Fastify from 'fastify';
|
||||
import cors from '@fastify/cors';
|
||||
import jwt from '@fastify/jwt';
|
||||
import multipart from '@fastify/multipart';
|
||||
import cookie from '@fastify/cookie';
|
||||
import session from '@fastify/session';
|
||||
import { authenticate } from './middleware/auth.middleware.js';
|
||||
import { env, validateEnv } from './config/env.js';
|
||||
|
||||
// Import routes
|
||||
import authRoute from './routes/auth.js';
|
||||
import eventsRoute from './routes/events.js';
|
||||
import galleryRoute from './routes/gallery.js';
|
||||
import contentRoute from './routes/content.js';
|
||||
import settingsRoute from './routes/settings.js';
|
||||
import publishRoute from './routes/publish.js';
|
||||
|
||||
// Validate environment variables
|
||||
try {
|
||||
validateEnv();
|
||||
} catch (error) {
|
||||
console.error('Environment validation failed:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const fastify = Fastify({
|
||||
logger: {
|
||||
level: env.NODE_ENV === 'production' ? 'info' : 'debug',
|
||||
transport: env.NODE_ENV === 'development' ? {
|
||||
target: 'pino-pretty',
|
||||
options: {
|
||||
translateTime: 'HH:MM:ss Z',
|
||||
ignore: 'pid,hostname',
|
||||
},
|
||||
} : undefined,
|
||||
},
|
||||
});
|
||||
|
||||
// Register plugins
|
||||
fastify.register(cors, {
|
||||
origin: env.CORS_ORIGIN,
|
||||
credentials: true,
|
||||
});
|
||||
|
||||
fastify.register(cookie);
|
||||
|
||||
fastify.register(session, {
|
||||
secret: env.SESSION_SECRET,
|
||||
cookie: {
|
||||
secure: env.NODE_ENV === 'production',
|
||||
httpOnly: true,
|
||||
maxAge: 600000, // 10 minutes (only needed for OAuth flow)
|
||||
},
|
||||
});
|
||||
|
||||
fastify.register(jwt, {
|
||||
secret: env.JWT_SECRET,
|
||||
});
|
||||
|
||||
fastify.register(multipart, {
|
||||
limits: {
|
||||
fileSize: env.MAX_FILE_SIZE,
|
||||
},
|
||||
});
|
||||
|
||||
// Decorate fastify with authenticate method
|
||||
fastify.decorate('authenticate', authenticate);
|
||||
|
||||
// Register routes
|
||||
fastify.register(authRoute, { prefix: '/api' });
|
||||
fastify.register(eventsRoute, { prefix: '/api' });
|
||||
fastify.register(galleryRoute, { prefix: '/api' });
|
||||
fastify.register(contentRoute, { prefix: '/api' });
|
||||
fastify.register(settingsRoute, { prefix: '/api' });
|
||||
fastify.register(publishRoute, { prefix: '/api' });
|
||||
|
||||
// Health check
|
||||
fastify.get('/health', async () => {
|
||||
return {
|
||||
status: 'ok',
|
||||
timestamp: new Date().toISOString(),
|
||||
environment: env.NODE_ENV,
|
||||
};
|
||||
});
|
||||
|
||||
// Root endpoint
|
||||
fastify.get('/', async () => {
|
||||
return {
|
||||
name: 'Gallus Pub CMS Backend',
|
||||
version: '1.0.0',
|
||||
status: 'running',
|
||||
};
|
||||
});
|
||||
|
||||
// Error handler
|
||||
fastify.setErrorHandler((error, request, reply) => {
|
||||
fastify.log.error(error);
|
||||
|
||||
reply.status(error.statusCode || 500).send({
|
||||
error: error.message || 'Internal Server Error',
|
||||
statusCode: error.statusCode || 500,
|
||||
});
|
||||
});
|
||||
|
||||
// Start server
|
||||
const start = async () => {
|
||||
try {
|
||||
await fastify.listen({ port: env.PORT, host: '0.0.0.0' });
|
||||
console.log(`🚀 Server listening on port ${env.PORT}`);
|
||||
console.log(`📝 Environment: ${env.NODE_ENV}`);
|
||||
console.log(`🔐 CORS Origin: ${env.CORS_ORIGIN}`);
|
||||
} catch (err) {
|
||||
fastify.log.error(err);
|
||||
process.exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
start();
|
||||
@ -1,12 +0,0 @@
|
||||
import { FastifyRequest, FastifyReply } from 'fastify';
|
||||
|
||||
export async function authenticate(
|
||||
request: FastifyRequest,
|
||||
reply: FastifyReply
|
||||
) {
|
||||
try {
|
||||
await request.jwtVerify();
|
||||
} catch (err) {
|
||||
reply.code(401).send({ error: 'Unauthorized' });
|
||||
}
|
||||
}
|
||||
@ -1,164 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { users } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { GiteaService } from '../services/gitea.service.js';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
const callbackSchema = z.object({
|
||||
code: z.string(),
|
||||
state: z.string(),
|
||||
});
|
||||
|
||||
const authRoute: FastifyPluginAsync = async (fastify) => {
|
||||
const giteaService = new GiteaService();
|
||||
|
||||
/**
|
||||
* GET /auth/gitea
|
||||
* Initiate OAuth flow
|
||||
*/
|
||||
fastify.get('/auth/gitea', async (request, reply) => {
|
||||
// Generate CSRF state token
|
||||
const state = giteaService.generateState();
|
||||
|
||||
// Store state in session
|
||||
request.session.set('oauth_state', state);
|
||||
|
||||
// Generate authorization URL
|
||||
const authUrl = giteaService.getAuthorizationUrl(state);
|
||||
|
||||
// Redirect to Gitea
|
||||
return reply.redirect(authUrl);
|
||||
});
|
||||
|
||||
/**
|
||||
* GET /auth/callback
|
||||
* OAuth callback endpoint
|
||||
*/
|
||||
fastify.get('/auth/callback', {
|
||||
schema: {
|
||||
querystring: callbackSchema,
|
||||
},
|
||||
}, async (request, reply) => {
|
||||
try {
|
||||
const { code, state } = request.query as z.infer<typeof callbackSchema>;
|
||||
|
||||
// Verify CSRF state
|
||||
const expectedState = request.session.get('oauth_state');
|
||||
if (!expectedState || state !== expectedState) {
|
||||
return reply.code(400).send({ error: 'Invalid state parameter' });
|
||||
}
|
||||
|
||||
// Clear state from session
|
||||
request.session.delete('oauth_state');
|
||||
|
||||
// Exchange code for access token
|
||||
const tokenResponse = await giteaService.exchangeCodeForToken(code);
|
||||
|
||||
// Fetch user info from Gitea
|
||||
const giteaUser = await giteaService.getUserInfo(tokenResponse.access_token);
|
||||
|
||||
// Check if user is allowed
|
||||
if (!giteaService.isUserAllowed(giteaUser.login)) {
|
||||
return reply.code(403).send({
|
||||
error: 'Access denied. You are not authorized to access this CMS.'
|
||||
});
|
||||
}
|
||||
|
||||
// Find or create user in database
|
||||
let [user] = await db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.giteaId, giteaUser.id.toString()))
|
||||
.limit(1);
|
||||
|
||||
if (!user) {
|
||||
// Create new user
|
||||
[user] = await db.insert(users).values({
|
||||
giteaId: giteaUser.id.toString(),
|
||||
giteaUsername: giteaUser.login,
|
||||
giteaEmail: giteaUser.email,
|
||||
displayName: giteaUser.full_name,
|
||||
avatarUrl: giteaUser.avatar_url,
|
||||
lastLogin: new Date(),
|
||||
}).returning();
|
||||
} else {
|
||||
// Update existing user
|
||||
[user] = await db
|
||||
.update(users)
|
||||
.set({
|
||||
giteaUsername: giteaUser.login,
|
||||
giteaEmail: giteaUser.email,
|
||||
displayName: giteaUser.full_name,
|
||||
avatarUrl: giteaUser.avatar_url,
|
||||
lastLogin: new Date(),
|
||||
})
|
||||
.where(eq(users.id, user.id))
|
||||
.returning();
|
||||
}
|
||||
|
||||
// Generate JWT for session management
|
||||
const token = fastify.jwt.sign(
|
||||
{
|
||||
id: user.id,
|
||||
giteaId: user.giteaId,
|
||||
username: user.giteaUsername,
|
||||
role: user.role,
|
||||
},
|
||||
{ expiresIn: '24h' }
|
||||
);
|
||||
|
||||
// Redirect to frontend with token
|
||||
const frontendUrl = env.FRONTEND_URL;
|
||||
return reply.redirect(`${frontendUrl}/auth/callback?token=${token}`);
|
||||
|
||||
} catch (error) {
|
||||
fastify.log.error('OAuth callback error:', error);
|
||||
return reply.code(500).send({ error: 'Authentication failed' });
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* GET /auth/me
|
||||
* Get current user info
|
||||
*/
|
||||
fastify.get('/auth/me', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const userId = request.user.id;
|
||||
|
||||
const [user] = await db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.id, userId))
|
||||
.limit(1);
|
||||
|
||||
if (!user) {
|
||||
return reply.code(404).send({ error: 'User not found' });
|
||||
}
|
||||
|
||||
return {
|
||||
id: user.id,
|
||||
username: user.giteaUsername,
|
||||
email: user.giteaEmail,
|
||||
displayName: user.displayName,
|
||||
avatarUrl: user.avatarUrl,
|
||||
role: user.role,
|
||||
};
|
||||
});
|
||||
|
||||
/**
|
||||
* POST /auth/logout
|
||||
* Logout (client-side token deletion)
|
||||
*/
|
||||
fastify.post('/auth/logout', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
// For JWT, logout is primarily client-side (delete token)
|
||||
// You could maintain a token blacklist in Redis for production
|
||||
return { message: 'Logged out successfully' };
|
||||
});
|
||||
};
|
||||
|
||||
export default authRoute;
|
||||
@ -1,99 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { contentSections } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
const contentSectionSchema = z.object({
|
||||
contentJson: z.record(z.any()),
|
||||
});
|
||||
|
||||
const contentRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
// Get content section
|
||||
fastify.get('/content/:section', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { section } = request.params as { section: string };
|
||||
|
||||
const [content] = await db
|
||||
.select()
|
||||
.from(contentSections)
|
||||
.where(eq(contentSections.sectionName, section))
|
||||
.limit(1);
|
||||
|
||||
if (!content) {
|
||||
return reply.code(404).send({ error: 'Content section not found' });
|
||||
}
|
||||
|
||||
return {
|
||||
section: content.sectionName,
|
||||
content: content.contentJson,
|
||||
updatedAt: content.updatedAt,
|
||||
};
|
||||
});
|
||||
|
||||
// Update content section
|
||||
fastify.put('/content/:section', {
|
||||
schema: {
|
||||
body: contentSectionSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { section } = request.params as { section: string };
|
||||
const { contentJson } = request.body as z.infer<typeof contentSectionSchema>;
|
||||
|
||||
// Check if section exists
|
||||
const [existing] = await db
|
||||
.select()
|
||||
.from(contentSections)
|
||||
.where(eq(contentSections.sectionName, section))
|
||||
.limit(1);
|
||||
|
||||
let result;
|
||||
|
||||
if (existing) {
|
||||
// Update existing
|
||||
[result] = await db
|
||||
.update(contentSections)
|
||||
.set({
|
||||
contentJson,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(eq(contentSections.sectionName, section))
|
||||
.returning();
|
||||
} else {
|
||||
// Create new
|
||||
[result] = await db
|
||||
.insert(contentSections)
|
||||
.values({
|
||||
sectionName: section,
|
||||
contentJson,
|
||||
})
|
||||
.returning();
|
||||
}
|
||||
|
||||
return {
|
||||
section: result.sectionName,
|
||||
content: result.contentJson,
|
||||
updatedAt: result.updatedAt,
|
||||
};
|
||||
});
|
||||
|
||||
// List all content sections
|
||||
fastify.get('/content', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const sections = await db.select().from(contentSections);
|
||||
|
||||
return {
|
||||
sections: sections.map(s => ({
|
||||
section: s.sectionName,
|
||||
content: s.contentJson,
|
||||
updatedAt: s.updatedAt,
|
||||
})),
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
export default contentRoute;
|
||||
@ -1,123 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { events } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
const eventSchema = z.object({
|
||||
title: z.string().min(1).max(200),
|
||||
date: z.string().min(1).max(100),
|
||||
description: z.string().min(1),
|
||||
imageUrl: z.string().url(),
|
||||
displayOrder: z.number().int().min(0),
|
||||
isPublished: z.boolean().optional().default(true),
|
||||
});
|
||||
|
||||
const eventsRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
// List all events
|
||||
fastify.get('/events', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const allEvents = await db.select().from(events).orderBy(events.displayOrder);
|
||||
return { events: allEvents };
|
||||
});
|
||||
|
||||
// Get single event
|
||||
fastify.get('/events/:id', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const event = await db.select().from(events).where(eq(events.id, id)).limit(1);
|
||||
|
||||
if (event.length === 0) {
|
||||
return reply.code(404).send({ error: 'Event not found' });
|
||||
}
|
||||
|
||||
return { event: event[0] };
|
||||
});
|
||||
|
||||
// Create event
|
||||
fastify.post('/events', {
|
||||
schema: {
|
||||
body: eventSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const data = request.body as z.infer<typeof eventSchema>;
|
||||
|
||||
const [newEvent] = await db.insert(events).values(data).returning();
|
||||
|
||||
return reply.code(201).send({ event: newEvent });
|
||||
});
|
||||
|
||||
// Update event
|
||||
fastify.put('/events/:id', {
|
||||
schema: {
|
||||
body: eventSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const data = request.body as z.infer<typeof eventSchema>;
|
||||
|
||||
const [updated] = await db
|
||||
.update(events)
|
||||
.set({ ...data, updatedAt: new Date() })
|
||||
.where(eq(events.id, id))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
return reply.code(404).send({ error: 'Event not found' });
|
||||
}
|
||||
|
||||
return { event: updated };
|
||||
});
|
||||
|
||||
// Delete event
|
||||
fastify.delete('/events/:id', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
|
||||
const [deleted] = await db
|
||||
.delete(events)
|
||||
.where(eq(events.id, id))
|
||||
.returning();
|
||||
|
||||
if (!deleted) {
|
||||
return reply.code(404).send({ error: 'Event not found' });
|
||||
}
|
||||
|
||||
return { message: 'Event deleted successfully' };
|
||||
});
|
||||
|
||||
// Reorder events
|
||||
fastify.put('/events/reorder', {
|
||||
schema: {
|
||||
body: z.object({
|
||||
orders: z.array(z.object({
|
||||
id: z.string().uuid(),
|
||||
displayOrder: z.number().int().min(0),
|
||||
})),
|
||||
}),
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { orders } = request.body as { orders: Array<{ id: string; displayOrder: number }> };
|
||||
|
||||
// Update all in transaction
|
||||
await db.transaction(async (tx) => {
|
||||
for (const { id, displayOrder } of orders) {
|
||||
await tx
|
||||
.update(events)
|
||||
.set({ displayOrder })
|
||||
.where(eq(events.id, id));
|
||||
}
|
||||
});
|
||||
|
||||
return { message: 'Events reordered successfully' };
|
||||
});
|
||||
};
|
||||
|
||||
export default eventsRoute;
|
||||
@ -1,121 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { galleryImages } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
const galleryImageSchema = z.object({
|
||||
imageUrl: z.string().url(),
|
||||
altText: z.string().min(1).max(200),
|
||||
displayOrder: z.number().int().min(0),
|
||||
isPublished: z.boolean().optional().default(true),
|
||||
});
|
||||
|
||||
const galleryRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
// List all gallery images
|
||||
fastify.get('/gallery', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const images = await db.select().from(galleryImages).orderBy(galleryImages.displayOrder);
|
||||
return { images };
|
||||
});
|
||||
|
||||
// Get single gallery image
|
||||
fastify.get('/gallery/:id', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const image = await db.select().from(galleryImages).where(eq(galleryImages.id, id)).limit(1);
|
||||
|
||||
if (image.length === 0) {
|
||||
return reply.code(404).send({ error: 'Image not found' });
|
||||
}
|
||||
|
||||
return { image: image[0] };
|
||||
});
|
||||
|
||||
// Create gallery image
|
||||
fastify.post('/gallery', {
|
||||
schema: {
|
||||
body: galleryImageSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const data = request.body as z.infer<typeof galleryImageSchema>;
|
||||
|
||||
const [newImage] = await db.insert(galleryImages).values(data).returning();
|
||||
|
||||
return reply.code(201).send({ image: newImage });
|
||||
});
|
||||
|
||||
// Update gallery image
|
||||
fastify.put('/gallery/:id', {
|
||||
schema: {
|
||||
body: galleryImageSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
const data = request.body as z.infer<typeof galleryImageSchema>;
|
||||
|
||||
const [updated] = await db
|
||||
.update(galleryImages)
|
||||
.set(data)
|
||||
.where(eq(galleryImages.id, id))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
return reply.code(404).send({ error: 'Image not found' });
|
||||
}
|
||||
|
||||
return { image: updated };
|
||||
});
|
||||
|
||||
// Delete gallery image
|
||||
fastify.delete('/gallery/:id', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { id } = request.params as { id: string };
|
||||
|
||||
const [deleted] = await db
|
||||
.delete(galleryImages)
|
||||
.where(eq(galleryImages.id, id))
|
||||
.returning();
|
||||
|
||||
if (!deleted) {
|
||||
return reply.code(404).send({ error: 'Image not found' });
|
||||
}
|
||||
|
||||
return { message: 'Image deleted successfully' };
|
||||
});
|
||||
|
||||
// Reorder gallery images
|
||||
fastify.put('/gallery/reorder', {
|
||||
schema: {
|
||||
body: z.object({
|
||||
orders: z.array(z.object({
|
||||
id: z.string().uuid(),
|
||||
displayOrder: z.number().int().min(0),
|
||||
})),
|
||||
}),
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { orders } = request.body as { orders: Array<{ id: string; displayOrder: number }> };
|
||||
|
||||
// Update all in transaction
|
||||
await db.transaction(async (tx) => {
|
||||
for (const { id, displayOrder } of orders) {
|
||||
await tx
|
||||
.update(galleryImages)
|
||||
.set({ displayOrder })
|
||||
.where(eq(galleryImages.id, id));
|
||||
}
|
||||
});
|
||||
|
||||
return { message: 'Gallery images reordered successfully' };
|
||||
});
|
||||
};
|
||||
|
||||
export default galleryRoute;
|
||||
@ -1,122 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { GitService } from '../services/git.service.js';
|
||||
import { FileGeneratorService } from '../services/file-generator.service.js';
|
||||
import { db } from '../config/database.js';
|
||||
import { events, galleryImages, contentSections, publishHistory } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
const publishSchema = z.object({
|
||||
commitMessage: z.string().min(1).max(200),
|
||||
});
|
||||
|
||||
const publishRoute: FastifyPluginAsync = async (fastify) => {
|
||||
fastify.post('/publish', {
|
||||
schema: {
|
||||
body: publishSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
try {
|
||||
const { commitMessage } = request.body as z.infer<typeof publishSchema>;
|
||||
const userId = request.user.id;
|
||||
|
||||
fastify.log.info('Starting publish process...');
|
||||
|
||||
// Initialize git service
|
||||
const gitService = new GitService();
|
||||
await gitService.initialize();
|
||||
|
||||
fastify.log.info('Git repository initialized');
|
||||
|
||||
// Fetch all content from database
|
||||
const eventsData = await db
|
||||
.select()
|
||||
.from(events)
|
||||
.where(eq(events.isPublished, true))
|
||||
.orderBy(events.displayOrder);
|
||||
|
||||
const galleryData = await db
|
||||
.select()
|
||||
.from(galleryImages)
|
||||
.where(eq(galleryImages.isPublished, true))
|
||||
.orderBy(galleryImages.displayOrder);
|
||||
|
||||
const sectionsData = await db.select().from(contentSections);
|
||||
const sectionsMap = new Map(
|
||||
sectionsData.map(s => [s.sectionName, s.contentJson as any])
|
||||
);
|
||||
|
||||
fastify.log.info(`Fetched ${eventsData.length} events, ${galleryData.length} images, ${sectionsData.length} sections`);
|
||||
|
||||
// Generate and write files
|
||||
const fileGenerator = new FileGeneratorService();
|
||||
await fileGenerator.writeFiles(
|
||||
gitService.getWorkspacePath(''),
|
||||
eventsData.map(e => ({
|
||||
title: e.title,
|
||||
date: e.date,
|
||||
description: e.description,
|
||||
imageUrl: e.imageUrl,
|
||||
})),
|
||||
galleryData.map(g => ({
|
||||
imageUrl: g.imageUrl,
|
||||
altText: g.altText,
|
||||
})),
|
||||
sectionsMap
|
||||
);
|
||||
|
||||
fastify.log.info('Files generated successfully');
|
||||
|
||||
// Commit and push
|
||||
const commitHash = await gitService.commitAndPush(commitMessage);
|
||||
|
||||
fastify.log.info(`Changes committed: ${commitHash}`);
|
||||
|
||||
// Record in history
|
||||
await db.insert(publishHistory).values({
|
||||
userId,
|
||||
commitHash,
|
||||
commitMessage,
|
||||
});
|
||||
|
||||
return {
|
||||
success: true,
|
||||
commitHash,
|
||||
message: 'Changes published successfully',
|
||||
};
|
||||
|
||||
} catch (error) {
|
||||
fastify.log.error('Publish error:', error);
|
||||
|
||||
// Attempt to reset git state on error
|
||||
try {
|
||||
const gitService = new GitService();
|
||||
await gitService.reset();
|
||||
} catch (resetError) {
|
||||
fastify.log.error('Failed to reset git state:', resetError);
|
||||
}
|
||||
|
||||
return reply.code(500).send({
|
||||
success: false,
|
||||
error: 'Failed to publish changes',
|
||||
details: error instanceof Error ? error.message : 'Unknown error',
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Get publish history
|
||||
fastify.get('/publish/history', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const history = await db
|
||||
.select()
|
||||
.from(publishHistory)
|
||||
.orderBy(publishHistory.publishedAt)
|
||||
.limit(20);
|
||||
|
||||
return { history };
|
||||
});
|
||||
};
|
||||
|
||||
export default publishRoute;
|
||||
@ -1,116 +0,0 @@
|
||||
import { FastifyPluginAsync } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import { db } from '../config/database.js';
|
||||
import { siteSettings } from '../db/schema.js';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
const settingSchema = z.object({
|
||||
value: z.string(),
|
||||
});
|
||||
|
||||
const settingsRoute: FastifyPluginAsync = async (fastify) => {
|
||||
|
||||
// Get all settings
|
||||
fastify.get('/settings', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const settings = await db.select().from(siteSettings);
|
||||
|
||||
return {
|
||||
settings: settings.reduce((acc, setting) => {
|
||||
acc[setting.key] = setting.value;
|
||||
return acc;
|
||||
}, {} as Record<string, string>),
|
||||
};
|
||||
});
|
||||
|
||||
// Get single setting
|
||||
fastify.get('/settings/:key', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { key } = request.params as { key: string };
|
||||
|
||||
const [setting] = await db
|
||||
.select()
|
||||
.from(siteSettings)
|
||||
.where(eq(siteSettings.key, key))
|
||||
.limit(1);
|
||||
|
||||
if (!setting) {
|
||||
return reply.code(404).send({ error: 'Setting not found' });
|
||||
}
|
||||
|
||||
return {
|
||||
key: setting.key,
|
||||
value: setting.value,
|
||||
updatedAt: setting.updatedAt,
|
||||
};
|
||||
});
|
||||
|
||||
// Update setting
|
||||
fastify.put('/settings/:key', {
|
||||
schema: {
|
||||
body: settingSchema,
|
||||
},
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { key } = request.params as { key: string };
|
||||
const { value } = request.body as z.infer<typeof settingSchema>;
|
||||
|
||||
// Check if setting exists
|
||||
const [existing] = await db
|
||||
.select()
|
||||
.from(siteSettings)
|
||||
.where(eq(siteSettings.key, key))
|
||||
.limit(1);
|
||||
|
||||
let result;
|
||||
|
||||
if (existing) {
|
||||
// Update existing
|
||||
[result] = await db
|
||||
.update(siteSettings)
|
||||
.set({
|
||||
value,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where(eq(siteSettings.key, key))
|
||||
.returning();
|
||||
} else {
|
||||
// Create new
|
||||
[result] = await db
|
||||
.insert(siteSettings)
|
||||
.values({
|
||||
key,
|
||||
value,
|
||||
})
|
||||
.returning();
|
||||
}
|
||||
|
||||
return {
|
||||
key: result.key,
|
||||
value: result.value,
|
||||
updatedAt: result.updatedAt,
|
||||
};
|
||||
});
|
||||
|
||||
// Delete setting
|
||||
fastify.delete('/settings/:key', {
|
||||
preHandler: [fastify.authenticate],
|
||||
}, async (request, reply) => {
|
||||
const { key } = request.params as { key: string };
|
||||
|
||||
const [deleted] = await db
|
||||
.delete(siteSettings)
|
||||
.where(eq(siteSettings.key, key))
|
||||
.returning();
|
||||
|
||||
if (!deleted) {
|
||||
return reply.code(404).send({ error: 'Setting not found' });
|
||||
}
|
||||
|
||||
return { message: 'Setting deleted successfully' };
|
||||
});
|
||||
};
|
||||
|
||||
export default settingsRoute;
|
||||
@ -1,239 +0,0 @@
|
||||
import { writeFile } from 'fs/promises';
|
||||
import path from 'path';
|
||||
|
||||
interface Event {
|
||||
title: string;
|
||||
date: string;
|
||||
description: string;
|
||||
imageUrl: string;
|
||||
}
|
||||
|
||||
interface GalleryImage {
|
||||
imageUrl: string;
|
||||
altText: string;
|
||||
}
|
||||
|
||||
interface ContentSection {
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
export class FileGeneratorService {
|
||||
|
||||
escapeQuotes(str: string): string {
|
||||
return str.replace(/"/g, '\\"');
|
||||
}
|
||||
|
||||
escapeBackticks(str: string): string {
|
||||
return str.replace(/`/g, '\\`').replace(/\${/g, '\\${');
|
||||
}
|
||||
|
||||
generateIndexAstro(events: Event[], images: GalleryImage[]): string {
|
||||
const eventsCode = events.map(e => `\t{
|
||||
\t\timage: "${e.imageUrl}",
|
||||
\t\ttitle: "${this.escapeQuotes(e.title)}",
|
||||
\t\tdate: "${e.date}",
|
||||
\t\tdescription: \`
|
||||
\t\t\t${this.escapeBackticks(e.description)}
|
||||
\t\t\`,
|
||||
\t}`).join(',\n');
|
||||
|
||||
const imagesCode = images.map(g =>
|
||||
`\t{ src: "${g.imageUrl}", alt: "${this.escapeQuotes(g.altText)}" }`
|
||||
).join(',\n');
|
||||
|
||||
return `---
|
||||
import Layout from "../components/Layout.astro";
|
||||
import Hero from "../components/Hero.astro";
|
||||
import Welcome from "../components/Welcome.astro";
|
||||
import EventsGrid from "../components/EventsGrid.astro";
|
||||
import Drinks from "../components/Drinks.astro";
|
||||
import ImageCarousel from "../components/ImageCarousel.astro";
|
||||
import Contact from "../components/Contact.astro";
|
||||
import About from "../components/About.astro";
|
||||
|
||||
const events = [
|
||||
${eventsCode}
|
||||
];
|
||||
|
||||
const images = [
|
||||
${imagesCode}
|
||||
];
|
||||
---
|
||||
|
||||
<Layout>
|
||||
\t<Hero id="hero" />
|
||||
\t<Welcome id="welcome" />
|
||||
\t<EventsGrid id="events" events={events} />
|
||||
\t<ImageCarousel id="gallery" images={images} />
|
||||
\t<Drinks id="drinks" />
|
||||
</Layout>
|
||||
`;
|
||||
}
|
||||
|
||||
generateHeroComponent(content: ContentSection): string {
|
||||
return `---
|
||||
// src/components/Hero.astro
|
||||
import "../styles/components/Hero.css"
|
||||
|
||||
const { id } = Astro.props;
|
||||
---
|
||||
|
||||
<section id={id} class="hero container">
|
||||
|
||||
\t<div class="hero-overlay">
|
||||
|
||||
\t\t<div class="hero-content">
|
||||
|
||||
\t\t\t<h1>${content.heading || 'Dein Irish Pub'}</h1>
|
||||
|
||||
\t\t\t<p>${content.subheading || 'Im Herzen von St.Gallen'}</p>
|
||||
|
||||
\t\t\t<a href="#" class="button">Aktuelles ↓</a>
|
||||
\t\t</div>
|
||||
|
||||
\t</div>
|
||||
|
||||
</section>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
`;
|
||||
}
|
||||
|
||||
generateWelcomeComponent(content: ContentSection): string {
|
||||
const highlightsList = (content.highlights || []).map((h: any) =>
|
||||
`\t\t\t<li>\n\t\t\t\t<b>${h.title}:</b> ${h.description}\n\t\t\t</li>`
|
||||
).join('\n\n');
|
||||
|
||||
return `---
|
||||
// src/components/Welcome.astro
|
||||
import "../styles/components/Welcome.css"
|
||||
|
||||
const { id } = Astro.props;
|
||||
---
|
||||
|
||||
<section id={id} class="welcome container">
|
||||
|
||||
\t<div class="welcome-text">
|
||||
|
||||
\t\t<h2>${content.heading1 || 'Herzlich willkommen im'}</h2>
|
||||
\t\t<h2>${content.heading2 || 'Gallus Pub!'}</h2>
|
||||
|
||||
\t\t<p>
|
||||
\t\t\t${content.introText || ''}
|
||||
\t\t</p>
|
||||
|
||||
\t\t<p><b>Unsere Highlights:</b></p>
|
||||
|
||||
\t\t<ul>
|
||||
${highlightsList}
|
||||
\t\t</ul>
|
||||
|
||||
\t\t<p>
|
||||
\t\t\t${content.closingText || ''}
|
||||
\t\t</p>
|
||||
|
||||
\t</div>
|
||||
|
||||
|
||||
\t<div class="welcome-image">
|
||||
\t\t<img src="${content.imageUrl || '/images/Welcome.png'}" alt="Welcome background image" />
|
||||
\t</div>
|
||||
|
||||
</section>
|
||||
`;
|
||||
}
|
||||
|
||||
generateDrinksComponent(content: ContentSection): string {
|
||||
return `---
|
||||
import "../styles/components/Drinks.css"
|
||||
|
||||
const { id } = Astro.props;
|
||||
---
|
||||
<section id={id} class="Drinks">
|
||||
<h2 class="title">Drinks</h2>
|
||||
|
||||
<p class="note">
|
||||
${content.introText || 'Ob ein frisch gezapftes Pint, ein edler Tropfen Whiskey oder ein gemütliches Glas Wein – hier kannst du in entspannter Atmosphäre das Leben genießen.'}
|
||||
</p>
|
||||
|
||||
<a href="/pdf/Getraenke_Gallus_2025.pdf" class="card-link" target="_blank" rel="noopener noreferrer">Getränkekarte</a>
|
||||
|
||||
<h3 class="monats-hit">Monats Hit</h3>
|
||||
|
||||
<div class="mate-vodka">
|
||||
<div class="circle" title="${content.monthlySpecialName || 'Mate Vodka'}">
|
||||
<img src="${content.monthlySpecialImage || '/images/MonthlyHit.png'}" alt="Monats Hit" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div>${content.monthlySpecialName || 'Mate Vodka'}</div>
|
||||
</div>
|
||||
|
||||
<p class="note">
|
||||
${content.whiskeyText || 'Für Whisky-Liebhaber haben wir erlesene Sorten aus Schottland und Irland im Angebot.'}
|
||||
</p>
|
||||
|
||||
<div class="circle-row">
|
||||
<div class="circle whiskey-circle" title="Whiskey 1">
|
||||
<img src="${content.whiskeyImage1 || '/images/Whiskey1.png'}" alt="Whiskey 1" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 2">
|
||||
<img src="${content.whiskeyImage2 || '/images/Whiskey2.png'}" alt="Whiskey 2" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 3">
|
||||
<img src="${content.whiskeyImage3 || '/images/Whiskey3.png'}" alt="Whiskey 3" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
`;
|
||||
}
|
||||
|
||||
async writeFiles(
|
||||
workspaceDir: string,
|
||||
events: Event[],
|
||||
images: GalleryImage[],
|
||||
sections: Map<string, ContentSection>
|
||||
) {
|
||||
// Write index.astro
|
||||
const indexContent = this.generateIndexAstro(events, images);
|
||||
await writeFile(
|
||||
path.join(workspaceDir, 'src/pages/index.astro'),
|
||||
indexContent,
|
||||
'utf-8'
|
||||
);
|
||||
|
||||
// Write Hero component
|
||||
if (sections.has('hero')) {
|
||||
const heroContent = this.generateHeroComponent(sections.get('hero')!);
|
||||
await writeFile(
|
||||
path.join(workspaceDir, 'src/components/Hero.astro'),
|
||||
heroContent,
|
||||
'utf-8'
|
||||
);
|
||||
}
|
||||
|
||||
// Write Welcome component
|
||||
if (sections.has('welcome')) {
|
||||
const welcomeContent = this.generateWelcomeComponent(sections.get('welcome')!);
|
||||
await writeFile(
|
||||
path.join(workspaceDir, 'src/components/Welcome.astro'),
|
||||
welcomeContent,
|
||||
'utf-8'
|
||||
);
|
||||
}
|
||||
|
||||
// Write Drinks component
|
||||
if (sections.has('drinks')) {
|
||||
const drinksContent = this.generateDrinksComponent(sections.get('drinks')!);
|
||||
await writeFile(
|
||||
path.join(workspaceDir, 'src/components/Drinks.astro'),
|
||||
drinksContent,
|
||||
'utf-8'
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
import simpleGit, { SimpleGit } from 'simple-git';
|
||||
import { mkdir, rm } from 'fs/promises';
|
||||
import path from 'path';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
export class GitService {
|
||||
private git: SimpleGit;
|
||||
private workspaceDir: string;
|
||||
private repoUrl: string;
|
||||
private token: string;
|
||||
|
||||
constructor() {
|
||||
this.workspaceDir = env.GIT_WORKSPACE_DIR;
|
||||
this.repoUrl = env.GIT_REPO_URL;
|
||||
this.token = env.GIT_TOKEN;
|
||||
this.git = simpleGit();
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
// Ensure workspace directory exists
|
||||
await mkdir(this.workspaceDir, { recursive: true });
|
||||
|
||||
// Add token to repo URL for authentication
|
||||
const authenticatedUrl = this.repoUrl.replace(
|
||||
'https://',
|
||||
`https://oauth2:${this.token}@`
|
||||
);
|
||||
|
||||
try {
|
||||
// Check if repo already exists
|
||||
await this.git.cwd(this.workspaceDir);
|
||||
await this.git.status();
|
||||
console.log('Repository already exists, pulling latest...');
|
||||
await this.git.pull();
|
||||
} catch {
|
||||
// Clone if doesn't exist
|
||||
console.log('Cloning repository...');
|
||||
await rm(this.workspaceDir, { recursive: true, force: true });
|
||||
await this.git.clone(authenticatedUrl, this.workspaceDir);
|
||||
await this.git.cwd(this.workspaceDir);
|
||||
}
|
||||
|
||||
// Configure git user
|
||||
await this.git.addConfig('user.name', env.GIT_USER_NAME);
|
||||
await this.git.addConfig('user.email', env.GIT_USER_EMAIL);
|
||||
}
|
||||
|
||||
async commitAndPush(message: string): Promise<string> {
|
||||
await this.git.add('.');
|
||||
await this.git.commit(message);
|
||||
await this.git.push('origin', 'main');
|
||||
|
||||
const log = await this.git.log({ maxCount: 1 });
|
||||
return log.latest?.hash || '';
|
||||
}
|
||||
|
||||
getWorkspacePath(relativePath: string): string {
|
||||
return path.join(this.workspaceDir, relativePath);
|
||||
}
|
||||
|
||||
async reset() {
|
||||
await this.git.reset(['--hard', 'HEAD']);
|
||||
await this.git.clean('f', ['-d']);
|
||||
}
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
import crypto from 'crypto';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
interface GiteaUser {
|
||||
id: number;
|
||||
login: string;
|
||||
email: string;
|
||||
full_name: string;
|
||||
avatar_url: string;
|
||||
}
|
||||
|
||||
interface OAuthTokenResponse {
|
||||
access_token: string;
|
||||
token_type: string;
|
||||
expires_in: number;
|
||||
refresh_token?: string;
|
||||
}
|
||||
|
||||
export class GiteaService {
|
||||
private giteaUrl: string;
|
||||
private clientId: string;
|
||||
private clientSecret: string;
|
||||
private redirectUri: string;
|
||||
private allowedUsers: Set<string>;
|
||||
|
||||
constructor() {
|
||||
this.giteaUrl = env.GITEA_URL;
|
||||
this.clientId = env.GITEA_CLIENT_ID;
|
||||
this.clientSecret = env.GITEA_CLIENT_SECRET;
|
||||
this.redirectUri = env.GITEA_REDIRECT_URI;
|
||||
|
||||
const allowed = env.GITEA_ALLOWED_USERS;
|
||||
this.allowedUsers = new Set(allowed.split(',').map(u => u.trim()).filter(Boolean));
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate OAuth authorization URL
|
||||
*/
|
||||
getAuthorizationUrl(state: string): string {
|
||||
const params = new URLSearchParams({
|
||||
client_id: this.clientId,
|
||||
redirect_uri: this.redirectUri,
|
||||
response_type: 'code',
|
||||
state,
|
||||
scope: 'read:user',
|
||||
});
|
||||
|
||||
return `${this.giteaUrl}/login/oauth/authorize?${params.toString()}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Exchange authorization code for access token
|
||||
*/
|
||||
async exchangeCodeForToken(code: string): Promise<OAuthTokenResponse> {
|
||||
const response = await fetch(`${this.giteaUrl}/login/oauth/access_token`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
client_id: this.clientId,
|
||||
client_secret: this.clientSecret,
|
||||
code,
|
||||
redirect_uri: this.redirectUri,
|
||||
grant_type: 'authorization_code',
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to exchange code: ${response.statusText}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch user info from Gitea using access token
|
||||
*/
|
||||
async getUserInfo(accessToken: string): Promise<GiteaUser> {
|
||||
const response = await fetch(`${this.giteaUrl}/api/v1/user`, {
|
||||
headers: {
|
||||
'Authorization': `Bearer ${accessToken}`,
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch user info: ${response.statusText}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user is allowed to access the CMS
|
||||
*/
|
||||
isUserAllowed(username: string): boolean {
|
||||
// If no allowed users specified, allow all
|
||||
if (this.allowedUsers.size === 0) {
|
||||
return true;
|
||||
}
|
||||
return this.allowedUsers.has(username);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate random state for CSRF protection
|
||||
*/
|
||||
generateState(): string {
|
||||
return crypto.randomBytes(32).toString('hex');
|
||||
}
|
||||
}
|
||||
@ -1,87 +0,0 @@
|
||||
import sharp from 'sharp';
|
||||
import { writeFile, mkdir } from 'fs/promises';
|
||||
import path from 'path';
|
||||
import crypto from 'crypto';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
export class MediaService {
|
||||
private allowedMimeTypes = ['image/jpeg', 'image/png', 'image/webp'];
|
||||
private maxFileSize: number;
|
||||
|
||||
constructor() {
|
||||
this.maxFileSize = env.MAX_FILE_SIZE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate file type and size
|
||||
*/
|
||||
async validateFile(file: any): Promise<void> {
|
||||
if (!this.allowedMimeTypes.includes(file.mimetype)) {
|
||||
throw new Error(`Invalid file type. Allowed types: ${this.allowedMimeTypes.join(', ')}`);
|
||||
}
|
||||
|
||||
// Check file size
|
||||
const buffer = await file.toBuffer();
|
||||
if (buffer.length > this.maxFileSize) {
|
||||
throw new Error(`File too large. Maximum size: ${this.maxFileSize / 1024 / 1024}MB`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate safe filename
|
||||
*/
|
||||
generateFilename(originalName: string): string {
|
||||
const ext = path.extname(originalName);
|
||||
const hash = crypto.randomBytes(8).toString('hex');
|
||||
const timestamp = Date.now();
|
||||
return `${timestamp}-${hash}${ext}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Optimize and save image
|
||||
*/
|
||||
async processAndSaveImage(
|
||||
file: any,
|
||||
destinationDir: string
|
||||
): Promise<{ filename: string; url: string }> {
|
||||
await this.validateFile(file);
|
||||
|
||||
// Ensure destination directory exists
|
||||
await mkdir(destinationDir, { recursive: true });
|
||||
|
||||
// Generate filename
|
||||
const filename = this.generateFilename(file.filename);
|
||||
const filepath = path.join(destinationDir, filename);
|
||||
|
||||
// Get file buffer
|
||||
const buffer = await file.toBuffer();
|
||||
|
||||
// Process image with sharp (optimize and resize if needed)
|
||||
await sharp(buffer)
|
||||
.resize(2000, 2000, {
|
||||
fit: 'inside',
|
||||
withoutEnlargement: true,
|
||||
})
|
||||
.jpeg({ quality: 85 })
|
||||
.png({ quality: 85 })
|
||||
.webp({ quality: 85 })
|
||||
.toFile(filepath);
|
||||
|
||||
// Return filename and URL path
|
||||
return {
|
||||
filename,
|
||||
url: `/images/${filename}`,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Save image to git workspace
|
||||
*/
|
||||
async saveToGitWorkspace(
|
||||
file: any,
|
||||
workspaceDir: string
|
||||
): Promise<{ filename: string; url: string }> {
|
||||
const imagesDir = path.join(workspaceDir, 'public', 'images');
|
||||
return this.processAndSaveImage(file, imagesDir);
|
||||
}
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
import { FastifyRequest } from 'fastify';
|
||||
|
||||
export interface JWTPayload {
|
||||
id: string;
|
||||
giteaId: string;
|
||||
username: string;
|
||||
role: string;
|
||||
}
|
||||
|
||||
declare module 'fastify' {
|
||||
interface FastifyInstance {
|
||||
authenticate: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||
}
|
||||
|
||||
interface FastifyRequest {
|
||||
user: JWTPayload;
|
||||
}
|
||||
}
|
||||
|
||||
declare module '@fastify/jwt' {
|
||||
interface FastifyJWT {
|
||||
payload: JWTPayload;
|
||||
user: JWTPayload;
|
||||
}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2022",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "node",
|
||||
"esModuleInterop": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"resolveJsonModule": true,
|
||||
"outDir": "./dist",
|
||||
"rootDir": "./src",
|
||||
"declaration": true,
|
||||
"declarationMap": true,
|
||||
"sourceMap": true
|
||||
},
|
||||
"include": ["src/**/*"],
|
||||
"exclude": ["node_modules", "dist"]
|
||||
}
|
||||
910
package-lock.json
generated
@ -1,14 +1,19 @@
|
||||
{
|
||||
"name": "Gallus Pub Site",
|
||||
"name": "gallus-pub",
|
||||
"type": "module",
|
||||
"version": "0.0.1",
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
"dev:local": "dotenv -e .env.local -- astro dev",
|
||||
"build": "astro build",
|
||||
"preview": "astro preview",
|
||||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^5.12.0"
|
||||
"astro": "^5.12.8",
|
||||
"@astrojs/node": "^9.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dotenv-cli": "^7.4.1"
|
||||
}
|
||||
}
|
||||
3114
pnpm-lock.yaml
generated
@ -1,3 +0,0 @@
|
||||
onlyBuiltDependencies:
|
||||
- esbuild
|
||||
- sharp
|
||||
BIN
public/images/Event1.png
Normal file
|
After Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 800 KiB After Width: | Height: | Size: 800 KiB |
|
Before Width: | Height: | Size: 747 KiB After Width: | Height: | Size: 747 KiB |
|
Before Width: | Height: | Size: 398 KiB After Width: | Height: | Size: 398 KiB |
|
Before Width: | Height: | Size: 604 KiB After Width: | Height: | Size: 604 KiB |
|
Before Width: | Height: | Size: 580 KiB After Width: | Height: | Size: 580 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 128 KiB After Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 567 KiB After Width: | Height: | Size: 567 KiB |
|
Before Width: | Height: | Size: 184 KiB After Width: | Height: | Size: 184 KiB |
|
Before Width: | Height: | Size: 179 KiB After Width: | Height: | Size: 179 KiB |
|
Before Width: | Height: | Size: 196 KiB After Width: | Height: | Size: 196 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 36 KiB |
|
Before Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
@ -29,15 +29,15 @@ const { id } = Astro.props;
|
||||
|
||||
<div class="circle-row">
|
||||
<div class="circle whiskey-circle" title="Whiskey 1">
|
||||
<img src="/images/whiskey/Whiskey1.png" alt="Whiskey 1" class="circle-image" />
|
||||
<img src="/images/Whiskey1.png" alt="Whiskey 1" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 2">
|
||||
<img src="/images/whiskey/Whiskey2.png" alt="Whiskey 2" class="circle-image" />
|
||||
<img src="/images/Whiskey2.png" alt="Whiskey 2" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
<div class="circle whiskey-circle" title="Whiskey 3">
|
||||
<img src="/images/whiskey/Whiskey3.png" alt="Whiskey 3" class="circle-image" />
|
||||
<img src="/images/Whiskey3.png" alt="Whiskey 3" class="circle-image" />
|
||||
<span class="circle-label"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
---
|
||||
// src/components/Footer.astro
|
||||
import "../styles/components/Footer.css"
|
||||
import "/styles/components/Footer.css"
|
||||
const currentYear = new Date().getFullYear();
|
||||
---
|
||||
|
||||
<footer class="footer" id="footer">
|
||||
<footer class="footer">
|
||||
<div class="footer-content">
|
||||
|
||||
|
||||
<div class="footer-sections">
|
||||
<div class="footer-section">
|
||||
<h3>Öffnungszeiten</h3>
|
||||
@ -22,7 +20,7 @@ const currentYear = new Date().getFullYear();
|
||||
<p>Gallus Pub</p>
|
||||
<p>Metzgergasse 13</p>
|
||||
<p>9000 St. Gallen</p>
|
||||
<p><a href="tel:0772322770">077 232 27 70</a></p>
|
||||
<p>Email:</p>
|
||||
<p><a href="mailto:info@gallus-pub.ch">info@gallus-pub.ch</a></p>
|
||||
</div>
|
||||
|
||||
@ -30,9 +28,11 @@ const currentYear = new Date().getFullYear();
|
||||
<h3>Raumreservationen</h3>
|
||||
<p>Du planst einen Event?</p>
|
||||
<p>Der "St.Gallerruum" im 2.OG</p>
|
||||
<p>kann gemietet werden.</p>
|
||||
<p>Kann gemietet werden.</p>
|
||||
<p>Reservierungen via Whatsapp</p>
|
||||
<p><a href="tel:0772322770">077 232 27 70</a></p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="copyright">
|
||||
© {currentYear} Gallus Pub. Alle Rechte vorbehalten.
|
||||
|
||||
@ -15,7 +15,7 @@ const { id } = Astro.props;
|
||||
|
||||
<p>Im Herzen von St.Gallen</p>
|
||||
|
||||
<a href="#welcome" class="button">Aktuelles ↓</a>
|
||||
<a href="#" class="button">Aktuelles ↓</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -39,7 +39,7 @@ const {title, description, image = "", date} = Astro.props;
|
||||
|
||||
// Close card when clicking outside (mobile only)
|
||||
document.addEventListener('click', (e) => {
|
||||
if (window.innerWidth <= 768 && !card.contains(e.target as Node)) {
|
||||
if (window.innerWidth <= 768 && !card.contains(e.target)) {
|
||||
card.classList.remove('active');
|
||||
}
|
||||
});
|
||||
|
||||
26
src/content/events.json
Normal file
@ -0,0 +1,26 @@
|
||||
[
|
||||
{
|
||||
"image": "/images/karaoke.jpg",
|
||||
"title": "Karaoke",
|
||||
"date": "Mittwoch - Samstag",
|
||||
"description": "Bei uns gibt es Karaoke Mi-Sa!! <br>\nSeid ihr eine Gruppe und lieber unter euch? ..unseren 2.Stock kannst du auch mieten ;) <br>\nReserviere am besten gleich per Whatsapp <a href=\"tel:+41772322770\">077 232 27 70</a>"
|
||||
},
|
||||
{
|
||||
"image": "/images/pub_quiz.jpg",
|
||||
"title": "Pub Quiz",
|
||||
"date": "Jeden Freitag",
|
||||
"description": "Jeden Freitag findet unser <b>Pub Quiz</b> statt. Gespielt wird tischweise in 3-4 Runden. <br>\nJede 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>\nAuch Einzelpersonen sind herzlich willkommen! <br>\n*zum mitmachen minimum 1 Getränk konsumieren oder 5CHF"
|
||||
},
|
||||
{
|
||||
"image": "/images/crepes_sucette.jpg",
|
||||
"title": "Crepes Sucette <br /> Live Music im Gallus Pub!",
|
||||
"date": "Do, 04. September 2025",
|
||||
"description": "<b>20:00 Uhr</b> <br>\n<a href=\"Metzgergasse 13, 9000 St. Gallen\">Metzgergasse 13, 9000 St. Gallen</a> <br>\nErlebt einen musikalischen Abend mit der Band <b>Crepes Sucette</b> <br>\nJetzt reservieren: <a href=\"tel:+41772322770\">077 232 27 70</a>"
|
||||
},
|
||||
{
|
||||
"image": "/images/kevin_mcflannigan.jpeg",
|
||||
"title": "Kevin McFlannigan <br> Live Music im Gallus Pub!",
|
||||
"date": "Sa, 27. September 2025",
|
||||
"description": "<b>ab 20:00 Uhr</b> <br>\nSinger & Songwriter Kevin McFlannigan <br>\nEintritt ist Frei / Hutkollekte <br>"
|
||||
}
|
||||
]
|
||||
12
src/content/gallery.json
Normal file
@ -0,0 +1,12 @@
|
||||
[
|
||||
{ "src": "/images/Logo.png", "alt": "Erstes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Zweites Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Drittes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Viertes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Fünftes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Sechstes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Siebtes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Achtes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Neuntes Bild" },
|
||||
{ "src": "/images/Logo.png", "alt": "Zehntes Bild" }
|
||||
]
|
||||
94
src/pages/admin/index.astro
Normal file
@ -0,0 +1,94 @@
|
||||
---
|
||||
import Layout from "../../components/Layout.astro";
|
||||
import eventsData from "../../content/events.json";
|
||||
import imagesData from "../../content/gallery.json";
|
||||
import { getSessionFromRequest } from "../../utils/session";
|
||||
|
||||
const session = getSessionFromRequest(Astro.request);
|
||||
if (!session?.user) {
|
||||
// Not logged in: redirect to OAuth login
|
||||
return Astro.redirect("/api/auth/login");
|
||||
}
|
||||
const csrf = session.csrf;
|
||||
const events = eventsData;
|
||||
const images = imagesData;
|
||||
---
|
||||
|
||||
<Layout>
|
||||
<section>
|
||||
<h1>Admin</h1>
|
||||
<p>Eingeloggt als {session.user.login}</p>
|
||||
<form id="editor">
|
||||
<h2>Events (JSON)</h2>
|
||||
<textarea id="events" name="events" rows="16" style="width:100%;font-family:monospace;">{JSON.stringify(events, null, 2)}</textarea>
|
||||
|
||||
<h2>Galerie (JSON)</h2>
|
||||
<textarea id="images" name="images" rows="10" style="width:100%;font-family:monospace;">{JSON.stringify(images, null, 2)}</textarea>
|
||||
|
||||
<h2>Bilder hochladen</h2>
|
||||
<input type="file" id="fileInput" multiple accept="image/*" />
|
||||
|
||||
<div style="margin-top:1rem;display:flex;gap:.5rem;">
|
||||
<button id="saveBtn" type="button">Speichern</button>
|
||||
<button id="logoutBtn" type="button">Logout</button>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<meta name="csrf" content={csrf} />
|
||||
<script type="module">
|
||||
const csrf = document.querySelector('meta[name="csrf"]').content;
|
||||
|
||||
async function uploadFiles(files){
|
||||
const uploads = [];
|
||||
for (const file of files){
|
||||
const arrayBuffer = await file.arrayBuffer();
|
||||
const base64 = btoa(String.fromCharCode(...new Uint8Array(arrayBuffer)));
|
||||
uploads.push({ path: `public/images/${file.name}`, content: base64 });
|
||||
}
|
||||
return uploads;
|
||||
}
|
||||
|
||||
async function save(){
|
||||
let events, images;
|
||||
try{
|
||||
events = JSON.parse(document.getElementById('events').value);
|
||||
images = JSON.parse(document.getElementById('images').value);
|
||||
}catch(e){
|
||||
alert('JSON fehlerhaft: ' + e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
const files = [
|
||||
{ path: 'src/content/events.json', content: JSON.stringify(events, null, 2) },
|
||||
{ path: 'src/content/gallery.json', content: JSON.stringify(images, null, 2) },
|
||||
];
|
||||
|
||||
const input = document.getElementById('fileInput');
|
||||
if (input.files && input.files.length){
|
||||
const imageFiles = await uploadFiles(input.files);
|
||||
files.push(...imageFiles);
|
||||
}
|
||||
|
||||
const res = await fetch('/api/save', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRF': csrf },
|
||||
body: JSON.stringify({ files, message: 'Admin-Inhalte aktualisiert' })
|
||||
});
|
||||
if (!res.ok){
|
||||
const t = await res.text();
|
||||
alert('Fehler beim Speichern: ' + t);
|
||||
return;
|
||||
}
|
||||
alert('Gespeichert! Build wird gestartet.');
|
||||
// optional: Seite neu laden
|
||||
location.reload();
|
||||
}
|
||||
|
||||
document.getElementById('saveBtn').addEventListener('click', save);
|
||||
document.getElementById('logoutBtn').addEventListener('click', async () => {
|
||||
await fetch('/api/auth/logout', { method: 'POST' });
|
||||
location.href = '/';
|
||||
});
|
||||
</script>
|
||||
</Layout>
|
||||
116
src/pages/api/auth/callback.ts
Normal file
@ -0,0 +1,116 @@
|
||||
import type { APIRoute } from "astro";
|
||||
import { createSessionCookie, sessionCookieHeader, randomToken } from "../../../utils/session";
|
||||
|
||||
export const GET: APIRoute = async ({ request }) => {
|
||||
const url = new URL(request.url);
|
||||
const code = url.searchParams.get("code");
|
||||
const state = url.searchParams.get("state");
|
||||
const cookie = request.headers.get("cookie") || "";
|
||||
const stateCookie = cookie.match(/(?:^|; )oauth_state=([^;]+)/)?.[1];
|
||||
|
||||
if (!code || !state || !stateCookie || stateCookie !== state) {
|
||||
return new Response("Invalid OAuth state", { status: 400 });
|
||||
}
|
||||
|
||||
const clientId = process.env.OAUTH_CLIENT_ID;
|
||||
const clientSecret = process.env.OAUTH_CLIENT_SECRET;
|
||||
const tokenUrlRaw = process.env.OAUTH_TOKEN_URL;
|
||||
const userinfoUrl = process.env.OAUTH_USERINFO_URL;
|
||||
if (!clientId || !clientSecret || !tokenUrlRaw || !userinfoUrl) {
|
||||
return new Response("OAuth not fully configured. Please set OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET, OAUTH_TOKEN_URL, OAUTH_USERINFO_URL.", { status: 500 });
|
||||
}
|
||||
|
||||
// Compute redirect_uri consistent with login, robust against invalid PUBLIC_BASE_URL
|
||||
let redirectUri: string;
|
||||
try {
|
||||
if (process.env.PUBLIC_BASE_URL) {
|
||||
const base = new URL(process.env.PUBLIC_BASE_URL);
|
||||
redirectUri = new URL("/api/auth/callback", base).toString();
|
||||
} else {
|
||||
const reqUrl = new URL(request.url);
|
||||
redirectUri = new URL("/api/auth/callback", `${reqUrl.protocol}//${reqUrl.host}`).toString();
|
||||
}
|
||||
} catch {
|
||||
const reqUrl = new URL(request.url);
|
||||
redirectUri = new URL("/api/auth/callback", `${reqUrl.protocol}//${reqUrl.host}`).toString();
|
||||
}
|
||||
|
||||
// Validate token URL
|
||||
let tokenUrl: URL;
|
||||
try {
|
||||
tokenUrl = new URL(tokenUrlRaw);
|
||||
} catch {
|
||||
return new Response("Invalid OAUTH_TOKEN_URL", { status: 500 });
|
||||
}
|
||||
|
||||
// Exchange code for token
|
||||
const params = new URLSearchParams();
|
||||
params.set("client_id", clientId);
|
||||
params.set("client_secret", clientSecret);
|
||||
params.set("code", code);
|
||||
params.set("grant_type", "authorization_code");
|
||||
params.set("redirect_uri", redirectUri);
|
||||
|
||||
const tokenRes = await fetch(tokenUrl, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
||||
body: params.toString(),
|
||||
});
|
||||
|
||||
if (!tokenRes.ok) {
|
||||
const t = await tokenRes.text();
|
||||
return new Response(`OAuth token error: ${tokenRes.status} ${t}`, { status: 500 });
|
||||
}
|
||||
|
||||
const tokenData = await tokenRes.json().catch(async () => {
|
||||
// Some Gitea versions return application/x-www-form-urlencoded
|
||||
const text = await tokenRes.text();
|
||||
const usp = new URLSearchParams(text);
|
||||
return Object.fromEntries(usp.entries());
|
||||
});
|
||||
const accessToken = tokenData.access_token || tokenData["access_token"];
|
||||
if (!accessToken) {
|
||||
return new Response("No access token", { status: 500 });
|
||||
}
|
||||
|
||||
const userRes = await fetch(userinfoUrl, {
|
||||
headers: { Authorization: `token ${accessToken}` },
|
||||
});
|
||||
if (!userRes.ok) {
|
||||
const t = await userRes.text();
|
||||
return new Response(`Userinfo error: ${userRes.status} ${t}`, { status: 500 });
|
||||
}
|
||||
const user = await userRes.json();
|
||||
|
||||
// Optional allowlist
|
||||
const allowedUsers = (process.env.OAUTH_ALLOWED_USERS || "").split(/[\,\s]+/).filter(Boolean);
|
||||
const allowedOrg = process.env.OAUTH_ALLOWED_ORG;
|
||||
if (allowedUsers.length && !allowedUsers.includes(user.login)) {
|
||||
return new Response("Forbidden", { status: 403 });
|
||||
}
|
||||
if (allowedOrg) {
|
||||
// Best-effort org check
|
||||
try {
|
||||
const orgsRes = await fetch(process.env.GITEA_BASE + "/api/v1/user/orgs", {
|
||||
headers: { Authorization: `token ${accessToken}` },
|
||||
});
|
||||
if (orgsRes.ok) {
|
||||
const orgs = await orgsRes.json();
|
||||
const inOrg = Array.isArray(orgs) && orgs.some((o: any) => o.username === allowedOrg || o.login === allowedOrg || o.name === allowedOrg);
|
||||
if (!inOrg) return new Response("Forbidden (org)", { status: 403 });
|
||||
}
|
||||
} catch {}
|
||||
}
|
||||
|
||||
const csrf = randomToken(16);
|
||||
const sessionValue = createSessionCookie({
|
||||
user: { id: user.id, login: user.login, name: user.full_name || user.username || user.login, email: user.email },
|
||||
csrf,
|
||||
});
|
||||
|
||||
const headers = new Headers();
|
||||
headers.set("Set-Cookie", sessionCookieHeader(sessionValue));
|
||||
headers.append("Set-Cookie", "oauth_state=; Path=/; HttpOnly; Secure; SameSite=Lax; Max-Age=0");
|
||||
headers.set("Location", "/admin");
|
||||
return new Response(null, { status: 302, headers });
|
||||
};
|
||||
53
src/pages/api/auth/login.ts
Normal file
@ -0,0 +1,53 @@
|
||||
import type { APIRoute } from "astro";
|
||||
import { randomToken, setTempCookie } from "../../../utils/session";
|
||||
|
||||
export const GET: APIRoute = async ({ request }) => {
|
||||
const clientId = process.env.OAUTH_CLIENT_ID;
|
||||
const authorizeUrlRaw = process.env.OAUTH_AUTHORIZE_URL;
|
||||
if (!clientId || !authorizeUrlRaw) {
|
||||
return new Response(
|
||||
"OAuth not configured. Please set OAUTH_CLIENT_ID and OAUTH_AUTHORIZE_URL (and related secrets) for local dev.",
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
|
||||
// Determine callback URL
|
||||
let finalRedirect: string;
|
||||
try {
|
||||
if (process.env.PUBLIC_BASE_URL) {
|
||||
// Ensure PUBLIC_BASE_URL is an absolute URL
|
||||
const base = new URL(process.env.PUBLIC_BASE_URL);
|
||||
finalRedirect = new URL("/api/auth/callback", base).toString();
|
||||
} else {
|
||||
// Fallback to current request origin
|
||||
const reqUrl = new URL(request.url);
|
||||
finalRedirect = new URL("/api/auth/callback", `${reqUrl.protocol}//${reqUrl.host}`).toString();
|
||||
}
|
||||
} catch {
|
||||
// As a last resort, use request URL
|
||||
const reqUrl = new URL(request.url);
|
||||
finalRedirect = new URL("/api/auth/callback", `${reqUrl.protocol}//${reqUrl.host}`).toString();
|
||||
}
|
||||
|
||||
// Validate authorize URL
|
||||
let authorizeUrl: URL;
|
||||
try {
|
||||
authorizeUrl = new URL(authorizeUrlRaw);
|
||||
} catch {
|
||||
return new Response("Invalid OAUTH_AUTHORIZE_URL", { status: 500 });
|
||||
}
|
||||
|
||||
const state = randomToken(16);
|
||||
authorizeUrl.searchParams.set("client_id", clientId);
|
||||
authorizeUrl.searchParams.set("redirect_uri", finalRedirect);
|
||||
authorizeUrl.searchParams.set("response_type", "code");
|
||||
authorizeUrl.searchParams.set("state", state);
|
||||
|
||||
return new Response(null, {
|
||||
status: 302,
|
||||
headers: {
|
||||
Location: authorizeUrl.toString(),
|
||||
"Set-Cookie": setTempCookie("oauth_state", state),
|
||||
},
|
||||
});
|
||||
};
|
||||
11
src/pages/api/auth/logout.ts
Normal file
@ -0,0 +1,11 @@
|
||||
import type { APIRoute } from "astro";
|
||||
import { clearCookieHeader } from "../../../utils/session";
|
||||
|
||||
export const POST: APIRoute = async () => {
|
||||
return new Response(null, {
|
||||
status: 204,
|
||||
headers: {
|
||||
"Set-Cookie": clearCookieHeader(),
|
||||
},
|
||||
});
|
||||
};
|
||||
97
src/pages/api/save.ts
Normal file
@ -0,0 +1,97 @@
|
||||
import type { APIRoute } from "astro";
|
||||
import { getSessionFromRequest } from "../../utils/session";
|
||||
|
||||
const GITEA_BASE = process.env.GITEA_BASE!;
|
||||
const GITEA_OWNER = process.env.GITEA_OWNER!;
|
||||
const GITEA_REPO = process.env.GITEA_REPO!;
|
||||
const GITEA_TOKEN = process.env.GITEA_TOKEN!;
|
||||
const DEFAULT_BRANCH = process.env.GIT_BRANCH || "main";
|
||||
|
||||
function isAllowedPath(path: string) {
|
||||
if (path === "src/content/events.json") return true;
|
||||
if (path === "src/content/gallery.json") return true;
|
||||
if (path.startsWith("public/images/")) {
|
||||
return /\.(png|jpg|jpeg|gif|webp|svg)$/i.test(path);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
async function getShaIfExists(path: string): Promise<string | undefined> {
|
||||
const url = `${GITEA_BASE}/api/v1/repos/${encodeURIComponent(GITEA_OWNER)}/${encodeURIComponent(GITEA_REPO)}/contents/${encodeURIComponent(path)}?ref=${encodeURIComponent(DEFAULT_BRANCH)}`;
|
||||
const res = await fetch(url, {
|
||||
headers: { Authorization: `token ${GITEA_TOKEN}` },
|
||||
});
|
||||
if (res.status === 404) return undefined;
|
||||
if (!res.ok) throw new Error(`Gitea get sha error ${res.status}`);
|
||||
const data = await res.json();
|
||||
return data.sha;
|
||||
}
|
||||
|
||||
export const POST: APIRoute = async ({ request }) => {
|
||||
const session = getSessionFromRequest(request);
|
||||
if (!session?.user) return new Response(JSON.stringify({ error: "unauthorized" }), { status: 401 });
|
||||
|
||||
// CSRF header required
|
||||
const csrfHeader = request.headers.get("x-csrf") || request.headers.get("X-CSRF");
|
||||
if (!csrfHeader || csrfHeader !== session.csrf) {
|
||||
return new Response(JSON.stringify({ error: "invalid csrf" }), { status: 403 });
|
||||
}
|
||||
|
||||
let payload: any;
|
||||
try {
|
||||
payload = await request.json();
|
||||
} catch {
|
||||
return new Response(JSON.stringify({ error: "invalid json" }), { status: 400 });
|
||||
}
|
||||
if (!payload || !Array.isArray(payload.files)) {
|
||||
return new Response(JSON.stringify({ error: "missing files" }), { status: 400 });
|
||||
}
|
||||
|
||||
const results: any[] = [];
|
||||
for (const file of payload.files) {
|
||||
const path = String(file.path || "");
|
||||
if (!isAllowedPath(path)) {
|
||||
return new Response(JSON.stringify({ error: `path not allowed: ${path}` }), { status: 400 });
|
||||
}
|
||||
let contentBase64: string;
|
||||
if (path.startsWith("public/images/")) {
|
||||
// Expect already base64 string of binary
|
||||
contentBase64 = String(file.content || "");
|
||||
// Remove possible data URL prefix
|
||||
const match = contentBase64.match(/^data:[^;]+;base64,(.*)$/);
|
||||
if (match) contentBase64 = match[1];
|
||||
} else {
|
||||
// Text file
|
||||
contentBase64 = Buffer.from(String(file.content ?? ""), "utf-8").toString("base64");
|
||||
}
|
||||
|
||||
const sha = await getShaIfExists(path).catch(() => undefined);
|
||||
const url = `${GITEA_BASE}/api/v1/repos/${encodeURIComponent(GITEA_OWNER)}/${encodeURIComponent(GITEA_REPO)}/contents/${encodeURIComponent(path)}`;
|
||||
const body: any = {
|
||||
content: contentBase64,
|
||||
message: payload.message || `Update ${path}`,
|
||||
branch: DEFAULT_BRANCH,
|
||||
};
|
||||
if (sha) body.sha = sha;
|
||||
if (session.user) {
|
||||
body.author = { name: session.user.name || session.user.login, email: session.user.email || `${session.user.login}@users.noreply` };
|
||||
body.committer = { name: session.user.name || session.user.login, email: session.user.email || `${session.user.login}@users.noreply` };
|
||||
}
|
||||
|
||||
const res = await fetch(url, {
|
||||
method: "PUT",
|
||||
headers: {
|
||||
Authorization: `token ${GITEA_TOKEN}`,
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const t = await res.text();
|
||||
return new Response(JSON.stringify({ error: `Gitea error for ${path}: ${res.status} ${t}` }), { status: 500 });
|
||||
}
|
||||
results.push(await res.json());
|
||||
}
|
||||
|
||||
return new Response(JSON.stringify({ ok: true, results }), { status: 200, headers: { "Content-Type": "application/json" } });
|
||||
};
|
||||
@ -1,86 +1,17 @@
|
||||
---
|
||||
// src/pages/index.astro
|
||||
import Layout from "../components/Layout.astro";
|
||||
import Hero from "../components/Hero.astro";
|
||||
import Welcome from "../components/Welcome.astro";
|
||||
import EventsGrid from "../components/EventsGrid.astro";
|
||||
import Drinks from "../components/Drinks.astro";
|
||||
import ImageCarousel from "../components/ImageCarousel.astro";
|
||||
import Contact from "../components/Contact.astro";
|
||||
import About from "../components/About.astro";
|
||||
|
||||
const events = [
|
||||
{
|
||||
image: "/images/events/event_karaoke.jpg",
|
||||
title: "Karaoke",
|
||||
date: "Mittwoch - Samstag",
|
||||
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>
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_pub-quiz.jpg",
|
||||
title: "Pub Quiz",
|
||||
date: "Jeden Freitag",
|
||||
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
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_schlager-karaoke.jpeg",
|
||||
title: "Schlager Hüttenzauber Karaoke",
|
||||
date: "27. November - 19:00 Uhr",
|
||||
description: `
|
||||
Ab 19:00 Uhr Eintritt ist Frei! Reservieren unter <a href="tel:+41772322770">077 232 27 70</a>
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_advents-kalender.jpeg",
|
||||
title: "Adventskalender",
|
||||
date: "03. Dezember - 20. Dezember 2025",
|
||||
description: `
|
||||
Jeden Tag neue Überraschungen! Check unsere Social Media Stories!
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_santa_karaoke.jpeg",
|
||||
title: "Santa Karaoke-Party",
|
||||
date: "06. Dezember 2025",
|
||||
description: `
|
||||
🤶🏻🎅🏻Komme als Weihnachts-Mann/-Frau und bekomme einen Shot auf's Haus!🤶🏻🎅🏻 `,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_ferien.jpeg",
|
||||
title: "Weihnachtsferien",
|
||||
date: "21. Dezember 2025 - 01. Januar 2026",
|
||||
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
|
||||
`,
|
||||
},
|
||||
{
|
||||
image: "/images/events/event_neujahrs-apero.jpeg",
|
||||
title: "Neujahrs-Apero",
|
||||
date: "02. Januar 2026 - 18:00-20:00 Uhr",
|
||||
description: `
|
||||
|
||||
`,
|
||||
},
|
||||
|
||||
];
|
||||
|
||||
const images = [
|
||||
{ src: "/images/gallery/Gallery7.png", alt: "Siebtes Bild" },
|
||||
{ src: "/images/gallery/Gallery8.png", alt: "Achtes Bild" },
|
||||
{ src: "/images/gallery/Gallery9.png", alt: "Neuntes Bild" },
|
||||
{ src: "/images/gallery/Gallery6.png", alt: "Sechstes Bild" },
|
||||
{ src: "/images/gallery/Gallery1.png", alt: "Erstes Bild" },
|
||||
{ src: "/images/gallery/Gallery2.png", alt: "Zweites Bild" },
|
||||
{ src: "/images/gallery/Gallery3.png", alt: "Drittes Bild" },
|
||||
{ src: "/images/gallery/Gallery4.png", alt: "Viertes Bild" },
|
||||
{ src: "/images/gallery/Gallery5.png", alt: "Fünftes Bild" },
|
||||
];
|
||||
// Inhalte aus Dateien laden (editierbar über Admin)
|
||||
import events from "../content/events.json";
|
||||
import images from "../content/gallery.json";
|
||||
---
|
||||
|
||||
<Layout>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.Drinks {
|
||||
font-family: var(--font-family-primary);
|
||||
font-family: var(--font-family-primary), serif;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
.title {
|
||||
font-size: var(--font-size-large);
|
||||
margin-bottom: 0.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
font-weight: bold;
|
||||
color: var(--color-text);
|
||||
text-transform: uppercase;
|
||||
@ -25,7 +25,6 @@
|
||||
.card-link {
|
||||
border: 2px solid var(--color-accent-beige);
|
||||
padding: 0.75rem 1.5rem;
|
||||
margin-top: 2.5rem;
|
||||
margin-bottom: 2.5rem;
|
||||
color: var(--color-text);
|
||||
background-color: var(--color-background);
|
||||
@ -69,6 +68,7 @@
|
||||
align-items: center;
|
||||
margin-bottom: 1.5rem;
|
||||
padding: 1rem;
|
||||
background-color: rgba(0, 0, 0, 0.2);
|
||||
border-radius: var(--border-radius);
|
||||
width: 80%;
|
||||
max-width: 300px;
|
||||
@ -81,8 +81,8 @@
|
||||
}
|
||||
|
||||
.circle {
|
||||
height: 35vh;
|
||||
width: 35vh;
|
||||
height: 9em;
|
||||
width: 9em;
|
||||
border: 2px solid var(--color-accent-beige);
|
||||
border-radius: 50%;
|
||||
margin: 0.5rem;
|
||||
@ -94,7 +94,6 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.circle:hover {
|
||||
@ -110,25 +109,12 @@
|
||||
text-align: center;
|
||||
transition: opacity var(--transition-standard);
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.circle:hover .circle-label {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.circle-image {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
object-position: center;
|
||||
border-radius: 50%;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.circle-row {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@ -163,6 +149,10 @@
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
.circle {
|
||||
height: 5em;
|
||||
width: 5em;
|
||||
}
|
||||
|
||||
.circle-label {
|
||||
font-size: 0.7rem;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
.hover-card {
|
||||
position: relative;
|
||||
width: 25rem;
|
||||
height: 25rem;
|
||||
width: 400px;
|
||||
height: 400px;
|
||||
border-radius: var(--border-radius);
|
||||
background-color: var(--color-accent-green);
|
||||
box-shadow: var(--box-shadow);
|
||||
@ -12,30 +12,10 @@
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* Hover effects only for devices that support hover */
|
||||
@media (hover: hover) and (pointer: fine) {
|
||||
.hover-card:hover {
|
||||
transform: translateY(-5px);
|
||||
}
|
||||
|
||||
.hover-card:hover .hover-text {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.hover-card:hover .card-image {
|
||||
opacity: 0.1;
|
||||
}
|
||||
}
|
||||
|
||||
.card-title {
|
||||
padding: 15px 15px 5px 15px;
|
||||
margin: 0;
|
||||
color: var(--color-accent-beige);
|
||||
font-size: var(--font-size-medium);
|
||||
text-align: center;
|
||||
order: -2;
|
||||
}
|
||||
|
||||
.card_date {
|
||||
padding: 0 15px 15px 15px;
|
||||
margin: 0;
|
||||
@ -104,12 +84,11 @@
|
||||
scrollbar-color: var(--color-accent-beige) rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
/* Active state for mobile tap functionality */
|
||||
.hover-card.active .hover-text {
|
||||
.hover-card:hover .hover-text {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.hover-card.active .card-image {
|
||||
.hover-card:hover .card-image {
|
||||
opacity: 0.1;
|
||||
}
|
||||
|
||||
@ -122,34 +101,5 @@
|
||||
.hover-card {
|
||||
width: 100%;
|
||||
max-width: 350px;
|
||||
/* Maintain square aspect ratio */
|
||||
aspect-ratio: 1 / 1;
|
||||
height: auto;
|
||||
/* Add cursor pointer to indicate it's clickable */
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Add visual feedback for tap */
|
||||
.hover-card:active {
|
||||
transform: scale(0.98);
|
||||
}
|
||||
|
||||
.hover-card::after {
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
right: 10px;
|
||||
background-color: rgba(0, 0, 0, 0.7);
|
||||
color: var(--color-accent-beige);
|
||||
font-size: 0.7rem;
|
||||
padding: 4px 8px;
|
||||
border-radius: 12px;
|
||||
opacity: 0.8;
|
||||
pointer-events: none;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
/* Hide the hint when card is active */
|
||||
.hover-card.active::after {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
74
src/utils/session.ts
Normal file
@ -0,0 +1,74 @@
|
||||
import crypto from "node:crypto";
|
||||
|
||||
export type SessionData = {
|
||||
user?: {
|
||||
id: number;
|
||||
login: string;
|
||||
name?: string;
|
||||
email?: string;
|
||||
};
|
||||
csrf?: string;
|
||||
};
|
||||
|
||||
const COOKIE_NAME = "gp_session";
|
||||
|
||||
function b64url(input: Buffer | string) {
|
||||
return Buffer.from(input)
|
||||
.toString("base64")
|
||||
.replace(/=/g, "")
|
||||
.replace(/\+/g, "-")
|
||||
.replace(/\//g, "_");
|
||||
}
|
||||
|
||||
function sign(payload: string, secret: string) {
|
||||
return crypto.createHmac("sha256", secret).update(payload).digest("base64url");
|
||||
}
|
||||
|
||||
export function createSessionCookie(data: SessionData, secret = process.env.SESSION_SECRET || "") {
|
||||
const payload = b64url(JSON.stringify(data));
|
||||
const sig = sign(payload, secret);
|
||||
return `${payload}.${sig}`;
|
||||
}
|
||||
|
||||
export function parseSessionCookie(cookieValue: string | undefined, secret = process.env.SESSION_SECRET || ""): SessionData | undefined {
|
||||
if (!cookieValue) return undefined;
|
||||
const [payload, sig] = cookieValue.split(".");
|
||||
if (!payload || !sig) return undefined;
|
||||
const expected = sign(payload, secret);
|
||||
if (!crypto.timingSafeEqual(Buffer.from(sig), Buffer.from(expected))) return undefined;
|
||||
try {
|
||||
const json = Buffer.from(payload.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf-8");
|
||||
return JSON.parse(json);
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
export function clearCookieHeader(name = COOKIE_NAME) {
|
||||
return `${name}=; Path=/; HttpOnly; Secure; SameSite=Lax; Max-Age=0`;
|
||||
}
|
||||
|
||||
export function sessionCookieHeader(value: string, name = COOKIE_NAME) {
|
||||
// 7 days
|
||||
const maxAge = 60 * 60 * 24 * 7;
|
||||
return `${name}=${value}; Path=/; HttpOnly; Secure; SameSite=Lax; Max-Age=${maxAge}`;
|
||||
}
|
||||
|
||||
export function getSessionFromRequest(req: Request, secret = process.env.SESSION_SECRET || ""): SessionData | undefined {
|
||||
const cookie = req.headers.get("cookie") || "";
|
||||
const match = cookie.match(/(?:^|; )gp_session=([^;]+)/);
|
||||
if (!match) return undefined;
|
||||
return parseSessionCookie(match[1], secret);
|
||||
}
|
||||
|
||||
export function randomToken(bytes = 32) {
|
||||
return crypto.randomBytes(bytes).toString("hex");
|
||||
}
|
||||
|
||||
export const COOKIE_NAME_STATE = "oauth_state";
|
||||
|
||||
export function setTempCookie(name: string, value: string) {
|
||||
// short lived: 10 minutes
|
||||
const maxAge = 60 * 10;
|
||||
return `${name}=${value}; Path=/; HttpOnly; Secure; SameSite=Lax; Max-Age=${maxAge}`;
|
||||
}
|
||||