Merge pull request 'Bug fixes and improvements' (#14) from dev into main

Reviewed-on: #14

.gitignore

@@ -37,8 +37,6 @@ backend/uploads/
 # Tooling
 .turbo/
 .cursor/
-.agents/
-skills-lock.json
 .npm-cache/
 
 # OS

README.md

@@ -14,7 +14,7 @@ A full-stack web app for organizing and managing language exchange events (Asunc
 - **Backend**: Node.js + TypeScript, Hono, Drizzle ORM, SQLite (default) or PostgreSQL
 - **Auth**: JWT (via `jose`), **Argon2id** password hashing (with legacy bcrypt verification for older hashes)
 - **Email**: `nodemailer` (SMTP) with optional provider config
-- **Frontend**: Next.js 14 (App Router), Tailwind CSS, Heroicons
+- **Frontend**: Next.js 14 (App Router), Tailwind CSS, SWR, Heroicons
 
 ## Local development
 
@@ -86,7 +86,6 @@ Key settings (see `backend/.env.example` for the full list):
 - **URLs/ports**: `PORT`, `API_URL`, `FRONTEND_URL`
 - **Email**: `EMAIL_PROVIDER` (`console|smtp|resend`) and corresponding credentials
 - **Payments (optional)**: Stripe/MercadoPago/LNbits configuration
-- **Scaling (optional)**: `REDIS_URL`, `DB_POOL_MAX`, and `S3_*` (see "Horizontal scaling" below)
 
 ### Frontend (`frontend/.env`)
 
@@ -161,86 +160,6 @@ npm run db:migrate
 
 Then install/enable the systemd services and nginx configs for your server.
 
-## Horizontal scaling
-
-The backend can run as a single instance with zero extra configuration (the
-default), or as multiple replicas behind a load balancer. Scaling support is
-fully optional and backward compatible: if you set none of the variables below,
-the app behaves exactly as before with in-memory state and local-disk uploads.
-
-### Requirements for multiple instances
-
-- **Use PostgreSQL.** Set `DB_TYPE=postgres`. SQLite is a single local file and
-  cannot be shared safely across instances.
-- **Set `REDIS_URL`.** This makes the following subsystems shared across
-  instances instead of per process:
-  - distributed cache
-  - rate limiting (shared sliding/fixed window)
-  - pub/sub for real-time payment events, so an SSE client connected to one
-    instance still receives an event when the LNbits webhook lands on another
-  - distributed locks (so only one instance seeds email templates per boot and
-    only one instance polls LNbits per pending ticket)
-  - the email hourly cap (`MAX_EMAILS_PER_HOUR`) becomes a global cap
-- **Tune the DB pool.** `DB_POOL_MAX` is the max Postgres connections per
-  instance (default 10). Keep `DB_POOL_MAX * replicas` below the Postgres
-  `max_connections` setting (default 100). For example, 5 replicas at
-  `DB_POOL_MAX=15` uses up to 75 connections.
-
-If Redis is configured but becomes unreachable at runtime, each subsystem
-degrades gracefully (rate limiter fails open, cache misses fall through to the
-DB, locks proceed) and the API keeps serving rather than crashing.
-
-### Uploads across instances
-
-Media uploads default to local disk (`./uploads`). With more than one instance
-you must use shared storage so a file uploaded on one instance is readable on
-the others. Two options:
-
-- **S3-compatible storage (recommended):** set `S3_ENDPOINT`, `S3_BUCKET`,
-  `S3_ACCESS_KEY_ID`, `S3_SECRET_ACCESS_KEY` (and optionally `S3_PUBLIC_URL`,
-  `S3_REGION`, `S3_FORCE_PATH_STYLE`). Works with Garage, MinIO, or AWS S3.
-- **Shared volume:** mount the same `./uploads` directory (e.g. NFS) into every
-  instance.
-
-### Real-time payment SSE behind a load balancer
-
-The payment status stream (`/api/lnbits/stream/:ticketId`) is a long-lived SSE
-connection. With Redis pub/sub enabled, any instance can deliver the payment
-event regardless of which instance holds the socket, so sticky sessions are not
-strictly required. Enabling sticky sessions (IP hash) for the SSE path is still
-a reasonable optimization.
-
-### Health and observability
-
-`GET /health` always returns 200 and reports Redis connectivity and which
-backend each subsystem selected, for example:
-
-```json
-{
-  "status": "ok",
-  "redis": { "enabled": true, "healthy": true },
-  "backends": {
-    "cache": "redis",
-    "rateLimiter": "redis",
-    "pubsub": "redis",
-    "lock": "redis",
-    "storage": "s3"
-  }
-}
-```
-
-The same selection is logged once at startup.
-
-### docker-compose example (N replicas + Redis)
-
-A ready-to-edit snippet lives at `deploy/docker-compose.scale.yml`. It runs
-Postgres, Redis, and the API scaled to multiple replicas behind nginx. Bring it
-up with:
-
-```bash
-docker compose -f deploy/docker-compose.scale.yml up --build --scale api=3
-```
-
 ## Documentation
 
 - **Specs / notes**: `about/`

backend/.env.example

@@ -8,40 +8,6 @@ DATABASE_URL=./data/spanglish.db
 # For PostgreSQL
 # DATABASE_URL=postgresql://user:password@localhost:5432/spanglish
 
-# Max PostgreSQL connections per instance (default 10). When running multiple
-# replicas, keep DB_POOL_MAX * replicas below the Postgres max_connections limit.
-# DB_POOL_MAX=10
-
-# ---------------------------------------------------------------------------
-# Horizontal scaling (all optional)
-# ---------------------------------------------------------------------------
-# Leave everything below UNSET to run as a single instance with in-memory
-# backends and local-disk uploads (zero-config, identical to the original
-# behavior). Set them to run multiple API replicas behind a load balancer.
-#
-# Note: running more than one instance requires DB_TYPE=postgres. SQLite is a
-# single local file and cannot be shared safely across instances.
-
-# Redis connection URL. When set, the cache, rate limiter, pub/sub (real-time
-# payment events), distributed locks, and the email hourly cap are shared across
-# all instances. When unset, each instance uses in-memory equivalents.
-# REDIS_URL=redis://localhost:6379
-
-# Optional S3-compatible object storage for media uploads (e.g. Garage, MinIO,
-# AWS S3). When S3_ENDPOINT and S3_BUCKET are set, uploads go to the bucket and
-# are shared across instances. When unset, uploads are written to ./uploads on
-# local disk (the default).
-# S3_ENDPOINT=https://garage.example.com
-# S3_REGION=garage
-# S3_BUCKET=spanglish-media
-# S3_ACCESS_KEY_ID=
-# S3_SECRET_ACCESS_KEY=
-# Public base URL used to build fileUrl for stored objects (CDN or web endpoint).
-# If unset, a path-style URL against S3_ENDPOINT/S3_BUCKET is used.
-# S3_PUBLIC_URL=https://media.example.com
-# Use path-style addressing (true for Garage/MinIO). Defaults to true.
-# S3_FORCE_PATH_STYLE=true
-
 # JWT Secret (change in production!)
 JWT_SECRET=your-super-secret-key-change-in-production
 
@@ -107,10 +73,3 @@ SMTP_TLS_REJECT_UNAUTHORIZED=true
 # If the limit is reached, queued emails will pause and resume automatically
 MAX_EMAILS_PER_HOUR=30
 
-# Pending Booking Cleanup
-# Pending bookings whose payment is still unpaid (not awaiting admin approval)
-# are cancelled after this many minutes, freeing the seats (default: 30)
-PENDING_BOOKING_TTL_MINUTES=30
-# How often the cleanup job runs, in milliseconds (default: 300000 = 5 min)
-PENDING_BOOKING_CLEANUP_INTERVAL_MS=300000
-

backend/package.json

@@ -13,7 +13,6 @@
     "db:import": "tsx src/db/import.ts"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1075.0",
     "@hono/node-server": "^1.11.4",
     "@hono/swagger-ui": "^0.4.0",
     "@hono/zod-openapi": "^0.14.4",
@@ -23,7 +22,6 @@
     "dotenv": "^17.2.3",
     "drizzle-orm": "^0.31.2",
     "hono": "^4.4.7",
-    "ioredis": "^5.11.1",
     "jose": "^5.4.0",
     "nanoid": "^5.0.7",
     "nodemailer": "^7.0.13",

backend/src/db/export.ts

@@ -1,5 +1,5 @@
 import 'dotenv/config';
-import { closeSync, existsSync, mkdirSync, openSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { spawnSync } from 'child_process';
 import Database from 'better-sqlite3';
@@ -43,32 +43,28 @@ function exportSqlite(outputPath: string): void {
 
 function exportPostgres(outputPath: string): void {
   const connString = process.env.DATABASE_URL || 'postgresql://localhost:5432/spanglish';
-  const outFd = openSync(outputPath, 'w');
-  try {
-    const result = spawnSync(
-      'pg_dump',
-      ['--clean', '--if-exists', connString],
-      {
-        stdio: ['ignore', outFd, 'pipe'],
-        encoding: 'utf-8',
-      }
-    );
-
-    if (result.error) {
-      console.error('pg_dump failed. Ensure pg_dump is installed and in PATH.');
-      console.error(result.error.message);
-      process.exit(1);
+  const result = spawnSync(
+    'pg_dump',
+    ['--clean', '--if-exists', connString],
+    {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      encoding: 'utf-8',
     }
+  );
 
-    if (result.status !== 0) {
-      console.error('pg_dump failed:', result.stderr);
-      process.exit(1);
-    }
-
-    console.log(`Exported to ${outputPath}`);
-  } finally {
-    closeSync(outFd);
+  if (result.error) {
+    console.error('pg_dump failed. Ensure pg_dump is installed and in PATH.');
+    console.error(result.error.message);
+    process.exit(1);
   }
+
+  if (result.status !== 0) {
+    console.error('pg_dump failed:', result.stderr);
+    process.exit(1);
+  }
+
+  writeFileSync(outputPath, result.stdout);
+  console.log(`Exported to ${outputPath}`);
 }
 
 async function main() {

backend/src/db/index.ts

@@ -12,11 +12,8 @@ const dbType = process.env.DB_TYPE || 'sqlite';
 let db: ReturnType<typeof drizzleSqlite> | ReturnType<typeof drizzlePg>;
 
 if (dbType === 'postgres') {
-  // Cap connections per instance so that, when running multiple replicas,
-  // DB_POOL_MAX * replicas stays below the Postgres max_connections limit.
   const pool = new pg.Pool({
     connectionString: process.env.DATABASE_URL || 'postgresql://localhost:5432/spanglish',
-    max: Number(process.env.DB_POOL_MAX || 10),
   });
   db = drizzlePg(pool, { schema });
 } else {

backend/src/db/migrate.ts

@@ -1,11 +1,10 @@
 import 'dotenv/config';
-import { db, dbAll, events } from './index.js';
-import { sql, eq } from 'drizzle-orm';
-import { uniqueSlug } from '../lib/slugify.js';
+import { db } from './index.js';
+import { sql } from 'drizzle-orm';
 
 const dbType = process.env.DB_TYPE || 'sqlite';
 console.log(`Database type: ${dbType}`);
-// Do not log DATABASE_URL: it may contain credentials.
+console.log(`Database URL: ${process.env.DATABASE_URL?.substring(0, 30)}...`);
 
 async function migrate() {
   console.log('Running migrations...');
@@ -43,9 +42,6 @@ async function migrate() {
     try {
       await (db as any).run(sql`ALTER TABLE users ADD COLUMN account_status TEXT NOT NULL DEFAULT 'active'`);
     } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).run(sql`ALTER TABLE users ADD COLUMN token_version INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
 
     // Magic link tokens table
     await (db as any).run(sql`
@@ -115,23 +111,6 @@ async function migrate() {
       await (db as any).run(sql`ALTER TABLE events ADD COLUMN short_description_es TEXT`);
     } catch (e) { /* column may already exist */ }
 
-    // Add slug column to events (backfilled below)
-    try {
-      await (db as any).run(sql`ALTER TABLE events ADD COLUMN slug TEXT`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).run(sql`CREATE UNIQUE INDEX IF NOT EXISTS events_slug_unique ON events(slug)`);
-    } catch (e) { /* index may already exist */ }
-
-    // Historical slugs that still resolve (and redirect) to an event's canonical slug
-    await (db as any).run(sql`
-      CREATE TABLE IF NOT EXISTS event_slug_aliases (
-        slug TEXT PRIMARY KEY,
-        event_id TEXT NOT NULL REFERENCES events(id),
-        created_at TEXT NOT NULL
-      )
-    `);
-
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS tickets (
         id TEXT PRIMARY KEY,
@@ -194,11 +173,6 @@ async function migrate() {
     try {
       await (db as any).run(sql`ALTER TABLE tickets ADD COLUMN booking_id TEXT`);
     } catch (e) { /* column may already exist */ }
-
-    // Migration: Add is_guest column to tickets
-    try {
-      await (db as any).run(sql`ALTER TABLE tickets ADD COLUMN is_guest INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
     
     // Make attendee_email and attendee_phone nullable (recreate table if needed or just allow nulls for new entries)
     // SQLite doesn't support altering column constraints, so we'll just ensure new entries work
@@ -262,10 +236,6 @@ async function migrate() {
         id TEXT PRIMARY KEY,
         tpago_enabled INTEGER NOT NULL DEFAULT 0,
         tpago_link TEXT,
-        tpago_link_2 TEXT,
-        tpago_link_3 TEXT,
-        tpago_link_4 TEXT,
-        tpago_link_5 TEXT,
         tpago_instructions TEXT,
         tpago_instructions_es TEXT,
         bank_transfer_enabled INTEGER NOT NULL DEFAULT 0,
@@ -290,13 +260,6 @@ async function migrate() {
       await (db as any).run(sql`ALTER TABLE payment_options ADD COLUMN allow_duplicate_bookings INTEGER NOT NULL DEFAULT 0`);
     } catch (e) { /* column may already exist */ }
 
-    // Add per-quantity TPago link columns to payment_options if they don't exist
-    for (const col of ['tpago_link_2', 'tpago_link_3', 'tpago_link_4', 'tpago_link_5']) {
-      try {
-        await (db as any).run(sql.raw(`ALTER TABLE payment_options ADD COLUMN ${col} TEXT`));
-      } catch (e) { /* column may already exist */ }
-    }
-
     // Event payment overrides table
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS event_payment_overrides (
@@ -304,10 +267,6 @@ async function migrate() {
         event_id TEXT NOT NULL REFERENCES events(id),
         tpago_enabled INTEGER,
         tpago_link TEXT,
-        tpago_link_2 TEXT,
-        tpago_link_3 TEXT,
-        tpago_link_4 TEXT,
-        tpago_link_5 TEXT,
         tpago_instructions TEXT,
         tpago_instructions_es TEXT,
         bank_transfer_enabled INTEGER,
@@ -327,13 +286,6 @@ async function migrate() {
       )
     `);
 
-    // Add per-quantity TPago link columns to event_payment_overrides if they don't exist
-    for (const col of ['tpago_link_2', 'tpago_link_3', 'tpago_link_4', 'tpago_link_5']) {
-      try {
-        await (db as any).run(sql.raw(`ALTER TABLE event_payment_overrides ADD COLUMN ${col} TEXT`));
-      } catch (e) { /* column may already exist */ }
-    }
-
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS contacts (
         id TEXT PRIMARY KEY,
@@ -416,13 +368,6 @@ async function migrate() {
       )
     `);
 
-    try {
-      await (db as any).run(sql`ALTER TABLE email_logs ADD COLUMN resend_attempts INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).run(sql`ALTER TABLE email_logs ADD COLUMN last_resent_at TEXT`);
-    } catch (e) { /* column may already exist */ }
-
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS email_settings (
         id TEXT PRIMARY KEY,
@@ -432,18 +377,6 @@ async function migrate() {
       )
     `);
 
-    await (db as any).run(sql`
-      CREATE TABLE IF NOT EXISTS email_queue (
-        id TEXT PRIMARY KEY,
-        params TEXT NOT NULL,
-        status TEXT NOT NULL DEFAULT 'pending',
-        attempts INTEGER NOT NULL DEFAULT 0,
-        last_error TEXT,
-        created_at TEXT NOT NULL,
-        processed_at TEXT
-      )
-    `);
-
     // Site settings table
     await (db as any).run(sql`
       CREATE TABLE IF NOT EXISTS site_settings (
@@ -556,9 +489,6 @@ async function migrate() {
     try {
       await (db as any).execute(sql`ALTER TABLE users ADD COLUMN account_status VARCHAR(20) NOT NULL DEFAULT 'active'`);
     } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).execute(sql`ALTER TABLE users ADD COLUMN token_version INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
 
     // Magic link tokens table
     await (db as any).execute(sql`
@@ -596,8 +526,8 @@ async function migrate() {
         description_es TEXT,
         short_description VARCHAR(300),
         short_description_es VARCHAR(300),
-        start_datetime TIMESTAMPTZ NOT NULL,
-        end_datetime TIMESTAMPTZ,
+        start_datetime TIMESTAMP NOT NULL,
+        end_datetime TIMESTAMP,
         location VARCHAR(500) NOT NULL,
         location_url VARCHAR(500),
         price DECIMAL(10, 2) NOT NULL DEFAULT 0,
@@ -628,32 +558,6 @@ async function migrate() {
       await (db as any).execute(sql`ALTER TABLE events ADD COLUMN short_description_es VARCHAR(300)`);
     } catch (e) { /* column may already exist */ }
 
-    // Migrate event datetime columns from TIMESTAMP to TIMESTAMPTZ for
-    // unambiguous UTC storage (eliminates pg driver timezone interpretation).
-    try {
-      await (db as any).execute(sql`ALTER TABLE events ALTER COLUMN start_datetime TYPE TIMESTAMPTZ USING start_datetime AT TIME ZONE 'UTC'`);
-    } catch (e) { /* already timestamptz or other issue */ }
-    try {
-      await (db as any).execute(sql`ALTER TABLE events ALTER COLUMN end_datetime TYPE TIMESTAMPTZ USING end_datetime AT TIME ZONE 'UTC'`);
-    } catch (e) { /* already timestamptz or other issue */ }
-
-    // Add slug column to events (backfilled below)
-    try {
-      await (db as any).execute(sql`ALTER TABLE events ADD COLUMN slug VARCHAR(255)`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).execute(sql`CREATE UNIQUE INDEX IF NOT EXISTS events_slug_unique ON events(slug)`);
-    } catch (e) { /* index may already exist */ }
-
-    // Historical slugs that still resolve (and redirect) to an event's canonical slug
-    await (db as any).execute(sql`
-      CREATE TABLE IF NOT EXISTS event_slug_aliases (
-        slug VARCHAR(255) PRIMARY KEY,
-        event_id UUID NOT NULL REFERENCES events(id),
-        created_at TIMESTAMP NOT NULL
-      )
-    `);
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS tickets (
         id UUID PRIMARY KEY,
@@ -688,11 +592,6 @@ async function migrate() {
       await (db as any).execute(sql`ALTER TABLE tickets ADD COLUMN booking_id UUID`);
     } catch (e) { /* column may already exist */ }
 
-    // Migration: Add is_guest column to tickets
-    try {
-      await (db as any).execute(sql`ALTER TABLE tickets ADD COLUMN is_guest INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS payments (
         id UUID PRIMARY KEY,
@@ -742,10 +641,6 @@ async function migrate() {
         id UUID PRIMARY KEY,
         tpago_enabled INTEGER NOT NULL DEFAULT 0,
         tpago_link VARCHAR(500),
-        tpago_link_2 VARCHAR(500),
-        tpago_link_3 VARCHAR(500),
-        tpago_link_4 VARCHAR(500),
-        tpago_link_5 VARCHAR(500),
         tpago_instructions TEXT,
         tpago_instructions_es TEXT,
         bank_transfer_enabled INTEGER NOT NULL DEFAULT 0,
@@ -770,23 +665,12 @@ async function migrate() {
       await (db as any).execute(sql`ALTER TABLE payment_options ADD COLUMN allow_duplicate_bookings INTEGER NOT NULL DEFAULT 0`);
     } catch (e) { /* column may already exist */ }
 
-    // Add per-quantity TPago link columns to payment_options if they don't exist
-    for (const col of ['tpago_link_2', 'tpago_link_3', 'tpago_link_4', 'tpago_link_5']) {
-      try {
-        await (db as any).execute(sql.raw(`ALTER TABLE payment_options ADD COLUMN ${col} VARCHAR(500)`));
-      } catch (e) { /* column may already exist */ }
-    }
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS event_payment_overrides (
         id UUID PRIMARY KEY,
         event_id UUID NOT NULL REFERENCES events(id),
         tpago_enabled INTEGER,
         tpago_link VARCHAR(500),
-        tpago_link_2 VARCHAR(500),
-        tpago_link_3 VARCHAR(500),
-        tpago_link_4 VARCHAR(500),
-        tpago_link_5 VARCHAR(500),
         tpago_instructions TEXT,
         tpago_instructions_es TEXT,
         bank_transfer_enabled INTEGER,
@@ -806,13 +690,6 @@ async function migrate() {
       )
     `);
 
-    // Add per-quantity TPago link columns to event_payment_overrides if they don't exist
-    for (const col of ['tpago_link_2', 'tpago_link_3', 'tpago_link_4', 'tpago_link_5']) {
-      try {
-        await (db as any).execute(sql.raw(`ALTER TABLE event_payment_overrides ADD COLUMN ${col} VARCHAR(500)`));
-      } catch (e) { /* column may already exist */ }
-    }
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS contacts (
         id UUID PRIMARY KEY,
@@ -895,13 +772,6 @@ async function migrate() {
       )
     `);
 
-    try {
-      await (db as any).execute(sql`ALTER TABLE email_logs ADD COLUMN resend_attempts INTEGER NOT NULL DEFAULT 0`);
-    } catch (e) { /* column may already exist */ }
-    try {
-      await (db as any).execute(sql`ALTER TABLE email_logs ADD COLUMN last_resent_at TIMESTAMP`);
-    } catch (e) { /* column may already exist */ }
-
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS email_settings (
         id UUID PRIMARY KEY,
@@ -911,18 +781,6 @@ async function migrate() {
       )
     `);
 
-    await (db as any).execute(sql`
-      CREATE TABLE IF NOT EXISTS email_queue (
-        id UUID PRIMARY KEY,
-        params TEXT NOT NULL,
-        status VARCHAR(20) NOT NULL DEFAULT 'pending',
-        attempts INTEGER NOT NULL DEFAULT 0,
-        last_error TEXT,
-        created_at TIMESTAMP NOT NULL,
-        processed_at TIMESTAMP
-      )
-    `);
-
     // Site settings table
     await (db as any).execute(sql`
       CREATE TABLE IF NOT EXISTS site_settings (
@@ -1004,64 +862,6 @@ async function migrate() {
     `);
   }
 
-  // Indexes on foreign-key / hot-filter columns (CREATE INDEX IF NOT EXISTS works on both engines)
-  const indexStatements = [
-    `CREATE INDEX IF NOT EXISTS tickets_event_id_idx ON tickets(event_id)`,
-    `CREATE INDEX IF NOT EXISTS tickets_user_id_idx ON tickets(user_id)`,
-    `CREATE INDEX IF NOT EXISTS tickets_booking_id_idx ON tickets(booking_id)`,
-    `CREATE INDEX IF NOT EXISTS tickets_status_idx ON tickets(status)`,
-    `CREATE INDEX IF NOT EXISTS payments_ticket_id_idx ON payments(ticket_id)`,
-    `CREATE INDEX IF NOT EXISTS payments_status_idx ON payments(status)`,
-    `CREATE INDEX IF NOT EXISTS email_logs_event_id_idx ON email_logs(event_id)`,
-    `CREATE INDEX IF NOT EXISTS magic_link_tokens_token_idx ON magic_link_tokens(token)`,
-  ];
-  for (const stmt of indexStatements) {
-    try {
-      if (dbType === 'sqlite') {
-        await (db as any).run(sql.raw(stmt));
-      } else {
-        await (db as any).execute(sql.raw(stmt));
-      }
-    } catch (e) { /* index may already exist */ }
-  }
-
-  // Backfill slugs for any events that don't have one yet (shared across DB types).
-  // Ordered by creation so duplicate titles get deterministic -2, -3 suffixes.
-  const allEvents = await dbAll<{ id: string; title: string; slug: string | null }>(
-    (db as any).select().from(events).orderBy((events as any).createdAt)
-  );
-  const assignedSlugs: string[] = allEvents
-    .filter((e) => e.slug)
-    .map((e) => e.slug as string);
-  let backfilled = 0;
-  for (const ev of allEvents) {
-    if (ev.slug) continue;
-    const slug = uniqueSlug(ev.title || 'event', assignedSlugs);
-    assignedSlugs.push(slug);
-    await (db as any).update(events).set({ slug }).where(eq((events as any).id, ev.id));
-    backfilled++;
-  }
-  if (backfilled > 0) {
-    console.log(`Backfilled slugs for ${backfilled} event(s).`);
-    // Bust the frontend cache so the homepage / sitemap pick up the new slugs
-    // immediately instead of serving stale (pre-slug) data for up to the
-    // revalidate window. Awaited (not fire-and-forget) so it runs before exit.
-    const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3002';
-    const secret = process.env.REVALIDATE_SECRET;
-    if (secret) {
-      try {
-        const res = await fetch(`${frontendUrl}/api/revalidate`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ secret, tag: ['events-sitemap', 'next-event'] }),
-        });
-        console.log(res.ok ? 'Frontend cache revalidated.' : `Frontend revalidation returned ${res.status}.`);
-      } catch (e: any) {
-        console.warn('Frontend revalidation skipped (frontend not reachable):', e?.message || e);
-      }
-    }
-  }
-
   console.log('Migrations completed successfully!');
   process.exit(0);
 }

backend/src/db/schema.ts

@@ -18,8 +18,6 @@ export const sqliteUsers = sqliteTable('users', {
   googleId: text('google_id'),
   rucNumber: text('ruc_number'),
   accountStatus: text('account_status', { enum: ['active', 'unclaimed', 'suspended'] }).notNull().default('active'),
-  // Incremented to invalidate previously issued JWTs (logout-everywhere, password change/reset)
-  tokenVersion: integer('token_version').notNull().default(0),
   createdAt: text('created_at').notNull(),
   updatedAt: text('updated_at').notNull(),
 });
@@ -64,7 +62,6 @@ export const sqliteInvoices = sqliteTable('invoices', {
 
 export const sqliteEvents = sqliteTable('events', {
   id: text('id').primaryKey(),
-  slug: text('slug').unique(),
   title: text('title').notNull(),
   titleEs: text('title_es'),
   description: text('description').notNull(),
@@ -86,13 +83,6 @@ export const sqliteEvents = sqliteTable('events', {
   updatedAt: text('updated_at').notNull(),
 });
 
-// Historical slugs that still resolve (and redirect) to an event's canonical slug
-export const sqliteEventSlugAliases = sqliteTable('event_slug_aliases', {
-  slug: text('slug').primaryKey(),
-  eventId: text('event_id').notNull().references(() => sqliteEvents.id),
-  createdAt: text('created_at').notNull(),
-});
-
 export const sqliteTickets = sqliteTable('tickets', {
   id: text('id').primaryKey(),
   bookingId: text('booking_id'), // Groups multiple tickets from same booking
@@ -109,7 +99,6 @@ export const sqliteTickets = sqliteTable('tickets', {
   checkedInByAdminId: text('checked_in_by_admin_id').references(() => sqliteUsers.id), // Who performed the check-in
   qrCode: text('qr_code'),
   adminNote: text('admin_note'),
-  isGuest: integer('is_guest', { mode: 'boolean' }).notNull().default(false),
   createdAt: text('created_at').notNull(),
 });
 
@@ -137,10 +126,6 @@ export const sqlitePaymentOptions = sqliteTable('payment_options', {
   // TPago configuration
   tpagoEnabled: integer('tpago_enabled', { mode: 'boolean' }).notNull().default(false),
   tpagoLink: text('tpago_link'),
-  tpagoLink2: text('tpago_link_2'),
-  tpagoLink3: text('tpago_link_3'),
-  tpagoLink4: text('tpago_link_4'),
-  tpagoLink5: text('tpago_link_5'),
   tpagoInstructions: text('tpago_instructions'),
   tpagoInstructionsEs: text('tpago_instructions_es'),
   // Bank Transfer configuration
@@ -172,10 +157,6 @@ export const sqliteEventPaymentOverrides = sqliteTable('event_payment_overrides'
   // Override flags (null means use global)
   tpagoEnabled: integer('tpago_enabled', { mode: 'boolean' }),
   tpagoLink: text('tpago_link'),
-  tpagoLink2: text('tpago_link_2'),
-  tpagoLink3: text('tpago_link_3'),
-  tpagoLink4: text('tpago_link_4'),
-  tpagoLink5: text('tpago_link_5'),
   tpagoInstructions: text('tpago_instructions'),
   tpagoInstructionsEs: text('tpago_instructions_es'),
   bankTransferEnabled: integer('bank_transfer_enabled', { mode: 'boolean' }),
@@ -262,8 +243,6 @@ export const sqliteEmailLogs = sqliteTable('email_logs', {
   sentAt: text('sent_at'),
   sentBy: text('sent_by').references(() => sqliteUsers.id),
   createdAt: text('created_at').notNull(),
-  resendAttempts: integer('resend_attempts').notNull().default(0),
-  lastResentAt: text('last_resent_at'),
 });
 
 export const sqliteEmailSettings = sqliteTable('email_settings', {
@@ -273,18 +252,6 @@ export const sqliteEmailSettings = sqliteTable('email_settings', {
   updatedAt: text('updated_at').notNull(),
 });
 
-// Durable email queue. Jobs survive process restarts; a startup recovery step
-// resets any 'processing' rows back to 'pending'.
-export const sqliteEmailQueue = sqliteTable('email_queue', {
-  id: text('id').primaryKey(),
-  params: text('params').notNull(), // JSON-encoded TemplateEmailJobParams
-  status: text('status', { enum: ['pending', 'processing', 'sent', 'failed'] }).notNull().default('pending'),
-  attempts: integer('attempts').notNull().default(0),
-  lastError: text('last_error'),
-  createdAt: text('created_at').notNull(),
-  processedAt: text('processed_at'),
-});
-
 // Legal Pages table for admin-editable legal content
 export const sqliteLegalPages = sqliteTable('legal_pages', {
   id: text('id').primaryKey(),
@@ -373,8 +340,6 @@ export const pgUsers = pgTable('users', {
   googleId: varchar('google_id', { length: 255 }),
   rucNumber: varchar('ruc_number', { length: 15 }),
   accountStatus: varchar('account_status', { length: 20 }).notNull().default('active'),
-  // Incremented to invalidate previously issued JWTs (logout-everywhere, password change/reset)
-  tokenVersion: pgInteger('token_version').notNull().default(0),
   createdAt: timestamp('created_at').notNull(),
   updatedAt: timestamp('updated_at').notNull(),
 });
@@ -419,15 +384,14 @@ export const pgInvoices = pgTable('invoices', {
 
 export const pgEvents = pgTable('events', {
   id: uuid('id').primaryKey(),
-  slug: varchar('slug', { length: 255 }).unique(),
   title: varchar('title', { length: 255 }).notNull(),
   titleEs: varchar('title_es', { length: 255 }),
   description: pgText('description').notNull(),
   descriptionEs: pgText('description_es'),
   shortDescription: varchar('short_description', { length: 300 }),
   shortDescriptionEs: varchar('short_description_es', { length: 300 }),
-  startDatetime: timestamp('start_datetime', { withTimezone: true }).notNull(),
-  endDatetime: timestamp('end_datetime', { withTimezone: true }),
+  startDatetime: timestamp('start_datetime').notNull(),
+  endDatetime: timestamp('end_datetime'),
   location: varchar('location', { length: 500 }).notNull(),
   locationUrl: varchar('location_url', { length: 500 }),
   price: decimal('price', { precision: 10, scale: 2 }).notNull().default('0'),
@@ -441,13 +405,6 @@ export const pgEvents = pgTable('events', {
   updatedAt: timestamp('updated_at').notNull(),
 });
 
-// Historical slugs that still resolve (and redirect) to an event's canonical slug
-export const pgEventSlugAliases = pgTable('event_slug_aliases', {
-  slug: varchar('slug', { length: 255 }).primaryKey(),
-  eventId: uuid('event_id').notNull().references(() => pgEvents.id),
-  createdAt: timestamp('created_at').notNull(),
-});
-
 export const pgTickets = pgTable('tickets', {
   id: uuid('id').primaryKey(),
   bookingId: uuid('booking_id'), // Groups multiple tickets from same booking
@@ -464,7 +421,6 @@ export const pgTickets = pgTable('tickets', {
   checkedInByAdminId: uuid('checked_in_by_admin_id').references(() => pgUsers.id), // Who performed the check-in
   qrCode: varchar('qr_code', { length: 255 }),
   adminNote: pgText('admin_note'),
-  isGuest: pgInteger('is_guest').notNull().default(0),
   createdAt: timestamp('created_at').notNull(),
 });
 
@@ -491,10 +447,6 @@ export const pgPaymentOptions = pgTable('payment_options', {
   id: uuid('id').primaryKey(),
   tpagoEnabled: pgInteger('tpago_enabled').notNull().default(0),
   tpagoLink: varchar('tpago_link', { length: 500 }),
-  tpagoLink2: varchar('tpago_link_2', { length: 500 }),
-  tpagoLink3: varchar('tpago_link_3', { length: 500 }),
-  tpagoLink4: varchar('tpago_link_4', { length: 500 }),
-  tpagoLink5: varchar('tpago_link_5', { length: 500 }),
   tpagoInstructions: pgText('tpago_instructions'),
   tpagoInstructionsEs: pgText('tpago_instructions_es'),
   bankTransferEnabled: pgInteger('bank_transfer_enabled').notNull().default(0),
@@ -520,10 +472,6 @@ export const pgEventPaymentOverrides = pgTable('event_payment_overrides', {
   eventId: uuid('event_id').notNull().references(() => pgEvents.id),
   tpagoEnabled: pgInteger('tpago_enabled'),
   tpagoLink: varchar('tpago_link', { length: 500 }),
-  tpagoLink2: varchar('tpago_link_2', { length: 500 }),
-  tpagoLink3: varchar('tpago_link_3', { length: 500 }),
-  tpagoLink4: varchar('tpago_link_4', { length: 500 }),
-  tpagoLink5: varchar('tpago_link_5', { length: 500 }),
   tpagoInstructions: pgText('tpago_instructions'),
   tpagoInstructionsEs: pgText('tpago_instructions_es'),
   bankTransferEnabled: pgInteger('bank_transfer_enabled'),
@@ -609,8 +557,6 @@ export const pgEmailLogs = pgTable('email_logs', {
   sentAt: timestamp('sent_at'),
   sentBy: uuid('sent_by').references(() => pgUsers.id),
   createdAt: timestamp('created_at').notNull(),
-  resendAttempts: pgInteger('resend_attempts').notNull().default(0),
-  lastResentAt: timestamp('last_resent_at'),
 });
 
 export const pgEmailSettings = pgTable('email_settings', {
@@ -620,18 +566,6 @@ export const pgEmailSettings = pgTable('email_settings', {
   updatedAt: timestamp('updated_at').notNull(),
 });
 
-// Durable email queue. Jobs survive process restarts; a startup recovery step
-// resets any 'processing' rows back to 'pending'.
-export const pgEmailQueue = pgTable('email_queue', {
-  id: uuid('id').primaryKey(),
-  params: pgText('params').notNull(), // JSON-encoded TemplateEmailJobParams
-  status: varchar('status', { length: 20 }).notNull().default('pending'),
-  attempts: pgInteger('attempts').notNull().default(0),
-  lastError: pgText('last_error'),
-  createdAt: timestamp('created_at').notNull(),
-  processedAt: timestamp('processed_at'),
-});
-
 // Legal Pages table for admin-editable legal content
 export const pgLegalPages = pgTable('legal_pages', {
   id: uuid('id').primaryKey(),
@@ -709,7 +643,6 @@ export const pgSiteSettings = pgTable('site_settings', {
 // Export the appropriate schema based on DB_TYPE
 export const users = dbType === 'postgres' ? pgUsers : sqliteUsers;
 export const events = dbType === 'postgres' ? pgEvents : sqliteEvents;
-export const eventSlugAliases = dbType === 'postgres' ? pgEventSlugAliases : sqliteEventSlugAliases;
 export const tickets = dbType === 'postgres' ? pgTickets : sqliteTickets;
 export const payments = dbType === 'postgres' ? pgPayments : sqlitePayments;
 export const contacts = dbType === 'postgres' ? pgContacts : sqliteContacts;
@@ -719,7 +652,6 @@ export const auditLogs = dbType === 'postgres' ? pgAuditLogs : sqliteAuditLogs;
 export const emailTemplates = dbType === 'postgres' ? pgEmailTemplates : sqliteEmailTemplates;
 export const emailLogs = dbType === 'postgres' ? pgEmailLogs : sqliteEmailLogs;
 export const emailSettings = dbType === 'postgres' ? pgEmailSettings : sqliteEmailSettings;
-export const emailQueue = dbType === 'postgres' ? pgEmailQueue : sqliteEmailQueue;
 export const paymentOptions = dbType === 'postgres' ? pgPaymentOptions : sqlitePaymentOptions;
 export const eventPaymentOverrides = dbType === 'postgres' ? pgEventPaymentOverrides : sqliteEventPaymentOverrides;
 export const magicLinkTokens = dbType === 'postgres' ? pgMagicLinkTokens : sqliteMagicLinkTokens;

backend/src/index.ts

@@ -25,9 +25,6 @@ import legalSettingsRoutes from './routes/legal-settings.js';
 import faqRoutes from './routes/faq.js';
 import emailService from './lib/email.js';
 import { initEmailQueue } from './lib/emailQueue.js';
-import { startBookingCleanup } from './lib/bookingCleanup.js';
-import { getLock } from './lib/stores/lock.js';
-import { describeBackends, describeRedis, logSelectedBackends } from './lib/backends.js';
 
 const app = new Hono();
 
@@ -59,19 +56,6 @@ app.use(
   })
 );
 
-// Baseline security headers on every response.
-const isProduction = process.env.NODE_ENV === 'production';
-app.use('*', async (c, next) => {
-  await next();
-  c.header('X-Content-Type-Options', 'nosniff');
-  c.header('X-Frame-Options', 'DENY');
-  c.header('Referrer-Policy', 'strict-origin-when-cross-origin');
-  c.header('X-XSS-Protection', '0');
-  if (isProduction) {
-    c.header('Strict-Transport-Security', 'max-age=31536000; includeSubDomains');
-  }
-});
-
 // OpenAPI specification
 const openApiSpec = {
   openapi: '3.0.0',
@@ -673,21 +657,11 @@ const openApiSpec = {
         },
       },
     },
-    '/api/events/next': {
-      get: {
-        tags: ['Events'],
-        summary: 'Get next upcoming event (chronological)',
-        description: 'Get the single earliest upcoming published event, ignoring featured promotion.',
-        responses: {
-          200: { description: 'Next event or null' },
-        },
-      },
-    },
     '/api/events/next/upcoming': {
       get: {
         tags: ['Events'],
         summary: 'Get next upcoming event',
-        description: 'Get the featured event if valid, otherwise the single next upcoming published event.',
+        description: 'Get the single next upcoming published event.',
         responses: {
           200: { description: 'Next event or null' },
         },
@@ -1853,46 +1827,20 @@ const openApiSpec = {
   },
 };
 
-// API documentation is disabled in production to avoid exposing the full API
-// surface (and schema) to anonymous users. Enable locally / in non-prod only.
-if (!isProduction) {
-  // OpenAPI JSON endpoint
-  app.get('/openapi.json', (c) => {
-    return c.json(openApiSpec);
-  });
-
-  // Swagger UI
-  app.get('/api-docs', swaggerUI({ url: '/openapi.json' }));
-} else {
-  app.get('/openapi.json', (c) => c.json({ error: 'Not Found' }, 404));
-  app.get('/api-docs', (c) => c.json({ error: 'Not Found' }, 404));
-}
-
-// Static file serving for uploads.
-// Uploads are validated as images at write time, but as defense-in-depth we force
-// any non-image path to download as an opaque attachment so a stray/legacy
-// .html/.svg can never be rendered (and therefore never execute script) in-origin.
-app.use('/uploads/*', async (c, next) => {
-  await next();
-  const path = c.req.path.toLowerCase();
-  const isInlineImage = /\.(jpg|jpeg|png|gif|webp|avif)$/.test(path);
-  if (!isInlineImage) {
-    c.header('Content-Disposition', 'attachment');
-    c.header('Content-Type', 'application/octet-stream');
-  }
+// OpenAPI JSON endpoint
+app.get('/openapi.json', (c) => {
+  return c.json(openApiSpec);
 });
+
+// Swagger UI
+app.get('/api-docs', swaggerUI({ url: '/openapi.json' }));
+
+// Static file serving for uploads
 app.use('/uploads/*', serveStatic({ root: './' }));
 
-// Health check.
-// Always returns 200 so a transient Redis blip does not cause the load balancer
-// to pull a node; Redis/subsystem status is reported in the body for monitoring.
+// Health check
 app.get('/health', (c) => {
-  return c.json({
-    status: 'ok',
-    timestamp: new Date().toISOString(),
-    redis: describeRedis(),
-    backends: describeBackends(),
-  });
+  return c.json({ status: 'ok', timestamp: new Date().toISOString() });
 });
 
 // API Routes
@@ -1929,30 +1877,15 @@ const port = parseInt(process.env.PORT || '3001');
 // Initialize email queue with the email service reference
 initEmailQueue(emailService);
 
-// Periodically expire abandoned pending bookings so they stop holding seats.
-startBookingCleanup();
-
-// Initialize email templates on startup.
-// Guarded by a distributed lock so that, when running multiple replicas, only
-// one instance seeds/updates templates per boot instead of all of them racing.
-getLock()
-  .withLock('seed-templates', 30_000, () => emailService.seedDefaultTemplates())
-  .then((result) => {
-    if (result === null) {
-      console.log('[Email] Template seeding skipped (another instance holds the lock)');
-    }
-  })
-  .catch(err => {
-    console.error('[Email] Failed to seed templates:', err);
-  });
+// Initialize email templates on startup
+emailService.seedDefaultTemplates().catch(err => {
+  console.error('[Email] Failed to seed templates:', err);
+});
 
 console.log(`🚀 Spanglish API server starting on port ${port}`);
 console.log(`📚 API docs available at http://localhost:${port}/api-docs`);
 console.log(`📋 OpenAPI spec at http://localhost:${port}/openapi.json`);
 
-// Log which backend (memory/redis, local/s3) each subsystem selected.
-logSelectedBackends();
-
 serve({
   fetch: app.fetch,
   port,

backend/src/lib/auth.ts

@@ -4,21 +4,10 @@ import bcrypt from 'bcryptjs';
 import crypto from 'crypto';
 import { Context } from 'hono';
 import { db, dbGet, dbAll, users, magicLinkTokens, userSessions } from '../db/index.js';
-import { eq, and, gt, sql, isNull } from 'drizzle-orm';
+import { eq, and, gt } from 'drizzle-orm';
 import { generateId, getNow, toDbDate } from './utils.js';
 
-const DEFAULT_DEV_JWT_SECRET = 'your-super-secret-key-change-in-production';
-const rawJwtSecret = process.env.JWT_SECRET;
-
-// Never allow the insecure default in production: forgeable tokens = full account takeover.
-if (process.env.NODE_ENV === 'production' && (!rawJwtSecret || rawJwtSecret === DEFAULT_DEV_JWT_SECRET)) {
-  throw new Error('JWT_SECRET must be set to a strong, unique value in production. Refusing to start with the default secret.');
-}
-if (!rawJwtSecret) {
-  console.warn('[auth] JWT_SECRET is not set; using an insecure development default. Set JWT_SECRET in production.');
-}
-
-const JWT_SECRET = new TextEncoder().encode(rawJwtSecret || DEFAULT_DEV_JWT_SECRET);
+const JWT_SECRET = new TextEncoder().encode(process.env.JWT_SECRET || 'your-super-secret-key-change-in-production');
 const JWT_ISSUER = 'spanglish';
 const JWT_AUDIENCE = 'spanglish-app';
 
@@ -26,7 +15,6 @@ export interface JWTPayload {
   sub: string;
   email: string;
   role: string;
-  tokenVersion?: number;
   iat: number;
   exp: number;
 }
@@ -96,36 +84,23 @@ export async function verifyMagicLinkToken(
       )
   );
 
-  // Use a single generic error for all invalid states to avoid leaking token state
-  const genericError = 'Invalid or expired token';
-
   if (!tokenRecord) {
-    return { valid: false, error: genericError };
+    return { valid: false, error: 'Invalid token' };
   }
 
   if (tokenRecord.usedAt) {
-    return { valid: false, error: genericError };
+    return { valid: false, error: 'Token already used' };
   }
 
   if (new Date(tokenRecord.expiresAt) < new Date()) {
-    return { valid: false, error: genericError };
+    return { valid: false, error: 'Token expired' };
   }
 
-  // Atomically consume the token: only the request that flips used_at from NULL wins.
-  // This prevents a double-spend race where two concurrent requests both pass the
-  // read-time "not used" check above.
-  const result: any = await (db as any)
+  // Mark token as used
+  await (db as any)
     .update(magicLinkTokens)
     .set({ usedAt: now })
-    .where(and(
-      eq((magicLinkTokens as any).id, tokenRecord.id),
-      isNull((magicLinkTokens as any).usedAt)
-    ));
-
-  const affected = result?.changes ?? result?.rowCount ?? 0;
-  if (affected === 0) {
-    return { valid: false, error: genericError };
-  }
+    .where(eq((magicLinkTokens as any).id, tokenRecord.id));
 
   return { valid: true, userId: tokenRecord.userId };
 }
@@ -192,67 +167,26 @@ export async function invalidateAllUserSessions(userId: string): Promise<void> {
     .where(eq((userSessions as any).userId, userId));
 }
 
-// Small blocklist of common/weak passwords (and obvious app-specific ones).
-// Compared case-insensitively after stripping non-alphanumerics so that e.g.
-// "P@ssw0rd!" still matches "password".
-const COMMON_PASSWORDS = new Set([
-  'password', 'passw0rd', '123456', '1234567', '12345678', '123456789', '1234567890',
-  'qwerty', 'qwertyuiop', 'letmein', 'welcome', 'admin', 'administrator', 'iloveyou',
-  'monkey', 'dragon', 'sunshine', 'princess', 'football', 'baseball', 'abc123',
-  'spanglish', 'changeme', 'secret', 'master', 'login', 'access',
-]);
-
-// Password policy: 10-128 chars, requires a mix of character types, and rejects
-// common/weak passwords. Centralized so register/reset/change all share it.
+// Password validation (min 10 characters per spec)
 export function validatePassword(password: string): { valid: boolean; error?: string } {
   if (password.length < 10) {
     return { valid: false, error: 'Password must be at least 10 characters long' };
   }
-  if (password.length > 128) {
-    return { valid: false, error: 'Password must be at most 128 characters long' };
-  }
-
-  const hasLower = /[a-z]/.test(password);
-  const hasUpper = /[A-Z]/.test(password);
-  const hasDigit = /\d/.test(password);
-  const hasSymbol = /[^A-Za-z0-9]/.test(password);
-
-  // Require lowercase, uppercase, and at least one digit or symbol.
-  if (!hasLower || !hasUpper || !(hasDigit || hasSymbol)) {
-    return {
-      valid: false,
-      error: 'Password must include uppercase and lowercase letters and at least one number or symbol',
-    };
-  }
-
-  const normalized = password.toLowerCase().replace(/[^a-z0-9]/g, '');
-  if (COMMON_PASSWORDS.has(normalized)) {
-    return { valid: false, error: 'Password is too common. Please choose a less guessable password.' };
-  }
-
   return { valid: true };
 }
 
-export async function createToken(userId: string, email: string, role: string, tokenVersion: number = 0): Promise<string> {
-  const token = await new jose.SignJWT({ sub: userId, email, role, tokenVersion })
+export async function createToken(userId: string, email: string, role: string): Promise<string> {
+  const token = await new jose.SignJWT({ sub: userId, email, role })
     .setProtectedHeader({ alg: 'HS256' })
     .setIssuedAt()
     .setIssuer(JWT_ISSUER)
     .setAudience(JWT_AUDIENCE)
-    .setExpirationTime('1d')
+    .setExpirationTime('7d')
     .sign(JWT_SECRET);
   
   return token;
 }
 
-// Invalidate all previously issued JWTs for a user (logout-everywhere, password change/reset).
-export async function bumpTokenVersion(userId: string): Promise<void> {
-  await (db as any)
-    .update(users)
-    .set({ tokenVersion: sql`${(users as any).tokenVersion} + 1` })
-    .where(eq((users as any).id, userId));
-}
-
 export async function createRefreshToken(userId: string): Promise<string> {
   const token = await new jose.SignJWT({ sub: userId, type: 'refresh' })
     .setProtectedHeader({ alg: 'HS256' })
@@ -289,44 +223,10 @@ export async function getAuthUser(c: Context): Promise<any | null> {
     return null;
   }
   
-  // Never load the password hash into request context — it is only needed for
-  // explicit password-verification routes that query it separately.
   const user = await dbGet<any>(
-    (db as any)
-      .select({
-        id: (users as any).id,
-        email: (users as any).email,
-        name: (users as any).name,
-        phone: (users as any).phone,
-        role: (users as any).role,
-        languagePreference: (users as any).languagePreference,
-        isClaimed: (users as any).isClaimed,
-        googleId: (users as any).googleId,
-        rucNumber: (users as any).rucNumber,
-        accountStatus: (users as any).accountStatus,
-        tokenVersion: (users as any).tokenVersion,
-        createdAt: (users as any).createdAt,
-        updatedAt: (users as any).updatedAt,
-      })
-      .from(users)
-      .where(eq((users as any).id, payload.sub))
+    (db as any).select().from(users).where(eq((users as any).id, payload.sub))
   );
-
-  if (!user) {
-    return null;
-  }
-
-  // Reject tokens issued before a logout-everywhere / password change
-  if ((payload.tokenVersion ?? 0) !== (user.tokenVersion ?? 0)) {
-    return null;
-  }
-
-  // Suspended/unclaimed accounts must not retain API access via an old JWT
-  if (user.accountStatus && user.accountStatus !== 'active') {
-    return null;
-  }
-
-  return user;
+  return user || null;
 }
 
 export function requireAuth(roles?: string[]) {
@@ -352,15 +252,3 @@ export async function isFirstUser(): Promise<boolean> {
   );
   return !result || result.length === 0;
 }
-
-/** Fetch only the password hash column (never expose via getAuthUser). */
-export async function getUserPasswordHash(userId: string): Promise<string | null> {
-  const row = await dbGet<any>(
-    (db as any)
-      .select({ password: (users as any).password })
-      .from(users)
-      .where(eq((users as any).id, userId))
-  );
-  const hash = row?.password;
-  return hash && String(hash).length > 0 ? String(hash) : null;
-}

backend/src/lib/backends.ts

@@ -1,36 +0,0 @@
-// Reports which backend each scalable subsystem is using, for the health
-// endpoint and startup logging.
-
-import { isRedisEnabled, isRedisHealthy } from './redis.js';
-import { getRateLimiter } from './stores/rateLimiter.js';
-import { getPubSub } from './stores/pubsub.js';
-import { getCache } from './stores/cache.js';
-import { getLock } from './stores/lock.js';
-import { getStorage } from './storage.js';
-
-export function describeBackends() {
-  return {
-    cache: getCache().backend,
-    rateLimiter: getRateLimiter().backend,
-    pubsub: getPubSub().backend,
-    lock: getLock().backend,
-    storage: getStorage().backend,
-  };
-}
-
-export function describeRedis() {
-  return { enabled: isRedisEnabled(), healthy: isRedisHealthy() };
-}
-
-/** Log one line per subsystem at startup so the active backend is obvious. */
-export function logSelectedBackends(): void {
-  const b = describeBackends();
-  const r = describeRedis();
-  console.log('[startup] Subsystem backends:');
-  console.log(`  redis:        ${r.enabled ? 'enabled' : 'disabled (in-memory fallback)'}`);
-  console.log(`  cache:        ${b.cache}`);
-  console.log(`  rate limiter: ${b.rateLimiter}`);
-  console.log(`  pub/sub:      ${b.pubsub}`);
-  console.log(`  lock:         ${b.lock}`);
-  console.log(`  storage:      ${b.storage}`);
-}

backend/src/lib/bookingCleanup.ts

@@ -1,104 +0,0 @@
-// Expire stale pending bookings.
-//
-// When a booking is started, its tickets are created with status 'pending' and
-// a 'pending' payment. Pending tickets count toward an event's capacity, so an
-// abandoned checkout would otherwise hold those seats forever. This job cancels
-// pending tickets whose payment is still 'pending' (i.e. never paid and not
-// awaiting admin approval) after a configurable TTL, freeing the seats.
-
-import { and, eq, lt, inArray } from 'drizzle-orm';
-import { db, dbAll, tickets, payments } from '../db/index.js';
-import { getNow, toDbDate } from './utils.js';
-import { getLock } from './stores/lock.js';
-
-function getTtlMs(): number {
-  const minutes = parseInt(process.env.PENDING_BOOKING_TTL_MINUTES || '30', 10);
-  return (Number.isFinite(minutes) && minutes > 0 ? minutes : 30) * 60 * 1000;
-}
-
-/**
- * Cancel stale pending bookings. Returns the number of tickets cancelled.
- *
- * A booking is considered stale when its payment is still 'pending' (not
- * 'pending_approval', which means an admin is reviewing a manual transfer) and
- * older than PENDING_BOOKING_TTL_MINUTES.
- */
-export async function cleanupStalePendingBookings(): Promise<number> {
-  const cutoff = toDbDate(new Date(Date.now() - getTtlMs()));
-
-  const stale = await dbAll<{ ticketId: string | null; paymentId: string }>(
-    (db as any)
-      .select({
-        ticketId: (payments as any).ticketId,
-        paymentId: (payments as any).id,
-      })
-      .from(payments)
-      .where(and(
-        eq((payments as any).status, 'pending'),
-        lt((payments as any).createdAt, cutoff)
-      ))
-  );
-
-  if (stale.length === 0) return 0;
-
-  const ticketIds = stale.map((s) => s.ticketId).filter((id): id is string => !!id);
-  const paymentIds = stale.map((s) => s.paymentId);
-  const now = getNow();
-
-  let cancelledTickets = 0;
-  if (ticketIds.length > 0) {
-    const result: any = await (db as any)
-      .update(tickets)
-      .set({ status: 'cancelled' })
-      .where(and(
-        inArray((tickets as any).id, ticketIds),
-        eq((tickets as any).status, 'pending')
-      ));
-    cancelledTickets = result?.changes ?? result?.rowCount ?? ticketIds.length;
-  }
-
-  await (db as any)
-    .update(payments)
-    .set({ status: 'failed', updatedAt: now })
-    .where(inArray((payments as any).id, paymentIds));
-
-  console.log(
-    `[BookingCleanup] Expired ${stale.length} stale pending payment(s); ` +
-    `cancelled ${cancelledTickets} ticket(s).`
-  );
-  return cancelledTickets;
-}
-
-let cleanupTimer: ReturnType<typeof setInterval> | null = null;
-
-/**
- * Start a periodic cleanup of stale pending bookings. Each run is guarded by a
- * distributed lock so that, across multiple replicas, only one instance does
- * the work per interval.
- */
-export function startBookingCleanup(): void {
-  const intervalMs = parseInt(process.env.PENDING_BOOKING_CLEANUP_INTERVAL_MS || '300000', 10); // 5 min
-
-  const run = () => {
-    getLock()
-      .withLock('cleanup-pending-bookings', Math.min(intervalMs, 60_000), () =>
-        cleanupStalePendingBookings()
-      )
-      .catch((err) =>
-        console.error('[BookingCleanup] Run failed:', err?.message || err)
-      );
-  };
-
-  // Run shortly after startup, then on the interval.
-  setTimeout(run, 30_000).unref?.();
-  cleanupTimer = setInterval(run, intervalMs);
-  cleanupTimer.unref?.();
-  console.log(`[BookingCleanup] Scheduled every ${Math.round(intervalMs / 1000)}s`);
-}
-
-export function stopBookingCleanup(): void {
-  if (cleanupTimer) {
-    clearInterval(cleanupTimer);
-    cleanupTimer = null;
-  }
-}

backend/src/lib/email/bookingEmails.ts

@@ -1,96 +0,0 @@
-// High-level booking confirmation email sender.
-
-import { db, dbGet, dbAll, events, tickets } from '../../db/index.js';
-import { eq } from 'drizzle-orm';
-import { sendTemplateEmail } from './templateService.js';
-import { formatDate, formatTime, formatCurrency, getSiteTimezone } from './formatting.js';
-
-/**
- * Send booking confirmation email
- * Supports multi-ticket bookings - includes all tickets in the booking
- */
-export async function sendBookingConfirmation(ticketId: string): Promise<{ success: boolean; error?: string }> {
-  // Get ticket with event info
-  const ticket = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(tickets)
-      .where(eq((tickets as any).id, ticketId))
-  );
-
-  if (!ticket) {
-    return { success: false, error: 'Ticket not found' };
-  }
-
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, ticket.eventId))
-  );
-
-  if (!event) {
-    return { success: false, error: 'Event not found' };
-  }
-
-  // Get all tickets in this booking (if multi-ticket)
-  let allTickets: any[] = [ticket];
-  if (ticket.bookingId) {
-    allTickets = await dbAll(
-      (db as any)
-        .select()
-        .from(tickets)
-        .where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-  }
-
-  const ticketCount = allTickets.length;
-  const locale = ticket.preferredLanguage || 'en';
-  const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-
-  // Generate ticket PDF URL (primary ticket, or use combined endpoint for multi)
-  const apiUrl = process.env.API_URL || 'http://localhost:3001';
-  const ticketPdfUrl = ticketCount > 1 && ticket.bookingId
-    ? `${apiUrl}/api/tickets/booking/${ticket.bookingId}/pdf`
-    : `${apiUrl}/api/tickets/${ticket.id}/pdf`;
-
-  const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-  // Build attendee list for multi-ticket emails
-  const attendeeNames = allTickets.map(t =>
-    `${t.attendeeFirstName} ${t.attendeeLastName || ''}`.trim()
-  ).join(', ');
-
-  // Calculate total price for multi-ticket bookings
-  const totalPrice = event.price * ticketCount;
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  return sendTemplateEmail({
-    templateSlug: 'booking-confirmation',
-    to: ticket.attendeeEmail,
-    toName: attendeeFullName,
-    locale,
-    eventId: event.id,
-    variables: {
-      attendeeName: attendeeFullName,
-      attendeeEmail: ticket.attendeeEmail,
-      ticketId: ticket.id,
-      bookingId: ticket.bookingId || ticket.id,
-      qrCode: ticket.qrCode || '',
-      ticketPdfUrl,
-      eventTitle,
-      eventDate: formatDate(event.startDatetime, locale, timezone),
-      eventTime: formatTime(event.startDatetime, locale, timezone),
-      eventLocation: event.location,
-      eventLocationUrl: event.locationUrl || '',
-      eventPrice: formatCurrency(event.price, event.currency),
-      // Multi-ticket specific variables
-      ticketCount: ticketCount.toString(),
-      totalPrice: formatCurrency(totalPrice, event.currency),
-      attendeeNames,
-      isMultiTicket: ticketCount > 1 ? 'true' : 'false',
-    },
-  });
-}

backend/src/lib/email/bulkEmails.ts

@@ -1,101 +0,0 @@
-// Event-wide bulk email sending via the background queue.
-
-import { db, dbGet, dbAll, events, tickets } from '../../db/index.js';
-import { eq, and } from 'drizzle-orm';
-import { enqueueBulkEmails, type TemplateEmailJobParams } from '../emailQueue.js';
-import { getTemplate } from './templateService.js';
-import { formatDate, formatTime, getSiteTimezone } from './formatting.js';
-
-/**
- * Queue emails for event attendees (non-blocking).
- * Adds all matching recipients to the background email queue and returns immediately.
- * Rate limiting and actual sending is handled by the email queue.
- */
-export async function queueEventEmails(params: {
-  eventId: string;
-  templateSlug: string;
-  customVariables?: Record<string, any>;
-  recipientFilter?: 'all' | 'confirmed' | 'pending' | 'checked_in';
-  sentBy: string;
-}): Promise<{ success: boolean; queuedCount: number; error?: string }> {
-  const { eventId, templateSlug, customVariables = {}, recipientFilter = 'confirmed', sentBy } = params;
-
-  // Validate event exists
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, eventId))
-  );
-
-  if (!event) {
-    return { success: false, queuedCount: 0, error: 'Event not found' };
-  }
-
-  // Validate template exists
-  const template = await getTemplate(templateSlug);
-  if (!template) {
-    return { success: false, queuedCount: 0, error: `Template "${templateSlug}" not found` };
-  }
-
-  // Get tickets based on filter
-  let ticketQuery = (db as any)
-    .select()
-    .from(tickets)
-    .where(eq((tickets as any).eventId, eventId));
-
-  if (recipientFilter !== 'all') {
-    ticketQuery = ticketQuery.where(
-      and(
-        eq((tickets as any).eventId, eventId),
-        eq((tickets as any).status, recipientFilter)
-      )
-    );
-  }
-
-  const eventTickets = await dbAll<any>(ticketQuery);
-
-  if (eventTickets.length === 0) {
-    return { success: true, queuedCount: 0, error: 'No recipients found' };
-  }
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  // Build individual email jobs for the queue
-  const jobs: TemplateEmailJobParams[] = eventTickets.map((ticket: any) => {
-    const locale = ticket.preferredLanguage || 'en';
-    const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-    const fullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-    return {
-      templateSlug,
-      to: ticket.attendeeEmail,
-      toName: fullName,
-      locale,
-      eventId: event.id,
-      sentBy,
-      variables: {
-        attendeeName: fullName,
-        attendeeEmail: ticket.attendeeEmail,
-        ticketId: ticket.id,
-        eventTitle,
-        eventDate: formatDate(event.startDatetime, locale, timezone),
-        eventTime: formatTime(event.startDatetime, locale, timezone),
-        eventLocation: event.location,
-        eventLocationUrl: event.locationUrl || '',
-        ...customVariables,
-      },
-    };
-  });
-
-  // Enqueue all emails for background processing
-  enqueueBulkEmails(jobs);
-
-  console.log(`[Email] Queued ${jobs.length} emails for event "${event.title}" (filter: ${recipientFilter})`);
-
-  return {
-    success: true,
-    queuedCount: jobs.length,
-  };
-}

backend/src/lib/email/formatting.ts

@@ -1,69 +0,0 @@
-// Shared formatting helpers and common template variables for emails.
-
-import { db, dbGet, siteSettings } from '../../db/index.js';
-import { getCache } from '../stores/cache.js';
-
-/**
- * Get common variables for all emails
- */
-export function getCommonVariables(): Record<string, string> {
-  return {
-    siteName: 'Spanglish',
-    siteUrl: process.env.FRONTEND_URL || 'https://spanglish.com',
-    currentYear: new Date().getFullYear().toString(),
-    supportEmail: process.env.EMAIL_FROM || 'hello@spanglish.com',
-  };
-}
-
-/**
- * Get the site timezone from settings (cached for performance).
- * Cached for a short TTL via the cache abstraction (in-memory or Redis).
- */
-export async function getSiteTimezone(): Promise<string> {
-  const cached = await getCache().get<string>('site:timezone');
-  if (cached) return cached;
-
-  const settings = await dbGet<any>(
-    (db as any).select().from(siteSettings).limit(1)
-  );
-  const timezone = settings?.timezone || 'America/Asuncion';
-  await getCache().set('site:timezone', timezone, 60);
-  return timezone;
-}
-
-/**
- * Format date for emails using site timezone
- */
-export function formatDate(dateStr: string, locale: string = 'en', timezone: string = 'America/Asuncion'): string {
-  const date = new Date(dateStr);
-  return date.toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
-    weekday: 'long',
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    timeZone: timezone,
-  });
-}
-
-/**
- * Format time for emails using site timezone
- */
-export function formatTime(dateStr: string, locale: string = 'en', timezone: string = 'America/Asuncion'): string {
-  const date = new Date(dateStr);
-  return date.toLocaleTimeString(locale === 'es' ? 'es-ES' : 'en-US', {
-    hour: '2-digit',
-    minute: '2-digit',
-    timeZone: timezone,
-  });
-}
-
-/**
- * Format currency for emails. Kept distinct from lib/utils.ts formatCurrency
- * because the email output format ("12.345 PYG" / "$10.00 USD") must not change.
- */
-export function formatCurrency(amount: number, currency: string = 'PYG'): string {
-  if (currency === 'PYG') {
-    return `${amount.toLocaleString('es-PY')} PYG`;
-  }
-  return `$${amount.toFixed(2)} ${currency}`;
-}

backend/src/lib/email/paymentEmails.ts

@@ -1,474 +0,0 @@
-// High-level payment-related email senders and payment config resolution.
-
-import { db, dbGet, dbAll, events, tickets, payments, paymentOptions, eventPaymentOverrides } from '../../db/index.js';
-import { eq } from 'drizzle-orm';
-import { sendTemplateEmail } from './templateService.js';
-import { formatDate, formatTime, formatCurrency, getSiteTimezone } from './formatting.js';
-
-/**
- * Send payment receipt email
- */
-export async function sendPaymentReceipt(paymentId: string): Promise<{ success: boolean; error?: string }> {
-  // Get payment with ticket and event info
-  const payment = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(payments)
-      .where(eq((payments as any).id, paymentId))
-  );
-
-  if (!payment) {
-    return { success: false, error: 'Payment not found' };
-  }
-
-  const ticket = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(tickets)
-      .where(eq((tickets as any).id, payment.ticketId))
-  );
-
-  if (!ticket) {
-    return { success: false, error: 'Ticket not found' };
-  }
-
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, ticket.eventId))
-  );
-
-  if (!event) {
-    return { success: false, error: 'Event not found' };
-  }
-
-  // Calculate total amount for multi-ticket bookings
-  let totalAmount = payment.amount;
-  let ticketCount = 1;
-
-  if (ticket.bookingId) {
-    // Get all payments for this booking
-    const bookingTickets = await dbAll<any>(
-      (db as any)
-        .select()
-        .from(tickets)
-        .where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-
-    ticketCount = bookingTickets.length;
-
-    // Sum up all payment amounts for the booking
-    const bookingPayments = await Promise.all(
-      bookingTickets.map((t: any) =>
-        dbGet<any>((db as any).select().from(payments).where(eq((payments as any).ticketId, t.id)))
-      )
-    );
-
-    totalAmount = bookingPayments
-      .filter((p: any) => p)
-      .reduce((sum: number, p: any) => sum + Number(p.amount || 0), 0);
-  }
-
-  const locale = ticket.preferredLanguage || 'en';
-  const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-
-  const paymentMethodNames: Record<string, Record<string, string>> = {
-    en: { bancard: 'Card', lightning: 'Lightning (Bitcoin)', cash: 'Cash', bank_transfer: 'Bank Transfer', tpago: 'TPago' },
-    es: { bancard: 'Tarjeta', lightning: 'Lightning (Bitcoin)', cash: 'Efectivo', bank_transfer: 'Transferencia Bancaria', tpago: 'TPago' },
-  };
-
-  const receiptFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-  // Format amount with ticket count info for multi-ticket bookings
-  const amountDisplay = ticketCount > 1
-    ? `${formatCurrency(totalAmount, payment.currency)} (${ticketCount} tickets)`
-    : formatCurrency(totalAmount, payment.currency);
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  return sendTemplateEmail({
-    templateSlug: 'payment-receipt',
-    to: ticket.attendeeEmail,
-    toName: receiptFullName,
-    locale,
-    eventId: event.id,
-    variables: {
-      attendeeName: receiptFullName,
-      ticketId: ticket.bookingId || ticket.id,
-      eventTitle,
-      eventDate: formatDate(event.startDatetime, locale, timezone),
-      paymentAmount: amountDisplay,
-      paymentMethod: paymentMethodNames[locale]?.[payment.provider] || payment.provider,
-      paymentReference: payment.reference || payment.id,
-      paymentDate: formatDate(payment.paidAt || payment.createdAt, locale, timezone),
-    },
-  });
-}
-
-/**
- * Get merged payment configuration for an event (global + overrides)
- */
-export async function getPaymentConfig(eventId: string): Promise<Record<string, any>> {
-  // Get global options
-  const globalOptions = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(paymentOptions)
-  );
-
-  // Get event overrides
-  const overrides = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(eventPaymentOverrides)
-      .where(eq((eventPaymentOverrides as any).eventId, eventId))
-  );
-
-  // Defaults
-  const defaults = {
-    tpagoEnabled: false,
-    tpagoLink: null,
-    tpagoLink2: null,
-    tpagoLink3: null,
-    tpagoLink4: null,
-    tpagoLink5: null,
-    tpagoInstructions: null,
-    tpagoInstructionsEs: null,
-    bankTransferEnabled: false,
-    bankName: null,
-    bankAccountHolder: null,
-    bankAccountNumber: null,
-    bankAlias: null,
-    bankPhone: null,
-    bankNotes: null,
-    bankNotesEs: null,
-  };
-
-  const global = globalOptions || defaults;
-
-  // Merge: override values take precedence if they're not null/undefined
-  return {
-    tpagoEnabled: overrides?.tpagoEnabled ?? global.tpagoEnabled,
-    tpagoLink: overrides?.tpagoLink ?? global.tpagoLink,
-    tpagoLink2: overrides?.tpagoLink2 ?? global.tpagoLink2,
-    tpagoLink3: overrides?.tpagoLink3 ?? global.tpagoLink3,
-    tpagoLink4: overrides?.tpagoLink4 ?? global.tpagoLink4,
-    tpagoLink5: overrides?.tpagoLink5 ?? global.tpagoLink5,
-    tpagoInstructions: overrides?.tpagoInstructions ?? global.tpagoInstructions,
-    tpagoInstructionsEs: overrides?.tpagoInstructionsEs ?? global.tpagoInstructionsEs,
-    bankTransferEnabled: overrides?.bankTransferEnabled ?? global.bankTransferEnabled,
-    bankName: overrides?.bankName ?? global.bankName,
-    bankAccountHolder: overrides?.bankAccountHolder ?? global.bankAccountHolder,
-    bankAccountNumber: overrides?.bankAccountNumber ?? global.bankAccountNumber,
-    bankAlias: overrides?.bankAlias ?? global.bankAlias,
-    bankPhone: overrides?.bankPhone ?? global.bankPhone,
-    bankNotes: overrides?.bankNotes ?? global.bankNotes,
-    bankNotesEs: overrides?.bankNotesEs ?? global.bankNotesEs,
-  };
-}
-
-/**
- * Send payment instructions email (for TPago or Bank Transfer)
- * This email is sent immediately after user clicks "Continue to Payment"
- */
-export async function sendPaymentInstructions(ticketId: string): Promise<{ success: boolean; error?: string }> {
-  // Get ticket
-  const ticket = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(tickets)
-      .where(eq((tickets as any).id, ticketId))
-  );
-
-  if (!ticket) {
-    return { success: false, error: 'Ticket not found' };
-  }
-
-  // Get event
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, ticket.eventId))
-  );
-
-  if (!event) {
-    return { success: false, error: 'Event not found' };
-  }
-
-  // Get payment
-  const payment = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(payments)
-      .where(eq((payments as any).ticketId, ticketId))
-  );
-
-  if (!payment) {
-    return { success: false, error: 'Payment not found' };
-  }
-
-  // Only send for manual payment methods
-  if (!['bank_transfer', 'tpago'].includes(payment.provider)) {
-    return { success: false, error: 'Payment instructions email only for bank_transfer or tpago' };
-  }
-
-  // Get merged payment config for this event
-  const paymentConfig = await getPaymentConfig(event.id);
-
-  const locale = ticket.preferredLanguage || 'en';
-  const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-  const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-  // Calculate total price for multi-ticket bookings
-  let totalPrice = event.price;
-  let ticketCount = 1;
-
-  if (ticket.bookingId) {
-    // Count all tickets in this booking
-    const bookingTickets = await dbAll<any>(
-      (db as any)
-        .select()
-        .from(tickets)
-        .where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-    ticketCount = bookingTickets.length;
-    totalPrice = event.price * ticketCount;
-  }
-
-  // Generate a payment reference using booking ID or ticket ID
-  const paymentReference = `SPG-${(ticket.bookingId || ticket.id).substring(0, 8).toUpperCase()}`;
-
-  // Generate the booking URL for returning to payment page
-  const frontendUrl = process.env.FRONTEND_URL || 'https://spanglish.com';
-  const bookingUrl = `${frontendUrl}/booking/${ticket.id}?step=payment`;
-
-  // Determine which template to use
-  const templateSlug = payment.provider === 'tpago'
-    ? 'payment-instructions-tpago'
-    : 'payment-instructions-bank-transfer';
-
-  // Format amount with ticket count info for multi-ticket bookings
-  const amountDisplay = ticketCount > 1
-    ? `${formatCurrency(totalPrice, event.currency)} (${ticketCount} tickets)`
-    : formatCurrency(totalPrice, event.currency);
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  // Build variables based on payment method
-  const variables: Record<string, any> = {
-    attendeeName: attendeeFullName,
-    attendeeEmail: ticket.attendeeEmail,
-    ticketId: ticket.bookingId || ticket.id,
-    eventTitle,
-    eventDate: formatDate(event.startDatetime, locale, timezone),
-    eventTime: formatTime(event.startDatetime, locale, timezone),
-    eventLocation: event.location,
-    eventLocationUrl: event.locationUrl || '',
-    paymentAmount: amountDisplay,
-    paymentReference,
-    bookingUrl,
-  };
-
-  // Add payment-method specific variables
-  if (payment.provider === 'tpago') {
-    // Select the TPago link matching the number of tickets (1-5), falling back to the base link
-    const tpagoLinkKey = ticketCount <= 1 ? 'tpagoLink' : `tpagoLink${Math.min(ticketCount, 5)}`;
-    variables.tpagoLink = paymentConfig[tpagoLinkKey] || paymentConfig.tpagoLink || '';
-  } else {
-    // Bank transfer
-    variables.bankName = paymentConfig.bankName || '';
-    variables.bankAccountHolder = paymentConfig.bankAccountHolder || '';
-    variables.bankAccountNumber = paymentConfig.bankAccountNumber || '';
-    variables.bankAlias = paymentConfig.bankAlias || '';
-    variables.bankPhone = paymentConfig.bankPhone || '';
-  }
-
-  console.log(`[Email] Sending payment instructions email (${payment.provider}) to ${ticket.attendeeEmail}`);
-
-  return sendTemplateEmail({
-    templateSlug,
-    to: ticket.attendeeEmail,
-    toName: attendeeFullName,
-    locale,
-    eventId: event.id,
-    variables,
-  });
-}
-
-/**
- * Send payment rejection email
- * This email is sent when admin rejects a TPago or Bank Transfer payment
- */
-export async function sendPaymentRejectionEmail(paymentId: string): Promise<{ success: boolean; error?: string }> {
-  // Get payment
-  const payment = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(payments)
-      .where(eq((payments as any).id, paymentId))
-  );
-
-  if (!payment) {
-    return { success: false, error: 'Payment not found' };
-  }
-
-  // Get ticket
-  const ticket = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(tickets)
-      .where(eq((tickets as any).id, payment.ticketId))
-  );
-
-  if (!ticket) {
-    return { success: false, error: 'Ticket not found' };
-  }
-
-  // Get event
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, ticket.eventId))
-  );
-
-  if (!event) {
-    return { success: false, error: 'Event not found' };
-  }
-
-  const locale = ticket.preferredLanguage || 'en';
-  const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-  const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-  // Generate a new booking URL for the event
-  const frontendUrl = process.env.FRONTEND_URL || 'https://spanglish.com';
-  const newBookingUrl = `${frontendUrl}/book/${event.id}`;
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  console.log(`[Email] Sending payment rejection email to ${ticket.attendeeEmail}`);
-
-  return sendTemplateEmail({
-    templateSlug: 'payment-rejected',
-    to: ticket.attendeeEmail,
-    toName: attendeeFullName,
-    locale,
-    eventId: event.id,
-    variables: {
-      attendeeName: attendeeFullName,
-      attendeeEmail: ticket.attendeeEmail,
-      ticketId: ticket.id,
-      eventTitle,
-      eventDate: formatDate(event.startDatetime, locale, timezone),
-      eventTime: formatTime(event.startDatetime, locale, timezone),
-      eventLocation: event.location,
-      eventLocationUrl: event.locationUrl || '',
-      newBookingUrl,
-    },
-  });
-}
-
-/**
- * Send payment reminder email
- * This email is sent when admin wants to remind attendee about pending payment
- */
-export async function sendPaymentReminder(paymentId: string): Promise<{ success: boolean; error?: string }> {
-  // Get payment
-  const payment = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(payments)
-      .where(eq((payments as any).id, paymentId))
-  );
-
-  if (!payment) {
-    return { success: false, error: 'Payment not found' };
-  }
-
-  // Only send for pending/pending_approval payments
-  if (!['pending', 'pending_approval'].includes(payment.status)) {
-    return { success: false, error: 'Payment reminder can only be sent for pending payments' };
-  }
-
-  // Get ticket
-  const ticket = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(tickets)
-      .where(eq((tickets as any).id, payment.ticketId))
-  );
-
-  if (!ticket) {
-    return { success: false, error: 'Ticket not found' };
-  }
-
-  // Get event
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(eq((events as any).id, ticket.eventId))
-  );
-
-  if (!event) {
-    return { success: false, error: 'Event not found' };
-  }
-
-  const locale = ticket.preferredLanguage || 'en';
-  const eventTitle = locale === 'es' && event.titleEs ? event.titleEs : event.title;
-  const attendeeFullName = `${ticket.attendeeFirstName} ${ticket.attendeeLastName || ''}`.trim();
-
-  // Calculate total price for multi-ticket bookings
-  let totalPrice = event.price;
-  let ticketCount = 1;
-
-  if (ticket.bookingId) {
-    const bookingTickets = await dbAll<any>(
-      (db as any)
-        .select()
-        .from(tickets)
-        .where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-    ticketCount = bookingTickets.length;
-    totalPrice = event.price * ticketCount;
-  }
-
-  // Generate the booking URL for returning to payment page
-  const frontendUrl = process.env.FRONTEND_URL || 'https://spanglish.com';
-  const bookingUrl = `${frontendUrl}/booking/${ticket.id}?step=payment`;
-
-  // Format amount with ticket count info for multi-ticket bookings
-  const amountDisplay = ticketCount > 1
-    ? `${formatCurrency(totalPrice, event.currency)} (${ticketCount} tickets)`
-    : formatCurrency(totalPrice, event.currency);
-
-  // Get site timezone for proper date/time formatting
-  const timezone = await getSiteTimezone();
-
-  console.log(`[Email] Sending payment reminder email to ${ticket.attendeeEmail}`);
-
-  return sendTemplateEmail({
-    templateSlug: 'payment-reminder',
-    to: ticket.attendeeEmail,
-    toName: attendeeFullName,
-    locale,
-    eventId: event.id,
-    variables: {
-      attendeeName: attendeeFullName,
-      attendeeEmail: ticket.attendeeEmail,
-      ticketId: ticket.bookingId || ticket.id,
-      eventTitle,
-      eventDate: formatDate(event.startDatetime, locale, timezone),
-      eventTime: formatTime(event.startDatetime, locale, timezone),
-      eventLocation: event.location,
-      eventLocationUrl: event.locationUrl || '',
-      paymentAmount: amountDisplay,
-      bookingUrl,
-    },
-  });
-}

backend/src/lib/email/templateService.ts

@@ -1,307 +0,0 @@
-// Template DB access, seeding, and the core template/custom send + logging logic.
-
-import { db, dbGet, emailTemplates, emailLogs } from '../../db/index.js';
-import { eq } from 'drizzle-orm';
-import { getNow, generateId } from '../utils.js';
-import { replaceTemplateVariables, wrapInBaseTemplate, defaultTemplates } from '../emailTemplates.js';
-import { sendEmail } from './transport.js';
-import { getCommonVariables } from './formatting.js';
-
-/**
- * Get a template by slug
- */
-export async function getTemplate(slug: string): Promise<any | null> {
-  const template = await dbGet(
-    (db as any)
-      .select()
-      .from(emailTemplates)
-      .where(eq((emailTemplates as any).slug, slug))
-  );
-
-  return template || null;
-}
-
-/**
- * Seed default templates if they don't exist, and update system templates with latest content
- */
-export async function seedDefaultTemplates(): Promise<void> {
-  console.log('[Email] Checking for default templates...');
-
-  for (const template of defaultTemplates) {
-    const existing = await getTemplate(template.slug);
-    const now = getNow();
-
-    if (!existing) {
-      console.log(`[Email] Creating template: ${template.name}`);
-
-      await (db as any).insert(emailTemplates).values({
-        id: generateId(),
-        name: template.name,
-        slug: template.slug,
-        subject: template.subject,
-        subjectEs: template.subjectEs,
-        bodyHtml: template.bodyHtml,
-        bodyHtmlEs: template.bodyHtmlEs,
-        bodyText: template.bodyText,
-        bodyTextEs: template.bodyTextEs,
-        description: template.description,
-        variables: JSON.stringify(template.variables),
-        isSystem: template.isSystem ? 1 : 0,
-        isActive: 1,
-        createdAt: now,
-        updatedAt: now,
-      });
-    } else if (existing.isSystem) {
-      // Update system templates with latest content from defaults
-      console.log(`[Email] Updating system template: ${template.name}`);
-
-      await (db as any)
-        .update(emailTemplates)
-        .set({
-          subject: template.subject,
-          subjectEs: template.subjectEs,
-          bodyHtml: template.bodyHtml,
-          bodyHtmlEs: template.bodyHtmlEs,
-          bodyText: template.bodyText,
-          bodyTextEs: template.bodyTextEs,
-          description: template.description,
-          variables: JSON.stringify(template.variables),
-          updatedAt: now,
-        })
-        .where(eq((emailTemplates as any).slug, template.slug));
-    }
-  }
-
-  console.log('[Email] Default templates check complete');
-}
-
-/**
- * Send an email using a template
- */
-export async function sendTemplateEmail(params: {
-  templateSlug: string;
-  to: string;
-  toName?: string;
-  variables: Record<string, any>;
-  locale?: string;
-  eventId?: string;
-  sentBy?: string;
-}): Promise<{ success: boolean; logId?: string; error?: string }> {
-  const { templateSlug, to, toName, variables, locale = 'en', eventId, sentBy } = params;
-
-  // Get template
-  const template = await getTemplate(templateSlug);
-  if (!template) {
-    return { success: false, error: `Template "${templateSlug}" not found` };
-  }
-
-  // Build variables
-  const allVariables = {
-    ...getCommonVariables(),
-    lang: locale,
-    ...variables,
-  };
-
-  // Get localized content
-  const subject = locale === 'es' && template.subjectEs
-    ? template.subjectEs
-    : template.subject;
-  const bodyHtml = locale === 'es' && template.bodyHtmlEs
-    ? template.bodyHtmlEs
-    : template.bodyHtml;
-  const bodyText = locale === 'es' && template.bodyTextEs
-    ? template.bodyTextEs
-    : template.bodyText;
-
-  // Replace variables
-  const finalSubject = replaceTemplateVariables(subject, allVariables);
-  const finalBodyContent = replaceTemplateVariables(bodyHtml, allVariables, true);
-  const finalBodyHtml = wrapInBaseTemplate(finalBodyContent, { ...allVariables, subject: finalSubject });
-  const finalBodyText = bodyText ? replaceTemplateVariables(bodyText, allVariables) : undefined;
-
-  // Create log entry
-  const logId = generateId();
-  const now = getNow();
-
-  await (db as any).insert(emailLogs).values({
-    id: logId,
-    templateId: template.id,
-    eventId: eventId || null,
-    recipientEmail: to,
-    recipientName: toName || null,
-    subject: finalSubject,
-    bodyHtml: finalBodyHtml,
-    status: 'pending',
-    sentBy: sentBy || null,
-    createdAt: now,
-  });
-
-  // Send email
-  const result = await sendEmail({
-    to,
-    subject: finalSubject,
-    html: finalBodyHtml,
-    text: finalBodyText,
-  });
-
-  // Update log with result
-  if (result.success) {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'sent',
-        sentAt: getNow(),
-      })
-      .where(eq((emailLogs as any).id, logId));
-  } else {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'failed',
-        errorMessage: result.error,
-      })
-      .where(eq((emailLogs as any).id, logId));
-  }
-
-  return {
-    success: result.success,
-    logId,
-    error: result.error
-  };
-}
-
-/**
- * Send a custom email (not from template)
- */
-export async function sendCustomEmail(params: {
-  to: string;
-  toName?: string;
-  subject: string;
-  bodyHtml: string;
-  bodyText?: string;
-  replyTo?: string;
-  eventId?: string;
-  sentBy?: string | null;
-}): Promise<{ success: boolean; logId?: string; error?: string }> {
-  const { to: rawTo, toName, subject: rawSubject, bodyHtml, bodyText, replyTo: rawReplyTo, eventId, sentBy = null } = params;
-
-  // Strip CR/LF from header-bound values to prevent email header injection
-  // (e.g. an attacker-supplied subject/replyTo smuggling extra headers/recipients).
-  const stripHeader = (v?: string) => (v ? v.replace(/[\r\n]+/g, ' ').trim() : v);
-  const to = stripHeader(rawTo) as string;
-  const subject = stripHeader(rawSubject) as string;
-  const replyTo = stripHeader(rawReplyTo);
-
-  const allVariables = {
-    ...getCommonVariables(),
-    subject,
-  };
-
-  const finalBodyHtml = wrapInBaseTemplate(bodyHtml, allVariables);
-
-  // Create log entry
-  const logId = generateId();
-  const now = getNow();
-
-  await (db as any).insert(emailLogs).values({
-    id: logId,
-    templateId: null,
-    eventId: eventId || null,
-    recipientEmail: to,
-    recipientName: toName || null,
-    subject,
-    bodyHtml: finalBodyHtml,
-    status: 'pending',
-    sentBy: sentBy || null,
-    createdAt: now,
-  });
-
-  // Send email
-  const result = await sendEmail({
-    to,
-    subject,
-    html: finalBodyHtml,
-    text: bodyText,
-    replyTo,
-  });
-
-  // Update log
-  if (result.success) {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'sent',
-        sentAt: getNow(),
-      })
-      .where(eq((emailLogs as any).id, logId));
-  } else {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'failed',
-        errorMessage: result.error,
-      })
-      .where(eq((emailLogs as any).id, logId));
-  }
-
-  return {
-    success: result.success,
-    logId,
-    error: result.error
-  };
-}
-
-/**
- * Resend an email from an existing log entry
- */
-export async function resendFromLog(logId: string): Promise<{ success: boolean; error?: string }> {
-  const log = await dbGet<any>(
-    (db as any).select().from(emailLogs).where(eq((emailLogs as any).id, logId))
-  );
-
-  if (!log) {
-    return { success: false, error: 'Email log not found' };
-  }
-
-  if (!log.bodyHtml || !log.subject || !log.recipientEmail) {
-    return { success: false, error: 'Email log missing required data to resend' };
-  }
-
-  const result = await sendEmail({
-    to: log.recipientEmail,
-    subject: log.subject,
-    html: log.bodyHtml,
-    text: undefined,
-  });
-
-  const now = getNow();
-  const currentResendAttempts = (log.resendAttempts ?? 0) + 1;
-
-  if (result.success) {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'sent',
-        sentAt: now,
-        errorMessage: null,
-        resendAttempts: currentResendAttempts,
-        lastResentAt: now,
-      })
-      .where(eq((emailLogs as any).id, logId));
-  } else {
-    await (db as any)
-      .update(emailLogs)
-      .set({
-        status: 'failed',
-        errorMessage: result.error,
-        resendAttempts: currentResendAttempts,
-        lastResentAt: now,
-      })
-      .where(eq((emailLogs as any).id, logId));
-  }
-
-  return {
-    success: result.success,
-    error: result.error,
-  };
-}

backend/src/lib/email/transport.ts

@@ -1,308 +0,0 @@
-// Email transport layer: provider configuration, SMTP setup, and the low-level
-// sendEmail router. No template rendering or DB logging happens here.
-
-import nodemailer from 'nodemailer';
-import type { Transporter } from 'nodemailer';
-
-// ==================== Types ====================
-
-export interface SendEmailOptions {
-  to: string | string[];
-  subject: string;
-  html: string;
-  text?: string;
-  replyTo?: string;
-}
-
-export interface SendEmailResult {
-  success: boolean;
-  messageId?: string;
-  error?: string;
-}
-
-export type EmailProvider = 'resend' | 'smtp' | 'console';
-
-// ==================== Provider Configuration ====================
-
-function getEmailProvider(): EmailProvider {
-  const provider = (process.env.EMAIL_PROVIDER || 'console').toLowerCase();
-  if (provider === 'resend' || provider === 'smtp' || provider === 'console') {
-    return provider;
-  }
-  console.warn(`[Email] Unknown provider "${provider}", falling back to console`);
-  return 'console';
-}
-
-function getFromEmail(): string {
-  return process.env.EMAIL_FROM || 'noreply@spanglish.com';
-}
-
-function getFromName(): string {
-  return process.env.EMAIL_FROM_NAME || 'Spanglish';
-}
-
-/** Provider info for diagnostics endpoints. */
-export function getProviderInfo(): { provider: EmailProvider; configured: boolean } {
-  const provider = getEmailProvider();
-  let configured = false;
-
-  switch (provider) {
-    case 'resend':
-      configured = !!(process.env.EMAIL_API_KEY || process.env.RESEND_API_KEY);
-      break;
-    case 'smtp':
-      configured = !!process.env.SMTP_HOST;
-      break;
-    case 'console':
-      configured = true;
-      break;
-  }
-
-  return { provider, configured };
-}
-
-// ==================== SMTP Configuration ====================
-
-interface SMTPConfig {
-  host: string;
-  port: number;
-  secure: boolean;
-  auth?: {
-    user: string;
-    pass: string;
-  };
-}
-
-function getSMTPConfig(): SMTPConfig | null {
-  const host = process.env.SMTP_HOST;
-  const port = parseInt(process.env.SMTP_PORT || '587');
-  const user = process.env.SMTP_USER;
-  const pass = process.env.SMTP_PASS;
-  const secure = process.env.SMTP_SECURE === 'true' || port === 465;
-
-  if (!host) {
-    return null;
-  }
-
-  const config: SMTPConfig = {
-    host,
-    port,
-    secure,
-  };
-
-  if (user && pass) {
-    config.auth = { user, pass };
-  }
-
-  return config;
-}
-
-// Cached SMTP transporter
-let smtpTransporter: Transporter | null = null;
-
-function getSMTPTransporter(): Transporter | null {
-  if (smtpTransporter) {
-    return smtpTransporter;
-  }
-
-  const config = getSMTPConfig();
-  if (!config) {
-    console.error('[Email] SMTP configuration missing');
-    return null;
-  }
-
-  smtpTransporter = nodemailer.createTransport({
-    host: config.host,
-    port: config.port,
-    secure: config.secure,
-    auth: config.auth,
-    // Additional options for better deliverability
-    pool: true,
-    maxConnections: 5,
-    maxMessages: 100,
-    // TLS options
-    tls: {
-      rejectUnauthorized: process.env.SMTP_TLS_REJECT_UNAUTHORIZED !== 'false',
-    },
-  });
-
-  // Verify connection configuration
-  smtpTransporter.verify((error, success) => {
-    if (error) {
-      console.error('[Email] SMTP connection verification failed:', error.message);
-    } else {
-      console.log('[Email] SMTP server is ready to send emails');
-    }
-  });
-
-  return smtpTransporter;
-}
-
-// ==================== Email Providers ====================
-
-/**
- * Send email using Resend API
- */
-async function sendWithResend(options: SendEmailOptions): Promise<SendEmailResult> {
-  const apiKey = process.env.EMAIL_API_KEY || process.env.RESEND_API_KEY;
-  const fromEmail = getFromEmail();
-  const fromName = getFromName();
-
-  if (!apiKey) {
-    console.error('[Email] Resend API key not configured');
-    return { success: false, error: 'Resend API key not configured' };
-  }
-
-  try {
-    const response = await fetch('https://api.resend.com/emails', {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        from: `${fromName} <${fromEmail}>`,
-        to: Array.isArray(options.to) ? options.to : [options.to],
-        subject: options.subject,
-        html: options.html,
-        text: options.text,
-        reply_to: options.replyTo,
-      }),
-    });
-
-    const data = await response.json();
-
-    if (!response.ok) {
-      console.error('[Email] Resend API error:', data);
-      return {
-        success: false,
-        error: data.message || data.error || 'Failed to send email'
-      };
-    }
-
-    console.log('[Email] Email sent via Resend:', data.id);
-    return {
-      success: true,
-      messageId: data.id
-    };
-  } catch (error: any) {
-    console.error('[Email] Resend error:', error);
-    return {
-      success: false,
-      error: error.message || 'Failed to send email via Resend'
-    };
-  }
-}
-
-/**
- * Send email using SMTP (Nodemailer)
- */
-async function sendWithSMTP(options: SendEmailOptions): Promise<SendEmailResult> {
-  const transporter = getSMTPTransporter();
-
-  if (!transporter) {
-    return { success: false, error: 'SMTP not configured' };
-  }
-
-  const fromEmail = getFromEmail();
-  const fromName = getFromName();
-
-  try {
-    const info = await transporter.sendMail({
-      from: `"${fromName}" <${fromEmail}>`,
-      to: Array.isArray(options.to) ? options.to.join(', ') : options.to,
-      replyTo: options.replyTo,
-      subject: options.subject,
-      html: options.html,
-      text: options.text,
-    });
-
-    console.log('[Email] Email sent via SMTP:', info.messageId);
-    return {
-      success: true,
-      messageId: info.messageId
-    };
-  } catch (error: any) {
-    console.error('[Email] SMTP error:', error);
-    return {
-      success: false,
-      error: error.message || 'Failed to send email via SMTP'
-    };
-  }
-}
-
-/**
- * Console logger for development/testing (no actual email sent)
- */
-async function sendWithConsole(options: SendEmailOptions): Promise<SendEmailResult> {
-  const to = Array.isArray(options.to) ? options.to.join(', ') : options.to;
-
-  console.log('\n========================================');
-  console.log('[Email] Console Mode - Email Preview');
-  console.log('========================================');
-  console.log(`To: ${to}`);
-  console.log(`Subject: ${options.subject}`);
-  console.log(`Reply-To: ${options.replyTo || 'N/A'}`);
-  console.log('----------------------------------------');
-  console.log('HTML Body (truncated):');
-  console.log(options.html?.substring(0, 500) + '...');
-  console.log('========================================\n');
-
-  return {
-    success: true,
-    messageId: `console-${Date.now()}`
-  };
-}
-
-// Mask an email address for logs: keep first char + domain (e.g. j***@example.com).
-function maskEmail(email: string): string {
-  const [local, domain] = String(email).split('@');
-  if (!domain) return '***';
-  const head = local.slice(0, 1);
-  return `${head}***@${domain}`;
-}
-
-/**
- * Main send function that routes to the appropriate provider
- */
-export async function sendEmail(options: SendEmailOptions): Promise<SendEmailResult> {
-  const provider = getEmailProvider();
-
-  const recipientCount = Array.isArray(options.to) ? options.to.length : 1;
-  const sample = Array.isArray(options.to) ? options.to[0] : options.to;
-  console.log(`[Email] Sending email via ${provider} to ${maskEmail(sample)}${recipientCount > 1 ? ` (+${recipientCount - 1} more)` : ''}`);
-
-  switch (provider) {
-    case 'resend':
-      return sendWithResend(options);
-    case 'smtp':
-      return sendWithSMTP(options);
-    case 'console':
-    default:
-      return sendWithConsole(options);
-  }
-}
-
-/**
- * Test email configuration by sending a test email
- */
-export async function testConnection(to: string): Promise<SendEmailResult> {
-  const { provider, configured } = getProviderInfo();
-
-  if (!configured) {
-    return { success: false, error: `Email provider "${provider}" is not configured` };
-  }
-
-  return sendEmail({
-    to,
-    subject: 'Spanglish - Email Test',
-    html: `
-        <h2>Email Configuration Test</h2>
-        <p>This is a test email from your Spanglish platform.</p>
-        <p><strong>Provider:</strong> ${provider}</p>
-        <p><strong>Timestamp:</strong> ${new Date().toISOString()}</p>
-        <p>If you received this email, your email configuration is working correctly!</p>
-      `,
-    text: `Email Configuration Test\n\nProvider: ${provider}\nTimestamp: ${new Date().toISOString()}\n\nIf you received this email, your email configuration is working correctly!`,
-  });
-}

backend/src/lib/emailQueue.ts

@@ -1,16 +1,17 @@
-// Durable email queue with rate limiting.
-// Jobs are persisted in the `email_queue` DB table so they survive process
-// restarts. Emails are processed asynchronously in the background without
-// blocking the request thread.
+// In-memory email queue with rate limiting
+// Processes emails asynchronously in the background without blocking the request thread
 
-import { eq, and, asc, sql } from 'drizzle-orm';
-import { db, dbGet, emailQueue } from '../db/index.js';
-import { generateId, getNow } from './utils.js';
-import { isRedisEnabled } from './redis.js';
-import { getRateLimiter } from './stores/rateLimiter.js';
+import { generateId } from './utils.js';
 
 // ==================== Types ====================
 
+export interface EmailJob {
+  id: string;
+  type: 'template';
+  params: TemplateEmailJobParams;
+  addedAt: number;
+}
+
 export interface TemplateEmailJobParams {
   templateSlug: string;
   to: string;
@@ -21,11 +22,6 @@ export interface TemplateEmailJobParams {
   sentBy?: string;
 }
 
-interface ClaimedJob {
-  id: string;
-  params: TemplateEmailJobParams;
-}
-
 export interface QueueStatus {
   queued: number;
   processing: boolean;
@@ -35,8 +31,7 @@ export interface QueueStatus {
 
 // ==================== Queue State ====================
 
-// Tracks send timestamps for the per-process (non-Redis) sliding-window rate
-// limit. The job backlog itself lives in the database, not in memory.
+const queue: EmailJob[] = [];
 const sentTimestamps: number[] = [];
 let processing = false;
 let processTimer: ReturnType<typeof setTimeout> | null = null;
@@ -46,6 +41,7 @@ let _emailService: any = null;
 
 function getEmailService() {
   if (!_emailService) {
+    // Dynamic import to avoid circular dependency
     throw new Error('[EmailQueue] Email service not initialized. Call initEmailQueue() first.');
   }
   return _emailService;
@@ -54,31 +50,12 @@ function getEmailService() {
 /**
  * Initialize the email queue with a reference to the email service.
  * Must be called once at startup.
- *
- * Also performs crash recovery: any jobs left in the 'processing' state by a
- * previous (crashed) process are reset to 'pending' so they get retried.
  */
 export function initEmailQueue(emailService: any): void {
   _emailService = emailService;
-  recoverProcessingJobs()
-    .then((recovered) => {
-      if (recovered > 0) {
-        console.log(`[EmailQueue] Recovered ${recovered} in-flight job(s) after restart`);
-      }
-      scheduleProcessing();
-    })
-    .catch((err) => console.error('[EmailQueue] Recovery failed:', err?.message || err));
   console.log('[EmailQueue] Initialized');
 }
 
-async function recoverProcessingJobs(): Promise<number> {
-  const result: any = await (db as any)
-    .update(emailQueue)
-    .set({ status: 'pending' })
-    .where(eq((emailQueue as any).status, 'processing'));
-  return result?.changes ?? result?.rowCount ?? 0;
-}
-
 // ==================== Rate Limiting ====================
 
 function getMaxPerHour(): number {
@@ -97,26 +74,19 @@ function cleanOldTimestamps(): void {
 
 // ==================== Queue Operations ====================
 
-async function insertJob(id: string, params: TemplateEmailJobParams): Promise<void> {
-  await (db as any).insert(emailQueue).values({
-    id,
-    params: JSON.stringify(params),
-    status: 'pending',
-    attempts: 0,
-    createdAt: getNow(),
-  });
-}
-
 /**
  * Add a single email job to the queue.
- * Returns the job ID. Persistence happens asynchronously so the caller is not
- * blocked; processing is scheduled once the row is written.
+ * Returns the job ID.
  */
 export function enqueueEmail(params: TemplateEmailJobParams): string {
   const id = generateId();
-  insertJob(id, params)
-    .then(() => scheduleProcessing())
-    .catch((err) => console.error('[EmailQueue] Failed to enqueue email:', err?.message || err));
+  queue.push({
+    id,
+    type: 'template',
+    params,
+    addedAt: Date.now(),
+  });
+  scheduleProcessing();
   return id;
 }
 
@@ -125,32 +95,31 @@ export function enqueueEmail(params: TemplateEmailJobParams): string {
  * Returns array of job IDs.
  */
 export function enqueueBulkEmails(paramsList: TemplateEmailJobParams[]): string[] {
-  const ids = paramsList.map(() => generateId());
-  if (ids.length === 0) return ids;
-
-  Promise.all(paramsList.map((params, i) => insertJob(ids[i], params)))
-    .then(() => {
-      console.log(`[EmailQueue] Queued ${ids.length} emails for background processing`);
-      scheduleProcessing();
-    })
-    .catch((err) => console.error('[EmailQueue] Failed to enqueue bulk emails:', err?.message || err));
-
+  const ids: string[] = [];
+  for (const params of paramsList) {
+    const id = generateId();
+    queue.push({
+      id,
+      type: 'template',
+      params,
+      addedAt: Date.now(),
+    });
+    ids.push(id);
+  }
+  if (ids.length > 0) {
+    console.log(`[EmailQueue] Queued ${ids.length} emails for background processing`);
+    scheduleProcessing();
+  }
   return ids;
 }
 
 /**
  * Get current queue status
  */
-export async function getQueueStatus(): Promise<QueueStatus> {
+export function getQueueStatus(): QueueStatus {
   cleanOldTimestamps();
-  const row = await dbGet<any>(
-    (db as any)
-      .select({ count: sql<number>`count(*)` })
-      .from(emailQueue)
-      .where(eq((emailQueue as any).status, 'pending'))
-  );
   return {
-    queued: Number(row?.count || 0),
+    queued: queue.length,
     processing,
     sentInLastHour: sentTimestamps.length,
     maxPerHour: getMaxPerHour(),
@@ -166,125 +135,46 @@ function scheduleProcessing(): void {
   setImmediate(() => processNext());
 }
 
-/**
- * Atomically claim the oldest pending job by flipping its status to
- * 'processing'. Returns null if there is nothing to do. The conditional update
- * (WHERE status='pending') guards against two workers claiming the same row.
- */
-async function claimNextJob(): Promise<ClaimedJob | null> {
-  for (let attempt = 0; attempt < 5; attempt++) {
-    const row = await dbGet<any>(
-      (db as any)
-        .select({ id: (emailQueue as any).id, params: (emailQueue as any).params })
-        .from(emailQueue)
-        .where(eq((emailQueue as any).status, 'pending'))
-        .orderBy(asc((emailQueue as any).createdAt))
-        .limit(1)
-    );
-    if (!row) return null;
-
-    const result: any = await (db as any)
-      .update(emailQueue)
-      .set({ status: 'processing' })
-      .where(and(
-        eq((emailQueue as any).id, row.id),
-        eq((emailQueue as any).status, 'pending')
-      ));
-
-    const affected = result?.changes ?? result?.rowCount ?? 0;
-    if (affected > 0) {
-      try {
-        return { id: row.id, params: JSON.parse(row.params) };
-      } catch {
-        // Corrupt params: mark failed and move on rather than crash-looping.
-        await markJob(row.id, 'failed', 'Invalid job params (JSON parse failed)');
-        continue;
-      }
-    }
-    // Lost the race for this row; try the next pending one.
-  }
-  return null;
-}
-
-async function markJob(id: string, status: 'sent' | 'failed', error?: string | null): Promise<void> {
-  const update: any = { status, processedAt: getNow() };
-  if (status === 'failed') {
-    update.attempts = sql`${(emailQueue as any).attempts} + 1`;
-    if (error) update.lastError = error.slice(0, 1000);
-  }
-  await (db as any).update(emailQueue).set(update).where(eq((emailQueue as any).id, id));
-}
-
-async function releaseJob(id: string): Promise<void> {
-  await (db as any)
-    .update(emailQueue)
-    .set({ status: 'pending' })
-    .where(eq((emailQueue as any).id, id));
-}
-
 async function processNext(): Promise<void> {
-  let job: ClaimedJob | null;
-  try {
-    job = await claimNextJob();
-  } catch (error: any) {
-    // Database error while claiming: back off and retry rather than stop.
-    console.error('[EmailQueue] Failed to claim next job:', error?.message || error);
-    processTimer = setTimeout(() => processNext(), 5_000);
-    return;
-  }
-
-  if (!job) {
+  if (queue.length === 0) {
     processing = false;
     console.log('[EmailQueue] Queue empty. Processing stopped.');
     return;
   }
 
-  // Rate limit check.
-  // - Without Redis: per-process sliding window.
-  // - With Redis: a shared hourly counter so the cap applies across all
-  //   instances rather than once per replica.
+  // Rate limit check
   cleanOldTimestamps();
   const maxPerHour = getMaxPerHour();
-  let waitMs = 0;
 
-  if (isRedisEnabled()) {
-    const result = await getRateLimiter().consume('email:hourly', maxPerHour, 3_600_000);
-    if (!result.allowed) {
-      waitMs = (result.retryAfter ?? 60) * 1000 + 500; // 500ms buffer
-    }
-  } else if (sentTimestamps.length >= maxPerHour) {
+  if (sentTimestamps.length >= maxPerHour) {
     // Calculate when the oldest timestamp in the window expires
-    waitMs = sentTimestamps[0] + 3_600_000 - Date.now() + 500; // 500ms buffer
-  }
-
-  if (waitMs > 0) {
-    // Put the claimed job back so it is retried after the cooldown.
-    await releaseJob(job.id);
+    const waitMs = sentTimestamps[0] + 3_600_000 - Date.now() + 500; // 500ms buffer
     console.log(
       `[EmailQueue] Rate limit reached (${maxPerHour}/hr). ` +
-      `Pausing for ${Math.ceil(waitMs / 1000)}s.`
+      `Pausing for ${Math.ceil(waitMs / 1000)}s. ${queue.length} email(s) remaining.`
     );
     processTimer = setTimeout(() => processNext(), waitMs);
     return;
   }
 
+  // Dequeue and process
+  const job = queue.shift()!;
+
   try {
     const emailService = getEmailService();
     await emailService.sendTemplateEmail(job.params);
     sentTimestamps.push(Date.now());
-    await markJob(job.id, 'sent');
     console.log(
       `[EmailQueue] Sent email ${job.id} to ${job.params.to}. ` +
-      `Sent this hour: ${sentTimestamps.length}/${maxPerHour}`
+      `Queue: ${queue.length} remaining. Sent this hour: ${sentTimestamps.length}/${maxPerHour}`
     );
   } catch (error: any) {
-    await markJob(job.id, 'failed', error?.message || String(error));
     console.error(
       `[EmailQueue] Failed to send email ${job.id} to ${job.params.to}:`,
       error?.message || error
     );
-    // The sendTemplateEmail method already logs the failure in the email_logs
-    // table, so we just record it on the queue row and move on.
+    // The sendTemplateEmail method already logs the failure in the email_logs table,
+    // so we don't need to retry here. The error is logged and we move on.
   }
 
   // Small delay between sends to be gentle on the email server
@@ -292,8 +182,7 @@ async function processNext(): Promise<void> {
 }
 
 /**
- * Stop processing (for graceful shutdown). In-flight and pending jobs remain
- * persisted in the database and resume on the next startup.
+ * Stop processing (for graceful shutdown)
  */
 export function stopQueue(): void {
   if (processTimer) {
@@ -301,5 +190,5 @@ export function stopQueue(): void {
     processTimer = null;
   }
   processing = false;
-  console.log('[EmailQueue] Stopped. Pending jobs remain persisted in the database.');
+  console.log(`[EmailQueue] Stopped. ${queue.length} email(s) remaining in queue.`);
 }

backend/src/lib/emailTemplates.ts

@@ -1216,26 +1216,8 @@ Spanglish`,
   },
 ];
 
-// Escape HTML-significant characters so substituted variable values can't inject markup.
-function escapeHtmlValue(value: string): string {
-  return value
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#x27;');
-}
-
-// Helper function to replace template variables.
-// When `escapeHtml` is true (HTML rendering contexts), substituted *values* are
-// HTML-escaped to prevent stored-XSS via attacker-influenced variables (e.g. event
-// location, attendee name). The template markup itself is never escaped. Subjects and
-// plain-text bodies pass `escapeHtml=false` so they don't show literal entities.
-export function replaceTemplateVariables(
-  template: string,
-  variables: Record<string, any>,
-  escapeHtml: boolean = false
-): string {
+// Helper function to replace template variables
+export function replaceTemplateVariables(template: string, variables: Record<string, any>): string {
   let result = template;
   
   // Handle conditional blocks {{#if variable}}...{{/if}}
@@ -1247,20 +1229,16 @@ export function replaceTemplateVariables(
   // Replace simple variables {{variable}}
   const variableRegex = /\{\{(\w+)\}\}/g;
   result = result.replace(variableRegex, (match, varName) => {
-    if (variables[varName] === undefined) return match;
-    const raw = String(variables[varName]);
-    return escapeHtml ? escapeHtmlValue(raw) : raw;
+    return variables[varName] !== undefined ? String(variables[varName]) : match;
   });
   
   return result;
 }
 
-// Helper to wrap content in the base template.
-// `content` is treated as trusted HTML (it is the already-rendered body). The wrapper's
-// own variables (subject, year, etc.) are HTML-escaped on substitution.
+// Helper to wrap content in the base template
 export function wrapInBaseTemplate(content: string, variables: Record<string, any>): string {
-  const wrappedContent = baseEmailWrapper.replace('{{content}}', () => content);
-  return replaceTemplateVariables(wrappedContent, variables, true);
+  const wrappedContent = baseEmailWrapper.replace('{{content}}', content);
+  return replaceTemplateVariables(wrappedContent, variables);
 }
 
 // Get all available variables for a template by slug

backend/src/lib/lnbits.ts

@@ -80,8 +80,11 @@ export async function createInvoice(params: CreateInvoiceParams): Promise<LNbits
   }
 
   console.log('Creating LNbits invoice:', {
+    url: `${config.url}${apiEndpoint}`,
     amount: params.amount,
     unit: payload.unit,
+    memo: params.memo,
+    webhook: params.webhookUrl,
   });
 
   const response = await fetch(`${config.url}${apiEndpoint}`, {

backend/src/lib/rateLimit.ts

@@ -1,48 +0,0 @@
-import { Context } from 'hono';
-import { getRateLimiter } from './stores/rateLimiter.js';
-
-/**
- * Rate limiting helpers.
- *
- * The actual counting is delegated to a pluggable rate limiter (in-memory by
- * default, Redis-backed when REDIS_URL is set) so limits are enforced either
- * per instance (single-instance deployments) or across all instances
- * (horizontal scaling). See lib/stores/rateLimiter.ts.
- */
-
-/** Best-effort client IP extraction (honours common reverse-proxy headers). */
-export function getClientIp(c: Context): string {
-  const forwarded = c.req.header('x-forwarded-for');
-  if (forwarded) return forwarded.split(',')[0].trim();
-  return c.req.header('x-real-ip') || 'unknown';
-}
-
-/**
- * Consume one unit against a key. Returns whether the request is allowed and,
- * when blocked, how many seconds until the window resets.
- */
-export function consumeRateLimit(
-  key: string,
-  max: number,
-  windowMs: number
-): Promise<{ allowed: boolean; retryAfter?: number }> {
-  return getRateLimiter().consume(key, max, windowMs);
-}
-
-/**
- * Hono middleware factory that rate-limits by client IP.
- * Use a distinct `prefix` per endpoint group so unrelated routes don't share a bucket.
- */
-export function rateLimitMiddleware(opts: { max: number; windowMs: number; prefix: string }) {
-  return async (c: Context, next: () => Promise<void>) => {
-    const ip = getClientIp(c);
-    const result = await consumeRateLimit(`${opts.prefix}:${ip}`, opts.max, opts.windowMs);
-    if (!result.allowed) {
-      return c.json(
-        { error: 'Too many requests. Please try again later.', retryAfter: result.retryAfter },
-        429
-      );
-    }
-    await next();
-  };
-}

backend/src/lib/redis.ts

@@ -1,93 +0,0 @@
-// Optional Redis connection manager.
-//
-// Redis is entirely optional. When REDIS_URL is unset the app runs exactly as
-// before with in-memory backends. When set, this module owns a single shared
-// command connection plus a dedicated subscriber connection (a connection in
-// subscribe mode cannot run normal commands), with auto-reconnect, capped
-// backoff, and a health flag that callers and the health endpoint can read.
-
-import Redis from 'ioredis';
-
-let client: Redis | null = null;
-let subscriber: Redis | null = null;
-let healthy = false;
-let initialized = false;
-
-/** Whether Redis is configured via REDIS_URL. */
-export function isRedisEnabled(): boolean {
-  return !!process.env.REDIS_URL;
-}
-
-/** Whether the Redis connection is currently usable. */
-export function isRedisHealthy(): boolean {
-  return isRedisEnabled() && healthy;
-}
-
-function buildClient(label: string): Redis {
-  const url = process.env.REDIS_URL as string;
-  const instance = new Redis(url, {
-    // Keep the process responsive: fail fast on a per-command basis and let the
-    // callers degrade to their in-memory fallback rather than hanging.
-    maxRetriesPerRequest: 1,
-    enableOfflineQueue: false,
-    lazyConnect: false,
-    retryStrategy(times) {
-      // Capped exponential backoff for reconnects: 200ms, 400ms ... max 5s.
-      const delay = Math.min(times * 200, 5000);
-      return delay;
-    },
-  });
-
-  instance.on('connect', () => {
-    console.log(`[redis] (${label}) connecting`);
-  });
-  instance.on('ready', () => {
-    healthy = true;
-    console.log(`[redis] (${label}) ready`);
-  });
-  instance.on('error', (err) => {
-    healthy = false;
-    console.error(`[redis] (${label}) error:`, err?.message || err);
-  });
-  instance.on('reconnecting', () => {
-    healthy = false;
-    console.warn(`[redis] (${label}) reconnecting`);
-  });
-  instance.on('end', () => {
-    healthy = false;
-    console.warn(`[redis] (${label}) connection closed`);
-  });
-
-  return instance;
-}
-
-function ensureInit(): void {
-  if (initialized || !isRedisEnabled()) return;
-  initialized = true;
-  client = buildClient('commands');
-  subscriber = buildClient('subscriber');
-}
-
-/** Shared command connection, or null when Redis is not configured. */
-export function getRedis(): Redis | null {
-  ensureInit();
-  return client;
-}
-
-/** Dedicated subscriber connection, or null when Redis is not configured. */
-export function getSubscriber(): Redis | null {
-  ensureInit();
-  return subscriber;
-}
-
-/** Close connections (used for graceful shutdown). */
-export async function closeRedis(): Promise<void> {
-  const tasks: Promise<unknown>[] = [];
-  if (client) tasks.push(client.quit().catch(() => undefined));
-  if (subscriber) tasks.push(subscriber.quit().catch(() => undefined));
-  await Promise.all(tasks);
-  client = null;
-  subscriber = null;
-  initialized = false;
-  healthy = false;
-}

backend/src/lib/slugify.ts

@@ -1,27 +0,0 @@
-/**
- * Convert a title into a URL-safe slug.
- * Lowercases, strips accents, replaces non-alphanumerics with hyphens,
- * collapses repeated hyphens, and trims leading/trailing hyphens.
- */
-export function slugify(title: string): string {
-  return title
-    .toLowerCase()
-    .normalize('NFKD')
-    .replace(/[\u0300-\u036f]/g, '')
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-}
-
-/**
- * Generate a slug from a title that does not collide with any of the
- * provided existing slugs. Appends -2, -3, ... when needed.
- */
-export function uniqueSlug(title: string, existingSlugs: string[]): string {
-  const base = slugify(title) || 'event';
-  const taken = new Set(existingSlugs);
-  if (!taken.has(base)) return base;
-  let n = 2;
-  while (taken.has(`${base}-${n}`)) n++;
-  return `${base}-${n}`;
-}

backend/src/lib/storage.ts

@@ -1,136 +0,0 @@
-// Media storage abstraction with two implementations:
-// - local: writes to the ./uploads directory and serves via /uploads/* (the
-//   original behavior, and the zero-config default)
-// - s3: stores objects in an S3-compatible bucket (e.g. Garage), so uploads are
-//   shared across instances instead of living on one container's local disk
-//
-// S3 is enabled only when S3_ENDPOINT and S3_BUCKET are set. With it unset the
-// app behaves exactly as before. A "key" is the object name (e.g. "abc123.jpg").
-
-import { writeFile, mkdir, unlink } from 'fs/promises';
-import { existsSync } from 'fs';
-import { join } from 'path';
-
-const UPLOAD_DIR = './uploads';
-
-export interface Storage {
-  readonly backend: 'local' | 's3';
-  put(key: string, buffer: Buffer, contentType: string): Promise<void>;
-  delete(key: string): Promise<void>;
-  // Public URL to persist as the media record's fileUrl.
-  publicUrl(key: string): string;
-}
-
-/** Whether S3-compatible storage is configured. */
-export function isS3Enabled(): boolean {
-  return !!(process.env.S3_ENDPOINT && process.env.S3_BUCKET);
-}
-
-/** Extract the storage key (object name) from a stored fileUrl. */
-export function keyFromUrl(fileUrl: string): string {
-  return fileUrl.split('/').pop() || fileUrl;
-}
-
-// ==================== Local implementation ====================
-
-class LocalStorage implements Storage {
-  readonly backend = 'local' as const;
-
-  private async ensureDir(): Promise<void> {
-    if (!existsSync(UPLOAD_DIR)) {
-      await mkdir(UPLOAD_DIR, { recursive: true });
-    }
-  }
-
-  async put(key: string, buffer: Buffer): Promise<void> {
-    await this.ensureDir();
-    await writeFile(join(UPLOAD_DIR, key), buffer);
-  }
-
-  async delete(key: string): Promise<void> {
-    const filepath = join(UPLOAD_DIR, key);
-    if (existsSync(filepath)) {
-      await unlink(filepath);
-    }
-  }
-
-  publicUrl(key: string): string {
-    return `/uploads/${key}`;
-  }
-}
-
-// ==================== S3 implementation ====================
-
-// Imported lazily so the AWS SDK is only loaded when S3 is actually configured.
-type S3ClientType = import('@aws-sdk/client-s3').S3Client;
-
-class S3Storage implements Storage {
-  readonly backend = 's3' as const;
-  private client: S3ClientType | null = null;
-  private bucket = process.env.S3_BUCKET as string;
-
-  private async getClient(): Promise<S3ClientType> {
-    if (this.client) return this.client;
-    const { S3Client } = await import('@aws-sdk/client-s3');
-    const forcePathStyle = (process.env.S3_FORCE_PATH_STYLE || 'true') !== 'false';
-    this.client = new S3Client({
-      endpoint: process.env.S3_ENDPOINT,
-      region: process.env.S3_REGION || 'us-east-1',
-      forcePathStyle,
-      credentials:
-        process.env.S3_ACCESS_KEY_ID && process.env.S3_SECRET_ACCESS_KEY
-          ? {
-              accessKeyId: process.env.S3_ACCESS_KEY_ID,
-              secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-            }
-          : undefined,
-    });
-    return this.client;
-  }
-
-  async put(key: string, buffer: Buffer, contentType: string): Promise<void> {
-    const client = await this.getClient();
-    const { PutObjectCommand } = await import('@aws-sdk/client-s3');
-    await client.send(
-      new PutObjectCommand({
-        Bucket: this.bucket,
-        Key: key,
-        Body: buffer,
-        ContentType: contentType,
-      })
-    );
-  }
-
-  async delete(key: string): Promise<void> {
-    const client = await this.getClient();
-    const { DeleteObjectCommand } = await import('@aws-sdk/client-s3');
-    await client.send(
-      new DeleteObjectCommand({
-        Bucket: this.bucket,
-        Key: key,
-      })
-    );
-  }
-
-  publicUrl(key: string): string {
-    // Prefer an explicit public base URL (e.g. a CDN or Garage web endpoint).
-    const base = process.env.S3_PUBLIC_URL;
-    if (base) {
-      return `${base.replace(/\/$/, '')}/${key}`;
-    }
-    // Fall back to a path-style URL against the configured endpoint.
-    const endpoint = (process.env.S3_ENDPOINT || '').replace(/\/$/, '');
-    return `${endpoint}/${this.bucket}/${key}`;
-  }
-}
-
-// ==================== Selection ====================
-
-let instance: Storage | null = null;
-
-export function getStorage(): Storage {
-  if (!instance) {
-    instance = isS3Enabled() ? new S3Storage() : new LocalStorage();
-  }
-  return instance;
-}

backend/src/lib/stores/cache.ts

@@ -1,105 +0,0 @@
-// Cache abstraction with two implementations:
-// - memory: per-process Map with TTL expiry (single instance)
-// - redis: shared GET / SETEX / DEL with JSON values (all instances)
-//
-// Values are JSON-serialized. Selection happens once based on REDIS_URL. On any
-// Redis error the cache behaves as a miss so callers fall back to their source.
-
-import { getRedis, isRedisEnabled } from '../redis.js';
-
-export interface Cache {
-  readonly backend: 'memory' | 'redis';
-  get<T>(key: string): Promise<T | null>;
-  set<T>(key: string, value: T, ttlSeconds: number): Promise<void>;
-  del(key: string): Promise<void>;
-}
-
-// ==================== Memory implementation ====================
-
-interface Entry {
-  value: unknown;
-  expiresAt: number;
-}
-
-class MemoryCache implements Cache {
-  readonly backend = 'memory' as const;
-  private store = new Map<string, Entry>();
-
-  constructor() {
-    const cleanup = setInterval(() => {
-      const now = Date.now();
-      for (const [key, entry] of this.store) {
-        if (now > entry.expiresAt) this.store.delete(key);
-      }
-    }, 60_000);
-    (cleanup as any).unref?.();
-  }
-
-  async get<T>(key: string): Promise<T | null> {
-    const entry = this.store.get(key);
-    if (!entry) return null;
-    if (Date.now() > entry.expiresAt) {
-      this.store.delete(key);
-      return null;
-    }
-    return entry.value as T;
-  }
-
-  async set<T>(key: string, value: T, ttlSeconds: number): Promise<void> {
-    this.store.set(key, { value, expiresAt: Date.now() + ttlSeconds * 1000 });
-  }
-
-  async del(key: string): Promise<void> {
-    this.store.delete(key);
-  }
-}
-
-// ==================== Redis implementation ====================
-
-class RedisCache implements Cache {
-  readonly backend = 'redis' as const;
-
-  async get<T>(key: string): Promise<T | null> {
-    const redis = getRedis();
-    if (!redis) return null;
-    try {
-      const raw = await redis.get(`cache:${key}`);
-      if (raw === null) return null;
-      return JSON.parse(raw) as T;
-    } catch (err: any) {
-      console.error('[cache] redis get error:', err?.message || err);
-      return null;
-    }
-  }
-
-  async set<T>(key: string, value: T, ttlSeconds: number): Promise<void> {
-    const redis = getRedis();
-    if (!redis) return;
-    try {
-      await redis.set(`cache:${key}`, JSON.stringify(value), 'EX', ttlSeconds);
-    } catch (err: any) {
-      console.error('[cache] redis set error:', err?.message || err);
-    }
-  }
-
-  async del(key: string): Promise<void> {
-    const redis = getRedis();
-    if (!redis) return;
-    try {
-      await redis.del(`cache:${key}`);
-    } catch (err: any) {
-      console.error('[cache] redis del error:', err?.message || err);
-    }
-  }
-}
-
-// ==================== Selection ====================
-
-let instance: Cache | null = null;
-
-export function getCache(): Cache {
-  if (!instance) {
-    instance = isRedisEnabled() ? new RedisCache() : new MemoryCache();
-  }
-  return instance;
-}

backend/src/lib/stores/lock.ts

@@ -1,111 +0,0 @@
-// Distributed lock abstraction with two implementations:
-// - memory: per-process key set with TTL (only meaningful within one instance)
-// - redis: SET key token NX PX ttl, released with a compare-and-delete Lua
-//   script so only the holder can release it
-//
-// Use acquire/release for long-lived ownership (e.g. a background poller) and
-// withLock for a one-shot critical section. Selection is based on REDIS_URL.
-
-import { randomUUID } from 'crypto';
-import { getRedis, isRedisEnabled } from '../redis.js';
-
-export interface Lock {
-  readonly backend: 'memory' | 'redis';
-  // Returns a token when the lock was acquired, or null when already held.
-  acquire(key: string, ttlMs: number): Promise<string | null>;
-  release(key: string, token: string): Promise<void>;
-  // Runs fn while holding the lock; returns fn's result, or null if not acquired.
-  withLock<T>(key: string, ttlMs: number, fn: () => Promise<T>): Promise<T | null>;
-}
-
-// ==================== Memory implementation ====================
-
-class MemoryLock implements Lock {
-  readonly backend = 'memory' as const;
-  private held = new Map<string, { token: string; expiresAt: number }>();
-
-  async acquire(key: string, ttlMs: number): Promise<string | null> {
-    const existing = this.held.get(key);
-    const now = Date.now();
-    if (existing && existing.expiresAt > now) {
-      return null;
-    }
-    const token = randomUUID();
-    this.held.set(key, { token, expiresAt: now + ttlMs });
-    return token;
-  }
-
-  async release(key: string, token: string): Promise<void> {
-    const existing = this.held.get(key);
-    if (existing && existing.token === token) {
-      this.held.delete(key);
-    }
-  }
-
-  async withLock<T>(key: string, ttlMs: number, fn: () => Promise<T>): Promise<T | null> {
-    const token = await this.acquire(key, ttlMs);
-    if (!token) return null;
-    try {
-      return await fn();
-    } finally {
-      await this.release(key, token);
-    }
-  }
-}
-
-// ==================== Redis implementation ====================
-
-const RELEASE_SCRIPT =
-  'if redis.call("get", KEYS[1]) == ARGV[1] then return redis.call("del", KEYS[1]) else return 0 end';
-
-class RedisLock implements Lock {
-  readonly backend = 'redis' as const;
-
-  async acquire(key: string, ttlMs: number): Promise<string | null> {
-    const redis = getRedis();
-    if (!redis) {
-      // Redis configured but unavailable: do not block critical sections.
-      return randomUUID();
-    }
-    const token = randomUUID();
-    try {
-      const result = await redis.set(`lock:${key}`, token, 'PX', ttlMs, 'NX');
-      return result === 'OK' ? token : null;
-    } catch (err: any) {
-      console.error('[lock] redis acquire error, proceeding without lock:', err?.message || err);
-      // Fail open so a Redis outage does not deadlock startup or jobs.
-      return randomUUID();
-    }
-  }
-
-  async release(key: string, token: string): Promise<void> {
-    const redis = getRedis();
-    if (!redis) return;
-    try {
-      await redis.eval(RELEASE_SCRIPT, 1, `lock:${key}`, token);
-    } catch (err: any) {
-      console.error('[lock] redis release error:', err?.message || err);
-    }
-  }
-
-  async withLock<T>(key: string, ttlMs: number, fn: () => Promise<T>): Promise<T | null> {
-    const token = await this.acquire(key, ttlMs);
-    if (!token) return null;
-    try {
-      return await fn();
-    } finally {
-      await this.release(key, token);
-    }
-  }
-}
-
-// ==================== Selection ====================
-
-let instance: Lock | null = null;
-
-export function getLock(): Lock {
-  if (!instance) {
-    instance = isRedisEnabled() ? new RedisLock() : new MemoryLock();
-  }
-  return instance;
-}

backend/src/lib/stores/pubsub.ts

@@ -1,121 +0,0 @@
-// Pub/Sub abstraction with two implementations:
-// - memory: in-process EventEmitter (single instance only)
-// - redis: PUBLISH / SUBSCRIBE so a message published on one instance reaches
-//   subscribers on every instance
-//
-// Messages are JSON-serialized. Selection happens once based on REDIS_URL.
-
-import { EventEmitter } from 'events';
-import { getRedis, getSubscriber, isRedisEnabled } from '../redis.js';
-
-export type PubSubHandler = (message: any) => void;
-
-export interface PubSub {
-  readonly backend: 'memory' | 'redis';
-  publish(channel: string, message: any): Promise<void>;
-  // Returns an unsubscribe function for this specific handler.
-  subscribe(channel: string, handler: PubSubHandler): Promise<() => void>;
-}
-
-// ==================== Memory implementation ====================
-
-class MemoryPubSub implements PubSub {
-  readonly backend = 'memory' as const;
-  private emitter = new EventEmitter();
-
-  constructor() {
-    // SSE fan-out can attach many listeners to the same channel; lift the cap.
-    this.emitter.setMaxListeners(0);
-  }
-
-  async publish(channel: string, message: any): Promise<void> {
-    this.emitter.emit(channel, message);
-  }
-
-  async subscribe(channel: string, handler: PubSubHandler): Promise<() => void> {
-    this.emitter.on(channel, handler);
-    return () => this.emitter.off(channel, handler);
-  }
-}
-
-// ==================== Redis implementation ====================
-
-class RedisPubSub implements PubSub {
-  readonly backend = 'redis' as const;
-  // Per-channel handler sets so a single Redis subscription fans out locally.
-  private handlers = new Map<string, Set<PubSubHandler>>();
-  private wired = false;
-
-  private ensureWired(): void {
-    if (this.wired) return;
-    const sub = getSubscriber();
-    if (!sub) return;
-    this.wired = true;
-    sub.on('message', (channel: string, payload: string) => {
-      const set = this.handlers.get(channel);
-      if (!set || set.size === 0) return;
-      let parsed: any = payload;
-      try {
-        parsed = JSON.parse(payload);
-      } catch {
-        // Leave as raw string if it was not JSON.
-      }
-      for (const handler of set) {
-        try {
-          handler(parsed);
-        } catch (err: any) {
-          console.error('[pubsub] handler error:', err?.message || err);
-        }
-      }
-    });
-  }
-
-  async publish(channel: string, message: any): Promise<void> {
-    const redis = getRedis();
-    if (!redis) return;
-    try {
-      await redis.publish(channel, JSON.stringify(message));
-    } catch (err: any) {
-      console.error('[pubsub] publish error:', err?.message || err);
-    }
-  }
-
-  async subscribe(channel: string, handler: PubSubHandler): Promise<() => void> {
-    this.ensureWired();
-    const sub = getSubscriber();
-    if (!sub) return () => undefined;
-
-    let set = this.handlers.get(channel);
-    if (!set) {
-      set = new Set();
-      this.handlers.set(channel, set);
-      try {
-        await sub.subscribe(channel);
-      } catch (err: any) {
-        console.error('[pubsub] subscribe error:', err?.message || err);
-      }
-    }
-    set.add(handler);
-
-    return () => {
-      const current = this.handlers.get(channel);
-      if (!current) return;
-      current.delete(handler);
-      if (current.size === 0) {
-        this.handlers.delete(channel);
-        sub.unsubscribe(channel).catch(() => undefined);
-      }
-    };
-  }
-}
-
-// ==================== Selection ====================
-
-let instance: PubSub | null = null;
-
-export function getPubSub(): PubSub {
-  if (!instance) {
-    instance = isRedisEnabled() ? new RedisPubSub() : new MemoryPubSub();
-  }
-  return instance;
-}

backend/src/lib/stores/rateLimiter.ts

@@ -1,98 +0,0 @@
-// Rate limiter abstraction with two implementations:
-// - memory: per-process fixed window (the original behavior)
-// - redis: shared fixed window across all instances (INCR + PEXPIRE)
-//
-// Selection happens once based on REDIS_URL. On any Redis error the limiter
-// fails open (allows the request) so a Redis blip never takes the API down.
-
-import { getRedis, isRedisEnabled } from '../redis.js';
-
-export interface RateLimitResult {
-  allowed: boolean;
-  retryAfter?: number;
-}
-
-export interface RateLimiter {
-  readonly backend: 'memory' | 'redis';
-  consume(key: string, max: number, windowMs: number): Promise<RateLimitResult>;
-}
-
-// ==================== Memory implementation ====================
-
-interface Bucket {
-  count: number;
-  resetAt: number;
-}
-
-class MemoryRateLimiter implements RateLimiter {
-  readonly backend = 'memory' as const;
-  private buckets = new Map<string, Bucket>();
-
-  constructor() {
-    // Periodically drop expired buckets so the Map does not grow unbounded.
-    const cleanup = setInterval(() => {
-      const now = Date.now();
-      for (const [key, bucket] of this.buckets) {
-        if (now > bucket.resetAt) this.buckets.delete(key);
-      }
-    }, 60_000);
-    (cleanup as any).unref?.();
-  }
-
-  async consume(key: string, max: number, windowMs: number): Promise<RateLimitResult> {
-    const now = Date.now();
-    const bucket = this.buckets.get(key);
-
-    if (!bucket || now > bucket.resetAt) {
-      this.buckets.set(key, { count: 1, resetAt: now + windowMs });
-      return { allowed: true };
-    }
-
-    bucket.count++;
-    if (bucket.count > max) {
-      return { allowed: false, retryAfter: Math.ceil((bucket.resetAt - now) / 1000) };
-    }
-    return { allowed: true };
-  }
-}
-
-// ==================== Redis implementation ====================
-
-class RedisRateLimiter implements RateLimiter {
-  readonly backend = 'redis' as const;
-
-  async consume(key: string, max: number, windowMs: number): Promise<RateLimitResult> {
-    const redis = getRedis();
-    if (!redis) return { allowed: true };
-
-    const redisKey = `rl:${key}`;
-    try {
-      const count = await redis.incr(redisKey);
-      if (count === 1) {
-        // First hit in this window: set the expiry that defines the window.
-        await redis.pexpire(redisKey, windowMs);
-      }
-      if (count > max) {
-        const ttl = await redis.pttl(redisKey);
-        const retryAfter = ttl > 0 ? Math.ceil(ttl / 1000) : Math.ceil(windowMs / 1000);
-        return { allowed: false, retryAfter };
-      }
-      return { allowed: true };
-    } catch (err: any) {
-      // Fail open: never block traffic because Redis is unavailable.
-      console.error('[rateLimiter] redis error, allowing request:', err?.message || err);
-      return { allowed: true };
-    }
-  }
-}
-
-// ==================== Selection ====================
-
-let instance: RateLimiter | null = null;
-
-export function getRateLimiter(): RateLimiter {
-  if (!instance) {
-    instance = isRedisEnabled() ? new RedisRateLimiter() : new MemoryRateLimiter();
-  }
-  return instance;
-}

backend/src/lib/utils.ts

@@ -41,49 +41,6 @@ export function toDbDate(date: Date | string): string | Date {
   return getDbType() === 'postgres' ? d : d.toISOString();
 }
 
-const NAIVE_DATETIME_RE = /^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}(:\d{2}(\.\d+)?)?$/;
-
-/**
- * Parse a datetime string that represents wall-clock time in a given timezone
- * and return the corresponding UTC Date.
- *
- * Naive strings (no "Z" or offset) are interpreted as wall-clock time in
- * `timezone`.  Strings that already carry a timezone indicator are parsed
- * directly so existing UTC ISO values still work.
- */
-export function parseEventDatetime(
-  datetime: string,
-  timezone: string = 'America/Asuncion',
-): Date {
-  if (!NAIVE_DATETIME_RE.test(datetime)) {
-    return new Date(datetime);
-  }
-
-  // Treat the digits as UTC so we have a stable reference instant.
-  const fakeUTC = new Date(datetime + 'Z');
-
-  // Ask Intl what that UTC instant looks like in both UTC and the target tz.
-  const utcStr = fakeUTC.toLocaleString('en-US', { timeZone: 'UTC' });
-  const tzStr  = fakeUTC.toLocaleString('en-US', { timeZone: timezone });
-
-  // The gap between the two tells us the tz offset at this point in time.
-  const offsetMs = new Date(utcStr).getTime() - new Date(tzStr).getTime();
-
-  return new Date(fakeUTC.getTime() + offsetMs);
-}
-
-/**
- * Convert a datetime string to the appropriate DB format, interpreting naive
- * strings as wall-clock time in `timezone` (defaults to America/Asuncion).
- */
-export function toDbDateTz(
-  datetime: string,
-  timezone: string = 'America/Asuncion',
-): string | Date {
-  const d = parseEventDatetime(datetime, timezone);
-  return getDbType() === 'postgres' ? d : d.toISOString();
-}
-
 /**
  * Convert a boolean value to the appropriate format for the database type.
  * - SQLite: returns boolean (true/false) for mode: 'boolean'

backend/src/routes/admin.ts

@@ -1,21 +1,11 @@
 import { Hono } from 'hono';
 import { db, dbGet, dbAll, users, events, tickets, payments, contacts, emailSubscribers } from '../db/index.js';
-import { eq, and, ne, gte, sql, desc, inArray } from 'drizzle-orm';
+import { eq, and, gte, sql, desc, inArray } from 'drizzle-orm';
 import { requireAuth } from '../lib/auth.js';
 import { getNow } from '../lib/utils.js';
 
 const adminRouter = new Hono();
 
-// Escape a value for inclusion in a CSV cell (RFC 4180 quoting).
-const csvEscape = (value: string) => {
-  if (value == null) return '';
-  const str = String(value);
-  if (str.includes(',') || str.includes('"') || str.includes('\n') || str.includes('\r')) {
-    return '"' + str.replace(/"/g, '""') + '"';
-  }
-  return str;
-};
-
 // Dashboard overview stats (admin)
 adminRouter.get('/dashboard', requireAuth(['admin', 'organizer']), async (c) => {
   const now = getNow();
@@ -77,14 +67,14 @@ adminRouter.get('/dashboard', requireAuth(['admin', 'organizer']), async (c) =>
       .where(eq((payments as any).status, 'pending'))
   );
   
-  const revenueRow = await dbGet<any>(
+  const paidPayments = await dbAll<any>(
     (db as any)
-      .select({ total: sql<number>`COALESCE(SUM(${(payments as any).amount}), 0)` })
+      .select()
       .from(payments)
       .where(eq((payments as any).status, 'paid'))
   );
   
-  const totalRevenue = Number(revenueRow?.total || 0);
+  const totalRevenue = paidPayments.reduce((sum: number, p: any) => sum + Number(p.amount || 0), 0);
   
   const newContacts = await dbGet<any>(
     (db as any)
@@ -120,52 +110,54 @@ adminRouter.get('/dashboard', requireAuth(['admin', 'organizer']), async (c) =>
 
 // Get analytics data (admin)
 adminRouter.get('/analytics', requireAuth(['admin']), async (c) => {
-  // Get events with ticket counts using grouped aggregates (avoids 3 queries per event).
+  // Get events with ticket counts
   const allEvents = await dbAll<any>((db as any).select().from(events));
-
-  const totalRows = await dbAll<any>(
-    (db as any)
-      .select({ eventId: (tickets as any).eventId, count: sql<number>`count(*)` })
-      .from(tickets)
-      .groupBy((tickets as any).eventId)
+  
+  const eventStats = await Promise.all(
+    allEvents.map(async (event: any) => {
+      const ticketCount = await dbGet<any>(
+        (db as any)
+          .select({ count: sql<number>`count(*)` })
+          .from(tickets)
+          .where(eq((tickets as any).eventId, event.id))
+      );
+      
+      const confirmedCount = await dbGet<any>(
+        (db as any)
+          .select({ count: sql<number>`count(*)` })
+          .from(tickets)
+          .where(
+            and(
+              eq((tickets as any).eventId, event.id),
+              eq((tickets as any).status, 'confirmed')
+            )
+          )
+      );
+      
+      const checkedInCount = await dbGet<any>(
+        (db as any)
+          .select({ count: sql<number>`count(*)` })
+          .from(tickets)
+          .where(
+            and(
+              eq((tickets as any).eventId, event.id),
+              eq((tickets as any).status, 'checked_in')
+            )
+          )
+      );
+      
+      return {
+        id: event.id,
+        title: event.title,
+        date: event.startDatetime,
+        capacity: event.capacity,
+        totalBookings: ticketCount?.count || 0,
+        confirmedBookings: confirmedCount?.count || 0,
+        checkedIn: checkedInCount?.count || 0,
+        revenue: (confirmedCount?.count || 0) * event.price,
+      };
+    })
   );
-  const confirmedRows = await dbAll<any>(
-    (db as any)
-      .select({ eventId: (tickets as any).eventId, count: sql<number>`count(*)` })
-      .from(tickets)
-      .where(and(eq((tickets as any).status, 'confirmed'), ne((tickets as any).isGuest, 1)))
-      .groupBy((tickets as any).eventId)
-  );
-  const checkedInRows = await dbAll<any>(
-    (db as any)
-      .select({ eventId: (tickets as any).eventId, count: sql<number>`count(*)` })
-      .from(tickets)
-      .where(and(eq((tickets as any).status, 'checked_in'), ne((tickets as any).isGuest, 1)))
-      .groupBy((tickets as any).eventId)
-  );
-
-  const toMap = (rows: any[]) => {
-    const m = new Map<string, number>();
-    for (const r of rows) m.set(r.eventId, Number(r.count) || 0);
-    return m;
-  };
-  const totalMap = toMap(totalRows);
-  const confirmedMap = toMap(confirmedRows);
-  const checkedInMap = toMap(checkedInRows);
-
-  const eventStats = allEvents.map((event: any) => {
-    const confirmedBookings = confirmedMap.get(event.id) || 0;
-    return {
-      id: event.id,
-      title: event.title,
-      date: event.startDatetime,
-      capacity: event.capacity,
-      totalBookings: totalMap.get(event.id) || 0,
-      confirmedBookings,
-      checkedIn: checkedInMap.get(event.id) || 0,
-      revenue: confirmedBookings * event.price,
-    };
-  });
   
   return c.json({
     analytics: {
@@ -185,25 +177,30 @@ adminRouter.get('/export/tickets', requireAuth(['admin']), async (c) => {
   }
   
   const ticketList = await dbAll<any>(query);
-
-  const userIds = [...new Set(ticketList.map((t: any) => t.userId).filter(Boolean))];
-  const eventIds = [...new Set(ticketList.map((t: any) => t.eventId).filter(Boolean))];
-  const ticketIds = ticketList.map((t: any) => t.id);
-
-  const [userRows, eventRows, paymentRows] = await Promise.all([
-    userIds.length ? dbAll<any>((db as any).select().from(users).where(inArray((users as any).id, userIds))) : Promise.resolve([]),
-    eventIds.length ? dbAll<any>((db as any).select().from(events).where(inArray((events as any).id, eventIds))) : Promise.resolve([]),
-    ticketIds.length ? dbAll<any>((db as any).select().from(payments).where(inArray((payments as any).ticketId, ticketIds))) : Promise.resolve([]),
-  ]);
-
-  const usersById = new Map(userRows.map((u: any) => [u.id, u]));
-  const eventsById = new Map(eventRows.map((e: any) => [e.id, e]));
-  const paymentsByTicketId = new Map(paymentRows.map((p: any) => [p.ticketId, p]));
   
-  const enrichedTickets = ticketList.map((ticket: any) => {
-      const user = usersById.get(ticket.userId);
-      const event = eventsById.get(ticket.eventId);
-      const payment = paymentsByTicketId.get(ticket.id);
+  // Get user and event details for each ticket
+  const enrichedTickets = await Promise.all(
+    ticketList.map(async (ticket: any) => {
+      const user = await dbGet<any>(
+        (db as any)
+          .select()
+          .from(users)
+          .where(eq((users as any).id, ticket.userId))
+      );
+      
+      const event = await dbGet<any>(
+        (db as any)
+          .select()
+          .from(events)
+          .where(eq((events as any).id, ticket.eventId))
+      );
+      
+      const payment = await dbGet<any>(
+        (db as any)
+          .select()
+          .from(payments)
+          .where(eq((payments as any).ticketId, ticket.id))
+      );
       
       return {
         ticketId: ticket.id,
@@ -219,7 +216,8 @@ adminRouter.get('/export/tickets', requireAuth(['admin']), async (c) => {
         paymentAmount: payment?.amount,
         createdAt: ticket.createdAt,
       };
-    });
+    })
+  );
   
   return c.json({ tickets: enrichedTickets });
 });
@@ -301,6 +299,16 @@ adminRouter.get('/events/:eventId/attendees/export', requireAuth(['admin']), asy
     })
   );
 
+  // Generate CSV
+  const csvEscape = (value: string) => {
+    if (value == null) return '';
+    const str = String(value);
+    if (str.includes(',') || str.includes('"') || str.includes('\n') || str.includes('\r')) {
+      return '"' + str.replace(/"/g, '""') + '"';
+    }
+    return str;
+  };
+
   const columns = [
     'Ticket ID', 'Full Name', 'Email', 'Phone',
     'Status', 'Checked In', 'Check-in Time', 'Payment Status',
@@ -380,6 +388,15 @@ adminRouter.get('/events/:eventId/tickets/export', requireAuth(['admin']), async
     });
   }
 
+  const csvEscape = (value: string) => {
+    if (value == null) return '';
+    const str = String(value);
+    if (str.includes(',') || str.includes('"') || str.includes('\n') || str.includes('\r')) {
+      return '"' + str.replace(/"/g, '""') + '"';
+    }
+    return str;
+  };
+
   const columns = ['Ticket ID', 'Booking ID', 'Attendee Name', 'Status', 'Check-in Time', 'Booked At'];
 
   const rows = ticketList.map((ticket: any) => ({

backend/src/routes/auth.ts

@@ -14,17 +14,10 @@ import {
   createMagicLinkToken,
   verifyMagicLinkToken,
   invalidateAllUserSessions,
-  bumpTokenVersion,
   requireAuth,
-  getUserPasswordHash,
 } from '../lib/auth.js';
 import { generateId, getNow, toDbBool } from '../lib/utils.js';
 import { sendEmail } from '../lib/email.js';
-import { rateLimitMiddleware } from '../lib/rateLimit.js';
-
-// Per-IP rate limit for sensitive auth endpoints (registration, login, and all
-// email-dispatching flows) to curb credential stuffing and email flooding.
-const authRateLimit = rateLimitMiddleware({ max: 20, windowMs: 15 * 60 * 1000, prefix: 'auth' });
 
 // User type that includes all fields (some added in schema updates)
 type AuthUser = User & {
@@ -104,7 +97,8 @@ const passwordResetSchema = z.object({
 
 const claimAccountSchema = z.object({
   token: z.string(),
-  password: z.string().min(10, 'Password must be at least 10 characters'),
+  password: z.string().min(10, 'Password must be at least 10 characters').optional(),
+  googleId: z.string().optional(),
 });
 
 const changePasswordSchema = z.object({
@@ -117,7 +111,7 @@ const googleAuthSchema = z.object({
 });
 
 // Register
-auth.post('/register', authRateLimit, zValidator('json', registerSchema), async (c) => {
+auth.post('/register', zValidator('json', registerSchema), async (c) => {
   const data = c.req.valid('json');
   
   // Validate password strength
@@ -167,7 +161,7 @@ auth.post('/register', authRateLimit, zValidator('json', registerSchema), async
   
   await (db as any).insert(users).values(newUser);
   
-  const token = await createToken(id, data.email, newUser.role, 0);
+  const token = await createToken(id, data.email, newUser.role);
   const refreshToken = await createRefreshToken(id);
   
   return c.json({
@@ -185,7 +179,7 @@ auth.post('/register', authRateLimit, zValidator('json', registerSchema), async
 });
 
 // Login with email/password
-auth.post('/login', authRateLimit, zValidator('json', loginSchema), async (c) => {
+auth.post('/login', zValidator('json', loginSchema), async (c) => {
   const data = c.req.valid('json');
   
   // Check rate limit
@@ -229,23 +223,8 @@ auth.post('/login', authRateLimit, zValidator('json', loginSchema), async (c) =>
   
   // Clear failed attempts on successful login
   clearFailedAttempts(data.email);
-
-  // Transparently upgrade legacy bcrypt hashes to argon2 now that we have the
-  // plaintext and have verified it. Best-effort: a failure here must not block
-  // the login.
-  if (!String(user.password).startsWith('$argon2')) {
-    try {
-      const upgradedHash = await hashPassword(data.password);
-      await (db as any)
-        .update(users)
-        .set({ password: upgradedHash })
-        .where(eq((users as any).id, user.id));
-    } catch (err: any) {
-      console.error('[auth] Failed to upgrade legacy password hash:', err?.message || err);
-    }
-  }
   
-  const token = await createToken(user.id, user.email, user.role, user.tokenVersion ?? 0);
+  const token = await createToken(user.id, user.email, user.role);
   const refreshToken = await createRefreshToken(user.id);
   
   return c.json({
@@ -265,7 +244,7 @@ auth.post('/login', authRateLimit, zValidator('json', loginSchema), async (c) =>
 });
 
 // Request magic link login
-auth.post('/magic-link/request', authRateLimit, zValidator('json', magicLinkRequestSchema), async (c) => {
+auth.post('/magic-link/request', zValidator('json', magicLinkRequestSchema), async (c) => {
   const { email } = c.req.valid('json');
   
   const user = await dbGet<any>(
@@ -306,7 +285,7 @@ auth.post('/magic-link/request', authRateLimit, zValidator('json', magicLinkRequ
 });
 
 // Verify magic link and login
-auth.post('/magic-link/verify', authRateLimit, zValidator('json', magicLinkVerifySchema), async (c) => {
+auth.post('/magic-link/verify', zValidator('json', magicLinkVerifySchema), async (c) => {
   const { token } = c.req.valid('json');
   
   const verification = await verifyMagicLinkToken(token, 'login');
@@ -323,7 +302,7 @@ auth.post('/magic-link/verify', authRateLimit, zValidator('json', magicLinkVerif
     return c.json({ error: 'Invalid token' }, 400);
   }
   
-  const authToken = await createToken(user.id, user.email, user.role, user.tokenVersion ?? 0);
+  const authToken = await createToken(user.id, user.email, user.role);
   const refreshToken = await createRefreshToken(user.id);
   
   return c.json({
@@ -343,7 +322,7 @@ auth.post('/magic-link/verify', authRateLimit, zValidator('json', magicLinkVerif
 });
 
 // Request password reset
-auth.post('/password-reset/request', authRateLimit, zValidator('json', passwordResetRequestSchema), async (c) => {
+auth.post('/password-reset/request', zValidator('json', passwordResetRequestSchema), async (c) => {
   const { email } = c.req.valid('json');
   
   const user = await dbGet<any>(
@@ -384,7 +363,7 @@ auth.post('/password-reset/request', authRateLimit, zValidator('json', passwordR
 });
 
 // Reset password
-auth.post('/password-reset/confirm', authRateLimit, zValidator('json', passwordResetSchema), async (c) => {
+auth.post('/password-reset/confirm', zValidator('json', passwordResetSchema), async (c) => {
   const { token, password } = c.req.valid('json');
   
   // Validate password strength
@@ -410,15 +389,14 @@ auth.post('/password-reset/confirm', authRateLimit, zValidator('json', passwordR
     })
     .where(eq((users as any).id, verification.userId));
   
-  // Invalidate all existing sessions/JWTs for security
+  // Invalidate all existing sessions for security
   await invalidateAllUserSessions(verification.userId!);
-  await bumpTokenVersion(verification.userId!);
   
   return c.json({ message: 'Password reset successfully. Please log in with your new password.' });
 });
 
 // Claim unclaimed account
-auth.post('/claim-account/request', authRateLimit, zValidator('json', magicLinkRequestSchema), async (c) => {
+auth.post('/claim-account/request', zValidator('json', magicLinkRequestSchema), async (c) => {
   const { email } = c.req.valid('json');
   
   const user = await dbGet<any>(
@@ -433,8 +411,8 @@ auth.post('/claim-account/request', authRateLimit, zValidator('json', magicLinkR
     return c.json({ error: 'Account is already claimed' }, 400);
   }
   
-  // Create claim token (expires in 1 hour)
-  const token = await createMagicLinkToken(user.id, 'claim_account', 60);
+  // Create claim token (expires in 24 hours)
+  const token = await createMagicLinkToken(user.id, 'claim_account', 24 * 60);
   const claimLink = `${process.env.FRONTEND_URL || 'http://localhost:3000'}/auth/claim-account?token=${token}`;
   
   // Send email
@@ -447,7 +425,7 @@ auth.post('/claim-account/request', authRateLimit, zValidator('json', magicLinkR
         <p>An account was created for you during booking. Click below to set up your login credentials.</p>
         <p><a href="${claimLink}" style="background-color: #3B82F6; color: white; padding: 12px 24px; text-decoration: none; border-radius: 6px; display: inline-block;">Claim Account</a></p>
         <p>Or copy this link: ${claimLink}</p>
-        <p>This link expires in 1 hour.</p>
+        <p>This link expires in 24 hours.</p>
       `,
     });
   } catch (error) {
@@ -458,8 +436,12 @@ auth.post('/claim-account/request', authRateLimit, zValidator('json', magicLinkR
 });
 
 // Complete account claim
-auth.post('/claim-account/confirm', authRateLimit, zValidator('json', claimAccountSchema), async (c) => {
-  const { token, password } = c.req.valid('json');
+auth.post('/claim-account/confirm', zValidator('json', claimAccountSchema), async (c) => {
+  const { token, password, googleId } = c.req.valid('json');
+  
+  if (!password && !googleId) {
+    return c.json({ error: 'Please provide either a password or link a Google account' }, 400);
+  }
   
   const verification = await verifyMagicLinkToken(token, 'claim_account');
   
@@ -467,21 +449,25 @@ auth.post('/claim-account/confirm', authRateLimit, zValidator('json', claimAccou
     return c.json({ error: verification.error }, 400);
   }
   
-  const passwordValidation = validatePassword(password);
-  if (!passwordValidation.valid) {
-    return c.json({ error: passwordValidation.error }, 400);
-  }
-
   const now = getNow();
-  // Only set a password here. Linking a Google account requires a verified Google
-  // ID token via /google; we never trust a client-supplied googleId.
   const updates: Record<string, any> = {
     isClaimed: toDbBool(true),
     accountStatus: 'active',
-    password: await hashPassword(password),
     updatedAt: now,
   };
   
+  if (password) {
+    const passwordValidation = validatePassword(password);
+    if (!passwordValidation.valid) {
+      return c.json({ error: passwordValidation.error }, 400);
+    }
+    updates.password = await hashPassword(password);
+  }
+  
+  if (googleId) {
+    updates.googleId = googleId;
+  }
+  
   await (db as any)
     .update(users)
     .set(updates)
@@ -491,7 +477,7 @@ auth.post('/claim-account/confirm', authRateLimit, zValidator('json', claimAccou
     (db as any).select().from(users).where(eq((users as any).id, verification.userId))
   );
   
-  const authToken = await createToken(user.id, user.email, user.role, user.tokenVersion ?? 0);
+  const authToken = await createToken(user.id, user.email, user.role);
   const refreshToken = await createRefreshToken(user.id);
   
   return c.json({
@@ -512,14 +498,13 @@ auth.post('/claim-account/confirm', authRateLimit, zValidator('json', claimAccou
 });
 
 // Google OAuth login/register
-auth.post('/google', authRateLimit, zValidator('json', googleAuthSchema), async (c) => {
+auth.post('/google', zValidator('json', googleAuthSchema), async (c) => {
   const { credential } = c.req.valid('json');
   
   try {
-    // Verify the Google ID token. Google's tokeninfo endpoint validates the
-    // signature and expiry server-side; we additionally enforce the audience so a
-    // token minted for a different OAuth client cannot be replayed against us.
-    const response = await fetch(`https://oauth2.googleapis.com/tokeninfo?id_token=${encodeURIComponent(credential)}`);
+    // Verify Google token
+    // In production, use Google's library to verify: https://developers.google.com/identity/gsi/web/guides/verify-google-id-token
+    const response = await fetch(`https://oauth2.googleapis.com/tokeninfo?id_token=${credential}`);
     
     if (!response.ok) {
       return c.json({ error: 'Invalid Google token' }, 400);
@@ -530,29 +515,11 @@ auth.post('/google', authRateLimit, zValidator('json', googleAuthSchema), async
       email: string;
       name: string;
       email_verified: string;
-      aud?: string;
-      exp?: string;
     };
-
-    // email_verified can be returned as boolean true or string "true"
-    if (String(googleData.email_verified) !== 'true') {
+    
+    if (googleData.email_verified !== 'true') {
       return c.json({ error: 'Google email not verified' }, 400);
     }
-
-    // Enforce audience when a client ID is configured (closes token-confusion attacks)
-    const expectedAud = process.env.GOOGLE_CLIENT_ID;
-    if (expectedAud) {
-      if (googleData.aud !== expectedAud) {
-        return c.json({ error: 'Invalid Google token audience' }, 400);
-      }
-    } else {
-      console.warn('[auth] GOOGLE_CLIENT_ID is not set; skipping audience verification for Google login.');
-    }
-
-    // Reject expired tokens (defense-in-depth; tokeninfo also rejects them)
-    if (googleData.exp && Number(googleData.exp) * 1000 < Date.now()) {
-      return c.json({ error: 'Google token expired' }, 400);
-    }
     
     const { sub: googleId, email, name } = googleData;
     
@@ -617,7 +584,7 @@ auth.post('/google', authRateLimit, zValidator('json', googleAuthSchema), async
       user = newUser;
     }
     
-    const authToken = await createToken(user.id, user.email, user.role, user.tokenVersion ?? 0);
+    const authToken = await createToken(user.id, user.email, user.role);
     const refreshToken = await createRefreshToken(user.id);
     
     return c.json({
@@ -676,9 +643,8 @@ auth.post('/change-password', requireAuth(), zValidator('json', changePasswordSc
   }
   
   // Verify current password if user has one
-  const existingHash = await getUserPasswordHash(user.id);
-  if (existingHash) {
-    const validPassword = await verifyPassword(currentPassword, existingHash);
+  if (user.password) {
+    const validPassword = await verifyPassword(currentPassword, user.password);
     if (!validPassword) {
       return c.json({ error: 'Current password is incorrect' }, 400);
     }
@@ -694,25 +660,12 @@ auth.post('/change-password', requireAuth(), zValidator('json', changePasswordSc
       updatedAt: now,
     })
     .where(eq((users as any).id, user.id));
-
-  // Invalidate all previously issued JWTs so a stolen old token can't outlive the change,
-  // then hand the current client a fresh token so it stays logged in on this device.
-  await bumpTokenVersion(user.id);
-  const refreshedUser = await dbGet<any>(
-    (db as any).select().from(users).where(eq((users as any).id, user.id))
-  );
-  const newToken = await createToken(user.id, user.email, user.role, refreshedUser?.tokenVersion ?? 0);
   
-  return c.json({ message: 'Password changed successfully', token: newToken });
+  return c.json({ message: 'Password changed successfully' });
 });
 
-// Logout - invalidate all previously issued JWTs for this user (logout everywhere)
+// Logout (client-side token removal, but we can log the action)
 auth.post('/logout', async (c) => {
-  const user = await getAuthUser(c);
-  if (user) {
-    await invalidateAllUserSessions(user.id);
-    await bumpTokenVersion(user.id);
-  }
   return c.json({ message: 'Logged out successfully' });
 });
 

backend/src/routes/contacts.ts

@@ -4,18 +4,26 @@ import { z } from 'zod';
 import { db, dbGet, dbAll, contacts, emailSubscribers, legalSettings } from '../db/index.js';
 import { eq, desc } from 'drizzle-orm';
 import { requireAuth } from '../lib/auth.js';
-import { generateId, getNow, sanitizeHtml } from '../lib/utils.js';
+import { generateId, getNow } from '../lib/utils.js';
 import { emailService } from '../lib/email.js';
-import { rateLimitMiddleware } from '../lib/rateLimit.js';
 
 const contactsRouter = new Hono();
 
-// Per-IP rate limit for public, unauthenticated write endpoints (contact form,
-// newsletter subscribe/unsubscribe) to prevent spam and email flooding.
-const publicFormLimit = rateLimitMiddleware({ max: 5, windowMs: 10 * 60 * 1000, prefix: 'contacts' });
-
 // ==================== Sanitization Helpers ====================
 
+/**
+ * Sanitize a string to prevent HTML injection
+ * Escapes HTML special characters
+ */
+function sanitizeHtml(str: string): string {
+  return str
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#x27;');
+}
+
 /**
  * Sanitize email header values to prevent email header injection
  * Strips newlines and carriage returns that could be used to inject headers
@@ -25,14 +33,14 @@ function sanitizeHeaderValue(str: string): string {
 }
 
 const createContactSchema = z.object({
-  name: z.string().min(2).max(200),
-  email: z.string().email().max(254),
-  message: z.string().min(10).max(5000),
+  name: z.string().min(2),
+  email: z.string().email(),
+  message: z.string().min(10),
 });
 
 const subscribeSchema = z.object({
-  email: z.string().email().max(254),
-  name: z.string().max(200).optional(),
+  email: z.string().email(),
+  name: z.string().optional(),
 });
 
 const updateContactSchema = z.object({
@@ -40,7 +48,7 @@ const updateContactSchema = z.object({
 });
 
 // Submit contact form (public)
-contactsRouter.post('/', publicFormLimit, zValidator('json', createContactSchema), async (c) => {
+contactsRouter.post('/', zValidator('json', createContactSchema), async (c) => {
   const data = c.req.valid('json');
   const now = getNow();
   const id = generateId();
@@ -117,7 +125,7 @@ contactsRouter.post('/', publicFormLimit, zValidator('json', createContactSchema
 });
 
 // Subscribe to newsletter (public)
-contactsRouter.post('/subscribe', publicFormLimit, zValidator('json', subscribeSchema), async (c) => {
+contactsRouter.post('/subscribe', zValidator('json', subscribeSchema), async (c) => {
   const data = c.req.valid('json');
   
   // Check if already subscribed
@@ -158,30 +166,28 @@ contactsRouter.post('/subscribe', publicFormLimit, zValidator('json', subscribeS
 });
 
 // Unsubscribe from newsletter (public)
-contactsRouter.post('/unsubscribe', publicFormLimit, zValidator('json', z.object({ email: z.string().email().max(254) })), async (c) => {
+contactsRouter.post('/unsubscribe', zValidator('json', z.object({ email: z.string().email() })), async (c) => {
   const { email } = c.req.valid('json');
   
   const existing = await dbGet<any>(
     (db as any).select().from(emailSubscribers).where(eq((emailSubscribers as any).email, email))
   );
   
-  // Always return the same response whether or not the address exists, to avoid
-  // leaking which emails are subscribed (enumeration).
-  if (existing && existing.status !== 'unsubscribed') {
-    await (db as any)
-      .update(emailSubscribers)
-      .set({ status: 'unsubscribed' })
-      .where(eq((emailSubscribers as any).id, existing.id));
+  if (!existing) {
+    return c.json({ error: 'Email not found' }, 404);
   }
   
-  return c.json({ message: 'If this email was subscribed, it has been unsubscribed.' });
+  await (db as any)
+    .update(emailSubscribers)
+    .set({ status: 'unsubscribed' })
+    .where(eq((emailSubscribers as any).id, existing.id));
+  
+  return c.json({ message: 'Successfully unsubscribed' });
 });
 
 // Get all contacts (admin)
 contactsRouter.get('/', requireAuth(['admin', 'organizer']), async (c) => {
   const status = c.req.query('status');
-  const limit = Math.min(Math.max(parseInt(c.req.query('limit') || '100', 10) || 100, 1), 500);
-  const offset = Math.max(parseInt(c.req.query('offset') || '0', 10) || 0, 0);
   
   let query = (db as any).select().from(contacts);
   
@@ -189,9 +195,7 @@ contactsRouter.get('/', requireAuth(['admin', 'organizer']), async (c) => {
     query = query.where(eq((contacts as any).status, status));
   }
   
-  const result = await dbAll(
-    query.orderBy(desc((contacts as any).createdAt)).limit(limit).offset(offset)
-  );
+  const result = await dbAll(query.orderBy(desc((contacts as any).createdAt)));
   
   return c.json({ contacts: result });
 });
@@ -251,8 +255,6 @@ contactsRouter.delete('/:id', requireAuth(['admin']), async (c) => {
 // Get all subscribers (admin)
 contactsRouter.get('/subscribers/list', requireAuth(['admin', 'marketing']), async (c) => {
   const status = c.req.query('status');
-  const limit = Math.min(Math.max(parseInt(c.req.query('limit') || '100', 10) || 100, 1), 1000);
-  const offset = Math.max(parseInt(c.req.query('offset') || '0', 10) || 0, 0);
   
   let query = (db as any).select().from(emailSubscribers);
   
@@ -260,9 +262,7 @@ contactsRouter.get('/subscribers/list', requireAuth(['admin', 'marketing']), asy
     query = query.where(eq((emailSubscribers as any).status, status));
   }
   
-  const result = await dbAll(
-    query.orderBy(desc((emailSubscribers as any).createdAt)).limit(limit).offset(offset)
-  );
+  const result = await dbAll(query.orderBy(desc((emailSubscribers as any).createdAt)));
   
   return c.json({ subscribers: result });
 });

backend/src/routes/dashboard.ts

@@ -2,8 +2,8 @@ import { Hono } from 'hono';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
 import { db, dbGet, dbAll, users, tickets, payments, events, invoices, User } from '../db/index.js';
-import { eq, desc, and, gt, sql, inArray } from 'drizzle-orm';
-import { requireAuth, getUserSessions, invalidateSession, invalidateAllUserSessions, bumpTokenVersion, createToken, hashPassword, validatePassword, getUserPasswordHash } from '../lib/auth.js';
+import { eq, desc, and, gt, sql } from 'drizzle-orm';
+import { requireAuth, getUserSessions, invalidateSession, invalidateAllUserSessions, hashPassword, validatePassword } from '../lib/auth.js';
 import { generateId, getNow } from '../lib/utils.js';
 
 // User type that includes all fields (some added in schema updates)
@@ -37,8 +37,6 @@ dashboard.get('/profile', async (c) => {
   const now = new Date();
   const membershipDays = Math.floor((now.getTime() - createdDate.getTime()) / (1000 * 60 * 60 * 24));
   
-  const hasPassword = !!(await getUserPasswordHash(user.id));
-
   return c.json({
     profile: {
       id: user.id,
@@ -49,7 +47,7 @@ dashboard.get('/profile', async (c) => {
       rucNumber: user.rucNumber,
       isClaimed: user.isClaimed,
       accountStatus: user.accountStatus,
-      hasPassword,
+      hasPassword: !!user.password,
       hasGoogleLinked: !!user.googleId,
       memberSince: user.createdAt,
       membershipDays,
@@ -105,31 +103,34 @@ dashboard.get('/tickets', async (c) => {
       .where(eq((tickets as any).userId, user.id))
       .orderBy(desc((tickets as any).createdAt))
   );
-
-  // Batch-fetch related events, payments, and invoices (avoids N+1 per ticket).
-  const eventIds = [...new Set(userTickets.map((t: any) => t.eventId).filter(Boolean))];
-  const ticketIds = userTickets.map((t: any) => t.id);
-
-  const eventRows = eventIds.length
-    ? await dbAll<any>((db as any).select().from(events).where(inArray((events as any).id, eventIds)))
-    : [];
-  const paymentRows = ticketIds.length
-    ? await dbAll<any>((db as any).select().from(payments).where(inArray((payments as any).ticketId, ticketIds)))
-    : [];
-
-  const eventsById = new Map(eventRows.map((e: any) => [e.id, e]));
-  const paymentsByTicketId = new Map(paymentRows.map((p: any) => [p.ticketId, p]));
-
-  const paidPaymentIds = paymentRows.filter((p: any) => p.status === 'paid').map((p: any) => p.id);
-  const invoiceRows = paidPaymentIds.length
-    ? await dbAll<any>((db as any).select().from(invoices).where(inArray((invoices as any).paymentId, paidPaymentIds)))
-    : [];
-  const invoicesByPaymentId = new Map(invoiceRows.map((inv: any) => [inv.paymentId, inv]));
   
-  const ticketsWithEvents = userTickets.map((ticket: any) => {
-      const event = eventsById.get(ticket.eventId);
-      const payment = paymentsByTicketId.get(ticket.id);
-      const invoice = payment && payment.status === 'paid' ? invoicesByPaymentId.get(payment.id) : null;
+  // Get event details for each ticket
+  const ticketsWithEvents = await Promise.all(
+    userTickets.map(async (ticket: any) => {
+      const event = await dbGet<any>(
+        (db as any)
+          .select()
+          .from(events)
+          .where(eq((events as any).id, ticket.eventId))
+      );
+      
+      const payment = await dbGet<any>(
+        (db as any)
+          .select()
+          .from(payments)
+          .where(eq((payments as any).ticketId, ticket.id))
+      );
+      
+      // Check for invoice
+      let invoice: any = null;
+      if (payment && payment.status === 'paid') {
+        invoice = await dbGet<any>(
+          (db as any)
+            .select()
+            .from(invoices)
+            .where(eq((invoices as any).paymentId, payment.id))
+        );
+      }
       
       return {
         ...ticket,
@@ -161,7 +162,8 @@ dashboard.get('/tickets', async (c) => {
           createdAt: invoice.createdAt,
         } : null,
       };
-    });
+    })
+  );
   
   return c.json({ tickets: ticketsWithEvents });
 });
@@ -450,22 +452,13 @@ dashboard.delete('/sessions/:id', async (c) => {
   return c.json({ message: 'Session revoked' });
 });
 
-// Revoke all sessions (logout everywhere). Bumping the token version invalidates
-// every previously issued JWT for this user, which is the actual enforcement
-// mechanism (auth is stateless JWT, not DB-session based).
+// Revoke all sessions (logout everywhere)
 dashboard.post('/sessions/revoke-all', async (c) => {
   const user = (c as any).get('user') as AuthUser;
   
   await invalidateAllUserSessions(user.id);
-  await bumpTokenVersion(user.id);
-
-  // Issue a fresh token so the current device stays signed in
-  const refreshed = await dbGet<any>(
-    (db as any).select().from(users).where(eq((users as any).id, user.id))
-  );
-  const token = await createToken(user.id, user.email, user.role, refreshed?.tokenVersion ?? 0);
   
-  return c.json({ message: 'All other sessions revoked.', token });
+  return c.json({ message: 'All sessions revoked. Please log in again.' });
 });
 
 // Set password (for users without one)
@@ -478,7 +471,7 @@ dashboard.post('/set-password', zValidator('json', setPasswordSchema), async (c)
   const { password } = c.req.valid('json');
   
   // Check if user already has a password
-  if (await getUserPasswordHash(user.id)) {
+  if (user.password) {
     return c.json({ error: 'Password already set. Use change password instead.' }, 400);
   }
   
@@ -509,7 +502,7 @@ dashboard.post('/unlink-google', async (c) => {
     return c.json({ error: 'Google account not linked' }, 400);
   }
   
-  if (!(await getUserPasswordHash(user.id))) {
+  if (!user.password) {
     return c.json({ error: 'Cannot unlink Google without a password set' }, 400);
   }
   

backend/src/routes/emails.ts

@@ -1,8 +1,6 @@
 import { Hono } from 'hono';
-import { zValidator } from '@hono/zod-validator';
-import { z } from 'zod';
 import { db, dbGet, dbAll, emailTemplates, emailLogs, events, tickets } from '../db/index.js';
-import { eq, desc, and, or, sql } from 'drizzle-orm';
+import { eq, desc, and, sql } from 'drizzle-orm';
 import { requireAuth } from '../lib/auth.js';
 import { getNow, generateId } from '../lib/utils.js';
 import emailService from '../lib/email.js';
@@ -11,50 +9,6 @@ import { getQueueStatus } from '../lib/emailQueue.js';
 
 const emailsRouter = new Hono();
 
-const slugPattern = /^[a-z0-9-]+$/;
-
-const createTemplateSchema = z.object({
-  name: z.string().min(1).max(255),
-  slug: z.string().min(1).max(100).regex(slugPattern),
-  subject: z.string().min(1).max(500),
-  subjectEs: z.string().max(500).optional().nullable(),
-  bodyHtml: z.string().min(1).max(200_000),
-  bodyHtmlEs: z.string().max(200_000).optional().nullable(),
-  bodyText: z.string().max(200_000).optional().nullable(),
-  bodyTextEs: z.string().max(200_000).optional().nullable(),
-  description: z.string().max(2000).optional().nullable(),
-  variables: z.array(z.any()).max(100).optional(),
-});
-
-const updateTemplateSchema = createTemplateSchema.partial().extend({
-  isActive: z.boolean().optional(),
-});
-
-const sendCustomEmailSchema = z.object({
-  to: z.string().email().max(254),
-  toName: z.string().max(200).optional(),
-  subject: z.string().min(1).max(500),
-  bodyHtml: z.string().min(1).max(200_000),
-  bodyText: z.string().max(200_000).optional(),
-  eventId: z.string().optional(),
-});
-
-const emailLogsQuerySchema = z.object({
-  limit: z.coerce.number().int().min(1).max(100).optional().default(50),
-  offset: z.coerce.number().int().min(0).optional().default(0),
-});
-
-// Safely parse a stored JSON variables column; a corrupt row must not 500 the route.
-function safeParseVariables(raw: any): any[] {
-  if (!raw) return [];
-  try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch {
-    return [];
-  }
-}
-
 // ==================== Template Routes ====================
 
 // Get all email templates
@@ -66,7 +20,7 @@ emailsRouter.get('/templates', requireAuth(['admin', 'organizer']), async (c) =>
   // Parse variables JSON for each template
   const parsedTemplates = templates.map((t: any) => ({
     ...t,
-    variables: safeParseVariables(t.variables),
+    variables: t.variables ? JSON.parse(t.variables) : [],
     isSystem: Boolean(t.isSystem),
     isActive: Boolean(t.isActive),
   }));
@@ -92,7 +46,7 @@ emailsRouter.get('/templates/:id', requireAuth(['admin', 'organizer']), async (c
   return c.json({ 
     template: {
       ...template,
-      variables: safeParseVariables(template.variables),
+      variables: template.variables ? JSON.parse(template.variables) : [],
       isSystem: Boolean(template.isSystem),
       isActive: Boolean(template.isActive),
     }
@@ -100,10 +54,14 @@ emailsRouter.get('/templates/:id', requireAuth(['admin', 'organizer']), async (c
 });
 
 // Create new email template
-emailsRouter.post('/templates', requireAuth(['admin']), zValidator('json', createTemplateSchema), async (c) => {
-  const body = c.req.valid('json');
+emailsRouter.post('/templates', requireAuth(['admin']), async (c) => {
+  const body = await c.req.json();
   const { name, slug, subject, subjectEs, bodyHtml, bodyHtmlEs, bodyText, bodyTextEs, description, variables } = body;
   
+  if (!name || !slug || !subject || !bodyHtml) {
+    return c.json({ error: 'Name, slug, subject, and bodyHtml are required' }, 400);
+  }
+  
   // Check if slug already exists
   const existing = await dbGet<any>(
     (db as any).select().from(emailTemplates).where(eq((emailTemplates as any).slug, slug))
@@ -146,9 +104,9 @@ emailsRouter.post('/templates', requireAuth(['admin']), zValidator('json', creat
 });
 
 // Update email template
-emailsRouter.put('/templates/:id', requireAuth(['admin']), zValidator('json', updateTemplateSchema), async (c) => {
+emailsRouter.put('/templates/:id', requireAuth(['admin']), async (c) => {
   const { id } = c.req.param();
-  const body = c.req.valid('json');
+  const body = await c.req.json();
   
   const existing = await dbGet<any>(
     (db as any)
@@ -163,22 +121,22 @@ emailsRouter.put('/templates/:id', requireAuth(['admin']), zValidator('json', up
   
   const updateData: any = { updatedAt: getNow() };
   
-  // System templates cannot have their slug or isSystem flag changed; only the
-  // editable fields below are applied.
+  // Only allow updating certain fields for system templates
+  const systemProtectedFields = ['slug', 'isSystem'];
+  
   const allowedFields = ['name', 'subject', 'subjectEs', 'bodyHtml', 'bodyHtmlEs', 'bodyText', 'bodyTextEs', 'description', 'variables', 'isActive'];
   if (!existing.isSystem) {
     allowedFields.push('slug');
   }
   
   for (const field of allowedFields) {
-    const value = (body as Record<string, unknown>)[field];
-    if (value !== undefined) {
+    if (body[field] !== undefined) {
       if (field === 'variables') {
-        updateData[field] = JSON.stringify(value);
+        updateData[field] = JSON.stringify(body[field]);
       } else if (field === 'isActive') {
-        updateData[field] = value ? 1 : 0;
+        updateData[field] = body[field] ? 1 : 0;
       } else {
-        updateData[field] = value;
+        updateData[field] = body[field];
       }
     }
   }
@@ -198,7 +156,7 @@ emailsRouter.put('/templates/:id', requireAuth(['admin']), zValidator('json', up
   return c.json({ 
     template: {
       ...updated,
-      variables: safeParseVariables(updated.variables),
+      variables: updated.variables ? JSON.parse(updated.variables) : [],
       isSystem: Boolean(updated.isSystem),
       isActive: Boolean(updated.isActive),
     },
@@ -245,22 +203,16 @@ emailsRouter.post('/send/event/:eventId', requireAuth(['admin', 'organizer']), a
   const body = await c.req.json();
   const { templateSlug, customVariables, recipientFilter } = body;
   
-  if (!templateSlug || typeof templateSlug !== 'string') {
+  if (!templateSlug) {
     return c.json({ error: 'Template slug is required' }, 400);
   }
-
-  const allowedFilters = ['confirmed', 'pending', 'all', 'checked_in'];
-  const filter = recipientFilter || 'confirmed';
-  if (!allowedFilters.includes(filter)) {
-    return c.json({ error: `Invalid recipientFilter. Allowed: ${allowedFilters.join(', ')}` }, 400);
-  }
   
   // Queue emails for background processing instead of sending synchronously
   const result = await emailService.queueEventEmails({
     eventId,
     templateSlug,
     customVariables,
-    recipientFilter: filter,
+    recipientFilter: recipientFilter || 'confirmed',
     sentBy: user?.id,
   });
   
@@ -268,9 +220,14 @@ emailsRouter.post('/send/event/:eventId', requireAuth(['admin', 'organizer']), a
 });
 
 // Send custom email to specific recipients
-emailsRouter.post('/send/custom', requireAuth(['admin', 'organizer']), zValidator('json', sendCustomEmailSchema), async (c) => {
+emailsRouter.post('/send/custom', requireAuth(['admin', 'organizer']), async (c) => {
   const user = (c as any).get('user');
-  const { to, toName, subject, bodyHtml, bodyText, eventId } = c.req.valid('json');
+  const body = await c.req.json();
+  const { to, toName, subject, bodyHtml, bodyText, eventId } = body;
+  
+  if (!to || !subject || !bodyHtml) {
+    return c.json({ error: 'Recipient (to), subject, and bodyHtml are required' }, 400);
+  }
   
   const result = await emailService.sendCustomEmail({
     to,
@@ -315,7 +272,7 @@ emailsRouter.post('/preview', requireAuth(['admin', 'organizer']), async (c) =>
     : template.bodyHtml;
   
   const finalSubject = replaceTemplateVariables(subject, allVariables);
-  const finalBodyContent = replaceTemplateVariables(bodyHtml, allVariables, true);
+  const finalBodyContent = replaceTemplateVariables(bodyHtml, allVariables);
   const finalBodyHtml = wrapInBaseTemplate(finalBodyContent, { ...allVariables, subject: finalSubject });
   
   return c.json({
@@ -330,10 +287,8 @@ emailsRouter.post('/preview', requireAuth(['admin', 'organizer']), async (c) =>
 emailsRouter.get('/logs', requireAuth(['admin', 'organizer']), async (c) => {
   const eventId = c.req.query('eventId');
   const status = c.req.query('status');
-  const search = c.req.query('search');
-  // Clamp pagination so a NaN / out-of-range value can't produce undefined query behaviour.
-  const limit = Math.min(Math.max(parseInt(c.req.query('limit') || '50', 10) || 50, 1), 200);
-  const offset = Math.max(parseInt(c.req.query('offset') || '0', 10) || 0, 0);
+  const limit = parseInt(c.req.query('limit') || '50');
+  const offset = parseInt(c.req.query('offset') || '0');
   
   let query = (db as any).select().from(emailLogs);
   
@@ -344,14 +299,6 @@ emailsRouter.get('/logs', requireAuth(['admin', 'organizer']), async (c) => {
   if (status) {
     conditions.push(eq((emailLogs as any).status, status));
   }
-  if (search && search.trim()) {
-    const term = `%${search.trim().toLowerCase()}%`;
-    conditions.push(or(
-      sql`LOWER(${(emailLogs as any).recipientEmail}) LIKE ${term}`,
-      sql`LOWER(COALESCE(${(emailLogs as any).recipientName}, '')) LIKE ${term}`,
-      sql`LOWER(${(emailLogs as any).subject}) LIKE ${term}`,
-    ));
-  }
   
   if (conditions.length > 0) {
     query = query.where(and(...conditions));
@@ -402,23 +349,6 @@ emailsRouter.get('/logs/:id', requireAuth(['admin', 'organizer']), async (c) =>
   return c.json({ log });
 });
 
-// Resend email from log
-emailsRouter.post('/logs/:id/resend', requireAuth(['admin', 'organizer']), async (c) => {
-  const { id } = c.req.param();
-  
-  const result = await emailService.resendFromLog(id);
-  
-  if (!result.success && result.error === 'Email log not found') {
-    return c.json({ error: 'Email log not found' }, 404);
-  }
-  
-  if (!result.success && result.error === 'Email log missing required data to resend') {
-    return c.json({ error: result.error }, 400);
-  }
-  
-  return c.json({ success: result.success, error: result.error });
-});
-
 // Get email stats
 emailsRouter.get('/stats', requireAuth(['admin', 'organizer']), async (c) => {
   const eventId = c.req.query('eventId');
@@ -485,7 +415,7 @@ emailsRouter.post('/test', requireAuth(['admin']), async (c) => {
 
 // Get email queue status
 emailsRouter.get('/queue/status', requireAuth(['admin']), async (c) => {
-  const status = await getQueueStatus();
+  const status = getQueueStatus();
   return c.json({ status });
 });
 

backend/src/routes/events.ts

@@ -1,11 +1,10 @@
 import { Hono } from 'hono';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { db, dbGet, dbAll, events, eventSlugAliases, tickets, payments, eventPaymentOverrides, emailLogs, invoices, siteSettings, isPostgres } from '../db/index.js';
+import { db, dbGet, dbAll, events, tickets, payments, eventPaymentOverrides, emailLogs, invoices, siteSettings } from '../db/index.js';
 import { eq, desc, and, gte, sql } from 'drizzle-orm';
 import { requireAuth, getAuthUser } from '../lib/auth.js';
-import { generateId, getNow, convertBooleansForDb, toDbDate, toDbDateTz, calculateAvailableSeats } from '../lib/utils.js';
-import { slugify, uniqueSlug } from '../lib/slugify.js';
+import { generateId, getNow, convertBooleansForDb, toDbDate, calculateAvailableSeats } from '../lib/utils.js';
 import { revalidateFrontendCache } from '../lib/revalidate.js';
 
 interface UserContext {
@@ -32,55 +31,6 @@ function normalizeEvent(event: any) {
   };
 }
 
-// Load every slug currently in use (canonical event slugs + historical aliases),
-// optionally excluding a given event's own canonical slug + aliases.
-async function getAllSlugsInUse(excludeEventId?: string): Promise<string[]> {
-  const eventRows = await dbAll<any>(
-    (db as any).select({ id: (events as any).id, slug: (events as any).slug }).from(events)
-  );
-  const aliasRows = await dbAll<any>(
-    (db as any).select({ eventId: (eventSlugAliases as any).eventId, slug: (eventSlugAliases as any).slug }).from(eventSlugAliases)
-  );
-  const slugs: string[] = [];
-  for (const row of eventRows) {
-    if (row.slug && row.id !== excludeEventId) slugs.push(row.slug);
-  }
-  for (const row of aliasRows) {
-    if (row.slug && row.eventId !== excludeEventId) slugs.push(row.slug);
-  }
-  return slugs;
-}
-
-const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-
-// Resolve an event by canonical slug, primary id, or a historical slug alias.
-// Slug is checked first because Postgres rejects non-UUID strings when comparing
-// against the uuid `id` column, so id lookups are guarded behind a UUID check there.
-async function resolveEventByParam(param: string): Promise<any | null> {
-  let event = await dbGet<any>(
-    (db as any).select().from(events).where(eq((events as any).slug, param))
-  );
-  
-  if (!event && (!isPostgres() || UUID_PATTERN.test(param))) {
-    event = await dbGet<any>(
-      (db as any).select().from(events).where(eq((events as any).id, param))
-    );
-  }
-  
-  if (!event) {
-    const alias = await dbGet<any>(
-      (db as any).select().from(eventSlugAliases).where(eq((eventSlugAliases as any).slug, param))
-    );
-    if (alias) {
-      event = await dbGet<any>(
-        (db as any).select().from(events).where(eq((events as any).id, alias.eventId))
-      );
-    }
-  }
-  
-  return event || null;
-}
-
 // Custom validation error handler
 const validationHook = (result: any, c: any) => {
   if (!result.success) {
@@ -113,7 +63,6 @@ const normalizeBoolean = (val: unknown): boolean => {
 const baseEventSchema = z.object({
   title: z.string().min(1),
   titleEs: z.string().optional().nullable(),
-  slug: z.string().optional(),
   description: z.string().min(1),
   descriptionEs: z.string().optional().nullable(),
   shortDescription: z.string().max(300).optional().nullable(),
@@ -127,13 +76,8 @@ const baseEventSchema = z.object({
   currency: z.string().default('PYG'),
   capacity: z.union([z.number(), z.string()]).transform((val) => typeof val === 'string' ? parseInt(val, 10) || 50 : val).pipe(z.number().min(1)).default(50),
   status: z.enum(['draft', 'published', 'unlisted', 'cancelled', 'completed', 'archived']).default('draft'),
-  // Accept relative paths (/uploads/...) or http(s) URLs only — reject schemes like
-  // javascript:/data: that could be reflected into an href/src on the frontend.
-  bannerUrl: z.string()
-    .refine((v) => v === '' || v.startsWith('/') || /^https?:\/\//i.test(v), {
-      message: 'Banner URL must be a relative path or an http(s) URL',
-    })
-    .optional().nullable().or(z.literal('')),
+  // Accept relative paths (/uploads/...) or full URLs
+  bannerUrl: z.string().optional().nullable().or(z.literal('')),
   // External booking support - accept boolean or number (0/1 from DB)
   externalBookingEnabled: z.union([z.boolean(), z.number()]).transform(normalizeBoolean).default(false),
   externalBookingUrl: z.string().url().optional().nullable().or(z.literal('')),
@@ -171,80 +115,66 @@ const updateEventSchema = baseEventSchema.partial().refine(
 eventsRouter.get('/', async (c) => {
   const status = c.req.query('status');
   const upcoming = c.req.query('upcoming');
-
-  // Only privileged users may see non-public events (drafts, archived, etc.).
-  // Anonymous/regular callers are restricted to published events regardless of
-  // any client-supplied status filter, so drafts cannot leak.
-  const authUser: any = await getAuthUser(c);
-  const isPrivileged = !!authUser && ['admin', 'organizer', 'staff', 'marketing'].includes(authUser.role);
-
-  const conditions: any[] = [];
-
-  if (upcoming === 'true') {
-    // Upcoming feed is always published + future-dated, for everyone.
-    conditions.push(eq((events as any).status, 'published'));
-    conditions.push(gte((events as any).startDatetime, getNow()));
-  } else if (isPrivileged) {
-    // Admins/staff may filter by any status (or list everything when unset).
-    if (status) {
-      conditions.push(eq((events as any).status, status));
-    }
-  } else {
-    // Public listing: published events only, regardless of any status param.
-    conditions.push(eq((events as any).status, 'published'));
-  }
-
+  
   let query = (db as any).select().from(events);
-  if (conditions.length > 0) {
-    query = query.where(conditions.length === 1 ? conditions[0] : and(...conditions));
+  
+  if (status) {
+    query = query.where(eq((events as any).status, status));
   }
   
-  const result = await dbAll<any>(query.orderBy(desc((events as any).startDatetime)));
-
-  // Single grouped query for booked counts across all events (avoids N+1: previously
-  // this ran one COUNT query per event).
-  const countRows = await dbAll<any>(
-    (db as any)
-      .select({ eventId: (tickets as any).eventId, count: sql<number>`count(*)` })
-      .from(tickets)
-      .where(sql`${(tickets as any).status} IN ('confirmed', 'checked_in')`)
-      .groupBy((tickets as any).eventId)
-  );
-  const countByEvent = new Map<string, number>();
-  for (const row of countRows) {
-    countByEvent.set(row.eventId, Number(row.count) || 0);
+  if (upcoming === 'true') {
+    const now = getNow();
+    query = query.where(
+      and(
+        eq((events as any).status, 'published'),
+        gte((events as any).startDatetime, now)
+      )
+    );
   }
-
-  const eventsWithCounts = result.map((event: any) => {
-    const normalized = normalizeEvent(event);
-    const bookedCount = countByEvent.get(event.id) || 0;
-    return {
-      ...normalized,
-      bookedCount,
-      availableSeats: calculateAvailableSeats(normalized.capacity, bookedCount),
-    };
-  });
+  
+  const result = await dbAll(query.orderBy(desc((events as any).startDatetime)));
+  
+  // Get ticket counts for each event
+  const eventsWithCounts = await Promise.all(
+    result.map(async (event: any) => {
+      // Count confirmed AND checked_in tickets (checked_in were previously confirmed)
+      // This ensures check-in doesn't affect capacity/spots_left
+      const ticketCount = await dbGet<any>(
+        (db as any)
+          .select({ count: sql<number>`count(*)` })
+          .from(tickets)
+          .where(
+            and(
+              eq((tickets as any).eventId, event.id),
+              sql`${(tickets as any).status} IN ('confirmed', 'checked_in')`
+            )
+          )
+      );
+      
+      const normalized = normalizeEvent(event);
+      const bookedCount = ticketCount?.count || 0;
+      return {
+        ...normalized,
+        bookedCount,
+        availableSeats: calculateAvailableSeats(normalized.capacity, bookedCount),
+      };
+    })
+  );
   
   return c.json({ events: eventsWithCounts });
 });
 
-// Get single event (public) - resolves by id, canonical slug, or historical alias
+// Get single event (public)
 eventsRouter.get('/:id', async (c) => {
-  const param = c.req.param('id');
-  const event = await resolveEventByParam(param);
+  const id = c.req.param('id');
+  
+  const event = await dbGet<any>(
+    (db as any).select().from(events).where(eq((events as any).id, id))
+  );
   
   if (!event) {
     return c.json({ error: 'Event not found' }, 404);
   }
-
-  // Draft events are only visible to privileged users (admin preview); hide from public.
-  if ((event as any).status === 'draft') {
-    const authUser: any = await getAuthUser(c);
-    const isPrivileged = !!authUser && ['admin', 'organizer', 'staff', 'marketing'].includes(authUser.role);
-    if (!isPrivileged) {
-      return c.json({ error: 'Event not found' }, 404);
-    }
-  }
   
   // Count confirmed AND checked_in tickets (checked_in were previously confirmed)
   // This ensures check-in doesn't affect capacity/spots_left
@@ -254,7 +184,7 @@ eventsRouter.get('/:id', async (c) => {
       .from(tickets)
       .where(
         and(
-          eq((tickets as any).eventId, event.id),
+          eq((tickets as any).eventId, id),
           sql`${(tickets as any).status} IN ('confirmed', 'checked_in')`
         )
       )
@@ -271,13 +201,6 @@ eventsRouter.get('/:id', async (c) => {
   });
 });
 
-async function getSiteTimezone(): Promise<string> {
-  const settings = await dbGet<any>(
-    (db as any).select().from(siteSettings).limit(1)
-  );
-  return settings?.timezone || 'America/Asuncion';
-}
-
 // Helper function to get ticket count for an event
 async function getEventTicketCount(eventId: string): Promise<number> {
   const ticketCount = await dbGet<any>(
@@ -294,45 +217,6 @@ async function getEventTicketCount(eventId: string): Promise<number> {
   return ticketCount?.count || 0;
 }
 
-// Get the earliest upcoming published event with ticket counts (ignores featured promotion)
-async function getNextChronologicalUpcoming(): Promise<any | null> {
-  const now = getNow();
-  const event = await dbGet<any>(
-    (db as any)
-      .select()
-      .from(events)
-      .where(
-        and(
-          eq((events as any).status, 'published'),
-          gte((events as any).startDatetime, now)
-        )
-      )
-      .orderBy((events as any).startDatetime)
-      .limit(1)
-  );
-
-  if (!event) {
-    return null;
-  }
-
-  const bookedCount = await getEventTicketCount(event.id);
-  const normalized = normalizeEvent(event);
-  return {
-    ...normalized,
-    bookedCount,
-    availableSeats: calculateAvailableSeats(normalized.capacity, bookedCount),
-  };
-}
-
-// Get next upcoming event (public) - earliest upcoming published event, ignores featured promotion
-eventsRouter.get('/next', async (c) => {
-  const event = await getNextChronologicalUpcoming();
-  if (!event) {
-    return c.json({ event: null });
-  }
-  return c.json({ event: { ...event, isFeatured: false } });
-});
-
 // Get next upcoming event (public) - returns featured event if valid, otherwise next upcoming
 eventsRouter.get('/next/upcoming', async (c) => {
   const now = getNow();
@@ -396,13 +280,34 @@ eventsRouter.get('/next/upcoming', async (c) => {
   }
   
   // Fallback: get the next upcoming published event
-  const event = await getNextChronologicalUpcoming();
-
+  const event = await dbGet<any>(
+    (db as any)
+      .select()
+      .from(events)
+      .where(
+        and(
+          eq((events as any).status, 'published'),
+          gte((events as any).startDatetime, now)
+        )
+      )
+      .orderBy((events as any).startDatetime)
+      .limit(1)
+  );
+  
   if (!event) {
     return c.json({ event: null });
   }
-
-  return c.json({ event: { ...event, isFeatured: false } });
+  
+  const bookedCount = await getEventTicketCount(event.id);
+  const normalized = normalizeEvent(event);
+  return c.json({
+    event: {
+      ...normalized,
+      bookedCount,
+      availableSeats: calculateAvailableSeats(normalized.capacity, bookedCount),
+      isFeatured: false,
+    },
+  });
 });
 
 // Create event (admin/organizer only)
@@ -411,21 +316,15 @@ eventsRouter.post('/', requireAuth(['admin', 'organizer']), zValidator('json', c
   const user = c.get('user');
   const now = getNow();
   const id = generateId();
-  const tz = await getSiteTimezone();
   
   // Convert data for database compatibility
   const dbData = convertBooleansForDb(data);
   
-  // Generate a unique slug from the title (manual slug is honored on update, not create)
-  const existingSlugs = await getAllSlugsInUse();
-  const slug = uniqueSlug(data.title, existingSlugs);
-  
   const newEvent = {
     id,
     ...dbData,
-    slug,
-    startDatetime: toDbDateTz(data.startDatetime, tz),
-    endDatetime: data.endDatetime ? toDbDateTz(data.endDatetime, tz) : null,
+    startDatetime: toDbDate(data.startDatetime),
+    endDatetime: data.endDatetime ? toDbDate(data.endDatetime) : null,
     createdAt: now,
     updatedAt: now,
   };
@@ -444,7 +343,7 @@ eventsRouter.put('/:id', requireAuth(['admin', 'organizer']), zValidator('json',
   const id = c.req.param('id');
   const data = c.req.valid('json');
   
-  const existing = await dbGet<any>(
+  const existing = await dbGet(
     (db as any).select().from(events).where(eq((events as any).id, id))
   );
   if (!existing) {
@@ -452,51 +351,14 @@ eventsRouter.put('/:id', requireAuth(['admin', 'organizer']), zValidator('json',
   }
   
   const now = getNow();
-  const tz = await getSiteTimezone();
   // Convert data for database compatibility
   const updateData: Record<string, any> = { ...convertBooleansForDb(data), updatedAt: now };
-  // Slug changes are handled explicitly below to manage aliases
-  delete updateData.slug;
   // Convert datetime fields if present
   if (data.startDatetime) {
-    updateData.startDatetime = toDbDateTz(data.startDatetime, tz);
+    updateData.startDatetime = toDbDate(data.startDatetime);
   }
   if (data.endDatetime !== undefined) {
-    updateData.endDatetime = data.endDatetime ? toDbDateTz(data.endDatetime, tz) : null;
-  }
-  
-  // Resolve slug: explicit admin edit takes priority, then title-derived regeneration
-  const oldSlug: string | null = existing.slug || null;
-  let newSlug: string | null = oldSlug;
-  if (typeof data.slug === 'string' && data.slug.trim() !== '') {
-    const normalized = slugify(data.slug);
-    if (!normalized) {
-      return c.json({ error: 'Invalid slug' }, 400);
-    }
-    if (normalized !== oldSlug) {
-      const taken = await getAllSlugsInUse(id);
-      if (taken.includes(normalized)) {
-        return c.json({ error: 'Slug already in use' }, 400);
-      }
-      newSlug = normalized;
-    }
-  } else if (data.title && slugify(data.title) !== slugify(existing.title || '')) {
-    const taken = await getAllSlugsInUse(id);
-    newSlug = uniqueSlug(data.title, taken);
-  }
-  
-  if (newSlug && newSlug !== oldSlug) {
-    // If this slug was previously one of THIS event's aliases, reclaim it as canonical
-    await (db as any)
-      .delete(eventSlugAliases)
-      .where(and(eq((eventSlugAliases as any).slug, newSlug), eq((eventSlugAliases as any).eventId, id)));
-    // Preserve the old slug as an alias so existing shared links keep redirecting
-    if (oldSlug) {
-      try {
-        await (db as any).insert(eventSlugAliases).values({ slug: oldSlug, eventId: id, createdAt: now });
-      } catch (e) { /* alias may already exist */ }
-    }
-    updateData.slug = newSlug;
+    updateData.endDatetime = data.endDatetime ? toDbDate(data.endDatetime) : null;
   }
   
   await (db as any)
@@ -558,9 +420,6 @@ eventsRouter.delete('/:id', requireAuth(['admin']), async (c) => {
   // Delete event payment overrides
   await (db as any).delete(eventPaymentOverrides).where(eq((eventPaymentOverrides as any).eventId, id));
   
-  // Delete slug aliases for this event
-  await (db as any).delete(eventSlugAliases).where(eq((eventSlugAliases as any).eventId, id));
-  
   // Set eventId to null on email logs (they reference this event but can exist without it)
   await (db as any)
     .update(emailLogs)
@@ -603,15 +462,11 @@ eventsRouter.post('/:id/duplicate', requireAuth(['admin', 'organizer']), async (
   
   const now = getNow();
   const newId = generateId();
-  const duplicatedTitle = `${existing.title} (Copy)`;
-  const existingSlugs = await getAllSlugsInUse();
-  const slug = uniqueSlug(duplicatedTitle, existingSlugs);
   
   // Create a copy with modified title and draft status
   const duplicatedEvent = {
     id: newId,
-    slug,
-    title: duplicatedTitle,
+    title: `${existing.title} (Copy)`,
     titleEs: existing.titleEs ? `${existing.titleEs} (Copia)` : null,
     description: existing.description,
     descriptionEs: existing.descriptionEs,
@@ -637,44 +492,4 @@ eventsRouter.post('/:id/duplicate', requireAuth(['admin', 'organizer']), async (
   return c.json({ event: normalizeEvent(duplicatedEvent), message: 'Event duplicated successfully' }, 201);
 });
 
-// List slug aliases for an event (admin/organizer only)
-eventsRouter.get('/:id/slug-aliases', requireAuth(['admin', 'organizer']), async (c) => {
-  const id = c.req.param('id');
-  
-  const existing = await dbGet<any>(
-    (db as any).select().from(events).where(eq((events as any).id, id))
-  );
-  if (!existing) {
-    return c.json({ error: 'Event not found' }, 404);
-  }
-  
-  const aliases = await dbAll<any>(
-    (db as any)
-      .select({ slug: (eventSlugAliases as any).slug, createdAt: (eventSlugAliases as any).createdAt })
-      .from(eventSlugAliases)
-      .where(eq((eventSlugAliases as any).eventId, id))
-  );
-  
-  return c.json({ aliases });
-});
-
-// Remove a slug alias from an event (admin/organizer only)
-eventsRouter.delete('/:id/slug-aliases/:slug', requireAuth(['admin', 'organizer']), async (c) => {
-  const id = c.req.param('id');
-  const slug = c.req.param('slug');
-  
-  const existing = await dbGet<any>(
-    (db as any).select().from(events).where(eq((events as any).id, id))
-  );
-  if (!existing) {
-    return c.json({ error: 'Event not found' }, 404);
-  }
-  
-  await (db as any)
-    .delete(eventSlugAliases)
-    .where(and(eq((eventSlugAliases as any).eventId, id), eq((eventSlugAliases as any).slug, slug)));
-  
-  return c.json({ message: 'Alias removed' });
-});
-
 export default eventsRouter;

backend/src/routes/faq.ts

@@ -6,22 +6,6 @@ import { getNow, generateId } from '../lib/utils.js';
 
 const faqRouter = new Hono();
 
-// Upper bounds for admin-supplied FAQ content (guards against accidental/abusive huge payloads)
-const MAX_QUESTION_LEN = 1000;
-const MAX_ANSWER_LEN = 20000;
-
-// Returns an error message if any provided field exceeds its limit, else null.
-function faqLengthError(fields: { question?: any; questionEs?: any; answer?: any; answerEs?: any }): string | null {
-  const check = (v: any, max: number, label: string) =>
-    typeof v === 'string' && v.length > max ? `${label} must be at most ${max} characters` : null;
-  return (
-    check(fields.question, MAX_QUESTION_LEN, 'Question') ||
-    check(fields.questionEs, MAX_QUESTION_LEN, 'Question (ES)') ||
-    check(fields.answer, MAX_ANSWER_LEN, 'Answer') ||
-    check(fields.answerEs, MAX_ANSWER_LEN, 'Answer (ES)')
-  );
-}
-
 // ==================== Public Routes ====================
 
 // Get FAQ list for public (only enabled; optional filter for homepage)
@@ -114,11 +98,6 @@ faqRouter.post('/admin', requireAuth(['admin']), async (c) => {
     return c.json({ error: 'Question and answer (EN) are required' }, 400);
   }
 
-  const lengthError = faqLengthError({ question, questionEs, answer, answerEs });
-  if (lengthError) {
-    return c.json({ error: lengthError }, 400);
-  }
-
   const now = getNow();
   const id = generateId();
 
@@ -178,11 +157,6 @@ faqRouter.put('/admin/:id', requireAuth(['admin']), async (c) => {
     return c.json({ error: 'FAQ not found' }, 404);
   }
 
-  const lengthError = faqLengthError({ question, questionEs, answer, answerEs });
-  if (lengthError) {
-    return c.json({ error: lengthError }, 400);
-  }
-
   const updateData: Record<string, unknown> = {
     updatedAt: getNow(),
   };
@@ -235,15 +209,6 @@ faqRouter.post('/admin/reorder', requireAuth(['admin']), async (c) => {
     return c.json({ error: 'ids array is required' }, 400);
   }
 
-  // Verify every id exists before applying ranks (prevents silent no-ops on bad input).
-  const existingRows = await dbAll<any>(
-    (db as any).select({ id: (faqQuestions as any).id }).from(faqQuestions)
-  );
-  const existingIds = new Set(existingRows.map((r: any) => r.id));
-  if (ids.some((id: string) => !existingIds.has(id))) {
-    return c.json({ error: 'One or more FAQ ids are invalid' }, 400);
-  }
-
   const now = getNow();
   for (let i = 0; i < ids.length; i++) {
     await (db as any)

backend/src/routes/legal-pages.ts

@@ -9,6 +9,24 @@ import path from 'path';
 
 const legalPagesRouter = new Hono();
 
+// Helper: Convert plain text to simple markdown
+// Preserves paragraphs and line breaks, nothing fancy
+function textToMarkdown(text: string): string {
+  if (!text) return '';
+  
+  // Split into paragraphs (double newlines)
+  const paragraphs = text.split(/\n\s*\n/);
+  
+  // Process each paragraph
+  const processed = paragraphs.map(para => {
+    // Replace single newlines with double spaces + newline for markdown line breaks
+    return para.trim().replace(/\n/g, '  \n');
+  });
+  
+  // Join paragraphs with double newlines
+  return processed.join('\n\n');
+}
+
 // Helper: Convert markdown to plain text for editing
 function markdownToText(markdown: string): string {
   if (!markdown) return '';
@@ -144,13 +162,6 @@ legalPagesRouter.get('/', async (c) => {
 legalPagesRouter.get('/:slug', async (c) => {
   const { slug } = c.req.param();
   const locale = c.req.query('locale') || 'en';
-
-  // Reject anything that isn't a simple slug. The filesystem fallback below builds a
-  // path from this value, so an unconstrained slug (e.g. "../../etc/passwd") would
-  // allow path traversal / arbitrary file reads.
-  if (!/^[a-z0-9-]+$/.test(slug)) {
-    return c.json({ error: 'Legal page not found' }, 404);
-  }
   
   // First try to get from database
   const page = await dbGet<any>(
@@ -264,17 +275,6 @@ legalPagesRouter.put('/admin/:slug', requireAuth(['admin']), async (c) => {
   if (!enContent && !esContent) {
     return c.json({ error: 'At least one language content is required' }, 400);
   }
-
-  // Bound the sizes of admin-supplied content to avoid unbounded payloads.
-  const MAX_CONTENT_LEN = 200000; // ~200 KB of markdown per language
-  const MAX_TITLE_LEN = 255;
-  const tooLong = (v: any, max: number) => typeof v === 'string' && v.length > max;
-  if (tooLong(enContent, MAX_CONTENT_LEN) || tooLong(esContent, MAX_CONTENT_LEN)) {
-    return c.json({ error: `Content must be at most ${MAX_CONTENT_LEN} characters` }, 400);
-  }
-  if (tooLong(title, MAX_TITLE_LEN) || tooLong(titleEs, MAX_TITLE_LEN)) {
-    return c.json({ error: `Title must be at most ${MAX_TITLE_LEN} characters` }, 400);
-  }
   
   const existing = await dbGet(
     (db as any)

backend/src/routes/lnbits.ts

@@ -1,30 +1,19 @@
 import { Hono } from 'hono';
 import { streamSSE } from 'hono/streaming';
 import { db, dbGet, dbAll, tickets, payments } from '../db/index.js';
-import { eq, and } from 'drizzle-orm';
+import { eq } from 'drizzle-orm';
 import { getNow } from '../lib/utils.js';
 import { verifyWebhookPayment, getPaymentStatus } from '../lib/lnbits.js';
 import emailService from '../lib/email.js';
-import { getPubSub } from '../lib/stores/pubsub.js';
-import { getLock } from '../lib/stores/lock.js';
 
 const lnbitsRouter = new Hono();
 
-// Local SSE connections owned by THIS process (ticketId -> Set of response writers).
-// Cross-instance delivery is handled by pub/sub: see paymentChannel below.
-const activeConnections = new Map<string, Set<(data: any) => Promise<void>>>();
-
-// Pub/sub unsubscribe handles per ticket (one local subscription per ticket).
-const channelUnsubs = new Map<string, () => void>();
+// Store for active SSE connections (ticketId -> Set of response writers)
+const activeConnections = new Map<string, Set<(data: any) => void>>();
 
 // Store for active background checkers (ticketId -> intervalId)
 const activeCheckers = new Map<string, NodeJS.Timeout>();
 
-/** Pub/sub channel that carries payment events for a ticket. */
-function paymentChannel(ticketId: string): string {
-  return `payment:${ticketId}`;
-}
-
 /**
  * LNbits webhook payload structure
  */
@@ -43,71 +32,32 @@ interface LNbitsWebhookPayload {
 }
 
 /**
- * Notify every client for a ticket across all instances.
- *
- * Publishes to the ticket's pub/sub channel. In single-instance / in-memory
- * mode this is an in-process broadcast; with Redis it reaches whichever
- * instance(s) actually hold the SSE socket(s) for this ticket.
+ * Notify all connected clients for a ticket
  */
-async function notifyClients(ticketId: string, data: any) {
-  await getPubSub().publish(paymentChannel(ticketId), data);
-}
-
-/**
- * Deliver an event to the SSE sockets held by THIS process for a ticket.
- * Invoked by the pub/sub subscription handler.
- */
-async function deliverLocal(ticketId: string, data: any) {
+function notifyClients(ticketId: string, data: any) {
   const connections = activeConnections.get(ticketId);
   if (connections) {
-    await Promise.all(
-      Array.from(connections).map(async (send) => {
-        try {
-          await send(data);
-        } catch (e) {
-          // Connection might be closed
-        }
-      })
-    );
-  }
-}
-
-// Distributed lock tokens for the per-ticket poller (ticketId -> token).
-const checkerLockTokens = new Map<string, string>();
-
-/** Release the per-ticket poller lock if this process holds it. */
-function releaseCheckerLock(ticketId: string) {
-  const token = checkerLockTokens.get(ticketId);
-  if (token) {
-    checkerLockTokens.delete(ticketId);
-    void getLock().release(`checker:${ticketId}`, token);
+    connections.forEach(send => {
+      try {
+        send(data);
+      } catch (e) {
+        // Connection might be closed
+      }
+    });
   }
 }
 
 /**
- * Start background payment checking for a ticket.
- *
- * Only one instance should poll LNbits per ticket, so we take a distributed
- * lock for the lifetime of the poll. Other instances skip polling and instead
- * receive the result via pub/sub. With no Redis configured the lock is a local
- * no-op and behavior matches the original single-instance polling.
+ * Start background payment checking for a ticket
  */
-async function startBackgroundChecker(ticketId: string, paymentHash: string, expirySeconds: number = 900) {
-  // Don't start if already checking on this instance
+function startBackgroundChecker(ticketId: string, paymentHash: string, expirySeconds: number = 900) {
+  // Don't start if already checking
   if (activeCheckers.has(ticketId)) {
     return;
   }
 
-  const expiryMs = expirySeconds * 1000;
-
-  const lockToken = await getLock().acquire(`checker:${ticketId}`, expiryMs);
-  if (!lockToken) {
-    // Another instance is already polling this ticket.
-    return;
-  }
-  checkerLockTokens.set(ticketId, lockToken);
-
   const startTime = Date.now();
+  const expiryMs = expirySeconds * 1000;
   let checkCount = 0;
 
   console.log(`Starting background checker for ticket ${ticketId}, expires in ${expirySeconds}s`);
@@ -121,8 +71,7 @@ async function startBackgroundChecker(ticketId: string, paymentHash: string, exp
       console.log(`Invoice expired for ticket ${ticketId}`);
       clearInterval(checkInterval);
       activeCheckers.delete(ticketId);
-      releaseCheckerLock(ticketId);
-      await notifyClients(ticketId, { type: 'expired', ticketId });
+      notifyClients(ticketId, { type: 'expired', ticketId });
       return;
     }
 
@@ -133,10 +82,9 @@ async function startBackgroundChecker(ticketId: string, paymentHash: string, exp
         console.log(`Payment confirmed for ticket ${ticketId} (check #${checkCount})`);
         clearInterval(checkInterval);
         activeCheckers.delete(ticketId);
-        releaseCheckerLock(ticketId);
         
         await handlePaymentComplete(ticketId, paymentHash);
-        await notifyClients(ticketId, { type: 'paid', ticketId, paymentHash });
+        notifyClients(ticketId, { type: 'paid', ticketId, paymentHash });
       }
     } catch (error) {
       console.error(`Error checking payment for ticket ${ticketId}:`, error);
@@ -154,7 +102,6 @@ function stopBackgroundChecker(ticketId: string) {
   if (interval) {
     clearInterval(interval);
     activeCheckers.delete(ticketId);
-    releaseCheckerLock(ticketId);
   }
 }
 
@@ -164,23 +111,13 @@ function stopBackgroundChecker(ticketId: string) {
  */
 lnbitsRouter.post('/webhook', async (c) => {
   try {
-    // Optional shared-secret gate: if LNBITS_WEBHOOK_SECRET is configured, the
-    // webhook URL must carry a matching ?token=... (set when the invoice is created).
-    const webhookSecret = process.env.LNBITS_WEBHOOK_SECRET || '';
-    if (webhookSecret) {
-      const provided = c.req.query('token') || c.req.header('x-webhook-secret') || '';
-      if (provided !== webhookSecret) {
-        console.warn('LNbits webhook rejected: invalid or missing secret');
-        return c.json({ received: true, processed: false }, 401);
-      }
-    }
-
     const payload: LNbitsWebhookPayload = await c.req.json();
     
-    // Log identifiers only (no full payload / PII)
     console.log('LNbits webhook received:', {
       paymentHash: payload.payment_hash,
       status: payload.status,
+      amount: payload.amount,
+      extra: payload.extra,
     });
 
     // Verify the payment is actually complete by checking with LNbits
@@ -198,27 +135,13 @@ lnbitsRouter.post('/webhook', async (c) => {
       return c.json({ received: true, processed: false }, 200);
     }
 
-    // CRITICAL: bind the paid hash to this ticket's own invoice. Without this, a
-    // valid paid hash from any other invoice could be replayed with an arbitrary
-    // ticketId to confirm tickets for free.
-    const ticketPayment = await dbGet<any>(
-      (db as any).select().from(payments).where(eq((payments as any).ticketId, ticketId))
-    );
-    if (!ticketPayment || ticketPayment.reference !== payload.payment_hash) {
-      console.warn('LNbits webhook rejected: payment hash does not match the ticket invoice', {
-        ticketId,
-        paymentHash: payload.payment_hash,
-      });
-      return c.json({ received: true, processed: false }, 200);
-    }
-
     // Stop background checker since webhook confirmed payment
     stopBackgroundChecker(ticketId);
 
     await handlePaymentComplete(ticketId, payload.payment_hash);
     
     // Notify connected clients via SSE
-    await notifyClients(ticketId, { type: 'paid', ticketId, paymentHash: payload.payment_hash });
+    notifyClients(ticketId, { type: 'paid', ticketId, paymentHash: payload.payment_hash });
     
     return c.json({ received: true, processed: true }, 200);
   } catch (error) {
@@ -263,13 +186,15 @@ async function handlePaymentComplete(ticketId: string, paymentHash: string) {
     console.log(`Multi-ticket booking detected: ${ticketsToConfirm.length} tickets to confirm`);
   }
   
-  // Confirm all tickets in the booking (idempotent: only flip pending -> confirmed)
+  // Confirm all tickets in the booking
   for (const ticket of ticketsToConfirm) {
+    // Update ticket status to confirmed
     await (db as any)
       .update(tickets)
       .set({ status: 'confirmed' })
-      .where(and(eq((tickets as any).id, ticket.id), eq((tickets as any).status, 'pending')));
+      .where(eq((tickets as any).id, ticket.id));
     
+    // Update payment status to paid
     await (db as any)
       .update(payments)
       .set({ 
@@ -278,7 +203,7 @@ async function handlePaymentComplete(ticketId: string, paymentHash: string) {
         paidAt: now,
         updatedAt: now,
       })
-      .where(and(eq((payments as any).ticketId, ticket.id), eq((payments as any).status, 'pending')));
+      .where(eq((payments as any).ticketId, ticket.id));
     
     console.log(`Ticket ${ticket.id} confirmed via Lightning payment (hash: ${paymentHash})`);
   }
@@ -317,45 +242,38 @@ lnbitsRouter.get('/stream/:ticketId', async (c) => {
     return c.json({ error: 'Ticket not found' }, 404);
   }
   
+  // If already paid, return immediately
+  if (ticket.status === 'confirmed') {
+    return c.json({ type: 'already_paid', ticketId }, 200);
+  }
+  
   // Get payment to start background checker
   const payment = await dbGet<any>(
     (db as any).select().from(payments).where(eq((payments as any).ticketId, ticketId))
   );
   
-  // Start background checker if not already running (only while still pending)
-  if (ticket.status !== 'confirmed' && payment?.reference && !activeCheckers.has(ticketId)) {
-    await startBackgroundChecker(ticketId, payment.reference, 900); // 15 min expiry
+  // Start background checker if not already running
+  if (payment?.reference && !activeCheckers.has(ticketId)) {
+    startBackgroundChecker(ticketId, payment.reference, 900); // 15 min expiry
   }
   
-  // Prevent proxies/CDNs from buffering the event stream so events flush immediately.
-  c.header('Cache-Control', 'no-cache, no-transform');
-  c.header('X-Accel-Buffering', 'no');
-  
   return streamSSE(c, async (stream) => {
-    const sendEvent = async (data: any) => {
-      await stream.writeSSE({ data: JSON.stringify(data), event: 'payment' });
-    };
-    
-    // If already paid, notify over SSE and close (EventSource can parse this).
-    if (ticket.status === 'confirmed') {
-      await sendEvent({ type: 'already_paid', ticketId });
-      return;
-    }
-    
-    // Register this connection. The first local connection for a ticket also
-    // subscribes to the ticket's pub/sub channel so events published by any
-    // instance (webhook or background checker) are delivered to these sockets.
+    // Register this connection
     if (!activeConnections.has(ticketId)) {
       activeConnections.set(ticketId, new Set());
-      const unsub = await getPubSub().subscribe(paymentChannel(ticketId), (data) => {
-        void deliverLocal(ticketId, data);
-      });
-      channelUnsubs.set(ticketId, unsub);
     }
+    
+    const sendEvent = (data: any) => {
+      stream.writeSSE({ data: JSON.stringify(data), event: 'payment' });
+    };
+    
     activeConnections.get(ticketId)!.add(sendEvent);
     
     // Send initial status
-    await sendEvent({ type: 'connected', ticketId });
+    await stream.writeSSE({ 
+      data: JSON.stringify({ type: 'connected', ticketId }), 
+      event: 'payment' 
+    });
     
     // Keep connection alive with heartbeat
     const heartbeat = setInterval(async () => {
@@ -374,12 +292,6 @@ lnbitsRouter.get('/stream/:ticketId', async (c) => {
         connections.delete(sendEvent);
         if (connections.size === 0) {
           activeConnections.delete(ticketId);
-          // Drop the pub/sub subscription once no local sockets remain.
-          const unsub = channelUnsubs.get(ticketId);
-          if (unsub) {
-            unsub();
-            channelUnsubs.delete(ticketId);
-          }
         }
       }
     });

backend/src/routes/media.ts

@@ -1,51 +1,24 @@
 import { Hono } from 'hono';
 import { db, dbGet, dbAll, media } from '../db/index.js';
-import { eq, and } from 'drizzle-orm';
+import { eq } from 'drizzle-orm';
 import { requireAuth } from '../lib/auth.js';
 import { generateId, getNow } from '../lib/utils.js';
-import { getStorage, keyFromUrl } from '../lib/storage.js';
+import { writeFile, mkdir, unlink } from 'fs/promises';
+import { existsSync } from 'fs';
+import { join, extname } from 'path';
 
 const mediaRouter = new Hono();
 
+const UPLOAD_DIR = './uploads';
+const ALLOWED_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif'];
 const MAX_FILE_SIZE =
   (Number(process.env.MEDIA_MAX_UPLOAD_MB || '10') || 10) * 1024 * 1024; // default 10MB
 
-/**
- * Detect a real image type from the file's magic bytes (content sniffing).
- * Returns the canonical mime + extension, or null if the content is not an
- * allowed image. We deliberately ignore the client-supplied filename and
- * Content-Type so an attacker cannot store e.g. an .html/.svg payload.
- */
-function detectImageType(buf: Buffer): { mime: string; ext: string } | null {
-  if (buf.length < 12) return null;
-
-  // JPEG: FF D8 FF
-  if (buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff) {
-    return { mime: 'image/jpeg', ext: '.jpg' };
+// Ensure upload directory exists
+async function ensureUploadDir() {
+  if (!existsSync(UPLOAD_DIR)) {
+    await mkdir(UPLOAD_DIR, { recursive: true });
   }
-  // PNG: 89 50 4E 47 0D 0A 1A 0A
-  if (
-    buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47 &&
-    buf[4] === 0x0d && buf[5] === 0x0a && buf[6] === 0x1a && buf[7] === 0x0a
-  ) {
-    return { mime: 'image/png', ext: '.png' };
-  }
-  // GIF: "GIF87a" / "GIF89a"
-  if (buf.toString('ascii', 0, 6) === 'GIF87a' || buf.toString('ascii', 0, 6) === 'GIF89a') {
-    return { mime: 'image/gif', ext: '.gif' };
-  }
-  // WEBP: "RIFF"...."WEBP"
-  if (buf.toString('ascii', 0, 4) === 'RIFF' && buf.toString('ascii', 8, 12) === 'WEBP') {
-    return { mime: 'image/webp', ext: '.webp' };
-  }
-  // AVIF / HEIF: "....ftyp" with an avif/heic brand
-  if (buf.toString('ascii', 4, 8) === 'ftyp') {
-    const brand = buf.toString('ascii', 8, 12);
-    if (brand === 'avif' || brand === 'avis') {
-      return { mime: 'image/avif', ext: '.avif' };
-    }
-  }
-  return null;
 }
 
 // Upload image
@@ -58,28 +31,28 @@ mediaRouter.post('/upload', requireAuth(['admin', 'organizer']), async (c) => {
       return c.json({ error: 'No file provided' }, 400);
     }
     
-    // Validate file size (cheap check before reading the whole buffer)
+    // Validate file type
+    if (!ALLOWED_TYPES.includes(file.type)) {
+      return c.json({ error: 'Invalid file type. Allowed: JPEG, PNG, GIF, WebP, AVIF' }, 400);
+    }
+    
+    // Validate file size
     if (file.size > MAX_FILE_SIZE) {
       const mb = Math.round((MAX_FILE_SIZE / (1024 * 1024)) * 10) / 10;
       return c.json({ error: `File too large. Maximum size: ${mb}MB` }, 400);
     }
     
-    // Read the bytes and validate the *content* (not the client-provided type/name)
-    const arrayBuffer = await file.arrayBuffer();
-    const buffer = Buffer.from(arrayBuffer);
-
-    const detected = detectImageType(buffer);
-    if (!detected) {
-      return c.json({ error: 'Invalid file. Allowed: JPEG, PNG, GIF, WebP, AVIF' }, 400);
-    }
+    await ensureUploadDir();
     
-    // Generate unique filename using the *detected* extension (ignore client filename)
+    // Generate unique filename
     const id = generateId();
-    const filename = `${id}${detected.ext}`;
-
-    // Persist via the storage backend (local disk or S3-compatible object store).
-    const storage = getStorage();
-    await storage.put(filename, buffer, detected.mime);
+    const ext = extname(file.name) || '.jpg';
+    const filename = `${id}${ext}`;
+    const filepath = join(UPLOAD_DIR, filename);
+    
+    // Write file
+    const arrayBuffer = await file.arrayBuffer();
+    await writeFile(filepath, Buffer.from(arrayBuffer));
     
     // Get related info from form data
     const relatedId = body['relatedId'] as string | undefined;
@@ -89,7 +62,7 @@ mediaRouter.post('/upload', requireAuth(['admin', 'organizer']), async (c) => {
     const now = getNow();
     const mediaRecord = {
       id,
-      fileUrl: storage.publicUrl(filename),
+      fileUrl: `/uploads/${filename}`,
       type: 'image' as const,
       relatedId: relatedId || null,
       relatedType: relatedType || null,
@@ -135,9 +108,12 @@ mediaRouter.delete('/:id', requireAuth(['admin', 'organizer']), async (c) => {
     return c.json({ error: 'Media not found' }, 404);
   }
   
-  // Delete the underlying object from the storage backend.
+  // Delete file from disk
   try {
-    await getStorage().delete(keyFromUrl(mediaRecord.fileUrl));
+    const filepath = join('.', mediaRecord.fileUrl);
+    if (existsSync(filepath)) {
+      await unlink(filepath);
+    }
   } catch (error) {
     console.error('Failed to delete file:', error);
   }
@@ -152,20 +128,17 @@ mediaRouter.delete('/:id', requireAuth(['admin', 'organizer']), async (c) => {
 mediaRouter.get('/', requireAuth(['admin', 'organizer']), async (c) => {
   const relatedType = c.req.query('relatedType');
   const relatedId = c.req.query('relatedId');
-  const limit = Math.min(Math.max(parseInt(c.req.query('limit') || '200', 10) || 200, 1), 500);
-  const offset = Math.max(parseInt(c.req.query('offset') || '0', 10) || 0, 0);
   
-  // Combine filters into a single where() — chaining .where() replaces the prior condition in Drizzle.
-  const conditions: any[] = [];
-  if (relatedType) conditions.push(eq((media as any).relatedType, relatedType));
-  if (relatedId) conditions.push(eq((media as any).relatedId, relatedId));
-
   let query = (db as any).select().from(media);
-  if (conditions.length > 0) {
-    query = query.where(conditions.length === 1 ? conditions[0] : and(...conditions));
+  
+  if (relatedType) {
+    query = query.where(eq((media as any).relatedType, relatedType));
+  }
+  if (relatedId) {
+    query = query.where(eq((media as any).relatedId, relatedId));
   }
   
-  const result = await dbAll(query.limit(limit).offset(offset));
+  const result = await dbAll(query);
   
   return c.json({ media: result });
 });

backend/src/routes/payment-options.ts

@@ -1,9 +1,9 @@
 import { Hono } from 'hono';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { db, dbGet, paymentOptions, eventPaymentOverrides, events, tickets } from '../db/index.js';
+import { db, dbGet, paymentOptions, eventPaymentOverrides, events } from '../db/index.js';
 import { eq } from 'drizzle-orm';
-import { requireAuth, getAuthUser } from '../lib/auth.js';
+import { requireAuth } from '../lib/auth.js';
 import { generateId, getNow, convertBooleansForDb } from '../lib/utils.js';
 
 const paymentOptionsRouter = new Hono();
@@ -18,10 +18,6 @@ const booleanOrNumber = z.union([z.boolean(), z.number()]).transform((val) => {
 const updatePaymentOptionsSchema = z.object({
   tpagoEnabled: booleanOrNumber.optional(),
   tpagoLink: z.string().optional().nullable(),
-  tpagoLink2: z.string().optional().nullable(),
-  tpagoLink3: z.string().optional().nullable(),
-  tpagoLink4: z.string().optional().nullable(),
-  tpagoLink5: z.string().optional().nullable(),
   tpagoInstructions: z.string().optional().nullable(),
   tpagoInstructionsEs: z.string().optional().nullable(),
   bankTransferEnabled: booleanOrNumber.optional(),
@@ -40,31 +36,10 @@ const updatePaymentOptionsSchema = z.object({
   allowDuplicateBookings: booleanOrNumber.optional(),
 });
 
-/** Strip bank account numbers from payment options for anonymous callers. */
-function publicPaymentOptions(merged: Record<string, any>) {
-  return {
-    ...merged,
-    bankName: null,
-    bankAccountHolder: null,
-    bankAccountNumber: null,
-    bankAlias: null,
-    bankPhone: null,
-    tpagoLink: null,
-    tpagoLink2: null,
-    tpagoLink3: null,
-    tpagoLink4: null,
-    tpagoLink5: null,
-  };
-}
-
 // Schema for event-level overrides
 const updateEventOverridesSchema = z.object({
   tpagoEnabled: booleanOrNumber.optional().nullable(),
   tpagoLink: z.string().optional().nullable(),
-  tpagoLink2: z.string().optional().nullable(),
-  tpagoLink3: z.string().optional().nullable(),
-  tpagoLink4: z.string().optional().nullable(),
-  tpagoLink5: z.string().optional().nullable(),
   tpagoInstructions: z.string().optional().nullable(),
   tpagoInstructionsEs: z.string().optional().nullable(),
   bankTransferEnabled: booleanOrNumber.optional().nullable(),
@@ -93,10 +68,6 @@ paymentOptionsRouter.get('/', requireAuth(['admin']), async (c) => {
       paymentOptions: {
         tpagoEnabled: false,
         tpagoLink: null,
-        tpagoLink2: null,
-        tpagoLink3: null,
-        tpagoLink4: null,
-        tpagoLink5: null,
         tpagoInstructions: null,
         tpagoInstructionsEs: null,
         bankTransferEnabled: false,
@@ -168,7 +139,6 @@ paymentOptionsRouter.put('/', requireAuth(['admin']), zValidator('json', updateP
 // Get payment options for a specific event (merged with global)
 paymentOptionsRouter.get('/event/:eventId', async (c) => {
   const eventId = c.req.param('eventId');
-  const ticketId = c.req.query('ticketId');
 
   // Get the event first to verify it exists
   const event = await dbGet(
@@ -201,10 +171,6 @@ paymentOptionsRouter.get('/event/:eventId', async (c) => {
   const defaults = {
     tpagoEnabled: false,
     tpagoLink: null,
-    tpagoLink2: null,
-    tpagoLink3: null,
-    tpagoLink4: null,
-    tpagoLink5: null,
     tpagoInstructions: null,
     tpagoInstructionsEs: null,
     bankTransferEnabled: false,
@@ -227,10 +193,6 @@ paymentOptionsRouter.get('/event/:eventId', async (c) => {
   const merged = {
     tpagoEnabled: overrides?.tpagoEnabled ?? global.tpagoEnabled,
     tpagoLink: overrides?.tpagoLink ?? global.tpagoLink,
-    tpagoLink2: overrides?.tpagoLink2 ?? global.tpagoLink2,
-    tpagoLink3: overrides?.tpagoLink3 ?? global.tpagoLink3,
-    tpagoLink4: overrides?.tpagoLink4 ?? global.tpagoLink4,
-    tpagoLink5: overrides?.tpagoLink5 ?? global.tpagoLink5,
     tpagoInstructions: overrides?.tpagoInstructions ?? global.tpagoInstructions,
     tpagoInstructionsEs: overrides?.tpagoInstructionsEs ?? global.tpagoInstructionsEs,
     bankTransferEnabled: overrides?.bankTransferEnabled ?? global.bankTransferEnabled,
@@ -247,24 +209,8 @@ paymentOptionsRouter.get('/event/:eventId', async (c) => {
     cashInstructionsEs: overrides?.cashInstructionsEs ?? global.cashInstructionsEs,
   };
 
-  // Full bank/TPago credentials are only returned when the caller proves they hold
-  // a valid ticket for this event (the ticket UUID is the booking capability token),
-  // or when an authenticated admin/organizer requests them.
-  let revealSensitive = false;
-  const authUser: any = await getAuthUser(c);
-  if (authUser && ['admin', 'organizer'].includes(authUser.role)) {
-    revealSensitive = true;
-  } else if (ticketId) {
-    const ticket = await dbGet<any>(
-      (db as any).select().from(tickets).where(eq((tickets as any).id, ticketId))
-    );
-    if (ticket && ticket.eventId === eventId && ticket.status !== 'cancelled') {
-      revealSensitive = true;
-    }
-  }
-
   return c.json({
-    paymentOptions: revealSensitive ? merged : publicPaymentOptions(merged),
+    paymentOptions: merged,
     hasOverrides: !!overrides,
   });
 });

backend/src/routes/payments.ts

@@ -162,29 +162,6 @@ paymentsRouter.get('/pending-approval', requireAuth(['admin', 'organizer']), asy
   return c.json({ payments: enrichedPayments });
 });
 
-// Get payment statistics (admin) — registered before /:id so "stats" is not parsed as an id
-paymentsRouter.get('/stats/overview', requireAuth(['admin']), async (c) => {
-  const [totalRow, pendingRow, paidRow, refundedRow, failedRow, revenueRow] = await Promise.all([
-    dbGet<any>((db as any).select({ count: sql<number>`count(*)` }).from(payments)),
-    dbGet<any>((db as any).select({ count: sql<number>`count(*)` }).from(payments).where(eq((payments as any).status, 'pending'))),
-    dbGet<any>((db as any).select({ count: sql<number>`count(*)` }).from(payments).where(eq((payments as any).status, 'paid'))),
-    dbGet<any>((db as any).select({ count: sql<number>`count(*)` }).from(payments).where(eq((payments as any).status, 'refunded'))),
-    dbGet<any>((db as any).select({ count: sql<number>`count(*)` }).from(payments).where(eq((payments as any).status, 'failed'))),
-    dbGet<any>((db as any).select({ total: sql<number>`COALESCE(SUM(${(payments as any).amount}), 0)` }).from(payments).where(eq((payments as any).status, 'paid'))),
-  ]);
-
-  return c.json({
-    stats: {
-      total: Number(totalRow?.count || 0),
-      pending: Number(pendingRow?.count || 0),
-      paid: Number(paidRow?.count || 0),
-      refunded: Number(refundedRow?.count || 0),
-      failed: Number(failedRow?.count || 0),
-      totalRevenue: Number(revenueRow?.total || 0),
-    },
-  });
-});
-
 // Get payment by ID (admin)
 paymentsRouter.get('/:id', requireAuth(['admin', 'organizer']), async (c) => {
   const id = c.req.param('id');
@@ -410,40 +387,26 @@ paymentsRouter.post('/:id/reject', requireAuth(['admin', 'organizer']), zValidat
   }
   
   const now = getNow();
-
-  // Determine all tickets in this booking (multi-ticket bookings must be rejected together)
-  const rejectTicket = await dbGet<any>(
-    (db as any).select().from(tickets).where(eq((tickets as any).id, payment.ticketId))
-  );
-  let ticketsToReject: any[] = rejectTicket ? [rejectTicket] : [];
-  if (rejectTicket?.bookingId) {
-    ticketsToReject = await dbAll<any>(
-      (db as any).select().from(tickets).where(eq((tickets as any).bookingId, rejectTicket.bookingId))
-    );
-    console.log(`[Payment] Rejecting multi-ticket booking: ${rejectTicket.bookingId}, ${ticketsToReject.length} tickets`);
-  }
-
-  for (const t of ticketsToReject) {
-    // Fail the payment for each ticket in the booking
-    await (db as any)
-      .update(payments)
-      .set({ 
-        status: 'failed',
-        paidByAdminId: user.id,
-        adminNote: adminNote || payment.adminNote,
-        updatedAt: now,
-      })
-      .where(eq((payments as any).ticketId, (t as any).id));
-
-    // Cancel the ticket - booking is no longer valid after rejection
-    await (db as any)
-      .update(tickets)
-      .set({ 
-        status: 'cancelled',
-        updatedAt: now,
-      })
-      .where(eq((tickets as any).id, (t as any).id));
-  }
+  
+  // Update payment status to failed
+  await (db as any)
+    .update(payments)
+    .set({ 
+      status: 'failed',
+      paidByAdminId: user.id,
+      adminNote: adminNote || payment.adminNote,
+      updatedAt: now,
+    })
+    .where(eq((payments as any).id, id));
+  
+  // Cancel the ticket - booking is no longer valid after rejection
+  await (db as any)
+    .update(tickets)
+    .set({ 
+      status: 'cancelled',
+      updatedAt: now,
+    })
+    .where(eq((tickets as any).id, payment.ticketId));
   
   // Send rejection email asynchronously (for manual payment methods only, if sendEmail is true)
   if (sendEmail !== false && ['bank_transfer', 'tpago'].includes(payment.provider)) {
@@ -566,42 +529,56 @@ paymentsRouter.post('/:id/refund', requireAuth(['admin']), async (c) => {
   }
   
   const now = getNow();
-
-  // Refund all tickets/payments in the booking (multi-ticket bookings refund together)
-  const refundTicket = await dbGet<any>(
-    (db as any).select().from(tickets).where(eq((tickets as any).id, payment.ticketId))
-  );
-  let ticketsToRefund: any[] = refundTicket ? [refundTicket] : [];
-  if (refundTicket?.bookingId) {
-    ticketsToRefund = await dbAll<any>(
-      (db as any).select().from(tickets).where(eq((tickets as any).bookingId, refundTicket.bookingId))
-    );
-    console.log(`[Payment] Refunding multi-ticket booking: ${refundTicket.bookingId}, ${ticketsToRefund.length} tickets`);
-  }
-
-  for (const t of ticketsToRefund) {
-    // Only refund payments that were actually paid; leave others untouched
-    await (db as any)
-      .update(payments)
-      .set({ status: 'refunded', updatedAt: now })
-      .where(and(eq((payments as any).ticketId, (t as any).id), eq((payments as any).status, 'paid')));
-
-    await (db as any)
-      .update(tickets)
-      .set({ status: 'cancelled' })
-      .where(eq((tickets as any).id, (t as any).id));
-  }
+  
+  // Update payment status
+  await (db as any)
+    .update(payments)
+    .set({ status: 'refunded', updatedAt: now })
+    .where(eq((payments as any).id, id));
+  
+  // Cancel associated ticket
+  await (db as any)
+    .update(tickets)
+    .set({ status: 'cancelled' })
+    .where(eq((tickets as any).id, payment.ticketId));
   
   return c.json({ message: 'Refund processed successfully' });
 });
 
 // Payment webhook (for Stripe/MercadoPago)
-// Not implemented: there is deliberately NO status mutation here. Until provider
-// signature verification is implemented, accepting webhooks would let anyone forge
-// a "paid" status. Returns 501 and never updates payments/tickets.
 paymentsRouter.post('/webhook', async (c) => {
-  console.warn('Payment webhook received but provider webhooks are not implemented (no signature verification).');
-  return c.json({ error: 'Webhook handling is not implemented' }, 501);
+  // This would handle webhook notifications from payment providers
+  // Implementation depends on which provider is used
+  
+  const body = await c.req.json();
+  
+  // Log webhook for debugging
+  console.log('Payment webhook received:', body);
+  
+  // TODO: Implement provider-specific webhook handling
+  // - Verify webhook signature
+  // - Update payment status
+  // - Update ticket status
+  
+  return c.json({ received: true });
+});
+
+// Get payment statistics (admin)
+paymentsRouter.get('/stats/overview', requireAuth(['admin']), async (c) => {
+  const allPayments = await dbAll<any>((db as any).select().from(payments));
+  
+  const stats = {
+    total: allPayments.length,
+    pending: allPayments.filter((p: any) => p.status === 'pending').length,
+    paid: allPayments.filter((p: any) => p.status === 'paid').length,
+    refunded: allPayments.filter((p: any) => p.status === 'refunded').length,
+    failed: allPayments.filter((p: any) => p.status === 'failed').length,
+    totalRevenue: allPayments
+      .filter((p: any) => p.status === 'paid')
+      .reduce((sum: number, p: any) => sum + Number(p.amount || 0), 0),
+  };
+  
+  return c.json({ stats });
 });
 
 export default paymentsRouter;

backend/src/routes/site-settings.ts

@@ -17,20 +17,9 @@ interface UserContext {
 const siteSettingsRouter = new Hono<{ Variables: { user: UserContext } }>();
 
 // Validation schema for updating site settings
-// Validate against the runtime's IANA timezone database (rejects arbitrary strings
-// that later get fed into Intl.DateTimeFormat on the frontend).
-const isValidTimezone = (tz: string): boolean => {
-  try {
-    Intl.DateTimeFormat('en-US', { timeZone: tz });
-    return true;
-  } catch {
-    return false;
-  }
-};
-
 const updateSiteSettingsSchema = z.object({
-  timezone: z.string().refine(isValidTimezone, { message: 'Invalid timezone' }).optional(),
-  siteName: z.string().max(255).optional(),
+  timezone: z.string().optional(),
+  siteName: z.string().optional(),
   siteDescription: z.string().optional().nullable(),
   siteDescriptionEs: z.string().optional().nullable(),
   contactEmail: z.string().email().optional().nullable().or(z.literal('')),

backend/src/routes/tickets.ts

@@ -1,12 +1,11 @@
 import { Hono } from 'hono';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { db, dbGet, dbAll, tickets, events, users, payments, paymentOptions, eventPaymentOverrides, siteSettings, isSqlite } from '../db/index.js';
-import { eq, and, or, sql, inArray } from 'drizzle-orm';
+import { db, dbGet, dbAll, tickets, events, users, payments, paymentOptions, siteSettings } from '../db/index.js';
+import { eq, and, or, sql } from 'drizzle-orm';
 import { requireAuth, getAuthUser } from '../lib/auth.js';
 import { generateId, generateTicketCode, getNow, calculateAvailableSeats, isEventSoldOut } from '../lib/utils.js';
 import { createInvoice, isLNbitsConfigured } from '../lib/lnbits.js';
-import { rateLimitMiddleware } from '../lib/rateLimit.js';
 import emailService from '../lib/email.js';
 import { generateTicketPDF, generateCombinedTicketsPDF } from '../lib/pdf.js';
 
@@ -18,9 +17,6 @@ const attendeeSchema = z.object({
   lastName: z.string().min(2).optional().or(z.literal('')),
 });
 
-// Maximum tickets a single buyer can book at once (enforced server-side)
-const MAX_TICKETS_PER_BOOKING = 5;
-
 const createTicketSchema = z.object({
   eventId: z.string(),
   firstName: z.string().min(2),
@@ -28,30 +24,12 @@ const createTicketSchema = z.object({
   email: z.string().email(),
   phone: z.string().min(6).optional().or(z.literal('')),
   preferredLanguage: z.enum(['en', 'es']).optional(),
-  // 'bancard' intentionally excluded: no checkout integration exists for it
-  paymentMethod: z.enum(['lightning', 'cash', 'bank_transfer', 'tpago']).default('cash'),
+  paymentMethod: z.enum(['bancard', 'lightning', 'cash', 'bank_transfer', 'tpago']).default('cash'),
   ruc: z.string().regex(/^\d{6,10}$/, 'Invalid RUC format').optional().or(z.literal('')),
-  // Optional: array of attendees for multi-ticket booking (capped at MAX_TICKETS_PER_BOOKING)
-  attendees: z.array(attendeeSchema).min(1).max(MAX_TICKETS_PER_BOOKING).optional(),
+  // Optional: array of attendees for multi-ticket booking
+  attendees: z.array(attendeeSchema).optional(),
 });
 
-// Maps a payment provider to the merged payment-option flag that enables it
-function isPaymentMethodEnabled(method: string, merged: Record<string, any>): boolean {
-  const truthy = (v: any) => v === true || v === 1;
-  switch (method) {
-    case 'tpago':
-      return truthy(merged.tpagoEnabled);
-    case 'bank_transfer':
-      return truthy(merged.bankTransferEnabled);
-    case 'lightning':
-      return truthy(merged.lightningEnabled);
-    case 'cash':
-      return truthy(merged.cashEnabled);
-    default:
-      return false;
-  }
-}
-
 const updateTicketSchema = z.object({
   status: z.enum(['pending', 'confirmed', 'cancelled', 'checked_in']).optional(),
   adminNote: z.string().optional(),
@@ -82,11 +60,6 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
     : [{ firstName: data.firstName, lastName: data.lastName }];
   
   const ticketCount = attendeesList.length;
-
-  // Enforce the per-booking ticket cap server-side (UI also caps, but the API is authoritative)
-  if (ticketCount < 1 || ticketCount > MAX_TICKETS_PER_BOOKING) {
-    return c.json({ error: `You can book between 1 and ${MAX_TICKETS_PER_BOOKING} tickets per order.` }, 400);
-  }
   
   // Get event
   const event = await dbGet<any>(
@@ -99,28 +72,9 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
   if (!['published', 'unlisted'].includes(event.status)) {
     return c.json({ error: 'Event is not available for booking' }, 400);
   }
-
-  // Validate the requested payment method is actually enabled for this event
-  // (merge global options with any event-level overrides; override wins when not null)
-  const globalPaymentOptions = await dbGet<any>(
-    (db as any).select().from(paymentOptions)
-  );
-  const eventOverrides = await dbGet<any>(
-    (db as any).select().from(eventPaymentOverrides).where(eq((eventPaymentOverrides as any).eventId, data.eventId))
-  );
-  const mergedPaymentOptions: Record<string, any> = {
-    tpagoEnabled: eventOverrides?.tpagoEnabled ?? globalPaymentOptions?.tpagoEnabled ?? false,
-    bankTransferEnabled: eventOverrides?.bankTransferEnabled ?? globalPaymentOptions?.bankTransferEnabled ?? false,
-    lightningEnabled: eventOverrides?.lightningEnabled ?? globalPaymentOptions?.lightningEnabled ?? true,
-    cashEnabled: eventOverrides?.cashEnabled ?? globalPaymentOptions?.cashEnabled ?? true,
-  };
-  if (!isPaymentMethodEnabled(data.paymentMethod, mergedPaymentOptions)) {
-    return c.json({ error: 'Selected payment method is not available for this event' }, 400);
-  }
   
-  // Check capacity - count pending, confirmed AND checked_in tickets.
-  // Pending reservations must hold seats to prevent overselling via unpaid bookings
-  // (cancelled/failed tickets are excluded so abandoned/rejected bookings free their seats).
+  // Check capacity - count confirmed AND checked_in tickets
+  // (checked_in were previously confirmed, check-in doesn't affect capacity)
   const existingTicketCount = await dbGet<any>(
     (db as any)
       .select({ count: sql<number>`count(*)` })
@@ -128,7 +82,7 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
       .where(
         and(
           eq((tickets as any).eventId, data.eventId),
-          sql`${(tickets as any).status} IN ('pending', 'confirmed', 'checked_in')`
+          sql`${(tickets as any).status} IN ('confirmed', 'checked_in')`
         )
       )
   );
@@ -174,7 +128,13 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
   }
   
   // Check for duplicate booking (unless allowDuplicateBookings is enabled)
-  const allowDuplicateBookings = globalPaymentOptions?.allowDuplicateBookings ?? false;
+  const globalOptions = await dbGet<any>(
+    (db as any)
+      .select()
+      .from(paymentOptions)
+  );
+  
+  const allowDuplicateBookings = globalOptions?.allowDuplicateBookings ?? false;
   
   if (!allowDuplicateBookings) {
     const existingTicket = await dbGet<any>(
@@ -196,151 +156,52 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
   
   // Generate booking ID to group multiple tickets
   const bookingId = generateId();
-
-  // Atomically re-check capacity and insert tickets/payments inside a transaction
-  // so concurrent bookings cannot oversell the same seats (TOCTOU race).
-  class BookingCapacityError extends Error {
-    constructor(public code: 'SOLD_OUT' | 'NOT_ENOUGH', public available?: number) {
-      super(code);
-    }
-  }
-
-  let createdTickets: any[] = [];
-  let createdPayments: any[] = [];
-
-  try {
-    if (isSqlite()) {
-      (db as any).transaction((tx: any) => {
-        const countRow = tx
-          .select({ count: sql<number>`count(*)` })
-          .from(tickets)
-          .where(
-            and(
-              eq((tickets as any).eventId, data.eventId),
-              sql`${(tickets as any).status} IN ('pending', 'confirmed', 'checked_in')`
-            )
-          )
-          .get();
-        const reserved = Number(countRow?.count || 0);
-        if (isEventSoldOut(event.capacity, reserved)) {
-          throw new BookingCapacityError('SOLD_OUT');
-        }
-        const seatsLeft = calculateAvailableSeats(event.capacity, reserved);
-        if (ticketCount > seatsLeft) {
-          throw new BookingCapacityError('NOT_ENOUGH', seatsLeft);
-        }
-
-        for (let i = 0; i < attendeesList.length; i++) {
-          const attendee = attendeesList[i];
-          const ticketId = generateId();
-          const qrCode = generateTicketCode();
-          const newTicket = {
-            id: ticketId,
-            bookingId: ticketCount > 1 ? bookingId : null,
-            userId: user.id,
-            eventId: data.eventId,
-            attendeeFirstName: attendee.firstName,
-            attendeeLastName: attendee.lastName && attendee.lastName.trim() ? attendee.lastName.trim() : null,
-            attendeeEmail: data.email,
-            attendeePhone: data.phone && data.phone.trim() ? data.phone.trim() : null,
-            attendeeRuc: data.ruc || null,
-            preferredLanguage: data.preferredLanguage || null,
-            status: 'pending',
-            qrCode,
-            checkinAt: null,
-            createdAt: now,
-          };
-          tx.insert(tickets).values(newTicket).run();
-          createdTickets.push(newTicket);
-
-          const paymentId = generateId();
-          const newPayment = {
-            id: paymentId,
-            ticketId,
-            provider: data.paymentMethod,
-            amount: event.price,
-            currency: event.currency,
-            status: 'pending',
-            reference: null,
-            createdAt: now,
-            updatedAt: now,
-          };
-          tx.insert(payments).values(newPayment).run();
-          createdPayments.push(newPayment);
-        }
-      });
-    } else {
-      await (db as any).transaction(async (tx: any) => {
-        const countRow = await dbGet<any>(
-          tx
-            .select({ count: sql<number>`count(*)` })
-            .from(tickets)
-            .where(
-              and(
-                eq((tickets as any).eventId, data.eventId),
-                sql`${(tickets as any).status} IN ('pending', 'confirmed', 'checked_in')`
-              )
-            )
-        );
-        const reserved = Number(countRow?.count || 0);
-        if (isEventSoldOut(event.capacity, reserved)) {
-          throw new BookingCapacityError('SOLD_OUT');
-        }
-        const seatsLeft = calculateAvailableSeats(event.capacity, reserved);
-        if (ticketCount > seatsLeft) {
-          throw new BookingCapacityError('NOT_ENOUGH', seatsLeft);
-        }
-
-        for (let i = 0; i < attendeesList.length; i++) {
-          const attendee = attendeesList[i];
-          const ticketId = generateId();
-          const qrCode = generateTicketCode();
-          const newTicket = {
-            id: ticketId,
-            bookingId: ticketCount > 1 ? bookingId : null,
-            userId: user.id,
-            eventId: data.eventId,
-            attendeeFirstName: attendee.firstName,
-            attendeeLastName: attendee.lastName && attendee.lastName.trim() ? attendee.lastName.trim() : null,
-            attendeeEmail: data.email,
-            attendeePhone: data.phone && data.phone.trim() ? data.phone.trim() : null,
-            attendeeRuc: data.ruc || null,
-            preferredLanguage: data.preferredLanguage || null,
-            status: 'pending',
-            qrCode,
-            checkinAt: null,
-            createdAt: now,
-          };
-          await tx.insert(tickets).values(newTicket);
-          createdTickets.push(newTicket);
-
-          const paymentId = generateId();
-          const newPayment = {
-            id: paymentId,
-            ticketId,
-            provider: data.paymentMethod,
-            amount: event.price,
-            currency: event.currency,
-            status: 'pending',
-            reference: null,
-            createdAt: now,
-            updatedAt: now,
-          };
-          await tx.insert(payments).values(newPayment);
-          createdPayments.push(newPayment);
-        }
-      });
-    }
-  } catch (err: any) {
-    if (err instanceof BookingCapacityError) {
-      if (err.code === 'SOLD_OUT') {
-        return c.json({ error: 'Event is sold out' }, 400);
-      }
-      return c.json({
-        error: `Not enough seats available. Only ${err.available} spot(s) remaining.`,
-      }, 400);
-    }
-    throw err;
+  
+  // Create tickets for each attendee
+  const createdTickets: any[] = [];
+  const createdPayments: any[] = [];
+  
+  for (let i = 0; i < attendeesList.length; i++) {
+    const attendee = attendeesList[i];
+    const ticketId = generateId();
+    const qrCode = generateTicketCode();
+    
+    const newTicket = {
+      id: ticketId,
+      bookingId: ticketCount > 1 ? bookingId : null, // Only set bookingId for multi-ticket bookings
+      userId: user.id,
+      eventId: data.eventId,
+      attendeeFirstName: attendee.firstName,
+      attendeeLastName: attendee.lastName && attendee.lastName.trim() ? attendee.lastName.trim() : null,
+      attendeeEmail: data.email, // Buyer's email for all tickets
+      attendeePhone: data.phone && data.phone.trim() ? data.phone.trim() : null,
+      attendeeRuc: data.ruc || null,
+      preferredLanguage: data.preferredLanguage || null,
+      status: 'pending',
+      qrCode,
+      checkinAt: null,
+      createdAt: now,
+    };
+    
+    await (db as any).insert(tickets).values(newTicket);
+    createdTickets.push(newTicket);
+    
+    // Create payment record for each ticket
+    const paymentId = generateId();
+    const newPayment = {
+      id: paymentId,
+      ticketId,
+      provider: data.paymentMethod,
+      amount: event.price,
+      currency: event.currency,
+      status: 'pending',
+      reference: null,
+      createdAt: now,
+      updatedAt: now,
+    };
+    
+    await (db as any).insert(payments).values(newPayment);
+    createdPayments.push(newPayment);
   }
   
   const primaryTicket = createdTickets[0];
@@ -360,26 +221,11 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
     });
   }
   
-  // If Lightning payment, create LNbits invoice (skip for free events — confirm immediately)
+  // If Lightning payment, create LNbits invoice
   let lnbitsInvoice = null;
   const totalPrice = event.price * ticketCount;
-
-  // Free events: no payment step required — confirm tickets immediately
-  if (totalPrice === 0) {
-    for (const t of createdTickets) {
-      await (db as any)
-        .update(tickets)
-        .set({ status: 'confirmed' })
-        .where(and(eq((tickets as any).id, t.id), eq((tickets as any).status, 'pending')));
-      await (db as any)
-        .update(payments)
-        .set({ status: 'paid', paidAt: now, updatedAt: now })
-        .where(and(eq((payments as any).ticketId, t.id), eq((payments as any).status, 'pending')));
-    }
-    emailService.sendBookingConfirmation(primaryTicket.id).catch(err => {
-      console.error('[Email] Failed to send free-booking confirmation:', err);
-    });
-  } else if (data.paymentMethod === 'lightning') {
+  
+  if (data.paymentMethod === 'lightning' && totalPrice > 0) {
     if (!isLNbitsConfigured()) {
       // Delete the tickets and payments we just created
       for (const payment of createdPayments) {
@@ -395,11 +241,6 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
     
     try {
       const apiUrl = process.env.API_URL || 'http://localhost:3001';
-      // Include the webhook secret (if configured) so the callback can be authenticated
-      const webhookSecret = process.env.LNBITS_WEBHOOK_SECRET || '';
-      const webhookUrl = webhookSecret
-        ? `${apiUrl}/api/lnbits/webhook?token=${encodeURIComponent(webhookSecret)}`
-        : `${apiUrl}/api/lnbits/webhook`;
       
       // Pass the fiat currency directly to LNbits - it handles conversion automatically
       // For multi-ticket, use total price
@@ -407,7 +248,7 @@ ticketsRouter.post('/', zValidator('json', createTicketSchema), async (c) => {
         amount: totalPrice,
         unit: event.currency, // LNbits supports fiat currencies like USD, PYG, etc.
         memo: `Spanglish: ${event.title} - ${fullName}${ticketCount > 1 ? ` (${ticketCount} tickets)` : ''}`,
-        webhookUrl,
+        webhookUrl: `${apiUrl}/api/lnbits/webhook`,
         expiry: 900, // 15 minutes expiry for faster UX
         extra: {
           ticketId: primaryTicket.id,
@@ -769,9 +610,6 @@ ticketsRouter.get('/search', requireAuth(['admin', 'organizer', 'staff']), async
 });
 
 // Get ticket by ID
-// Capability-based access: the unguessable ticket UUID acts as the access token for
-// guest bookings (no account required). For anonymous callers we withhold attendee PII
-// (email/phone/RUC); the full record is only returned to the owner or admin/staff.
 ticketsRouter.get('/:id', async (c) => {
   const id = c.req.param('id');
   
@@ -793,30 +631,13 @@ ticketsRouter.get('/:id', async (c) => {
     (db as any).select().from(payments).where(eq((payments as any).ticketId, id))
   );
   
-  // Count how many tickets belong to this booking (for per-quantity payment links)
-  let bookingTicketCount = 1;
-  if (ticket.bookingId) {
-    const bookingTickets = await dbAll<any>(
-      (db as any).select().from(tickets).where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-    bookingTicketCount = bookingTickets.length || 1;
-  }
-
-  // Determine whether the requester is the owner or an admin/staff member
-  const authUser: any = await getAuthUser(c);
-  const isPrivileged = !!authUser && (
-    ['admin', 'organizer', 'staff'].includes(authUser.role) || authUser.id === ticket.userId
-  );
-
-  const ticketPayload: any = { ...ticket, event, payment, bookingTicketCount };
-  if (!isPrivileged) {
-    // Strip attendee PII for anonymous capability-based access
-    delete ticketPayload.attendeeEmail;
-    delete ticketPayload.attendeePhone;
-    delete ticketPayload.attendeeRuc;
-  }
-  
-  return c.json({ ticket: ticketPayload });
+  return c.json({
+    ticket: {
+      ...ticket,
+      event,
+      payment,
+    },
+  });
 });
 
 // Update ticket status (admin/organizer)
@@ -1154,7 +975,7 @@ ticketsRouter.post('/:id/mark-paid', requireAuth(['admin', 'organizer', 'staff']
 
 // User marks payment as sent (for manual payment methods: bank_transfer, tpago)
 // This sets status to "pending_approval" and notifies admin
-ticketsRouter.post('/:id/mark-payment-sent', rateLimitMiddleware({ max: 10, windowMs: 10 * 60 * 1000, prefix: 'mark-payment-sent' }), async (c) => {
+ticketsRouter.post('/:id/mark-payment-sent', async (c) => {
   const id = c.req.param('id');
   const body = await c.req.json().catch(() => ({}));
   const { payerName } = body;
@@ -1208,33 +1029,18 @@ ticketsRouter.post('/:id/mark-payment-sent', rateLimitMiddleware({ max: 10, wind
   
   const now = getNow();
   
-  // Update payment status to pending_approval for this ticket and any siblings
-  // in a multi-ticket booking (mirrors the approve flow's bookingId fan-out).
-  let ticketsToMark: any[] = [ticket];
-  if (ticket.bookingId) {
-    ticketsToMark = await dbAll<any>(
-      (db as any).select().from(tickets).where(eq((tickets as any).bookingId, ticket.bookingId))
-    );
-  }
-
-  for (const t of ticketsToMark) {
-    await (db as any)
-      .update(payments)
-      .set({ 
-        status: 'pending_approval',
-        userMarkedPaidAt: now,
-        payerName: payerName?.trim() || null,
-        updatedAt: now,
-      })
-      .where(
-        and(
-          eq((payments as any).ticketId, (t as any).id),
-          eq((payments as any).status, 'pending')
-        )
-      );
-  }
+  // Update payment status to pending_approval
+  await (db as any)
+    .update(payments)
+    .set({ 
+      status: 'pending_approval',
+      userMarkedPaidAt: now,
+      payerName: payerName?.trim() || null,
+      updatedAt: now,
+    })
+    .where(eq((payments as any).id, payment.id));
   
-  // Get updated payment for the requested ticket
+  // Get updated payment
   const updatedPayment = await dbGet(
     (db as any)
       .select()
@@ -1588,143 +1394,7 @@ ticketsRouter.post('/admin/manual', requireAuth(['admin', 'organizer', 'staff'])
   }, 201);
 });
 
-// Admin invite guest ticket (free, confirmed, not counted in revenue)
-ticketsRouter.post('/admin/guest', requireAuth(['admin', 'organizer', 'staff']), zValidator('json', z.object({
-  eventId: z.string(),
-  firstName: z.string().min(1),
-  lastName: z.string().optional().or(z.literal('')),
-  email: z.string().email().optional().or(z.literal('')),
-  phone: z.string().optional().or(z.literal('')),
-  preferredLanguage: z.enum(['en', 'es']).optional(),
-  adminNote: z.string().max(1000).optional(),
-})), async (c) => {
-  const data = c.req.valid('json');
-
-  const event = await dbGet<any>(
-    (db as any).select().from(events).where(eq((events as any).id, data.eventId))
-  );
-  if (!event) {
-    return c.json({ error: 'Event not found' }, 404);
-  }
-
-  const now = getNow();
-  const adminUser = (c as any).get('user');
-
-  // Find or create user (use placeholder email if none provided)
-  const attendeeEmail = data.email && data.email.trim()
-    ? data.email.trim()
-    : `guest-${generateId()}@guestinvite.local`;
-
-  const fullName = data.lastName && data.lastName.trim()
-    ? `${data.firstName} ${data.lastName}`.trim()
-    : data.firstName;
-
-  let user = await dbGet<any>(
-    (db as any).select().from(users).where(eq((users as any).email, attendeeEmail))
-  );
-
-  if (!user) {
-    const userId = generateId();
-    user = {
-      id: userId,
-      email: attendeeEmail,
-      password: '',
-      name: fullName,
-      phone: data.phone || null,
-      role: 'user',
-      languagePreference: null,
-      createdAt: now,
-      updatedAt: now,
-    };
-    await (db as any).insert(users).values(user);
-  }
-
-  // Check for existing active ticket (only for real emails, not placeholder)
-  if (data.email && data.email.trim()) {
-    const existingTicket = await dbGet<any>(
-      (db as any)
-        .select()
-        .from(tickets)
-        .where(
-          and(
-            eq((tickets as any).userId, user.id),
-            eq((tickets as any).eventId, data.eventId)
-          )
-        )
-    );
-    if (existingTicket && existingTicket.status !== 'cancelled') {
-      return c.json({ error: 'This person already has a ticket for this event' }, 400);
-    }
-  }
-
-  const ticketId = generateId();
-  const qrCode = generateTicketCode();
-
-  const newTicket = {
-    id: ticketId,
-    userId: user.id,
-    eventId: data.eventId,
-    attendeeFirstName: data.firstName,
-    attendeeLastName: data.lastName && data.lastName.trim() ? data.lastName.trim() : null,
-    attendeeEmail: data.email && data.email.trim() ? data.email.trim() : null,
-    attendeePhone: data.phone && data.phone.trim() ? data.phone.trim() : null,
-    preferredLanguage: data.preferredLanguage || null,
-    status: 'confirmed',
-    isGuest: 1,
-    qrCode,
-    checkinAt: null,
-    adminNote: data.adminNote || null,
-    createdAt: now,
-  };
-
-  await (db as any).insert(tickets).values(newTicket);
-
-  // Create a $0 payment record to track the invite
-  const paymentId = generateId();
-  const newPayment = {
-    id: paymentId,
-    ticketId,
-    provider: 'cash',
-    amount: 0,
-    currency: event.currency,
-    status: 'paid',
-    reference: 'Guest invite',
-    paidAt: now,
-    paidByAdminId: adminUser?.id || null,
-    createdAt: now,
-    updatedAt: now,
-  };
-
-  await (db as any).insert(payments).values(newPayment);
-
-  // Send booking confirmation email if a real email was provided
-  if (data.email && data.email.trim()) {
-    emailService.sendBookingConfirmation(ticketId).then(result => {
-      if (result.success) {
-        console.log(`[Email] Booking confirmation sent for guest ticket ${ticketId}`);
-      } else {
-        console.error(`[Email] Failed to send booking confirmation for guest ticket ${ticketId}:`, result.error);
-      }
-    }).catch(err => {
-      console.error('[Email] Exception sending booking confirmation for guest ticket:', err);
-    });
-  }
-
-  return c.json({
-    ticket: {
-      ...newTicket,
-      event: {
-        title: event.title,
-        startDatetime: event.startDatetime,
-        location: event.location,
-      },
-    },
-    payment: newPayment,
-    message: 'Guest ticket created successfully',
-  }, 201);
-});
-
-// Get all tickets (admin) - includes payment for each ticket
+// Get all tickets (admin)
 ticketsRouter.get('/', requireAuth(['admin', 'organizer']), async (c) => {
   const eventId = c.req.query('eventId');
   const status = c.req.query('status');
@@ -1743,25 +1413,9 @@ ticketsRouter.get('/', requireAuth(['admin', 'organizer']), async (c) => {
     query = query.where(and(...conditions));
   }
   
-  const ticketsList = await dbAll(query);
-  const ticketIds = ticketsList.map((t: any) => t.id);
-
-  let paymentByTicketId: Record<string, any> = {};
-  if (ticketIds.length > 0) {
-    const paymentsList = await dbAll(
-      (db as any).select().from(payments).where(inArray((payments as any).ticketId, ticketIds))
-    );
-    for (const p of paymentsList as any[]) {
-      paymentByTicketId[p.ticketId] = p;
-    }
-  }
-
-  const ticketsWithPayment = ticketsList.map((t: any) => ({
-    ...t,
-    payment: paymentByTicketId[t.id] || null,
-  }));
-
-  return c.json({ tickets: ticketsWithPayment });
+  const result = await dbAll(query);
+  
+  return c.json({ tickets: result });
 });
 
 export default ticketsRouter;

backend/src/routes/users.ts

@@ -50,29 +50,6 @@ usersRouter.get('/', requireAuth(['admin']), async (c) => {
   return c.json({ users: result });
 });
 
-// Get user statistics (admin) — registered before /:id so "stats" is not parsed as a user id
-usersRouter.get('/stats/overview', requireAuth(['admin']), async (c) => {
-  const totalUsers = await dbGet<any>(
-    (db as any)
-      .select({ count: sql<number>`count(*)` })
-      .from(users)
-  );
-  
-  const adminCount = await dbGet<any>(
-    (db as any)
-      .select({ count: sql<number>`count(*)` })
-      .from(users)
-      .where(eq((users as any).role, 'admin'))
-  );
-  
-  return c.json({
-    stats: {
-      total: totalUsers?.count || 0,
-      admins: adminCount?.count || 0,
-    },
-  });
-});
-
 // Get user by ID (admin or self)
 usersRouter.get('/:id', requireAuth(['admin', 'organizer', 'staff', 'marketing', 'user']), async (c) => {
   const id = c.req.param('id');
@@ -309,4 +286,27 @@ usersRouter.delete('/:id', requireAuth(['admin']), async (c) => {
   }
 });
 
+// Get user statistics (admin)
+usersRouter.get('/stats/overview', requireAuth(['admin']), async (c) => {
+  const totalUsers = await dbGet<any>(
+    (db as any)
+      .select({ count: sql<number>`count(*)` })
+      .from(users)
+  );
+  
+  const adminCount = await dbGet<any>(
+    (db as any)
+      .select({ count: sql<number>`count(*)` })
+      .from(users)
+      .where(eq((users as any).role, 'admin'))
+  );
+  
+  return c.json({
+    stats: {
+      total: totalUsers?.count || 0,
+      admins: adminCount?.count || 0,
+    },
+  });
+});
+
 export default usersRouter;

deploy/docker-compose.scale.yml

@@ -1,81 +0,0 @@
-# Example docker-compose for running the Spanglish API as multiple replicas
-# behind nginx, with Redis for shared state and Postgres as the database.
-#
-# This is a starting point, not a turnkey production setup. It expects a
-# Dockerfile at backend/Dockerfile that builds the API and runs it on PORT.
-#
-# Bring it up with N API replicas:
-#   docker compose -f deploy/docker-compose.scale.yml up --build --scale api=3
-#
-# No em dashes are used in this file by design.
-
-services:
-  postgres:
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_USER: spanglish
-      POSTGRES_PASSWORD: spanglish
-      POSTGRES_DB: spanglish
-    # Raise max_connections if DB_POOL_MAX * replicas approaches the default 100.
-    command: ["postgres", "-c", "max_connections=200"]
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U spanglish"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-
-  redis:
-    image: redis:7-alpine
-    command: ["redis-server", "--appendonly", "yes"]
-    volumes:
-      - redisdata:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-
-  api:
-    build:
-      context: ../backend
-    environment:
-      NODE_ENV: production
-      PORT: "3001"
-      DB_TYPE: postgres
-      DATABASE_URL: postgresql://spanglish:spanglish@postgres:5432/spanglish
-      DB_POOL_MAX: "15"
-      REDIS_URL: redis://redis:6379
-      JWT_SECRET: change-me-to-a-strong-secret
-      FRONTEND_URL: http://localhost:8080
-      # Optional S3-compatible storage so uploads are shared across replicas.
-      # If you omit these, mount a shared volume at /app/uploads on every replica.
-      # S3_ENDPOINT: http://garage:3900
-      # S3_REGION: garage
-      # S3_BUCKET: spanglish-media
-      # S3_ACCESS_KEY_ID: ""
-      # S3_SECRET_ACCESS_KEY: ""
-      # S3_PUBLIC_URL: http://localhost:8080/media
-    expose:
-      - "3001"
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-
-  # Load balancer across the scaled api replicas. nginx resolves the "api"
-  # service name via Docker's embedded DNS, which round-robins across replicas.
-  lb:
-    image: nginx:alpine
-    ports:
-      - "8080:80"
-    volumes:
-      - ./nginx.scale.conf:/etc/nginx/conf.d/default.conf:ro
-    depends_on:
-      - api
-
-volumes:
-  pgdata:
-  redisdata:

deploy/front-end_nginx.conf

@@ -43,25 +43,6 @@ server {
     access_log /var/log/nginx/spanglish_frontend_access.log;
     error_log  /var/log/nginx/spanglish_frontend_error.log;
 
-    # LNbits payment SSE stream - must not be buffered or events won't flush in
-    # real time. Regex location takes precedence over the /api prefix below.
-    location ~ ^/api/lnbits/stream/ {
-        proxy_pass http://spanglish_backend;
-        proxy_http_version 1.1;
-
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection '';
-
-        # Disable buffering/caching for Server-Sent Events
-        proxy_buffering off;
-        proxy_cache off;
-        proxy_read_timeout 3600s;
-        proxy_connect_timeout 300s;
-    }
-
     # Proxy /api to backend
     location /api {
         proxy_pass http://spanglish_backend;

deploy/nginx.scale.conf

@@ -1,29 +0,0 @@
-# nginx load balancer for the scaled "api" service in docker-compose.scale.yml.
-# Uses Docker's embedded DNS resolver so newly scaled replicas are discovered
-# without editing a static upstream list.
-
-server {
-    listen 80;
-
-    # Docker embedded DNS. valid=10s re-resolves so scaling up/down is picked up.
-    resolver 127.0.0.11 valid=10s;
-
-    location / {
-        # Use a variable so nginx defers resolution to request time (round-robin
-        # across all replicas of the "api" service).
-        set $api_upstream http://api:3001;
-        proxy_pass $api_upstream;
-
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-
-        # Server-Sent Events: do not buffer the payment status stream.
-        proxy_buffering off;
-        proxy_cache off;
-        proxy_read_timeout 1h;
-        proxy_set_header Connection "";
-        proxy_http_version 1.1;
-    }
-}

frontend/next.config.js

@@ -1,51 +1,28 @@
 /** @type {import('next').NextConfig} */
-
-// Backend origin for API/upload proxying. Configurable per environment instead of
-// being hardcoded to localhost.
-const BACKEND_URL = process.env.BACKEND_URL || 'http://localhost:3001';
-
-// Extra image hosts can be allowed via a comma-separated env var (e.g. a CDN).
-const extraImageHosts = (process.env.NEXT_PUBLIC_IMAGE_HOSTS || '')
-  .split(',')
-  .map((h) => h.trim())
-  .filter(Boolean)
-  .map((hostname) => ({ protocol: 'https', hostname }));
-
-const securityHeaders = [
-  { key: 'X-Content-Type-Options', value: 'nosniff' },
-  { key: 'X-Frame-Options', value: 'SAMEORIGIN' },
-  { key: 'Referrer-Policy', value: 'strict-origin-when-cross-origin' },
-  { key: 'X-XSS-Protection', value: '0' },
-  { key: 'Permissions-Policy', value: 'camera=(self), microphone=(), geolocation=()' },
-];
-
 const nextConfig = {
   images: {
-    // Restrict remote image sources to a known allowlist instead of allowing any
-    // https host (which let the Next image optimizer be used as an open proxy).
+    domains: ['localhost', 'images.unsplash.com'],
     remotePatterns: [
-      { protocol: 'https', hostname: 'images.unsplash.com' },
-      { protocol: 'http', hostname: 'localhost', port: '3001' },
-      ...extraImageHosts,
-    ],
-  },
-  async headers() {
-    return [
       {
-        source: '/:path*',
-        headers: securityHeaders,
+        protocol: 'https',
+        hostname: '**',
       },
-    ];
+      {
+        protocol: 'http',
+        hostname: 'localhost',
+        port: '3001',
+      },
+    ],
   },
   async rewrites() {
     return [
       {
         source: '/api/:path*',
-        destination: `${BACKEND_URL}/api/:path*`,
+        destination: 'http://localhost:3001/api/:path*',
       },
       {
         source: '/uploads/:path*',
-        destination: `${BACKEND_URL}/uploads/:path*`,
+        destination: 'http://localhost:3001/uploads/:path*',
       },
     ];
   },

frontend/package.json

@@ -22,7 +22,8 @@
     "react-dom": "^18.3.1",
     "react-hot-toast": "^2.4.1",
     "react-markdown": "^10.1.0",
-    "remark-gfm": "^4.0.1"
+    "remark-gfm": "^4.0.1",
+    "swr": "^2.2.5"
   },
   "devDependencies": {
     "@types/node": "^20.14.9",

frontend/src/app/(public)/book/[eventId]/_hooks/useLightningWatcher.ts

@@ -1,83 +0,0 @@
-import { useEffect } from 'react';
-import toast from 'react-hot-toast';
-import { ticketsApi } from '@/lib/api';
-import type { BookingStep } from '../_types';
-
-/**
- * Watch for Lightning payment confirmation while on the paying step.
- * SSE gives instant updates; a 3s poll runs in parallel as a safety net so a
- * buffered/stuck stream (e.g. a proxy that doesn't flush SSE) can't strand the UI.
- */
-export function useLightningWatcher(
-  step: BookingStep,
-  ticketId: string | undefined,
-  locale: string,
-  setPaymentPending: (value: boolean) => void,
-  setStep: (value: BookingStep) => void
-) {
-  useEffect(() => {
-    if (step !== 'paying' || !ticketId) return;
-
-    let settled = false;
-    let pollTimer: ReturnType<typeof setTimeout> | null = null;
-
-    const confirmPaid = () => {
-      if (settled) return;
-      settled = true;
-      toast.success(locale === 'es' ? '¡Pago confirmado!' : 'Payment confirmed!');
-      setPaymentPending(false);
-      setStep('success');
-    };
-
-    const expire = () => {
-      if (settled) return;
-      settled = true;
-      toast.error(locale === 'es' ? 'La factura ha expirado' : 'Invoice has expired');
-      setPaymentPending(false);
-    };
-
-    // Always same-origin so the streaming proxy route handler is used (it
-    // bypasses the rewrite, which buffers SSE).
-    const eventSource = new EventSource(`/api/lnbits/stream/${ticketId}`);
-
-    eventSource.addEventListener('payment', (event) => {
-      try {
-        const data = JSON.parse((event as MessageEvent).data);
-        if (data.type === 'paid' || data.type === 'already_paid') {
-          confirmPaid();
-        } else if (data.type === 'expired') {
-          expire();
-        }
-      } catch (e) {
-        console.error('Error parsing payment event:', e);
-      }
-    });
-
-    eventSource.onerror = () => {
-      // SSE failed or was closed; the poll below remains the source of truth.
-      eventSource.close();
-    };
-
-    const poll = async () => {
-      try {
-        const status = await ticketsApi.checkPaymentStatus(ticketId);
-        if (status.isPaid) {
-          confirmPaid();
-          return;
-        }
-      } catch (error) {
-        console.error('Error checking payment status:', error);
-      }
-      if (!settled) {
-        pollTimer = setTimeout(poll, 3000);
-      }
-    };
-    pollTimer = setTimeout(poll, 3000);
-
-    return () => {
-      settled = true;
-      eventSource.close();
-      if (pollTimer) clearTimeout(pollTimer);
-    };
-  }, [step, ticketId, locale]);
-}

frontend/src/app/(public)/book/[eventId]/_logic/booking.ts

@@ -1,131 +0,0 @@
-import toast from 'react-hot-toast';
-import { PaymentOptionsConfig } from '@/lib/api';
-import {
-  CreditCardIcon,
-  BanknotesIcon,
-  BoltIcon,
-  BuildingLibraryIcon,
-} from '@heroicons/react/24/outline';
-import type { PaymentMethod, BookingResult } from '../_types';
-
-export const rucPattern = /^\d{6,10}$/;
-
-/** Format RUC input: digits only, max 10. */
-export function formatRuc(value: string): string {
-  return value.replace(/\D/g, '').slice(0, 10);
-}
-
-/** Truncate a long invoice string for display. */
-export function truncateInvoice(invoice: string, chars: number = 20): string {
-  if (invoice.length <= chars * 2) return invoice;
-  return `${invoice.slice(0, chars)}...${invoice.slice(-chars)}`;
-}
-
-/** Copy a Lightning invoice to the clipboard with localized feedback. */
-export function copyInvoiceToClipboard(invoice: string, locale: string): void {
-  navigator.clipboard.writeText(invoice).then(() => {
-    toast.success(locale === 'es' ? '¡Copiado!' : 'Copied!');
-  }).catch(() => {
-    toast.error(locale === 'es' ? 'Error al copiar' : 'Failed to copy');
-  });
-}
-
-export interface PaymentMethodOption {
-  id: PaymentMethod;
-  icon: typeof CreditCardIcon;
-  label: string;
-  description: string;
-  badge?: string;
-}
-
-/** Build the list of selectable payment methods from the event config. */
-export function buildPaymentMethods(
-  paymentConfig: PaymentOptionsConfig | null,
-  locale: string
-): PaymentMethodOption[] {
-  const paymentMethods: PaymentMethodOption[] = [];
-
-  if (paymentConfig?.lightningEnabled) {
-    paymentMethods.push({
-      id: 'lightning',
-      icon: BoltIcon,
-      label: 'Bitcoin Lightning',
-      description: locale === 'es' ? 'Pago instantáneo con Bitcoin' : 'Instant payment with Bitcoin',
-      badge: locale === 'es' ? 'Instantáneo' : 'Instant',
-    });
-  }
-
-  if (paymentConfig?.tpagoEnabled) {
-    paymentMethods.push({
-      id: 'tpago',
-      icon: CreditCardIcon,
-      label: locale === 'es' ? 'TPago / Tarjetas de Crédito' : 'TPago / Credit Cards',
-      description: locale === 'es' ? 'Pagá con tarjetas de crédito locales o internacionales' : 'Pay with local or international credit cards',
-      badge: locale === 'es' ? 'Manual' : 'Manual',
-    });
-  }
-
-  if (paymentConfig?.bankTransferEnabled) {
-    paymentMethods.push({
-      id: 'bank_transfer',
-      icon: BuildingLibraryIcon,
-      label: locale === 'es' ? 'Transferencia Bancaria Local' : 'Local Bank Transfer',
-      description: locale === 'es' ? 'Pago por transferencia bancaria en Paraguay' : 'Pay via Paraguayan bank transfer',
-      badge: locale === 'es' ? 'Manual' : 'Manual',
-    });
-  }
-
-  if (paymentConfig?.cashEnabled) {
-    paymentMethods.push({
-      id: 'cash',
-      icon: BanknotesIcon,
-      label: locale === 'es' ? 'Efectivo en el Evento' : 'Cash at Event',
-      description: locale === 'es' ? 'Paga cuando llegues al evento' : 'Pay when you arrive at the event',
-      badge: locale === 'es' ? 'Manual' : 'Manual',
-    });
-  }
-
-  return paymentMethods;
-}
-
-export interface SuccessContent {
-  title: string;
-  description: string;
-  iconColor: string;
-  iconTextColor: string;
-}
-
-/** Resolve the success-screen copy based on the payment method used. */
-export function getSuccessContent(
-  bookingResult: BookingResult | null,
-  locale: string,
-  t: (key: string) => string
-): SuccessContent {
-  if (bookingResult?.paymentMethod === 'cash') {
-    return {
-      title: locale === 'es' ? '¡Reserva Recibida!' : 'Reservation Received!',
-      description: locale === 'es'
-        ? 'Tu lugar está reservado. El pago se realizará en el evento.'
-        : 'Your spot is reserved. Payment will be collected at the event.',
-      iconColor: 'bg-yellow-100',
-      iconTextColor: 'text-yellow-600',
-    };
-  }
-  if (bookingResult?.paymentMethod === 'lightning') {
-    // For Lightning, if we're on success step, payment was confirmed
-    return {
-      title: locale === 'es' ? '¡Pago Confirmado!' : 'Payment Confirmed!',
-      description: locale === 'es'
-        ? '¡Tu reserva está confirmada! Te esperamos en el evento.'
-        : 'Your booking is confirmed! See you at the event.',
-      iconColor: 'bg-green-100',
-      iconTextColor: 'text-green-600',
-    };
-  }
-  return {
-    title: t('booking.success.title'),
-    description: t('booking.success.description'),
-    iconColor: 'bg-green-100',
-    iconTextColor: 'text-green-600',
-  };
-}

frontend/src/app/(public)/book/[eventId]/_steps/BookingFormStep.tsx

@@ -1,447 +0,0 @@
-import Link from 'next/link';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import Input from '@/components/ui/Input';
-import {
-  CalendarIcon,
-  MapPinIcon,
-  UserGroupIcon,
-  CurrencyDollarIcon,
-  ArrowLeftIcon,
-  CheckCircleIcon,
-  UserIcon,
-} from '@heroicons/react/24/outline';
-import { Event } from '@/lib/api';
-import { formatPrice } from '@/lib/utils';
-import type { AttendeeInfo, BookingFormData } from '../_types';
-import type { PaymentMethodOption } from '../_logic/booking';
-
-interface BookingFormStepProps {
-  event: Event;
-  locale: string;
-  t: (key: string) => string;
-  spotsLeft: number;
-  isSoldOut: boolean;
-  ticketQuantity: number;
-  formData: BookingFormData;
-  setFormData: React.Dispatch<React.SetStateAction<BookingFormData>>;
-  errors: Partial<Record<keyof BookingFormData, string>>;
-  attendees: AttendeeInfo[];
-  setAttendees: React.Dispatch<React.SetStateAction<AttendeeInfo[]>>;
-  attendeeErrors: { [key: number]: string };
-  setAttendeeErrors: React.Dispatch<React.SetStateAction<{ [key: number]: string }>>;
-  handleRucChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  handleRucBlur: () => void;
-  paymentMethods: PaymentMethodOption[];
-  agreedToTerms: boolean;
-  setAgreedToTerms: (value: boolean) => void;
-  termsError: string | null;
-  submitting: boolean;
-  onSubmit: (e: React.FormEvent) => void;
-  formatDate: (dateStr: string) => string;
-  fmtTime: (dateStr: string) => string;
-}
-
-export function BookingFormStep({
-  event,
-  locale,
-  t,
-  spotsLeft,
-  isSoldOut,
-  ticketQuantity,
-  formData,
-  setFormData,
-  errors,
-  attendees,
-  setAttendees,
-  attendeeErrors,
-  setAttendeeErrors,
-  handleRucChange,
-  handleRucBlur,
-  paymentMethods,
-  agreedToTerms,
-  setAgreedToTerms,
-  termsError,
-  submitting,
-  onSubmit,
-  formatDate,
-  fmtTime,
-}: BookingFormStepProps) {
-  return (
-    <div className="section-padding bg-secondary-gray min-h-screen">
-      <div className="container-page max-w-2xl">
-        <Link
-          href={`/events/${event.slug}`}
-          className="inline-flex items-center gap-2 text-gray-600 hover:text-primary-dark mb-6"
-        >
-          <ArrowLeftIcon className="w-4 h-4" />
-          {t('common.back')}
-        </Link>
-
-        {/* Event Summary - Always Visible */}
-        <Card className="mb-6 overflow-hidden">
-          <div className="bg-primary-yellow/20 p-4 border-b border-primary-yellow/30">
-            <h2 className="font-bold text-lg text-primary-dark">
-              {locale === 'es' && event.titleEs ? event.titleEs : event.title}
-            </h2>
-          </div>
-          <div className="p-4 space-y-2 text-sm">
-            <div className="flex items-center gap-3">
-              <CalendarIcon className="w-5 h-5 text-primary-yellow" />
-              <span>{formatDate(event.startDatetime)} • {fmtTime(event.startDatetime)}</span>
-            </div>
-            <div className="flex items-center gap-3">
-              <MapPinIcon className="w-5 h-5 text-primary-yellow" />
-              <span>{event.location}</span>
-            </div>
-            {!event.externalBookingEnabled && (
-              <div className="flex items-center gap-3">
-                <UserGroupIcon className="w-5 h-5 text-primary-yellow" />
-                <span>{spotsLeft} / {event.capacity} {t('events.details.spotsLeft')}</span>
-              </div>
-            )}
-            <div className="flex items-center gap-3">
-              <CurrencyDollarIcon className="w-5 h-5 text-primary-yellow" />
-              <span className="font-bold text-lg">
-                {event.price === 0
-                  ? t('events.details.free')
-                  : formatPrice(event.price, event.currency)}
-              </span>
-              {event.price > 0 && (
-                <span className="text-gray-400 text-sm">
-                  {locale === 'es' ? 'por persona' : 'per person'}
-                </span>
-              )}
-            </div>
-            {/* Ticket quantity and total */}
-            {ticketQuantity > 1 && (
-              <div className="mt-3 pt-3 border-t border-secondary-light-gray">
-                <div className="flex items-center justify-between">
-                  <span className="text-gray-600">
-                    {locale === 'es' ? 'Tickets' : 'Tickets'}: <span className="font-semibold">{ticketQuantity}</span>
-                  </span>
-                  <span className="font-bold text-lg text-primary-dark">
-                    {locale === 'es' ? 'Total' : 'Total'}: {formatPrice(event.price * ticketQuantity, event.currency)}
-                  </span>
-                </div>
-              </div>
-            )}
-          </div>
-        </Card>
-
-        {isSoldOut ? (
-          <Card className="p-8 text-center">
-            <UserGroupIcon className="w-16 h-16 text-gray-300 mx-auto mb-4" />
-            <h2 className="text-xl font-bold text-gray-700">{t('events.details.soldOut')}</h2>
-            <p className="text-gray-500 mt-2">{t('booking.form.soldOutMessage')}</p>
-          </Card>
-        ) : (
-          <form onSubmit={onSubmit}>
-            {/* User Information Section */}
-            <Card className="mb-6 p-6">
-              <h3 className="font-bold text-lg mb-4 text-primary-dark flex items-center gap-2">
-                {attendees.length > 0 && (
-                  <span className="w-6 h-6 rounded-full bg-primary-yellow text-primary-dark text-sm font-bold flex items-center justify-center">
-                    1
-                  </span>
-                )}
-                {t('booking.form.personalInfo')}
-                {attendees.length > 0 && (
-                  <span className="text-sm font-normal text-gray-500">
-                    ({locale === 'es' ? 'Asistente principal' : 'Primary attendee'})
-                  </span>
-                )}
-              </h3>
-
-              <div className="space-y-4">
-                <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-                  <Input
-                    label={t('booking.form.firstName')}
-                    value={formData.firstName}
-                    onChange={(e) => setFormData({ ...formData, firstName: e.target.value })}
-                    placeholder={t('booking.form.firstNamePlaceholder')}
-                    error={errors.firstName}
-                    required
-                  />
-                  <div>
-                    <div className="flex items-center gap-2 mb-1">
-                      <label className="block text-sm font-medium text-gray-700">
-                        {t('booking.form.lastName')}
-                      </label>
-                      <span className="text-xs text-gray-400">
-                        ({locale === 'es' ? 'Opcional' : 'Optional'})
-                      </span>
-                    </div>
-                    <Input
-                      value={formData.lastName}
-                      onChange={(e) => setFormData({ ...formData, lastName: e.target.value })}
-                      placeholder={t('booking.form.lastNamePlaceholder')}
-                      error={errors.lastName}
-                    />
-                  </div>
-                </div>
-
-                <div>
-                  <Input
-                    label={t('booking.form.email')}
-                    type="email"
-                    value={formData.email}
-                    onChange={(e) => setFormData({ ...formData, email: e.target.value })}
-                    placeholder={t('booking.form.emailPlaceholder')}
-                    error={errors.email}
-                    required
-                  />
-                </div>
-
-                <div>
-                  <div className="flex items-center gap-2 mb-1">
-                    <label className="block text-sm font-medium text-gray-700">
-                      {t('booking.form.phone')}
-                    </label>
-                    <span className="text-xs text-gray-400">
-                      ({locale === 'es' ? 'Opcional' : 'Optional'})
-                    </span>
-                  </div>
-                  <Input
-                    type="tel"
-                    value={formData.phone}
-                    onChange={(e) => setFormData({ ...formData, phone: e.target.value })}
-                    placeholder={t('booking.form.phonePlaceholder')}
-                    error={errors.phone}
-                  />
-                </div>
-
-                <div>
-                  <div className="flex items-center gap-2 mb-1">
-                    <label className="block text-sm font-medium text-gray-700">
-                      {t('booking.form.ruc')}
-                    </label>
-                    <span className="text-xs text-gray-400">
-                      {t('booking.form.rucOptional')}
-                    </span>
-                  </div>
-                  <Input
-                    value={formData.ruc}
-                    onChange={handleRucChange}
-                    onBlur={handleRucBlur}
-                    placeholder={t('booking.form.rucPlaceholder')}
-                    error={errors.ruc}
-                    inputMode="numeric"
-                    maxLength={10}
-                    aria-label={t('booking.form.ruc')}
-                  />
-                </div>
-
-                <div>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {t('booking.form.preferredLanguage')}
-                  </label>
-                  <select
-                    value={formData.preferredLanguage}
-                    onChange={(e) => setFormData({ ...formData, preferredLanguage: e.target.value as 'en' | 'es' })}
-                    className="w-full px-4 py-3 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  >
-                    <option value="en">English</option>
-                    <option value="es">Español</option>
-                  </select>
-                </div>
-              </div>
-            </Card>
-
-            {/* Additional Attendees Section (for multi-ticket bookings) */}
-            {attendees.length > 0 && (
-              <Card className="mb-6 p-6">
-                <h3 className="font-bold text-lg mb-4 text-primary-dark flex items-center gap-2">
-                  <UserIcon className="w-5 h-5 text-primary-yellow" />
-                  {locale === 'es' ? 'Información de los Otros Asistentes' : 'Other Attendees Information'}
-                </h3>
-                <p className="text-sm text-gray-600 mb-4">
-                  {locale === 'es'
-                    ? 'Ingresa el nombre de cada asistente adicional. Cada persona recibirá su propio ticket.'
-                    : 'Enter the name for each additional attendee. Each person will receive their own ticket.'}
-                </p>
-
-                <div className="space-y-4">
-                  {attendees.map((attendee, index) => (
-                    <div key={index} className="p-4 bg-gray-50 rounded-lg">
-                      <div className="flex items-center gap-2 mb-3">
-                        <span className="w-6 h-6 rounded-full bg-primary-yellow text-primary-dark text-sm font-bold flex items-center justify-center">
-                          {index + 2}
-                        </span>
-                        <span className="font-medium text-gray-700">
-                          {locale === 'es' ? `Asistente ${index + 2}` : `Attendee ${index + 2}`}
-                        </span>
-                      </div>
-                      <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-                        <Input
-                          label={t('booking.form.firstName')}
-                          value={attendee.firstName}
-                          onChange={(e) => {
-                            const newAttendees = [...attendees];
-                            newAttendees[index].firstName = e.target.value;
-                            setAttendees(newAttendees);
-                            if (attendeeErrors[index]) {
-                              const newErrors = { ...attendeeErrors };
-                              delete newErrors[index];
-                              setAttendeeErrors(newErrors);
-                            }
-                          }}
-                          placeholder={t('booking.form.firstNamePlaceholder')}
-                          error={attendeeErrors[index]}
-                          required
-                        />
-                        <div>
-                          <div className="flex items-center gap-2 mb-1">
-                            <label className="block text-sm font-medium text-gray-700">
-                              {t('booking.form.lastName')}
-                            </label>
-                            <span className="text-xs text-gray-400">
-                              ({locale === 'es' ? 'Opcional' : 'Optional'})
-                            </span>
-                          </div>
-                          <Input
-                            value={attendee.lastName}
-                            onChange={(e) => {
-                              const newAttendees = [...attendees];
-                              newAttendees[index].lastName = e.target.value;
-                              setAttendees(newAttendees);
-                            }}
-                            placeholder={t('booking.form.lastNamePlaceholder')}
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  ))}
-                </div>
-              </Card>
-            )}
-
-            {/* Payment Selection Section */}
-            <Card className="mb-6 p-6">
-              <h3 className="font-bold text-lg mb-4 text-primary-dark">
-                {t('booking.form.paymentMethod')}
-              </h3>
-
-              <div className="space-y-3">
-                {paymentMethods.length === 0 ? (
-                  <div className="text-center py-8 text-gray-500">
-                    {locale === 'es'
-                      ? 'No hay métodos de pago disponibles para este evento.'
-                      : 'No payment methods available for this event.'}
-                  </div>
-                ) : (
-                  <>
-                    {paymentMethods.map((method) => (
-                      <button
-                        key={method.id}
-                        type="button"
-                        onClick={() => setFormData({ ...formData, paymentMethod: method.id })}
-                        className={`w-full p-4 rounded-lg border-2 transition-all text-left flex items-start gap-4 ${
-                          formData.paymentMethod === method.id
-                            ? 'border-primary-yellow bg-primary-yellow/10'
-                            : 'border-secondary-light-gray hover:border-gray-300'
-                        }`}
-                      >
-                        <div className={`w-10 h-10 rounded-full flex items-center justify-center flex-shrink-0 ${
-                          formData.paymentMethod === method.id
-                            ? 'bg-primary-yellow'
-                            : 'bg-gray-100'
-                        }`}>
-                          <method.icon className={`w-5 h-5 ${
-                            formData.paymentMethod === method.id
-                              ? 'text-primary-dark'
-                              : 'text-gray-500'
-                          }`} />
-                        </div>
-                        <div className="flex-1">
-                          <div className="flex items-center gap-2">
-                            <p className="font-medium text-primary-dark">{method.label}</p>
-                            {method.badge && (
-                              <span className={`text-xs px-2 py-0.5 rounded-full ${
-                                method.badge === 'Instant' || method.badge === 'Instantáneo'
-                                  ? 'bg-green-100 text-green-700'
-                                  : 'bg-gray-100 text-gray-600'
-                              }`}>
-                                {method.badge}
-                              </span>
-                            )}
-                          </div>
-                          <p className="text-sm text-gray-500">{method.description}</p>
-                        </div>
-                        {formData.paymentMethod === method.id && (
-                          <CheckCircleIcon className="w-6 h-6 text-primary-yellow ml-auto flex-shrink-0" />
-                        )}
-                      </button>
-                    ))}
-
-                  </>
-                )}
-              </div>
-            </Card>
-
-            {/* Terms & Privacy agreement */}
-            <Card className="mb-6 p-6">
-              <div className="flex items-start gap-3">
-                <input
-                  id="booking-terms-agree"
-                  type="checkbox"
-                  checked={agreedToTerms}
-                  onChange={(e) => setAgreedToTerms(e.target.checked)}
-                  aria-required="true"
-                  aria-invalid={termsError ? true : undefined}
-                  aria-describedby={termsError ? 'booking-terms-error' : undefined}
-                  className="h-5 w-5 mt-0.5 flex-shrink-0 accent-primary-yellow rounded focus:outline-none focus:ring-2 focus:ring-primary-yellow focus:ring-offset-2 cursor-pointer"
-                />
-                <label
-                  htmlFor="booking-terms-agree"
-                  className="text-sm text-gray-500 leading-relaxed cursor-pointer select-none"
-                >
-                  {t('booking.form.termsAgreePart1')}
-                  <Link
-                    href={`/legal/terms-policy${locale === 'es' ? '?locale=es' : ''}`}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-secondary-blue hover:text-brand-navy underline"
-                  >
-                    {t('booking.form.termsOfService')}
-                  </Link>
-                  {t('booking.form.termsAgreePart2')}
-                  <Link
-                    href={`/legal/privacy-policy${locale === 'es' ? '?locale=es' : ''}`}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-secondary-blue hover:text-brand-navy underline"
-                  >
-                    {t('booking.form.privacyPolicy')}
-                  </Link>
-                  {t('booking.form.termsAgreePart3')}
-                </label>
-              </div>
-              {termsError && (
-                <p id="booking-terms-error" className="mt-1.5 text-sm text-red-600">
-                  {termsError}
-                </p>
-              )}
-            </Card>
-
-            {/* Submit Button */}
-            <Button
-              type="submit"
-              size="lg"
-              className="w-full"
-              isLoading={submitting}
-              disabled={paymentMethods.length === 0 || !agreedToTerms}
-            >
-              {formData.paymentMethod === 'cash'
-                ? t('booking.form.reserveSpot')
-                : formData.paymentMethod === 'lightning'
-                  ? t('booking.form.proceedPayment')
-                  : locale === 'es' ? 'Continuar al Pago' : 'Continue to Payment'
-              }
-            </Button>
-          </form>
-        )}
-      </div>
-    </div>
-  );
-}

frontend/src/app/(public)/book/[eventId]/_steps/ManualPaymentStep.tsx

@@ -1,249 +0,0 @@
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import Input from '@/components/ui/Input';
-import {
-  CreditCardIcon,
-  BuildingLibraryIcon,
-  CheckCircleIcon,
-  ArrowTopRightOnSquareIcon,
-} from '@heroicons/react/24/outline';
-import { Event, PaymentOptionsConfig } from '@/lib/api';
-import { formatPrice, getTpagoLink } from '@/lib/utils';
-import type { BookingResult } from '../_types';
-
-interface ManualPaymentStepProps {
-  bookingResult: BookingResult;
-  event: Event;
-  paymentConfig: PaymentOptionsConfig;
-  locale: string;
-  paidUnderDifferentName: boolean;
-  setPaidUnderDifferentName: (value: boolean) => void;
-  payerName: string;
-  setPayerName: (value: string) => void;
-  markingPaid: boolean;
-  onMarkPaymentSent: () => void;
-}
-
-export function ManualPaymentStep({
-  bookingResult,
-  event,
-  paymentConfig,
-  locale,
-  paidUnderDifferentName,
-  setPaidUnderDifferentName,
-  payerName,
-  setPayerName,
-  markingPaid,
-  onMarkPaymentSent,
-}: ManualPaymentStepProps) {
-  const isBankTransfer = bookingResult.paymentMethod === 'bank_transfer';
-  const isTpago = bookingResult.paymentMethod === 'tpago';
-  const ticketCount = bookingResult.ticketCount || 1;
-  const totalAmount = (event?.price || 0) * ticketCount;
-  const tpagoLink = getTpagoLink(paymentConfig, ticketCount);
-
-  return (
-    <div className="section-padding">
-      <div className="container-page max-w-xl">
-        <Card className="p-6">
-          <div className="text-center mb-6">
-            <div className={`w-16 h-16 rounded-full ${isBankTransfer ? 'bg-green-100' : 'bg-blue-100'} flex items-center justify-center mx-auto mb-4`}>
-              {isBankTransfer ? (
-                <BuildingLibraryIcon className="w-8 h-8 text-green-600" />
-              ) : (
-                <CreditCardIcon className="w-8 h-8 text-blue-600" />
-              )}
-            </div>
-            <h1 className="text-xl font-bold text-primary-dark mb-2">
-              {locale === 'es' ? 'Completa tu Pago' : 'Complete Your Payment'}
-            </h1>
-            <p className="text-gray-600">
-              {locale === 'es'
-                ? 'Sigue las instrucciones para completar tu pago'
-                : 'Follow the instructions to complete your payment'}
-            </p>
-          </div>
-
-          {/* Amount to pay */}
-          <div className="bg-gray-50 rounded-lg p-4 mb-6 text-center">
-            <p className="text-sm text-gray-500 mb-1">
-              {locale === 'es' ? 'Monto a pagar' : 'Amount to pay'}
-            </p>
-            <p className="text-2xl font-bold text-primary-dark">
-              {event?.price !== undefined ? formatPrice(totalAmount, event.currency) : ''}
-            </p>
-            {ticketCount > 1 && (
-              <p className="text-sm text-gray-500 mt-1">
-                {ticketCount} tickets × {formatPrice(event?.price || 0, event?.currency || 'PYG')}
-              </p>
-            )}
-          </div>
-
-          {/* Bank Transfer Details */}
-          {isBankTransfer && (
-            <div className="space-y-4 mb-6">
-              <h3 className="font-semibold text-gray-900">
-                {locale === 'es' ? 'Datos Bancarios' : 'Bank Details'}
-              </h3>
-              <div className="bg-green-50 border border-green-200 rounded-lg p-4 space-y-3">
-                {paymentConfig.bankName && (
-                  <div className="flex justify-between">
-                    <span className="text-gray-600">{locale === 'es' ? 'Banco' : 'Bank'}:</span>
-                    <span className="font-medium">{paymentConfig.bankName}</span>
-                  </div>
-                )}
-                {paymentConfig.bankAccountHolder && (
-                  <div className="flex justify-between">
-                    <span className="text-gray-600">{locale === 'es' ? 'Titular' : 'Account Holder'}:</span>
-                    <span className="font-medium">{paymentConfig.bankAccountHolder}</span>
-                  </div>
-                )}
-                {paymentConfig.bankAccountNumber && (
-                  <div className="flex justify-between">
-                    <span className="text-gray-600">{locale === 'es' ? 'Nro. Cuenta' : 'Account Number'}:</span>
-                    <span className="font-medium font-mono">{paymentConfig.bankAccountNumber}</span>
-                  </div>
-                )}
-                {paymentConfig.bankAlias && (
-                  <div className="flex justify-between">
-                    <span className="text-gray-600">Alias:</span>
-                    <span className="font-medium">{paymentConfig.bankAlias}</span>
-                  </div>
-                )}
-                {paymentConfig.bankPhone && (
-                  <div className="flex justify-between">
-                    <span className="text-gray-600">{locale === 'es' ? 'Teléfono' : 'Phone'}:</span>
-                    <span className="font-medium">{paymentConfig.bankPhone}</span>
-                  </div>
-                )}
-              </div>
-              {(locale === 'es' ? paymentConfig.bankNotesEs : paymentConfig.bankNotes) && (
-                <p className="text-sm text-gray-600">
-                  {locale === 'es' ? paymentConfig.bankNotesEs : paymentConfig.bankNotes}
-                </p>
-              )}
-            </div>
-          )}
-
-          {/* TPago Link */}
-          {isTpago && (
-            <div className="space-y-4 mb-6">
-              <h3 className="font-semibold text-gray-900">
-                {locale === 'es' ? 'Pago con Tarjeta' : 'Card Payment'}
-              </h3>
-              {tpagoLink && (
-                <a
-                  href={tpagoLink}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="flex items-center justify-center gap-2 w-full px-6 py-4 bg-blue-600 text-white rounded-btn hover:bg-blue-700 transition-colors font-medium"
-                >
-                  <ArrowTopRightOnSquareIcon className="w-5 h-5" />
-                  {locale === 'es' ? 'Abrir TPago para Pagar' : 'Open TPago to Pay'}
-                </a>
-              )}
-              {(locale === 'es' ? paymentConfig.tpagoInstructionsEs : paymentConfig.tpagoInstructions) && (
-                <p className="text-sm text-gray-600">
-                  {locale === 'es' ? paymentConfig.tpagoInstructionsEs : paymentConfig.tpagoInstructions}
-                </p>
-              )}
-            </div>
-          )}
-
-          {/* Reference */}
-          <div className="bg-gray-100 rounded-lg p-3 mb-6">
-            <p className="text-xs text-gray-500 mb-1">
-              {locale === 'es' ? 'Referencia de tu reserva' : 'Your booking reference'}
-            </p>
-            <p className="font-mono font-bold text-lg">{bookingResult.qrCode}</p>
-          </div>
-
-          {/* Manual verification notice */}
-          <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 mb-4">
-            <div className="flex gap-3">
-              <div className="flex-shrink-0">
-                <svg className="w-5 h-5 text-blue-600 mt-0.5" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor">
-                  <path strokeLinecap="round" strokeLinejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" />
-                </svg>
-              </div>
-              <div className="text-sm text-blue-800">
-                <p className="font-medium mb-1">
-                  {locale === 'es' ? 'Verificación manual' : 'Manual verification'}
-                </p>
-                <p className="text-blue-700">
-                  {locale === 'es'
-                    ? 'El equipo de Spanglish revisará el pago manualmente. Tu reserva solo será confirmada después de recibir un email de confirmación de nuestra parte.'
-                    : 'The Spanglish team will review the payment manually. Your booking is only confirmed after you receive a confirmation email from us.'}
-                </p>
-              </div>
-            </div>
-          </div>
-
-          {/* Paid under different name option */}
-          <div className="bg-gray-50 rounded-lg p-4 mb-4">
-            <label className="flex items-start gap-3 cursor-pointer">
-              <input
-                type="checkbox"
-                checked={paidUnderDifferentName}
-                onChange={(e) => {
-                  setPaidUnderDifferentName(e.target.checked);
-                  if (!e.target.checked) setPayerName('');
-                }}
-                className="mt-1 w-4 h-4 text-primary-yellow border-gray-300 rounded focus:ring-primary-yellow"
-              />
-              <div>
-                <span className="font-medium text-gray-700">
-                  {locale === 'es'
-                    ? 'El pago está a nombre de otra persona'
-                    : 'The payment is under another person\'s name'}
-                </span>
-                <p className="text-xs text-gray-500 mt-1">
-                  {locale === 'es'
-                    ? 'Marcá esta opción si el pago fue realizado por un familiar o tercero.'
-                    : 'Check this option if the payment was made by a family member or a third party.'}
-                </p>
-              </div>
-            </label>
-
-            {paidUnderDifferentName && (
-              <div className="mt-3 pl-7">
-                <Input
-                  label={locale === 'es' ? 'Nombre del pagador' : 'Payer name'}
-                  value={payerName}
-                  onChange={(e) => setPayerName(e.target.value)}
-                  placeholder={locale === 'es' ? 'Nombre completo del titular de la cuenta' : 'Full name of account holder'}
-                  required
-                />
-              </div>
-            )}
-          </div>
-
-          {/* Warning before I Have Paid button */}
-          <p className="text-sm text-center text-amber-700 font-medium mb-3">
-            {locale === 'es'
-              ? 'Solo haz clic aquí después de haber completado el pago.'
-              : 'Only click this after you have actually completed the payment.'}
-          </p>
-
-          {/* I Have Paid Button */}
-          <Button
-            onClick={onMarkPaymentSent}
-            isLoading={markingPaid}
-            size="lg"
-            className="w-full"
-            disabled={paidUnderDifferentName && !payerName.trim()}
-          >
-            <CheckCircleIcon className="w-5 h-5 mr-2" />
-            {locale === 'es' ? 'Ya Realicé el Pago' : 'I Have Paid'}
-          </Button>
-
-          <p className="text-xs text-center text-gray-500 mt-4">
-            {locale === 'es'
-              ? 'Tu reserva será confirmada una vez que verifiquemos el pago'
-              : 'Your booking will be confirmed once we verify the payment'}
-          </p>
-        </Card>
-      </div>
-    </div>
-  );
-}

frontend/src/app/(public)/book/[eventId]/_steps/PayingStep.tsx

@@ -1,81 +0,0 @@
-import { QRCodeSVG } from 'qrcode.react';
-import Card from '@/components/ui/Card';
-import { BoltIcon, ClipboardDocumentIcon } from '@heroicons/react/24/outline';
-import { copyInvoiceToClipboard, truncateInvoice } from '../_logic/booking';
-import type { LightningInvoice } from '../_types';
-
-interface PayingStepProps {
-  invoice: LightningInvoice;
-  qrCode: string;
-  locale: string;
-}
-
-export function PayingStep({ invoice, qrCode, locale }: PayingStepProps) {
-  return (
-    <div className="section-padding">
-      <div className="container-page max-w-md">
-        <Card className="p-6 text-center">
-          {/* Amount - prominent at top */}
-          <div className="mb-4">
-            {invoice.fiatAmount && invoice.fiatCurrency && (
-              <p className="text-2xl font-bold text-primary-dark">
-                {invoice.fiatAmount.toLocaleString()} {invoice.fiatCurrency}
-              </p>
-            )}
-            <p className="text-orange-600 font-medium">
-              ≈ {invoice.amount.toLocaleString()} sats
-            </p>
-          </div>
-
-          {/* QR Code - clickable to copy */}
-          <div
-            className="bg-white p-4 rounded-lg shadow-inner inline-block mb-4 cursor-pointer hover:shadow-md transition-shadow"
-            onClick={() => copyInvoiceToClipboard(invoice.paymentRequest, locale)}
-            title={locale === 'es' ? 'Clic para copiar' : 'Click to copy'}
-          >
-            <QRCodeSVG
-              value={invoice.paymentRequest.toUpperCase()}
-              size={200}
-              level="M"
-              includeMargin={false}
-            />
-          </div>
-
-          {/* Invoice string - truncated, clickable */}
-          <div
-            className="bg-secondary-gray rounded-lg p-3 mb-4 cursor-pointer hover:bg-gray-200 transition-colors"
-            onClick={() => copyInvoiceToClipboard(invoice.paymentRequest, locale)}
-          >
-            <p className="font-mono text-xs text-gray-600 flex items-center justify-center gap-2">
-              <ClipboardDocumentIcon className="w-4 h-4 flex-shrink-0" />
-              <span className="truncate">{truncateInvoice(invoice.paymentRequest, 16)}</span>
-            </p>
-            <p className="text-xs text-gray-400 mt-1">
-              {locale === 'es' ? 'Toca para copiar' : 'Tap to copy'}
-            </p>
-          </div>
-
-          {/* Open in Wallet - primary action */}
-          <a
-            href={`lightning:${invoice.paymentRequest}`}
-            className="inline-flex items-center justify-center gap-2 w-full px-6 py-3 bg-orange-500 text-white rounded-btn hover:bg-orange-600 transition-colors font-medium mb-4"
-          >
-            <BoltIcon className="w-5 h-5" />
-            {locale === 'es' ? 'Abrir en Billetera' : 'Open in Wallet'}
-          </a>
-
-          {/* Status indicator */}
-          <div className="flex items-center justify-center gap-2 text-gray-500 text-sm">
-            <div className="animate-spin w-3 h-3 border-2 border-orange-400 border-t-transparent rounded-full" />
-            <span>{locale === 'es' ? 'Esperando pago...' : 'Waiting for payment...'}</span>
-          </div>
-
-          {/* Ticket reference - small */}
-          <p className="text-xs text-gray-400 mt-3">
-            {locale === 'es' ? 'Ref' : 'Ref'}: {qrCode}
-          </p>
-        </Card>
-      </div>
-    </div>
-  );
-}

frontend/src/app/(public)/book/[eventId]/_steps/PendingApprovalStep.tsx

@@ -1,76 +0,0 @@
-import Link from 'next/link';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import { ClockIcon, TicketIcon } from '@heroicons/react/24/outline';
-import { Event } from '@/lib/api';
-import type { BookingResult } from '../_types';
-
-interface PendingApprovalStepProps {
-  bookingResult: BookingResult;
-  event: Event | null;
-  locale: string;
-  t: (key: string) => string;
-  formatDate: (dateStr: string) => string;
-  fmtTime: (dateStr: string) => string;
-}
-
-export function PendingApprovalStep({
-  bookingResult,
-  event,
-  locale,
-  t,
-  formatDate,
-  fmtTime,
-}: PendingApprovalStepProps) {
-  return (
-    <div className="section-padding">
-      <div className="container-page max-w-xl">
-        <Card className="p-8 text-center">
-          <div className="w-16 h-16 rounded-full bg-yellow-100 flex items-center justify-center mx-auto mb-6">
-            <ClockIcon className="w-10 h-10 text-yellow-600" />
-          </div>
-
-          <h1 className="text-2xl font-bold text-primary-dark mb-2">
-            {locale === 'es' ? '¡Pago en Verificación!' : 'Payment Being Verified!'}
-          </h1>
-          <p className="text-gray-600 mb-6">
-            {locale === 'es'
-              ? 'Estamos verificando tu pago. Recibirás un email de confirmación una vez aprobado.'
-              : 'We are verifying your payment. You will receive a confirmation email once approved.'}
-          </p>
-
-          <div className="bg-secondary-gray rounded-lg p-6 mb-6">
-            <div className="flex items-center justify-center gap-2 mb-4">
-              <TicketIcon className="w-6 h-6 text-primary-yellow" />
-              <span className="font-mono text-lg font-bold">{bookingResult.qrCode}</span>
-            </div>
-
-            <div className="text-sm text-gray-600 space-y-2">
-              <p><strong>{t('booking.success.event')}:</strong> {event?.title}</p>
-              <p><strong>{t('booking.success.date')}:</strong> {event && formatDate(event.startDatetime)}</p>
-              <p><strong>{t('booking.success.time')}:</strong> {event && fmtTime(event.startDatetime)}</p>
-              <p><strong>{t('booking.success.location')}:</strong> {event?.location}</p>
-            </div>
-          </div>
-
-          <div className="bg-yellow-50 border border-yellow-200 rounded-lg p-4 mb-6">
-            <p className="text-yellow-800 text-sm">
-              {locale === 'es'
-                ? 'La verificación del pago puede tomar hasta 24 horas hábiles. Por favor revisa tu email regularmente.'
-                : 'Payment verification may take up to 24 business hours. Please check your email regularly.'}
-            </p>
-          </div>
-
-          <div className="flex flex-col sm:flex-row gap-3 justify-center">
-            <Link href="/events">
-              <Button variant="outline">{t('booking.success.browseEvents')}</Button>
-            </Link>
-            <Link href="/">
-              <Button>{t('booking.success.backHome')}</Button>
-            </Link>
-          </div>
-        </Card>
-      </div>
-    </div>
-  );
-}

frontend/src/app/(public)/book/[eventId]/_steps/SuccessStep.tsx

@@ -1,144 +0,0 @@
-import Link from 'next/link';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import {
-  CheckCircleIcon,
-  TicketIcon,
-  ArrowDownTrayIcon,
-} from '@heroicons/react/24/outline';
-import { Event } from '@/lib/api';
-import { getSuccessContent } from '../_logic/booking';
-import type { BookingResult } from '../_types';
-
-interface SuccessStepProps {
-  bookingResult: BookingResult;
-  event: Event;
-  locale: string;
-  t: (key: string) => string;
-  formatDate: (dateStr: string) => string;
-  fmtTime: (dateStr: string) => string;
-}
-
-export function SuccessStep({
-  bookingResult,
-  event,
-  locale,
-  t,
-  formatDate,
-  fmtTime,
-}: SuccessStepProps) {
-  const successContent = getSuccessContent(bookingResult, locale, t);
-
-  return (
-    <div className="section-padding">
-      <div className="container-page max-w-2xl">
-        <Card className="p-8 text-center">
-          <div className={`w-16 h-16 rounded-full ${successContent.iconColor} flex items-center justify-center mx-auto mb-6`}>
-            <CheckCircleIcon className={`w-10 h-10 ${successContent.iconTextColor}`} />
-          </div>
-
-          <h1 className="text-2xl font-bold text-primary-dark mb-2">
-            {successContent.title}
-          </h1>
-          <p className="text-gray-600 mb-6">
-            {successContent.description}
-          </p>
-
-          <div className="bg-secondary-gray rounded-lg p-6 mb-6">
-            {/* Multi-ticket indicator */}
-            {bookingResult.ticketCount && bookingResult.ticketCount > 1 && (
-              <div className="mb-4 pb-4 border-b border-gray-300">
-                <p className="text-lg font-semibold text-primary-dark">
-                  {locale === 'es'
-                    ? `${bookingResult.ticketCount} tickets reservados`
-                    : `${bookingResult.ticketCount} tickets booked`}
-                </p>
-                <p className="text-sm text-gray-500">
-                  {locale === 'es'
-                    ? 'Cada asistente recibirá su propio código QR'
-                    : 'Each attendee will receive their own QR code'}
-                </p>
-              </div>
-            )}
-
-            <div className="flex items-center justify-center gap-2 mb-4">
-              <TicketIcon className="w-6 h-6 text-primary-yellow" />
-              <span className="font-mono text-lg font-bold">{bookingResult.qrCode}</span>
-              {bookingResult.ticketCount && bookingResult.ticketCount > 1 && (
-                <span className="text-xs bg-purple-100 text-purple-700 px-2 py-1 rounded-full">
-                  +{bookingResult.ticketCount - 1} {locale === 'es' ? 'más' : 'more'}
-                </span>
-              )}
-            </div>
-
-            <div className="text-sm text-gray-600 space-y-2">
-              <p><strong>{t('booking.success.event')}:</strong> {event.title}</p>
-              <p><strong>{t('booking.success.date')}:</strong> {formatDate(event.startDatetime)}</p>
-              <p><strong>{t('booking.success.time')}:</strong> {fmtTime(event.startDatetime)}</p>
-              <p><strong>{t('booking.success.location')}:</strong> {event.location}</p>
-            </div>
-          </div>
-
-          {bookingResult.paymentMethod === 'cash' && (
-            <div className="bg-yellow-50 border border-yellow-200 rounded-lg p-4 mb-6">
-              <p className="text-yellow-800 text-sm">
-                <strong>{t('booking.success.cashNote')}:</strong> {t('booking.success.cashDescription')}
-              </p>
-            </div>
-          )}
-
-          {bookingResult.paymentMethod === 'bancard' && (
-            <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 mb-6">
-              <p className="text-blue-800 text-sm">
-                {t('booking.success.cardNote')}
-              </p>
-            </div>
-          )}
-
-          {bookingResult.paymentMethod === 'lightning' && (
-            <div className="bg-green-50 border border-green-200 rounded-lg p-4 mb-6">
-              <p className="text-green-800 text-sm flex items-center gap-2">
-                <CheckCircleIcon className="w-5 h-5" />
-                {locale === 'es'
-                  ? '¡Pago con Bitcoin Lightning recibido exitosamente!'
-                  : 'Bitcoin Lightning payment received successfully!'}
-              </p>
-            </div>
-          )}
-
-          <p className="text-sm text-gray-500 mb-6">
-            {t('booking.success.emailSent')}
-          </p>
-
-          {/* Download Ticket Button - only for instant confirmation (Lightning) */}
-          {bookingResult.paymentMethod === 'lightning' && (
-            <div className="mb-6">
-              <a
-                href={bookingResult.bookingId
-                  ? `/api/tickets/booking/${bookingResult.bookingId}/pdf`
-                  : `/api/tickets/${bookingResult.ticketId}/pdf`
-                }
-                download
-                className="inline-flex items-center gap-2 px-4 py-2 bg-primary-yellow text-primary-dark font-medium rounded-btn hover:bg-primary-yellow/90 transition-colors"
-              >
-                <ArrowDownTrayIcon className="w-5 h-5" />
-                {locale === 'es'
-                  ? (bookingResult.ticketCount && bookingResult.ticketCount > 1 ? 'Descargar Tickets' : 'Descargar Ticket')
-                  : (bookingResult.ticketCount && bookingResult.ticketCount > 1 ? 'Download Tickets' : 'Download Ticket')}
-              </a>
-            </div>
-          )}
-
-          <div className="flex flex-col sm:flex-row gap-3 justify-center">
-            <Link href="/events">
-              <Button variant="outline">{t('booking.success.browseEvents')}</Button>
-            </Link>
-            <Link href="/">
-              <Button>{t('booking.success.backHome')}</Button>
-            </Link>
-          </div>
-        </Card>
-      </div>
-    </div>
-  );
-}

frontend/src/app/(public)/book/[eventId]/_types.ts

@@ -1,40 +0,0 @@
-// Shared types for the booking flow.
-
-export interface AttendeeInfo {
-  firstName: string;
-  lastName: string;
-}
-
-export type PaymentMethod = 'bancard' | 'lightning' | 'cash' | 'bank_transfer' | 'tpago';
-
-export interface BookingFormData {
-  firstName: string;
-  lastName: string;
-  email: string;
-  phone: string;
-  preferredLanguage: 'en' | 'es';
-  paymentMethod: PaymentMethod;
-  ruc: string;
-}
-
-export interface LightningInvoice {
-  paymentHash: string;
-  paymentRequest: string; // BOLT11 invoice
-  amount: number; // Amount in satoshis
-  fiatAmount?: number; // Original fiat amount
-  fiatCurrency?: string; // Original fiat currency
-  expiry?: string;
-}
-
-export interface BookingResult {
-  ticketId: string;
-  ticketIds?: string[]; // For multi-ticket bookings
-  bookingId?: string;
-  qrCode: string;
-  qrCodes?: string[]; // For multi-ticket bookings
-  paymentMethod: PaymentMethod;
-  lightningInvoice?: LightningInvoice;
-  ticketCount?: number;
-}
-
-export type BookingStep = 'form' | 'paying' | 'manual_payment' | 'pending_approval' | 'success';

frontend/src/app/(public)/booking/[ticketId]/page.tsx

@@ -5,7 +5,7 @@ import { useParams, useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import { useLanguage } from '@/context/LanguageContext';
 import { ticketsApi, paymentOptionsApi, Ticket, PaymentOptionsConfig } from '@/lib/api';
-import { formatPrice, formatDateLong, formatTime, getTpagoLink } from '@/lib/utils';
+import { formatPrice, formatDateLong, formatTime } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { 
@@ -69,7 +69,7 @@ export default function BookingPaymentPage() {
 
         // Get payment config for the event
         if (ticketData.eventId) {
-          const { paymentOptions } = await paymentOptionsApi.getForEvent(ticketData.eventId, ticketData.id);
+          const { paymentOptions } = await paymentOptionsApi.getForEvent(ticketData.eventId);
           setPaymentConfig(paymentOptions);
         }
 
@@ -305,7 +305,6 @@ export default function BookingPaymentPage() {
   if (step === 'manual_payment' && ticket && paymentConfig) {
     const isBankTransfer = ticket.payment?.provider === 'bank_transfer';
     const isTpago = ticket.payment?.provider === 'tpago';
-    const tpagoLink = getTpagoLink(paymentConfig, ticket.bookingTicketCount || 1);
     
     return (
       <div className="section-padding">
@@ -419,9 +418,9 @@ export default function BookingPaymentPage() {
                 <h3 className="font-semibold text-gray-900">
                   {locale === 'es' ? 'Pago con Tarjeta' : 'Card Payment'}
                 </h3>
-                {tpagoLink && (
+                {paymentConfig.tpagoLink && (
                   <a
-                    href={tpagoLink}
+                    href={paymentConfig.tpagoLink}
                     target="_blank"
                     rel="noopener noreferrer"
                     className="flex items-center justify-center gap-2 w-full px-6 py-4 bg-blue-600 text-white rounded-btn hover:bg-blue-700 transition-colors font-medium"

frontend/src/app/(public)/components/NextEventSection.tsx

@@ -69,7 +69,7 @@ export default function NextEventSection({ initialEvent }: NextEventSectionProps
   }
 
   return (
-    <Link href={`/events/${nextEvent.slug}`} className="block group">
+    <Link href={`/events/${nextEvent.id}`} className="block group">
       <div className="bg-gray-50 border border-gray-200 rounded-2xl overflow-hidden shadow-lg transition-all duration-300 hover:shadow-2xl hover:scale-[1.01]">
         <div className="flex flex-col md:flex-row">
           {/* Banner */}
@@ -102,11 +102,11 @@ export default function NextEventSection({ initialEvent }: NextEventSectionProps
               <div className="mt-4 md:mt-5 space-y-2">
                 <div className="flex items-center gap-2.5 text-gray-700 text-sm">
                   <CalendarIcon className="w-4 h-4 text-primary-yellow flex-shrink-0" />
-                  <span suppressHydrationWarning>{formatDate(nextEvent.startDatetime)}</span>
+                  <span>{formatDate(nextEvent.startDatetime)}</span>
                 </div>
                 <div className="flex items-center gap-2.5 text-gray-700 text-sm">
                   <ClockIcon className="w-4 h-4 text-primary-yellow flex-shrink-0" />
-                  <span suppressHydrationWarning>{fmtTime(nextEvent.startDatetime)}</span>
+                  <span>{fmtTime(nextEvent.startDatetime)}</span>
                 </div>
                 <div className="flex items-center gap-2.5 text-gray-700 text-sm">
                   <MapPinIcon className="w-4 h-4 text-primary-yellow flex-shrink-0" />

frontend/src/app/(public)/dashboard/components/PaymentsTab.tsx

@@ -4,7 +4,6 @@ import { useState } from 'react';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { UserPayment } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 
 interface PaymentsTabProps {
   payments: UserPayment[];
@@ -22,7 +21,7 @@ export default function PaymentsTab({ payments, language }: PaymentsTabProps) {
   });
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(language === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(language === 'es' ? 'es-ES' : 'en-US', {
       year: 'numeric',
       month: 'short',
       day: 'numeric',

frontend/src/app/(public)/dashboard/components/ProfileTab.tsx

@@ -7,7 +7,6 @@ import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
 import { dashboardApi, UserProfile } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import toast from 'react-hot-toast';
 
 interface ProfileTabProps {
@@ -117,7 +116,7 @@ export default function ProfileTab({ onUpdate }: ProfileTabProps) {
             </span>
             <span className="font-medium">
               {profile?.memberSince
-                ? parseDate(profile.memberSince).toLocaleDateString(
+                ? new Date(profile.memberSince).toLocaleDateString(
                     language === 'es' ? 'es-ES' : 'en-US',
                     { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'America/Asuncion' }
                   )

frontend/src/app/(public)/dashboard/components/SecurityTab.tsx

@@ -7,7 +7,6 @@ import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
 import { dashboardApi, authApi, UserProfile, UserSession } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import toast from 'react-hot-toast';
 
 export default function SecurityTab() {
@@ -148,7 +147,7 @@ export default function SecurityTab() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleString(language === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleString(language === 'es' ? 'es-ES' : 'en-US', {
       year: 'numeric',
       month: 'short',
       day: 'numeric',

frontend/src/app/(public)/dashboard/components/TicketsTab.tsx

@@ -5,7 +5,6 @@ import Link from 'next/link';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { UserTicket } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 
 interface TicketsTabProps {
   tickets: UserTicket[];
@@ -27,7 +26,7 @@ export default function TicketsTab({ tickets, language }: TicketsTabProps) {
   });
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(language === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(language === 'es' ? 'es-ES' : 'en-US', {
       year: 'numeric',
       month: 'short',
       day: 'numeric',

frontend/src/app/(public)/events/[id]/EventDetailClient.tsx

@@ -23,8 +23,6 @@ interface EventDetailClientProps {
   initialEvent: Event;
 }
 
-const MAX_TICKETS_PER_PERSON = 5;
-
 export default function EventDetailClient({ eventId, initialEvent }: EventDetailClientProps) {
   const { t, locale } = useLanguage();
   const [event, setEvent] = useState<Event>(initialEvent);
@@ -46,13 +44,7 @@ export default function EventDetailClient({ eventId, initialEvent }: EventDetail
   // Spots left: never negative; sold out when confirmed >= capacity
   const spotsLeft = Math.max(0, event.capacity - (event.bookedCount ?? 0));
   const isSoldOut = (event.bookedCount ?? 0) >= event.capacity;
-  const maxTickets = isSoldOut ? 0 : Math.min(MAX_TICKETS_PER_PERSON, Math.max(1, spotsLeft));
-
-  useEffect(() => {
-    if (maxTickets > 0) {
-      setTicketQuantity((q) => Math.min(q, maxTickets));
-    }
-  }, [maxTickets]);
+  const maxTickets = isSoldOut ? 0 : Math.max(1, spotsLeft);
 
   const decreaseQuantity = () => {
     setTicketQuantity(prev => Math.max(1, prev - 1));

frontend/src/app/(public)/events/[id]/page.tsx

@@ -1,5 +1,5 @@
 import type { Metadata } from 'next';
-import { notFound, permanentRedirect } from 'next/navigation';
+import { notFound } from 'next/navigation';
 import EventDetailClient from './EventDetailClient';
 
 const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://spanglish.com.py';
@@ -7,7 +7,6 @@ const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001';
 
 interface Event {
   id: string;
-  slug: string;
   title: string;
   titleEs?: string;
   description: string;
@@ -69,7 +68,7 @@ export async function generateMetadata({ params }: { params: { id: string } }):
       title,
       description,
       type: 'website',
-      url: `${siteUrl}/events/${event.slug}`,
+      url: `${siteUrl}/events/${event.id}`,
       images: [{ url: imageUrl, width: 1200, height: 630, alt: event.title }],
     },
     twitter: {
@@ -79,7 +78,7 @@ export async function generateMetadata({ params }: { params: { id: string } }):
       images: [imageUrl],
     },
     alternates: {
-      canonical: `${siteUrl}/events/${event.slug}`,
+      canonical: `${siteUrl}/events/${event.id}`,
     },
   };
 }
@@ -120,11 +119,11 @@ function generateEventJsonLd(event: Event) {
       availability: Math.max(0, (event.capacity ?? 0) - (event.bookedCount ?? 0)) > 0
         ? 'https://schema.org/InStock'
         : 'https://schema.org/SoldOut',
-      url: `${siteUrl}/events/${event.slug}`,
+      url: `${siteUrl}/events/${event.id}`,
       validFrom: new Date().toISOString(),
     },
     image: event.bannerUrl || `${siteUrl}/images/og-image.jpg`,
-    url: `${siteUrl}/events/${event.slug}`,
+    url: `${siteUrl}/events/${event.id}`,
   };
 }
 
@@ -135,11 +134,6 @@ export default async function EventDetailPage({ params }: { params: { id: string
     notFound();
   }
 
-  // Redirect legacy UUID/alias URLs to the canonical slug (HTTP 308 permanent)
-  if (event.slug && params.id !== event.slug) {
-    permanentRedirect(`/events/${event.slug}`);
-  }
-
   const jsonLd = generateEventJsonLd(event);
 
   return (
@@ -148,7 +142,7 @@ export default async function EventDetailPage({ params }: { params: { id: string
         type="application/ld+json"
         dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
       />
-      <EventDetailClient eventId={event.slug} initialEvent={event} />
+      <EventDetailClient eventId={params.id} initialEvent={event} />
     </>
   );
 }

frontend/src/app/(public)/events/page.tsx

@@ -91,7 +91,7 @@ export default function EventsPage() {
           ) : (
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
               {displayedEvents.map((event) => (
-                <Link key={event.id} href={`/events/${event.slug}`} className="block">
+                <Link key={event.id} href={`/events/${event.id}`} className="block">
                   <Card variant="elevated" className="card-hover overflow-hidden cursor-pointer h-full">
                     {/* Event banner */}
                     {event.bannerUrl ? (

frontend/src/app/(public)/featured/page.tsx

@@ -1,23 +0,0 @@
-import { redirect } from 'next/navigation';
-
-const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001';
-
-async function getFeaturedEventSlug(): Promise<string | null> {
-  try {
-    const revalidateSeconds =
-      parseInt(process.env.NEXT_EVENT_REVALIDATE_SECONDS || '3600', 10) || 3600;
-    const response = await fetch(`${apiUrl}/api/events/next/upcoming`, {
-      next: { tags: ['next-event'], revalidate: revalidateSeconds },
-    });
-    if (!response.ok) return null;
-    const data = await response.json();
-    return data.event?.slug || null;
-  } catch {
-    return null;
-  }
-}
-
-export default async function FeaturedEventPage() {
-  const slug = await getFeaturedEventSlug();
-  redirect(slug ? `/events/${slug}` : '/events');
-}

frontend/src/app/(public)/legal/[slug]/page.tsx

@@ -68,8 +68,6 @@ export default async function LegalPage({ params, searchParams }: PageProps) {
   
   return (
     <LegalPageLayout
-      slug={resolvedParams.slug}
-      initialLocale={locale}
       title={legalPage.title}
       content={legalPage.content}
       lastUpdated={legalPage.lastUpdated}

frontend/src/app/(public)/login/page.tsx

@@ -10,7 +10,6 @@ import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
 import GoogleSignInButton from '@/components/GoogleSignInButton';
 import { authApi } from '@/lib/api';
-import { safeInternalPath } from '@/lib/safeRedirect';
 import toast from 'react-hot-toast';
 
 function LoginContent() {
@@ -26,8 +25,8 @@ function LoginContent() {
     password: '',
   });
 
-  // Check for redirect after login (only same-origin relative paths are honoured)
-  const redirectTo = safeInternalPath(searchParams.get('redirect'), '/dashboard');
+  // Check for redirect after login
+  const redirectTo = searchParams.get('redirect') || '/dashboard';
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();

frontend/src/app/(public)/next/page.tsx

@@ -1,23 +0,0 @@
-import { redirect } from 'next/navigation';
-
-const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001';
-
-async function getNextEventSlug(): Promise<string | null> {
-  try {
-    const revalidateSeconds =
-      parseInt(process.env.NEXT_EVENT_REVALIDATE_SECONDS || '3600', 10) || 3600;
-    const response = await fetch(`${apiUrl}/api/events/next`, {
-      next: { tags: ['next-event'], revalidate: revalidateSeconds },
-    });
-    if (!response.ok) return null;
-    const data = await response.json();
-    return data.event?.slug || null;
-  } catch {
-    return null;
-  }
-}
-
-export default async function NextEventPage() {
-  const slug = await getNextEventSlug();
-  redirect(slug ? `/events/${slug}` : '/events');
-}

frontend/src/app/(public)/page.tsx

@@ -3,7 +3,6 @@ import HeroSection from './components/HeroSection';
 import NextEventSectionWrapper from './components/NextEventSectionWrapper';
 import AboutSection from './components/AboutSection';
 import MediaCarouselSection from './components/MediaCarouselSection';
-import { parseDate } from '@/lib/utils';
 import NewsletterSection from './components/NewsletterSection';
 import HomepageFaqSection from './components/HomepageFaqSection';
 import { getCarouselImages } from '@/lib/carouselImages';
@@ -13,7 +12,6 @@ const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001';
 
 interface NextEvent {
   id: string;
-  slug: string;
   title: string;
   titleEs?: string;
   description: string;
@@ -65,7 +63,7 @@ export async function generateMetadata(): Promise<Metadata> {
     };
   }
 
-  const eventDate = parseDate(event.startDatetime).toLocaleDateString('en-US', {
+  const eventDate = new Date(event.startDatetime).toLocaleDateString('en-US', {
     weekday: 'long',
     year: 'numeric',
     month: 'long',
@@ -140,10 +138,10 @@ function generateNextEventJsonLd(event: NextEvent) {
         (event.availableSeats ?? 0) > 0
           ? 'https://schema.org/InStock'
           : 'https://schema.org/SoldOut',
-      url: `${siteUrl}/events/${event.slug}`,
+      url: `${siteUrl}/events/${event.id}`,
     },
     image: event.bannerUrl || `${siteUrl}/images/og-image.jpg`,
-    url: `${siteUrl}/events/${event.slug}`,
+    url: `${siteUrl}/events/${event.id}`,
   };
 }
 

frontend/src/app/admin/bookings/page.tsx

@@ -3,7 +3,6 @@
 import { useState, useEffect } from 'react';
 import { useLanguage } from '@/context/LanguageContext';
 import { ticketsApi, eventsApi, Ticket, Event } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { BottomSheet, MoreMenu, DropdownItem, AdminMobileStyles } from '@/components/admin/MobileComponents';
@@ -60,13 +59,19 @@ export default function AdminBookingsPage() {
         ticketsApi.getAll(),
         eventsApi.getAll(),
       ]);
-
-      const ticketsWithEvent = ticketsRes.tickets.map((ticket) => ({
-        ...ticket,
-        event: eventsRes.events.find((e) => e.id === ticket.eventId),
-      }));
-
-      setTickets(ticketsWithEvent);
+      
+      const ticketsWithDetails = await Promise.all(
+        ticketsRes.tickets.map(async (ticket) => {
+          try {
+            const { ticket: fullTicket } = await ticketsApi.getById(ticket.id);
+            return fullTicket;
+          } catch {
+            return ticket;
+          }
+        })
+      );
+      
+      setTickets(ticketsWithDetails);
       setEvents(eventsRes.events);
     } catch (error) {
       toast.error('Failed to load bookings');
@@ -117,7 +122,7 @@ export default function AdminBookingsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short',
       day: 'numeric',
       year: 'numeric',
@@ -148,8 +153,7 @@ export default function AdminBookingsPage() {
     }
   };
 
-  const getPaymentMethodLabel = (provider: string | null) => {
-    if (provider == null) return '—';
+  const getPaymentMethodLabel = (provider: string) => {
     const labels: Record<string, string> = {
       cash: locale === 'es' ? 'Efectivo en el Evento' : 'Cash at Event',
       bank_transfer: locale === 'es' ? 'Transferencia Bancaria' : 'Bank Transfer',
@@ -160,13 +164,13 @@ export default function AdminBookingsPage() {
     return labels[provider] || provider;
   };
 
-  const getDisplayProvider = (ticket: TicketWithDetails): string | null => {
+  const getDisplayProvider = (ticket: TicketWithDetails) => {
     if (ticket.payment?.provider) return ticket.payment.provider;
     if (ticket.bookingId) {
-      const sibling = tickets.find((t) => t.bookingId === ticket.bookingId && t.payment?.provider);
-      return sibling?.payment?.provider ?? null;
+      const sibling = tickets.find(t => t.bookingId === ticket.bookingId && t.payment?.provider);
+      return sibling?.payment?.provider ?? 'cash';
     }
-    return null;
+    return 'cash';
   };
 
   const filteredTickets = tickets.filter((ticket) => {

frontend/src/app/admin/contacts/page.tsx

@@ -7,7 +7,6 @@ import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { EnvelopeIcon, EnvelopeOpenIcon, CheckIcon } from '@heroicons/react/24/outline';
 import toast from 'react-hot-toast';
-import { parseDate } from '@/lib/utils';
 
 export default function AdminContactsPage() {
   const { t, locale } = useLanguage();
@@ -45,7 +44,7 @@ export default function AdminContactsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short',
       day: 'numeric',
       hour: '2-digit',

frontend/src/app/admin/emails/page.tsx

@@ -3,7 +3,6 @@
 import { useState, useEffect } from 'react';
 import { useLanguage } from '@/context/LanguageContext';
 import { emailsApi, EmailTemplate, EmailLog, EmailStats } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
@@ -21,8 +20,6 @@ import {
   ChevronLeftIcon,
   ChevronRightIcon,
   XMarkIcon,
-  ArrowPathIcon,
-  MagnifyingGlassIcon,
 } from '@heroicons/react/24/outline';
 import toast from 'react-hot-toast';
 import clsx from 'clsx';
@@ -55,11 +52,6 @@ export default function AdminEmailsPage() {
   const [logs, setLogs] = useState<EmailLog[]>([]);
   const [logsOffset, setLogsOffset] = useState(0);
   const [logsTotal, setLogsTotal] = useState(0);
-  const [logsSubTab, setLogsSubTab] = useState<'all' | 'failed'>('all');
-  const [logsSearch, setLogsSearch] = useState('');
-  const [debouncedSearch, setDebouncedSearch] = useState('');
-  const [logsEventFilter, setLogsEventFilter] = useState('');
-  const [resendingLogId, setResendingLogId] = useState<string | null>(null);
   const [selectedLog, setSelectedLog] = useState<EmailLog | null>(null);
   
   // Stats state
@@ -218,20 +210,11 @@ export default function AdminEmailsPage() {
     }
   };
 
-  useEffect(() => {
-    const handle = setTimeout(() => setDebouncedSearch(logsSearch), 300);
-    return () => clearTimeout(handle);
-  }, [logsSearch]);
-
-  useEffect(() => {
-    setLogsOffset(0);
-  }, [debouncedSearch, logsEventFilter]);
-
   useEffect(() => {
     if (activeTab === 'logs') {
       loadLogs();
     }
-  }, [activeTab, logsOffset, logsSubTab, debouncedSearch, logsEventFilter]);
+  }, [activeTab, logsOffset]);
 
   const loadData = async () => {
     try {
@@ -250,13 +233,7 @@ export default function AdminEmailsPage() {
 
   const loadLogs = async () => {
     try {
-      const res = await emailsApi.getLogs({
-        limit: 20,
-        offset: logsOffset,
-        ...(logsSubTab === 'failed' ? { status: 'failed' } : {}),
-        ...(debouncedSearch.trim() ? { search: debouncedSearch.trim() } : {}),
-        ...(logsEventFilter ? { eventId: logsEventFilter } : {}),
-      });
+      const res = await emailsApi.getLogs({ limit: 20, offset: logsOffset });
       setLogs(res.logs);
       setLogsTotal(res.pagination.total);
     } catch (error) {
@@ -264,27 +241,6 @@ export default function AdminEmailsPage() {
     }
   };
 
-  const handleResend = async (log: EmailLog) => {
-    setResendingLogId(log.id);
-    try {
-      const res = await emailsApi.resendLog(log.id);
-      if (res.success) {
-        toast.success('Email re-sent successfully');
-      } else {
-        toast.error(res.error || 'Failed to re-send email');
-      }
-      await loadLogs();
-      if (selectedLog?.id === log.id) {
-        const { log: updatedLog } = await emailsApi.getLog(log.id);
-        setSelectedLog(updatedLog);
-      }
-    } catch (error: any) {
-      toast.error(error.message || 'Failed to re-send email');
-    } finally {
-      setResendingLogId(null);
-    }
-  };
-
   const resetTemplateForm = () => {
     setTemplateForm({
       name: '',
@@ -407,7 +363,7 @@ export default function AdminEmailsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short',
       day: 'numeric',
       year: 'numeric',
@@ -588,7 +544,7 @@ export default function AdminEmailsPage() {
               <div className="flex items-center gap-2">
                 {hasDraft && (
                   <span className="text-xs text-gray-500">
-                    Draft saved {composeForm.savedAt ? parseDate(composeForm.savedAt).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: 'America/Asuncion' }) : ''}
+                    Draft saved {composeForm.savedAt ? new Date(composeForm.savedAt).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: 'America/Asuncion' }) : ''}
                   </span>
                 )}
                 <Button variant="outline" size="sm" onClick={saveDraft}>
@@ -614,7 +570,7 @@ export default function AdminEmailsPage() {
                   <option value="">Choose an event</option>
                   {events.filter(e => e.status === 'published' || e.status === 'unlisted').map((event) => (
                     <option key={event.id} value={event.id}>
-                      {event.title} - {parseDate(event.startDatetime).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: 'America/Asuncion' })}
+                      {event.title} - {new Date(event.startDatetime).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: 'America/Asuncion' })}
                     </option>
                   ))}
                 </select>
@@ -743,70 +699,6 @@ export default function AdminEmailsPage() {
       {/* Logs Tab */}
       {activeTab === 'logs' && (
         <div>
-          {/* Sub-tabs: All | Failed */}
-          <div className="border-b border-secondary-light-gray mb-4">
-            <nav className="flex gap-4">
-              <button
-                onClick={() => { setLogsSubTab('all'); setLogsOffset(0); }}
-                className={clsx(
-                  'py-2 px-1 border-b-2 font-medium text-sm transition-colors',
-                  logsSubTab === 'all' ? 'border-primary-yellow text-primary-dark' : 'border-transparent text-gray-500 hover:text-gray-700'
-                )}
-              >
-                All
-              </button>
-              <button
-                onClick={() => { setLogsSubTab('failed'); setLogsOffset(0); }}
-                className={clsx(
-                  'py-2 px-1 border-b-2 font-medium text-sm transition-colors',
-                  logsSubTab === 'failed' ? 'border-primary-yellow text-primary-dark' : 'border-transparent text-gray-500 hover:text-gray-700'
-                )}
-              >
-                Failed
-                {stats && stats.failed > 0 && (
-                  <span className="ml-1.5 inline-flex items-center justify-center px-1.5 py-0.5 text-xs font-medium rounded-full bg-red-100 text-red-700">
-                    {stats.failed}
-                  </span>
-                )}
-              </button>
-            </nav>
-          </div>
-
-          {/* Filters: search + event */}
-          <div className="flex flex-col md:flex-row gap-3 mb-4">
-            <div className="relative flex-1">
-              <MagnifyingGlassIcon className="w-5 h-5 text-gray-400 absolute left-3 top-1/2 -translate-y-1/2 pointer-events-none" />
-              <input
-                type="text"
-                value={logsSearch}
-                onChange={(e) => setLogsSearch(e.target.value)}
-                placeholder="Search by recipient or subject..."
-                className="w-full pl-10 pr-10 py-3 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-              />
-              {logsSearch && (
-                <button
-                  onClick={() => setLogsSearch('')}
-                  className="absolute right-2 top-1/2 -translate-y-1/2 p-1.5 hover:bg-gray-100 rounded-btn"
-                  title="Clear search"
-                >
-                  <XMarkIcon className="w-4 h-4 text-gray-400" />
-                </button>
-              )}
-            </div>
-            <select
-              value={logsEventFilter}
-              onChange={(e) => setLogsEventFilter(e.target.value)}
-              className="w-full md:w-64 px-4 py-3 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-            >
-              <option value="">All events</option>
-              {events.map((event) => (
-                <option key={event.id} value={event.id}>
-                  {event.title}
-                </option>
-              ))}
-            </select>
-          </div>
-
           {/* Desktop: Table */}
           <Card className="overflow-hidden hidden md:block">
             <div className="overflow-x-auto">
@@ -822,17 +714,12 @@ export default function AdminEmailsPage() {
                 </thead>
                 <tbody className="divide-y divide-secondary-light-gray">
                   {logs.length === 0 ? (
-                    <tr><td colSpan={5} className="px-4 py-12 text-center text-gray-500 text-sm">{(debouncedSearch.trim() || logsEventFilter) ? 'No emails match your filters' : logsSubTab === 'failed' ? 'No failed emails' : 'No emails sent yet'}</td></tr>
+                    <tr><td colSpan={5} className="px-4 py-12 text-center text-gray-500 text-sm">No emails sent yet</td></tr>
                   ) : (
                     logs.map((log) => (
                       <tr key={log.id} className="hover:bg-gray-50">
                         <td className="px-4 py-3">
-                          <div className="flex flex-col gap-1">
-                            <div className="flex items-center gap-2">{getStatusIcon(log.status)}<span className="capitalize text-sm">{log.status}</span></div>
-                            {(log.resendAttempts ?? 0) > 0 && (
-                              <span className="text-xs text-gray-500">Re-sent {log.resendAttempts} time{(log.resendAttempts ?? 0) !== 1 ? 's' : ''}</span>
-                            )}
-                          </div>
+                          <div className="flex items-center gap-2">{getStatusIcon(log.status)}<span className="capitalize text-sm">{log.status}</span></div>
                         </td>
                         <td className="px-4 py-3">
                           <p className="font-medium text-sm">{log.recipientName || 'Unknown'}</p>
@@ -841,15 +728,7 @@ export default function AdminEmailsPage() {
                         <td className="px-4 py-3 max-w-xs"><p className="text-sm truncate">{log.subject}</p></td>
                         <td className="px-4 py-3 text-xs text-gray-500">{formatDate(log.sentAt || log.createdAt)}</td>
                         <td className="px-4 py-3">
-                          <div className="flex items-center justify-end gap-1">
-                            <button
-                              onClick={() => handleResend(log)}
-                              disabled={resendingLogId === log.id}
-                              className="p-2 hover:bg-gray-100 rounded-btn disabled:opacity-50"
-                              title="Re-send"
-                            >
-                              <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === log.id && 'animate-spin')} />
-                            </button>
+                          <div className="flex items-center justify-end">
                             <button onClick={() => setSelectedLog(log)} className="p-2 hover:bg-gray-100 rounded-btn" title="View">
                               <EyeIcon className="w-4 h-4" />
                             </button>
@@ -879,7 +758,7 @@ export default function AdminEmailsPage() {
           {/* Mobile: Card List */}
           <div className="md:hidden space-y-2">
             {logs.length === 0 ? (
-              <div className="text-center py-10 text-gray-500 text-sm">{(debouncedSearch.trim() || logsEventFilter) ? 'No emails match your filters' : logsSubTab === 'failed' ? 'No failed emails' : 'No emails sent yet'}</div>
+              <div className="text-center py-10 text-gray-500 text-sm">No emails sent yet</div>
             ) : (
               logs.map((log) => (
                 <Card key={log.id} className="p-3" onClick={() => setSelectedLog(log)}>
@@ -889,18 +768,7 @@ export default function AdminEmailsPage() {
                       <p className="font-medium text-sm truncate">{log.subject}</p>
                       <p className="text-xs text-gray-500 truncate">{log.recipientName || 'Unknown'} &lt;{log.recipientEmail}&gt;</p>
                       <p className="text-[10px] text-gray-400 mt-1">{formatDate(log.sentAt || log.createdAt)}</p>
-                      {(log.resendAttempts ?? 0) > 0 && (
-                        <p className="text-[10px] text-gray-500 mt-0.5">Re-sent {log.resendAttempts} time{(log.resendAttempts ?? 0) !== 1 ? 's' : ''}</p>
-                      )}
                     </div>
-                    <button
-                      onClick={(e) => { e.stopPropagation(); handleResend(log); }}
-                      disabled={resendingLogId === log.id}
-                      className="p-2 hover:bg-gray-100 rounded-btn flex-shrink-0 disabled:opacity-50"
-                      title="Re-send"
-                    >
-                      <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === log.id && 'animate-spin')} />
-                    </button>
                   </div>
                 </Card>
               ))
@@ -1047,7 +915,6 @@ export default function AdminEmailsPage() {
             <div className="flex-1 overflow-auto">
               <iframe
                 srcDoc={previewHtml}
-                sandbox=""
                 className="w-full h-full min-h-[500px]"
                 title="Email Preview"
               />
@@ -1071,26 +938,12 @@ export default function AdminEmailsPage() {
                   {selectedLog.errorMessage && (
                     <span className="text-xs text-red-500">- {selectedLog.errorMessage}</span>
                   )}
-                  {(selectedLog.resendAttempts ?? 0) > 0 && (
-                    <span className="text-xs text-gray-500">Re-sent {selectedLog.resendAttempts} time{(selectedLog.resendAttempts ?? 0) !== 1 ? 's' : ''}{selectedLog.lastResentAt ? ` (${formatDate(selectedLog.lastResentAt)})` : ''}</span>
-                  )}
                 </div>
               </div>
-              <div className="flex items-center gap-1 flex-shrink-0">
-                <button
-                  onClick={() => handleResend(selectedLog)}
-                  disabled={resendingLogId === selectedLog.id}
-                  className="p-2 hover:bg-gray-100 rounded-btn disabled:opacity-50 flex items-center gap-1.5 text-sm"
-                  title="Re-send"
-                >
-                  <ArrowPathIcon className={clsx('w-4 h-4', resendingLogId === selectedLog.id && 'animate-spin')} />
-                  Re-send
-                </button>
-                <button onClick={() => setSelectedLog(null)}
-                  className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center">
-                  <XMarkIcon className="w-5 h-5" />
-                </button>
-              </div>
+              <button onClick={() => setSelectedLog(null)}
+                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center flex-shrink-0">
+                <XMarkIcon className="w-5 h-5" />
+              </button>
             </div>
             <div className="p-4 space-y-2 border-b border-secondary-light-gray bg-gray-50">
               <p><strong>To:</strong> {selectedLog.recipientName} &lt;{selectedLog.recipientEmail}&gt;</p>
@@ -1101,7 +954,6 @@ export default function AdminEmailsPage() {
               {selectedLog.bodyHtml ? (
                 <iframe
                   srcDoc={selectedLog.bodyHtml}
-                  sandbox=""
                   className="w-full h-full min-h-[400px]"
                   title="Email Content"
                 />

frontend/src/app/admin/events/[id]/_components/StatusBadge.tsx

@@ -1,19 +0,0 @@
-import clsx from 'clsx';
-
-export function StatusBadge({ status, compact = false }: { status: string; compact?: boolean }) {
-  const styles: Record<string, string> = {
-    pending: 'bg-yellow-100 text-yellow-800',
-    confirmed: 'bg-green-100 text-green-800',
-    cancelled: 'bg-red-100 text-red-800',
-    checked_in: 'bg-blue-100 text-blue-800',
-  };
-  return (
-    <span className={clsx(
-      'inline-flex items-center rounded-full font-medium',
-      compact ? 'px-1.5 py-0.5 text-[10px]' : 'px-2 py-0.5 text-xs',
-      styles[status] || 'bg-gray-100 text-gray-800'
-    )}>
-      {status.replace('_', ' ')}
-    </span>
-  );
-}

frontend/src/app/admin/events/[id]/_hooks/useEventDetailData.ts

@@ -1,37 +0,0 @@
-import { useState, useEffect } from 'react';
-import toast from 'react-hot-toast';
-import { eventsApi, ticketsApi, emailsApi, Event, Ticket, EmailTemplate } from '@/lib/api';
-
-/**
- * Loads the core data for the admin event detail page (event, tickets, active
- * email templates) and exposes a reload function used after mutations.
- */
-export function useEventDetailData(eventId: string) {
-  const [loading, setLoading] = useState(true);
-  const [event, setEvent] = useState<Event | null>(null);
-  const [tickets, setTickets] = useState<Ticket[]>([]);
-  const [templates, setTemplates] = useState<EmailTemplate[]>([]);
-
-  const loadEventData = async () => {
-    try {
-      const [eventRes, ticketsRes, templatesRes] = await Promise.all([
-        eventsApi.getById(eventId),
-        ticketsApi.getAll({ eventId }),
-        emailsApi.getTemplates(),
-      ]);
-      setEvent(eventRes.event);
-      setTickets(ticketsRes.tickets);
-      setTemplates(templatesRes.templates.filter(t => t.isActive));
-    } catch (error) {
-      toast.error('Failed to load event data');
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    loadEventData();
-  }, [eventId]);
-
-  return { loading, event, tickets, templates, loadEventData };
-}

frontend/src/app/admin/events/[id]/_hooks/usePaymentOverrides.ts

@@ -1,96 +0,0 @@
-import { useState } from 'react';
-import toast from 'react-hot-toast';
-import { paymentOptionsApi, PaymentOptionsConfig } from '@/lib/api';
-
-/**
- * Manages the event-level payment override editor state: loading global +
- * override config, computing effective values, editing, saving and resetting.
- */
-export function usePaymentOverrides(eventId: string, locale: string) {
-  const [globalPaymentOptions, setGlobalPaymentOptions] = useState<PaymentOptionsConfig | null>(null);
-  const [paymentOverrides, setPaymentOverrides] = useState<Partial<PaymentOptionsConfig>>({});
-  const [hasPaymentOverrides, setHasPaymentOverrides] = useState(false);
-  const [savingPayments, setSavingPayments] = useState(false);
-  const [loadingPayments, setLoadingPayments] = useState(false);
-
-  const loadPaymentOptions = async () => {
-    if (globalPaymentOptions) return;
-    setLoadingPayments(true);
-    try {
-      const [globalRes, overridesRes] = await Promise.all([
-        paymentOptionsApi.getGlobal(),
-        paymentOptionsApi.getEventOverrides(eventId),
-      ]);
-      setGlobalPaymentOptions(globalRes.paymentOptions);
-      if (overridesRes.overrides) {
-        setPaymentOverrides(overridesRes.overrides);
-        setHasPaymentOverrides(true);
-      }
-    } catch (error) {
-      toast.error('Failed to load payment options');
-    } finally {
-      setLoadingPayments(false);
-    }
-  };
-
-  const getEffectivePaymentOption = <K extends keyof PaymentOptionsConfig>(key: K): PaymentOptionsConfig[K] => {
-    if (paymentOverrides[key] !== undefined && paymentOverrides[key] !== null) {
-      return paymentOverrides[key] as PaymentOptionsConfig[K];
-    }
-    return globalPaymentOptions?.[key] as PaymentOptionsConfig[K];
-  };
-
-  const updatePaymentOverride = <K extends keyof PaymentOptionsConfig>(
-    key: K,
-    value: PaymentOptionsConfig[K] | null
-  ) => {
-    setPaymentOverrides((prev) => ({ ...prev, [key]: value }));
-    setHasPaymentOverrides(true);
-  };
-
-  const handleSavePaymentOptions = async () => {
-    setSavingPayments(true);
-    try {
-      await paymentOptionsApi.updateEventOverrides(eventId, paymentOverrides);
-      toast.success(locale === 'es' ? 'Opciones de pago guardadas' : 'Payment options saved');
-    } catch (error: any) {
-      toast.error(error.message || 'Failed to save payment options');
-    } finally {
-      setSavingPayments(false);
-    }
-  };
-
-  const handleResetToGlobal = async () => {
-    if (!confirm(locale === 'es'
-      ? '¿Resetear a la configuración global? Se eliminarán todas las personalizaciones de este evento.'
-      : 'Reset to global settings? This will remove all customizations for this event.')) {
-      return;
-    }
-    setSavingPayments(true);
-    try {
-      await paymentOptionsApi.deleteEventOverrides(eventId);
-      setPaymentOverrides({});
-      setHasPaymentOverrides(false);
-      toast.success(locale === 'es' ? 'Restablecido a configuración global' : 'Reset to global settings');
-    } catch (error: any) {
-      toast.error(error.message || 'Failed to reset payment options');
-    } finally {
-      setSavingPayments(false);
-    }
-  };
-
-  return {
-    globalPaymentOptions,
-    paymentOverrides,
-    hasPaymentOverrides,
-    savingPayments,
-    loadingPayments,
-    loadPaymentOptions,
-    getEffectivePaymentOption,
-    updatePaymentOverride,
-    handleSavePaymentOptions,
-    handleResetToGlobal,
-  };
-}
-
-export type PaymentOverridesController = ReturnType<typeof usePaymentOverrides>;

frontend/src/app/admin/events/[id]/_modals/EventModals.tsx

@@ -1,521 +0,0 @@
-import type { Dispatch, FormEvent, SetStateAction } from 'react';
-import { Ticket } from '@/lib/api';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import { BottomSheet } from '@/components/admin/MobileComponents';
-import clsx from 'clsx';
-import {
-  CheckCircleIcon,
-  EnvelopeIcon,
-  PlusIcon,
-  StarIcon,
-  XMarkIcon,
-} from '@heroicons/react/24/outline';
-import type { AttendeeStatusFilter, AttendeeFormState, AddAtDoorFormState } from '../_types';
-
-interface EventModalsProps {
-  // counts + filter
-  ticketsCount: number;
-  pendingCount: number;
-  confirmedCount: number;
-  checkedInCount: number;
-  cancelledCount: number;
-  statusFilter: AttendeeStatusFilter;
-  setStatusFilter: (value: AttendeeStatusFilter) => void;
-  // mobile filter sheet
-  mobileFilterOpen: boolean;
-  setMobileFilterOpen: (value: boolean) => void;
-  // add ticket sheet
-  showAddTicketSheet: boolean;
-  setShowAddTicketSheet: (value: boolean) => void;
-  // export sheets
-  showExportSheet: boolean;
-  setShowExportSheet: (value: boolean) => void;
-  handleExportAttendees: (status: 'confirmed' | 'checked_in' | 'confirmed_pending' | 'all') => void;
-  showTicketExportSheet: boolean;
-  setShowTicketExportSheet: (value: boolean) => void;
-  handleExportTickets: (status: 'confirmed' | 'checked_in' | 'all') => void;
-  // add at door
-  showAddAtDoorModal: boolean;
-  setShowAddAtDoorModal: (value: boolean) => void;
-  addAtDoorForm: AddAtDoorFormState;
-  setAddAtDoorForm: Dispatch<SetStateAction<AddAtDoorFormState>>;
-  handleAddAtDoor: (e: FormEvent) => void;
-  // manual ticket
-  showManualTicketModal: boolean;
-  setShowManualTicketModal: (value: boolean) => void;
-  manualTicketForm: AttendeeFormState;
-  setManualTicketForm: Dispatch<SetStateAction<AttendeeFormState>>;
-  handleManualTicket: (e: FormEvent) => void;
-  // invite guest
-  showInviteGuestModal: boolean;
-  setShowInviteGuestModal: (value: boolean) => void;
-  inviteGuestForm: AttendeeFormState;
-  setInviteGuestForm: Dispatch<SetStateAction<AttendeeFormState>>;
-  handleInviteGuest: (e: FormEvent) => void;
-  // shared submit flag
-  submitting: boolean;
-  // note modal
-  showNoteModal: boolean;
-  setShowNoteModal: (value: boolean) => void;
-  selectedTicket: Ticket | null;
-  setSelectedTicket: (value: Ticket | null) => void;
-  noteText: string;
-  setNoteText: (value: string) => void;
-  handleSaveNote: () => void;
-  // preview modal
-  previewHtml: string | null;
-  setPreviewHtml: (value: string | null) => void;
-}
-
-export function EventModals(props: EventModalsProps) {
-  const {
-    ticketsCount,
-    pendingCount,
-    confirmedCount,
-    checkedInCount,
-    cancelledCount,
-    statusFilter,
-    setStatusFilter,
-    mobileFilterOpen,
-    setMobileFilterOpen,
-    showAddTicketSheet,
-    setShowAddTicketSheet,
-    showExportSheet,
-    setShowExportSheet,
-    handleExportAttendees,
-    showTicketExportSheet,
-    setShowTicketExportSheet,
-    handleExportTickets,
-    showAddAtDoorModal,
-    setShowAddAtDoorModal,
-    addAtDoorForm,
-    setAddAtDoorForm,
-    handleAddAtDoor,
-    showManualTicketModal,
-    setShowManualTicketModal,
-    manualTicketForm,
-    setManualTicketForm,
-    handleManualTicket,
-    showInviteGuestModal,
-    setShowInviteGuestModal,
-    inviteGuestForm,
-    setInviteGuestForm,
-    handleInviteGuest,
-    submitting,
-    showNoteModal,
-    setShowNoteModal,
-    selectedTicket,
-    setSelectedTicket,
-    noteText,
-    setNoteText,
-    handleSaveNote,
-    previewHtml,
-    setPreviewHtml,
-  } = props;
-
-  return (
-    <>
-      {/* Mobile filter bottom sheet */}
-      <BottomSheet
-        open={mobileFilterOpen}
-        onClose={() => setMobileFilterOpen(false)}
-        title="Filter by Status"
-      >
-        <div className="space-y-1">
-          {[
-            { value: 'all', label: `All (${ticketsCount})` },
-            { value: 'pending', label: `Pending (${pendingCount})` },
-            { value: 'confirmed', label: `Confirmed (${confirmedCount})` },
-            { value: 'checked_in', label: `Checked In (${checkedInCount})` },
-            { value: 'cancelled', label: `Cancelled (${cancelledCount})` },
-          ].map((option) => (
-            <button
-              key={option.value}
-              onClick={() => { setStatusFilter(option.value as AttendeeStatusFilter); setMobileFilterOpen(false); }}
-              className={clsx(
-                'w-full text-left px-4 py-3 rounded-btn text-sm min-h-[44px] flex items-center justify-between',
-                statusFilter === option.value ? 'bg-yellow-50 text-primary-dark font-medium' : 'hover:bg-gray-50'
-              )}
-            >
-              {option.label}
-              {statusFilter === option.value && <CheckCircleIcon className="w-4 h-4 text-primary-yellow" />}
-            </button>
-          ))}
-        </div>
-      </BottomSheet>
-
-      {/* Mobile FAB bottom sheet */}
-      <BottomSheet
-        open={showAddTicketSheet}
-        onClose={() => setShowAddTicketSheet(false)}
-        title="Add Ticket"
-      >
-        <div className="space-y-1">
-          <button
-            onClick={() => { setShowManualTicketModal(true); setShowAddTicketSheet(false); }}
-            className="w-full text-left px-4 py-3 rounded-btn text-sm hover:bg-gray-50 min-h-[44px] flex items-center gap-3"
-          >
-            <EnvelopeIcon className="w-5 h-5 text-gray-500" />
-            <div>
-              <p className="font-medium">Manual Ticket</p>
-              <p className="text-xs text-gray-500">Send confirmation email with ticket</p>
-            </div>
-          </button>
-          <button
-            onClick={() => { setShowAddAtDoorModal(true); setShowAddTicketSheet(false); }}
-            className="w-full text-left px-4 py-3 rounded-btn text-sm hover:bg-gray-50 min-h-[44px] flex items-center gap-3"
-          >
-            <PlusIcon className="w-5 h-5 text-gray-500" />
-            <div>
-              <p className="font-medium">Add at Door</p>
-              <p className="text-xs text-gray-500">Quick add with optional auto check-in</p>
-            </div>
-          </button>
-          <button
-            onClick={() => { setShowInviteGuestModal(true); setShowAddTicketSheet(false); }}
-            className="w-full text-left px-4 py-3 rounded-btn text-sm hover:bg-gray-50 min-h-[44px] flex items-center gap-3"
-          >
-            <StarIcon className="w-5 h-5 text-gray-500" />
-            <div>
-              <p className="font-medium">Invite Guest</p>
-              <p className="text-xs text-gray-500">Free ticket, not counted in revenue</p>
-            </div>
-          </button>
-        </div>
-      </BottomSheet>
-
-      {/* Mobile export bottom sheet (attendees) */}
-      <BottomSheet
-        open={showExportSheet}
-        onClose={() => setShowExportSheet(false)}
-        title="Export Attendees"
-      >
-        <div className="space-y-1">
-          {[
-            { status: 'all' as const, label: 'Export All' },
-            { status: 'confirmed' as const, label: 'Export Confirmed' },
-            { status: 'checked_in' as const, label: 'Export Checked-in' },
-            { status: 'confirmed_pending' as const, label: 'Confirmed & Pending' },
-          ].map((opt) => (
-            <button
-              key={opt.status}
-              onClick={() => { handleExportAttendees(opt.status); setShowExportSheet(false); }}
-              className="w-full text-left px-4 py-3 rounded-btn text-sm hover:bg-gray-50 min-h-[44px]"
-            >
-              {opt.label}
-            </button>
-          ))}
-          <p className="text-[10px] text-gray-400 px-4 pt-2">Format: CSV</p>
-        </div>
-      </BottomSheet>
-
-      {/* Mobile export bottom sheet (tickets) */}
-      <BottomSheet
-        open={showTicketExportSheet}
-        onClose={() => setShowTicketExportSheet(false)}
-        title="Export Tickets"
-      >
-        <div className="space-y-1">
-          {[
-            { status: 'all' as const, label: 'Export All' },
-            { status: 'confirmed' as const, label: 'Export Valid' },
-            { status: 'checked_in' as const, label: 'Export Checked-in' },
-          ].map((opt) => (
-            <button
-              key={opt.status}
-              onClick={() => { handleExportTickets(opt.status); setShowTicketExportSheet(false); }}
-              className="w-full text-left px-4 py-3 rounded-btn text-sm hover:bg-gray-50 min-h-[44px]"
-            >
-              {opt.label}
-            </button>
-          ))}
-          <p className="text-[10px] text-gray-400 px-4 pt-2">Format: CSV</p>
-        </div>
-      </BottomSheet>
-
-      {/* Add at Door Modal */}
-      {showAddAtDoorModal && (
-        <div
-          className="fixed inset-0 bg-black/50 z-50 flex items-end md:items-center justify-center p-0 md:p-4"
-          onClick={() => setShowAddAtDoorModal(false)}
-          role="presentation"
-        >
-          <Card
-            className="w-full md:max-w-md max-h-[90vh] flex flex-col overflow-hidden rounded-t-2xl md:rounded-card"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-center justify-between p-4 border-b border-secondary-light-gray flex-shrink-0">
-              <h2 className="text-base font-bold">Add Attendee at Door</h2>
-              <button
-                onClick={() => setShowAddAtDoorModal(false)}
-                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center"
-              >
-                <XMarkIcon className="w-5 h-5" />
-              </button>
-            </div>
-            <form onSubmit={handleAddAtDoor} className="p-4 space-y-3 overflow-y-auto flex-1 min-h-0">
-              <div className="grid grid-cols-2 gap-3">
-                <div>
-                  <label className="block text-xs font-medium mb-1">First Name *</label>
-                  <input type="text" required value={addAtDoorForm.firstName}
-                    onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, firstName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="First name" />
-                </div>
-                <div>
-                  <label className="block text-xs font-medium mb-1">Last Name</label>
-                  <input type="text" value={addAtDoorForm.lastName}
-                    onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, lastName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="Last name" />
-                </div>
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Email</label>
-                <input type="email" value={addAtDoorForm.email}
-                  onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, email: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="email@example.com" />
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Phone</label>
-                <input type="tel" value={addAtDoorForm.phone}
-                  onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, phone: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="+595 981 123456" />
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Admin Note</label>
-                <textarea value={addAtDoorForm.adminNote}
-                  onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, adminNote: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  rows={2} placeholder="Internal note..." />
-              </div>
-              <div className="flex items-center gap-3">
-                <input type="checkbox" id="autoCheckin" checked={addAtDoorForm.autoCheckin}
-                  onChange={(e) => setAddAtDoorForm({ ...addAtDoorForm, autoCheckin: e.target.checked })}
-                  className="w-4 h-4 rounded border-secondary-light-gray text-primary-yellow focus:ring-primary-yellow" />
-                <label htmlFor="autoCheckin" className="text-sm font-medium">Auto check-in immediately</label>
-              </div>
-              <div className="flex gap-3 pt-2">
-                <Button type="button" variant="outline" onClick={() => setShowAddAtDoorModal(false)} className="flex-1 min-h-[44px]">Cancel</Button>
-                <Button type="submit" isLoading={submitting} className="flex-1 min-h-[44px]">Add Attendee</Button>
-              </div>
-            </form>
-          </Card>
-        </div>
-      )}
-
-      {/* Manual Ticket Modal */}
-      {showManualTicketModal && (
-        <div
-          className="fixed inset-0 bg-black/50 z-50 flex items-end md:items-center justify-center p-0 md:p-4"
-          onClick={() => setShowManualTicketModal(false)}
-          role="presentation"
-        >
-          <Card
-            className="w-full md:max-w-md max-h-[90vh] flex flex-col overflow-hidden rounded-t-2xl md:rounded-card"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-center justify-between p-4 border-b border-secondary-light-gray flex-shrink-0">
-              <div>
-                <h2 className="text-base font-bold">Create Manual Ticket</h2>
-                <p className="text-xs text-gray-500">Confirmation email will be sent</p>
-              </div>
-              <button onClick={() => setShowManualTicketModal(false)}
-                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center">
-                <XMarkIcon className="w-5 h-5" />
-              </button>
-            </div>
-            <form onSubmit={handleManualTicket} className="p-4 space-y-3 overflow-y-auto flex-1 min-h-0">
-              <div className="grid grid-cols-2 gap-3">
-                <div>
-                  <label className="block text-xs font-medium mb-1">First Name *</label>
-                  <input type="text" required value={manualTicketForm.firstName}
-                    onChange={(e) => setManualTicketForm({ ...manualTicketForm, firstName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="First name" />
-                </div>
-                <div>
-                  <label className="block text-xs font-medium mb-1">Last Name</label>
-                  <input type="text" value={manualTicketForm.lastName}
-                    onChange={(e) => setManualTicketForm({ ...manualTicketForm, lastName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="Last name" />
-                </div>
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Email *</label>
-                <input type="email" required value={manualTicketForm.email}
-                  onChange={(e) => setManualTicketForm({ ...manualTicketForm, email: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="email@example.com" />
-                <p className="text-[10px] text-gray-500 mt-1">Ticket will be sent to this email</p>
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Phone</label>
-                <input type="tel" value={manualTicketForm.phone}
-                  onChange={(e) => setManualTicketForm({ ...manualTicketForm, phone: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="+595 981 123456" />
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Admin Note</label>
-                <textarea value={manualTicketForm.adminNote}
-                  onChange={(e) => setManualTicketForm({ ...manualTicketForm, adminNote: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  rows={2} placeholder="Internal note..." />
-              </div>
-              <div className="bg-blue-50 border border-blue-200 rounded-lg p-3">
-                <div className="flex items-start gap-2">
-                  <EnvelopeIcon className="w-4 h-4 text-blue-500 mt-0.5 flex-shrink-0" />
-                  <div className="text-xs text-blue-800">
-                    <p className="font-medium">This will send:</p>
-                    <ul className="list-disc ml-4 mt-0.5 space-y-0.5">
-                      <li>Booking confirmation email</li>
-                      <li>Ticket with QR code</li>
-                    </ul>
-                  </div>
-                </div>
-              </div>
-              <div className="flex gap-3 pt-2">
-                <Button type="button" variant="outline" onClick={() => setShowManualTicketModal(false)} className="flex-1 min-h-[44px]">Cancel</Button>
-                <Button type="submit" isLoading={submitting} className="flex-1 min-h-[44px]">
-                  <EnvelopeIcon className="w-4 h-4 mr-1.5" />
-                  Create & Send
-                </Button>
-              </div>
-            </form>
-          </Card>
-        </div>
-      )}
-
-      {/* Invite Guest Modal */}
-      {showInviteGuestModal && (
-        <div
-          className="fixed inset-0 bg-black/50 z-50 flex items-end md:items-center justify-center p-0 md:p-4"
-          onClick={() => setShowInviteGuestModal(false)}
-          role="presentation"
-        >
-          <Card
-            className="w-full md:max-w-md max-h-[90vh] flex flex-col overflow-hidden rounded-t-2xl md:rounded-card"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <div className="flex items-center justify-between p-4 border-b border-secondary-light-gray flex-shrink-0">
-              <div>
-                <h2 className="text-base font-bold">Invite Guest</h2>
-                <p className="text-xs text-gray-500">Free ticket — not counted in revenue</p>
-              </div>
-              <button onClick={() => setShowInviteGuestModal(false)}
-                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center">
-                <XMarkIcon className="w-5 h-5" />
-              </button>
-            </div>
-            <form onSubmit={handleInviteGuest} className="p-4 space-y-3 overflow-y-auto flex-1 min-h-0">
-              <div className="grid grid-cols-2 gap-3">
-                <div>
-                  <label className="block text-xs font-medium mb-1">First Name *</label>
-                  <input type="text" required value={inviteGuestForm.firstName}
-                    onChange={(e) => setInviteGuestForm({ ...inviteGuestForm, firstName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="First name" />
-                </div>
-                <div>
-                  <label className="block text-xs font-medium mb-1">Last Name</label>
-                  <input type="text" value={inviteGuestForm.lastName}
-                    onChange={(e) => setInviteGuestForm({ ...inviteGuestForm, lastName: e.target.value })}
-                    className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                    placeholder="Last name" />
-                </div>
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Email</label>
-                <input type="email" value={inviteGuestForm.email}
-                  onChange={(e) => setInviteGuestForm({ ...inviteGuestForm, email: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="email@example.com (optional)" />
-                <p className="text-[10px] text-gray-500 mt-1">If provided, a confirmation email will be sent</p>
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Phone</label>
-                <input type="tel" value={inviteGuestForm.phone}
-                  onChange={(e) => setInviteGuestForm({ ...inviteGuestForm, phone: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  placeholder="+595 981 123456" />
-              </div>
-              <div>
-                <label className="block text-xs font-medium mb-1">Admin Note</label>
-                <textarea value={inviteGuestForm.adminNote}
-                  onChange={(e) => setInviteGuestForm({ ...inviteGuestForm, adminNote: e.target.value })}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  rows={2} placeholder="Internal note..." />
-              </div>
-              <div className="bg-amber-50 border border-amber-200 rounded-lg p-3">
-                <div className="flex items-start gap-2">
-                  <StarIcon className="w-4 h-4 text-amber-500 mt-0.5 flex-shrink-0" />
-                  <p className="text-xs text-amber-800">
-                    Guest tickets are <strong>free</strong> and are automatically confirmed. They are not counted toward revenue or paid ticket totals.
-                  </p>
-                </div>
-              </div>
-              <div className="flex gap-3 pt-2">
-                <Button type="button" variant="outline" onClick={() => setShowInviteGuestModal(false)} className="flex-1 min-h-[44px]">Cancel</Button>
-                <Button type="submit" isLoading={submitting} className="flex-1 min-h-[44px]">
-                  <StarIcon className="w-4 h-4 mr-1.5" />
-                  Invite Guest
-                </Button>
-              </div>
-            </form>
-          </Card>
-        </div>
-      )}
-
-      {/* Note Modal */}
-      {showNoteModal && selectedTicket && (
-        <div className="fixed inset-0 bg-black/50 z-50 flex items-end md:items-center justify-center p-0 md:p-4">
-          <Card className="w-full md:max-w-md rounded-t-2xl md:rounded-card">
-            <div className="flex items-center justify-between p-4 border-b border-secondary-light-gray">
-              <div>
-                <h2 className="text-base font-bold">Admin Note</h2>
-                <p className="text-xs text-gray-500">{selectedTicket.attendeeFirstName} {selectedTicket.attendeeLastName || ''}</p>
-              </div>
-              <button onClick={() => { setShowNoteModal(false); setSelectedTicket(null); }}
-                className="p-2 hover:bg-gray-100 rounded-btn min-h-[44px] min-w-[44px] flex items-center justify-center">
-                <XMarkIcon className="w-5 h-5" />
-              </button>
-            </div>
-            <div className="p-4 space-y-3">
-              <div>
-                <label className="block text-xs font-medium mb-1">Note</label>
-                <textarea value={noteText} onChange={(e) => setNoteText(e.target.value)}
-                  className="w-full px-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                  rows={4} placeholder="Add a private note..." maxLength={1000} />
-                <p className="text-[10px] text-gray-400 mt-1 text-right">{noteText.length}/1000</p>
-              </div>
-              <div className="flex gap-3">
-                <Button variant="outline" onClick={() => { setShowNoteModal(false); setSelectedTicket(null); }} className="flex-1 min-h-[44px]">Cancel</Button>
-                <Button onClick={handleSaveNote} isLoading={submitting} className="flex-1 min-h-[44px]">Save Note</Button>
-              </div>
-            </div>
-          </Card>
-        </div>
-      )}
-
-      {/* Preview Modal */}
-      {previewHtml && (
-        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-          <Card className="w-full max-w-3xl max-h-[90vh] overflow-hidden flex flex-col">
-            <div className="flex items-center justify-between p-4 border-b border-secondary-light-gray">
-              <h2 className="text-base font-bold">Email Preview</h2>
-              <Button variant="outline" size="sm" onClick={() => setPreviewHtml(null)} className="min-h-[44px] md:min-h-0">Close</Button>
-            </div>
-            <div className="flex-1 overflow-auto">
-              <iframe srcDoc={previewHtml} sandbox="" className="w-full h-full min-h-[500px]" title="Email Preview" />
-            </div>
-          </Card>
-        </div>
-      )}
-    </>
-  );
-}

frontend/src/app/admin/events/[id]/_tabs/AttendeesTab.tsx

@@ -1,355 +0,0 @@
-import { Ticket } from '@/lib/api';
-import { parseDate, EVENT_TIMEZONE } from '@/lib/utils';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import { Dropdown, DropdownItem, MoreMenu } from '@/components/admin/MobileComponents';
-import clsx from 'clsx';
-import {
-  MagnifyingGlassIcon,
-  ChevronDownIcon,
-  ArrowDownTrayIcon,
-  PlusIcon,
-  EnvelopeIcon,
-  StarIcon,
-  FunnelIcon,
-  ChatBubbleLeftIcon,
-} from '@heroicons/react/24/outline';
-import { StatusBadge } from '../_components/StatusBadge';
-import type { AttendeeStatusFilter, PrimaryAction } from '../_types';
-
-interface AttendeesTabProps {
-  locale: string;
-  tickets: Ticket[];
-  filteredTickets: Ticket[];
-  searchQuery: string;
-  setSearchQuery: (value: string) => void;
-  statusFilter: AttendeeStatusFilter;
-  setStatusFilter: (value: AttendeeStatusFilter) => void;
-  pendingCount: number;
-  confirmedCount: number;
-  checkedInCount: number;
-  cancelledCount: number;
-  exporting: boolean;
-  showExportDropdown: boolean;
-  setShowExportDropdown: (value: boolean) => void;
-  showAddTicketDropdown: boolean;
-  setShowAddTicketDropdown: (value: boolean) => void;
-  handleExportAttendees: (status: 'confirmed' | 'checked_in' | 'confirmed_pending' | 'all') => void;
-  setShowManualTicketModal: (value: boolean) => void;
-  setShowAddAtDoorModal: (value: boolean) => void;
-  setShowInviteGuestModal: (value: boolean) => void;
-  setMobileFilterOpen: (value: boolean) => void;
-  setShowExportSheet: (value: boolean) => void;
-  setShowAddTicketSheet: (value: boolean) => void;
-  getPrimaryAction: (ticket: Ticket) => PrimaryAction | null;
-  handleOpenNoteModal: (ticket: Ticket) => void;
-}
-
-export function AttendeesTab({
-  locale,
-  tickets,
-  filteredTickets,
-  searchQuery,
-  setSearchQuery,
-  statusFilter,
-  setStatusFilter,
-  pendingCount,
-  confirmedCount,
-  checkedInCount,
-  cancelledCount,
-  exporting,
-  showExportDropdown,
-  setShowExportDropdown,
-  showAddTicketDropdown,
-  setShowAddTicketDropdown,
-  handleExportAttendees,
-  setShowManualTicketModal,
-  setShowAddAtDoorModal,
-  setShowInviteGuestModal,
-  setMobileFilterOpen,
-  setShowExportSheet,
-  setShowAddTicketSheet,
-  getPrimaryAction,
-  handleOpenNoteModal,
-}: AttendeesTabProps) {
-  return (
-    <div className="space-y-3">
-      {/* Desktop toolbar */}
-      <Card className="p-3 hidden md:block">
-        <div className="flex items-center gap-3">
-          {/* Left: Search + Status */}
-          <div className="relative flex-1 max-w-sm">
-            <MagnifyingGlassIcon className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
-            <input
-              type="text"
-              placeholder="Search name, email, phone..."
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              className="w-full pl-9 pr-3 py-1.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-            />
-          </div>
-          <select
-            value={statusFilter}
-            onChange={(e) => setStatusFilter(e.target.value as AttendeeStatusFilter)}
-            className="px-3 py-1.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-          >
-            <option value="all">All ({tickets.length})</option>
-            <option value="pending">Pending ({pendingCount})</option>
-            <option value="confirmed">Confirmed ({confirmedCount})</option>
-            <option value="checked_in">Checked In ({checkedInCount})</option>
-            <option value="cancelled">Cancelled ({cancelledCount})</option>
-          </select>
-
-          <div className="flex-1" />
-
-          {/* Right: Export + Add Ticket dropdown */}
-          <Dropdown
-            open={showExportDropdown}
-            onOpenChange={setShowExportDropdown}
-            trigger={
-              <Button variant="outline" size="sm" disabled={exporting}>
-                {exporting ? (
-                  <div className="w-3.5 h-3.5 mr-1.5 border-2 border-gray-400 border-t-transparent rounded-full animate-spin" />
-                ) : (
-                  <ArrowDownTrayIcon className="w-3.5 h-3.5 mr-1.5" />
-                )}
-                Export
-                <ChevronDownIcon className="w-3 h-3 ml-1" />
-              </Button>
-            }
-          >
-            <DropdownItem onClick={() => handleExportAttendees('all')}>Export All</DropdownItem>
-            <DropdownItem onClick={() => handleExportAttendees('confirmed')}>Export Confirmed</DropdownItem>
-            <DropdownItem onClick={() => handleExportAttendees('checked_in')}>Export Checked-in</DropdownItem>
-            <DropdownItem onClick={() => handleExportAttendees('confirmed_pending')}>Confirmed &amp; Pending</DropdownItem>
-            <div className="border-t border-gray-100 mx-2" />
-            <div className="px-4 py-1.5 text-[10px] text-gray-400">Format: CSV</div>
-          </Dropdown>
-
-          <Dropdown
-            open={showAddTicketDropdown}
-            onOpenChange={setShowAddTicketDropdown}
-            trigger={
-              <Button size="sm">
-                <PlusIcon className="w-3.5 h-3.5 mr-1.5" />
-                Add Ticket
-                <ChevronDownIcon className="w-3 h-3 ml-1" />
-              </Button>
-            }
-          >
-            <DropdownItem onClick={() => { setShowManualTicketModal(true); setShowAddTicketDropdown(false); }}>
-              <EnvelopeIcon className="w-4 h-4 mr-2" /> Manual Ticket
-            </DropdownItem>
-            <DropdownItem onClick={() => { setShowAddAtDoorModal(true); setShowAddTicketDropdown(false); }}>
-              <PlusIcon className="w-4 h-4 mr-2" /> Add at Door
-            </DropdownItem>
-            <DropdownItem onClick={() => { setShowInviteGuestModal(true); setShowAddTicketDropdown(false); }}>
-              <StarIcon className="w-4 h-4 mr-2" /> Invite Guest
-            </DropdownItem>
-          </Dropdown>
-        </div>
-        {(searchQuery || statusFilter !== 'all') && (
-          <div className="mt-2 text-xs text-gray-500 flex items-center gap-2">
-            <span>Showing {filteredTickets.length} of {tickets.length}</span>
-            <button onClick={() => { setSearchQuery(''); setStatusFilter('all'); }} className="text-primary-yellow hover:underline">
-              Clear
-            </button>
-          </div>
-        )}
-      </Card>
-
-      {/* Mobile toolbar */}
-      <div className="md:hidden space-y-2">
-        <div className="relative">
-          <MagnifyingGlassIcon className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
-          <input
-            type="text"
-            placeholder="Search name, email, phone..."
-            value={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            className="w-full pl-9 pr-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-          />
-        </div>
-        <div className="flex items-center gap-2">
-          <button
-            onClick={() => setMobileFilterOpen(true)}
-            className={clsx(
-              'flex items-center gap-1.5 px-3 py-2 rounded-btn border text-sm min-h-[44px]',
-              statusFilter !== 'all'
-                ? 'border-primary-yellow bg-yellow-50 text-primary-dark'
-                : 'border-secondary-light-gray text-gray-600'
-            )}
-          >
-            <FunnelIcon className="w-4 h-4" />
-            {statusFilter === 'all' ? 'Filter' : statusFilter.replace('_', ' ')}
-          </button>
-          <button
-            onClick={() => setShowExportSheet(true)}
-            disabled={exporting}
-            className="flex items-center gap-1.5 px-3 py-2 rounded-btn border border-secondary-light-gray text-sm text-gray-600 min-h-[44px]"
-          >
-            <ArrowDownTrayIcon className="w-4 h-4" />
-            Export
-          </button>
-          {(searchQuery || statusFilter !== 'all') && (
-            <button
-              onClick={() => { setSearchQuery(''); setStatusFilter('all'); }}
-              className="text-xs text-primary-yellow ml-auto min-h-[44px] flex items-center"
-            >
-              Clear
-            </button>
-          )}
-        </div>
-        {(searchQuery || statusFilter !== 'all') && (
-          <p className="text-xs text-gray-500">Showing {filteredTickets.length} of {tickets.length}</p>
-        )}
-      </div>
-
-      {/* Desktop: Dense table */}
-      <Card className="overflow-hidden hidden md:block">
-        <div className="overflow-x-auto">
-          <table className="w-full">
-            <thead className="bg-gray-50">
-              <tr>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Attendee</th>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Contact</th>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Booked</th>
-                <th className="text-right px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
-              </tr>
-            </thead>
-            <tbody className="divide-y divide-gray-100">
-              {filteredTickets.length === 0 ? (
-                <tr>
-                  <td colSpan={5} className="px-4 py-10 text-center text-gray-500 text-sm">
-                    {tickets.length === 0 ? 'No attendees yet' : 'No attendees match the current filters'}
-                  </td>
-                </tr>
-              ) : (
-                filteredTickets.map((ticket) => {
-                  const primary = getPrimaryAction(ticket);
-                  return (
-                    <tr key={ticket.id} className="hover:bg-gray-50/50">
-                      <td className="px-4 py-2.5">
-                        <p className="font-medium text-sm">{ticket.attendeeFirstName} {ticket.attendeeLastName || ''}</p>
-                        {ticket.bookingId && (
-                          <span className="text-[10px] text-purple-600" title={`Booking: ${ticket.bookingId}`}>
-                            Group booking
-                          </span>
-                        )}
-                      </td>
-                      <td className="px-4 py-2.5">
-                        <p className="text-sm text-gray-600 truncate max-w-[200px]">{ticket.attendeeEmail}</p>
-                        {ticket.attendeePhone && <p className="text-xs text-gray-400">{ticket.attendeePhone}</p>}
-                      </td>
-                      <td className="px-4 py-2.5">
-                        <div className="flex items-center gap-1 flex-wrap">
-                          <StatusBadge status={ticket.status} compact />
-                          {!!ticket.isGuest && (
-                            <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-amber-100 text-amber-700 font-medium">Guest</span>
-                          )}
-                        </div>
-                        {ticket.checkinAt && (
-                          <p className="text-[10px] text-gray-400 mt-0.5">
-                            {parseDate(ticket.checkinAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE })}
-                          </p>
-                        )}
-                      </td>
-                      <td className="px-4 py-2.5 text-xs text-gray-500">
-                        {parseDate(ticket.createdAt).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: EVENT_TIMEZONE })}
-                      </td>
-                      <td className="px-4 py-2.5">
-                        <div className="flex items-center justify-end gap-1">
-                          {primary && (
-                            <Button size="sm" variant={primary.variant} onClick={primary.onClick} className="text-xs px-2 py-1">
-                              {primary.icon && <primary.icon className="w-3 h-3 mr-1" />}
-                              {primary.label}
-                            </Button>
-                          )}
-                          <MoreMenu>
-                            <DropdownItem onClick={() => handleOpenNoteModal(ticket)}>
-                              <ChatBubbleLeftIcon className="w-4 h-4 mr-2" />
-                              {ticket.adminNote ? 'Edit Note' : 'Add Note'}
-                            </DropdownItem>
-                            {ticket.adminNote && (
-                              <div className="px-4 py-1.5 text-[10px] text-gray-400 truncate max-w-[180px]">
-                                Note: {ticket.adminNote}
-                              </div>
-                            )}
-                            <div className="px-4 py-1.5 text-[10px] text-gray-400 font-mono" title={ticket.id}>
-                              ID: {ticket.id.slice(0, 8)}...
-                            </div>
-                          </MoreMenu>
-                        </div>
-                      </td>
-                    </tr>
-                  );
-                })
-              )}
-            </tbody>
-          </table>
-        </div>
-      </Card>
-
-      {/* Mobile: Card layout */}
-      <div className="md:hidden space-y-2">
-        {filteredTickets.length === 0 ? (
-          <div className="text-center py-10 text-gray-500 text-sm">
-            {tickets.length === 0 ? 'No attendees yet' : 'No attendees match the current filters'}
-          </div>
-        ) : (
-          filteredTickets.map((ticket) => {
-            const primary = getPrimaryAction(ticket);
-            return (
-              <Card key={ticket.id} className="p-3">
-                <div className="flex items-start justify-between gap-2">
-                  <div className="min-w-0 flex-1">
-                    <p className="font-medium text-sm truncate">{ticket.attendeeFirstName} {ticket.attendeeLastName || ''}</p>
-                    <p className="text-xs text-gray-500 truncate">{ticket.attendeeEmail}</p>
-                    {ticket.attendeePhone && <p className="text-[10px] text-gray-400">{ticket.attendeePhone}</p>}
-                  </div>
-                  <div className="flex items-center gap-1.5 flex-shrink-0 flex-wrap justify-end">
-                    <StatusBadge status={ticket.status} compact />
-                    {!!ticket.isGuest && (
-                      <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-amber-100 text-amber-700 font-medium">Guest</span>
-                    )}
-                  </div>
-                </div>
-                <div className="flex items-center justify-between mt-2 pt-2 border-t border-gray-100">
-                  <p className="text-[10px] text-gray-400">
-                    {parseDate(ticket.createdAt).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', { timeZone: EVENT_TIMEZONE })}
-                    {ticket.checkinAt && ` · Checked in ${parseDate(ticket.checkinAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE })}`}
-                  </p>
-                  <div className="flex items-center gap-1">
-                    {primary && (
-                      <Button size="sm" variant={primary.variant} onClick={primary.onClick} className="text-xs px-2.5 py-1.5 min-h-[36px]">
-                        {primary.icon && <primary.icon className="w-3 h-3 mr-1" />}
-                        {primary.label}
-                      </Button>
-                    )}
-                    <MoreMenu>
-                      <DropdownItem onClick={() => handleOpenNoteModal(ticket)}>
-                        <ChatBubbleLeftIcon className="w-4 h-4 mr-2" />
-                        {ticket.adminNote ? 'Edit Note' : 'Add Note'}
-                      </DropdownItem>
-                    </MoreMenu>
-                  </div>
-                </div>
-              </Card>
-            );
-          })
-        )}
-      </div>
-
-      {/* Mobile FAB */}
-      <div className="md:hidden fixed bottom-6 right-6 z-40">
-        <button
-          onClick={() => setShowAddTicketSheet(true)}
-          className="w-14 h-14 bg-primary-yellow text-primary-dark rounded-full shadow-lg flex items-center justify-center hover:bg-yellow-400 active:scale-95 transition-transform"
-        >
-          <PlusIcon className="w-6 h-6" />
-        </button>
-      </div>
-    </div>
-  );
-}

frontend/src/app/admin/events/[id]/_tabs/EmailTab.tsx

@@ -1,155 +0,0 @@
-import { EmailTemplate } from '@/lib/api';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import clsx from 'clsx';
-import {
-  EyeIcon,
-  PaperAirplaneIcon,
-  CheckCircleIcon,
-  ClockIcon,
-  TicketIcon,
-  XCircleIcon,
-} from '@heroicons/react/24/outline';
-
-type RecipientFilter = 'all' | 'confirmed' | 'pending' | 'checked_in';
-
-interface EmailTabProps {
-  templates: EmailTemplate[];
-  selectedTemplate: string;
-  setSelectedTemplate: (value: string) => void;
-  recipientFilter: RecipientFilter;
-  setRecipientFilter: (value: RecipientFilter) => void;
-  customMessage: string;
-  setCustomMessage: (value: string) => void;
-  sending: boolean;
-  handlePreviewEmail: () => void;
-  handleSendEmail: () => void;
-  getFilteredRecipientCount: () => number;
-  ticketsCount: number;
-  confirmedCount: number;
-  pendingCount: number;
-  checkedInCount: number;
-  cancelledCount: number;
-}
-
-export function EmailTab({
-  templates,
-  selectedTemplate,
-  setSelectedTemplate,
-  recipientFilter,
-  setRecipientFilter,
-  customMessage,
-  setCustomMessage,
-  sending,
-  handlePreviewEmail,
-  handleSendEmail,
-  getFilteredRecipientCount,
-  ticketsCount,
-  confirmedCount,
-  pendingCount,
-  checkedInCount,
-  cancelledCount,
-}: EmailTabProps) {
-  return (
-    <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
-      <Card className="p-5">
-        <h3 className="font-semibold text-base mb-3">Send Email to Attendees</h3>
-
-        <div className="space-y-3">
-          <div>
-            <label className="block text-sm font-medium mb-1">Email Template</label>
-            <select
-              value={selectedTemplate}
-              onChange={(e) => setSelectedTemplate(e.target.value)}
-              className="w-full px-3 py-2.5 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow text-sm"
-            >
-              <option value="">Select a template...</option>
-              {templates.map((template) => (
-                <option key={template.id} value={template.slug}>
-                  {template.name}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium mb-1">Recipients</label>
-            <select
-              value={recipientFilter}
-              onChange={(e) => setRecipientFilter(e.target.value as RecipientFilter)}
-              className="w-full px-3 py-2.5 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow text-sm"
-            >
-              <option value="all">All Attendees ({ticketsCount})</option>
-              <option value="confirmed">Confirmed Only ({confirmedCount})</option>
-              <option value="pending">Pending Only ({pendingCount})</option>
-              <option value="checked_in">Checked In Only ({checkedInCount})</option>
-            </select>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium mb-1">Custom Message (optional)</label>
-            <textarea
-              value={customMessage}
-              onChange={(e) => setCustomMessage(e.target.value)}
-              className="w-full px-3 py-2.5 rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow text-sm"
-              rows={3}
-              placeholder="Add a custom message that will be included in the email..."
-            />
-            <p className="text-[10px] text-gray-500 mt-1">
-              This message will replace the {`{{customMessage}}`} variable in the template.
-            </p>
-          </div>
-
-          <div className="flex flex-wrap gap-2 pt-1">
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={handlePreviewEmail}
-              disabled={!selectedTemplate}
-              className="min-h-[44px] md:min-h-0"
-            >
-              <EyeIcon className="w-4 h-4 mr-1.5" />
-              Preview
-            </Button>
-            <Button
-              size="sm"
-              onClick={handleSendEmail}
-              disabled={!selectedTemplate || getFilteredRecipientCount() === 0}
-              isLoading={sending}
-              className="min-h-[44px] md:min-h-0"
-            >
-              <PaperAirplaneIcon className="w-4 h-4 mr-1.5" />
-              Send to {getFilteredRecipientCount()} {getFilteredRecipientCount() === 1 ? 'person' : 'people'}
-            </Button>
-          </div>
-        </div>
-      </Card>
-
-      <Card className="p-5">
-        <h3 className="font-semibold text-base mb-3">Recipient Summary</h3>
-        <div className="space-y-2">
-          {[
-            { label: 'Confirmed', count: confirmedCount, icon: CheckCircleIcon, color: 'text-green-500' },
-            { label: 'Pending Payment', count: pendingCount, icon: ClockIcon, color: 'text-yellow-500' },
-            { label: 'Checked In', count: checkedInCount, icon: TicketIcon, color: 'text-blue-500' },
-            { label: 'Cancelled', count: cancelledCount, icon: XCircleIcon, color: 'text-red-500' },
-          ].map((item) => (
-            <div key={item.label} className="flex items-center justify-between p-2.5 bg-gray-50 rounded-btn">
-              <div className="flex items-center gap-2">
-                <item.icon className={clsx('w-4 h-4', item.color)} />
-                <span className="text-sm">{item.label}</span>
-              </div>
-              <span className="font-semibold text-sm">{item.count}</span>
-            </div>
-          ))}
-          <div className="border-t pt-2 mt-2">
-            <div className="flex items-center justify-between font-semibold text-sm">
-              <span>Total Bookings</span>
-              <span>{ticketsCount}</span>
-            </div>
-          </div>
-        </div>
-      </Card>
-    </div>
-  );
-}

frontend/src/app/admin/events/[id]/_tabs/OverviewTab.tsx

@@ -1,83 +0,0 @@
-import { Event } from '@/lib/api';
-import Card from '@/components/ui/Card';
-import { CalendarIcon, MapPinIcon, CurrencyDollarIcon, UsersIcon } from '@heroicons/react/24/outline';
-
-interface OverviewTabProps {
-  event: Event;
-  formatDate: (dateStr: string) => string;
-  fmtTime: (dateStr: string) => string;
-  formatCurrency: (amount: number, currency: string) => string;
-  confirmedCount: number;
-  checkedInCount: number;
-}
-
-export function OverviewTab({ event, formatDate, fmtTime, formatCurrency, confirmedCount, checkedInCount }: OverviewTabProps) {
-  return (
-    <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
-      <Card className="p-5">
-        <h3 className="font-semibold text-base mb-3">Event Information</h3>
-        <div className="space-y-3">
-          <div className="flex items-start gap-3">
-            <CalendarIcon className="w-5 h-5 text-gray-400 mt-0.5 flex-shrink-0" />
-            <div>
-              <p className="font-medium text-sm">Date & Time</p>
-              <p className="text-sm text-gray-600">{formatDate(event.startDatetime)}</p>
-              <p className="text-sm text-gray-600">{fmtTime(event.startDatetime)}{event.endDatetime && ` - ${fmtTime(event.endDatetime)}`}</p>
-            </div>
-          </div>
-          <div className="flex items-start gap-3">
-            <MapPinIcon className="w-5 h-5 text-gray-400 mt-0.5 flex-shrink-0" />
-            <div>
-              <p className="font-medium text-sm">Location</p>
-              <p className="text-sm text-gray-600">{event.location}</p>
-              {event.locationUrl && (
-                <a href={event.locationUrl} target="_blank" rel="noopener" className="text-blue-600 text-xs hover:underline">
-                  View on Map
-                </a>
-              )}
-            </div>
-          </div>
-          <div className="flex items-start gap-3">
-            <CurrencyDollarIcon className="w-5 h-5 text-gray-400 mt-0.5 flex-shrink-0" />
-            <div>
-              <p className="font-medium text-sm">Price</p>
-              <p className="text-sm text-gray-600">{event.price === 0 ? 'Free' : formatCurrency(event.price, event.currency)}</p>
-            </div>
-          </div>
-          <div className="flex items-start gap-3">
-            <UsersIcon className="w-5 h-5 text-gray-400 mt-0.5 flex-shrink-0" />
-            <div>
-              <p className="font-medium text-sm">Capacity</p>
-              <p className="text-sm text-gray-600">{confirmedCount + checkedInCount} / {event.capacity} spots filled</p>
-              <p className="text-xs text-gray-500">{Math.max(0, event.capacity - confirmedCount - checkedInCount)} spots remaining</p>
-            </div>
-          </div>
-        </div>
-      </Card>
-
-      <Card className="p-5">
-        <h3 className="font-semibold text-base mb-3">Description</h3>
-        <div className="prose prose-sm max-w-none">
-          <p className="text-sm text-gray-600 whitespace-pre-wrap">{event.description}</p>
-          {event.descriptionEs && (
-            <>
-              <p className="font-medium text-sm mt-3">Spanish:</p>
-              <p className="text-sm text-gray-600 whitespace-pre-wrap">{event.descriptionEs}</p>
-            </>
-          )}
-        </div>
-      </Card>
-
-      {event.bannerUrl && (
-        <Card className="p-5 lg:col-span-2">
-          <h3 className="font-semibold text-base mb-3">Event Banner</h3>
-          <img
-            src={event.bannerUrl}
-            alt={event.title}
-            className="w-full max-h-64 object-cover rounded-lg"
-          />
-        </Card>
-      )}
-    </div>
-  );
-}

frontend/src/app/admin/events/[id]/_tabs/PaymentsTab.tsx

@@ -1,406 +0,0 @@
-import { PaymentOptionsConfig } from '@/lib/api';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import clsx from 'clsx';
-import {
-  CreditCardIcon,
-  BuildingLibraryIcon,
-  BoltIcon,
-  BanknotesIcon,
-  ArrowPathIcon,
-  CheckCircleIcon,
-  XCircleIcon,
-} from '@heroicons/react/24/outline';
-import type { PaymentOverridesController } from '../_hooks/usePaymentOverrides';
-
-interface PaymentsTabProps {
-  locale: string;
-  payments: PaymentOverridesController;
-}
-
-export function PaymentsTab({ locale, payments }: PaymentsTabProps) {
-  const {
-    loadingPayments,
-    hasPaymentOverrides,
-    savingPayments,
-    globalPaymentOptions,
-    paymentOverrides,
-    getEffectivePaymentOption,
-    updatePaymentOverride,
-    handleResetToGlobal,
-    handleSavePaymentOptions,
-  } = payments;
-
-  return (
-    <div className="space-y-4">
-      {loadingPayments ? (
-        <div className="flex items-center justify-center py-12">
-          <div className="animate-spin w-8 h-8 border-4 border-primary-yellow border-t-transparent rounded-full" />
-        </div>
-      ) : (
-        <>
-          {/* Header */}
-          <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-2">
-            <div>
-              <h3 className="font-semibold text-base">
-                {locale === 'es' ? 'Métodos de Pago del Evento' : 'Event Payment Methods'}
-              </h3>
-              <p className="text-xs text-gray-500">
-                {hasPaymentOverrides
-                  ? (locale === 'es' ? 'Configuración personalizada' : 'Custom settings')
-                  : (locale === 'es' ? 'Usando configuración global' : 'Using global settings')}
-              </p>
-            </div>
-            <div className="flex items-center gap-2">
-              {hasPaymentOverrides && (
-                <Button variant="outline" size="sm" onClick={handleResetToGlobal} disabled={savingPayments} className="min-h-[44px] md:min-h-0">
-                  <ArrowPathIcon className="w-4 h-4 mr-1.5" />
-                  {locale === 'es' ? 'Resetear' : 'Reset'}
-                </Button>
-              )}
-              <Button size="sm" onClick={handleSavePaymentOptions} isLoading={savingPayments} className="min-h-[44px] md:min-h-0">
-                {locale === 'es' ? 'Guardar' : 'Save'}
-              </Button>
-            </div>
-          </div>
-
-          {/* TPago */}
-          <Card>
-            <div className="p-4 md:p-5">
-              <div className="flex items-center justify-between mb-3">
-                <div className="flex items-center gap-2.5">
-                  <div className="w-8 h-8 bg-blue-100 rounded-full flex items-center justify-center flex-shrink-0">
-                    <CreditCardIcon className="w-4 h-4 text-blue-600" />
-                  </div>
-                  <div>
-                    <h4 className="font-semibold text-sm">
-                      {locale === 'es' ? 'TPago / Tarjeta' : 'TPago / Card'}
-                    </h4>
-                    <p className="text-[10px] text-gray-500">
-                      {locale === 'es' ? 'Requiere aprobación' : 'Requires approval'}
-                    </p>
-                  </div>
-                </div>
-                <div className="flex items-center gap-2">
-                  {globalPaymentOptions && !globalPaymentOptions.tpagoEnabled && (
-                    <span className="text-[10px] text-gray-400 hidden sm:inline">
-                      {locale === 'es' ? '(Deshabilitado global)' : '(Disabled globally)'}
-                    </span>
-                  )}
-                  <button
-                    onClick={() => updatePaymentOverride('tpagoEnabled', !getEffectivePaymentOption('tpagoEnabled'))}
-                    className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${
-                      getEffectivePaymentOption('tpagoEnabled') ? 'bg-primary-yellow' : 'bg-gray-300'
-                    }`}
-                  >
-                    <span className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${
-                      getEffectivePaymentOption('tpagoEnabled') ? 'translate-x-6' : 'translate-x-1'
-                    }`} />
-                  </button>
-                </div>
-              </div>
-
-              {getEffectivePaymentOption('tpagoEnabled') && (
-                <div className="space-y-3 pt-3 border-t">
-                  <div>
-                    <label className="block text-xs font-medium text-gray-700 mb-1">
-                      {locale === 'es' ? 'Enlaces de Pago TPago (por cantidad de tickets)' : 'TPago Payment Links (per ticket quantity)'}
-                    </label>
-                    <p className="text-[10px] text-gray-500 mb-2">
-                      {locale === 'es'
-                        ? 'Cada enlace tiene un monto fijo. Un enlace distinto por cantidad de tickets.'
-                        : 'Each link has a fixed amount. One link per ticket quantity.'}
-                    </p>
-                    <div className="space-y-2">
-                      {([1, 2, 3, 4, 5] as const).map((qty) => {
-                        const key = (qty === 1 ? 'tpagoLink' : `tpagoLink${qty}`) as keyof PaymentOptionsConfig;
-                        return (
-                          <div key={qty} className="flex items-center gap-2">
-                            <span className="text-xs font-medium text-gray-600 w-20 flex-shrink-0">
-                              {qty} {qty === 1 ? 'ticket' : 'tickets'}
-                            </span>
-                            <input
-                              type="url"
-                              value={(paymentOverrides[key] as string | null) ?? ''}
-                              onChange={(e) => updatePaymentOverride(key, (e.target.value || null) as any)}
-                              placeholder={(globalPaymentOptions?.[key] as string | null) || 'https://www.tpago.com.py/links?alias=...'}
-                              className="flex-1 px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                            />
-                          </div>
-                        );
-                      })}
-                    </div>
-                  </div>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Instructions (EN)</label>
-                      <textarea
-                        value={paymentOverrides.tpagoInstructions ?? ''}
-                        onChange={(e) => updatePaymentOverride('tpagoInstructions', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.tpagoInstructions || 'Instructions for users...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Instrucciones (ES)</label>
-                      <textarea
-                        value={paymentOverrides.tpagoInstructionsEs ?? ''}
-                        onChange={(e) => updatePaymentOverride('tpagoInstructionsEs', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.tpagoInstructionsEs || 'Instrucciones para usuarios...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                  </div>
-                  <p className="text-[10px] text-gray-400">
-                    {locale === 'es' ? 'Vacío = configuración global' : 'Empty = global settings'}
-                  </p>
-                </div>
-              )}
-            </div>
-          </Card>
-
-          {/* Bank Transfer */}
-          <Card>
-            <div className="p-4 md:p-5">
-              <div className="flex items-center justify-between mb-3">
-                <div className="flex items-center gap-2.5">
-                  <div className="w-8 h-8 bg-green-100 rounded-full flex items-center justify-center flex-shrink-0">
-                    <BuildingLibraryIcon className="w-4 h-4 text-green-600" />
-                  </div>
-                  <div>
-                    <h4 className="font-semibold text-sm">
-                      {locale === 'es' ? 'Transferencia Bancaria' : 'Bank Transfer'}
-                    </h4>
-                    <p className="text-[10px] text-gray-500">
-                      {locale === 'es' ? 'Requiere aprobación' : 'Requires approval'}
-                    </p>
-                  </div>
-                </div>
-                <div className="flex items-center gap-2">
-                  {globalPaymentOptions && !globalPaymentOptions.bankTransferEnabled && (
-                    <span className="text-[10px] text-gray-400 hidden sm:inline">
-                      {locale === 'es' ? '(Deshabilitado global)' : '(Disabled globally)'}
-                    </span>
-                  )}
-                  <button
-                    onClick={() => updatePaymentOverride('bankTransferEnabled', !getEffectivePaymentOption('bankTransferEnabled'))}
-                    className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${
-                      getEffectivePaymentOption('bankTransferEnabled') ? 'bg-primary-yellow' : 'bg-gray-300'
-                    }`}
-                  >
-                    <span className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${
-                      getEffectivePaymentOption('bankTransferEnabled') ? 'translate-x-6' : 'translate-x-1'
-                    }`} />
-                  </button>
-                </div>
-              </div>
-
-              {getEffectivePaymentOption('bankTransferEnabled') && (
-                <div className="space-y-3 pt-3 border-t">
-                  <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                    {[
-                      { label: locale === 'es' ? 'Banco' : 'Bank Name', key: 'bankName' as const, placeholder: 'e.g., Banco Itaú' },
-                      { label: locale === 'es' ? 'Titular' : 'Account Holder', key: 'bankAccountHolder' as const, placeholder: 'e.g., Juan Pérez' },
-                      { label: locale === 'es' ? 'N° Cuenta' : 'Account Number', key: 'bankAccountNumber' as const, placeholder: 'e.g., 1234567890' },
-                      { label: 'Alias', key: 'bankAlias' as const, placeholder: 'e.g., spanglish.pagos' },
-                      { label: locale === 'es' ? 'Teléfono' : 'Phone', key: 'bankPhone' as const, placeholder: '+595 981 123456' },
-                    ].map((field) => (
-                      <div key={field.key}>
-                        <label className="block text-xs font-medium text-gray-700 mb-1">{field.label}</label>
-                        <input
-                          type="text"
-                          value={(paymentOverrides as any)[field.key] ?? ''}
-                          onChange={(e) => updatePaymentOverride(field.key, e.target.value || null)}
-                          placeholder={(globalPaymentOptions as any)?.[field.key] || field.placeholder}
-                          className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                        />
-                      </div>
-                    ))}
-                  </div>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Notes (EN)</label>
-                      <textarea
-                        value={paymentOverrides.bankNotes ?? ''}
-                        onChange={(e) => updatePaymentOverride('bankNotes', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.bankNotes || 'Additional notes...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Notas (ES)</label>
-                      <textarea
-                        value={paymentOverrides.bankNotesEs ?? ''}
-                        onChange={(e) => updatePaymentOverride('bankNotesEs', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.bankNotesEs || 'Notas adicionales...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                  </div>
-                  <p className="text-[10px] text-gray-400">
-                    {locale === 'es' ? 'Vacío = configuración global' : 'Empty = global settings'}
-                  </p>
-                </div>
-              )}
-            </div>
-          </Card>
-
-          {/* Bitcoin Lightning */}
-          <Card>
-            <div className="p-4 md:p-5">
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-2.5">
-                  <div className="w-8 h-8 bg-orange-100 rounded-full flex items-center justify-center flex-shrink-0">
-                    <BoltIcon className="w-4 h-4 text-orange-600" />
-                  </div>
-                  <div>
-                    <h4 className="font-semibold text-sm">Bitcoin Lightning</h4>
-                    <p className="text-[10px] text-gray-500">
-                      {locale === 'es' ? 'Confirmación automática' : 'Auto confirmation'}
-                    </p>
-                  </div>
-                </div>
-                <div className="flex items-center gap-2">
-                  {globalPaymentOptions && !globalPaymentOptions.lightningEnabled && (
-                    <span className="text-[10px] text-gray-400 hidden sm:inline">
-                      {locale === 'es' ? '(Deshabilitado global)' : '(Disabled globally)'}
-                    </span>
-                  )}
-                  <button
-                    onClick={() => updatePaymentOverride('lightningEnabled', !getEffectivePaymentOption('lightningEnabled'))}
-                    className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${
-                      getEffectivePaymentOption('lightningEnabled') ? 'bg-primary-yellow' : 'bg-gray-300'
-                    }`}
-                  >
-                    <span className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${
-                      getEffectivePaymentOption('lightningEnabled') ? 'translate-x-6' : 'translate-x-1'
-                    }`} />
-                  </button>
-                </div>
-              </div>
-              {getEffectivePaymentOption('lightningEnabled') && (
-                <div className="pt-3 border-t mt-3">
-                  <div className="bg-orange-50 border border-orange-200 rounded-lg p-3">
-                    <p className="text-xs text-orange-800">
-                      {locale === 'es'
-                        ? 'Lightning configurado vía LNbits. No personalizable por evento.'
-                        : 'Lightning is configured via LNbits. Cannot be customized per event.'}
-                    </p>
-                  </div>
-                </div>
-              )}
-            </div>
-          </Card>
-
-          {/* Cash at Door */}
-          <Card>
-            <div className="p-4 md:p-5">
-              <div className="flex items-center justify-between mb-3">
-                <div className="flex items-center gap-2.5">
-                  <div className="w-8 h-8 bg-yellow-100 rounded-full flex items-center justify-center flex-shrink-0">
-                    <BanknotesIcon className="w-4 h-4 text-yellow-600" />
-                  </div>
-                  <div>
-                    <h4 className="font-semibold text-sm">
-                      {locale === 'es' ? 'Efectivo' : 'Cash at Door'}
-                    </h4>
-                    <p className="text-[10px] text-gray-500">
-                      {locale === 'es' ? 'Requiere aprobación' : 'Requires approval'}
-                    </p>
-                  </div>
-                </div>
-                <div className="flex items-center gap-2">
-                  {globalPaymentOptions && !globalPaymentOptions.cashEnabled && (
-                    <span className="text-[10px] text-gray-400 hidden sm:inline">
-                      {locale === 'es' ? '(Deshabilitado global)' : '(Disabled globally)'}
-                    </span>
-                  )}
-                  <button
-                    onClick={() => updatePaymentOverride('cashEnabled', !getEffectivePaymentOption('cashEnabled'))}
-                    className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${
-                      getEffectivePaymentOption('cashEnabled') ? 'bg-primary-yellow' : 'bg-gray-300'
-                    }`}
-                  >
-                    <span className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${
-                      getEffectivePaymentOption('cashEnabled') ? 'translate-x-6' : 'translate-x-1'
-                    }`} />
-                  </button>
-                </div>
-              </div>
-
-              {getEffectivePaymentOption('cashEnabled') && (
-                <div className="space-y-3 pt-3 border-t">
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Instructions (EN)</label>
-                      <textarea
-                        value={paymentOverrides.cashInstructions ?? ''}
-                        onChange={(e) => updatePaymentOverride('cashInstructions', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.cashInstructions || 'Cash payment instructions...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                    <div>
-                      <label className="block text-xs font-medium text-gray-700 mb-1">Instrucciones (ES)</label>
-                      <textarea
-                        value={paymentOverrides.cashInstructionsEs ?? ''}
-                        onChange={(e) => updatePaymentOverride('cashInstructionsEs', e.target.value || null)}
-                        rows={2}
-                        placeholder={globalPaymentOptions?.cashInstructionsEs || 'Instrucciones de pago en efectivo...'}
-                        className="w-full px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-                      />
-                    </div>
-                  </div>
-                  <p className="text-[10px] text-gray-400">
-                    {locale === 'es' ? 'Vacío = configuración global' : 'Empty = global settings'}
-                  </p>
-                </div>
-              )}
-            </div>
-          </Card>
-
-          {/* Summary */}
-          <Card>
-            <div className="p-4 md:p-5">
-              <h4 className="font-semibold text-sm mb-3">
-                {locale === 'es' ? 'Resumen' : 'Active Methods'}
-              </h4>
-              <div className="grid grid-cols-2 md:grid-cols-4 gap-3">
-                {[
-                  { label: 'TPago', enabled: getEffectivePaymentOption('tpagoEnabled') },
-                  { label: locale === 'es' ? 'Transferencia' : 'Bank Transfer', enabled: getEffectivePaymentOption('bankTransferEnabled') },
-                  { label: 'Lightning', enabled: getEffectivePaymentOption('lightningEnabled') },
-                  { label: locale === 'es' ? 'Efectivo' : 'Cash', enabled: getEffectivePaymentOption('cashEnabled') },
-                ].map((method) => (
-                  <div key={method.label} className="flex items-center gap-1.5">
-                    {method.enabled ? (
-                      <CheckCircleIcon className="w-4 h-4 text-green-500" />
-                    ) : (
-                      <XCircleIcon className="w-4 h-4 text-gray-300" />
-                    )}
-                    <span className={clsx('text-sm', method.enabled ? 'text-gray-900' : 'text-gray-400')}>
-                      {method.label}
-                    </span>
-                  </div>
-                ))}
-              </div>
-              {hasPaymentOverrides && (
-                <p className="text-[10px] text-gray-500 mt-3 flex items-center gap-1">
-                  <span className="inline-block w-1.5 h-1.5 bg-primary-yellow rounded-full" />
-                  {locale === 'es'
-                    ? 'Configuración personalizada activa'
-                    : 'Custom settings override global defaults'}
-                </p>
-              )}
-            </div>
-          </Card>
-        </>
-      )}
-    </div>
-  );
-}

frontend/src/app/admin/events/[id]/_tabs/TicketsTab.tsx

@@ -1,258 +0,0 @@
-import { Ticket } from '@/lib/api';
-import { parseDate, EVENT_TIMEZONE } from '@/lib/utils';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import { Dropdown, DropdownItem, MoreMenu } from '@/components/admin/MobileComponents';
-import {
-  MagnifyingGlassIcon,
-  ChevronDownIcon,
-  ArrowDownTrayIcon,
-  ArrowUturnLeftIcon,
-} from '@heroicons/react/24/outline';
-import type { TicketStatusFilter } from '../_types';
-
-interface TicketsTabProps {
-  locale: string;
-  confirmedTickets: Ticket[];
-  filteredConfirmedTickets: Ticket[];
-  ticketSearchQuery: string;
-  setTicketSearchQuery: (value: string) => void;
-  ticketStatusFilter: TicketStatusFilter;
-  setTicketStatusFilter: (value: TicketStatusFilter) => void;
-  confirmedCount: number;
-  checkedInCount: number;
-  exporting: boolean;
-  showTicketExportDropdown: boolean;
-  setShowTicketExportDropdown: (value: boolean) => void;
-  handleExportTickets: (status: 'confirmed' | 'checked_in' | 'all') => void;
-  handleCheckin: (ticketId: string) => void;
-  handleRemoveCheckin: (ticketId: string) => void;
-  setShowTicketExportSheet: (value: boolean) => void;
-}
-
-export function TicketsTab({
-  locale,
-  confirmedTickets,
-  filteredConfirmedTickets,
-  ticketSearchQuery,
-  setTicketSearchQuery,
-  ticketStatusFilter,
-  setTicketStatusFilter,
-  confirmedCount,
-  checkedInCount,
-  exporting,
-  showTicketExportDropdown,
-  setShowTicketExportDropdown,
-  handleExportTickets,
-  handleCheckin,
-  handleRemoveCheckin,
-  setShowTicketExportSheet,
-}: TicketsTabProps) {
-  return (
-    <div className="space-y-3">
-      {/* Desktop toolbar */}
-      <Card className="p-3 hidden md:block">
-        <div className="flex items-center gap-3">
-          <div className="relative flex-1 max-w-sm">
-            <MagnifyingGlassIcon className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
-            <input
-              type="text"
-              placeholder="Search by name or ticket ID..."
-              value={ticketSearchQuery}
-              onChange={(e) => setTicketSearchQuery(e.target.value)}
-              className="w-full pl-9 pr-3 py-1.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-            />
-          </div>
-          <select
-            value={ticketStatusFilter}
-            onChange={(e) => setTicketStatusFilter(e.target.value as TicketStatusFilter)}
-            className="px-3 py-1.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-          >
-            <option value="all">All ({confirmedTickets.length})</option>
-            <option value="confirmed">Valid ({confirmedCount})</option>
-            <option value="checked_in">Checked In ({checkedInCount})</option>
-          </select>
-          <div className="flex-1" />
-          <Dropdown
-            open={showTicketExportDropdown}
-            onOpenChange={setShowTicketExportDropdown}
-            trigger={
-              <Button variant="outline" size="sm" disabled={exporting}>
-                <ArrowDownTrayIcon className="w-3.5 h-3.5 mr-1.5" />
-                Export
-                <ChevronDownIcon className="w-3 h-3 ml-1" />
-              </Button>
-            }
-          >
-            <DropdownItem onClick={() => handleExportTickets('all')}>Export All</DropdownItem>
-            <DropdownItem onClick={() => handleExportTickets('confirmed')}>Export Valid</DropdownItem>
-            <DropdownItem onClick={() => handleExportTickets('checked_in')}>Export Checked-in</DropdownItem>
-            <div className="border-t border-gray-100 mx-2" />
-            <div className="px-4 py-1.5 text-[10px] text-gray-400">Format: CSV</div>
-          </Dropdown>
-        </div>
-        {(ticketSearchQuery || ticketStatusFilter !== 'all') && (
-          <div className="mt-2 text-xs text-gray-500 flex items-center gap-2">
-            <span>Showing {filteredConfirmedTickets.length} of {confirmedTickets.length}</span>
-            <button onClick={() => { setTicketSearchQuery(''); setTicketStatusFilter('all'); }} className="text-primary-yellow hover:underline">Clear</button>
-          </div>
-        )}
-      </Card>
-
-      {/* Mobile toolbar */}
-      <div className="md:hidden space-y-2">
-        <div className="relative">
-          <MagnifyingGlassIcon className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
-          <input
-            type="text"
-            placeholder="Search by name or ticket ID..."
-            value={ticketSearchQuery}
-            onChange={(e) => setTicketSearchQuery(e.target.value)}
-            className="w-full pl-9 pr-3 py-2.5 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow"
-          />
-        </div>
-        <div className="flex items-center gap-2">
-          <select
-            value={ticketStatusFilter}
-            onChange={(e) => setTicketStatusFilter(e.target.value as TicketStatusFilter)}
-            className="px-3 py-2 text-sm rounded-btn border border-secondary-light-gray focus:outline-none focus:ring-2 focus:ring-primary-yellow min-h-[44px]"
-          >
-            <option value="all">All ({confirmedTickets.length})</option>
-            <option value="confirmed">Valid ({confirmedCount})</option>
-            <option value="checked_in">Checked In ({checkedInCount})</option>
-          </select>
-          <button
-            onClick={() => setShowTicketExportSheet(true)}
-            disabled={exporting}
-            className="flex items-center gap-1.5 px-3 py-2 rounded-btn border border-secondary-light-gray text-sm text-gray-600 min-h-[44px]"
-          >
-            <ArrowDownTrayIcon className="w-4 h-4" />
-            Export
-          </button>
-        </div>
-      </div>
-
-      {/* Desktop: Dense table */}
-      <Card className="overflow-hidden hidden md:block">
-        <div className="overflow-x-auto">
-          <table className="w-full">
-            <thead className="bg-gray-50">
-              <tr>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Attendee</th>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
-                <th className="text-left px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Check-in</th>
-                <th className="text-right px-4 py-2 text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
-              </tr>
-            </thead>
-            <tbody className="divide-y divide-gray-100">
-              {filteredConfirmedTickets.length === 0 ? (
-                <tr>
-                  <td colSpan={4} className="px-4 py-10 text-center text-gray-500 text-sm">
-                    {confirmedTickets.length === 0 ? 'No confirmed tickets yet' : 'No tickets match the current filters'}
-                  </td>
-                </tr>
-              ) : (
-                filteredConfirmedTickets.map((ticket) => (
-                  <tr key={ticket.id} className="hover:bg-gray-50/50">
-                    <td className="px-4 py-2.5">
-                      <p className="font-medium text-sm">{ticket.attendeeFirstName} {ticket.attendeeLastName || ''}</p>
-                      {ticket.bookingId && (
-                        <span className="text-[10px] text-purple-600">Group booking</span>
-                      )}
-                    </td>
-                    <td className="px-4 py-2.5">
-                      {ticket.status === 'confirmed' ? (
-                        <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-green-100 text-green-800 font-medium">Valid</span>
-                      ) : (
-                        <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-blue-100 text-blue-800 font-medium">Checked In</span>
-                      )}
-                    </td>
-                    <td className="px-4 py-2.5 text-xs text-gray-500">
-                      {ticket.checkinAt ? (
-                        parseDate(ticket.checkinAt).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', {
-                          month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE,
-                        })
-                      ) : (
-                        <span className="text-gray-300">—</span>
-                      )}
-                    </td>
-                    <td className="px-4 py-2.5">
-                      <div className="flex items-center justify-end gap-1">
-                        {ticket.status === 'confirmed' && (
-                          <Button size="sm" onClick={() => handleCheckin(ticket.id)} className="text-xs px-2 py-1">
-                            Check In
-                          </Button>
-                        )}
-                        {ticket.status === 'checked_in' && (
-                          <Button size="sm" variant="outline" onClick={() => handleRemoveCheckin(ticket.id)} className="text-xs px-2 py-1">
-                            <ArrowUturnLeftIcon className="w-3 h-3 mr-1" />
-                            Undo
-                          </Button>
-                        )}
-                        <MoreMenu>
-                          <div className="px-4 py-1.5 text-[10px] text-gray-400 font-mono" title={ticket.id}>
-                            ID: {ticket.id.slice(0, 8)}...
-                          </div>
-                          {ticket.bookingId && (
-                            <div className="px-4 py-1.5 text-[10px] text-purple-500 font-mono" title={ticket.bookingId}>
-                              Booking: {ticket.bookingId.slice(0, 8)}...
-                            </div>
-                          )}
-                        </MoreMenu>
-                      </div>
-                    </td>
-                  </tr>
-                ))
-              )}
-            </tbody>
-          </table>
-        </div>
-      </Card>
-
-      {/* Mobile: Card layout */}
-      <div className="md:hidden space-y-2">
-        {filteredConfirmedTickets.length === 0 ? (
-          <div className="text-center py-10 text-gray-500 text-sm">
-            {confirmedTickets.length === 0 ? 'No confirmed tickets yet' : 'No tickets match the current filters'}
-          </div>
-        ) : (
-          filteredConfirmedTickets.map((ticket) => (
-            <Card key={ticket.id} className="p-3">
-              <div className="flex items-start justify-between gap-2">
-                <div className="min-w-0 flex-1">
-                  <p className="font-medium text-sm truncate">{ticket.attendeeFirstName} {ticket.attendeeLastName || ''}</p>
-                  {ticket.bookingId && <p className="text-[10px] text-purple-600">Group booking</p>}
-                </div>
-                {ticket.status === 'confirmed' ? (
-                  <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-green-100 text-green-800 font-medium flex-shrink-0">Valid</span>
-                ) : (
-                  <span className="px-1.5 py-0.5 text-[10px] rounded-full bg-blue-100 text-blue-800 font-medium flex-shrink-0">Checked In</span>
-                )}
-              </div>
-              <div className="flex items-center justify-between mt-2 pt-2 border-t border-gray-100">
-                <p className="text-[10px] text-gray-400">
-                  {ticket.checkinAt
-                    ? `Checked in ${parseDate(ticket.checkinAt).toLocaleString(locale === 'es' ? 'es-ES' : 'en-US', { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE })}`
-                    : 'Not checked in'}
-                </p>
-                <div className="flex items-center gap-1">
-                  {ticket.status === 'confirmed' && (
-                    <Button size="sm" onClick={() => handleCheckin(ticket.id)} className="text-xs px-2.5 py-1.5 min-h-[36px]">
-                      Check In
-                    </Button>
-                  )}
-                  {ticket.status === 'checked_in' && (
-                    <Button size="sm" variant="outline" onClick={() => handleRemoveCheckin(ticket.id)} className="text-xs px-2.5 py-1.5 min-h-[36px]">
-                      <ArrowUturnLeftIcon className="w-3 h-3 mr-1" />
-                      Undo
-                    </Button>
-                  )}
-                </div>
-              </div>
-            </Card>
-          ))
-        )}
-      </div>
-    </div>
-  );
-}

frontend/src/app/admin/events/[id]/_types.ts

@@ -1,26 +0,0 @@
-import type { ComponentType } from 'react';
-
-export type TabType = 'overview' | 'attendees' | 'tickets' | 'email' | 'payments';
-
-export type AttendeeStatusFilter = 'all' | 'pending' | 'confirmed' | 'checked_in' | 'cancelled';
-export type TicketStatusFilter = 'all' | 'confirmed' | 'checked_in';
-export type RecipientFilter = 'all' | 'confirmed' | 'pending' | 'checked_in';
-
-export interface PrimaryAction {
-  label: string;
-  onClick: () => void;
-  variant: 'outline' | 'primary';
-  icon?: ComponentType<{ className?: string }>;
-}
-
-export interface AttendeeFormState {
-  firstName: string;
-  lastName: string;
-  email: string;
-  phone: string;
-  adminNote: string;
-}
-
-export interface AddAtDoorFormState extends AttendeeFormState {
-  autoCheckin: boolean;
-}

frontend/src/app/admin/events/[id]/_utils/format.ts

@@ -1,20 +0,0 @@
-// Pure formatting/IO helpers for the admin event detail page.
-
-export function formatCurrency(amount: number, currency: string): string {
-  if (currency === 'PYG') {
-    return `${amount.toLocaleString('es-PY')} PYG`;
-  }
-  return `$${amount.toFixed(2)} ${currency}`;
-}
-
-/** Trigger a browser download for a blob with the given filename. */
-export function downloadBlob(blob: Blob, filename: string): void {
-  const url = URL.createObjectURL(blob);
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = filename;
-  document.body.appendChild(a);
-  a.click();
-  document.body.removeChild(a);
-  URL.revokeObjectURL(url);
-}

frontend/src/app/admin/events/page.tsx

@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from 'react';
 import Link from 'next/link';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
 import { useLanguage } from '@/context/LanguageContext';
 import { eventsApi, siteSettingsApi, Event } from '@/lib/api';
 import Card from '@/components/ui/Card';
@@ -14,10 +14,8 @@ import { PlusIcon, PencilIcon, TrashIcon, EyeIcon, PhotoIcon, DocumentDuplicateI
 import { StarIcon as StarIconSolid } from '@heroicons/react/24/solid';
 import toast from 'react-hot-toast';
 import clsx from 'clsx';
-import { parseDate, EVENT_TIMEZONE } from '@/lib/utils';
 
 export default function AdminEventsPage() {
-  const router = useRouter();
   const { t, locale } = useLanguage();
   const searchParams = useSearchParams();
   const [events, setEvents] = useState<Event[]>([]);
@@ -28,11 +26,9 @@ export default function AdminEventsPage() {
   const [featuredEventId, setFeaturedEventId] = useState<string | null>(null);
   const [settingFeatured, setSettingFeatured] = useState<string | null>(null);
   
-  const [slugAliases, setSlugAliases] = useState<{ slug: string; createdAt: string }[]>([]);
   const [formData, setFormData] = useState<{
     title: string;
     titleEs: string;
-    slug: string;
     description: string;
     descriptionEs: string;
     shortDescription: string;
@@ -51,7 +47,6 @@ export default function AdminEventsPage() {
   }>({
     title: '',
     titleEs: '',
-    slug: '',
     description: '',
     descriptionEs: '',
     shortDescription: '',
@@ -116,9 +111,8 @@ export default function AdminEventsPage() {
   };
 
   const resetForm = () => {
-    setSlugAliases([]);
     setFormData({
-      title: '', titleEs: '', slug: '', description: '', descriptionEs: '',
+      title: '', titleEs: '', description: '', descriptionEs: '',
       shortDescription: '', shortDescriptionEs: '',
       startDatetime: '', endDatetime: '', location: '', locationUrl: '',
       price: 0, currency: 'PYG', capacity: 50, status: 'draft' as const,
@@ -128,45 +122,18 @@ export default function AdminEventsPage() {
   };
 
   const isoToLocalDatetime = (isoString: string): string => {
-    const date = parseDate(isoString);
-    const parts = new Intl.DateTimeFormat('en-US', {
-      timeZone: EVENT_TIMEZONE,
-      year: 'numeric',
-      month: '2-digit',
-      day: '2-digit',
-      hour: '2-digit',
-      minute: '2-digit',
-      hour12: false,
-    }).formatToParts(date);
-    const get = (type: string) => parts.find(p => p.type === type)!.value;
-    const h = get('hour') === '24' ? '00' : get('hour');
-    return `${get('year')}-${get('month')}-${get('day')}T${h}:${get('minute')}`;
-  };
-
-  const loadSlugAliases = async (eventId: string) => {
-    try {
-      const { aliases } = await eventsApi.getSlugAliases(eventId);
-      setSlugAliases(aliases);
-    } catch (error) {
-      setSlugAliases([]);
-    }
-  };
-
-  const handleRemoveAlias = async (slug: string) => {
-    if (!editingEvent) return;
-    if (!confirm(`Remove alias "${slug}"? The old URL /events/${slug} will stop working.`)) return;
-    try {
-      await eventsApi.deleteSlugAlias(editingEvent.id, slug);
-      toast.success('Alias removed');
-      setSlugAliases((prev) => prev.filter((a) => a.slug !== slug));
-    } catch (error: any) {
-      toast.error(error.message || 'Failed to remove alias');
-    }
+    const date = new Date(isoString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${year}-${month}-${day}T${hours}:${minutes}`;
   };
 
   const handleEdit = (event: Event) => {
     setFormData({
-      title: event.title, titleEs: event.titleEs || '', slug: event.slug || '',
+      title: event.title, titleEs: event.titleEs || '',
       description: event.description, descriptionEs: event.descriptionEs || '',
       shortDescription: event.shortDescription || '', shortDescriptionEs: event.shortDescriptionEs || '',
       startDatetime: isoToLocalDatetime(event.startDatetime),
@@ -179,7 +146,6 @@ export default function AdminEventsPage() {
     });
     setEditingEvent(event);
     setShowForm(true);
-    loadSlugAliases(event.id);
   };
 
   const handleSubmit = async (e: React.FormEvent) => {
@@ -196,12 +162,12 @@ export default function AdminEventsPage() {
         setSaving(false);
         return;
       }
-      const eventData: Partial<Event> = {
+      const eventData = {
         title: formData.title, titleEs: formData.titleEs || undefined,
         description: formData.description, descriptionEs: formData.descriptionEs || undefined,
         shortDescription: formData.shortDescription || undefined, shortDescriptionEs: formData.shortDescriptionEs || undefined,
-        startDatetime: formData.startDatetime,
-        endDatetime: formData.endDatetime || undefined,
+        startDatetime: new Date(formData.startDatetime).toISOString(),
+        endDatetime: formData.endDatetime ? new Date(formData.endDatetime).toISOString() : undefined,
         location: formData.location, locationUrl: formData.locationUrl || undefined,
         price: formData.price, currency: formData.currency, capacity: formData.capacity,
         status: formData.status, bannerUrl: formData.bannerUrl || undefined,
@@ -209,8 +175,6 @@ export default function AdminEventsPage() {
         externalBookingUrl: formData.externalBookingEnabled ? formData.externalBookingUrl : undefined,
       };
       if (editingEvent) {
-        // Only send slug when editing so creates still auto-generate from title
-        eventData.slug = formData.slug || undefined;
         await eventsApi.update(editingEvent.id, eventData);
         toast.success('Event updated');
       } else {
@@ -249,7 +213,7 @@ export default function AdminEventsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short', day: 'numeric', year: 'numeric', timeZone: 'America/Asuncion',
     });
   };
@@ -327,38 +291,6 @@ export default function AdminEventsPage() {
                   onChange={(e) => setFormData({ ...formData, titleEs: e.target.value })} />
               </div>
               
-              {editingEvent && (
-                <div>
-                  <Input label="URL Slug" value={formData.slug}
-                    onChange={(e) => setFormData({ ...formData, slug: e.target.value })}
-                    placeholder="auto-generated from title" />
-                  <p className="text-xs text-gray-500 mt-1">
-                    Public URL: <span className="font-mono">/events/{formData.slug || '...'}</span>
-                    . Changing the slug keeps the old one as a redirecting alias.
-                  </p>
-                  {slugAliases.length > 0 && (
-                    <div className="mt-3 rounded-btn border border-secondary-light-gray p-3">
-                      <p className="text-sm font-medium mb-2">URL aliases</p>
-                      <p className="text-xs text-gray-500 mb-2">
-                        Old URLs that still redirect to the current slug. Removing one breaks those links.
-                      </p>
-                      <ul className="space-y-1">
-                        {slugAliases.map((alias) => (
-                          <li key={alias.slug} className="flex items-center justify-between gap-2 text-sm">
-                            <span className="font-mono truncate">/events/{alias.slug}</span>
-                            <button type="button" onClick={() => handleRemoveAlias(alias.slug)}
-                              className="p-1.5 hover:bg-red-50 text-red-600 rounded-btn flex-shrink-0"
-                              title="Remove alias">
-                              <TrashIcon className="w-4 h-4" />
-                            </button>
-                          </li>
-                        ))}
-                      </ul>
-                    </div>
-                  )}
-                </div>
-              )}
-              
               <div>
                 <label className="block text-sm font-medium mb-1">Description (English)</label>
                 <textarea value={formData.description}
@@ -526,11 +458,7 @@ export default function AdminEventsPage() {
                 </tr>
               ) : (
                 events.map((event) => (
-                  <tr
-                    key={event.id}
-                    onClick={() => router.push(`/admin/events/${event.id}`)}
-                    className={clsx("hover:bg-gray-50 cursor-pointer", featuredEventId === event.id && "bg-amber-50")}
-                  >
+                  <tr key={event.id} className={clsx("hover:bg-gray-50", featuredEventId === event.id && "bg-amber-50")}>
                     <td className="px-4 py-3">
                       <div className="flex items-center gap-3">
                         {event.bannerUrl ? (
@@ -564,7 +492,7 @@ export default function AdminEventsPage() {
                         )}
                       </div>
                     </td>
-                    <td className="px-4 py-3" onClick={(e) => e.stopPropagation()}>
+                    <td className="px-4 py-3">
                       <div className="flex items-center justify-end gap-1">
                         {event.status === 'draft' && (
                           <Button size="sm" variant="ghost" onClick={() => handleStatusChange(event, 'published')}>
@@ -633,11 +561,7 @@ export default function AdminEventsPage() {
           </div>
         ) : (
           events.map((event) => (
-            <Card
-              key={event.id}
-              className={clsx("p-3 cursor-pointer", featuredEventId === event.id && "ring-2 ring-amber-300")}
-              onClick={() => router.push(`/admin/events/${event.id}`)}
-            >
+            <Card key={event.id} className={clsx("p-3", featuredEventId === event.id && "ring-2 ring-amber-300")}>
               <div className="flex items-start gap-3">
                 {event.bannerUrl ? (
                   <img src={event.bannerUrl} alt={event.title}
@@ -666,7 +590,7 @@ export default function AdminEventsPage() {
                   </div>
                   <div className="flex items-center justify-between mt-2 pt-2 border-t border-gray-100">
                     <p className="text-xs text-gray-500">{event.bookedCount || 0} / {event.capacity} spots</p>
-                    <div className="flex items-center gap-1" onClick={(e) => e.stopPropagation()}>
+                    <div className="flex items-center gap-1">
                       <Link href={`/admin/events/${event.id}`}
                         className="p-2 hover:bg-primary-yellow/20 text-primary-dark rounded-btn min-h-[36px] min-w-[36px] flex items-center justify-center">
                         <EyeIcon className="w-4 h-4" />

frontend/src/app/admin/gallery/page.tsx

@@ -3,7 +3,6 @@
 import { useState, useEffect, useRef } from 'react';
 import { useLanguage } from '@/context/LanguageContext';
 import { mediaApi, Media } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import { 
@@ -109,7 +108,7 @@ export default function AdminGalleryPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       year: 'numeric',
       month: 'short',
       day: 'numeric',

frontend/src/app/admin/legal-pages/page.tsx

@@ -4,7 +4,6 @@ import { useState, useEffect } from 'react';
 import dynamic from 'next/dynamic';
 import { useLanguage } from '@/context/LanguageContext';
 import { legalPagesApi, LegalPage } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
@@ -159,7 +158,7 @@ export default function AdminLegalPagesPage() {
 
   const formatDate = (dateStr: string) => {
     try {
-      return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-PY' : 'en-US', {
+      return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-PY' : 'en-US', {
         year: 'numeric',
         month: 'short',
         day: 'numeric',

frontend/src/app/admin/page.tsx

@@ -15,7 +15,6 @@ import {
   UserGroupIcon,
   ExclamationTriangleIcon,
 } from '@heroicons/react/24/outline';
-import { parseDate } from '@/lib/utils';
 
 export default function AdminDashboardPage() {
   const { t, locale } = useLanguage();
@@ -31,7 +30,7 @@ export default function AdminDashboardPage() {
   }, []);
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short',
       day: 'numeric',
       hour: '2-digit',

frontend/src/app/admin/payment-options/page.tsx

@@ -26,10 +26,6 @@ export default function PaymentOptionsPage() {
   const [options, setOptions] = useState<PaymentOptionsConfig>({
     tpagoEnabled: false,
     tpagoLink: null,
-    tpagoLink2: null,
-    tpagoLink3: null,
-    tpagoLink4: null,
-    tpagoLink5: null,
     tpagoInstructions: null,
     tpagoInstructionsEs: null,
     bankTransferEnabled: false,
@@ -144,31 +140,13 @@ export default function PaymentOptionsPage() {
             <div className="space-y-4 pt-4 border-t">
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
-                  {locale === 'es' ? 'Enlaces de Pago TPago (por cantidad de tickets)' : 'TPago Payment Links (per ticket quantity)'}
+                  {locale === 'es' ? 'Enlace de Pago TPago' : 'TPago Payment Link'}
                 </label>
-                <p className="text-xs text-gray-500 mb-2">
-                  {locale === 'es'
-                    ? 'Cada enlace tiene un monto fijo. Usá un enlace distinto para cada cantidad de tickets.'
-                    : 'Each link has a fixed amount. Use a different link for each ticket quantity.'}
-                </p>
-                <div className="space-y-2">
-                  {([1, 2, 3, 4, 5] as const).map((qty) => {
-                    const key = (qty === 1 ? 'tpagoLink' : `tpagoLink${qty}`) as keyof PaymentOptionsConfig;
-                    return (
-                      <div key={qty} className="flex items-center gap-2">
-                        <span className="text-sm font-medium text-gray-600 w-24 flex-shrink-0">
-                          {qty} {locale === 'es' ? (qty === 1 ? 'ticket' : 'tickets') : (qty === 1 ? 'ticket' : 'tickets')}
-                        </span>
-                        <Input
-                          value={(options[key] as string | null) || ''}
-                          onChange={(e) => updateOption(key, (e.target.value || null) as any)}
-                          placeholder="https://www.tpago.com.py/links?alias=..."
-                          className="flex-1"
-                        />
-                      </div>
-                    );
-                  })}
-                </div>
+                <Input
+                  value={options.tpagoLink || ''}
+                  onChange={(e) => updateOption('tpagoLink', e.target.value || null)}
+                  placeholder="https://www.tpago.com.py/links?alias=..."
+                />
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div>

frontend/src/app/admin/payments/page.tsx

@@ -3,7 +3,6 @@
 import { useState, useEffect } from 'react';
 import { useLanguage } from '@/context/LanguageContext';
 import { paymentsApi, adminApi, eventsApi, PaymentWithDetails, Event, ExportedPayment, FinancialSummary } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
@@ -204,7 +203,7 @@ export default function AdminPaymentsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short',
       day: 'numeric',
       hour: '2-digit',
@@ -281,22 +280,6 @@ export default function AdminPaymentsPage() {
     };
   };
 
-  // Hide pending-approval payments whose event has already ended.
-  // Fall back to startDatetime when endDatetime is absent; keep visible when we
-  // can't classify (event missing from list and no startDatetime on payment.event).
-  const visiblePendingApprovalPayments = (() => {
-    const now = new Date();
-    return pendingApprovalPayments.filter((payment) => {
-      const eventId = payment.event?.id;
-      const fullEvent = eventId ? events.find((e) => e.id === eventId) : undefined;
-      const endIso = fullEvent?.endDatetime
-        || fullEvent?.startDatetime
-        || payment.event?.startDatetime;
-      if (!endIso) return true;
-      return parseDate(endIso).getTime() >= now.getTime();
-    });
-  })();
-
   // Get booking info for pending approval payments
   const getPendingBookingInfo = (payment: PaymentWithDetails) => {
     if (!payment.ticket?.bookingId) {
@@ -304,7 +287,7 @@ export default function AdminPaymentsPage() {
     }
     
     // Count all pending payments with the same bookingId
-    const bookingPayments = visiblePendingApprovalPayments.filter(
+    const bookingPayments = pendingApprovalPayments.filter(
       p => p.ticket?.bookingId === payment.ticket?.bookingId
     );
     
@@ -342,7 +325,7 @@ export default function AdminPaymentsPage() {
   const paidBookingsCount = getUniqueBookingsCount(
     payments.filter(p => p.status === 'paid')
   );
-  const pendingApprovalBookingsCount = getUniqueBookingsCount(visiblePendingApprovalPayments);
+  const pendingApprovalBookingsCount = getUniqueBookingsCount(pendingApprovalPayments);
 
   if (loading) {
     return (
@@ -636,8 +619,8 @@ export default function AdminPaymentsPage() {
             <div>
               <p className="text-sm text-gray-500">{locale === 'es' ? 'Pendientes de Aprobación' : 'Pending Approval'}</p>
               <p className="text-xl font-bold text-yellow-600">{pendingApprovalBookingsCount}</p>
-              {visiblePendingApprovalPayments.length !== pendingApprovalBookingsCount && (
-                <p className="text-xs text-gray-400">({visiblePendingApprovalPayments.length} tickets)</p>
+              {pendingApprovalPayments.length !== pendingApprovalBookingsCount && (
+                <p className="text-xs text-gray-400">({pendingApprovalPayments.length} tickets)</p>
               )}
             </div>
           </div>
@@ -686,8 +669,8 @@ export default function AdminPaymentsPage() {
             className={clsx('pb-3 px-1 text-sm font-medium border-b-2 transition-colors whitespace-nowrap min-h-[44px]',
               activeTab === 'pending_approval' ? 'border-primary-yellow text-primary-dark' : 'border-transparent text-gray-500 hover:text-gray-700')}>
             {locale === 'es' ? 'Pendientes' : 'Pending Approval'}
-            {visiblePendingApprovalPayments.length > 0 && (
-              <span className="ml-2 bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full text-xs">{visiblePendingApprovalPayments.length}</span>
+            {pendingApprovalPayments.length > 0 && (
+              <span className="ml-2 bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full text-xs">{pendingApprovalPayments.length}</span>
             )}
           </button>
           <button onClick={() => setActiveTab('all')}
@@ -701,7 +684,7 @@ export default function AdminPaymentsPage() {
       {/* Pending Approval Tab */}
       {activeTab === 'pending_approval' && (
         <>
-          {visiblePendingApprovalPayments.length === 0 ? (
+          {pendingApprovalPayments.length === 0 ? (
             <Card className="p-12 text-center">
               <CheckCircleIcon className="w-12 h-12 text-green-400 mx-auto mb-4" />
               <p className="text-gray-500">
@@ -712,7 +695,7 @@ export default function AdminPaymentsPage() {
             </Card>
           ) : (
             <div className="space-y-4">
-              {visiblePendingApprovalPayments.map((payment) => {
+              {pendingApprovalPayments.map((payment) => {
                 const bookingInfo = getPendingBookingInfo(payment);
                 return (
                   <Card key={payment.id} className="p-4">

frontend/src/app/admin/scanner/page.tsx

@@ -18,7 +18,6 @@ import {
   VideoCameraIcon,
 } from '@heroicons/react/24/outline';
 import toast from 'react-hot-toast';
-import { parseDate, EVENT_TIMEZONE } from '@/lib/utils';
 import clsx from 'clsx';
 
 // ─── Types ───────────────────────────────────────────────────
@@ -325,7 +324,7 @@ function InvalidTicketScreen({
 
   const reasonDetail: Record<InvalidReason, string> = {
     already_checked_in: validation?.ticket?.checkinAt
-      ? `Checked in at ${parseDate(validation.ticket.checkinAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE })}${validation.ticket.checkedInBy ? ` by ${validation.ticket.checkedInBy}` : ''}`
+      ? `Checked in at ${new Date(validation.ticket.checkinAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}${validation.ticket.checkedInBy ? ` by ${validation.ticket.checkedInBy}` : ''}`
       : 'This ticket was already used',
     cancelled: 'This ticket has been cancelled and is no longer valid.',
     not_found: error || 'No ticket matching this code was found.',
@@ -766,7 +765,7 @@ export default function AdminScannerPage() {
       setRecentCheckins((prev) => [
         {
           name: result.ticket.attendeeName || 'Guest',
-          time: new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE }),
+          time: new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }),
           ticketId: scanResult.validation!.ticket!.id,
         },
         ...prev.slice(0, 19),
@@ -797,7 +796,7 @@ export default function AdminScannerPage() {
       setRecentCheckins((prev) => [
         {
           name: result.ticket.attendeeName || 'Guest',
-          time: new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', timeZone: EVENT_TIMEZONE }),
+          time: new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }),
           ticketId: searchDetailValidation!.ticket!.id,
         },
         ...prev.slice(0, 19),

frontend/src/app/admin/settings/page.tsx

@@ -4,7 +4,6 @@ import { useState, useEffect } from 'react';
 import Link from 'next/link';
 import { useLanguage } from '@/context/LanguageContext';
 import { siteSettingsApi, eventsApi, legalSettingsApi, SiteSettings, TimezoneOption, Event, LegalSettingsData } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
@@ -320,7 +319,7 @@ export default function AdminSettingsPage() {
                       <div>
                         <p className="font-medium text-amber-900">{featuredEvent.title}</p>
                         <p className="text-sm text-amber-700">
-                          {parseDate(featuredEvent.startDatetime).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+                          {new Date(featuredEvent.startDatetime).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
                             month: 'long',
                             day: 'numeric',
                             year: 'numeric',

frontend/src/app/admin/tickets/page.tsx

@@ -3,7 +3,6 @@
 import { useState, useEffect } from 'react';
 import { useLanguage } from '@/context/LanguageContext';
 import { ticketsApi, eventsApi, Ticket, Event } from '@/lib/api';
-import { parseDate } from '@/lib/utils';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
@@ -108,7 +107,7 @@ export default function AdminTicketsPage() {
   };
 
   const formatDate = (dateStr: string) => {
-    return parseDate(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
+    return new Date(dateStr).toLocaleDateString(locale === 'es' ? 'es-ES' : 'en-US', {
       month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: 'America/Asuncion',
     });
   };