feat: implement public booking cancellation feature

- Added cancelPublicBooking handler to manage booking cancellations. - Updated public booking service to include cancellation logic. - Created cancelPublicBooking schema for input validation. - Modified public booking confirmation page to allow users to cancel their bookings. - Enhanced email service to send cancellation confirmation emails. - Made customerEmail field required in booking schemas and updated related components. - Updated API client to support cancellation requests. - Added migration to enforce non-nullable customer_email fields in the database.
feat(booking-ui): add confirmation dialog for cancelling bookings and improve mobile UI
2026-06-05 11:24:02 -03:00 · 2026-06-04 16:39:45 -03:00 · 2026-06-04 16:33:51 -03:00 · 2026-06-04 14:06:23 -03:00 · 2026-06-03 10:57:23 -03:00 · 2026-06-03 13:44:12 +00:00
107 changed files with 3416 additions and 4324 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -193,3 +193,61 @@ await getAvailability('my-club', { date: '2026-04-20' });
 1. Create `lib/api/resources/[resource].ts`
 2. Export functions using `http` from `../http`
 3. Add exports in `lib/api/index.ts`
+
+## Email Templates
+
+Todos los emails deben usar la misma estética. El layout compartido está en `apps/backend/src/emails/booking-confirmation.ts`.
+
+### Layout (`wrapLayout`)
+
+Exportado como `wrapLayout(content)`. Proporciona:
+- Fondo: `#edf7f4`
+- Card blanca: `max-width: 520px`, `border-radius: 28px`, `box-shadow: 0 24px 70px rgba(15,23,42,0.12)`, `border: 1px solid rgba(5,9,20,0.1)`
+- Playzer favicon: `{APP_BASE_URL}/playzer-favicon-512-transparent.png` (está en `apps/frontend/public/`)
+- **Sin `min-height: 100vh`**: la card empieza arriba, no centrada verticalmente
+
+```typescript
+import { wrapLayout } from '@/emails/booking-confirmation';
+
+const html = wrapLayout(`<tr>...contenido...</tr>`);
+```
+
+### Estructura de cada email
+
+| Sección | Descripción |
+|---------|-------------|
+| **Header** | Dos columnas: badge pill a la izquierda + Playzer (favicon + texto) a la derecha. El badge usa `border-radius: 999px`, `padding: 4px 12px`, `font-size: 11px`, `font-weight: 700`, `letter-spacing: 0.14em`, `text-transform: uppercase`. |
+| **Card fecha/hora** | Fondo `#f0fdf4`, borde `1px solid rgba(5,150,105,0.3)`, `border-radius: 24px`. Siempre verde aunque el email sea de cancelación. |
+| **Grilla detalles** | `border: 1px solid #e5e7eb`, `border-radius: 22px`, dos celdas de 50% con `border-right` en la primera. |
+| **Botón CTA** | Tabla con fondo `#059669`, `border-radius: 12px`, link blanco con `padding: 14px 32px`. |
+| **Pie** | Sin pie de marca. Solo texto secundario opcional centrado si es necesario. |
+| **Sin botones de acción** | Los emails de booking **no** incluyen los botones "Compartir por WhatsApp" ni "Hacer otra reserva". |
+
+### Padding estándar
+
+| Ubicación | Valor |
+|-----------|-------|
+| Wrapper (outer `<td>`) | `padding: 24px 12px` |
+| Primer `<td>` del contenido (header) | `padding: 24px 20px 16px` |
+| `<td>` intermedios (cards, texto) | `padding: 0 20px 16px` |
+| Último `<td>` del contenido | `padding: 0 20px 24px` |
+
+### Colores de badges según estado
+
+| Estado | Fondo badge | Texto badge |
+|--------|-------------|-------------|
+| Confirmado | `#f0fdf4` | `#15803d` |
+| Cancelado | `#fef2f2` | `#dc2626` |
+| No concretado | `#fffbeb` | `#d97706` |
+| Neutro (verificación, etc.) | `#f4f4f5` | `#71717a` |
+
+### Archivos de templates
+
+| Archivo | Templates |
+|---------|-----------|
+| `apps/backend/src/emails/booking-confirmation.ts` | `bookingConfirmationHtml`, `bookingCancelledHtml`, `bookingNoShowHtml` + exporta `wrapLayout` |
+| `apps/backend/src/lib/auth.ts` | Email de verificación de Better Auth (usa `wrapLayout` inline) |
+
+### Regla general
+
+Para emails nuevos: importar `wrapLayout`, construir el HTML interno con `<tr>`s, usar la misma estructura de cabecera (badge + Playzer), y nunca incluir el pie "Playzer — Reserva de canchas online". Usar `APP_BASE_URL` para construir URLs absolutas al logo.
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -4,7 +4,7 @@
    "dev": "bun run --hot src/server.ts",
    "start": "bun src/server.ts",
    "build": "tsc -b",
-    "test": "bun test",
+    "test": "bun test --preload ./test/support/prisma.mock.ts ./test",
    "lint": "biome check .",
    "lint:fix": "biome check --write .",
    "format": "biome format --write .",
--- a/apps/backend/prisma/auth.prisma
+++ b/apps/backend/prisma/auth.prisma
@@ -4,6 +4,7 @@ model User {
    email         String
    emailVerified Boolean   @default(false)
    image         String?
+    phone         String?
    createdAt     DateTime  @default(now())
    updatedAt     DateTime  @updatedAt
    sessions      Session[]
--- a/apps/backend/prisma/court.prisma
+++ b/apps/backend/prisma/court.prisma
@@ -85,6 +85,7 @@ model CourtBooking {
  endTime       String              @map("end_time") @db.VarChar(5)
  customerName  String              @map("customer_name") @db.VarChar(120)
  customerPhone String              @map("customer_phone") @db.VarChar(30)
+  customerEmail String              @map("customer_email") @db.VarChar(254)
  status        CourtBookingStatus  @default(CONFIRMED)
  createdAt     DateTime            @default(now()) @map("created_at")
  updatedAt     DateTime            @updatedAt @map("updated_at")
@@ -107,6 +108,7 @@ model CourtBookingLog {
  newStatus      CourtBookingStatus  @map("new_status")
  customerName  String               @map("customer_name") @db.VarChar(120)
  customerPhone String               @map("customer_phone") @db.VarChar(30)
+  customerEmail String               @map("customer_email") @db.VarChar(254)
  changedAt      DateTime            @default(now()) @map("changed_at")

  @@map("court_booking_logs")
--- a/apps/backend/prisma/migrations/20260601193348_add_phone_to_user/migration.sql
+++ b/apps/backend/prisma/migrations/20260601193348_add_phone_to_user/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "users" ADD COLUMN     "phone" TEXT;
--- a/apps/backend/prisma/migrations/20260602220943_add_customer_email/migration.sql
+++ b/apps/backend/prisma/migrations/20260602220943_add_customer_email/migration.sql
@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - You are about to drop the `onboarding_requests` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "court_booking_logs" ADD COLUMN     "customer_email" VARCHAR(254);
+
+-- AlterTable
+ALTER TABLE "court_bookings" ADD COLUMN     "customer_email" VARCHAR(254);
+
+-- DropTable
+DROP TABLE "onboarding_requests";
--- a/apps/backend/prisma/migrations/20260605121954_make_email_required/migration.sql
+++ b/apps/backend/prisma/migrations/20260605121954_make_email_required/migration.sql
@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - Made the column `customer_email` on table `court_booking_logs` required. This step will fail if there are existing NULL values in that column.
+  - Made the column `customer_email` on table `court_bookings` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- Backfill existing NULL values with placeholder
+UPDATE "court_booking_logs" SET "customer_email" = 'missing@playzer.app' WHERE "customer_email" IS NULL;
+UPDATE "court_bookings" SET "customer_email" = 'missing@playzer.app' WHERE "customer_email" IS NULL;
+
+-- AlterTable
+ALTER TABLE "court_booking_logs" ALTER COLUMN "customer_email" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "court_bookings" ALTER COLUMN "customer_email" SET NOT NULL;
--- a/apps/backend/prisma/onboarding.prisma
+++ b/apps/backend/prisma/onboarding.prisma
@@ -1,18 +0,0 @@
-model OnboardingRequest {
-  id            String    @id @db.Uuid
-  fullName      String    @map("full_name")
-  email         String
-  otpHash       String    @map("otp_hash")
-  otpExpiresAt  DateTime  @map("otp_expires_at")
-  otpAttempts   Int       @default(0) @map("otp_attempts")
-  otpLastSentAt DateTime  @map("otp_last_sent_at")
-  otpResendCount Int      @default(0) @map("otp_resend_count")
-  emailVerifiedAt DateTime? @map("email_verified_at")
-  completedAt     DateTime? @map("completed_at")
-  createdAt       DateTime  @default(now()) @map("created_at")
-  updatedAt       DateTime  @updatedAt @map("updated_at")
-
-  @@index([email])
-  @@index([otpExpiresAt])
-  @@map("onboarding_requests")
-}
--- a/apps/backend/src/emails/booking-confirmation.ts
+++ b/apps/backend/src/emails/booking-confirmation.ts
@@ -0,0 +1,401 @@
+type BookingEmailData = {
+  bookingCode: string;
+  complexSlug?: string;
+  complexName: string;
+  date: string;
+  startTime: string;
+  endTime: string;
+  courtName: string;
+  sportName: string;
+  customerName: string;
+  price?: number;
+};
+
+const APP_BASE_URL = process.env.APP_BASE_URL ?? 'http://localhost:5173';
+
+function formatBookingPrice(price: number): string {
+  if (price === 0) {
+    return 'Sin cargo';
+  }
+
+  return new Intl.NumberFormat('es-AR', {
+    style: 'currency',
+    currency: 'ARS',
+    maximumFractionDigits: Number.isInteger(price) ? 0 : 2,
+  }).format(price);
+}
+
+function formatFriendlyDate(isoDate: string): string {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(isoDate);
+  if (!match) return isoDate;
+
+  const date = new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]));
+
+  const weekday = new Intl.DateTimeFormat('es-AR', { weekday: 'long' }).format(date);
+  const day = date.getDate();
+  const month = new Intl.DateTimeFormat('es-AR', { month: 'long' }).format(date);
+
+  return `${weekday.charAt(0).toUpperCase() + weekday.slice(1)}, ${day} de ${month}`;
+}
+
+const BASE_STYLES = `
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #edf7f4;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  }
+  * {
+    box-sizing: border-box;
+  }
+`;
+
+export function wrapLayout(content: string) {
+  return `<!DOCTYPE html>
+<html lang="es">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Playzer</title>
+  <style>${BASE_STYLES}</style>
+</head>
+<body style="margin:0;padding:0;background-color:#edf7f4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif;">
+  <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#edf7f4;">
+    <tr>
+      <td align="center" style="padding:24px 12px;">
+        <table role="presentation" width="100%" style="max-width:520px;background-color:#ffffff;border-radius:28px;overflow:hidden;box-shadow:0 24px 70px rgba(15,23,42,0.12);border:1px solid rgba(5,9,20,0.1);">
+          ${content}
+        </table>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>`;
+}
+
+export function bookingConfirmationHtml(data: BookingEmailData): string {
+  const formattedPrice = formatBookingPrice(data.price ?? 0);
+  const friendlyDate = formatFriendlyDate(data.date);
+
+  const content = `
+    <tr>
+      <td style="padding:24px 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+          <tr>
+            <td valign="top">
+              <table role="presentation" cellpadding="0" cellspacing="0" style="display:inline-block;background-color:#f0fdf4;border-radius:999px;padding:4px 12px;">
+                <tr>
+                  <td style="font-size:11px;font-weight:700;letter-spacing:0.14em;color:#15803d;text-transform:uppercase;line-height:1.25rem;">
+                    &#10003; Reserva confirmada
+                  </td>
+                </tr>
+              </table>
+              <h1 style="margin:12px 0 0;font-size:28px;font-weight:700;color:#111827;letter-spacing:-0.025em;">
+                ${data.complexName}
+              </h1>
+            </td>
+            <td valign="top" align="right" style="white-space:nowrap;">
+              <table role="presentation" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td valign="middle" style="padding-right:8px;">
+                    <img src="${APP_BASE_URL}/playzer-favicon-512-transparent.png" alt="Playzer" width="32" height="32" style="display:block;" />
+                  </td>
+                  <td valign="middle">
+                    <span style="font-size:18px;font-weight:700;color:#475569;letter-spacing:-0.025em;">Playzer</span>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#f0fdf4;border-radius:24px;border:1px solid rgba(5,150,105,0.3);">
+          <tr>
+            <td style="padding:20px 24px;">
+              <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td valign="bottom">
+                    <p style="margin:0;font-size:13px;font-weight:600;color:#15803d;">
+                      Tu turno
+                    </p>
+                    <p style="margin:12px 0 0;font-size:28px;font-weight:900;color:#111827;line-height:1.1;letter-spacing:-0.025em;">
+                      ${friendlyDate}
+                    </p>
+                    <p style="margin:8px 0 0;font-size:24px;font-weight:900;color:#059669;line-height:1;letter-spacing:-0.025em;">
+                      ${data.startTime} &mdash; ${data.endTime}
+                    </p>
+                  </td>
+                  <td valign="bottom" align="right" style="padding-left:16px;">
+                    <table role="presentation" cellpadding="0" cellspacing="0" style="background-color:rgba(255,255,255,0.8);border-radius:16px;border:1px solid rgba(5,150,105,0.2);">
+                      <tr>
+                        <td style="padding:12px 16px;text-align:right;min-width:120px;">
+                          <p style="margin:0;font-size:11px;font-weight:500;color:#6b7280;">Precio del turno</p>
+                          <p style="margin:4px 0 0;font-size:20px;font-weight:700;color:#111827;">${formattedPrice}</p>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border:1px solid #e5e7eb;border-radius:22px;overflow:hidden;">
+          <tr>
+            <td width="50%" style="padding:16px;border-right:1px solid #e5e7eb;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                Cancha
+              </p>
+              <p style="margin:8px 0 0;font-size:14px;font-weight:600;color:#111827;">
+                ${data.courtName} &mdash; ${data.sportName}
+              </p>
+            </td>
+            <td width="50%" style="padding:16px;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                C&oacute;digo de reserva
+              </p>
+              <p style="margin:8px 0 0;font-family:monospace;font-size:16px;font-weight:700;letter-spacing:0.18em;color:#111827;">
+                ${data.bookingCode}
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    ${
+      data.complexSlug
+        ? `
+    <tr>
+      <td style="padding:0 20px 24px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+          <tr>
+            <td align="center">
+              <table role="presentation" cellpadding="0" cellspacing="0" style="background-color:#059669;border-radius:12px;">
+                <tr>
+                  <td style="padding:14px 32px;font-size:15px;font-weight:600;">
+                    <a href="${APP_BASE_URL}/${data.complexSlug}/booking/confirmed/${data.bookingCode}" style="color:#ffffff;text-decoration:none;display:inline-block;">
+                      Cancelar reserva
+                    </a>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>`
+        : ''
+    }`;
+
+  return wrapLayout(content);
+}
+
+export function bookingCancelledHtml(data: BookingEmailData): string {
+  const friendlyDate = formatFriendlyDate(data.date);
+
+  const content = `
+    <tr>
+      <td style="padding:24px 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+          <tr>
+            <td valign="top">
+              <table role="presentation" cellpadding="0" cellspacing="0" style="display:inline-block;background-color:#fef2f2;border-radius:999px;padding:4px 12px;">
+                <tr>
+                  <td style="font-size:11px;font-weight:700;letter-spacing:0.14em;color:#dc2626;text-transform:uppercase;line-height:1.25rem;">
+                    &#10007; Reserva cancelada
+                  </td>
+                </tr>
+              </table>
+              <h1 style="margin:12px 0 0;font-size:28px;font-weight:700;color:#111827;letter-spacing:-0.025em;">
+                ${data.complexName}
+              </h1>
+            </td>
+            <td valign="top" align="right" style="white-space:nowrap;">
+              <table role="presentation" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td valign="middle" style="padding-right:8px;">
+                    <img src="${APP_BASE_URL}/playzer-favicon-512-transparent.png" alt="Playzer" width="32" height="32" style="display:block;" />
+                  </td>
+                  <td valign="middle">
+                    <span style="font-size:18px;font-weight:700;color:#475569;letter-spacing:-0.025em;">Playzer</span>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#f0fdf4;border-radius:24px;border:1px solid rgba(5,150,105,0.3);">
+          <tr>
+            <td style="padding:20px 24px;">
+              <p style="margin:0;font-size:13px;font-weight:600;color:#15803d;">
+                Tu turno
+              </p>
+              <p style="margin:12px 0 0;font-size:28px;font-weight:900;color:#111827;line-height:1.1;letter-spacing:-0.025em;">
+                ${friendlyDate}
+              </p>
+              <p style="margin:8px 0 0;font-size:24px;font-weight:900;color:#059669;line-height:1;letter-spacing:-0.025em;">
+                ${data.startTime} &mdash; ${data.endTime}
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#fef2f2;border-radius:24px;border:1px solid rgba(220,38,38,0.3);">
+          <tr>
+            <td style="padding:20px 24px;">
+              <p style="margin:0;font-size:14px;color:#374151;line-height:1.6;">
+                La reserva <strong style="font-family:monospace;font-weight:700;letter-spacing:2px;">${data.bookingCode}</strong>
+                fue cancelada. Si ten&eacute;s dudas, contactate con el complejo.
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 24px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border:1px solid #e5e7eb;border-radius:22px;overflow:hidden;">
+          <tr>
+            <td width="50%" style="padding:16px;border-right:1px solid #e5e7eb;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                Cancha
+              </p>
+              <p style="margin:8px 0 0;font-size:14px;font-weight:600;color:#111827;">
+                ${data.courtName} &mdash; ${data.sportName}
+              </p>
+            </td>
+            <td width="50%" style="padding:16px;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                Cliente
+              </p>
+              <p style="margin:8px 0 0;font-size:14px;font-weight:600;color:#111827;">
+                ${data.customerName}
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>`;
+
+  return wrapLayout(content);
+}
+
+export function bookingNoShowHtml(data: BookingEmailData): string {
+  const friendlyDate = formatFriendlyDate(data.date);
+
+  const content = `
+    <tr>
+      <td style="padding:24px 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+          <tr>
+            <td valign="top">
+              <table role="presentation" cellpadding="0" cellspacing="0" style="display:inline-block;background-color:#fffbeb;border-radius:999px;padding:4px 12px;">
+                <tr>
+                  <td style="font-size:11px;font-weight:700;letter-spacing:0.14em;color:#d97706;text-transform:uppercase;line-height:1.25rem;">
+                    Reserva no concretada
+                  </td>
+                </tr>
+              </table>
+              <h1 style="margin:12px 0 0;font-size:28px;font-weight:700;color:#111827;letter-spacing:-0.025em;">
+                ${data.complexName}
+              </h1>
+            </td>
+            <td valign="top" align="right" style="white-space:nowrap;">
+              <table role="presentation" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td valign="middle" style="padding-right:8px;">
+                    <img src="${APP_BASE_URL}/playzer-favicon-512-transparent.png" alt="Playzer" width="32" height="32" style="display:block;" />
+                  </td>
+                  <td valign="middle">
+                    <span style="font-size:18px;font-weight:700;color:#475569;letter-spacing:-0.025em;">Playzer</span>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#f0fdf4;border-radius:24px;border:1px solid rgba(5,150,105,0.3);">
+          <tr>
+            <td style="padding:20px 24px;">
+              <p style="margin:0;font-size:13px;font-weight:600;color:#15803d;">
+                Tu turno
+              </p>
+              <p style="margin:12px 0 0;font-size:28px;font-weight:900;color:#111827;line-height:1.1;letter-spacing:-0.025em;">
+                ${friendlyDate}
+              </p>
+              <p style="margin:8px 0 0;font-size:24px;font-weight:900;color:#059669;line-height:1;letter-spacing:-0.025em;">
+                ${data.startTime} &mdash; ${data.endTime}
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 16px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background-color:#fffbeb;border-radius:24px;border:1px solid rgba(217,119,6,0.3);">
+          <tr>
+            <td style="padding:20px 24px;">
+              <p style="margin:0;font-size:14px;color:#374151;line-height:1.6;">
+                La reserva <strong style="font-family:monospace;font-weight:700;letter-spacing:2px;">${data.bookingCode}</strong>
+                fue registrada como no concretada por falta de asistencia.
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td style="padding:0 20px 24px;">
+        <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="border:1px solid #e5e7eb;border-radius:22px;overflow:hidden;">
+          <tr>
+            <td width="50%" style="padding:16px;border-right:1px solid #e5e7eb;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                Cancha
+              </p>
+              <p style="margin:8px 0 0;font-size:14px;font-weight:600;color:#111827;">
+                ${data.courtName} &mdash; ${data.sportName}
+              </p>
+            </td>
+            <td width="50%" style="padding:16px;background-color:#ffffff;">
+              <p style="margin:0;font-size:13px;font-weight:500;color:#6b7280;">
+                Cliente
+              </p>
+              <p style="margin:8px 0 0;font-size:14px;font-weight:600;color:#111827;">
+                ${data.customerName}
+              </p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>`;
+
+  return wrapLayout(content);
+}
--- a/apps/backend/src/generated/prisma/browser.ts
+++ b/apps/backend/src/generated/prisma/browser.ts
@@ -82,11 +82,6 @@ export type CourtBooking = Prisma.CourtBookingModel
 * 
 */
 export type CourtBookingLog = Prisma.CourtBookingLogModel
-/**
- * Model OnboardingRequest
- * 
- */
-export type OnboardingRequest = Prisma.OnboardingRequestModel
 /**
 * Model PasswordResetRequest
 * 
--- a/apps/backend/src/generated/prisma/client.ts
+++ b/apps/backend/src/generated/prisma/client.ts
@@ -106,11 +106,6 @@ export type CourtBooking = Prisma.CourtBookingModel
 * 
 */
 export type CourtBookingLog = Prisma.CourtBookingLogModel
-/**
- * Model OnboardingRequest
- * 
- */
-export type OnboardingRequest = Prisma.OnboardingRequestModel
 /**
 * Model PasswordResetRequest
 * 
--- a/apps/backend/src/generated/prisma/internal/class.ts
+++ b/apps/backend/src/generated/prisma/internal/class.ts
--- a/apps/backend/src/generated/prisma/internal/prismaNamespace.ts
+++ b/apps/backend/src/generated/prisma/internal/prismaNamespace.ts
@@ -397,7 +397,6 @@ export const ModelName = {
  CourtPriceRule: 'CourtPriceRule',
  CourtBooking: 'CourtBooking',
  CourtBookingLog: 'CourtBookingLog',
-  OnboardingRequest: 'OnboardingRequest',
  PasswordResetRequest: 'PasswordResetRequest',
  Plan: 'Plan'
 } as const
@@ -415,7 +414,7 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
    omit: GlobalOmitOptions
  }
  meta: {
-    modelProps: "user" | "session" | "account" | "verification" | "complex" | "complexUser" | "complexInvitation" | "sport" | "court" | "courtAvailability" | "courtPriceRule" | "courtBooking" | "courtBookingLog" | "onboardingRequest" | "passwordResetRequest" | "plan"
+    modelProps: "user" | "session" | "account" | "verification" | "complex" | "complexUser" | "complexInvitation" | "sport" | "court" | "courtAvailability" | "courtPriceRule" | "courtBooking" | "courtBookingLog" | "passwordResetRequest" | "plan"
    txIsolationLevel: TransactionIsolationLevel
  }
  model: {
@@ -1381,80 +1380,6 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
        }
      }
    }
-    OnboardingRequest: {
-      payload: Prisma.$OnboardingRequestPayload<ExtArgs>
-      fields: Prisma.OnboardingRequestFieldRefs
-      operations: {
-        findUnique: {
-          args: Prisma.OnboardingRequestFindUniqueArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload> | null
-        }
-        findUniqueOrThrow: {
-          args: Prisma.OnboardingRequestFindUniqueOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        findFirst: {
-          args: Prisma.OnboardingRequestFindFirstArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload> | null
-        }
-        findFirstOrThrow: {
-          args: Prisma.OnboardingRequestFindFirstOrThrowArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        findMany: {
-          args: Prisma.OnboardingRequestFindManyArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>[]
-        }
-        create: {
-          args: Prisma.OnboardingRequestCreateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        createMany: {
-          args: Prisma.OnboardingRequestCreateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        createManyAndReturn: {
-          args: Prisma.OnboardingRequestCreateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>[]
-        }
-        delete: {
-          args: Prisma.OnboardingRequestDeleteArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        update: {
-          args: Prisma.OnboardingRequestUpdateArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        deleteMany: {
-          args: Prisma.OnboardingRequestDeleteManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateMany: {
-          args: Prisma.OnboardingRequestUpdateManyArgs<ExtArgs>
-          result: BatchPayload
-        }
-        updateManyAndReturn: {
-          args: Prisma.OnboardingRequestUpdateManyAndReturnArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>[]
-        }
-        upsert: {
-          args: Prisma.OnboardingRequestUpsertArgs<ExtArgs>
-          result: runtime.Types.Utils.PayloadToResult<Prisma.$OnboardingRequestPayload>
-        }
-        aggregate: {
-          args: Prisma.OnboardingRequestAggregateArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.AggregateOnboardingRequest>
-        }
-        groupBy: {
-          args: Prisma.OnboardingRequestGroupByArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.OnboardingRequestGroupByOutputType>[]
-        }
-        count: {
-          args: Prisma.OnboardingRequestCountArgs<ExtArgs>
-          result: runtime.Types.Utils.Optional<Prisma.OnboardingRequestCountAggregateOutputType> | number
-        }
-      }
-    }
    PasswordResetRequest: {
      payload: Prisma.$PasswordResetRequestPayload<ExtArgs>
      fields: Prisma.PasswordResetRequestFieldRefs
@@ -1648,6 +1573,7 @@ export const UserScalarFieldEnum = {
  email: 'email',
  emailVerified: 'emailVerified',
  image: 'image',
+  phone: 'phone',
  createdAt: 'createdAt',
  updatedAt: 'updatedAt',
  role: 'role'
@@ -1805,6 +1731,7 @@ export const CourtBookingScalarFieldEnum = {
  endTime: 'endTime',
  customerName: 'customerName',
  customerPhone: 'customerPhone',
+  customerEmail: 'customerEmail',
  status: 'status',
  createdAt: 'createdAt',
  updatedAt: 'updatedAt'
@@ -1824,30 +1751,13 @@ export const CourtBookingLogScalarFieldEnum = {
  newStatus: 'newStatus',
  customerName: 'customerName',
  customerPhone: 'customerPhone',
+  customerEmail: 'customerEmail',
  changedAt: 'changedAt'
 } as const

 export type CourtBookingLogScalarFieldEnum = (typeof CourtBookingLogScalarFieldEnum)[keyof typeof CourtBookingLogScalarFieldEnum]


-export const OnboardingRequestScalarFieldEnum = {
-  id: 'id',
-  fullName: 'fullName',
-  email: 'email',
-  otpHash: 'otpHash',
-  otpExpiresAt: 'otpExpiresAt',
-  otpAttempts: 'otpAttempts',
-  otpLastSentAt: 'otpLastSentAt',
-  otpResendCount: 'otpResendCount',
-  emailVerifiedAt: 'emailVerifiedAt',
-  completedAt: 'completedAt',
-  createdAt: 'createdAt',
-  updatedAt: 'updatedAt'
-} as const
-
-export type OnboardingRequestScalarFieldEnum = (typeof OnboardingRequestScalarFieldEnum)[keyof typeof OnboardingRequestScalarFieldEnum]
-
-
 export const PasswordResetRequestScalarFieldEnum = {
  id: 'id',
  email: 'email',
@@ -2161,7 +2071,6 @@ export type GlobalOmitConfig = {
  courtPriceRule?: Prisma.CourtPriceRuleOmit
  courtBooking?: Prisma.CourtBookingOmit
  courtBookingLog?: Prisma.CourtBookingLogOmit
-  onboardingRequest?: Prisma.OnboardingRequestOmit
  passwordResetRequest?: Prisma.PasswordResetRequestOmit
  plan?: Prisma.PlanOmit
 }
--- a/apps/backend/src/generated/prisma/internal/prismaNamespaceBrowser.ts
+++ b/apps/backend/src/generated/prisma/internal/prismaNamespaceBrowser.ts
@@ -64,7 +64,6 @@ export const ModelName = {
  CourtPriceRule: 'CourtPriceRule',
  CourtBooking: 'CourtBooking',
  CourtBookingLog: 'CourtBookingLog',
-  OnboardingRequest: 'OnboardingRequest',
  PasswordResetRequest: 'PasswordResetRequest',
  Plan: 'Plan'
 } as const
@@ -91,6 +90,7 @@ export const UserScalarFieldEnum = {
  email: 'email',
  emailVerified: 'emailVerified',
  image: 'image',
+  phone: 'phone',
  createdAt: 'createdAt',
  updatedAt: 'updatedAt',
  role: 'role'
@@ -248,6 +248,7 @@ export const CourtBookingScalarFieldEnum = {
  endTime: 'endTime',
  customerName: 'customerName',
  customerPhone: 'customerPhone',
+  customerEmail: 'customerEmail',
  status: 'status',
  createdAt: 'createdAt',
  updatedAt: 'updatedAt'
@@ -267,30 +268,13 @@ export const CourtBookingLogScalarFieldEnum = {
  newStatus: 'newStatus',
  customerName: 'customerName',
  customerPhone: 'customerPhone',
+  customerEmail: 'customerEmail',
  changedAt: 'changedAt'
 } as const

 export type CourtBookingLogScalarFieldEnum = (typeof CourtBookingLogScalarFieldEnum)[keyof typeof CourtBookingLogScalarFieldEnum]


-export const OnboardingRequestScalarFieldEnum = {
-  id: 'id',
-  fullName: 'fullName',
-  email: 'email',
-  otpHash: 'otpHash',
-  otpExpiresAt: 'otpExpiresAt',
-  otpAttempts: 'otpAttempts',
-  otpLastSentAt: 'otpLastSentAt',
-  otpResendCount: 'otpResendCount',
-  emailVerifiedAt: 'emailVerifiedAt',
-  completedAt: 'completedAt',
-  createdAt: 'createdAt',
-  updatedAt: 'updatedAt'
-} as const
-
-export type OnboardingRequestScalarFieldEnum = (typeof OnboardingRequestScalarFieldEnum)[keyof typeof OnboardingRequestScalarFieldEnum]
-
-
 export const PasswordResetRequestScalarFieldEnum = {
  id: 'id',
  email: 'email',
--- a/apps/backend/src/generated/prisma/models.ts
+++ b/apps/backend/src/generated/prisma/models.ts
@@ -21,7 +21,6 @@ export type * from './models/CourtAvailability'
 export type * from './models/CourtPriceRule'
 export type * from './models/CourtBooking'
 export type * from './models/CourtBookingLog'
-export type * from './models/OnboardingRequest'
 export type * from './models/PasswordResetRequest'
 export type * from './models/Plan'
 export type * from './commonInputTypes'
--- a/apps/backend/src/generated/prisma/models/CourtBooking.ts
+++ b/apps/backend/src/generated/prisma/models/CourtBooking.ts
@@ -33,6 +33,7 @@ export type CourtBookingMinAggregateOutputType = {
  endTime: string | null
  customerName: string | null
  customerPhone: string | null
+  customerEmail: string | null
  status: $Enums.CourtBookingStatus | null
  createdAt: Date | null
  updatedAt: Date | null
@@ -47,6 +48,7 @@ export type CourtBookingMaxAggregateOutputType = {
  endTime: string | null
  customerName: string | null
  customerPhone: string | null
+  customerEmail: string | null
  status: $Enums.CourtBookingStatus | null
  createdAt: Date | null
  updatedAt: Date | null
@@ -61,6 +63,7 @@ export type CourtBookingCountAggregateOutputType = {
  endTime: number
  customerName: number
  customerPhone: number
+  customerEmail: number
  status: number
  createdAt: number
  updatedAt: number
@@ -77,6 +80,7 @@ export type CourtBookingMinAggregateInputType = {
  endTime?: true
  customerName?: true
  customerPhone?: true
+  customerEmail?: true
  status?: true
  createdAt?: true
  updatedAt?: true
@@ -91,6 +95,7 @@ export type CourtBookingMaxAggregateInputType = {
  endTime?: true
  customerName?: true
  customerPhone?: true
+  customerEmail?: true
  status?: true
  createdAt?: true
  updatedAt?: true
@@ -105,6 +110,7 @@ export type CourtBookingCountAggregateInputType = {
  endTime?: true
  customerName?: true
  customerPhone?: true
+  customerEmail?: true
  status?: true
  createdAt?: true
  updatedAt?: true
@@ -192,6 +198,7 @@ export type CourtBookingGroupByOutputType = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status: $Enums.CourtBookingStatus
  createdAt: Date
  updatedAt: Date
@@ -227,6 +234,7 @@ export type CourtBookingWhereInput = {
  endTime?: Prisma.StringFilter<"CourtBooking"> | string
  customerName?: Prisma.StringFilter<"CourtBooking"> | string
  customerPhone?: Prisma.StringFilter<"CourtBooking"> | string
+  customerEmail?: Prisma.StringFilter<"CourtBooking"> | string
  status?: Prisma.EnumCourtBookingStatusFilter<"CourtBooking"> | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
  updatedAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
@@ -242,6 +250,7 @@ export type CourtBookingOrderByWithRelationInput = {
  endTime?: Prisma.SortOrder
  customerName?: Prisma.SortOrder
  customerPhone?: Prisma.SortOrder
+  customerEmail?: Prisma.SortOrder
  status?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
@@ -261,6 +270,7 @@ export type CourtBookingWhereUniqueInput = Prisma.AtLeast<{
  endTime?: Prisma.StringFilter<"CourtBooking"> | string
  customerName?: Prisma.StringFilter<"CourtBooking"> | string
  customerPhone?: Prisma.StringFilter<"CourtBooking"> | string
+  customerEmail?: Prisma.StringFilter<"CourtBooking"> | string
  status?: Prisma.EnumCourtBookingStatusFilter<"CourtBooking"> | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
  updatedAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
@@ -276,6 +286,7 @@ export type CourtBookingOrderByWithAggregationInput = {
  endTime?: Prisma.SortOrder
  customerName?: Prisma.SortOrder
  customerPhone?: Prisma.SortOrder
+  customerEmail?: Prisma.SortOrder
  status?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
@@ -296,6 +307,7 @@ export type CourtBookingScalarWhereWithAggregatesInput = {
  endTime?: Prisma.StringWithAggregatesFilter<"CourtBooking"> | string
  customerName?: Prisma.StringWithAggregatesFilter<"CourtBooking"> | string
  customerPhone?: Prisma.StringWithAggregatesFilter<"CourtBooking"> | string
+  customerEmail?: Prisma.StringWithAggregatesFilter<"CourtBooking"> | string
  status?: Prisma.EnumCourtBookingStatusWithAggregatesFilter<"CourtBooking"> | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeWithAggregatesFilter<"CourtBooking"> | Date | string
  updatedAt?: Prisma.DateTimeWithAggregatesFilter<"CourtBooking"> | Date | string
@@ -309,6 +321,7 @@ export type CourtBookingCreateInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -324,6 +337,7 @@ export type CourtBookingUncheckedCreateInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -337,6 +351,7 @@ export type CourtBookingUpdateInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -352,6 +367,7 @@ export type CourtBookingUncheckedUpdateInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -366,6 +382,7 @@ export type CourtBookingCreateManyInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -379,6 +396,7 @@ export type CourtBookingUpdateManyMutationInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -393,6 +411,7 @@ export type CourtBookingUncheckedUpdateManyInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -423,6 +442,7 @@ export type CourtBookingCountOrderByAggregateInput = {
  endTime?: Prisma.SortOrder
  customerName?: Prisma.SortOrder
  customerPhone?: Prisma.SortOrder
+  customerEmail?: Prisma.SortOrder
  status?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
@@ -437,6 +457,7 @@ export type CourtBookingMaxOrderByAggregateInput = {
  endTime?: Prisma.SortOrder
  customerName?: Prisma.SortOrder
  customerPhone?: Prisma.SortOrder
+  customerEmail?: Prisma.SortOrder
  status?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
@@ -451,6 +472,7 @@ export type CourtBookingMinOrderByAggregateInput = {
  endTime?: Prisma.SortOrder
  customerName?: Prisma.SortOrder
  customerPhone?: Prisma.SortOrder
+  customerEmail?: Prisma.SortOrder
  status?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
@@ -510,6 +532,7 @@ export type CourtBookingCreateWithoutCourtInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -523,6 +546,7 @@ export type CourtBookingUncheckedCreateWithoutCourtInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -566,6 +590,7 @@ export type CourtBookingScalarWhereInput = {
  endTime?: Prisma.StringFilter<"CourtBooking"> | string
  customerName?: Prisma.StringFilter<"CourtBooking"> | string
  customerPhone?: Prisma.StringFilter<"CourtBooking"> | string
+  customerEmail?: Prisma.StringFilter<"CourtBooking"> | string
  status?: Prisma.EnumCourtBookingStatusFilter<"CourtBooking"> | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
  updatedAt?: Prisma.DateTimeFilter<"CourtBooking"> | Date | string
@@ -579,6 +604,7 @@ export type CourtBookingCreateManyCourtInput = {
  endTime: string
  customerName: string
  customerPhone: string
+  customerEmail: string
  status?: $Enums.CourtBookingStatus
  createdAt?: Date | string
  updatedAt?: Date | string
@@ -592,6 +618,7 @@ export type CourtBookingUpdateWithoutCourtInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -605,6 +632,7 @@ export type CourtBookingUncheckedUpdateWithoutCourtInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -618,6 +646,7 @@ export type CourtBookingUncheckedUpdateManyWithoutCourtInput = {
  endTime?: Prisma.StringFieldUpdateOperationsInput | string
  customerName?: Prisma.StringFieldUpdateOperationsInput | string
  customerPhone?: Prisma.StringFieldUpdateOperationsInput | string
+  customerEmail?: Prisma.StringFieldUpdateOperationsInput | string
  status?: Prisma.EnumCourtBookingStatusFieldUpdateOperationsInput | $Enums.CourtBookingStatus
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
@@ -634,6 +663,7 @@ export type CourtBookingSelect<ExtArgs extends runtime.Types.Extensions.Internal
  endTime?: boolean
  customerName?: boolean
  customerPhone?: boolean
+  customerEmail?: boolean
  status?: boolean
  createdAt?: boolean
  updatedAt?: boolean
@@ -649,6 +679,7 @@ export type CourtBookingSelectCreateManyAndReturn<ExtArgs extends runtime.Types.
  endTime?: boolean
  customerName?: boolean
  customerPhone?: boolean
+  customerEmail?: boolean
  status?: boolean
  createdAt?: boolean
  updatedAt?: boolean
@@ -664,6 +695,7 @@ export type CourtBookingSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.
  endTime?: boolean
  customerName?: boolean
  customerPhone?: boolean
+  customerEmail?: boolean
  status?: boolean
  createdAt?: boolean
  updatedAt?: boolean
@@ -679,12 +711,13 @@ export type CourtBookingSelectScalar = {
  endTime?: boolean
  customerName?: boolean
  customerPhone?: boolean
+  customerEmail?: boolean
  status?: boolean
  createdAt?: boolean
  updatedAt?: boolean
 }

-export type CourtBookingOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "bookingCode" | "courtId" | "bookingDate" | "startTime" | "endTime" | "customerName" | "customerPhone" | "status" | "createdAt" | "updatedAt", ExtArgs["result"]["courtBooking"]>
+export type CourtBookingOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "bookingCode" | "courtId" | "bookingDate" | "startTime" | "endTime" | "customerName" | "customerPhone" | "customerEmail" | "status" | "createdAt" | "updatedAt", ExtArgs["result"]["courtBooking"]>
 export type CourtBookingInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
  court?: boolean | Prisma.CourtDefaultArgs<ExtArgs>
 }
@@ -709,6 +742,7 @@ export type $CourtBookingPayload<ExtArgs extends runtime.Types.Extensions.Intern
    endTime: string
    customerName: string
    customerPhone: string
+    customerEmail: string
    status: $Enums.CourtBookingStatus
    createdAt: Date
    updatedAt: Date
@@ -1144,6 +1178,7 @@ export interface CourtBookingFieldRefs {
  readonly endTime: Prisma.FieldRef<"CourtBooking", 'String'>
  readonly customerName: Prisma.FieldRef<"CourtBooking", 'String'>
  readonly customerPhone: Prisma.FieldRef<"CourtBooking", 'String'>
+  readonly customerEmail: Prisma.FieldRef<"CourtBooking", 'String'>
  readonly status: Prisma.FieldRef<"CourtBooking", 'CourtBookingStatus'>
  readonly createdAt: Prisma.FieldRef<"CourtBooking", 'DateTime'>
  readonly updatedAt: Prisma.FieldRef<"CourtBooking", 'DateTime'>
--- a/apps/backend/src/generated/prisma/models/OnboardingRequest.ts
+++ b/apps/backend/src/generated/prisma/models/OnboardingRequest.ts
--- a/apps/backend/src/generated/prisma/models/User.ts
+++ b/apps/backend/src/generated/prisma/models/User.ts
@@ -30,6 +30,7 @@ export type UserMinAggregateOutputType = {
  email: string | null
  emailVerified: boolean | null
  image: string | null
+  phone: string | null
  createdAt: Date | null
  updatedAt: Date | null
  role: string | null
@@ -41,6 +42,7 @@ export type UserMaxAggregateOutputType = {
  email: string | null
  emailVerified: boolean | null
  image: string | null
+  phone: string | null
  createdAt: Date | null
  updatedAt: Date | null
  role: string | null
@@ -52,6 +54,7 @@ export type UserCountAggregateOutputType = {
  email: number
  emailVerified: number
  image: number
+  phone: number
  createdAt: number
  updatedAt: number
  role: number
@@ -65,6 +68,7 @@ export type UserMinAggregateInputType = {
  email?: true
  emailVerified?: true
  image?: true
+  phone?: true
  createdAt?: true
  updatedAt?: true
  role?: true
@@ -76,6 +80,7 @@ export type UserMaxAggregateInputType = {
  email?: true
  emailVerified?: true
  image?: true
+  phone?: true
  createdAt?: true
  updatedAt?: true
  role?: true
@@ -87,6 +92,7 @@ export type UserCountAggregateInputType = {
  email?: true
  emailVerified?: true
  image?: true
+  phone?: true
  createdAt?: true
  updatedAt?: true
  role?: true
@@ -171,6 +177,7 @@ export type UserGroupByOutputType = {
  email: string
  emailVerified: boolean
  image: string | null
+  phone: string | null
  createdAt: Date
  updatedAt: Date
  role: string
@@ -203,6 +210,7 @@ export type UserWhereInput = {
  email?: Prisma.StringFilter<"User"> | string
  emailVerified?: Prisma.BoolFilter<"User"> | boolean
  image?: Prisma.StringNullableFilter<"User"> | string | null
+  phone?: Prisma.StringNullableFilter<"User"> | string | null
  createdAt?: Prisma.DateTimeFilter<"User"> | Date | string
  updatedAt?: Prisma.DateTimeFilter<"User"> | Date | string
  role?: Prisma.StringFilter<"User"> | string
@@ -217,6 +225,7 @@ export type UserOrderByWithRelationInput = {
  email?: Prisma.SortOrder
  emailVerified?: Prisma.SortOrder
  image?: Prisma.SortOrderInput | Prisma.SortOrder
+  phone?: Prisma.SortOrderInput | Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
  role?: Prisma.SortOrder
@@ -234,6 +243,7 @@ export type UserWhereUniqueInput = Prisma.AtLeast<{
  name?: Prisma.StringFilter<"User"> | string
  emailVerified?: Prisma.BoolFilter<"User"> | boolean
  image?: Prisma.StringNullableFilter<"User"> | string | null
+  phone?: Prisma.StringNullableFilter<"User"> | string | null
  createdAt?: Prisma.DateTimeFilter<"User"> | Date | string
  updatedAt?: Prisma.DateTimeFilter<"User"> | Date | string
  role?: Prisma.StringFilter<"User"> | string
@@ -248,6 +258,7 @@ export type UserOrderByWithAggregationInput = {
  email?: Prisma.SortOrder
  emailVerified?: Prisma.SortOrder
  image?: Prisma.SortOrderInput | Prisma.SortOrder
+  phone?: Prisma.SortOrderInput | Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
  role?: Prisma.SortOrder
@@ -265,6 +276,7 @@ export type UserScalarWhereWithAggregatesInput = {
  email?: Prisma.StringWithAggregatesFilter<"User"> | string
  emailVerified?: Prisma.BoolWithAggregatesFilter<"User"> | boolean
  image?: Prisma.StringNullableWithAggregatesFilter<"User"> | string | null
+  phone?: Prisma.StringNullableWithAggregatesFilter<"User"> | string | null
  createdAt?: Prisma.DateTimeWithAggregatesFilter<"User"> | Date | string
  updatedAt?: Prisma.DateTimeWithAggregatesFilter<"User"> | Date | string
  role?: Prisma.StringWithAggregatesFilter<"User"> | string
@@ -276,6 +288,7 @@ export type UserCreateInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -290,6 +303,7 @@ export type UserUncheckedCreateInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -304,6 +318,7 @@ export type UserUpdateInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -318,6 +333,7 @@ export type UserUncheckedUpdateInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -332,6 +348,7 @@ export type UserCreateManyInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -343,6 +360,7 @@ export type UserUpdateManyMutationInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -354,6 +372,7 @@ export type UserUncheckedUpdateManyInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -365,6 +384,7 @@ export type UserCountOrderByAggregateInput = {
  email?: Prisma.SortOrder
  emailVerified?: Prisma.SortOrder
  image?: Prisma.SortOrder
+  phone?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
  role?: Prisma.SortOrder
@@ -376,6 +396,7 @@ export type UserMaxOrderByAggregateInput = {
  email?: Prisma.SortOrder
  emailVerified?: Prisma.SortOrder
  image?: Prisma.SortOrder
+  phone?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
  role?: Prisma.SortOrder
@@ -387,6 +408,7 @@ export type UserMinOrderByAggregateInput = {
  email?: Prisma.SortOrder
  emailVerified?: Prisma.SortOrder
  image?: Prisma.SortOrder
+  phone?: Prisma.SortOrder
  createdAt?: Prisma.SortOrder
  updatedAt?: Prisma.SortOrder
  role?: Prisma.SortOrder
@@ -461,6 +483,7 @@ export type UserCreateWithoutSessionsInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -474,6 +497,7 @@ export type UserUncheckedCreateWithoutSessionsInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -503,6 +527,7 @@ export type UserUpdateWithoutSessionsInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -516,6 +541,7 @@ export type UserUncheckedUpdateWithoutSessionsInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -529,6 +555,7 @@ export type UserCreateWithoutAccountsInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -542,6 +569,7 @@ export type UserUncheckedCreateWithoutAccountsInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -571,6 +599,7 @@ export type UserUpdateWithoutAccountsInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -584,6 +613,7 @@ export type UserUncheckedUpdateWithoutAccountsInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -597,6 +627,7 @@ export type UserCreateWithoutComplexesInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -610,6 +641,7 @@ export type UserUncheckedCreateWithoutComplexesInput = {
  email: string
  emailVerified?: boolean
  image?: string | null
+  phone?: string | null
  createdAt?: Date | string
  updatedAt?: Date | string
  role?: string
@@ -639,6 +671,7 @@ export type UserUpdateWithoutComplexesInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -652,6 +685,7 @@ export type UserUncheckedUpdateWithoutComplexesInput = {
  email?: Prisma.StringFieldUpdateOperationsInput | string
  emailVerified?: Prisma.BoolFieldUpdateOperationsInput | boolean
  image?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  phone?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
  createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  updatedAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
  role?: Prisma.StringFieldUpdateOperationsInput | string
@@ -714,6 +748,7 @@ export type UserSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = r
  email?: boolean
  emailVerified?: boolean
  image?: boolean
+  phone?: boolean
  createdAt?: boolean
  updatedAt?: boolean
  role?: boolean
@@ -729,6 +764,7 @@ export type UserSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensio
  email?: boolean
  emailVerified?: boolean
  image?: boolean
+  phone?: boolean
  createdAt?: boolean
  updatedAt?: boolean
  role?: boolean
@@ -740,6 +776,7 @@ export type UserSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensio
  email?: boolean
  emailVerified?: boolean
  image?: boolean
+  phone?: boolean
  createdAt?: boolean
  updatedAt?: boolean
  role?: boolean
@@ -751,12 +788,13 @@ export type UserSelectScalar = {
  email?: boolean
  emailVerified?: boolean
  image?: boolean
+  phone?: boolean
  createdAt?: boolean
  updatedAt?: boolean
  role?: boolean
 }

-export type UserOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "name" | "email" | "emailVerified" | "image" | "createdAt" | "updatedAt" | "role", ExtArgs["result"]["user"]>
+export type UserOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "name" | "email" | "emailVerified" | "image" | "phone" | "createdAt" | "updatedAt" | "role", ExtArgs["result"]["user"]>
 export type UserInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
  sessions?: boolean | Prisma.User$sessionsArgs<ExtArgs>
  accounts?: boolean | Prisma.User$accountsArgs<ExtArgs>
@@ -779,6 +817,7 @@ export type $UserPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
    email: string
    emailVerified: boolean
    image: string | null
+    phone: string | null
    createdAt: Date
    updatedAt: Date
    role: string
@@ -1213,6 +1252,7 @@ export interface UserFieldRefs {
  readonly email: Prisma.FieldRef<"User", 'String'>
  readonly emailVerified: Prisma.FieldRef<"User", 'Boolean'>
  readonly image: Prisma.FieldRef<"User", 'String'>
+  readonly phone: Prisma.FieldRef<"User", 'String'>
  readonly createdAt: Prisma.FieldRef<"User", 'DateTime'>
  readonly updatedAt: Prisma.FieldRef<"User", 'DateTime'>
  readonly role: Prisma.FieldRef<"User", 'String'>
--- a/apps/backend/src/lib/auth.ts
+++ b/apps/backend/src/lib/auth.ts
@@ -1,7 +1,9 @@
+import { wrapLayout } from '@/emails/booking-confirmation';
 import { dash } from '@better-auth/infra';
 import { betterAuth } from 'better-auth';
 import { prismaAdapter } from 'better-auth/adapters/prisma';
 import { openAPI } from 'better-auth/plugins';
+import { sendMail } from './mailer';
 import { db } from './prisma';

 export const auth = betterAuth({
@@ -18,6 +20,92 @@ export const auth = betterAuth({
  emailAndPassword: {
    enabled: true,
  },
+  user: {
+    additionalFields: {
+      phone: {
+        type: 'string',
+        required: false,
+      },
+    },
+  },
+  emailVerification: {
+    sendOnSignUp: true,
+    autoSignInAfterVerification: true,
+    sendVerificationEmail: async ({ user, url }) => {
+      const verificationUrl = new URL(url);
+      const appUrl = process.env.APP_BASE_URL ?? 'http://localhost:5173';
+      verificationUrl.searchParams.set('callbackURL', appUrl);
+
+      const content = `
+        <tr>
+          <td style="padding:24px 20px 16px;">
+            <table role="presentation" width="100%" cellpadding="0" cellspacing="0">
+              <tr>
+                <td valign="top">
+                  <table role="presentation" cellpadding="0" cellspacing="0" style="display:inline-block;background-color:#f4f4f5;border-radius:999px;padding:4px 12px;">
+                    <tr>
+                      <td style="font-size:11px;font-weight:700;letter-spacing:0.14em;color:#71717a;text-transform:uppercase;line-height:1.25rem;">
+                        Verificaci&oacute;n de email
+                      </td>
+                    </tr>
+                  </table>
+                  <h1 style="margin:16px 0 0;font-size:24px;font-weight:700;color:#111827;letter-spacing:-0.025em;">
+                    Verific&aacute; tu direcci&oacute;n de correo electr&oacute;nico
+                  </h1>
+                </td>
+                <td valign="top" align="right" style="white-space:nowrap;">
+                  <table role="presentation" cellpadding="0" cellspacing="0">
+                    <tr>
+                      <td valign="middle" style="padding-right:8px;">
+                        <img src="${appUrl}/playzer-favicon-512-transparent.png" alt="Playzer" width="32" height="32" style="display:block;" />
+                      </td>
+                      <td valign="middle">
+                        <span style="font-size:18px;font-weight:700;color:#475569;letter-spacing:-0.025em;">Playzer</span>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+padding:0 20px 16px;
+            <p style="margin:0;font-size:15px;color:#374151;line-height:1.6;">
+              Hac&eacute; click en el bot&oacute;n de abajo para verificar tu direcci&oacute;n de correo electr&oacute;nico y empezar a usar Playzer.
+            </p>
+          </td>
+        </tr>
+
+        <tr>
+          <td style="padding:0 20px 24px;">
+            <table role="presentation" cellpadding="0" cellspacing="0">
+              <tr>
+                <td style="background-color:#059669;border-radius:12px;text-align:center;">
+                  <a href="${verificationUrl.toString()}" style="display:block;padding:14px 32px;font-size:15px;font-weight:600;color:#ffffff;text-decoration:none;line-height:1.25rem;">Verificar email</a>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td style="padding:0 20px 24px;">
+            <p style="margin:0;font-size:13px;color:#9ca3af;text-align:center;line-height:1.5;">
+              Si no creaste una cuenta en Playzer, ignor&aacute; este mensaje.
+            </p>
+          </td>
+        </tr>`;
+
+      await sendMail({
+        to: user.email,
+        subject: 'Verificá tu email en Playzer',
+        html: wrapLayout(content),
+        text: `Hacé click para verificar tu email: ${verificationUrl.toString()}`,
+      });
+    },
+  },
  socialProviders: {
    google: {
      clientId: process.env.GOOGLE_CLIENT_ID!,
--- a/apps/backend/src/modules/admin-booking/handlers/create-admin-booking.handler.ts
+++ b/apps/backend/src/modules/admin-booking/handlers/create-admin-booking.handler.ts
@@ -1,7 +1,9 @@
+import { db } from '@/lib/prisma';
 import {
  AdminBookingServiceError,
  createAdminBooking,
 } from '@/modules/admin-booking/services/admin-booking.service';
+import { sendBookingConfirmation } from '@/services/booking-email.service';
 import type { AppContext } from '@/types/hono';
 import type { CreateAdminBookingInput } from '@repo/api-contract';

@@ -14,6 +16,26 @@ export async function createAdminBookingHandler(c: AppContext) {

  try {
    const booking = await createAdminBooking(user.id, complexId, payload);
+
+    const complex = await db.complex.findUnique({
+      where: { id: complexId },
+      select: { complexSlug: true },
+    });
+
+    void sendBookingConfirmation({
+      bookingCode: booking.bookingCode,
+      complexSlug: complex?.complexSlug ?? '',
+      complexName: booking.complexName,
+      date: booking.date,
+      startTime: booking.startTime,
+      endTime: booking.endTime,
+      courtName: booking.courtName,
+      sportName: booking.sport.name,
+      customerName: booking.customerName,
+      customerEmail: booking.customerEmail,
+      price: booking.price,
+    });
+
    return c.json(booking, 201);
  } catch (error) {
    if (error instanceof AdminBookingServiceError) {
--- a/apps/backend/src/modules/admin-booking/handlers/update-admin-booking-status.handler.ts
+++ b/apps/backend/src/modules/admin-booking/handlers/update-admin-booking-status.handler.ts
@@ -2,6 +2,7 @@ import {
  AdminBookingServiceError,
  updateAdminBookingStatus,
 } from '@/modules/admin-booking/services/admin-booking.service';
+import { sendBookingCancelled, sendBookingNoShow } from '@/services/booking-email.service';
 import type { AppContext } from '@/types/hono';
 import type { UpdateAdminBookingStatusInput } from '@repo/api-contract';

@@ -14,6 +15,33 @@ export async function updateAdminBookingStatusHandler(c: AppContext) {

  try {
    const booking = await updateAdminBookingStatus(user.id, id, payload);
+
+    if (payload.status === 'CANCELLED') {
+      void sendBookingCancelled({
+        bookingCode: booking.bookingCode,
+        complexName: booking.complexName,
+        date: booking.date,
+        startTime: booking.startTime,
+        endTime: booking.endTime,
+        courtName: booking.courtName,
+        sportName: booking.sport.name,
+        customerName: booking.customerName,
+        customerEmail: booking.customerEmail,
+      });
+    } else if (payload.status === 'NOSHOW') {
+      void sendBookingNoShow({
+        bookingCode: booking.bookingCode,
+        complexName: booking.complexName,
+        date: booking.date,
+        startTime: booking.startTime,
+        endTime: booking.endTime,
+        courtName: booking.courtName,
+        sportName: booking.sport.name,
+        customerName: booking.customerName,
+        customerEmail: booking.customerEmail,
+      });
+    }
+
    return c.json(booking);
  } catch (error) {
    if (error instanceof AdminBookingServiceError) {
--- a/apps/backend/src/modules/admin-booking/services/admin-booking.service.ts
+++ b/apps/backend/src/modules/admin-booking/services/admin-booking.service.ts
@@ -2,6 +2,7 @@ import { randomInt } from 'node:crypto';
 import { CourtBookingStatus } from '@/generated/prisma/enums';
 import { db } from '@/lib/prisma';
 import { evaluatePlanUsage, parsePlanRules } from '@/modules/plan/services/plan-rules.service';
+import type { DayOfWeek } from '@repo/api-contract';
 import type {
  AdminBooking,
  CreateAdminBookingInput,
@@ -156,6 +157,40 @@ async function ensureComplexAccess(complexId: string, userId: string) {
  return complexUser.complex;
 }

+function resolvePrice(
+  court: {
+    basePrice: unknown;
+    priceRules: Array<{
+      dayOfWeek: string | null;
+      startTime: string | null;
+      endTime: string | null;
+      price: unknown;
+    }>;
+  },
+  dayOfWeek: string,
+  startTime: string,
+  endTime: string
+): number {
+  const slotStart = toMinutes(startTime);
+  const slotEnd = toMinutes(endTime);
+
+  const matchingRules = court.priceRules
+    .filter((rule) => {
+      if (rule.dayOfWeek && rule.dayOfWeek !== dayOfWeek) return false;
+      if (!rule.startTime || !rule.endTime) return true;
+      return slotStart >= toMinutes(rule.startTime) && slotEnd <= toMinutes(rule.endTime);
+    })
+    .sort((first, second) => {
+      const firstSpecificity =
+        (first.dayOfWeek ? 2 : 0) + (first.startTime && first.endTime ? 1 : 0);
+      const secondSpecificity =
+        (second.dayOfWeek ? 2 : 0) + (second.startTime && second.endTime ? 1 : 0);
+      return secondSpecificity - firstSpecificity;
+    });
+
+  return Number(matchingRules[0]?.price ?? court.basePrice);
+}
+
 function mapBookingResponse(booking: {
  id: string;
  bookingCode: string;
@@ -164,6 +199,7 @@ function mapBookingResponse(booking: {
  endTime: string;
  customerName: string;
  customerPhone: string;
+  customerEmail: string;
  status: 'CONFIRMED' | 'CANCELLED' | 'COMPLETED' | 'NOSHOW';
  createdAt: Date;
  updatedAt: Date;
@@ -180,6 +216,7 @@ function mapBookingResponse(booking: {
      slug: string;
    };
  };
+  price?: number;
 }): AdminBooking {
  return {
    id: booking.id,
@@ -198,6 +235,8 @@ function mapBookingResponse(booking: {
    endTime: booking.endTime,
    customerName: booking.customerName,
    customerPhone: booking.customerPhone,
+    customerEmail: booking.customerEmail,
+    price: booking.price ?? 0,
    status: booking.status,
    createdAt: booking.createdAt.toISOString(),
    updatedAt: booking.updatedAt.toISOString(),
@@ -258,6 +297,16 @@ export async function createAdminBooking(
  input: CreateAdminBookingInput
 ) {
  const complex = await ensureComplexAccess(complexId, userId);
+
+  const adminUser = await db.user.findUnique({
+    where: { id: userId },
+    select: { emailVerified: true },
+  });
+
+  if (!adminUser?.emailVerified) {
+    throw new AdminBookingServiceError('Debés verificar tu email para poder crear reservas.', 403);
+  }
+
  const bookingDate = parseIsoDate(input.date);
  const dayOfWeek = getDayOfWeek(bookingDate);

@@ -282,6 +331,10 @@ export async function createAdminBooking(
          slug: true,
        },
      },
+      priceRules: {
+        where: { isActive: true },
+        orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
+      },
    },
  });

@@ -371,6 +424,7 @@ export async function createAdminBooking(
            endTime: selectedSlot.endTime,
            customerName: input.customerName.trim(),
            customerPhone: input.customerPhone.trim(),
+            customerEmail: input.customerEmail.trim(),
            status: 'CONFIRMED',
          },
          include: {
@@ -397,7 +451,9 @@ export async function createAdminBooking(
        });
      });

-      return mapBookingResponse(booking);
+      const price = resolvePrice(court, dayOfWeek, selectedSlot.startTime, selectedSlot.endTime);
+
+      return mapBookingResponse({ ...booking, price });
    } catch (error) {
      if (error instanceof AdminBookingServiceError) {
        throw error;
@@ -511,6 +567,7 @@ export async function updateAdminBookingStatus(
      endTime: booking.endTime,
      customerName: booking.customerName,
      customerPhone: booking.customerPhone,
+      customerEmail: booking.customerEmail,
      previousStatus: booking.status,
      newStatus: input.status,
      changedAt: new Date(),
--- a/apps/backend/src/modules/complex/handlers/create-complex.handler.ts
+++ b/apps/backend/src/modules/complex/handlers/create-complex.handler.ts
@@ -40,6 +40,11 @@ export async function createComplexHandler(c: AppContext) {
    city: payload.city,
    state: payload.state,
    country: payload.country,
+    setupCourts: payload.setupCourts,
+    courtSportId: payload.courtSportId,
+    courtStartTime: payload.courtStartTime,
+    courtEndTime: payload.courtEndTime,
+    courtDaysOfWeek: payload.courtDaysOfWeek,
  });

  return c.json(complex, 201);
--- a/apps/backend/src/modules/complex/services/complex.service.ts
+++ b/apps/backend/src/modules/complex/services/complex.service.ts
@@ -11,8 +11,47 @@ export type CreateComplexInput = {
  city?: string;
  state?: string;
  country?: string;
+  setupCourts?: boolean;
+  courtSportId?: string;
+  courtStartTime?: string;
+  courtEndTime?: string;
+  courtDaysOfWeek?: string[];
 };

+type DayOfWeek = 'MONDAY' | 'TUESDAY' | 'WEDNESDAY' | 'THURSDAY' | 'FRIDAY' | 'SATURDAY' | 'SUNDAY';
+
+function toMinutes(value: string): number {
+  const [hours, minutes] = value.split(':').map((part) => Number(part));
+  return hours * 60 + minutes;
+}
+
+function assertAvailabilityRanges(
+  availability: Array<{
+    dayOfWeek: DayOfWeek;
+    startTime: string;
+    endTime: string;
+  }>
+) {
+  for (const range of availability) {
+    const start = toMinutes(range.startTime);
+    const end = toMinutes(range.endTime);
+    if (start >= end) {
+      throw new Error(`El rango ${range.startTime}-${range.endTime} es inválido.`);
+    }
+  }
+}
+
+async function ensureActiveSport(sportId: string) {
+  const sport = await db.sport.findFirst({
+    where: { id: sportId, isActive: true },
+    select: { id: true, name: true },
+  });
+  if (!sport) {
+    throw new Error('El deporte seleccionado no existe o está inactivo.');
+  }
+  return sport;
+}
+
 export type UpdateComplexInput = {
  complexName?: string;
  physicalAddress?: string | null;
@@ -94,6 +133,38 @@ export async function createComplex(input: CreateComplexInput) {
      });
    }

+    if (input.setupCourts && input.courtSportId) {
+      const sport = await ensureActiveSport(input.courtSportId);
+      const availability = (input.courtDaysOfWeek ?? []).map((day) => ({
+        dayOfWeek: day as DayOfWeek,
+        startTime: input.courtStartTime ?? '08:00',
+        endTime: input.courtEndTime ?? '22:00',
+      }));
+
+      assertAvailabilityRanges(availability);
+
+      const court = await tx.court.create({
+        data: {
+          id: uuidv7(),
+          complexId: complex.id,
+          sportId: input.courtSportId,
+          name: `${sport.name} 1`,
+          slotDurationMinutes: 60,
+          basePrice: 0,
+        },
+      });
+
+      await tx.courtAvailability.createMany({
+        data: availability.map((avail) => ({
+          id: uuidv7(),
+          courtId: court.id,
+          dayOfWeek: avail.dayOfWeek,
+          startTime: avail.startTime,
+          endTime: avail.endTime,
+        })),
+      });
+    }
+
    return complex;
  });
 }
--- a/apps/backend/src/modules/onboarding/handlers/complete-onboarding.handler.ts
+++ b/apps/backend/src/modules/onboarding/handlers/complete-onboarding.handler.ts
@@ -1,27 +0,0 @@
-import {
-  OnboardingError,
-  completeOnboarding,
-} from '@/modules/onboarding/services/onboarding.service';
-import type { AppContext } from '@/types/hono';
-import type { OnboardingCompleteInput } from '@repo/api-contract';
-
-export async function completeOnboardingHandler(c: AppContext) {
-  const payload = c.req.valid('json' as never) as OnboardingCompleteInput;
-
-  try {
-    const result = await completeOnboarding(payload);
-    return c.json({
-      message: 'Onboarding completado correctamente.',
-      ...result,
-    });
-  } catch (error) {
-    if (error instanceof OnboardingError) {
-      return c.json({ message: error.message }, error.status);
-    }
-
-    if (error instanceof Error) {
-      return c.json({ message: error.message }, 400);
-    }
-    throw error;
-  }
-}
--- a/apps/backend/src/modules/onboarding/handlers/resend-otp.handler.ts
+++ b/apps/backend/src/modules/onboarding/handlers/resend-otp.handler.ts
@@ -1,25 +0,0 @@
-import {
-  OnboardingError,
-  resendOnboardingOtp,
-} from '@/modules/onboarding/services/onboarding.service';
-import type { AppContext } from '@/types/hono';
-import type { OnboardingResendOtpInput } from '@repo/api-contract';
-
-export async function resendOtpHandler(c: AppContext) {
-  const payload = c.req.valid('json' as never) as OnboardingResendOtpInput;
-
-  try {
-    const result = await resendOnboardingOtp(payload);
-    return c.json(result);
-  } catch (error) {
-    if (error instanceof OnboardingError) {
-      return c.json({ message: error.message }, error.status);
-    }
-
-    if (error instanceof Error) {
-      return c.json({ message: error.message }, 400);
-    }
-
-    throw error;
-  }
-}
--- a/apps/backend/src/modules/onboarding/handlers/start-onboarding.handler.ts
+++ b/apps/backend/src/modules/onboarding/handlers/start-onboarding.handler.ts
@@ -1,10 +0,0 @@
-import { startOnboarding } from '@/modules/onboarding/services/onboarding.service';
-import type { AppContext } from '@/types/hono';
-import type { OnboardingStartInput } from '@repo/api-contract';
-
-export async function startOnboardingHandler(c: AppContext) {
-  const payload = c.req.valid('json' as never) as OnboardingStartInput;
-
-  const result = await startOnboarding(payload);
-  return c.json(result, 202);
-}
--- a/apps/backend/src/modules/onboarding/handlers/verify-otp.handler.ts
+++ b/apps/backend/src/modules/onboarding/handlers/verify-otp.handler.ts
@@ -1,10 +0,0 @@
-import { verifyOnboardingOtp } from '@/modules/onboarding/services/onboarding.service';
-import type { AppContext } from '@/types/hono';
-import type { OnboardingVerifyOtpInput } from '@repo/api-contract';
-
-export async function verifyOtpHandler(c: AppContext) {
-  const payload = c.req.valid('json' as never) as OnboardingVerifyOtpInput;
-  const result = await verifyOnboardingOtp(payload);
-
-  return c.json(result);
-}
--- a/apps/backend/src/modules/onboarding/onboarding.routes.ts
+++ b/apps/backend/src/modules/onboarding/onboarding.routes.ts
@@ -1,35 +0,0 @@
-import { completeOnboardingHandler } from '@/modules/onboarding/handlers/complete-onboarding.handler';
-import { resendOtpHandler } from '@/modules/onboarding/handlers/resend-otp.handler';
-import { startOnboardingHandler } from '@/modules/onboarding/handlers/start-onboarding.handler';
-import { verifyOtpHandler } from '@/modules/onboarding/handlers/verify-otp.handler';
-import type { AppEnv } from '@/types/hono';
-import { zValidator } from '@hono/zod-validator';
-import {
-  onboardingCompleteSchema,
-  onboardingResendOtpSchema,
-  onboardingStartSchema,
-  onboardingVerifyOtpSchema,
-} from '@repo/api-contract';
-import { Hono } from 'hono';
-
-export const onboardingRoutes = new Hono<AppEnv>();
-
-onboardingRoutes.post('/start', zValidator('json', onboardingStartSchema), startOnboardingHandler);
-
-onboardingRoutes.post(
-  '/verify-otp',
-  zValidator('json', onboardingVerifyOtpSchema),
-  verifyOtpHandler
-);
-
-onboardingRoutes.post(
-  '/resend-otp',
-  zValidator('json', onboardingResendOtpSchema),
-  resendOtpHandler
-);
-
-onboardingRoutes.post(
-  '/complete',
-  zValidator('json', onboardingCompleteSchema),
-  completeOnboardingHandler
-);
--- a/apps/backend/src/modules/onboarding/services/onboarding.service.ts
+++ b/apps/backend/src/modules/onboarding/services/onboarding.service.ts
@@ -1,415 +0,0 @@
-import { createHash, randomInt } from 'node:crypto';
-import { auth } from '@/lib/auth';
-import { sendMail } from '@/lib/mailer';
-import { db } from '@/lib/prisma';
-import type {
-  OnboardingCompleteInput,
-  OnboardingResendOtpInput,
-  OnboardingStartInput,
-  OnboardingVerifyOtpInput,
-} from '@repo/api-contract';
-import { v7 as uuidv7 } from 'uuid';
-
-const OTP_LENGTH = 6;
-const OTP_TTL_MINUTES = Number(Bun.env.ONBOARDING_OTP_TTL_MINUTES ?? 10);
-const OTP_MAX_ATTEMPTS = Number(Bun.env.ONBOARDING_OTP_MAX_ATTEMPTS ?? 5);
-const OTP_RESEND_COOLDOWN_SECONDS = Number(Bun.env.ONBOARDING_OTP_RESEND_COOLDOWN_SECONDS ?? 30);
-
-type VerifyOtpResult = {
-  message: string;
-  verified: boolean;
-  requestId: string;
-  email: string | null;
-  expiresAt: string | null;
-  remainingAttempts: number;
-  cooldownSeconds: number;
-};
-
-type ResendOtpResult = {
-  message: string;
-  requestId: string;
-  email: string;
-  expiresAt: string;
-  cooldownSeconds: number;
-  remainingAttempts: number;
-};
-
-type StartOnboardingResult = {
-  message: string;
-  requestId: string;
-  email: string;
-  expiresAt: string;
-  cooldownSeconds: number;
-};
-
-export class OnboardingError extends Error {
-  status: 400 | 404 | 409 | 429;
-
-  constructor(message: string, status: 400 | 404 | 409 | 429 = 400) {
-    super(message);
-    this.name = 'OnboardingError';
-    this.status = status;
-  }
-}
-
-function nowPlusMinutes(minutes: number): Date {
-  const date = new Date();
-  date.setMinutes(date.getMinutes() + minutes);
-  return date;
-}
-
-function normalizeEmail(email: string): string {
-  return email.trim().toLowerCase();
-}
-
-function createOtpCode(): string {
-  return randomInt(0, 10 ** OTP_LENGTH)
-    .toString()
-    .padStart(OTP_LENGTH, '0');
-}
-
-function hashValue(value: string): string {
-  return createHash('sha256').update(value).digest('hex');
-}
-
-function getRemainingAttempts(otpAttempts: number): number {
-  return Math.max(0, OTP_MAX_ATTEMPTS - otpAttempts);
-}
-
-function getCooldownSeconds(otpLastSentAt: Date): number {
-  const elapsedMs = Date.now() - otpLastSentAt.getTime();
-  const remainingMs = OTP_RESEND_COOLDOWN_SECONDS * 1000 - elapsedMs;
-  return Math.max(0, Math.ceil(remainingMs / 1000));
-}
-
-function slugify(value: string): string {
-  return value
-    .normalize('NFD')
-    .replace(/[\u0300-\u036f]/g, '')
-    .toLowerCase()
-    .trim()
-    .replace(/[^a-z0-9\s-]/g, '')
-    .replace(/\s+/g, '-')
-    .replace(/-+/g, '-');
-}
-
-async function buildUniqueComplexSlug(complexName: string): Promise<string> {
-  const base = slugify(complexName);
-  const fallback = base.length > 0 ? base : `complex-${uuidv7().slice(0, 8)}`;
-
-  let candidate = fallback;
-  let index = 1;
-
-  while (true) {
-    const existing = await db.complex.findFirst({
-      where: { complexSlug: candidate },
-      select: { id: true },
-    });
-
-    if (!existing) {
-      return candidate;
-    }
-
-    index += 1;
-    candidate = `${fallback}-${index}`;
-  }
-}
-
-async function sendOtpEmail(email: string, otpCode: string) {
-  await sendMail({
-    to: email,
-    subject: 'Codigo OTP para validar tu email',
-    text: `Tu codigo OTP es ${otpCode}. Vence en ${OTP_TTL_MINUTES} minutos.`,
-    html: `<p>Tu codigo OTP es <strong>${otpCode}</strong>.</p><p>Vence en ${OTP_TTL_MINUTES} minutos.</p>`,
-  });
-}
-
-export async function startOnboarding(input: OnboardingStartInput): Promise<StartOnboardingResult> {
-  const email = normalizeEmail(input.email);
-  const otpCode = createOtpCode();
-  const expiresAt = nowPlusMinutes(OTP_TTL_MINUTES);
-  const now = new Date();
-
-  const request = await db.onboardingRequest.create({
-    data: {
-      id: uuidv7(),
-      fullName: input.fullName.trim(),
-      email,
-      otpHash: hashValue(otpCode),
-      otpExpiresAt: expiresAt,
-      otpAttempts: 0,
-      otpLastSentAt: now,
-      otpResendCount: 0,
-    },
-    select: {
-      id: true,
-      email: true,
-      otpExpiresAt: true,
-    },
-  });
-
-  await sendOtpEmail(email, otpCode);
-
-  return {
-    message: 'Te enviamos un codigo OTP para validar tu direccion.',
-    requestId: request.id,
-    email: request.email,
-    expiresAt: request.otpExpiresAt.toISOString(),
-    cooldownSeconds: OTP_RESEND_COOLDOWN_SECONDS,
-  };
-}
-
-export async function verifyOnboardingOtp(
-  input: OnboardingVerifyOtpInput
-): Promise<VerifyOtpResult> {
-  const request = await db.onboardingRequest.findUnique({
-    where: { id: input.requestId },
-  });
-
-  if (!request) {
-    return {
-      message: 'Solicitud de onboarding invalida o expirada.',
-      verified: false,
-      requestId: input.requestId,
-      email: null,
-      expiresAt: null,
-      remainingAttempts: 0,
-      cooldownSeconds: 0,
-    };
-  }
-
-  if (request.completedAt) {
-    return {
-      message: 'Este onboarding ya fue completado.',
-      verified: true,
-      requestId: request.id,
-      email: request.email,
-      expiresAt: request.otpExpiresAt.toISOString(),
-      remainingAttempts: getRemainingAttempts(request.otpAttempts),
-      cooldownSeconds: getCooldownSeconds(request.otpLastSentAt),
-    };
-  }
-
-  if (request.otpExpiresAt < new Date()) {
-    return {
-      message: 'El codigo OTP vencio. Solicita un nuevo codigo.',
-      verified: false,
-      requestId: request.id,
-      email: request.email,
-      expiresAt: request.otpExpiresAt.toISOString(),
-      remainingAttempts: getRemainingAttempts(request.otpAttempts),
-      cooldownSeconds: getCooldownSeconds(request.otpLastSentAt),
-    };
-  }
-
-  if (request.otpAttempts >= OTP_MAX_ATTEMPTS) {
-    return {
-      message: 'Se agotaron los intentos de OTP. Solicita un nuevo codigo.',
-      verified: false,
-      requestId: request.id,
-      email: request.email,
-      expiresAt: request.otpExpiresAt.toISOString(),
-      remainingAttempts: 0,
-      cooldownSeconds: getCooldownSeconds(request.otpLastSentAt),
-    };
-  }
-
-  const otpMatches = hashValue(input.otp) === request.otpHash;
-
-  if (!otpMatches) {
-    const updated = await db.onboardingRequest.update({
-      where: { id: request.id },
-      data: {
-        otpAttempts: {
-          increment: 1,
-        },
-      },
-      select: {
-        id: true,
-        email: true,
-        otpAttempts: true,
-        otpExpiresAt: true,
-        otpLastSentAt: true,
-      },
-    });
-
-    const remainingAttempts = getRemainingAttempts(updated.otpAttempts);
-
-    return {
-      message:
-        remainingAttempts > 0
-          ? 'Codigo OTP invalido.'
-          : 'Se agotaron los intentos de OTP. Solicita un nuevo codigo.',
-      verified: false,
-      requestId: updated.id,
-      email: updated.email,
-      expiresAt: updated.otpExpiresAt.toISOString(),
-      remainingAttempts,
-      cooldownSeconds: getCooldownSeconds(updated.otpLastSentAt),
-    };
-  }
-
-  if (!request.emailVerifiedAt) {
-    await db.onboardingRequest.update({
-      where: { id: request.id },
-      data: { emailVerifiedAt: new Date() },
-    });
-  }
-
-  return {
-    message: 'Email verificado correctamente.',
-    verified: true,
-    requestId: request.id,
-    email: request.email,
-    expiresAt: request.otpExpiresAt.toISOString(),
-    remainingAttempts: getRemainingAttempts(request.otpAttempts),
-    cooldownSeconds: getCooldownSeconds(request.otpLastSentAt),
-  };
-}
-
-export async function resendOnboardingOtp(
-  input: OnboardingResendOtpInput
-): Promise<ResendOtpResult> {
-  const request = await db.onboardingRequest.findUnique({
-    where: { id: input.requestId },
-  });
-
-  if (!request) {
-    throw new OnboardingError('Solicitud de onboarding invalida o expirada.', 404);
-  }
-
-  if (request.completedAt) {
-    throw new OnboardingError('Este onboarding ya fue completado.', 400);
-  }
-
-  if (request.emailVerifiedAt) {
-    throw new OnboardingError('El email ya fue verificado.', 400);
-  }
-
-  const cooldownSeconds = getCooldownSeconds(request.otpLastSentAt);
-  if (cooldownSeconds > 0) {
-    throw new OnboardingError(`Debes esperar ${cooldownSeconds}s antes de reenviar el OTP.`, 429);
-  }
-
-  const otpCode = createOtpCode();
-  const expiresAt = nowPlusMinutes(OTP_TTL_MINUTES);
-  const now = new Date();
-
-  const updated = await db.onboardingRequest.update({
-    where: { id: request.id },
-    data: {
-      otpHash: hashValue(otpCode),
-      otpExpiresAt: expiresAt,
-      otpAttempts: 0,
-      otpLastSentAt: now,
-      otpResendCount: {
-        increment: 1,
-      },
-    },
-    select: {
-      id: true,
-      email: true,
-      otpExpiresAt: true,
-      otpAttempts: true,
-    },
-  });
-
-  await sendOtpEmail(updated.email, otpCode);
-
-  return {
-    message: 'Te enviamos un nuevo codigo OTP.',
-    requestId: updated.id,
-    email: updated.email,
-    expiresAt: updated.otpExpiresAt.toISOString(),
-    cooldownSeconds: OTP_RESEND_COOLDOWN_SECONDS,
-    remainingAttempts: getRemainingAttempts(updated.otpAttempts),
-  };
-}
-
-export async function completeOnboarding(input: OnboardingCompleteInput) {
-  const onboardingRequest = await db.onboardingRequest.findUnique({
-    where: { id: input.onboardingRequestId },
-  });
-
-  if (!onboardingRequest) {
-    throw new OnboardingError('Solicitud de onboarding inválida o expirada.', 400);
-  }
-
-  if (onboardingRequest.otpExpiresAt < new Date()) {
-    throw new OnboardingError('La sesión de onboarding expiró. Solicita un nuevo OTP.', 400);
-  }
-
-  if (!onboardingRequest.emailVerifiedAt) {
-    throw new OnboardingError('Debes verificar el email antes de continuar.', 400);
-  }
-
-  if (onboardingRequest.completedAt) {
-    throw new OnboardingError('Este onboarding ya fue completado.', 400);
-  }
-
-  const plan = await db.plan.findUnique({
-    where: { code: input.planCode },
-    select: { code: true },
-  });
-
-  if (!plan) {
-    throw new OnboardingError('El plan seleccionado no existe.', 400);
-  }
-
-  const { user } = await auth.api.signUpEmail({
-    asResponse: false,
-    body: {
-      email: onboardingRequest.email,
-      password: input.password,
-      name: onboardingRequest.fullName,
-    },
-  });
-
-  const complexSlug = await buildUniqueComplexSlug(input.complexName);
-
-  const result = await db.$transaction(async (tx) => {
-    await tx.user.update({
-      where: { id: user.id },
-      data: { emailVerified: true },
-    });
-
-    const complex = await tx.complex.create({
-      data: {
-        id: uuidv7(),
-        complexName: input.complexName.trim(),
-        physicalAddress: input.physicalAddress.trim(),
-        city: input.city?.trim() || null,
-        state: input.state?.trim() || null,
-        country: input.country?.trim() || null,
-        complexSlug,
-        adminEmail: onboardingRequest.email,
-        planCode: input.planCode,
-      },
-    });
-
-    await tx.complexUser.create({
-      data: {
-        complexId: complex.id,
-        userId: user.id,
-        role: 'ADMIN',
-      },
-    });
-
-    await tx.onboardingRequest.update({
-      where: { id: onboardingRequest.id },
-      data: {
-        completedAt: new Date(),
-      },
-    });
-
-    return {
-      userId: user.id,
-      complexId: complex.id,
-      complexSlug: complex.complexSlug,
-    };
-  });
-
-  return {
-    ...result,
-  };
-}
--- a/apps/backend/src/modules/plan/handlers/list-plans.handler.ts
+++ b/apps/backend/src/modules/plan/handlers/list-plans.handler.ts
@@ -1,23 +1,24 @@
 import { db } from '@/lib/prisma';
+import { parsePlanRules } from '@/modules/plan/services/plan-rules.service';
 import type { AppContext } from '@/types/hono';

 export async function listPlansHandler(c: AppContext) {
  const plans = await db.plan.findMany({
-    select: {
-      code: true,
-      name: true,
-      price: true,
-    },
    orderBy: {
      price: 'asc',
    },
  });

  return c.json(
-    plans.map((plan) => ({
+    plans.map((plan) => {
+      const rules = parsePlanRules(plan.rules);
+      return {
        code: plan.code,
        name: plan.name,
        price: Number(plan.price),
-    }))
+        features: rules.features,
+        limits: rules.limits,
+      };
+    })
  );
 }
--- a/apps/backend/src/modules/public-booking/handlers/cancel-public-booking.handler.ts
+++ b/apps/backend/src/modules/public-booking/handlers/cancel-public-booking.handler.ts
@@ -0,0 +1,55 @@
+import { sseManager } from '@/lib/sse';
+import {
+  PublicBookingServiceError,
+  cancelPublicBooking,
+} from '@/modules/public-booking/services/public-booking.service';
+import { sendBookingCancelled } from '@/services/booking-email.service';
+import type { AppContext } from '@/types/hono';
+import type { CancelPublicBookingInput } from '@repo/api-contract';
+
+type ComplexSlugParams = { complexSlug: string };
+
+export async function cancelPublicBookingHandler(c: AppContext) {
+  const { complexSlug } = c.req.valid('param' as never) as ComplexSlugParams;
+  const payload = c.req.valid('json' as never) as CancelPublicBookingInput;
+
+  try {
+    const booking = await cancelPublicBooking(complexSlug, payload);
+
+    const channel = `complex-${booking.complexId}`;
+    sseManager.emit(
+      channel,
+      JSON.stringify({
+        type: 'booking_cancelled',
+        booking: {
+          bookingCode: booking.bookingCode,
+          courtId: booking.courtId,
+          date: booking.date,
+          startTime: booking.startTime,
+          endTime: booking.endTime,
+        },
+      })
+    );
+
+    void sendBookingCancelled({
+      bookingCode: booking.bookingCode,
+      complexSlug: booking.complexSlug,
+      complexName: booking.complexName,
+      date: booking.date,
+      startTime: booking.startTime,
+      endTime: booking.endTime,
+      courtName: booking.courtName,
+      sportName: booking.sport.name,
+      customerName: booking.customerName,
+      customerEmail: booking.customerEmail,
+    });
+
+    return c.json(booking);
+  } catch (error) {
+    if (error instanceof PublicBookingServiceError) {
+      return c.json({ message: error.message }, error.status);
+    }
+
+    throw error;
+  }
+}
--- a/apps/backend/src/modules/public-booking/handlers/create-public-booking.handler.ts
+++ b/apps/backend/src/modules/public-booking/handlers/create-public-booking.handler.ts
@@ -3,6 +3,7 @@ import {
  PublicBookingServiceError,
  createPublicBooking,
 } from '@/modules/public-booking/services/public-booking.service';
+import { sendBookingConfirmation } from '@/services/booking-email.service';
 import type { AppContext } from '@/types/hono';
 import type { CreatePublicBookingInput } from '@repo/api-contract';

@@ -30,6 +31,20 @@ export async function createPublicBookingHandler(c: AppContext) {
      })
    );

+    void sendBookingConfirmation({
+      bookingCode: booking.bookingCode,
+      complexSlug: booking.complexSlug,
+      complexName: booking.complexName,
+      date: booking.date,
+      startTime: booking.startTime,
+      endTime: booking.endTime,
+      courtName: booking.courtName,
+      sportName: booking.sport.name,
+      customerName: booking.customerName,
+      customerEmail: booking.customerEmail,
+      price: booking.price,
+    });
+
    return c.json(booking, 201);
  } catch (error) {
    if (error instanceof PublicBookingServiceError) {
--- a/apps/backend/src/modules/public-booking/public-booking.routes.ts
+++ b/apps/backend/src/modules/public-booking/public-booking.routes.ts
@@ -1,9 +1,14 @@
+import { cancelPublicBookingHandler } from '@/modules/public-booking/handlers/cancel-public-booking.handler';
 import { createPublicBookingHandler } from '@/modules/public-booking/handlers/create-public-booking.handler';
 import { getPublicBookingConfirmationHandler } from '@/modules/public-booking/handlers/get-public-booking-confirmation.handler';
 import { listPublicAvailabilityHandler } from '@/modules/public-booking/handlers/list-public-availability.handler';
 import type { AppEnv } from '@/types/hono';
 import { zValidator } from '@hono/zod-validator';
-import { createPublicBookingSchema, publicAvailabilityQuerySchema } from '@repo/api-contract';
+import {
+  cancelPublicBookingSchema,
+  createPublicBookingSchema,
+  publicAvailabilityQuerySchema,
+} from '@repo/api-contract';
 import { Hono } from 'hono';
 import { z } from 'zod';

@@ -33,3 +38,10 @@ publicBookingRoutes.get(
  zValidator('param', confirmationParamsSchema),
  getPublicBookingConfirmationHandler
 );
+
+publicBookingRoutes.post(
+  '/complex/:complexSlug/cancel',
+  zValidator('param', complexSlugParamsSchema),
+  zValidator('json', cancelPublicBookingSchema),
+  cancelPublicBookingHandler
+);
--- a/apps/backend/src/modules/public-booking/services/public-booking.service.ts
+++ b/apps/backend/src/modules/public-booking/services/public-booking.service.ts
@@ -2,6 +2,7 @@ import { randomInt } from 'node:crypto';
 import { db } from '@/lib/prisma';
 import { evaluatePlanUsage, parsePlanRules } from '@/modules/plan/services/plan-rules.service';
 import type {
+  CancelPublicBookingInput,
  CreatePublicBookingInput,
  DayOfWeek,
  PublicAvailabilityQuery,
@@ -13,6 +14,16 @@ type Slot = {
  endTime: string;
 };

+type PriceableCourt = {
+  basePrice: unknown;
+  priceRules: Array<{
+    dayOfWeek: DayOfWeek | null;
+    startTime: string | null;
+    endTime: string | null;
+    price: unknown;
+  }>;
+};
+
 type ComplexWithPublicBookingData = Awaited<ReturnType<typeof getComplexWithBookingData>>;

 const DAY_OF_WEEK_BY_INDEX: DayOfWeek[] = [
@@ -32,7 +43,6 @@ export class PublicBookingServiceError extends Error {

  constructor(message: string, status: 400 | 403 | 404 | 409) {
    super(message);
-    this.name = 'PublicBookingServiceError';
    this.status = status;
  }
 }
@@ -202,6 +212,10 @@ async function getComplexWithBookingData(complexSlug: string) {
          availabilities: {
            orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
          },
+          priceRules: {
+            where: { isActive: true },
+            orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
+          },
        },
        orderBy: { createdAt: 'asc' },
      },
@@ -226,6 +240,33 @@ async function getComplexWithBookingData(complexSlug: string) {
  return complex;
 }

+function resolveSlotPrice(court: PriceableCourt, dayOfWeek: DayOfWeek, slot: Slot): number {
+  const slotStart = toMinutes(slot.startTime);
+  const slotEnd = toMinutes(slot.endTime);
+  const matchingRules = court.priceRules
+    .filter((rule) => {
+      if (rule.dayOfWeek && rule.dayOfWeek !== dayOfWeek) {
+        return false;
+      }
+
+      if (!rule.startTime || !rule.endTime) {
+        return true;
+      }
+
+      return slotStart >= toMinutes(rule.startTime) && slotEnd <= toMinutes(rule.endTime);
+    })
+    .sort((first, second) => {
+      const firstSpecificity =
+        (first.dayOfWeek ? 2 : 0) + (first.startTime && first.endTime ? 1 : 0);
+      const secondSpecificity =
+        (second.dayOfWeek ? 2 : 0) + (second.startTime && second.endTime ? 1 : 0);
+
+      return secondSpecificity - firstSpecificity;
+    });
+
+  return Number(matchingRules[0]?.price ?? court.basePrice);
+}
+
 function mapBookingResponse(input: {
  bookingId: string;
  bookingCode: string;
@@ -235,6 +276,8 @@ function mapBookingResponse(input: {
  endTime: string;
  customerName: string;
  customerPhone: string;
+  customerEmail: string;
+  price: number;
  status: 'CONFIRMED' | 'CANCELLED' | 'COMPLETED' | 'NOSHOW';
  court: {
    id: string;
@@ -263,7 +306,9 @@ function mapBookingResponse(input: {
    endTime: input.endTime,
    customerName: input.customerName,
    customerPhone: input.customerPhone,
+    customerEmail: input.customerEmail,
    status: input.status,
+    price: input.price,
    createdAt: input.createdAt.toISOString(),
  };
 }
@@ -284,11 +329,17 @@ export async function getPublicBookingConfirmation(complexSlug: string, bookingC
      bookingDate: true,
      startTime: true,
      endTime: true,
+      customerEmail: true,
      status: true,
      createdAt: true,
      court: {
        select: {
          name: true,
+          basePrice: true,
+          priceRules: {
+            where: { isActive: true },
+            orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
+          },
          sport: {
            select: {
              id: true,
@@ -299,6 +350,7 @@ export async function getPublicBookingConfirmation(complexSlug: string, bookingC
          complex: {
            select: {
              complexName: true,
+              physicalAddress: true,
              complexSlug: true,
            },
          },
@@ -311,13 +363,22 @@ export async function getPublicBookingConfirmation(complexSlug: string, bookingC
    throw new PublicBookingServiceError('Reserva no encontrada.', 404);
  }

+  const date = formatIsoDate(booking.bookingDate);
+  const { dayOfWeek } = parseIsoDate(date);
+  const price = resolveSlotPrice(booking.court, dayOfWeek, {
+    startTime: booking.startTime,
+    endTime: booking.endTime,
+  });
+
  return {
    bookingCode: booking.bookingCode,
    complexName: booking.court.complex.complexName,
+    complexAddress: booking.court.complex.physicalAddress ?? undefined,
    complexSlug: booking.court.complex.complexSlug,
-    date: formatIsoDate(booking.bookingDate),
+    date,
    startTime: booking.startTime,
    endTime: booking.endTime,
+    price,
    courtName: booking.court.name,
    sport: {
      id: booking.court.sport.id,
@@ -325,13 +386,39 @@ export async function getPublicBookingConfirmation(complexSlug: string, bookingC
      slug: booking.court.sport.slug,
    },
    status: booking.status,
+    customerEmail: booking.customerEmail,
    createdAt: booking.createdAt.toISOString(),
  };
 }

+async function hasVerifiedAdmin(complexId: string): Promise<boolean> {
+  const verifiedAdmin = await db.complexUser.findFirst({
+    where: {
+      complexId,
+      role: 'ADMIN',
+      user: { emailVerified: true },
+    },
+  });
+  return verifiedAdmin !== null;
+}
+
 export async function listPublicAvailability(complexSlug: string, query: PublicAvailabilityQuery) {
  const { bookingDate, dayOfWeek } = parseIsoDate(query.date);
  const complex = await getComplexWithBookingData(complexSlug);
+
+  if (!(await hasVerifiedAdmin(complex.id))) {
+    return {
+      complexId: complex.id,
+      complexName: complex.complexName,
+      complexAddress: complex.physicalAddress ?? null,
+      complexSlug: complex.complexSlug,
+      date: query.date,
+      sportSelectionRequired: false,
+      sports: [],
+      courts: [],
+    };
+  }
+
  const sports = resolveSports(complex);
  const sportSelectionRequired = sports.length > 1;

@@ -407,7 +494,10 @@ export async function listPublicAvailability(complexSlug: string, query: PublicA
        },
        slotDurationMinutes: court.slotDurationMinutes,
        availabilityDay: dayOfWeek,
-        availableSlots,
+        availableSlots: availableSlots.map((slot) => ({
+          ...slot,
+          price: resolveSlotPrice(court, dayOfWeek, slot),
+        })),
      };
    })
    .filter((court) => court.availableSlots.length > 0);
@@ -427,6 +517,14 @@ export async function listPublicAvailability(complexSlug: string, query: PublicA
 export async function createPublicBooking(complexSlug: string, input: CreatePublicBookingInput) {
  const { bookingDate, dayOfWeek } = parseIsoDate(input.date);
  const complex = await getComplexWithBookingData(complexSlug);
+
+  if (!(await hasVerifiedAdmin(complex.id))) {
+    throw new PublicBookingServiceError(
+      'El complejo no puede recibir reservas hasta que un administrador verifique su email.',
+      403
+    );
+  }
+
  const sports = resolveSports(complex);
  const { sportSelectionRequired } = validateSportSelection(sports, input.sportId);

@@ -533,6 +631,7 @@ export async function createPublicBooking(complexSlug: string, input: CreatePubl
            endTime: selectedSlot.endTime,
            customerName: input.customerName.trim(),
            customerPhone: input.customerPhone.trim(),
+            customerEmail: input.customerEmail.trim(),
            status: 'CONFIRMED',
          },
          select: {
@@ -544,11 +643,14 @@ export async function createPublicBooking(complexSlug: string, input: CreatePubl
            endTime: true,
            customerName: true,
            customerPhone: true,
+            customerEmail: true,
            status: true,
          },
        });
      });

+      const price = resolveSlotPrice(selectedCourt, dayOfWeek, selectedSlot);
+
      return mapBookingResponse({
        bookingId: booking.id,
        bookingCode: booking.bookingCode,
@@ -558,6 +660,8 @@ export async function createPublicBooking(complexSlug: string, input: CreatePubl
        endTime: booking.endTime,
        customerName: booking.customerName,
        customerPhone: booking.customerPhone,
+        customerEmail: booking.customerEmail,
+        price,
        status: booking.status,
        court: {
          id: selectedCourt.id,
@@ -608,3 +712,108 @@ export async function createPublicBooking(complexSlug: string, input: CreatePubl
    409
  );
 }
+
+export async function cancelPublicBooking(complexSlug: string, input: CancelPublicBookingInput) {
+  const normalizedBookingCode = input.bookingCode.toUpperCase();
+  const booking = await db.courtBooking.findFirst({
+    where: {
+      bookingCode: normalizedBookingCode,
+      court: {
+        complex: {
+          complexSlug,
+        },
+      },
+    },
+    include: {
+      court: {
+        select: {
+          id: true,
+          name: true,
+          basePrice: true,
+          priceRules: {
+            where: { isActive: true },
+            orderBy: [{ dayOfWeek: 'asc' }, { startTime: 'asc' }],
+          },
+          sport: {
+            select: {
+              id: true,
+              name: true,
+              slug: true,
+            },
+          },
+          complex: {
+            select: {
+              id: true,
+              complexName: true,
+              complexSlug: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!booking) {
+    throw new PublicBookingServiceError('Reserva no encontrada.', 404);
+  }
+
+  if (booking.status !== 'CONFIRMED') {
+    throw new PublicBookingServiceError(
+      'Solo se pueden cancelar reservas en estado confirmada.',
+      409
+    );
+  }
+
+  if (booking.customerPhone !== input.customerPhone.trim()) {
+    throw new PublicBookingServiceError('Los datos ingresados no coinciden con la reserva.', 403);
+  }
+
+  const date = formatIsoDate(booking.bookingDate);
+  const { dayOfWeek } = parseIsoDate(date);
+  const price = resolveSlotPrice(booking.court, dayOfWeek, {
+    startTime: booking.startTime,
+    endTime: booking.endTime,
+  });
+
+  await db.courtBookingLog.create({
+    data: {
+      id: uuidv7(),
+      bookingCode: booking.bookingCode,
+      courtId: booking.courtId,
+      bookingDate: booking.bookingDate,
+      startTime: booking.startTime,
+      endTime: booking.endTime,
+      customerName: booking.customerName,
+      customerPhone: booking.customerPhone,
+      customerEmail: booking.customerEmail,
+      previousStatus: booking.status,
+      newStatus: 'CANCELLED',
+    },
+  });
+
+  await db.courtBooking.delete({
+    where: { id: booking.id },
+  });
+
+  return mapBookingResponse({
+    bookingId: booking.id,
+    bookingCode: booking.bookingCode,
+    bookingDate: booking.bookingDate,
+    createdAt: booking.createdAt,
+    startTime: booking.startTime,
+    endTime: booking.endTime,
+    customerName: booking.customerName,
+    customerPhone: booking.customerPhone,
+    customerEmail: booking.customerEmail,
+    price,
+    status: 'CANCELLED',
+    court: {
+      id: booking.court.id,
+      name: booking.court.name,
+      complexId: booking.court.complex.id,
+      complexName: booking.court.complex.complexName,
+      complexSlug: booking.court.complex.complexSlug,
+      sport: booking.court.sport,
+    },
+  });
+}
--- a/apps/backend/src/register-routes.ts
+++ b/apps/backend/src/register-routes.ts
@@ -3,7 +3,6 @@ import { adminBookingRoutes } from '@/modules/admin-booking/admin-booking.routes
 import { authRoutes } from '@/modules/auth/auth.routes';
 import { complexRoutes } from '@/modules/complex/complex.routes';
 import { courtRoutes } from '@/modules/court/court.routes';
-import { onboardingRoutes } from '@/modules/onboarding/onboarding.routes';
 import { passwordResetRoutes } from '@/modules/password-reset/password-reset.routes';
 import { planRoutes } from '@/modules/plan/plan.routes';
 import { publicBookingRoutes } from '@/modules/public-booking/public-booking.routes';
@@ -20,7 +19,6 @@ export function registerRoutes(app: Hono<AppEnv>) {
    .route('', authRoutes)
    .route('/api/user', userRoutes)
    .route('/api/plans', planRoutes)
-    .route('/api/onboarding', onboardingRoutes)
    .route('/api/password-reset', passwordResetRoutes)
    .route('/api/complexes', complexRoutes)
    .route('/api/sports', sportRoutes)
--- a/apps/backend/src/services/booking-email.service.ts
+++ b/apps/backend/src/services/booking-email.service.ts
@@ -0,0 +1,88 @@
+import {
+  bookingCancelledHtml,
+  bookingConfirmationHtml,
+  bookingNoShowHtml,
+} from '@/emails/booking-confirmation';
+import { sendMail } from '@/lib/mailer';
+
+type BookingEmailInput = {
+  bookingCode: string;
+  complexSlug?: string;
+  complexName: string;
+  date: string;
+  startTime: string;
+  endTime: string;
+  courtName: string;
+  sportName: string;
+  customerName: string;
+  customerEmail: string;
+  price?: number;
+};
+
+export async function sendBookingConfirmation(data: BookingEmailInput) {
+  if (!data.customerEmail) return;
+
+  const html = bookingConfirmationHtml({
+    bookingCode: data.bookingCode,
+    complexSlug: data.complexSlug,
+    complexName: data.complexName,
+    date: data.date,
+    startTime: data.startTime,
+    endTime: data.endTime,
+    courtName: data.courtName,
+    sportName: data.sportName,
+    customerName: data.customerName,
+    price: data.price,
+  });
+
+  await sendMail({
+    to: data.customerEmail,
+    subject: `Reserva confirmada en ${data.complexName} | Playzer`,
+    html,
+    text: `Reserva confirmada en ${data.complexName}. Codigo: ${data.bookingCode}. Cancha: ${data.courtName}. Fecha: ${data.date}. Horario: ${data.startTime} - ${data.endTime}.`,
+  });
+}
+
+export async function sendBookingCancelled(data: BookingEmailInput) {
+  if (!data.customerEmail) return;
+
+  const html = bookingCancelledHtml({
+    bookingCode: data.bookingCode,
+    complexName: data.complexName,
+    date: data.date,
+    startTime: data.startTime,
+    endTime: data.endTime,
+    courtName: data.courtName,
+    sportName: data.sportName,
+    customerName: data.customerName,
+  });
+
+  await sendMail({
+    to: data.customerEmail,
+    subject: `Reserva cancelada en ${data.complexName} | Playzer`,
+    html,
+    text: `Reserva cancelada en ${data.complexName}. Codigo: ${data.bookingCode}. Fecha: ${data.date}. Horario: ${data.startTime} - ${data.endTime}.`,
+  });
+}
+
+export async function sendBookingNoShow(data: BookingEmailInput) {
+  if (!data.customerEmail) return;
+
+  const html = bookingNoShowHtml({
+    bookingCode: data.bookingCode,
+    complexName: data.complexName,
+    date: data.date,
+    startTime: data.startTime,
+    endTime: data.endTime,
+    courtName: data.courtName,
+    sportName: data.sportName,
+    customerName: data.customerName,
+  });
+
+  await sendMail({
+    to: data.customerEmail,
+    subject: `Reserva no concretada en ${data.complexName} | Playzer`,
+    html,
+    text: `Reserva no concretada en ${data.complexName}. Codigo: ${data.bookingCode}. Fecha: ${data.date}. Horario: ${data.startTime} - ${data.endTime}.`,
+  });
+}
--- a/apps/backend/test/complex/invite-complex-user.handler.test.ts
+++ b/apps/backend/test/complex/invite-complex-user.handler.test.ts
@@ -1,6 +1,5 @@
 import { beforeEach, expect, mock, test } from 'bun:test';

-import { createInviteComplexUserHandler } from '@/modules/complex/handlers/invite-complex-user.handler';
 import type { InviteComplexUserResponse } from '@repo/api-contract';

 const inviteComplexUserMock = mock(async () => undefined as unknown as InviteComplexUserResponse);
@@ -15,6 +14,10 @@ class MockComplexMembersError extends Error {
  }
 }

+const { createInviteComplexUserHandler } = await import(
+  '@/modules/complex/handlers/invite-complex-user.handler'
+);
+
 const inviteComplexUserHandler = createInviteComplexUserHandler({
  inviteComplexUser: inviteComplexUserMock,
  ComplexMembersError: MockComplexMembersError,
@@ -59,7 +62,6 @@ function createContext(input: {

 beforeEach(() => {
  inviteComplexUserMock.mockReset();
-  mock.clearAllMocks();
 });

 test('returns 201 with the service result', async () => {
--- a/apps/backend/test/complex/invite-complex-user.test.ts
+++ b/apps/backend/test/complex/invite-complex-user.test.ts
@@ -1,14 +1,15 @@
-import { beforeEach, expect, mock, test } from 'bun:test';
+import { beforeEach, expect, test } from 'bun:test';

-import {
-  ComplexMembersError,
-  inviteComplexUser,
-} from '@/modules/complex/services/complex-members.service';
 import { prismaMock, sendMailMock, transactionMock } from '../support/prisma.mock';

+const { ComplexMembersError, inviteComplexUser } = await import(
+  '@/modules/complex/services/complex-members.service'
+);
+
 beforeEach(() => {
  prismaMock._reset();
-  mock.clearAllMocks();
+  sendMailMock.mockClear();
+  transactionMock.mockClear();
 });

 test('creates a pending invitation and sends the email', async () => {
@@ -21,10 +22,10 @@ test('creates a pending invitation and sends the email', async () => {
    complexId: 'complex-1',
    email: 'new.member@example.com',
    tokenHash: 'token-hash',
-    expiresAt: new Date('2026-04-29T00:00:00.000Z'),
+    expiresAt: new Date('2027-01-01T00:00:00.000Z'),
    acceptedAt: null,
    revokedAt: null,
-    createdAt: new Date('2026-04-22T00:00:00.000Z'),
+    createdAt: new Date('2026-12-01T00:00:00.000Z'),
  } as never);

  const result = await inviteComplexUser('admin-1', 'complex-1', {
@@ -79,7 +80,7 @@ test('rejects when the invite target already belongs to the complex', async () =
  }

  expect(caught).toBeInstanceOf(ComplexMembersError);
-  expect((caught as ComplexMembersError).status).toBe(409);
+  expect((caught as InstanceType<typeof ComplexMembersError>).status).toBe(409);
  expect(transactionMock).not.toHaveBeenCalled();
  expect(sendMailMock).not.toHaveBeenCalled();
 });
--- a/apps/backend/test/sport/create-sport.handler.test.ts
+++ b/apps/backend/test/sport/create-sport.handler.test.ts
@@ -49,7 +49,6 @@ function createContext(body: unknown) {

 beforeEach(() => {
  createSportMock.mockReset();
-  mock.clearAllMocks();
 });

 test('returns 201 with the created sport', async () => {
--- a/apps/backend/test/sport/sport.service.test.ts
+++ b/apps/backend/test/sport/sport.service.test.ts
@@ -6,7 +6,6 @@ import type { PrismaClient } from '@/generated/prisma/client';
 import type { PrismaClientMock } from 'bun-mock-prisma';

 const prismaMock = createPrismaMock<PrismaClient>() as PrismaClientMock<PrismaClient>;
-const uuidV7Mock = mock(() => '00000000-0000-4000-8000-000000000001');

 mock.module('@/lib/prisma', () => ({
  __esModule: true,
@@ -15,10 +14,7 @@ mock.module('@/lib/prisma', () => ({
  },
 }));

-mock.module('uuid', () => ({
-  __esModule: true,
-  v7: uuidV7Mock,
-}));
+const { uuidV7Mock } = await import('../support/prisma.mock');

 const { createSport, getSportById, listSports, updateSport } = await import(
  '@/modules/sport/services/sport.service'
@@ -26,7 +22,7 @@ const { createSport, getSportById, listSports, updateSport } = await import(

 beforeEach(() => {
  prismaMock._reset();
-  mock.clearAllMocks();
+  uuidV7Mock.mockClear();
 });

 test('listSports returns sports ordered by name', async () => {
--- a/apps/backend/test/support/prisma.mock.ts
+++ b/apps/backend/test/support/prisma.mock.ts
@@ -33,3 +33,10 @@ mock.module('@/lib/mailer', () => ({
  __esModule: true,
  sendMail: sendMailMock,
 }));
+
+export const uuidV7Mock = mock(() => '00000000-0000-4000-8000-000000000001');
+
+mock.module('uuid', () => ({
+  __esModule: true,
+  v7: uuidV7Mock,
+}));
--- a/apps/frontend/public/playzer-favicon-512-transparent.png
+++ b/apps/frontend/public/playzer-favicon-512-transparent.png
--- a/apps/frontend/src/features/booking/booking-provider.tsx
+++ b/apps/frontend/src/features/booking/booking-provider.tsx
@@ -41,6 +41,7 @@ interface CreateManualBookingPayload {
  startTime: string;
  customerName: string;
  customerPhone: string;
+  customerEmail: string;
 }

 interface BookingContextValue {
@@ -315,6 +316,7 @@ export function BookingProvider({ children, complex }: BookingProviderProps) {
        startTime: payload.startTime,
        customerName: payload.customerName,
        customerPhone: payload.customerPhone,
+        customerEmail: payload.customerEmail,
      }),
    onSuccess: async () => {
      await queryClient.invalidateQueries({ queryKey: ['admin-bookings', complex.id] });
--- a/apps/frontend/src/features/booking/booking.tsx
+++ b/apps/frontend/src/features/booking/booking.tsx
@@ -1,5 +1,8 @@
 import { useIsMobile } from '@/hooks/use-mobile';
+import { authClient } from '@/lib/api-client';
+import { useAuth } from '@/lib/auth';
 import type { ComplexWithRole } from '@repo/api-contract';
+import { useState } from 'react';
 import { BookingProvider } from './booking-provider';
 import { BookingCreateDialog } from './components/booking-create-dialog';
 import { BookingDaySummary, BookingQuickActions } from './components/booking-day-summary';
@@ -15,9 +18,44 @@ interface BookingProps {

 export function Booking({ complex }: BookingProps) {
  const isMobile = useIsMobile();
+  const { user } = useAuth();
+  const [sending, setSending] = useState(false);
+  const [emailSent, setEmailSent] = useState(false);
+
+  const emailNotVerified = user && !user.emailVerified;
+
+  const handleResendVerification = async () => {
+    if (!user?.email || sending) return;
+    setSending(true);
+    try {
+      await authClient.sendVerificationEmail({ email: user.email });
+      setEmailSent(true);
+      setTimeout(() => setEmailSent(false), 6000);
+    } catch {
+      // Silently fail — the banner already shows the email to contact
+    } finally {
+      setSending(false);
+    }
+  };

  return (
    <BookingProvider complex={complex}>
+      {emailNotVerified && (
+        <div className="mb-6 flex items-center justify-between gap-4 rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-800 dark:border-amber-800/30 dark:bg-amber-950/30 dark:text-amber-200">
+          <span>
+            No verificaste tu email. Para crear reservas necesitás verificar tu dirección de correo
+            electrónico.
+          </span>
+          <button
+            type="button"
+            onClick={handleResendVerification}
+            disabled={sending}
+            className="shrink-0 rounded-lg bg-amber-200 px-3 py-1.5 text-xs font-medium text-amber-900 transition-colors hover:bg-amber-300 disabled:opacity-50 dark:bg-amber-800 dark:text-amber-50 dark:hover:bg-amber-700"
+          >
+            {sending ? 'Enviando...' : emailSent ? '¡Email enviado!' : 'Reenviar email'}
+          </button>
+        </div>
+      )}
      {isMobile ? (
        <BookingMobile />
      ) : (
--- a/apps/frontend/src/features/booking/components/booking-create-dialog.tsx
+++ b/apps/frontend/src/features/booking/components/booking-create-dialog.tsx
@@ -42,6 +42,7 @@ const bookingFormSchema = z.object({
    .trim()
    .min(6, 'Ingresa un telefono válido.')
    .max(30, 'El telefono no puede superar los 30 caracteres.'),
+  customerEmail: z.string().email('Ingresá un email válido.'),
 });

 type BookingForm = z.infer<typeof bookingFormSchema>;
@@ -76,6 +77,7 @@ export function BookingCreateDialog() {
    defaultValues: {
      customerName: '',
      customerPhone: '',
+      customerEmail: '',
    },
  });

@@ -154,6 +156,7 @@ export function BookingCreateDialog() {
      startTime,
      customerName: values.customerName,
      customerPhone: values.customerPhone,
+      customerEmail: values.customerEmail,
    });
  };

@@ -271,6 +274,23 @@ export function BookingCreateDialog() {
            <FieldError errors={[errors.customerPhone]} />
          </Field>

+          <Field data-invalid={Boolean(errors.customerEmail)}>
+            <FieldLabel htmlFor="customerEmail">
+              Email <span className="text-muted-foreground font-normal">(opcional)</span>
+            </FieldLabel>
+            <Input
+              id="customerEmail"
+              type="email"
+              placeholder="Ej: juan@ejemplo.com"
+              aria-invalid={Boolean(errors.customerEmail)}
+              {...register('customerEmail')}
+            />
+            <p className="mt-1 text-xs text-muted-foreground">
+              Se enviará la confirmación de la reserva por email.
+            </p>
+            <FieldError errors={[errors.customerEmail]} />
+          </Field>
+
          {createBookingError && <p className="text-sm text-destructive">{createBookingError}</p>}
        </form>

--- a/apps/frontend/src/features/booking/components/booking-tools-dialog.tsx
+++ b/apps/frontend/src/features/booking/components/booking-tools-dialog.tsx
@@ -24,6 +24,7 @@ import {
  Wrench,
  XCircle,
 } from 'lucide-react';
+import { useState } from 'react';
 import { useBooking } from '../booking-provider';

 function formatDate(date: string | undefined) {
@@ -70,6 +71,7 @@ export function BookingToolsDialog() {
    useBooking();
  const isMobile = useIsMobile();
  const booking = selectedSegment?.booking;
+  const [confirmCancelOpen, setConfirmCancelOpen] = useState(false);

  const status = statusConfig[booking?.status ?? 'CONFIRMED'] ?? {
    label: booking?.status,
@@ -93,8 +95,62 @@ export function BookingToolsDialog() {
    closeBookingTools();
  };

+  const cancelConfirmDialog = (
+    <ResponsiveDialog
+      open={confirmCancelOpen}
+      onOpenChange={(open) => !open && setConfirmCancelOpen(false)}
+    >
+      <ResponsiveDialogContent>
+        <ResponsiveDialogHeader>
+          <ResponsiveDialogTitle>¿Cancelar reserva?</ResponsiveDialogTitle>
+          <ResponsiveDialogDescription>
+            Esta acción no se puede deshacer. Se eliminará la reserva y la cancha volverá a estar
+            disponible.
+          </ResponsiveDialogDescription>
+        </ResponsiveDialogHeader>
+
+        <div className="space-y-2 rounded-lg border bg-card p-4">
+          <div className="flex items-center justify-between">
+            <span className="text-sm text-muted-foreground">Cliente</span>
+            <span className="text-sm font-medium">{booking?.customerName ?? '-'}</span>
+          </div>
+          <div className="flex items-center justify-between">
+            <span className="text-sm text-muted-foreground">Cancha</span>
+            <span className="text-sm font-medium">{booking?.courtName ?? '-'}</span>
+          </div>
+          <div className="flex items-center justify-between">
+            <span className="text-sm text-muted-foreground">Fecha</span>
+            <span className="text-sm font-medium">{formatDate(booking?.date) || '-'}</span>
+          </div>
+          <div className="flex items-center justify-between">
+            <span className="text-sm text-muted-foreground">Horario</span>
+            <span className="text-sm font-medium">
+              {booking?.startTime ?? '--:--'} a {booking?.endTime ?? '--:--'}
+            </span>
+          </div>
+        </div>
+
+        <ResponsiveDialogFooter>
+          <ResponsiveDialogClose asChild>
+            <Button variant="outline">Volver</Button>
+          </ResponsiveDialogClose>
+          <Button
+            variant="destructive"
+            onClick={() => {
+              setConfirmCancelOpen(false);
+              updateStatus('CANCELLED');
+            }}
+          >
+            Sí, cancelar reserva
+          </Button>
+        </ResponsiveDialogFooter>
+      </ResponsiveDialogContent>
+    </ResponsiveDialog>
+  );
+
  if (isMobile) {
    return (
+      <>
        <ResponsiveDialog
          open={bookingToolsOpen}
          onOpenChange={(open) => !open && closeBookingTools()}
@@ -106,17 +162,23 @@ export function BookingToolsDialog() {
            <MobileBookingToolsSheet
              status={status}
              onComplete={() => updateStatus('COMPLETED')}
-            onCancel={() => updateStatus('CANCELLED')}
+              onCancel={() => setConfirmCancelOpen(true)}
              onReminder={sendWhatsappReminder}
              onNoShow={() => updateStatus('NOSHOW')}
            />
          </ResponsiveDialogContent>
        </ResponsiveDialog>
+        {cancelConfirmDialog}
+      </>
    );
  }

  return (
-    <ResponsiveDialog open={bookingToolsOpen} onOpenChange={(open) => !open && closeBookingTools()}>
+    <>
+      <ResponsiveDialog
+        open={bookingToolsOpen}
+        onOpenChange={(open) => !open && closeBookingTools()}
+      >
        <ResponsiveDialogContent
          className="data-[variant=dialog]:max-w-5xl data-[variant=drawer]:max-h-[92dvh] data-[variant=drawer]:overflow-y-auto data-[variant=drawer]:px-4 data-[variant=drawer]:pb-5"
          onOpenAutoFocus={(event) => event.preventDefault()}
@@ -179,6 +241,7 @@ export function BookingToolsDialog() {

          <Separator className="dark:bg-slate-800 bg-slate-300" />

+          {booking?.status !== 'COMPLETED' && (
            <section className="space-y-3">
              <div>
                <h3 className="font-medium text-slate-100">Acciones disponibles</h3>
@@ -202,9 +265,7 @@ export function BookingToolsDialog() {
                  title="Cancelar reserva"
                  description="El cliente avisó que no va a venir. La cancha vuelve a estar disponible."
                  className="border-red-500/40 bg-red-500/10 text-lg text-red-600 hover:bg-red-500/15 hover:text-red-800"
-              onClick={() => {
-                updateStatus('CANCELLED');
-              }}
+                  onClick={() => setConfirmCancelOpen(true)}
                />

                <ActionButton
@@ -226,6 +287,7 @@ export function BookingToolsDialog() {
                />
              </div>
            </section>
+          )}

          <ResponsiveDialogFooter className="data-[variant=drawer]:px-0">
            <ResponsiveDialogClose asChild>
@@ -236,6 +298,8 @@ export function BookingToolsDialog() {
          </ResponsiveDialogFooter>
        </ResponsiveDialogContent>
      </ResponsiveDialog>
+      {cancelConfirmDialog}
+    </>
  );
 }

@@ -321,6 +385,7 @@ function MobileBookingToolsSheet({
        </section>
      </div>

+      {booking?.status !== 'COMPLETED' && (
        <section className="shrink-0 border-t border-border/70 bg-popover/95 px-4 py-3">
          <h3 className="text-sm font-medium">Acciones</h3>
          <div className="mt-3 grid grid-cols-2 gap-2">
@@ -357,6 +422,7 @@ function MobileBookingToolsSheet({
            </ResponsiveDialogClose>
          </ResponsiveDialogFooter>
        </section>
+      )}
    </div>
  );
 }
--- a/apps/frontend/src/features/home/home-page.tsx
+++ b/apps/frontend/src/features/home/home-page.tsx
@@ -49,8 +49,14 @@ export function HomePage() {
  useEffect(() => {
    async function autoSelect() {
      if (myComplexesQuery.data && myComplexesQuery.data.length === 1) {
-        await apiClient.complexes.select({ complexId: myComplexesQuery.data[0].id });
-        queryClient.invalidateQueries({ queryKey: ['current-complex'] });
+        try {
+          const result = await apiClient.complexes.select({
+            complexId: myComplexesQuery.data[0].id,
+          });
+          queryClient.setQueryData(['current-complex'], result);
+        } catch (error) {
+          console.error('Error al auto-seleccionar complejo:', error);
+        }
      } else if (
        myComplexesQuery.data &&
        myComplexesQuery.data.length > 1 &&
@@ -60,13 +66,23 @@ export function HomePage() {
      }
    }

-    if (!currentComplexQuery.isLoading && !currentComplexQuery.data && myComplexesQuery.data) {
+    if (
+      !currentComplexQuery.isLoading &&
+      !currentComplexQuery.data &&
+      myComplexesQuery.data &&
+      !myComplexesQuery.isLoading
+    ) {
+      if (myComplexesQuery.data.length === 0) {
+        navigate({ to: '/onboard/setup' });
+        return;
+      }
      autoSelect();
    }
  }, [
    currentComplexQuery.isLoading,
    currentComplexQuery.data,
    myComplexesQuery.data,
+    myComplexesQuery.isLoading,
    navigate,
    queryClient,
  ]);
--- a/apps/frontend/src/features/login/login-page.tsx
+++ b/apps/frontend/src/features/login/login-page.tsx
@@ -6,7 +6,7 @@ import { apiClient, authClient } from '@/lib/api-client';
 import { useAuth } from '@/lib/auth';
 import { acceptStoredPendingInvite } from '@/lib/invitations';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Link, useNavigate } from '@tanstack/react-router';
+import { Link } from '@tanstack/react-router';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
@@ -18,12 +18,7 @@ const loginSchema = z.object({

 type LoginForm = z.infer<typeof loginSchema>;

-type LoginPageProps = {
-  redirectTo?: string;
-};
-
-export function LoginPage({ redirectTo = '/' }: LoginPageProps) {
-  const navigate = useNavigate();
+export function LoginPage() {
  const { signInWithPassword } = useAuth();
  const [submitError, setSubmitError] = useState<string | null>(null);

@@ -42,16 +37,6 @@ export function LoginPage({ redirectTo = '/' }: LoginPageProps) {

  async function handlePostLogin() {
    await acceptStoredPendingInvite(apiClient.complexes.acceptPendingInvitations);
-    const complexes = await apiClient.complexes.listMine();
-
-    if (complexes.length === 0) {
-      await navigate({ to: redirectTo });
-    } else if (complexes.length === 1) {
-      await apiClient.complexes.select({ complexId: complexes[0].id });
-      navigate({ to: redirectTo });
-    } else {
-      navigate({ to: '/select-complex' });
-    }
  }

  const onSubmit = async (values: LoginForm) => {
@@ -91,7 +76,7 @@ export function LoginPage({ redirectTo = '/' }: LoginPageProps) {
      <section className="w-full max-w-sm rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
        <h1 className="mb-2 text-2xl font-semibold">Iniciar sesión</h1>
        <p className="mb-4 text-sm text-muted-foreground">
-          Ingresá con tu cuenta para acceder a Home.
+          Ingresá con tu cuenta para acceder a Playzer.
        </p>

        <Button type="button" variant="outline" className="w-full" onClick={handleGoogleSignIn}>
@@ -161,6 +146,10 @@ export function LoginPage({ redirectTo = '/' }: LoginPageProps) {
          <Link to="/reset-password" className="text-primary hover:underline">
            ¿Olvidaste tu contraseña?
          </Link>
+          <span className="mx-3 text-muted-foreground">|</span>
+          <Link to="/signup" className="text-primary hover:underline">
+            Crear cuenta
+          </Link>
        </p>
      </section>
    </main>
--- a/apps/frontend/src/features/onboard/components/onboarding-check-email-step.tsx
+++ b/apps/frontend/src/features/onboard/components/onboarding-check-email-step.tsx
@@ -1,7 +0,0 @@
-export function OnboardingCheckEmailStep() {
-  return (
-    <p className="text-sm text-muted-foreground">
-      Revisa tu correo y abre el link de verificacion para continuar.
-    </p>
-  );
-}
--- a/apps/frontend/src/features/onboard/components/onboarding-complete-step.tsx
+++ b/apps/frontend/src/features/onboard/components/onboarding-complete-step.tsx
@@ -1,119 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Field, FieldError, FieldLabel } from '@/components/ui/field';
-import { Input } from '@/components/ui/input';
-import type { CompleteValues } from '@/features/onboard/onboarding.types';
-import type { PlanSummary } from '@repo/api-contract';
-import { Controller, type UseFormReturn } from 'react-hook-form';
-
-type OnboardingCompleteStepProps = {
-  form: UseFormReturn<CompleteValues>;
-  plans: PlanSummary[];
-  verifiedEmail: string | null;
-  errorMessage: string | null;
-  infoMessage: string | null;
-  planPlaceholder: string;
-  onSubmit: (values: CompleteValues) => Promise<void>;
-};
-
-export function OnboardingCompleteStep({
-  form,
-  plans,
-  verifiedEmail,
-  errorMessage,
-  infoMessage,
-  planPlaceholder,
-  onSubmit,
-}: OnboardingCompleteStepProps) {
-  return (
-    <form className="space-y-3" onSubmit={form.handleSubmit(onSubmit)}>
-      {verifiedEmail && (
-        <Field>
-          <FieldLabel htmlFor="verified-email">Email verificado</FieldLabel>
-          <Input id="verified-email" type="email" value={verifiedEmail} disabled readOnly />
-        </Field>
-      )}
-
-      <Field data-invalid={Boolean(form.formState.errors.password)}>
-        <FieldLabel htmlFor="onboard-password">Contraseña</FieldLabel>
-        <Input
-          id="onboard-password"
-          type="password"
-          placeholder="********"
-          aria-invalid={Boolean(form.formState.errors.password)}
-          {...form.register('password')}
-        />
-        <FieldError errors={[form.formState.errors.password]} />
-      </Field>
-
-      <Field data-invalid={Boolean(form.formState.errors.complexName)}>
-        <FieldLabel htmlFor="complex-name">Nombre del complejo</FieldLabel>
-        <Input
-          id="complex-name"
-          type="text"
-          placeholder="Complejo Las Palmeras"
-          aria-invalid={Boolean(form.formState.errors.complexName)}
-          {...form.register('complexName')}
-        />
-        <FieldError errors={[form.formState.errors.complexName]} />
-      </Field>
-
-      <Field data-invalid={Boolean(form.formState.errors.physicalAddress)}>
-        <FieldLabel htmlFor="physical-address">Direccion fisica</FieldLabel>
-        <Input
-          id="physical-address"
-          type="text"
-          placeholder="Ej: Av. San Martin 1234, Salta"
-          aria-invalid={Boolean(form.formState.errors.physicalAddress)}
-          {...form.register('physicalAddress')}
-        />
-        <FieldError errors={[form.formState.errors.physicalAddress]} />
-      </Field>
-
-      <Field data-invalid={Boolean(form.formState.errors.planCode)}>
-        <FieldLabel htmlFor="plan-code">Plan</FieldLabel>
-        <Controller
-          control={form.control}
-          name="planCode"
-          render={({ field }) => (
-            <select
-              id="plan-code"
-              className="h-10 w-full rounded-md border bg-background px-3 text-sm"
-              aria-invalid={Boolean(form.formState.errors.planCode)}
-              value={field.value ?? ''}
-              onChange={(event) => {
-                field.onChange(event.target.value);
-              }}
-              disabled={plans.length === 0}
-            >
-              <option value="">
-                {plans.length > 0 ? planPlaceholder : 'No hay planes disponibles'}
-              </option>
-              {plans.map((plan) => (
-                <option key={plan.code} value={plan.code}>
-                  {plan.name} - ${plan.price.toFixed(2)}
-                </option>
-              ))}
-            </select>
-          )}
-        />
-        {plans.length === 0 && (
-          <p className="text-xs text-muted-foreground">
-            Carga planes en la base para continuar con el onboarding.
-          </p>
-        )}
-        <FieldError errors={[form.formState.errors.planCode]} />
-      </Field>
-
-      {errorMessage && <p className="text-sm text-destructive">{errorMessage}</p>}
-      {infoMessage && <p className="text-sm text-muted-foreground">{infoMessage}</p>}
-
-      <Button
-        type="submit"
-        className="w-full"
-        disabled={form.formState.isSubmitting || !form.formState.isValid}
-      >
-        {form.formState.isSubmitting ? 'Finalizando...' : 'Completar onboarding'}
-      </Button>
-    </form>
-  );
-}
--- a/apps/frontend/src/features/onboard/components/onboarding-start-step.tsx
+++ b/apps/frontend/src/features/onboard/components/onboarding-start-step.tsx
@@ -1,58 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Field, FieldError, FieldLabel } from '@/components/ui/field';
-import { Input } from '@/components/ui/input';
-import type { StartValues } from '@/features/onboard/onboarding.types';
-import type { UseFormReturn } from 'react-hook-form';
-
-type OnboardingStartStepProps = {
-  form: UseFormReturn<StartValues>;
-  errorMessage: string | null;
-  infoMessage: string | null;
-  onSubmit: (values: StartValues) => Promise<void>;
-};
-
-export function OnboardingStartStep({
-  form,
-  errorMessage,
-  infoMessage,
-  onSubmit,
-}: OnboardingStartStepProps) {
-  return (
-    <form className="space-y-3" onSubmit={form.handleSubmit(onSubmit)}>
-      <Field data-invalid={Boolean(form.formState.errors.fullName)}>
-        <FieldLabel htmlFor="onboard-fullname">Nombre</FieldLabel>
-        <Input
-          id="onboard-fullname"
-          type="text"
-          placeholder="Nombre Apellido"
-          aria-invalid={Boolean(form.formState.errors.fullName)}
-          {...form.register('fullName')}
-        />
-        <FieldError errors={[form.formState.errors.fullName]} />
-      </Field>
-
-      <Field data-invalid={Boolean(form.formState.errors.email)}>
-        <FieldLabel htmlFor="onboard-email">Email</FieldLabel>
-        <Input
-          id="onboard-email"
-          type="email"
-          placeholder="tu@email.com"
-          aria-invalid={Boolean(form.formState.errors.email)}
-          {...form.register('email')}
-        />
-        <FieldError errors={[form.formState.errors.email]} />
-      </Field>
-
-      {errorMessage && <p className="text-sm text-destructive">{errorMessage}</p>}
-      {infoMessage && <p className="text-sm text-muted-foreground">{infoMessage}</p>}
-
-      <Button
-        type="submit"
-        className="w-full"
-        disabled={form.formState.isSubmitting || !form.formState.isValid}
-      >
-        {form.formState.isSubmitting ? 'Enviando...' : 'Enviar codigo OTP'}
-      </Button>
-    </form>
-  );
-}
--- a/apps/frontend/src/features/onboard/components/onboarding-verify-otp-step.tsx
+++ b/apps/frontend/src/features/onboard/components/onboarding-verify-otp-step.tsx
@@ -1,108 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Field, FieldError, FieldLabel } from '@/components/ui/field';
-import {
-  InputOTP,
-  InputOTPGroup,
-  InputOTPSeparator,
-  InputOTPSlot,
-} from '@/components/ui/input-otp';
-import type { VerifyOtpValues } from '@/features/onboard/onboarding.types';
-import { RefreshCw } from 'lucide-react';
-import type { UseFormReturn } from 'react-hook-form';
-
-type OnboardingVerifyOtpStepProps = {
-  form: UseFormReturn<VerifyOtpValues>;
-  email: string | null;
-  errorMessage: string | null;
-  infoMessage: string | null;
-  remainingAttempts: number;
-  resendCooldownSeconds: number;
-  isResending: boolean;
-  onSubmit: (values: VerifyOtpValues) => Promise<void>;
-  onResend: () => Promise<void>;
-};
-
-export function OnboardingVerifyOtpStep({
-  form,
-  email,
-  errorMessage,
-  infoMessage,
-  remainingAttempts,
-  resendCooldownSeconds,
-  isResending,
-  onSubmit,
-  onResend,
-}: OnboardingVerifyOtpStepProps) {
-  const resendDisabled = resendCooldownSeconds > 0 || isResending;
-
-  return (
-    <form className="space-y-4" onSubmit={form.handleSubmit(onSubmit)}>
-      <p className="text-sm text-muted-foreground">
-        Ingresa el codigo de 6 digitos que enviamos a{' '}
-        <span className="font-medium text-foreground">{email ?? 'tu email'}</span>.
-      </p>
-
-      <Field data-invalid={Boolean(form.formState.errors.otp)}>
-        <div className="mb-2 flex items-center justify-between gap-3">
-          <FieldLabel htmlFor="onboard-otp">Codigo de verificacion</FieldLabel>
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            disabled={resendDisabled}
-            onClick={() => {
-              void onResend();
-            }}
-          >
-            <RefreshCw className="mr-1 h-3.5 w-3.5" />
-            {isResending
-              ? 'Reenviando...'
-              : resendCooldownSeconds > 0
-                ? `Reenviar en ${resendCooldownSeconds}s`
-                : 'Reenviar codigo'}
-          </Button>
-        </div>
-
-        <InputOTP
-          id="onboard-otp"
-          maxLength={6}
-          inputMode="numeric"
-          pattern="\d*"
-          value={form.watch('otp')}
-          onChange={(value) => {
-            form.setValue('otp', value, { shouldValidate: true });
-          }}
-        >
-          <InputOTPGroup>
-            <InputOTPSlot index={0} />
-            <InputOTPSlot index={1} />
-            <InputOTPSlot index={2} />
-          </InputOTPGroup>
-          <InputOTPSeparator />
-          <InputOTPGroup>
-            <InputOTPSlot index={3} />
-            <InputOTPSlot index={4} />
-            <InputOTPSlot index={5} />
-          </InputOTPGroup>
-        </InputOTP>
-
-        <FieldError errors={[form.formState.errors.otp]} />
-      </Field>
-
-      <p className="text-xs text-muted-foreground">
-        Intentos restantes: <span className="font-medium">{remainingAttempts}</span>
-      </p>
-
-      {errorMessage && <p className="text-sm text-destructive">{errorMessage}</p>}
-      {infoMessage && <p className="text-sm text-muted-foreground">{infoMessage}</p>}
-
-      <Button
-        type="submit"
-        className="w-full"
-        disabled={form.formState.isSubmitting || !form.formState.isValid}
-      >
-        {form.formState.isSubmitting ? 'Verificando...' : 'Verificar codigo'}
-      </Button>
-    </form>
-  );
-}
--- a/apps/frontend/src/features/onboard/components/onboarding-verifying-step.tsx
+++ b/apps/frontend/src/features/onboard/components/onboarding-verifying-step.tsx
@@ -1,5 +0,0 @@
-export function OnboardingVerifyingStep() {
-  return (
-    <p className="text-sm text-muted-foreground">Verificando tu email, espera un momento...</p>
-  );
-}
--- a/apps/frontend/src/features/onboard/components/setup-stepper.tsx
+++ b/apps/frontend/src/features/onboard/components/setup-stepper.tsx
@@ -0,0 +1,161 @@
+import { Button } from '@/components/ui/button';
+import {
+  Stepper,
+  StepperContent,
+  StepperDescription,
+  StepperIndicator,
+  StepperItem,
+  StepperList,
+  StepperNext,
+  StepperPrev,
+  StepperSeparator,
+  StepperTitle,
+  StepperTrigger,
+} from '@/components/ui/stepper';
+import { ComplexNameStep } from '@/features/onboard/components/steps/complex-name-step';
+import { CourtsSetupStep } from '@/features/onboard/components/steps/courts-setup-step';
+import { LocationStep } from '@/features/onboard/components/steps/location-step';
+import { PlanSelectStep } from '@/features/onboard/components/steps/plan-select-step';
+import { ReviewStep } from '@/features/onboard/components/steps/review-step';
+import type { PlanWithFeatures, Sport } from '@repo/api-contract';
+import { Loader2 } from 'lucide-react';
+import { useCallback, useState } from 'react';
+import type { UseFormReturn } from 'react-hook-form';
+
+type SetupStepperProps = {
+  form: UseFormReturn<any>;
+  plans: PlanWithFeatures[];
+  sports: Sport[];
+  isSubmitting: boolean;
+  onSubmit: () => Promise<void>;
+};
+
+const STEPS = [
+  { value: 'step-1', title: 'Nombre', description: 'Nombre del complejo' },
+  { value: 'step-2', title: 'Ubicación', description: 'Dirección y ciudad' },
+  { value: 'step-3', title: 'Plan', description: 'Elegí tu plan' },
+  { value: 'step-4', title: 'Canchas', description: 'Crear cancha inicial' },
+  { value: 'step-5', title: 'Revisar', description: 'Confirmar datos' },
+];
+
+const VALIDATION_MAP: Record<string, string[]> = {
+  'step-2': ['complexName'],
+  'step-3': ['physicalAddress'],
+  'step-4': ['planCode'],
+  'step-5': ['planCode'],
+};
+
+export function SetupStepper({ form, plans, sports, isSubmitting, onSubmit }: SetupStepperProps) {
+  const [currentStep, setCurrentStep] = useState('step-1');
+  const setupCourts = form.watch('setupCourts') as boolean | undefined;
+
+  const handleValidate = useCallback(
+    async (nextValue: string, direction: string) => {
+      if (direction === 'prev') return true;
+
+      let fields = VALIDATION_MAP[nextValue];
+
+      if (nextValue === 'step-5' && setupCourts) {
+        fields = [
+          ...(fields ?? []),
+          'courtSportId',
+          'courtStartTime',
+          'courtEndTime',
+          'courtDaysOfWeek',
+        ];
+      }
+
+      if (fields && fields.length > 0) {
+        return form.trigger(fields as never[]);
+      }
+
+      return true;
+    },
+    [form, setupCourts]
+  );
+
+  const selectedPlan = plans.find((p) => p.code === form.watch('planCode'));
+  const courtSportId = form.watch('courtSportId') as string | undefined;
+  const selectedSport = sports.find((s) => s.id === courtSportId);
+
+  return (
+    <Stepper value={currentStep} onValueChange={setCurrentStep} onValidate={handleValidate}>
+      <StepperList>
+        {STEPS.map((step) => (
+          <StepperItem key={step.value} value={step.value}>
+            <StepperTrigger>
+              <StepperIndicator />
+              <div className="flex flex-col gap-0.5 text-left max-sm:hidden">
+                <StepperTitle>{step.title}</StepperTitle>
+                <StepperDescription>{step.description}</StepperDescription>
+              </div>
+            </StepperTrigger>
+            <StepperSeparator />
+          </StepperItem>
+        ))}
+      </StepperList>
+
+      <div className="mt-6">
+        <StepperContent value="step-1">
+          <ComplexNameStep form={form} />
+        </StepperContent>
+
+        <StepperContent value="step-2">
+          <LocationStep form={form} />
+        </StepperContent>
+
+        <StepperContent value="step-3">
+          <PlanSelectStep form={form} plans={plans} />
+        </StepperContent>
+
+        <StepperContent value="step-4">
+          <CourtsSetupStep form={form} sports={sports} />
+        </StepperContent>
+
+        <StepperContent value="step-5">
+          <ReviewStep
+            data={{
+              complexName: (form.watch('complexName') as string) ?? '',
+              physicalAddress: (form.watch('physicalAddress') as string) ?? '',
+              city: form.watch('city') as string | undefined,
+              state: form.watch('state') as string | undefined,
+              country: form.watch('country') as string | undefined,
+              planCode: (form.watch('planCode') as string) ?? '',
+              setupCourts: setupCourts ?? false,
+              courtSportName: selectedSport?.name,
+              courtStartTime: (form.watch('courtStartTime') as string) ?? '08:00',
+              courtEndTime: (form.watch('courtEndTime') as string) ?? '22:00',
+              courtDaysOfWeek: form.watch('courtDaysOfWeek') as string[] | undefined,
+            }}
+            selectedPlan={selectedPlan}
+          />
+        </StepperContent>
+      </div>
+
+      <div className="mt-6 flex items-center justify-between">
+        <StepperPrev asChild>
+          <Button variant="outline" disabled={isSubmitting}>
+            Anterior
+          </Button>
+        </StepperPrev>
+
+        {currentStep === 'step-5' ? (
+          <Button onClick={onSubmit} disabled={isSubmitting}>
+            {isSubmitting ? (
+              <>
+                <Loader2 className="mr-2 size-4 animate-spin" />
+                Creando complejo...
+              </>
+            ) : (
+              'Confirmar y crear complejo'
+            )}
+          </Button>
+        ) : (
+          <StepperNext asChild>
+            <Button disabled={isSubmitting}>Siguiente</Button>
+          </StepperNext>
+        )}
+      </div>
+    </Stepper>
+  );
+}
--- a/apps/frontend/src/features/onboard/components/steps/complex-name-step.tsx
+++ b/apps/frontend/src/features/onboard/components/steps/complex-name-step.tsx
@@ -0,0 +1,32 @@
+import { Field, FieldError, FieldLabel } from '@/components/ui/field';
+import { Input } from '@/components/ui/input';
+import type { UseFormReturn } from 'react-hook-form';
+
+type ComplexNameStepProps = {
+  form: UseFormReturn<any>;
+};
+
+export function ComplexNameStep({ form }: ComplexNameStepProps) {
+  const errors = form.formState.errors;
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h2 className="text-lg font-semibold">Nombre del complejo</h2>
+        <p className="text-sm text-muted-foreground">¿Cómo se va a llamar tu complejo?</p>
+      </div>
+
+      <Field data-invalid={Boolean(errors.complexName)}>
+        <FieldLabel htmlFor="complex-name">Nombre del complejo</FieldLabel>
+        <Input
+          id="complex-name"
+          type="text"
+          placeholder="Ej: Complejo Las Palmeras"
+          aria-invalid={Boolean(errors.complexName)}
+          {...form.register('complexName')}
+        />
+        <FieldError errors={[errors.complexName]} />
+      </Field>
+    </div>
+  );
+}
--- a/apps/frontend/src/features/onboard/components/steps/courts-setup-step.tsx
+++ b/apps/frontend/src/features/onboard/components/steps/courts-setup-step.tsx
@@ -0,0 +1,158 @@
+import { Field, FieldLabel } from '@/components/ui/field';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { cn } from '@/lib/utils';
+import type { Sport } from '@repo/api-contract';
+import { Check } from 'lucide-react';
+import type { UseFormReturn } from 'react-hook-form';
+
+type CourtsSetupStepProps = {
+  form: UseFormReturn<any>;
+  sports: Sport[];
+};
+
+const DAYS_OF_WEEK = [
+  { value: 'MONDAY', label: 'Lun' },
+  { value: 'TUESDAY', label: 'Mar' },
+  { value: 'WEDNESDAY', label: 'Mié' },
+  { value: 'THURSDAY', label: 'Jue' },
+  { value: 'FRIDAY', label: 'Vie' },
+  { value: 'SATURDAY', label: 'Sáb' },
+  { value: 'SUNDAY', label: 'Dom' },
+] as const;
+
+export function CourtsSetupStep({ form, sports }: CourtsSetupStepProps) {
+  const setupCourts = form.watch('setupCourts') as boolean | undefined;
+  const courtDaysOfWeek = form.watch('courtDaysOfWeek') as string[] | undefined;
+  const errors = form.formState.errors;
+
+  const toggleDay = (day: string) => {
+    const current = courtDaysOfWeek ?? [];
+    const next = current.includes(day) ? current.filter((d) => d !== day) : [...current, day];
+    form.setValue('courtDaysOfWeek', next, { shouldValidate: true });
+  };
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h2 className="text-lg font-semibold">Crear canchas</h2>
+        <p className="text-sm text-muted-foreground">
+          Configurá una cancha para empezar a recibir reservas.
+        </p>
+      </div>
+
+      <label className="flex items-center gap-3 rounded-lg border p-4 cursor-pointer hover:bg-muted/50 transition-colors">
+        <input
+          type="checkbox"
+          className="size-4 accent-primary"
+          checked={setupCourts ?? false}
+          onChange={(e) => {
+            form.setValue('setupCourts', e.target.checked, { shouldValidate: true });
+            if (!e.target.checked) {
+              form.setValue('courtSportId', undefined);
+              form.setValue('courtStartTime', undefined);
+              form.setValue('courtEndTime', undefined);
+              form.setValue('courtDaysOfWeek', undefined);
+            }
+          }}
+        />
+        <div>
+          <p className="font-medium text-sm">Sí, crear una cancha ahora</p>
+          <p className="text-xs text-muted-foreground">
+            Vas a poder agregar más canchas después desde el panel de administración.
+          </p>
+        </div>
+      </label>
+
+      {setupCourts && (
+        <div className="space-y-4 pl-6 border-l-2 border-primary/20">
+          <Field data-invalid={Boolean(errors.courtSportId)}>
+            <FieldLabel htmlFor="court-sport">Deporte</FieldLabel>
+            <select
+              id="court-sport"
+              className="h-10 w-full rounded-md border bg-background px-3 text-sm aria-invalid:border-destructive"
+              aria-invalid={Boolean(errors.courtSportId)}
+              {...form.register('courtSportId')}
+            >
+              <option value="">Seleccioná un deporte</option>
+              {sports.map((sport) => (
+                <option key={sport.id} value={sport.id}>
+                  {sport.name}
+                </option>
+              ))}
+            </select>
+            {errors.courtSportId && (
+              <p className="text-sm text-destructive mt-1">
+                {String(errors.courtSportId.message ?? '')}
+              </p>
+            )}
+          </Field>
+
+          <div className="grid grid-cols-2 gap-3">
+            <Field data-invalid={Boolean(errors.courtStartTime)}>
+              <FieldLabel htmlFor="court-start">Horario desde</FieldLabel>
+              <Input
+                id="court-start"
+                type="time"
+                defaultValue="08:00"
+                aria-invalid={Boolean(errors.courtStartTime)}
+                {...form.register('courtStartTime')}
+              />
+              {errors.courtStartTime && (
+                <p className="text-sm text-destructive mt-1">
+                  {String(errors.courtStartTime.message ?? '')}
+                </p>
+              )}
+            </Field>
+
+            <Field data-invalid={Boolean(errors.courtEndTime)}>
+              <FieldLabel htmlFor="court-end">Horario hasta</FieldLabel>
+              <Input
+                id="court-end"
+                type="time"
+                defaultValue="22:00"
+                aria-invalid={Boolean(errors.courtEndTime)}
+                {...form.register('courtEndTime')}
+              />
+              {errors.courtEndTime && (
+                <p className="text-sm text-destructive mt-1">
+                  {String(errors.courtEndTime.message ?? '')}
+                </p>
+              )}
+            </Field>
+          </div>
+
+          <div>
+            <Label className="mb-2 block text-sm">Días de la semana</Label>
+            <div className="flex flex-wrap gap-2">
+              {DAYS_OF_WEEK.map((day) => {
+                const isSelected = courtDaysOfWeek?.includes(day.value) ?? false;
+                return (
+                  <button
+                    key={day.value}
+                    type="button"
+                    onClick={() => toggleDay(day.value)}
+                    className={cn(
+                      'flex items-center gap-1.5 rounded-md border px-3 py-1.5 text-xs font-medium transition-all',
+                      isSelected
+                        ? 'border-primary bg-primary/10 text-primary'
+                        : 'border-border text-muted-foreground hover:border-muted-foreground/30'
+                    )}
+                  >
+                    {isSelected && <Check className="size-3" />}
+                    {day.label}
+                  </button>
+                );
+              })}
+            </div>
+            {errors.courtDaysOfWeek && (
+              <p className="text-sm text-destructive mt-1">
+                {String(errors.courtDaysOfWeek.message ?? '')}
+              </p>
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
--- a/apps/frontend/src/features/onboard/components/steps/location-step.tsx
+++ b/apps/frontend/src/features/onboard/components/steps/location-step.tsx
@@ -0,0 +1,70 @@
+import { Field, FieldError, FieldLabel } from '@/components/ui/field';
+import { Input } from '@/components/ui/input';
+import type { UseFormReturn } from 'react-hook-form';
+
+type LocationStepProps = {
+  form: UseFormReturn<any>;
+};
+
+export function LocationStep({ form }: LocationStepProps) {
+  const errors = form.formState.errors;
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h2 className="text-lg font-semibold">Ubicación</h2>
+        <p className="text-sm text-muted-foreground">¿Dónde está ubicado tu complejo?</p>
+      </div>
+
+      <Field data-invalid={Boolean(errors.physicalAddress)}>
+        <FieldLabel htmlFor="physical-address">Dirección</FieldLabel>
+        <Input
+          id="physical-address"
+          type="text"
+          placeholder="Ej: Av. San Martín 1234"
+          aria-invalid={Boolean(errors.physicalAddress)}
+          {...form.register('physicalAddress')}
+        />
+        <FieldError errors={[errors.physicalAddress]} />
+      </Field>
+
+      <Field data-invalid={Boolean(errors.city)}>
+        <FieldLabel htmlFor="city">Ciudad</FieldLabel>
+        <Input
+          id="city"
+          type="text"
+          placeholder="Ej: Salta"
+          aria-invalid={Boolean(errors.city)}
+          {...form.register('city')}
+        />
+        <FieldError errors={[errors.city]} />
+      </Field>
+
+      <div className="grid grid-cols-2 gap-3">
+        <Field data-invalid={Boolean(errors.state)}>
+          <FieldLabel htmlFor="state">Provincia / Estado</FieldLabel>
+          <Input
+            id="state"
+            type="text"
+            placeholder="Ej: Salta"
+            aria-invalid={Boolean(errors.state)}
+            {...form.register('state')}
+          />
+          <FieldError errors={[errors.state]} />
+        </Field>
+
+        <Field data-invalid={Boolean(errors.country)}>
+          <FieldLabel htmlFor="country">País</FieldLabel>
+          <Input
+            id="country"
+            type="text"
+            placeholder="Ej: Argentina"
+            aria-invalid={Boolean(errors.country)}
+            {...form.register('country')}
+          />
+          <FieldError errors={[errors.country]} />
+        </Field>
+      </div>
+    </div>
+  );
+}
--- a/apps/frontend/src/features/onboard/components/steps/plan-select-step.tsx
+++ b/apps/frontend/src/features/onboard/components/steps/plan-select-step.tsx
@@ -0,0 +1,100 @@
+import { cn } from '@/lib/utils';
+import type { PlanWithFeatures } from '@repo/api-contract';
+import { Check, X } from 'lucide-react';
+import type { UseFormReturn } from 'react-hook-form';
+
+type PlanSelectStepProps = {
+  form: UseFormReturn<any>;
+  plans: PlanWithFeatures[];
+};
+
+const FEATURE_LABELS: Record<string, string> = {
+  publicBookingPage: 'Página de booking pública',
+  onlinePayments: 'Pagos online',
+  advancedReports: 'Reportes avanzados',
+  whatsappReminders: 'Recordatorios WhatsApp',
+};
+
+export function PlanSelectStep({ form, plans }: PlanSelectStepProps) {
+  const selectedCode = form.watch('planCode') as string | undefined;
+  const errors = form.formState.errors;
+
+  const featuresList = [
+    'publicBookingPage',
+    'onlinePayments',
+    'advancedReports',
+    'whatsappReminders',
+  ] as const;
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h2 className="text-lg font-semibold">Elegí tu plan</h2>
+        <p className="text-sm text-muted-foreground">
+          Seleccioná el plan que mejor se adapte a tu complejo.
+        </p>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-3">
+        {plans.map((plan) => {
+          const isSelected = selectedCode === plan.code;
+          return (
+            <button
+              key={plan.code}
+              type="button"
+              onClick={() => form.setValue('planCode', plan.code, { shouldValidate: true })}
+              className={cn(
+                'relative flex flex-col rounded-xl border-2 p-5 text-left transition-all',
+                'hover:border-primary/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
+                isSelected ? 'border-primary bg-primary/5 shadow-sm' : 'border-border bg-card'
+              )}
+            >
+              {isSelected && (
+                <div className="absolute right-3 top-3 flex size-6 items-center justify-center rounded-full bg-primary text-primary-foreground">
+                  <Check className="size-4" />
+                </div>
+              )}
+
+              <div className="mb-3">
+                <h3 className="text-xl font-bold">{plan.name}</h3>
+                <div className="mt-1">
+                  <span className="text-3xl font-bold">${plan.price}</span>
+                  <span className="text-sm text-muted-foreground">/mes</span>
+                </div>
+              </div>
+
+              <div className="mb-4 space-y-1.5 border-t pt-3 text-xs text-muted-foreground">
+                <p className="font-medium text-foreground">Incluye:</p>
+                <p>Hasta {plan.limits.maxCourts} canchas</p>
+                <p>Hasta {plan.limits.maxBookingsPerDay} reservas/día</p>
+                {plan.limits.maxActiveUsers && <p>Hasta {plan.limits.maxActiveUsers} usuarios</p>}
+              </div>
+
+              <div className="space-y-1.5 border-t pt-3">
+                {featuresList.map((feature) => {
+                  const enabled = plan.features[feature as keyof typeof plan.features];
+                  return (
+                    <div key={feature} className="flex items-center gap-2 text-xs">
+                      {enabled ? (
+                        <Check className="size-3.5 shrink-0 text-green-600" />
+                      ) : (
+                        <X className="size-3.5 shrink-0 text-muted-foreground" />
+                      )}
+                      <span className={enabled ? 'text-foreground' : 'text-muted-foreground'}>
+                        {FEATURE_LABELS[feature]}
+                      </span>
+                    </div>
+                  );
+                })}
+              </div>
+            </button>
+          );
+        })}
+      </div>
+
+      {errors.planCode && (
+        <p className="text-sm text-destructive">{String(errors.planCode.message ?? '')}</p>
+      )}
+    </div>
+  );
+}
--- a/apps/frontend/src/features/onboard/components/steps/review-step.tsx
+++ b/apps/frontend/src/features/onboard/components/steps/review-step.tsx
@@ -0,0 +1,123 @@
+import type { PlanWithFeatures } from '@repo/api-contract';
+import { Check, X } from 'lucide-react';
+
+type ReviewStepProps = {
+  data: {
+    complexName: string;
+    physicalAddress: string;
+    city?: string;
+    state?: string;
+    country?: string;
+    planCode: string;
+    setupCourts: boolean;
+    courtSportName?: string;
+    courtStartTime?: string;
+    courtEndTime?: string;
+    courtDaysOfWeek?: string[];
+  };
+  selectedPlan: PlanWithFeatures | undefined;
+};
+
+const DAY_LABELS: Record<string, string> = {
+  MONDAY: 'Lunes',
+  TUESDAY: 'Martes',
+  WEDNESDAY: 'Miércoles',
+  THURSDAY: 'Jueves',
+  FRIDAY: 'Viernes',
+  SATURDAY: 'Sábado',
+  SUNDAY: 'Domingo',
+};
+
+export function ReviewStep({ data, selectedPlan }: ReviewStepProps) {
+  return (
+    <div className="space-y-4">
+      <div>
+        <h2 className="text-lg font-semibold">Revisá tus datos</h2>
+        <p className="text-sm text-muted-foreground">
+          Antes de confirmar, revisá que todos los datos sean correctos.
+        </p>
+      </div>
+
+      <div className="space-y-3 rounded-lg border p-4">
+        <Section title="Complejo">
+          <Row label="Nombre" value={data.complexName} />
+          <Row label="Dirección" value={data.physicalAddress} />
+          {data.city && <Row label="Ciudad" value={data.city} />}
+          {data.state && <Row label="Provincia" value={data.state} />}
+          {data.country && <Row label="País" value={data.country} />}
+        </Section>
+
+        <Section title="Plan seleccionado">
+          {selectedPlan ? (
+            <>
+              <Row label="Plan" value={`${selectedPlan.name} - $${selectedPlan.price}/mes`} />
+              <div className="mt-2 space-y-1">
+                {[
+                  ['publicBookingPage', 'Página de booking pública'],
+                  ['onlinePayments', 'Pagos online'],
+                  ['advancedReports', 'Reportes avanzados'],
+                  ['whatsappReminders', 'Recordatorios WhatsApp'],
+                ].map(([feature, label]) => {
+                  const enabled =
+                    selectedPlan.features[feature as keyof typeof selectedPlan.features];
+                  return (
+                    <div key={feature} className="flex items-center gap-2 text-xs">
+                      {enabled ? (
+                        <Check className="size-3.5 shrink-0 text-green-600" />
+                      ) : (
+                        <X className="size-3.5 shrink-0 text-muted-foreground" />
+                      )}
+                      <span className={enabled ? '' : 'text-muted-foreground'}>{label}</span>
+                    </div>
+                  );
+                })}
+              </div>
+            </>
+          ) : (
+            <p className="text-sm text-muted-foreground">No se seleccionó un plan.</p>
+          )}
+        </Section>
+
+        <Section title="Cancha">
+          {data.setupCourts ? (
+            <>
+              <Row label="Deporte" value={data.courtSportName ?? '-'} />
+              <Row
+                label="Horario"
+                value={`${data.courtStartTime ?? '08:00'} - ${data.courtEndTime ?? '22:00'}`}
+              />
+              <Row
+                label="Días"
+                value={(data.courtDaysOfWeek ?? []).map((d) => DAY_LABELS[d] ?? d).join(', ')}
+              />
+            </>
+          ) : (
+            <p className="text-sm text-muted-foreground">
+              No se crearán canchas automáticamente. Podés agregarlas después.
+            </p>
+          )}
+        </Section>
+      </div>
+    </div>
+  );
+}
+
+function Section({ title, children }: { title: string; children: React.ReactNode }) {
+  return (
+    <div>
+      <h3 className="mb-2 text-sm font-semibold text-muted-foreground uppercase tracking-wide">
+        {title}
+      </h3>
+      <div className="space-y-1.5">{children}</div>
+    </div>
+  );
+}
+
+function Row({ label, value }: { label: string; value: string }) {
+  return (
+    <div className="flex justify-between gap-4 text-sm">
+      <span className="shrink-0 text-muted-foreground">{label}</span>
+      <span className="flex-1 text-end font-medium">{value}</span>
+    </div>
+  );
+}
--- a/apps/frontend/src/features/onboard/create-complex-page.tsx
+++ b/apps/frontend/src/features/onboard/create-complex-page.tsx
@@ -1,222 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Field, FieldError, FieldLabel } from '@/components/ui/field';
-import { Input } from '@/components/ui/input';
-import { apiClient } from '@/lib/api-client';
-import { useAuth } from '@/lib/auth';
-import { setCurrentComplexSlug } from '@/lib/current-complex';
-import { zodResolver } from '@hookform/resolvers/zod';
-import type { PlanSummary } from '@repo/api-contract';
-import { useNavigate } from '@tanstack/react-router';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-const createComplexSchema = z.object({
-  complexName: z
-    .string()
-    .trim()
-    .min(3, 'El nombre del complejo debe tener al menos 3 caracteres.')
-    .max(120, 'El nombre del complejo no puede superar los 120 caracteres.'),
-  physicalAddress: z
-    .string()
-    .trim()
-    .min(5, 'La direccion debe tener al menos 5 caracteres.')
-    .max(200, 'La direccion no puede superar los 200 caracteres.'),
-  city: z.string().trim().max(100, 'La ciudad no puede superar los 100 caracteres.').optional(),
-  state: z
-    .string()
-    .trim()
-    .max(100, 'La provincia/estado no puede superar los 100 caracteres.')
-    .optional(),
-  country: z.string().trim().max(100, 'El país no puede superar los 100 caracteres.').optional(),
-  planCode: z
-    .string()
-    .trim()
-    .min(1, 'El planCode no puede estar vacío.')
-    .max(10, 'El planCode no puede superar los 10 caracteres.')
-    .optional(),
-});
-
-type CreateComplexForm = z.infer<typeof createComplexSchema>;
-
-export function CreateComplexPage() {
-  const navigate = useNavigate();
-  const { user } = useAuth();
-  const [plans, setPlans] = useState<PlanSummary[]>([]);
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const form = useForm<CreateComplexForm>({
-    resolver: zodResolver(createComplexSchema),
-    mode: 'onChange',
-    defaultValues: {
-      complexName: '',
-      physicalAddress: '',
-      city: '',
-      state: '',
-      country: '',
-      planCode: '',
-    },
-  });
-
-  useEffect(() => {
-    void (async () => {
-      try {
-        const result = await apiClient.plans.list();
-        setPlans(result);
-      } catch {
-        setPlans([]);
-      }
-    })();
-  }, []);
-
-  const onSubmit = async (values: CreateComplexForm) => {
-    setErrorMessage(null);
-    setIsSubmitting(true);
-
-    try {
-      const pendingEmail = sessionStorage.getItem('pending-signup-email');
-      const payload: Parameters<typeof apiClient.complexes.create>[0] = {
-        complexName: values.complexName,
-        physicalAddress: values.physicalAddress,
-        city: values.city,
-        state: values.state,
-        country: values.country,
-        planCode: values.planCode,
-      };
-
-      if (pendingEmail) {
-        payload.adminEmail = pendingEmail;
-      }
-
-      const complex = await apiClient.complexes.create(payload);
-
-      sessionStorage.removeItem('pending-signup-email');
-      sessionStorage.removeItem('pending-signup-userId');
-      setCurrentComplexSlug(complex.complexSlug);
-      await navigate({
-        to: '/complex/$slug/edit',
-        params: { slug: complex.complexSlug },
-      });
-    } catch {
-      setErrorMessage('No pudimos crear el complejo. Intenta nuevamente.');
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  return (
-    <main className="flex min-h-screen w-full items-center justify-center px-3 sm:px-6">
-      <section className="w-full max-w-sm rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
-        <h1 className="mb-2 text-2xl font-semibold">Crear tu complejo</h1>
-        <p className="mb-4 text-sm text-muted-foreground">
-          Completá los datos de tu complejo para comenzar.
-        </p>
-
-        <form className="space-y-3" onSubmit={form.handleSubmit(onSubmit)}>
-          {user?.email && (
-            <Field>
-              <FieldLabel htmlFor="user-email">Email</FieldLabel>
-              <Input id="user-email" type="email" value={user.email} disabled readOnly />
-            </Field>
-          )}
-
-          <Field data-invalid={Boolean(form.formState.errors.complexName)}>
-            <FieldLabel htmlFor="complexName">Nombre del complejo</FieldLabel>
-            <Input
-              id="complexName"
-              type="text"
-              placeholder="Complejo Las Palmeras"
-              aria-invalid={Boolean(form.formState.errors.complexName)}
-              {...form.register('complexName')}
-            />
-            <FieldError errors={[form.formState.errors.complexName]} />
-          </Field>
-
-          <Field data-invalid={Boolean(form.formState.errors.physicalAddress)}>
-            <FieldLabel htmlFor="physicalAddress">Dirección física</FieldLabel>
-            <Input
-              id="physicalAddress"
-              type="text"
-              placeholder="Av. San Martin 1234, Salta"
-              aria-invalid={Boolean(form.formState.errors.physicalAddress)}
-              {...form.register('physicalAddress')}
-            />
-            <FieldError errors={[form.formState.errors.physicalAddress]} />
-          </Field>
-
-          <Field data-invalid={Boolean(form.formState.errors.city)}>
-            <FieldLabel htmlFor="city">Ciudad</FieldLabel>
-            <Input
-              id="city"
-              type="text"
-              placeholder="Salta"
-              aria-invalid={Boolean(form.formState.errors.city)}
-              {...form.register('city')}
-            />
-            <FieldError errors={[form.formState.errors.city]} />
-          </Field>
-
-          <Field data-invalid={Boolean(form.formState.errors.state)}>
-            <FieldLabel htmlFor="state">Provincia/Estado</FieldLabel>
-            <Input
-              id="state"
-              type="text"
-              placeholder="Salta"
-              aria-invalid={Boolean(form.formState.errors.state)}
-              {...form.register('state')}
-            />
-            <FieldError errors={[form.formState.errors.state]} />
-          </Field>
-
-          <Field data-invalid={Boolean(form.formState.errors.country)}>
-            <FieldLabel htmlFor="country">País</FieldLabel>
-            <Input
-              id="country"
-              type="text"
-              placeholder="Argentina"
-              aria-invalid={Boolean(form.formState.errors.country)}
-              {...form.register('country')}
-            />
-            <FieldError errors={[form.formState.errors.country]} />
-          </Field>
-
-          <Field data-invalid={Boolean(form.formState.errors.planCode)}>
-            <FieldLabel htmlFor="planCode">Plan</FieldLabel>
-            <select
-              id="planCode"
-              className="h-10 w-full rounded-md border bg-background px-3 text-sm"
-              aria-invalid={Boolean(form.formState.errors.planCode)}
-              {...form.register('planCode')}
-            >
-              <option value="">
-                {plans.length > 0 ? 'Selecciona un plan' : 'No hay planes disponibles'}
-              </option>
-              {plans.map((plan) => (
-                <option key={plan.code} value={plan.code}>
-                  {plan.name} - ${plan.price.toFixed(2)}
-                </option>
-              ))}
-            </select>
-            {plans.length === 0 && (
-              <p className="text-xs text-muted-foreground">
-                Carga planes en la base para continuar.
-              </p>
-            )}
-            <FieldError errors={[form.formState.errors.planCode]} />
-          </Field>
-
-          {errorMessage && <p className="text-sm text-destructive">{errorMessage}</p>}
-
-          <Button
-            type="submit"
-            className="w-full"
-            disabled={isSubmitting || !form.formState.isValid}
-          >
-            {isSubmitting ? 'Creando complejo...' : 'Crear complejo'}
-          </Button>
-        </form>
-      </section>
-    </main>
-  );
-}
--- a/apps/frontend/src/features/onboard/onboard-complete-page.tsx
+++ b/apps/frontend/src/features/onboard/onboard-complete-page.tsx
@@ -1,119 +0,0 @@
-import { OnboardingCompleteStep } from '@/features/onboard/components/onboarding-complete-step';
-import { OnboardingLayout } from '@/features/onboard/components/onboarding-layout';
-import {
-  clearOnboardingSessionState,
-  getOnboardingSessionState,
-  updateOnboardingSessionState,
-} from '@/features/onboard/onboarding-session';
-import type { CompleteValues } from '@/features/onboard/onboarding.types';
-import { apiClient } from '@/lib/api-client';
-import { useAuth } from '@/lib/auth';
-import { setCurrentComplexSlug } from '@/lib/current-complex';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { type PlanSummary, onboardingCompleteSchema } from '@repo/api-contract';
-import { useNavigate } from '@tanstack/react-router';
-import { useEffect, useMemo, useState } from 'react';
-import { useForm, useWatch } from 'react-hook-form';
-
-export function OnboardCompletePage() {
-  const navigate = useNavigate();
-  const { signInWithPassword } = useAuth();
-  const initialState = useMemo(() => getOnboardingSessionState(), []);
-
-  const [requestId] = useState<string | null>(initialState.requestId);
-  const [verifiedEmail] = useState<string | null>(initialState.verifiedEmail);
-  const [onboardingEmail] = useState<string | null>(initialState.onboardingEmail);
-  const [plans, setPlans] = useState<PlanSummary[]>([]);
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-
-  const form = useForm<CompleteValues>({
-    resolver: zodResolver(onboardingCompleteSchema.omit({ onboardingRequestId: true })),
-    mode: 'onChange',
-    defaultValues: initialState.completeForm,
-  });
-  const values = useWatch({ control: form.control });
-
-  useEffect(() => {
-    if (!requestId) {
-      void navigate({ to: '/onboard' });
-      return;
-    }
-
-    if (!verifiedEmail) {
-      void navigate({ to: '/onboard/verify' });
-    }
-  }, [navigate, requestId, verifiedEmail]);
-
-  useEffect(() => {
-    updateOnboardingSessionState((current) => ({
-      ...current,
-      completeForm: {
-        password: values.password ?? '',
-        complexName: values.complexName ?? '',
-        physicalAddress: values.physicalAddress ?? '',
-        planCode: values.planCode ?? '',
-      },
-    }));
-  }, [values.complexName, values.password, values.physicalAddress, values.planCode]);
-
-  useEffect(() => {
-    void (async () => {
-      try {
-        const result = await apiClient.plans.list();
-        setPlans(result);
-      } catch {
-        setPlans([]);
-      }
-    })();
-  }, []);
-
-  const onSubmit = async (payload: CompleteValues) => {
-    if (!requestId) {
-      setErrorMessage('No encontramos una solicitud de onboarding activa.');
-      return;
-    }
-
-    setErrorMessage(null);
-
-    try {
-      const result = await apiClient.onboarding.complete({
-        onboardingRequestId: requestId,
-        password: payload.password,
-        complexName: payload.complexName,
-        physicalAddress: payload.physicalAddress,
-        planCode: payload.planCode,
-      });
-
-      setCurrentComplexSlug(result.complexSlug);
-      const emailForSignIn = verifiedEmail ?? onboardingEmail;
-      if (emailForSignIn) {
-        await signInWithPassword({ email: emailForSignIn, password: payload.password });
-      }
-
-      clearOnboardingSessionState();
-      await navigate({ to: '/complex/$slug/edit', params: { slug: result.complexSlug } });
-    } catch {
-      setErrorMessage('No pudimos completar el onboarding. Intenta nuevamente.');
-    }
-  };
-
-  const planPlaceholder =
-    plans.length === 0 ? 'Codigo del plan (por ejemplo: BASIC)' : 'Selecciona un plan';
-
-  return (
-    <OnboardingLayout
-      title="Completa tu onboarding"
-      description="Define tu contraseña y configura tu complejo."
-    >
-      <OnboardingCompleteStep
-        form={form}
-        plans={plans}
-        verifiedEmail={verifiedEmail}
-        errorMessage={errorMessage}
-        infoMessage={null}
-        planPlaceholder={planPlaceholder}
-        onSubmit={onSubmit}
-      />
-    </OnboardingLayout>
-  );
-}
--- a/apps/frontend/src/features/onboard/onboard-login-page.tsx
+++ b/apps/frontend/src/features/onboard/onboard-login-page.tsx
@@ -1,317 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Field, FieldError, FieldLabel } from '@/components/ui/field';
-import { Input } from '@/components/ui/input';
-import { apiClient, authClient } from '@/lib/api-client';
-import { useAuth } from '@/lib/auth';
-import { acceptStoredPendingInvite } from '@/lib/invitations';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useNavigate } from '@tanstack/react-router';
-import { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-const loginSchema = z.object({
-  email: z.string().email('Ingresá un email válido.'),
-  password: z.string().min(6, 'La contraseña debe tener al menos 6 caracteres.'),
-});
-
-const signupSchema = z
-  .object({
-    fullName: z.string().min(2, 'El nombre debe tener al menos 2 caracteres.'),
-    email: z.string().email('Ingresá un email válido.'),
-    password: z.string().min(6, 'La contraseña debe tener al menos 6 caracteres.'),
-    confirmPassword: z.string(),
-  })
-  .refine((data) => data.password === data.confirmPassword, {
-    message: 'Las contraseñas no coinciden.',
-    path: ['confirmPassword'],
-  });
-
-type LoginForm = z.infer<typeof loginSchema>;
-type SignupForm = z.infer<typeof signupSchema>;
-
-type OnboardLoginPageProps = {
-  variant?: 'onboard' | 'invite';
-  inviteEmail?: string | null;
-};
-
-export function OnboardLoginPage({
-  variant = 'onboard',
-  inviteEmail = null,
-}: OnboardLoginPageProps) {
-  const navigate = useNavigate();
-  const { signInWithPassword, signUp } = useAuth();
-  const [mode, setMode] = useState<'login' | 'signup'>(variant === 'invite' ? 'signup' : 'login');
-  const [submitError, setSubmitError] = useState<string | null>(null);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const loginForm = useForm<LoginForm>({
-    resolver: zodResolver(loginSchema),
-    mode: 'onChange',
-    defaultValues: { email: inviteEmail ?? '', password: '' },
-  });
-
-  const signupForm = useForm<SignupForm>({
-    resolver: zodResolver(signupSchema),
-    mode: 'onChange',
-    defaultValues: {
-      fullName: '',
-      email: inviteEmail ?? '',
-      password: '',
-      confirmPassword: '',
-    },
-  });
-
-  async function handlePostLogin() {
-    await acceptStoredPendingInvite(apiClient.complexes.acceptPendingInvitations);
-
-    if (variant === 'invite') {
-      await navigate({ to: '/' });
-      return;
-    }
-
-    const complexes = await apiClient.complexes.listMine();
-
-    if (complexes.length === 0) {
-      navigate({ to: '/onboard/create-complex' });
-    } else if (complexes.length === 1) {
-      await apiClient.complexes.select({ complexId: complexes[0].id });
-      navigate({ to: '/' });
-    } else {
-      navigate({ to: '/select-complex' });
-    }
-  }
-
-  const onLoginSubmit = async (values: LoginForm) => {
-    setSubmitError(null);
-    setIsSubmitting(true);
-
-    try {
-      await signInWithPassword(values);
-      await handlePostLogin();
-    } catch {
-      setSubmitError('No pudimos iniciar sesión. Verificá tus credenciales.');
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const onSignupSubmit = async (values: SignupForm) => {
-    setSubmitError(null);
-    setIsSubmitting(true);
-
-    try {
-      const result = await signUp({
-        email: values.email,
-        password: values.password,
-        fullName: values.fullName,
-      });
-
-      if (result.requiresEmailConfirmation) {
-        sessionStorage.setItem('pending-signup-email', values.email);
-        navigate({
-          to: '/onboard/verify-email',
-          search: { email: values.email },
-        });
-      } else {
-        if (variant === 'invite') {
-          await acceptStoredPendingInvite(apiClient.complexes.acceptPendingInvitations);
-          await navigate({ to: '/' });
-        } else {
-          await handlePostLogin();
-        }
-      }
-    } catch {
-      setSubmitError('No pudimos crear la cuenta. Intenta nuevamente.');
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleGoogleSignIn = async () => {
-    setSubmitError(null);
-
-    try {
-      await authClient.signIn.social({
-        provider: 'google',
-        callbackURL: `${window.location.origin}/auth-callback`,
-      });
-    } catch {
-      setSubmitError('No pudimos iniciar sesión con Google.');
-    }
-  };
-
-  return (
-    <main className="flex min-h-screen w-full items-center justify-center px-3 sm:px-6">
-      <section className="w-full max-w-sm rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
-        <h1 className="mb-2 text-2xl font-semibold">
-          {mode === 'login' ? 'Iniciar sesión' : 'Crear cuenta'}
-        </h1>
-        <p className="mb-4 text-sm text-muted-foreground">
-          {mode === 'login'
-            ? variant === 'invite'
-              ? 'Ingresá con tu cuenta para aceptar la invitación.'
-              : 'Ingresá con tu cuenta para continuar.'
-            : variant === 'invite'
-              ? 'Creá tu cuenta para aceptar la invitación.'
-              : 'Creá tu cuenta para comenzar.'}
-        </p>
-
-        <Button type="button" variant="outline" className="w-full" onClick={handleGoogleSignIn}>
-          <svg className="mr-2 h-4 w-4" viewBox="0 0 24 24" aria-hidden="true">
-            <path
-              fill="currentColor"
-              d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-            />
-            <path
-              fill="currentColor"
-              d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-            />
-            <path
-              fill="currentColor"
-              d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-            />
-            <path
-              fill="currentColor"
-              d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-            />
-          </svg>
-          Continuar con Google
-        </Button>
-
-        <div className="relative my-4">
-          <div className="absolute inset-0 flex items-center">
-            <span className="w-full border-t" />
-          </div>
-          <div className="relative flex justify-center text-xs uppercase">
-            <span className="bg-card px-2 text-muted-foreground">O</span>
-          </div>
-        </div>
-
-        {mode === 'login' ? (
-          <form className="space-y-3" onSubmit={loginForm.handleSubmit(onLoginSubmit)}>
-            <Field data-invalid={Boolean(loginForm.formState.errors.email)}>
-              <FieldLabel htmlFor="email">Email</FieldLabel>
-              <Input
-                id="email"
-                type="email"
-                placeholder="tu@email.com"
-                aria-invalid={Boolean(loginForm.formState.errors.email)}
-                {...loginForm.register('email')}
-              />
-              <FieldError errors={[loginForm.formState.errors.email]} />
-            </Field>
-
-            <Field data-invalid={Boolean(loginForm.formState.errors.password)}>
-              <FieldLabel htmlFor="password">Contraseña</FieldLabel>
-              <Input
-                id="password"
-                type="password"
-                placeholder="••••••••"
-                aria-invalid={Boolean(loginForm.formState.errors.password)}
-                {...loginForm.register('password')}
-              />
-              <FieldError errors={[loginForm.formState.errors.password]} />
-            </Field>
-
-            {submitError && <p className="text-sm text-destructive">{submitError}</p>}
-
-            <Button
-              type="submit"
-              className="w-full"
-              disabled={!loginForm.formState.isValid || isSubmitting}
-            >
-              {isSubmitting ? 'Ingresando...' : 'Ingresar'}
-            </Button>
-          </form>
-        ) : (
-          <form className="space-y-3" onSubmit={signupForm.handleSubmit(onSignupSubmit)}>
-            <Field data-invalid={Boolean(signupForm.formState.errors.fullName)}>
-              <FieldLabel htmlFor="fullName">Nombre completo</FieldLabel>
-              <Input
-                id="fullName"
-                type="text"
-                placeholder="Juan Pérez"
-                aria-invalid={Boolean(signupForm.formState.errors.fullName)}
-                {...signupForm.register('fullName')}
-              />
-              <FieldError errors={[signupForm.formState.errors.fullName]} />
-            </Field>
-
-            <Field data-invalid={Boolean(signupForm.formState.errors.email)}>
-              <FieldLabel htmlFor="email">Email</FieldLabel>
-              <Input
-                id="email"
-                type="email"
-                placeholder="tu@email.com"
-                aria-invalid={Boolean(signupForm.formState.errors.email)}
-                {...signupForm.register('email')}
-              />
-              <FieldError errors={[signupForm.formState.errors.email]} />
-            </Field>
-
-            <Field data-invalid={Boolean(signupForm.formState.errors.password)}>
-              <FieldLabel htmlFor="password">Contraseña</FieldLabel>
-              <Input
-                id="password"
-                type="password"
-                placeholder="••••••••"
-                aria-invalid={Boolean(signupForm.formState.errors.password)}
-                {...signupForm.register('password')}
-              />
-              <FieldError errors={[signupForm.formState.errors.password]} />
-            </Field>
-
-            <Field data-invalid={Boolean(signupForm.formState.errors.confirmPassword)}>
-              <FieldLabel htmlFor="confirmPassword">Confirmar contraseña</FieldLabel>
-              <Input
-                id="confirmPassword"
-                type="password"
-                placeholder="••••••••"
-                aria-invalid={Boolean(signupForm.formState.errors.confirmPassword)}
-                {...signupForm.register('confirmPassword')}
-              />
-              <FieldError errors={[signupForm.formState.errors.confirmPassword]} />
-            </Field>
-
-            {submitError && <p className="text-sm text-destructive">{submitError}</p>}
-
-            <Button
-              type="submit"
-              className="w-full"
-              disabled={!signupForm.formState.isValid || isSubmitting}
-            >
-              {isSubmitting ? 'Creando cuenta...' : 'Crear cuenta'}
-            </Button>
-          </form>
-        )}
-
-        <p className="mt-4 text-center text-sm text-muted-foreground">
-          {mode === 'login' ? (
-            <>
-              ¿No tenés cuenta?{' '}
-              <button
-                type="button"
-                className="text-primary hover:underline"
-                onClick={() => setMode('signup')}
-              >
-                Crear cuenta
-              </button>
-            </>
-          ) : (
-            <>
-              ¿Ya tenés cuenta?{' '}
-              <button
-                type="button"
-                className="text-primary hover:underline"
-                onClick={() => setMode('login')}
-              >
-                Iniciar sesión
-              </button>
-            </>
-          )}
-        </p>
-      </section>
-    </main>
-  );
-}
--- a/apps/frontend/src/features/onboard/onboard-start-page.tsx
+++ b/apps/frontend/src/features/onboard/onboard-start-page.tsx
@@ -1,79 +0,0 @@
-import { OnboardingLayout } from '@/features/onboard/components/onboarding-layout';
-import { OnboardingStartStep } from '@/features/onboard/components/onboarding-start-step';
-import {
-  OTP_MAX_ATTEMPTS,
-  defaultCompleteFormValues,
-  defaultVerifyOtpFormValues,
-  getOnboardingSessionState,
-  updateOnboardingSessionState,
-} from '@/features/onboard/onboarding-session';
-import type { StartValues } from '@/features/onboard/onboarding.types';
-import { apiClient } from '@/lib/api-client';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { onboardingStartSchema } from '@repo/api-contract';
-import { useNavigate } from '@tanstack/react-router';
-import { useEffect, useMemo, useState } from 'react';
-import { useForm, useWatch } from 'react-hook-form';
-
-export function OnboardStartPage() {
-  const navigate = useNavigate();
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [infoMessage, setInfoMessage] = useState<string | null>(null);
-  const initialState = useMemo(() => getOnboardingSessionState(), []);
-
-  const form = useForm<StartValues>({
-    resolver: zodResolver(onboardingStartSchema),
-    mode: 'onChange',
-    defaultValues: initialState.startForm,
-  });
-  const values = useWatch({ control: form.control });
-
-  useEffect(() => {
-    updateOnboardingSessionState((current) => ({
-      ...current,
-      startForm: {
-        fullName: values.fullName ?? '',
-        email: values.email ?? '',
-      },
-    }));
-  }, [values.email, values.fullName]);
-
-  const onSubmit = async (payload: StartValues) => {
-    setErrorMessage(null);
-    setInfoMessage(null);
-
-    try {
-      const result = await apiClient.onboarding.start(payload);
-
-      updateOnboardingSessionState((current) => ({
-        ...current,
-        requestId: result.requestId,
-        onboardingEmail: result.email,
-        verifiedEmail: null,
-        remainingAttempts: OTP_MAX_ATTEMPTS,
-        resendCooldownSeconds: result.cooldownSeconds,
-        startForm: {
-          fullName: payload.fullName,
-          email: payload.email,
-        },
-        verifyOtpForm: defaultVerifyOtpFormValues,
-        completeForm: defaultCompleteFormValues,
-      }));
-
-      await navigate({ to: '/onboard/verify' });
-    } catch {
-      setErrorMessage('No pudimos iniciar el onboarding. Intenta nuevamente.');
-    }
-  };
-
-  return (
-    <OnboardingLayout title="Onboarding" description="Ingresa tu nombre y email para comenzar.">
-      <OnboardingStartStep
-        form={form}
-        errorMessage={errorMessage}
-        infoMessage={infoMessage}
-        onSubmit={onSubmit}
-      />
-    </OnboardingLayout>
-  );
-}
--- a/apps/frontend/src/features/onboard/onboard-verify-page.tsx
+++ b/apps/frontend/src/features/onboard/onboard-verify-page.tsx
@@ -1,169 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { OnboardingLayout } from '@/features/onboard/components/onboarding-layout';
-import { OnboardingVerifyOtpStep } from '@/features/onboard/components/onboarding-verify-otp-step';
-import {
-  OTP_MAX_ATTEMPTS,
-  getOnboardingSessionState,
-  updateOnboardingSessionState,
-} from '@/features/onboard/onboarding-session';
-import type { VerifyOtpValues } from '@/features/onboard/onboarding.types';
-import { apiClient } from '@/lib/api-client';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { onboardingVerifyOtpSchema } from '@repo/api-contract';
-import { useNavigate } from '@tanstack/react-router';
-import { useEffect, useMemo, useState } from 'react';
-import { useForm, useWatch } from 'react-hook-form';
-
-export function OnboardVerifyPage() {
-  const navigate = useNavigate();
-  const initialState = useMemo(() => getOnboardingSessionState(), []);
-  const [requestId] = useState<string | null>(initialState.requestId);
-  const [onboardingEmail, setOnboardingEmail] = useState<string | null>(
-    initialState.onboardingEmail
-  );
-  const [remainingAttempts, setRemainingAttempts] = useState<number>(
-    initialState.remainingAttempts || OTP_MAX_ATTEMPTS
-  );
-  const [resendCooldownSeconds, setResendCooldownSeconds] = useState<number>(
-    initialState.resendCooldownSeconds || 0
-  );
-  const [isResending, setIsResending] = useState(false);
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [infoMessage, setInfoMessage] = useState<string | null>(null);
-
-  const form = useForm<VerifyOtpValues>({
-    resolver: zodResolver(onboardingVerifyOtpSchema.omit({ requestId: true })),
-    mode: 'onChange',
-    defaultValues: initialState.verifyOtpForm,
-  });
-  const values = useWatch({ control: form.control });
-
-  useEffect(() => {
-    if (requestId && onboardingEmail) return;
-    void navigate({ to: '/onboard' });
-  }, [navigate, onboardingEmail, requestId]);
-
-  useEffect(() => {
-    updateOnboardingSessionState((current) => ({
-      ...current,
-      onboardingEmail,
-      remainingAttempts,
-      resendCooldownSeconds,
-      verifyOtpForm: {
-        otp: values.otp ?? '',
-      },
-    }));
-  }, [onboardingEmail, remainingAttempts, resendCooldownSeconds, values.otp]);
-
-  useEffect(() => {
-    if (resendCooldownSeconds <= 0) return;
-
-    const timeout = window.setTimeout(() => {
-      setResendCooldownSeconds((current) => Math.max(0, current - 1));
-    }, 1000);
-
-    return () => {
-      window.clearTimeout(timeout);
-    };
-  }, [resendCooldownSeconds]);
-
-  const onSubmit = async (payload: VerifyOtpValues) => {
-    if (!requestId) {
-      setErrorMessage('No encontramos una solicitud de onboarding activa.');
-      return;
-    }
-
-    setErrorMessage(null);
-
-    try {
-      const result = await apiClient.onboarding.verifyOtp({
-        requestId,
-        otp: payload.otp,
-      });
-
-      setRemainingAttempts(result.remainingAttempts);
-      setResendCooldownSeconds(result.cooldownSeconds);
-      setInfoMessage(result.message);
-
-      updateOnboardingSessionState((current) => ({
-        ...current,
-        remainingAttempts: result.remainingAttempts,
-        resendCooldownSeconds: result.cooldownSeconds,
-      }));
-
-      if (result.verified) {
-        const nextVerifiedEmail = result.email ?? onboardingEmail;
-
-        updateOnboardingSessionState((current) => ({
-          ...current,
-          verifiedEmail: nextVerifiedEmail,
-          remainingAttempts: result.remainingAttempts,
-          resendCooldownSeconds: result.cooldownSeconds,
-        }));
-
-        await navigate({ to: '/onboard/complete' });
-      }
-    } catch {
-      setErrorMessage('No pudimos verificar el OTP. Intenta nuevamente.');
-    }
-  };
-
-  const onResend = async () => {
-    if (!requestId) {
-      setErrorMessage('No encontramos una solicitud de onboarding activa.');
-      return;
-    }
-
-    setIsResending(true);
-    setErrorMessage(null);
-
-    try {
-      const result = await apiClient.onboarding.resendOtp({ requestId });
-      setOnboardingEmail(result.email);
-      setRemainingAttempts(result.remainingAttempts);
-      setResendCooldownSeconds(result.cooldownSeconds);
-      form.reset({ otp: '' });
-      setInfoMessage(result.message);
-
-      updateOnboardingSessionState((current) => ({
-        ...current,
-        onboardingEmail: result.email,
-        remainingAttempts: result.remainingAttempts,
-        resendCooldownSeconds: result.cooldownSeconds,
-        verifyOtpForm: { otp: '' },
-      }));
-    } catch {
-      setErrorMessage('No pudimos reenviar el OTP. Intenta nuevamente.');
-    } finally {
-      setIsResending(false);
-    }
-  };
-
-  return (
-    <OnboardingLayout
-      title="Verifica tu email"
-      description="Ingresa el OTP para validar tu cuenta."
-    >
-      <OnboardingVerifyOtpStep
-        form={form}
-        email={onboardingEmail}
-        errorMessage={errorMessage}
-        infoMessage={infoMessage}
-        remainingAttempts={remainingAttempts}
-        resendCooldownSeconds={resendCooldownSeconds}
-        isResending={isResending}
-        onSubmit={onSubmit}
-        onResend={onResend}
-      />
-      <Button
-        variant="ghost"
-        className="mt-2 w-full"
-        onClick={() => {
-          void navigate({ to: '/onboard' });
-        }}
-      >
-        Volver al paso anterior
-      </Button>
-    </OnboardingLayout>
-  );
-}
--- a/apps/frontend/src/features/onboard/onboarding-session.ts
+++ b/apps/frontend/src/features/onboard/onboarding-session.ts
@@ -1,140 +0,0 @@
-import type {
-  CompleteValues,
-  StartValues,
-  VerifyOtpValues,
-} from '@/features/onboard/onboarding.types';
-
-const ONBOARDING_SESSION_KEY = 'playzer:onboarding-session';
-export const OTP_MAX_ATTEMPTS = 5;
-
-export const defaultStartFormValues: StartValues = {
-  fullName: '',
-  email: '',
-};
-
-export const defaultVerifyOtpFormValues: VerifyOtpValues = {
-  otp: '',
-};
-
-export const defaultCompleteFormValues: CompleteValues = {
-  password: '',
-  complexName: '',
-  physicalAddress: '',
-  planCode: '',
-};
-
-export type OnboardingSessionState = {
-  requestId: string | null;
-  onboardingEmail: string | null;
-  verifiedEmail: string | null;
-  remainingAttempts: number;
-  resendCooldownSeconds: number;
-  startForm: StartValues;
-  verifyOtpForm: VerifyOtpValues;
-  completeForm: CompleteValues;
-};
-
-const defaultOnboardingSessionState: OnboardingSessionState = {
-  requestId: null,
-  onboardingEmail: null,
-  verifiedEmail: null,
-  remainingAttempts: OTP_MAX_ATTEMPTS,
-  resendCooldownSeconds: 0,
-  startForm: defaultStartFormValues,
-  verifyOtpForm: defaultVerifyOtpFormValues,
-  completeForm: defaultCompleteFormValues,
-};
-
-function isObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null;
-}
-
-function normalizeSessionState(value: unknown): OnboardingSessionState {
-  if (!isObject(value)) {
-    return defaultOnboardingSessionState;
-  }
-
-  return {
-    requestId: typeof value.requestId === 'string' ? value.requestId : null,
-    onboardingEmail: typeof value.onboardingEmail === 'string' ? value.onboardingEmail : null,
-    verifiedEmail: typeof value.verifiedEmail === 'string' ? value.verifiedEmail : null,
-    remainingAttempts:
-      typeof value.remainingAttempts === 'number'
-        ? value.remainingAttempts
-        : defaultOnboardingSessionState.remainingAttempts,
-    resendCooldownSeconds:
-      typeof value.resendCooldownSeconds === 'number'
-        ? value.resendCooldownSeconds
-        : defaultOnboardingSessionState.resendCooldownSeconds,
-    startForm: {
-      fullName:
-        isObject(value.startForm) && typeof value.startForm.fullName === 'string'
-          ? value.startForm.fullName
-          : defaultStartFormValues.fullName,
-      email:
-        isObject(value.startForm) && typeof value.startForm.email === 'string'
-          ? value.startForm.email
-          : defaultStartFormValues.email,
-    },
-    verifyOtpForm: {
-      otp:
-        isObject(value.verifyOtpForm) && typeof value.verifyOtpForm.otp === 'string'
-          ? value.verifyOtpForm.otp
-          : defaultVerifyOtpFormValues.otp,
-    },
-    completeForm: {
-      password:
-        isObject(value.completeForm) && typeof value.completeForm.password === 'string'
-          ? value.completeForm.password
-          : defaultCompleteFormValues.password,
-      complexName:
-        isObject(value.completeForm) && typeof value.completeForm.complexName === 'string'
-          ? value.completeForm.complexName
-          : defaultCompleteFormValues.complexName,
-      physicalAddress:
-        isObject(value.completeForm) && typeof value.completeForm.physicalAddress === 'string'
-          ? value.completeForm.physicalAddress
-          : defaultCompleteFormValues.physicalAddress,
-      planCode:
-        isObject(value.completeForm) && typeof value.completeForm.planCode === 'string'
-          ? value.completeForm.planCode
-          : defaultCompleteFormValues.planCode,
-    },
-  };
-}
-
-export function getOnboardingSessionState(): OnboardingSessionState {
-  if (typeof window === 'undefined') {
-    return defaultOnboardingSessionState;
-  }
-
-  const rawState = window.sessionStorage.getItem(ONBOARDING_SESSION_KEY);
-  if (!rawState) {
-    return defaultOnboardingSessionState;
-  }
-
-  try {
-    return normalizeSessionState(JSON.parse(rawState));
-  } catch {
-    return defaultOnboardingSessionState;
-  }
-}
-
-export function setOnboardingSessionState(state: OnboardingSessionState) {
-  if (typeof window === 'undefined') return;
-  window.sessionStorage.setItem(ONBOARDING_SESSION_KEY, JSON.stringify(state));
-}
-
-export function updateOnboardingSessionState(
-  updater: (current: OnboardingSessionState) => OnboardingSessionState
-): OnboardingSessionState {
-  const currentState = getOnboardingSessionState();
-  const nextState = updater(currentState);
-  setOnboardingSessionState(nextState);
-  return nextState;
-}
-
-export function clearOnboardingSessionState() {
-  if (typeof window === 'undefined') return;
-  window.sessionStorage.removeItem(ONBOARDING_SESSION_KEY);
-}
--- a/apps/frontend/src/features/onboard/onboarding.types.ts
+++ b/apps/frontend/src/features/onboard/onboarding.types.ts
@@ -1,10 +0,0 @@
-import {
-  onboardingCompleteSchema,
-  onboardingStartSchema,
-  onboardingVerifyOtpSchema,
-} from '@repo/api-contract';
-import { z } from 'zod';
-
-export type StartValues = z.infer<typeof onboardingStartSchema>;
-export type VerifyOtpValues = Omit<z.infer<typeof onboardingVerifyOtpSchema>, 'requestId'>;
-export type CompleteValues = Omit<z.infer<typeof onboardingCompleteSchema>, 'onboardingRequestId'>;
--- a/apps/frontend/src/features/onboard/setup-stepper-page.tsx
+++ b/apps/frontend/src/features/onboard/setup-stepper-page.tsx
@@ -0,0 +1,114 @@
+import { SetupStepper } from '@/features/onboard/components/setup-stepper';
+import { apiClient } from '@/lib/api-client';
+import { setCurrentComplexSlug } from '@/lib/current-complex';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { createComplexSchema } from '@repo/api-contract';
+import type { PlanWithFeatures, Sport } from '@repo/api-contract';
+import { useNavigate } from '@tanstack/react-router';
+import { useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
+
+export function SetupStepperPage() {
+  const navigate = useNavigate();
+  const [plans, setPlans] = useState<PlanWithFeatures[]>([]);
+  const [sports, setSports] = useState<Sport[]>([]);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const form = useForm({
+    resolver: zodResolver(createComplexSchema),
+    mode: 'onChange',
+    defaultValues: {
+      complexName: '',
+      physicalAddress: '',
+      city: '',
+      state: '',
+      country: '',
+      planCode: '',
+      setupCourts: false,
+      courtSportId: undefined,
+      courtStartTime: '08:00',
+      courtEndTime: '22:00',
+      courtDaysOfWeek: [],
+    },
+  });
+
+  useEffect(() => {
+    void (async () => {
+      try {
+        // Safety: if user already has complexes (e.g., accepted invite between redirects),
+        // redirect to home
+        const myComplexes = await apiClient.complexes.listMine();
+        if (myComplexes.length > 0) {
+          navigate({ to: '/' });
+          return;
+        }
+
+        const [plansResult, sportsResult] = await Promise.all([
+          apiClient.plans.list(),
+          apiClient.sports.list(),
+        ]);
+        setPlans(plansResult);
+        setSports(sportsResult);
+      } catch {
+        setErrorMessage('Error al cargar datos iniciales.');
+      }
+    })();
+  }, [navigate]);
+
+  const onSubmit = async () => {
+    const isValid = await form.trigger();
+    if (!isValid) return;
+
+    setErrorMessage(null);
+    setIsSubmitting(true);
+
+    try {
+      const values = form.getValues();
+      const result = await apiClient.complexes.create(values as any);
+
+      setCurrentComplexSlug(result.complexSlug);
+      await navigate({
+        to: '/complex/$slug/edit',
+        params: { slug: result.complexSlug },
+      });
+    } catch {
+      setErrorMessage('No pudimos crear el complejo. Intenta nuevamente.');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  if (errorMessage && plans.length === 0) {
+    return (
+      <main className="mx-auto flex min-h-screen w-full max-w-6xl items-center justify-center px-3 sm:px-6">
+        <section className="w-full max-w-xl rounded-xl border bg-card p-6 text-card-foreground shadow-sm text-center">
+          <p className="text-destructive">{errorMessage}</p>
+        </section>
+      </main>
+    );
+  }
+
+  return (
+    <main className="mx-auto flex min-h-screen w-full max-w-6xl items-start justify-center px-3 py-12 sm:px-6">
+      <section className="w-full max-w-3xl rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
+        <div className="mb-6">
+          <h1 className="text-2xl font-semibold">Configurá tu complejo</h1>
+          <p className="text-sm text-muted-foreground">
+            Completá los datos para empezar a recibir reservas.
+          </p>
+        </div>
+
+        <SetupStepper
+          form={form}
+          plans={plans}
+          sports={sports}
+          isSubmitting={isSubmitting}
+          onSubmit={onSubmit}
+        />
+
+        {errorMessage && <p className="mt-4 text-sm text-destructive">{errorMessage}</p>}
+      </section>
+    </main>
+  );
+}
--- a/apps/frontend/src/features/onboard/verify-email-page.tsx
+++ b/apps/frontend/src/features/onboard/verify-email-page.tsx
@@ -1,68 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { getPendingInvite } from '@/lib/invitations';
-import { Route } from '@/routes/onboard/verify-email';
-import { Link } from '@tanstack/react-router';
-import { useEffect, useState } from 'react';
-
-export function VerifyEmailPage() {
-  const search = Route.useSearch();
-  const email = search.email || sessionStorage.getItem('pending-signup-email') || '';
-  const pendingInvite = getPendingInvite();
-  const [resendCooldown, setResendCooldown] = useState(0);
-
-  useEffect(() => {
-    if (resendCooldown > 0) {
-      const timer = setTimeout(() => setResendCooldown((c) => c - 1), 1000);
-      return () => clearTimeout(timer);
-    }
-  }, [resendCooldown]);
-
-  const handleResend = async () => {
-    if (!email || resendCooldown > 0) return;
-
-    setResendCooldown(60);
-  };
-
-  return (
-    <main className="flex min-h-screen w-full items-center justify-center px-3 sm:px-6">
-      <section className="w-full max-w-sm rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
-        <h1 className="mb-2 text-2xl font-semibold">Verificá tu email</h1>
-        <p className="mb-4 text-sm text-muted-foreground">
-          Te enviamos un email de verificación a <strong>{email}</strong>. Hacé click en el link
-          para confirmar tu cuenta.
-        </p>
-
-        <div className="space-y-3">
-          <Button
-            type="button"
-            className="w-full"
-            onClick={handleResend}
-            disabled={resendCooldown > 0}
-          >
-            {resendCooldown > 0 ? `Reenviar en ${resendCooldown}s` : 'Reenviar email'}
-          </Button>
-
-          <p className="text-center text-sm text-muted-foreground">
-            ¿Ya verificaste tu email?{' '}
-            {pendingInvite.token ? (
-              <Link
-                to="/invite"
-                search={{
-                  email: pendingInvite.email ?? email,
-                  inviteToken: pendingInvite.token,
-                }}
-                className="text-primary hover:underline"
-              >
-                Continuar con la invitación
-              </Link>
-            ) : (
-              <Link to="/onboard/create-complex" className="text-primary hover:underline">
-                Continuar
-              </Link>
-            )}
-          </p>
-        </div>
-      </section>
-    </main>
-  );
-}
--- a/apps/frontend/src/features/public-booking/components/share-whatsapp-button.tsx
+++ b/apps/frontend/src/features/public-booking/components/share-whatsapp-button.tsx
@@ -6,7 +6,8 @@ type ShareWhatsappButtonProps = {
  confirmation: PublicBookingConfirmation;
 };

-function formatDateLabel(isoDate: string) {
+function formatDateLabel(isoDate: string | null | undefined) {
+  if (!isoDate) return '';
  const [year, month, day] = isoDate.split('-').map(Number);
  const date = new Date(year, (month ?? 1) - 1, day ?? 1);

@@ -18,16 +19,35 @@ function formatDateLabel(isoDate: string) {
  }).format(date);
 }

+function formatBookingPrice(price: number): string {
+  if (price === 0) {
+    return 'Sin cargo';
+  }
+
+  return new Intl.NumberFormat('es-AR', {
+    style: 'currency',
+    currency: 'ARS',
+    maximumFractionDigits: Number.isInteger(price) ? 0 : 2,
+  }).format(price);
+}
+
 function createWhatsappMessage(confirmation: PublicBookingConfirmation) {
  const dateLabel = formatDateLabel(confirmation.date);
-  return [
-    'Ya reservamos cancha para jugar.',
-    `Complejo: ${confirmation.complexName}`,
+  const lines = ['Ya reservamos cancha para jugar.', `Complejo: ${confirmation.complexName}`];
+
+  if (confirmation.complexAddress) {
+    lines.push(`Direccion: ${confirmation.complexAddress}`);
+  }
+
+  lines.push(
    `Cancha: ${confirmation.courtName} (${confirmation.sport.name})`,
    `Fecha: ${dateLabel}`,
    `Horario: ${confirmation.startTime} - ${confirmation.endTime}`,
-    `Codigo de reserva: ${confirmation.bookingCode}`,
-  ].join('\n');
+    `Precio: ${formatBookingPrice(confirmation.price)}`,
+    `Codigo de reserva: ${confirmation.bookingCode}`
+  );
+
+  return lines.join('\n');
 }

 export function ShareWhatsappButton({ confirmation }: ShareWhatsappButtonProps) {
@@ -36,17 +56,27 @@ export function ShareWhatsappButton({ confirmation }: ShareWhatsappButtonProps)
  )}`;

  return (
-    <Button type="button" variant="outline" className="h-11 w-full text-sm sm:text-base" asChild>
-      <a href={whatsappUrl} target="_blank" rel="noopener noreferrer">
+    <Button
+      type="button"
+      variant="outline"
+      className="h-12 w-full rounded-xl border-slate-200 bg-white text-sm font-semibold text-slate-900 hover:bg-slate-50 sm:text-base"
+      asChild
+    >
+      <a
+        href={whatsappUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+        title="Compartir por WhatsApp"
+      >
        <svg
          viewBox="0 0 24 24"
          aria-hidden="true"
-          className="size-4"
+          className="size-5"
          style={{ color: `#${siWhatsapp.hex}` }}
        >
          <path d={siWhatsapp.path} fill="currentColor" />
        </svg>
-        Compartir por WhatsApp
+        <span className="sm:hidden">Compartir por WhatsApp</span>
      </a>
    </Button>
  );
--- a/apps/frontend/src/features/public-booking/public-booking-confirmation-page.tsx
+++ b/apps/frontend/src/features/public-booking/public-booking-confirmation-page.tsx
@@ -1,7 +1,30 @@
+import PlayzerIcon from '@/assets/playzer-favicon-512-transparent.png';
 import { Button } from '@/components/ui/button';
-import { ApiClientError, apiClient } from '@/lib/api-client';
-import { useQuery } from '@tanstack/react-query';
+import { Input } from '@/components/ui/input';
+import {
+  ResponsiveDialog,
+  ResponsiveDialogClose,
+  ResponsiveDialogContent,
+  ResponsiveDialogDescription,
+  ResponsiveDialogFooter,
+  ResponsiveDialogHeader,
+  ResponsiveDialogTitle,
+} from '@/components/ui/responsive-dialog';
+import { apiClient } from '@/lib/api-client';
+import { useMutation, useQuery } from '@tanstack/react-query';
 import { useNavigate } from '@tanstack/react-router';
+import {
+  AlertCircle,
+  ArrowRight,
+  CalendarDays,
+  CheckCircle2,
+  Clock3,
+  LoaderCircle,
+  Receipt,
+  Trophy,
+  XCircle,
+} from 'lucide-react';
+import { useState } from 'react';
 import { ShareWhatsappButton } from './components/share-whatsapp-button';

 type PublicBookingConfirmationPageProps = {
@@ -10,23 +33,34 @@ type PublicBookingConfirmationPageProps = {
 };

 function extractMessage(error: unknown, fallback: string) {
-  if (error instanceof ApiClientError) {
-    return error.message || fallback;
-  }
-
-  return fallback;
+  const msg = (error as { message?: string } | undefined)?.message;
+  return msg || fallback;
 }

-function formatDateLabel(isoDate: string) {
+function formatDateLabel(isoDate: string | undefined | null) {
+  if (!isoDate) return '';
  const [year, month, day] = isoDate.split('-').map(Number);
  const date = new Date(year, (month ?? 1) - 1, day ?? 1);

-  return new Intl.DateTimeFormat('es-AR', {
+  const label = new Intl.DateTimeFormat('es-AR', {
    weekday: 'long',
    day: '2-digit',
    month: 'long',
-    year: 'numeric',
  }).format(date);
+
+  return label.charAt(0).toUpperCase() + label.slice(1);
+}
+
+function formatBookingPrice(price: number): string {
+  if (price === 0) {
+    return 'Sin cargo';
+  }
+
+  return new Intl.NumberFormat('es-AR', {
+    style: 'currency',
+    currency: 'ARS',
+    maximumFractionDigits: Number.isInteger(price) ? 0 : 2,
+  }).format(price);
 }

 export function PublicBookingConfirmationPage({
@@ -34,68 +68,172 @@ export function PublicBookingConfirmationPage({
  bookingCode,
 }: PublicBookingConfirmationPageProps) {
  const navigate = useNavigate();
+  const [cancelDialogOpen, setCancelDialogOpen] = useState(false);
+  const [customerPhone, setCustomerPhone] = useState('');
+  const [cancelError, setCancelError] = useState<string | null>(null);
+  const [cancelledBooking, setCancelledBooking] = useState<{
+    date: string;
+    startTime: string;
+    endTime: string;
+    courtName: string;
+    sport: { name: string };
+    bookingCode: string;
+    price: number;
+    complexName: string;
+  } | null>(null);
+
  const confirmationQuery = useQuery({
    queryKey: ['public-booking-confirmation', complexSlug, bookingCode],
    queryFn: () => apiClient.publicBookings.getConfirmation(complexSlug, bookingCode),
  });

+  const cancelMutation = useMutation({
+    mutationFn: (phone: string) =>
+      apiClient.publicBookings.cancelPublic(complexSlug, {
+        bookingCode,
+        customerPhone: phone,
+      }),
+  });
+
+  const handleCancelClick = () => {
+    cancelMutation.reset();
+    setCustomerPhone('');
+    setCancelError(null);
+    setCancelDialogOpen(true);
+  };
+
+  const handleConfirmCancel = async () => {
+    setCancelError(null);
+    try {
+      const data = await cancelMutation.mutateAsync(customerPhone);
+      setCancelledBooking(data);
+      setCancelDialogOpen(false);
+      setCustomerPhone('');
+    } catch (error: unknown) {
+      console.error('[Cancel]', error);
+      setCancelError(
+        (error as { message?: string } | undefined)?.message ?? 'No pudimos cancelar la reserva.'
+      );
+    }
+  };
+
+  const isCancelled = cancelledBooking !== null;
+  const displayData = cancelledBooking ?? confirmationQuery.data;
+
  return (
-    <main className="min-h-screen bg-linear-to-b from-background via-background to-primary/5">
-      <div className="mx-auto flex min-h-screen w-full max-w-3xl items-center px-3 py-8 sm:px-6">
-        <section className="w-full rounded-3xl border bg-card p-5 shadow-lg sm:p-8">
-          {confirmationQuery.isLoading && (
-            <p className="text-sm text-muted-foreground">Cargando confirmacion...</p>
+    <main className="min-h-screen bg-[#edf7f4] text-[#111827]">
+      <div className="mx-auto flex min-h-screen w-full max-w-3xl items-center px-4 py-8 sm:px-6">
+        <section className="w-full rounded-[28px] border border-emerald-950/10 bg-white p-5 shadow-[0_24px_70px_rgba(15,23,42,0.12)] sm:p-8">
+          {confirmationQuery.isLoading && !cancelledBooking && (
+            <div className="flex items-center gap-3 text-sm text-slate-500">
+              <LoaderCircle className="size-5 animate-spin text-emerald-600" />
+              Cargando confirmación...
+            </div>
          )}

-          {confirmationQuery.isError && (
-            <p className="text-sm text-destructive">
+          {confirmationQuery.isError && !cancelledBooking && (
+            <div className="flex gap-3 rounded-2xl border border-red-200 bg-red-50 p-4 text-sm text-red-700">
+              <AlertCircle className="mt-0.5 size-5 shrink-0" />
+              <p>
                {extractMessage(
                  confirmationQuery.error,
-                'No pudimos cargar la confirmacion de la reserva.'
+                  'No pudimos cargar la confirmación de la reserva.'
                )}
              </p>
+            </div>
          )}

-          {confirmationQuery.data && (
+          {displayData && (
            <div className="space-y-6">
+              <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
                <div>
-                <p className="text-xs font-medium tracking-[0.2em] text-muted-foreground uppercase">
+                  {isCancelled ? (
+                    <div className="inline-flex items-center gap-2 rounded-full bg-red-50 px-3 py-1 text-xs font-semibold tracking-[0.14em] text-red-600 uppercase">
+                      <XCircle className="size-4" />
+                      Reserva cancelada
+                    </div>
+                  ) : (
+                    <div className="inline-flex items-center gap-2 rounded-full bg-emerald-50 px-3 py-1 text-xs font-semibold tracking-[0.14em] text-emerald-700 uppercase">
+                      <CheckCircle2 className="size-4" />
                      Reserva confirmada
-                </p>
-                <h1 className="mt-2 text-2xl font-semibold sm:text-3xl">
-                  {confirmationQuery.data.complexName}
+                    </div>
+                  )}
+                  <h1 className="mt-3 text-2xl font-bold tracking-tight sm:text-3xl">
+                    {displayData.complexName}
                  </h1>
                </div>
-
-              <div className="rounded-2xl border border-primary/30 bg-primary/5 p-4 text-center sm:p-5">
-                <p className="text-xs text-muted-foreground">Codigo de reserva</p>
-                <p className="mt-1 text-3xl font-bold tracking-[0.25em] text-primary sm:text-4xl">
-                  {confirmationQuery.data.bookingCode}
-                </p>
+                <div className="flex items-center gap-2 text-slate-600">
+                  <img src={PlayzerIcon} alt="Playzer" className="size-8" />
+                  <span className="text-lg font-bold tracking-tight">Playzer</span>
+                </div>
              </div>

-              <div className="rounded-2xl border bg-background p-4 sm:p-5">
-                <p className="text-sm text-muted-foreground">Fecha</p>
-                <p className="mt-1 text-base font-medium capitalize sm:text-lg">
-                  {formatDateLabel(confirmationQuery.data.date)}
+              <div className="rounded-[24px] border border-emerald-500/30 bg-emerald-50/80 p-5 sm:p-6">
+                <div className="flex flex-col gap-5 sm:flex-row sm:items-end sm:justify-between">
+                  <div>
+                    <p className="flex items-center gap-2 text-sm font-semibold text-emerald-700">
+                      <CalendarDays className="size-4" />
+                      Tu turno
                    </p>
-
-                <p className="mt-4 text-sm text-muted-foreground">Horario</p>
-                <p className="mt-1 text-base font-medium sm:text-lg">
-                  {confirmationQuery.data.startTime} - {confirmationQuery.data.endTime}
+                    <p className="mt-3 text-2xl font-black leading-tight tracking-tight text-slate-950 sm:text-4xl">
+                      {formatDateLabel(displayData.date)}
                    </p>
-
-                <p className="mt-4 text-sm text-muted-foreground">Cancha</p>
-                <p className="mt-1 text-base font-medium sm:text-lg">
-                  {confirmationQuery.data.courtName} · {confirmationQuery.data.sport.name}
+                    <p className="mt-2 flex items-center gap-2 text-3xl font-black leading-none text-emerald-700 sm:text-5xl">
+                      <Clock3 className="size-7 sm:size-9" />
+                      {displayData.startTime} - {displayData.endTime}
                    </p>
                  </div>
+                  <div className="rounded-2xl border border-emerald-600/20 bg-white/80 px-4 py-3 sm:min-w-40 sm:text-right">
+                    <p className="text-xs font-medium text-slate-500">Precio del turno</p>
+                    <p className="mt-1 text-2xl font-bold text-slate-950">
+                      {formatBookingPrice(displayData.price)}
+                    </p>
+                  </div>
+                </div>
+              </div>

-              <div className="grid gap-3 sm:grid-cols-2">
-                <ShareWhatsappButton confirmation={confirmationQuery.data} />
+              <div className="overflow-hidden rounded-[22px] border border-slate-200 bg-slate-50/70">
+                <div className="grid gap-px bg-slate-200 sm:grid-cols-2">
+                  <div className="bg-white p-4">
+                    <p className="flex items-center gap-2 text-sm font-medium text-slate-500">
+                      <Trophy className="size-4 text-emerald-600" />
+                      Cancha
+                    </p>
+                    <p className="mt-2 text-base font-semibold text-slate-950">
+                      {displayData.courtName} · {displayData.sport.name}
+                    </p>
+                  </div>
+                  <div className="bg-white p-4">
+                    <p className="flex items-center gap-2 text-sm font-medium text-slate-500">
+                      <Receipt className="size-4 text-emerald-600" />
+                      Código de reserva
+                    </p>
+                    <p className="mt-2 font-mono text-lg font-bold tracking-[0.18em] text-slate-950">
+                      {displayData.bookingCode}
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              {isCancelled ? (
+                <div className="rounded-2xl bg-red-50 p-4 text-center text-sm text-red-700">
+                  Esta reserva fue cancelada. Te enviamos un email con los detalles de la
+                  cancelación.
+                </div>
+              ) : (
+                <div className="grid grid-cols-3 gap-2 sm:gap-3">
+                  <ShareWhatsappButton confirmation={confirmationQuery.data!} />
                  <Button
                    type="button"
-                  className="h-11 w-full text-sm sm:text-base"
+                    variant="outline"
+                    className="h-12 w-full rounded-xl border-red-200 text-sm font-semibold text-red-600 hover:bg-red-50 hover:text-red-700 sm:text-base"
+                    onClick={handleCancelClick}
+                  >
+                    Cancelar
+                  </Button>
+                  <Button
+                    type="button"
+                    className="h-12 w-full rounded-xl bg-emerald-600 text-sm font-semibold text-white hover:bg-emerald-500 sm:text-base"
                    onClick={() => {
                      void navigate({
                        to: '/$complexSlug/booking',
@@ -103,13 +241,58 @@ export function PublicBookingConfirmationPage({
                      });
                    }}
                  >
-                  Hacer otra reserva
+                    <span className="hidden sm:inline">Hacer otra reserva</span>
+                    <span className="sm:hidden">Otra</span>
+                    <ArrowRight className="size-4" />
                  </Button>
                </div>
+              )}
            </div>
          )}
        </section>
      </div>
+
+      <ResponsiveDialog open={cancelDialogOpen} onOpenChange={setCancelDialogOpen}>
+        <ResponsiveDialogContent>
+          <ResponsiveDialogHeader>
+            <ResponsiveDialogTitle>Cancelar reserva</ResponsiveDialogTitle>
+            <ResponsiveDialogDescription>
+              Ingresá el número de teléfono que usaste al hacer la reserva para confirmar la
+              cancelación.
+            </ResponsiveDialogDescription>
+          </ResponsiveDialogHeader>
+
+          <div className="px-6 pb-2">
+            <Input
+              type="tel"
+              placeholder="Ej: 1134567890"
+              value={customerPhone}
+              onChange={(e) => {
+                setCustomerPhone(e.target.value);
+                setCancelError(null);
+              }}
+            />
+            {cancelError && <p className="mt-2 text-sm text-red-600">{cancelError}</p>}
+          </div>
+
+          <ResponsiveDialogFooter>
+            <ResponsiveDialogClose asChild>
+              <Button variant="outline">Volver</Button>
+            </ResponsiveDialogClose>
+            <Button
+              variant="destructive"
+              disabled={!customerPhone.trim() || cancelMutation.isPending}
+              onClick={handleConfirmCancel}
+            >
+              {cancelMutation.isPending ? (
+                <LoaderCircle className="size-4 animate-spin" />
+              ) : (
+                'Sí, cancelar reserva'
+              )}
+            </Button>
+          </ResponsiveDialogFooter>
+        </ResponsiveDialogContent>
+      </ResponsiveDialog>
    </main>
  );
 }
--- a/apps/frontend/src/features/public-booking/public-booking-page.tsx
+++ b/apps/frontend/src/features/public-booking/public-booking-page.tsx
@@ -2,13 +2,6 @@ import PlayzerIcon from '@/assets/playzer-favicon-512-transparent.png';
 import { Button } from '@/components/ui/button';
 import { Field, FieldError, FieldLabel } from '@/components/ui/field';
 import { Input } from '@/components/ui/input';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
 import {
  Stepper,
  StepperIndicator,
@@ -69,6 +62,7 @@ const bookingFormSchema = z.object({
    .trim()
    .min(6, 'Ingresá un teléfono válido.')
    .max(30, 'El teléfono no puede superar los 30 caracteres.'),
+  customerEmail: z.string().email('Ingresá un email válido.'),
 });

 type BookingFormValues = z.infer<typeof bookingFormSchema>;
@@ -84,6 +78,7 @@ type SelectedSlot = {
  sportName: string;
  startTime: string;
  endTime: string;
+  price: number;
 };

 type BookingShellProps = {
@@ -186,6 +181,18 @@ function extractMessage(error: unknown, fallback: string) {
  return fallback;
 }

+function formatBookingPrice(price: number): string {
+  if (price === 0) {
+    return 'Sin cargo';
+  }
+
+  return new Intl.NumberFormat('es-AR', {
+    style: 'currency',
+    currency: 'ARS',
+    maximumFractionDigits: Number.isInteger(price) ? 0 : 2,
+  }).format(price);
+}
+
 function getStep(selectedSlot: SelectedSlot | null, isValid: boolean) {
  if (!selectedSlot) return 1;
  if (!isValid) return 3;
@@ -638,6 +645,8 @@ function PublicBookingDesktop(props: BookingShellProps) {
          )}
          {isError && <StatusPanel>{errorMessage}</StatusPanel>}
          {isLoading && <StatusPanel>Buscando disponibilidad...</StatusPanel>}
+          {selectedCourt && (
+            <>
              <Panel className="overflow-hidden">
                <div className="flex items-center border-b border-white/10 px-6 py-5">
                  <CourtHeader court={selectedCourt} complexName={props.complexName} />
@@ -680,6 +689,8 @@ function PublicBookingDesktop(props: BookingShellProps) {
                <CourtDetails court={selectedCourt} />
                <SelectedSlotCard {...props} />
              </div>
+            </>
+          )}
        </section>
      </div>
    </PublicBookingPageChrome>
@@ -711,16 +722,19 @@ function PublicBookingMobile(props: BookingShellProps) {
                options={props.sports.map((sport) => ({ value: sport.id, label: sport.name }))}
              />
            )}
-            <MobileSelect
-              label="Cancha"
-              value={selectedCourt?.courtId ?? ''}
-              placeholder="Seleccioná"
-              onValueChange={props.onSelectCourt}
-              options={props.courts.map((court) => ({
-                value: court.courtId,
-                label: court.courtName,
-              }))}
+            {props.courts.length > 0 ? (
+              <MobileCourtPicker
+                courts={props.courts}
+                selectedCourtId={selectedCourt?.courtId}
+                onSelectCourt={props.onSelectCourt}
              />
+            ) : (
+              !props.isLoading && (
+                <p className="rounded-md border border-white/10 bg-white/[0.035] p-3 text-sm text-white/62">
+                  No hay canchas disponibles para esta fecha.
+                </p>
+              )
+            )}
          </div>
        </Panel>

@@ -756,25 +770,23 @@ function PublicBookingMobile(props: BookingShellProps) {
        )}
        {props.isLoading && <StatusPanel>Buscando disponibilidad...</StatusPanel>}
        {props.isError && <StatusPanel>{props.errorMessage}</StatusPanel>}
+        {selectedCourt && (
          <Panel className="overflow-hidden">
            <div className="p-3">
              <CourtHeader court={selectedCourt} compact />
-            <div className="mt-3">
-              <Legend />
            </div>
-          </div>
-          <div className="border-t border-white/10 px-0 py-3">
-            <BookingTimeline
+            <div className="border-t border-white/10 p-3">
+              <MobileAvailableSlots
                court={selectedCourt}
                selectedSlot={props.selectedSlot}
                onSelectSlot={props.onSelectSlot}
-              compact
              />
            </div>
            <div className="px-3 pb-3">
              <SelectedSlotCard {...props} compact />
            </div>
          </Panel>
+        )}
      </div>
    </PublicBookingPageChrome>
  );
@@ -876,34 +888,119 @@ function MobileSportSelector({
  );
 }

-function MobileSelect({
-  label,
-  value,
-  placeholder,
-  options,
-  onValueChange,
+function MobileCourtPicker({
+  courts,
+  selectedCourtId,
+  onSelectCourt,
 }: {
-  label: string;
-  value: string;
-  placeholder: string;
-  options: { value: string; label: string }[];
-  onValueChange: (value: string) => void;
+  courts: PublicAvailabilityCourt[];
+  selectedCourtId?: string;
+  onSelectCourt: (courtId: string) => void;
 }) {
  return (
-    <div className="grid grid-cols-[88px_minmax(0,1fr)] items-center border-b border-white/10 bg-white/[0.025] px-3 py-2 last:border-b-0">
-      <span className="text-xs text-white/66">{label}</span>
-      <Select value={value} onValueChange={onValueChange}>
-        <SelectTrigger className="h-8 border-0 bg-transparent px-0 text-xs text-white shadow-none">
-          <SelectValue placeholder={placeholder} />
-        </SelectTrigger>
-        <SelectContent>
-          {options.map((option) => (
-            <SelectItem key={option.value} value={option.value}>
-              {option.label}
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
+    <div className="border-b border-white/10 bg-white/[0.025] px-3 py-3 last:border-b-0">
+      <div className="grid grid-cols-2 gap-2">
+        {courts.map((court) => {
+          const isSelected = selectedCourtId === court.courtId;
+
+          return (
+            <button
+              key={court.courtId}
+              type="button"
+              onClick={() => onSelectCourt(court.courtId)}
+              aria-pressed={isSelected}
+              className={`flex min-h-16 items-start gap-2 rounded-md border p-3 text-left transition ${
+                isSelected
+                  ? 'border-emerald-400 bg-emerald-500/20 text-white shadow-[inset_0_0_18px_rgba(16,185,129,0.12)]'
+                  : 'border-white/10 bg-white/[0.045] text-white/72 active:border-white/25 active:bg-white/[0.075]'
+              }`}
+            >
+              <span
+                className={`mt-0.5 flex size-5 shrink-0 items-center justify-center rounded-full border ${
+                  isSelected
+                    ? 'border-emerald-300 bg-emerald-400 text-[#061019]'
+                    : 'border-white/18 text-transparent'
+                }`}
+              >
+                <Check className="size-3.5" />
+              </span>
+              <span className="min-w-0">
+                <span className="block truncate text-sm font-semibold">{court.courtName}</span>
+                <span className="mt-0.5 block truncate text-xs text-white/52">
+                  {court.sport.name}
+                </span>
+              </span>
+            </button>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+function MobileAvailableSlots({
+  court,
+  selectedSlot,
+  onSelectSlot,
+}: {
+  court: PublicAvailabilityCourt;
+  selectedSlot: SelectedSlot | null;
+  onSelectSlot: (slot: SelectedSlot) => void;
+}) {
+  const slots = court.availableSlots;
+
+  return (
+    <div>
+      <div className="flex items-end justify-between gap-3">
+        <div>
+          <h3 className="text-base font-semibold">Horarios disponibles</h3>
+          <p className="mt-0.5 text-xs text-white/58">
+            Turnos de {court.slotDurationMinutes} minutos
+          </p>
+        </div>
+        <span className="shrink-0 text-xs font-medium text-emerald-300/90">
+          {slots.length} {slots.length === 1 ? 'turno' : 'turnos'}
+        </span>
+      </div>
+
+      {slots.length > 0 ? (
+        <div className="mt-3 grid grid-cols-3 gap-2">
+          {slots.map((slot) => {
+            const selected = isSlotSelected(slot, court.courtId, selectedSlot);
+
+            return (
+              <button
+                key={`${court.courtId}-${slot.startTime}`}
+                type="button"
+                onClick={() =>
+                  onSelectSlot({
+                    courtId: court.courtId,
+                    courtName: court.courtName,
+                    sportId: court.sport.id,
+                    sportName: court.sport.name,
+                    startTime: slot.startTime,
+                    endTime: slot.endTime,
+                    price: slot.price,
+                  })
+                }
+                aria-pressed={selected}
+                className={`flex h-12 items-center justify-center gap-1.5 rounded-md border text-sm font-bold transition ${
+                  selected
+                    ? 'border-emerald-300 bg-emerald-400 text-[#061019] shadow-lg shadow-emerald-500/20'
+                    : 'border-emerald-500/45 bg-emerald-500/12 text-white active:bg-emerald-500/24'
+                }`}
+              >
+                {selected && <Check className="size-4" />}
+                {slot.startTime}
+              </button>
+            );
+          })}
+        </div>
+      ) : (
+        <p className="mt-3 rounded-md border border-white/10 bg-white/[0.035] p-3 text-sm text-white/62">
+          No hay horarios disponibles para esta cancha.
+        </p>
+      )}
    </div>
  );
 }
@@ -1011,6 +1108,7 @@ function BookingTimeline({
                      sportName: court.sport.name,
                      startTime: slot.startTime,
                      endTime: slot.endTime,
+                      price: slot.price,
                    });
                  }}
                  className={`absolute top-7 flex h-12 min-w-[50px] items-center justify-center rounded border text-xs transition ${
@@ -1155,6 +1253,13 @@ function SelectedSlotCard(props: BookingShellProps & { compact?: boolean }) {
          className={compact ? 'mt-4 space-y-3' : 'mt-5 grid gap-3'}
          onSubmit={handleSubmit(onSubmit)}
        >
+          <div className="flex items-center justify-between gap-3 rounded-md border border-emerald-400/20 bg-emerald-400/[0.06] px-3 py-2.5">
+            <span className="text-sm text-white/72">Precio del turno</span>
+            <span className="shrink-0 text-base font-bold text-white">
+              {formatBookingPrice(selectedSlot.price)}
+            </span>
+          </div>
+
          <div className={compact ? 'space-y-3' : 'grid grid-cols-2 gap-3'}>
            <Field data-invalid={Boolean(errors.customerName)}>
              <FieldLabel htmlFor="customerName" className="text-white/76">
@@ -1190,6 +1295,24 @@ function SelectedSlotCard(props: BookingShellProps & { compact?: boolean }) {
            </Field>
          </div>

+          <Field data-invalid={Boolean(errors.customerEmail)}>
+            <FieldLabel htmlFor="customerEmail" className="text-white/76">
+              Email
+            </FieldLabel>
+            <Input
+              id="customerEmail"
+              type="email"
+              placeholder="Ej: juan@ejemplo.com"
+              aria-invalid={Boolean(errors.customerEmail)}
+              className="border-white/10 bg-white/[0.045] text-white placeholder:text-white/32"
+              {...register('customerEmail')}
+            />
+            <p className="mt-1 text-xs text-white/40">
+              Te enviaremos la confirmación de la reserva por email.
+            </p>
+            <FieldError errors={[errors.customerEmail]} />
+          </Field>
+
          {createError && <p className="text-sm text-red-300">{createError}</p>}
          {navigationError && <p className="text-sm text-red-300">{navigationError}</p>}

@@ -1305,6 +1428,7 @@ export function PublicBookingPage({ complexSlug }: PublicBookingPageProps) {
    defaultValues: {
      customerName: '',
      customerPhone: '',
+      customerEmail: '',
    },
  });

@@ -1321,6 +1445,7 @@ export function PublicBookingPage({ complexSlug }: PublicBookingPageProps) {
        startTime: selectedSlot.startTime,
        customerName: payload.customerName,
        customerPhone: payload.customerPhone,
+        customerEmail: payload.customerEmail,
      });
    },
  });
--- a/apps/frontend/src/features/select-complex/select-complex-page.tsx
+++ b/apps/frontend/src/features/select-complex/select-complex-page.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@/components/ui/button';
 import { apiClient } from '@/lib/api-client';
 import type { ComplexWithRole } from '@repo/api-contract';
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useNavigate } from '@tanstack/react-router';
 import { Building2, Loader2 } from 'lucide-react';

@@ -13,12 +13,15 @@ export function SelectComplexPage() {
    queryFn: () => apiClient.complexes.listMine(),
  });

+  const queryClient = useQueryClient();
+
  const selectMutation = useMutation({
    mutationFn: async (complexId: string) => {
      const response = await apiClient.complexes.select({ complexId });
      return response;
    },
-    onSuccess: () => {
+    onSuccess: (data) => {
+      queryClient.setQueryData(['current-complex'], data);
      navigate({ to: '/' });
    },
  });
--- a/apps/frontend/src/features/signup/signup-page.tsx
+++ b/apps/frontend/src/features/signup/signup-page.tsx
@@ -0,0 +1,232 @@
+import PlayzerIcon from '@/assets/playzer-favicon-512-transparent.png';
+import { Button } from '@/components/ui/button';
+import { Field, FieldError, FieldLabel } from '@/components/ui/field';
+import { Input } from '@/components/ui/input';
+import { authClient } from '@/lib/api-client';
+import { useAuth } from '@/lib/auth';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Link, useNavigate } from '@tanstack/react-router';
+import { useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+const signupSchema = z
+  .object({
+    fullName: z.string().min(2, 'El nombre debe tener al menos 2 caracteres.'),
+    email: z.string().email('Ingresá un email válido.'),
+    phone: z
+      .string()
+      .optional()
+      .refine(
+        (val) => !val || val.replace(/\D/g, '').length >= 7,
+        'El teléfono debe tener al menos 7 dígitos.'
+      ),
+    password: z.string().min(6, 'La contraseña debe tener al menos 6 caracteres.'),
+    confirmPassword: z.string(),
+  })
+  .refine((data) => data.password === data.confirmPassword, {
+    message: 'Las contraseñas no coinciden.',
+    path: ['confirmPassword'],
+  });
+
+type SignupForm = z.infer<typeof signupSchema>;
+
+const STORAGE_KEY = 'signup-form-pending';
+
+function loadFormState(): Partial<SignupForm> {
+  try {
+    const saved = sessionStorage.getItem(STORAGE_KEY);
+    if (saved) return JSON.parse(saved);
+  } catch {}
+  return {};
+}
+
+export function SignupPage() {
+  const navigate = useNavigate();
+  const { signUp } = useAuth();
+  const [submitError, setSubmitError] = useState<string | null>(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors, isValid },
+    watch,
+  } = useForm<SignupForm>({
+    resolver: zodResolver(signupSchema),
+    mode: 'onChange',
+    defaultValues: loadFormState(),
+  });
+
+  useEffect(() => {
+    const sub = watch((values) => {
+      sessionStorage.setItem(STORAGE_KEY, JSON.stringify(values));
+    });
+    return () => sub.unsubscribe();
+  }, [watch]);
+
+  const handleGoogleSignIn = async () => {
+    setSubmitError(null);
+
+    try {
+      await authClient.signIn.social({
+        provider: 'google',
+        callbackURL: `${window.location.origin}/auth-callback`,
+      });
+    } catch {
+      setSubmitError('No pudimos iniciar sesión con Google.');
+    }
+  };
+
+  const onSubmit = async (values: SignupForm) => {
+    setSubmitError(null);
+    setIsSubmitting(true);
+
+    try {
+      const { requiresEmailConfirmation } = await signUp({
+        email: values.email,
+        password: values.password,
+        fullName: values.fullName,
+        phone: values.phone || undefined,
+      });
+
+      sessionStorage.removeItem(STORAGE_KEY);
+
+      if (requiresEmailConfirmation) {
+        sessionStorage.setItem('pending-signup-email', values.email);
+        await navigate({ to: '/onboard/setup' });
+      }
+    } catch {
+      setSubmitError('No pudimos crear la cuenta. Intenta nuevamente.');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <main className="flex min-h-screen w-full flex-col items-center justify-center gap-6 px-3 sm:px-6">
+      <Link to="/" className="group flex items-center gap-3">
+        <div className="flex size-10 items-center justify-center">
+          <img src={PlayzerIcon} alt="Playzer" className="size-7" />
+        </div>
+        <span className="bg-gradient-to-r from-primary via-primary to-reserved bg-clip-text text-xl font-bold tracking-tight text-transparent">
+          Playzer
+        </span>
+      </Link>
+      <section className="w-full max-w-sm rounded-xl border bg-card p-6 text-card-foreground shadow-sm">
+        <h1 className="mb-2 text-2xl font-semibold">Crear cuenta</h1>
+        <p className="mb-4 text-sm text-muted-foreground">
+          Creá tu cuenta para comenzar a usar Playzer.
+        </p>
+
+        <Button type="button" variant="outline" className="w-full" onClick={handleGoogleSignIn}>
+          <svg className="mr-2 h-4 w-4" viewBox="0 0 24 24" aria-hidden="true">
+            <path
+              fill="currentColor"
+              d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
+            />
+            <path
+              fill="currentColor"
+              d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
+            />
+            <path
+              fill="currentColor"
+              d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
+            />
+            <path
+              fill="currentColor"
+              d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
+            />
+          </svg>
+          Continuar con Google
+        </Button>
+
+        <div className="relative my-4">
+          <div className="absolute inset-0 flex items-center">
+            <span className="w-full border-t" />
+          </div>
+          <div className="relative flex justify-center text-xs uppercase">
+            <span className="bg-card px-2 text-muted-foreground">O</span>
+          </div>
+        </div>
+
+        <form className="space-y-3" onSubmit={handleSubmit(onSubmit)}>
+          <Field data-invalid={Boolean(errors.fullName)}>
+            <FieldLabel htmlFor="fullName">Nombre completo</FieldLabel>
+            <Input
+              id="fullName"
+              type="text"
+              placeholder="Juan Pérez"
+              aria-invalid={Boolean(errors.fullName)}
+              {...register('fullName')}
+            />
+            <FieldError errors={[errors.fullName]} />
+          </Field>
+
+          <Field data-invalid={Boolean(errors.email)}>
+            <FieldLabel htmlFor="email">Email</FieldLabel>
+            <Input
+              id="email"
+              type="email"
+              placeholder="tu@email.com"
+              aria-invalid={Boolean(errors.email)}
+              {...register('email')}
+            />
+            <FieldError errors={[errors.email]} />
+          </Field>
+
+          <Field data-invalid={Boolean(errors.phone)}>
+            <FieldLabel htmlFor="phone">
+              Teléfono <span className="text-muted-foreground">(opcional)</span>
+            </FieldLabel>
+            <Input
+              id="phone"
+              type="tel"
+              placeholder="+54 11 1234-5678"
+              aria-invalid={Boolean(errors.phone)}
+              {...register('phone')}
+            />
+            <FieldError errors={[errors.phone]} />
+          </Field>
+
+          <Field data-invalid={Boolean(errors.password)}>
+            <FieldLabel htmlFor="password">Contraseña</FieldLabel>
+            <Input
+              id="password"
+              type="password"
+              placeholder="••••••••"
+              aria-invalid={Boolean(errors.password)}
+              {...register('password')}
+            />
+            <FieldError errors={[errors.password]} />
+          </Field>
+
+          <Field data-invalid={Boolean(errors.confirmPassword)}>
+            <FieldLabel htmlFor="confirmPassword">Confirmar contraseña</FieldLabel>
+            <Input
+              id="confirmPassword"
+              type="password"
+              placeholder="••••••••"
+              aria-invalid={Boolean(errors.confirmPassword)}
+              {...register('confirmPassword')}
+            />
+            <FieldError errors={[errors.confirmPassword]} />
+          </Field>
+
+          {submitError && <p className="text-sm text-destructive">{submitError}</p>}
+
+          <Button type="submit" className="w-full" disabled={!isValid || isSubmitting}>
+            {isSubmitting ? 'Creando cuenta...' : 'Crear cuenta'}
+          </Button>
+        </form>
+
+        <p className="mt-4 text-center text-sm text-muted-foreground">
+          ¿Ya tenés cuenta?{' '}
+          <Link to="/login" className="text-primary hover:underline">
+            Iniciar sesión
+          </Link>
+        </p>
+      </section>
+    </main>
+  );
+}
--- a/apps/frontend/src/lib/api-client.ts
+++ b/apps/frontend/src/lib/api-client.ts
@@ -1,10 +1,21 @@
 import { sentinelClient } from '@better-auth/infra/client';
+import { inferAdditionalFields } from 'better-auth/client/plugins';
 import { createAuthClient } from 'better-auth/react';
 import * as api from './api';

 const apiBaseUrl = api.apiBaseUrl;

-const plugins = [sentinelClient()];
+const plugins = [
+  sentinelClient(),
+  inferAdditionalFields({
+    user: {
+      phone: {
+        type: 'string',
+        required: false,
+      },
+    },
+  }),
+];

 export const authClient = createAuthClient({
  baseURL: apiBaseUrl,
@@ -32,7 +43,6 @@ export class ApiClientError extends Error {
 }

 export const apiClient = {
-  onboarding: api.onboarding,
  plans: api.plans,
  user: api.user,
  complexes: api.complexes,
@@ -42,6 +52,7 @@ export const apiClient = {
    getAvailability: api.getAvailability,
    create: api.createPublic,
    getConfirmation: api.getConfirmation,
+    cancelPublic: api.cancelPublic,
  },
  adminBookings: {
    listByComplex: api.listByComplex,
--- a/apps/frontend/src/lib/api/http.ts
+++ b/apps/frontend/src/lib/api/http.ts
@@ -10,14 +10,36 @@ export const http: AxiosInstance = axios.create({
 });

 function extractMessage(details: unknown, fallback: string): string {
-  if (
-    typeof details === 'object' &&
-    details &&
-    'message' in details &&
-    typeof details.message === 'string'
-  ) {
+  if (typeof details === 'object' && details) {
+    if ('message' in details && typeof details.message === 'string') {
      return details.message;
    }
+    if ('detail' in details && typeof details.detail === 'string') {
+      return details.detail;
+    }
+    if ('error' in details && typeof details.error === 'object' && details.error) {
+      const zodError = details.error as Record<string, unknown>;
+      if (Array.isArray(zodError.issues) && zodError.issues.length > 0) {
+        const firstIssue = zodError.issues[0] as { message?: string };
+        if (typeof firstIssue.message === 'string') return firstIssue.message;
+      }
+      if (typeof zodError.message === 'string') {
+        try {
+          const parsed = JSON.parse(zodError.message);
+          if (
+            Array.isArray(parsed) &&
+            parsed.length > 0 &&
+            typeof parsed[0]?.message === 'string'
+          ) {
+            return parsed[0].message;
+          }
+        } catch {
+          /* not JSON, use raw string */
+        }
+        return zodError.message;
+      }
+    }
+  }
  return fallback;
 }

--- a/apps/frontend/src/lib/api/index.ts
+++ b/apps/frontend/src/lib/api/index.ts
@@ -6,9 +6,9 @@ export * as courts from './resources/courts';
 export * as user from './resources/user';
 export * as sports from './resources/sports';
 export * as plans from './resources/plans';
-export * as onboarding from './resources/onboarding';

 export {
+  cancelPublic,
  getAvailability,
  createPublic,
  getConfirmation,
--- a/apps/frontend/src/lib/api/resources/bookings.ts
+++ b/apps/frontend/src/lib/api/resources/bookings.ts
@@ -1,5 +1,6 @@
 import type {
  AdminBooking,
+  CancelPublicBookingInput,
  CreateAdminBookingInput,
  CreatePublicBookingInput,
  PublicAvailabilityResponse,
@@ -51,6 +52,14 @@ export async function createAdmin(complexId: string, payload: CreateAdminBooking
  return response.data;
 }

+export async function cancelPublic(complexSlug: string, payload: CancelPublicBookingInput) {
+  const response = await http.post<PublicBooking>(
+    `/api/public-bookings/complex/${complexSlug}/cancel`,
+    payload
+  );
+  return response.data;
+}
+
 export async function updateStatus(bookingId: string, payload: UpdateAdminBookingStatusInput) {
  const response = await http.patch<AdminBooking>(
    `/api/admin-bookings/${bookingId}/status`,
--- a/apps/frontend/src/lib/api/resources/onboarding.ts
+++ b/apps/frontend/src/lib/api/resources/onboarding.ts
@@ -1,37 +0,0 @@
-import type {
-  OnboardingCompleteInput,
-  OnboardingCompleteResponse,
-  OnboardingResendOtpInput,
-  OnboardingResendOtpResponse,
-  OnboardingStartInput,
-  OnboardingStartResponse,
-  OnboardingVerifyOtpInput,
-  OnboardingVerifyOtpResponse,
-} from '@repo/api-contract';
-import { http } from '../http';
-
-export async function start(payload: OnboardingStartInput) {
-  const response = await http.post<OnboardingStartResponse>('/api/onboarding/start', payload);
-  return response.data;
-}
-
-export async function verifyOtp(payload: OnboardingVerifyOtpInput) {
-  const response = await http.post<OnboardingVerifyOtpResponse>(
-    '/api/onboarding/verify-otp',
-    payload
-  );
-  return response.data;
-}
-
-export async function resendOtp(payload: OnboardingResendOtpInput) {
-  const response = await http.post<OnboardingResendOtpResponse>(
-    '/api/onboarding/resend-otp',
-    payload
-  );
-  return response.data;
-}
-
-export async function complete(payload: OnboardingCompleteInput) {
-  const response = await http.post<OnboardingCompleteResponse>('/api/onboarding/complete', payload);
-  return response.data;
-}
--- a/apps/frontend/src/lib/api/resources/plans.ts
+++ b/apps/frontend/src/lib/api/resources/plans.ts
@@ -1,7 +1,7 @@
-import type { PlanSummary } from '@repo/api-contract';
+import type { PlanWithFeatures } from '@repo/api-contract';
 import { http } from '../http';

 export async function list() {
-  const response = await http.get<PlanSummary[]>('/api/plans');
+  const response = await http.get<PlanWithFeatures[]>('/api/plans');
  return response.data;
 }
--- a/apps/frontend/src/lib/auth.tsx
+++ b/apps/frontend/src/lib/auth.tsx
@@ -13,6 +13,7 @@ type SignUpParams = {
  email: string;
  password: string;
  fullName: string;
+  phone?: string;
 };

 type UpdateProfileParams = {
@@ -162,11 +163,12 @@ export function AuthProvider({ children }: PropsWithChildren) {
          throw error;
        }
      },
-      signUp: async ({ email, password, fullName }) => {
+      signUp: async ({ email, password, fullName, phone }) => {
        const { data: signUpData, error } = await authClient.signUp.email({
          email,
          password,
          name: fullName,
+          phone,
        });

        if (error) {
--- a/apps/frontend/src/main.tsx
+++ b/apps/frontend/src/main.tsx
@@ -6,21 +6,32 @@ import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { RouterProvider } from '@tanstack/react-router';
 import { TanStackRouterDevtools } from '@tanstack/router-devtools';
-import { StrictMode, useEffect } from 'react';
+import { StrictMode, useEffect, useRef } from 'react';
 import { createRoot } from 'react-dom/client';
 import { router } from './router';
 import './index.css';

 function AppRouter() {
  const auth = useAuth();
+  const prevAuthRef = useRef(auth);
+
+  if (auth !== prevAuthRef.current) {
+    prevAuthRef.current = auth;
+    router.update({ context: { auth, api: apiClient } });
+  }

  useEffect(() => {
+    router.update({ context: { auth, api: apiClient } });
    router.invalidate();
  }, [auth.isAuthenticated, auth.loading, auth.user]);

  useEffect(() => {
    configureApiClient({
-      onForbidden: async () => {
+      onForbidden: async (error) => {
+        if (error.message?.includes('verificar tu email')) {
+          return;
+        }
+
        if (!auth.isAuthenticated) {
          return;
        }
--- a/apps/frontend/src/routeTree.gen.ts
+++ b/apps/frontend/src/routeTree.gen.ts
@@ -9,6 +9,7 @@
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

 import { Route as rootRouteImport } from './routes/__root'
+import { Route as SignupRouteImport } from './routes/signup'
 import { Route as SelectComplexRouteImport } from './routes/select-complex'
 import { Route as ResetPasswordRouteImport } from './routes/reset-password'
 import { Route as OnboardRouteImport } from './routes/onboard'
@@ -16,11 +17,7 @@ import { Route as LoginRouteImport } from './routes/login'
 import { Route as InviteRouteImport } from './routes/invite'
 import { Route as AuthCallbackRouteImport } from './routes/auth-callback'
 import { Route as AppRouteRouteImport } from './routes/_app/route'
-import { Route as OnboardIndexRouteImport } from './routes/onboard/index'
-import { Route as OnboardVerifyEmailRouteImport } from './routes/onboard/verify-email'
-import { Route as OnboardVerifyRouteImport } from './routes/onboard/verify'
-import { Route as OnboardCreateComplexRouteImport } from './routes/onboard/create-complex'
-import { Route as OnboardCompleteRouteImport } from './routes/onboard/complete'
+import { Route as OnboardSetupRouteImport } from './routes/onboard/setup'
 import { Route as AppProfileRouteImport } from './routes/_app/profile'
 import { Route as ComplexSlugBookingRouteImport } from './routes/$complexSlug/booking'
 import { Route as AppAuthenticatedRouteRouteImport } from './routes/_app/_authenticated/route'
@@ -29,6 +26,11 @@ import { Route as ComplexSlugBookingIndexRouteImport } from './routes/$complexSl
 import { Route as ComplexSlugBookingConfirmedBookingCodeRouteImport } from './routes/$complexSlug/booking/confirmed/$bookingCode'
 import { Route as AppAuthenticatedComplexSlugEditRouteImport } from './routes/_app/_authenticated/complex/$slug/edit'

+const SignupRoute = SignupRouteImport.update({
+  id: '/signup',
+  path: '/signup',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const SelectComplexRoute = SelectComplexRouteImport.update({
  id: '/select-complex',
  path: '/select-complex',
@@ -63,29 +65,9 @@ const AppRouteRoute = AppRouteRouteImport.update({
  id: '/_app',
  getParentRoute: () => rootRouteImport,
 } as any)
-const OnboardIndexRoute = OnboardIndexRouteImport.update({
-  id: '/',
-  path: '/',
-  getParentRoute: () => OnboardRoute,
-} as any)
-const OnboardVerifyEmailRoute = OnboardVerifyEmailRouteImport.update({
-  id: '/verify-email',
-  path: '/verify-email',
-  getParentRoute: () => OnboardRoute,
-} as any)
-const OnboardVerifyRoute = OnboardVerifyRouteImport.update({
-  id: '/verify',
-  path: '/verify',
-  getParentRoute: () => OnboardRoute,
-} as any)
-const OnboardCreateComplexRoute = OnboardCreateComplexRouteImport.update({
-  id: '/create-complex',
-  path: '/create-complex',
-  getParentRoute: () => OnboardRoute,
-} as any)
-const OnboardCompleteRoute = OnboardCompleteRouteImport.update({
-  id: '/complete',
-  path: '/complete',
+const OnboardSetupRoute = OnboardSetupRouteImport.update({
+  id: '/setup',
+  path: '/setup',
  getParentRoute: () => OnboardRoute,
 } as any)
 const AppProfileRoute = AppProfileRouteImport.update({
@@ -133,13 +115,10 @@ export interface FileRoutesByFullPath {
  '/onboard': typeof OnboardRouteWithChildren
  '/reset-password': typeof ResetPasswordRoute
  '/select-complex': typeof SelectComplexRoute
+  '/signup': typeof SignupRoute
  '/$complexSlug/booking': typeof ComplexSlugBookingRouteWithChildren
  '/profile': typeof AppProfileRoute
-  '/onboard/complete': typeof OnboardCompleteRoute
-  '/onboard/create-complex': typeof OnboardCreateComplexRoute
-  '/onboard/verify': typeof OnboardVerifyRoute
-  '/onboard/verify-email': typeof OnboardVerifyEmailRoute
-  '/onboard/': typeof OnboardIndexRoute
+  '/onboard/setup': typeof OnboardSetupRoute
  '/$complexSlug/booking/': typeof ComplexSlugBookingIndexRoute
  '/$complexSlug/booking/confirmed/$bookingCode': typeof ComplexSlugBookingConfirmedBookingCodeRoute
  '/complex/$slug/edit': typeof AppAuthenticatedComplexSlugEditRoute
@@ -149,14 +128,12 @@ export interface FileRoutesByTo {
  '/auth-callback': typeof AuthCallbackRoute
  '/invite': typeof InviteRoute
  '/login': typeof LoginRoute
+  '/onboard': typeof OnboardRouteWithChildren
  '/reset-password': typeof ResetPasswordRoute
  '/select-complex': typeof SelectComplexRoute
+  '/signup': typeof SignupRoute
  '/profile': typeof AppProfileRoute
-  '/onboard/complete': typeof OnboardCompleteRoute
-  '/onboard/create-complex': typeof OnboardCreateComplexRoute
-  '/onboard/verify': typeof OnboardVerifyRoute
-  '/onboard/verify-email': typeof OnboardVerifyEmailRoute
-  '/onboard': typeof OnboardIndexRoute
+  '/onboard/setup': typeof OnboardSetupRoute
  '/$complexSlug/booking': typeof ComplexSlugBookingIndexRoute
  '/$complexSlug/booking/confirmed/$bookingCode': typeof ComplexSlugBookingConfirmedBookingCodeRoute
  '/complex/$slug/edit': typeof AppAuthenticatedComplexSlugEditRoute
@@ -170,14 +147,11 @@ export interface FileRoutesById {
  '/onboard': typeof OnboardRouteWithChildren
  '/reset-password': typeof ResetPasswordRoute
  '/select-complex': typeof SelectComplexRoute
+  '/signup': typeof SignupRoute
  '/_app/_authenticated': typeof AppAuthenticatedRouteRouteWithChildren
  '/$complexSlug/booking': typeof ComplexSlugBookingRouteWithChildren
  '/_app/profile': typeof AppProfileRoute
-  '/onboard/complete': typeof OnboardCompleteRoute
-  '/onboard/create-complex': typeof OnboardCreateComplexRoute
-  '/onboard/verify': typeof OnboardVerifyRoute
-  '/onboard/verify-email': typeof OnboardVerifyEmailRoute
-  '/onboard/': typeof OnboardIndexRoute
+  '/onboard/setup': typeof OnboardSetupRoute
  '/$complexSlug/booking/': typeof ComplexSlugBookingIndexRoute
  '/_app/_authenticated/': typeof AppAuthenticatedIndexRoute
  '/$complexSlug/booking/confirmed/$bookingCode': typeof ComplexSlugBookingConfirmedBookingCodeRoute
@@ -193,13 +167,10 @@ export interface FileRouteTypes {
    | '/onboard'
    | '/reset-password'
    | '/select-complex'
+    | '/signup'
    | '/$complexSlug/booking'
    | '/profile'
-    | '/onboard/complete'
-    | '/onboard/create-complex'
-    | '/onboard/verify'
-    | '/onboard/verify-email'
-    | '/onboard/'
+    | '/onboard/setup'
    | '/$complexSlug/booking/'
    | '/$complexSlug/booking/confirmed/$bookingCode'
    | '/complex/$slug/edit'
@@ -209,14 +180,12 @@ export interface FileRouteTypes {
    | '/auth-callback'
    | '/invite'
    | '/login'
+    | '/onboard'
    | '/reset-password'
    | '/select-complex'
+    | '/signup'
    | '/profile'
-    | '/onboard/complete'
-    | '/onboard/create-complex'
-    | '/onboard/verify'
-    | '/onboard/verify-email'
-    | '/onboard'
+    | '/onboard/setup'
    | '/$complexSlug/booking'
    | '/$complexSlug/booking/confirmed/$bookingCode'
    | '/complex/$slug/edit'
@@ -229,14 +198,11 @@ export interface FileRouteTypes {
    | '/onboard'
    | '/reset-password'
    | '/select-complex'
+    | '/signup'
    | '/_app/_authenticated'
    | '/$complexSlug/booking'
    | '/_app/profile'
-    | '/onboard/complete'
-    | '/onboard/create-complex'
-    | '/onboard/verify'
-    | '/onboard/verify-email'
-    | '/onboard/'
+    | '/onboard/setup'
    | '/$complexSlug/booking/'
    | '/_app/_authenticated/'
    | '/$complexSlug/booking/confirmed/$bookingCode'
@@ -251,11 +217,19 @@ export interface RootRouteChildren {
  OnboardRoute: typeof OnboardRouteWithChildren
  ResetPasswordRoute: typeof ResetPasswordRoute
  SelectComplexRoute: typeof SelectComplexRoute
+  SignupRoute: typeof SignupRoute
  ComplexSlugBookingRoute: typeof ComplexSlugBookingRouteWithChildren
 }

 declare module '@tanstack/react-router' {
  interface FileRoutesByPath {
+    '/signup': {
+      id: '/signup'
+      path: '/signup'
+      fullPath: '/signup'
+      preLoaderRoute: typeof SignupRouteImport
+      parentRoute: typeof rootRouteImport
+    }
    '/select-complex': {
      id: '/select-complex'
      path: '/select-complex'
@@ -305,39 +279,11 @@ declare module '@tanstack/react-router' {
      preLoaderRoute: typeof AppRouteRouteImport
      parentRoute: typeof rootRouteImport
    }
-    '/onboard/': {
-      id: '/onboard/'
-      path: '/'
-      fullPath: '/onboard/'
-      preLoaderRoute: typeof OnboardIndexRouteImport
-      parentRoute: typeof OnboardRoute
-    }
-    '/onboard/verify-email': {
-      id: '/onboard/verify-email'
-      path: '/verify-email'
-      fullPath: '/onboard/verify-email'
-      preLoaderRoute: typeof OnboardVerifyEmailRouteImport
-      parentRoute: typeof OnboardRoute
-    }
-    '/onboard/verify': {
-      id: '/onboard/verify'
-      path: '/verify'
-      fullPath: '/onboard/verify'
-      preLoaderRoute: typeof OnboardVerifyRouteImport
-      parentRoute: typeof OnboardRoute
-    }
-    '/onboard/create-complex': {
-      id: '/onboard/create-complex'
-      path: '/create-complex'
-      fullPath: '/onboard/create-complex'
-      preLoaderRoute: typeof OnboardCreateComplexRouteImport
-      parentRoute: typeof OnboardRoute
-    }
-    '/onboard/complete': {
-      id: '/onboard/complete'
-      path: '/complete'
-      fullPath: '/onboard/complete'
-      preLoaderRoute: typeof OnboardCompleteRouteImport
+    '/onboard/setup': {
+      id: '/onboard/setup'
+      path: '/setup'
+      fullPath: '/onboard/setup'
+      preLoaderRoute: typeof OnboardSetupRouteImport
      parentRoute: typeof OnboardRoute
    }
    '/_app/profile': {
@@ -422,19 +368,11 @@ const AppRouteRouteWithChildren = AppRouteRoute._addFileChildren(
 )

 interface OnboardRouteChildren {
-  OnboardCompleteRoute: typeof OnboardCompleteRoute
-  OnboardCreateComplexRoute: typeof OnboardCreateComplexRoute
-  OnboardVerifyRoute: typeof OnboardVerifyRoute
-  OnboardVerifyEmailRoute: typeof OnboardVerifyEmailRoute
-  OnboardIndexRoute: typeof OnboardIndexRoute
+  OnboardSetupRoute: typeof OnboardSetupRoute
 }

 const OnboardRouteChildren: OnboardRouteChildren = {
-  OnboardCompleteRoute: OnboardCompleteRoute,
-  OnboardCreateComplexRoute: OnboardCreateComplexRoute,
-  OnboardVerifyRoute: OnboardVerifyRoute,
-  OnboardVerifyEmailRoute: OnboardVerifyEmailRoute,
-  OnboardIndexRoute: OnboardIndexRoute,
+  OnboardSetupRoute: OnboardSetupRoute,
 }

 const OnboardRouteWithChildren =
@@ -462,6 +400,7 @@ const rootRouteChildren: RootRouteChildren = {
  OnboardRoute: OnboardRouteWithChildren,
  ResetPasswordRoute: ResetPasswordRoute,
  SelectComplexRoute: SelectComplexRoute,
+  SignupRoute: SignupRoute,
  ComplexSlugBookingRoute: ComplexSlugBookingRouteWithChildren,
 }
 export const routeTree = rootRouteImport
--- a/apps/frontend/src/routes/$complexSlug/booking/confirmed/$bookingCode.tsx
+++ b/apps/frontend/src/routes/$complexSlug/booking/confirmed/$bookingCode.tsx
@@ -1,11 +1,15 @@
-import { PublicBookingConfirmationPage } from '@/features/public-booking/public-booking-confirmation-page';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, lazyRouteComponent } from '@tanstack/react-router';
+
+const PublicBookingConfirmationPage = lazyRouteComponent(
+  () => import('@/features/public-booking/public-booking-confirmation-page'),
+  'PublicBookingConfirmationPage'
+);

 export const Route = createFileRoute('/$complexSlug/booking/confirmed/$bookingCode')({
-  component: PublicBookingConfirmationRouteComponent,
+  component: RouteComponent,
 });

-function PublicBookingConfirmationRouteComponent() {
+function RouteComponent() {
  const { complexSlug, bookingCode } = Route.useParams();

  return <PublicBookingConfirmationPage complexSlug={complexSlug} bookingCode={bookingCode} />;
--- a/apps/frontend/src/routes/$complexSlug/booking/index.tsx
+++ b/apps/frontend/src/routes/$complexSlug/booking/index.tsx
@@ -1,11 +1,15 @@
-import { PublicBookingPage } from '@/features/public-booking/public-booking-page';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, lazyRouteComponent } from '@tanstack/react-router';
+
+const PublicBookingPage = lazyRouteComponent(
+  () => import('@/features/public-booking/public-booking-page'),
+  'PublicBookingPage'
+);

 export const Route = createFileRoute('/$complexSlug/booking/')({
-  component: PublicBookingIndexRouteComponent,
+  component: RouteComponent,
 });

-function PublicBookingIndexRouteComponent() {
+function RouteComponent() {
  const { complexSlug } = Route.useParams();

  return <PublicBookingPage complexSlug={complexSlug} />;
--- a/apps/frontend/src/routes/__root.tsx
+++ b/apps/frontend/src/routes/__root.tsx
@@ -18,7 +18,7 @@ export const Route = createRootRouteWithContext<RouterContext>()({
 });

 const AUTH_PAGE_REGEX =
-  /^\/(login|select-complex|reset-password|onboard|invite|auth-callback)(?:\/|$)/;
+  /^\/(login|signup|select-complex|reset-password|onboard|invite|auth-callback)(?:\/|$)/;

 function RootRoute() {
  const location = useLocation();
--- a/apps/frontend/src/routes/_app/_authenticated/complex/$slug/edit.tsx
+++ b/apps/frontend/src/routes/_app/_authenticated/complex/$slug/edit.tsx
@@ -1,5 +1,9 @@
-import { ComplexSettingsPage } from '@/features/complex/complex-settings-page';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, lazyRouteComponent } from '@tanstack/react-router';
+
+const ComplexSettingsPage = lazyRouteComponent(
+  () => import('@/features/complex/complex-settings-page'),
+  'ComplexSettingsPage'
+);

 export const Route = createFileRoute('/_app/_authenticated/complex/$slug/edit')({
  component: RouteComponent,
--- a/apps/frontend/src/routes/_app/profile.tsx
+++ b/apps/frontend/src/routes/_app/profile.tsx
@@ -1,5 +1,9 @@
-import { ProfilePage } from '@/features/profile/profile-page';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, lazyRouteComponent } from '@tanstack/react-router';
+
+const ProfilePage = lazyRouteComponent(
+  () => import('@/features/profile/profile-page'),
+  'ProfilePage'
+);

 export const Route = createFileRoute('/_app/profile')({
  component: ProfilePage,
--- a/apps/frontend/src/routes/auth-callback.tsx
+++ b/apps/frontend/src/routes/auth-callback.tsx
@@ -17,23 +17,9 @@ function AuthCallbackPage() {

      try {
        await acceptStoredPendingInvite(apiClient.complexes.acceptPendingInvitations);
-        const complexes = await apiClient.complexes.listMine();
-
-        if (complexes.length === 1) {
-          await apiClient.complexes.select({ complexId: complexes[0].id });
        navigate({ to: '/' });
-        } else if (complexes.length > 1) {
-          const current = await apiClient.complexes.getCurrent();
-          if (current) {
-            navigate({ to: '/' });
-          } else {
-            navigate({ to: '/select-complex' });
-          }
-        } else {
-          navigate({ to: '/onboard/create-complex' });
-        }
      } catch {
-        navigate({ to: '/onboard' });
+        navigate({ to: '/login' });
      }
    }

--- a/apps/frontend/src/routes/invite.tsx
+++ b/apps/frontend/src/routes/invite.tsx
@@ -1,4 +1,3 @@
-import { OnboardLoginPage } from '@/features/onboard/onboard-login-page';
 import { apiClient } from '@/lib/api-client';
 import { useAuth } from '@/lib/auth';
 import { acceptStoredPendingInvite, setPendingInvite } from '@/lib/invitations';
@@ -25,6 +24,7 @@ function InvitePage() {

  useEffect(() => {
    if (!isAuthenticated) {
+      navigate({ to: '/login' });
      return;
    }

@@ -34,15 +34,11 @@ function InvitePage() {
    })();
  }, [isAuthenticated, navigate]);

-  if (isAuthenticated) {
  return (
    <main className="flex min-h-screen w-full items-center justify-center px-3 sm:px-6">
      <p className="text-sm text-muted-foreground">Aceptando invitación...</p>
    </main>
  );
-  }
-
-  return <OnboardLoginPage variant="invite" inviteEmail={search.email ?? null} />;
 }

 export const Route = createFileRoute('/invite')({
--- a/apps/frontend/src/routes/login.tsx
+++ b/apps/frontend/src/routes/login.tsx
@@ -1,22 +1,11 @@
 import { LoginPage } from '@/features/login/login-page';
 import { createFileRoute, redirect } from '@tanstack/react-router';
-import { z } from 'zod';
-
-const loginSearchSchema = z.object({
-  redirect: z.string().optional(),
-});

 export const Route = createFileRoute('/login')({
-  validateSearch: loginSearchSchema,
  beforeLoad: ({ context }) => {
    if (context.auth.isAuthenticated) {
      throw redirect({ to: '/' });
    }
  },
-  component: LoginRouteComponent,
+  component: LoginPage,
 });
-
-function LoginRouteComponent() {
-  const search = Route.useSearch();
-  return <LoginPage redirectTo={search.redirect} />;
-}
--- a/apps/frontend/src/routes/onboard/complete.tsx
+++ b/apps/frontend/src/routes/onboard/complete.tsx
@@ -1,6 +0,0 @@
-import { OnboardCompletePage } from '@/features/onboard/onboard-complete-page';
-import { createFileRoute } from '@tanstack/react-router';
-
-export const Route = createFileRoute('/onboard/complete')({
-  component: OnboardCompletePage,
-});
--- a/apps/frontend/src/routes/onboard/create-complex.tsx
+++ b/apps/frontend/src/routes/onboard/create-complex.tsx
@@ -1,14 +0,0 @@
-import { CreateComplexPage } from '@/features/onboard/create-complex-page';
-import { createFileRoute, redirect } from '@tanstack/react-router';
-
-export const Route = createFileRoute('/onboard/create-complex')({
-  beforeLoad: ({ context }) => {
-    const hasSession = context.auth.isAuthenticated;
-    const hasPendingSignup = Boolean(sessionStorage.getItem('pending-signup-email'));
-
-    if (!hasSession && !hasPendingSignup) {
-      throw redirect({ to: '/onboard' });
-    }
-  },
-  component: CreateComplexPage,
-});
--- a/apps/frontend/src/routes/onboard/index.tsx
+++ b/apps/frontend/src/routes/onboard/index.tsx
@@ -1,11 +0,0 @@
-import { OnboardLoginPage } from '@/features/onboard/onboard-login-page';
-import { createFileRoute, redirect } from '@tanstack/react-router';
-
-export const Route = createFileRoute('/onboard/')({
-  beforeLoad: ({ context }) => {
-    if (!context.auth.isAuthenticated) {
-      throw redirect({ to: '/login', search: { redirect: '/onboard/create-complex' } });
-    }
-  },
-  component: OnboardLoginPage,
-});
--- a/apps/frontend/src/routes/onboard/setup.tsx
+++ b/apps/frontend/src/routes/onboard/setup.tsx
@@ -0,0 +1,18 @@
+import { createFileRoute, lazyRouteComponent, redirect } from '@tanstack/react-router';
+
+const SetupStepperPage = lazyRouteComponent(
+  () => import('@/features/onboard/setup-stepper-page'),
+  'SetupStepperPage'
+);
+
+export const Route = createFileRoute('/onboard/setup')({
+  beforeLoad: ({ context }) => {
+    const hasSession = context.auth.isAuthenticated;
+    const hasPendingSignup = Boolean(sessionStorage.getItem('pending-signup-email'));
+
+    if (!hasSession && !hasPendingSignup) {
+      throw redirect({ to: '/login' });
+    }
+  },
+  component: SetupStepperPage,
+});
--- a/apps/frontend/src/routes/onboard/verify-email.tsx
+++ b/apps/frontend/src/routes/onboard/verify-email.tsx
@@ -1,18 +0,0 @@
-import { VerifyEmailPage } from '@/features/onboard/verify-email-page';
-import { createFileRoute, redirect } from '@tanstack/react-router';
-import { z } from 'zod';
-
-const verifyEmailSearchSchema = z.object({
-  email: z.string().email().optional(),
-});
-
-export const Route = createFileRoute('/onboard/verify-email')({
-  validateSearch: verifyEmailSearchSchema,
-  beforeLoad: () => {
-    const hasPendingSignup = Boolean(sessionStorage.getItem('pending-signup-email'));
-    if (!hasPendingSignup) {
-      throw redirect({ to: '/onboard' });
-    }
-  },
-  component: VerifyEmailPage,
-});
--- a/apps/frontend/src/routes/onboard/verify.tsx
+++ b/apps/frontend/src/routes/onboard/verify.tsx
@@ -1,6 +0,0 @@
-import { OnboardVerifyPage } from '@/features/onboard/onboard-verify-page';
-import { createFileRoute } from '@tanstack/react-router';
-
-export const Route = createFileRoute('/onboard/verify')({
-  component: OnboardVerifyPage,
-});
--- a/apps/frontend/src/routes/signup.tsx
+++ b/apps/frontend/src/routes/signup.tsx
@@ -0,0 +1,11 @@
+import { SignupPage } from '@/features/signup/signup-page';
+import { createFileRoute, redirect } from '@tanstack/react-router';
+
+export const Route = createFileRoute('/signup')({
+  beforeLoad: ({ context }) => {
+    if (context.auth.isAuthenticated) {
+      throw redirect({ to: '/' });
+    }
+  },
+  component: SignupPage,
+});
--- a/bunfig.toml
+++ b/bunfig.toml
@@ -0,0 +1,2 @@
+[test]
+preload = ["./apps/backend/test/support/prisma.mock.ts"]
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,4 +3,5 @@ set -e
 cd /app/apps/backend
 bun prisma migrate deploy
 bun prisma generate
+bun prisma/seed.ts
 bun run start
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jose Selesan	260d79fc99	feat: implement public booking cancellation feature - Added cancelPublicBooking handler to manage booking cancellations. - Updated public booking service to include cancellation logic. - Created cancelPublicBooking schema for input validation. - Modified public booking confirmation page to allow users to cancel their bookings. - Enhanced email service to send cancellation confirmation emails. - Made customerEmail field required in booking schemas and updated related components. - Updated API client to support cancellation requests. - Added migration to enforce non-nullable customer_email fields in the database.	2026-06-05 11:24:02 -03:00
Jose Selesan	1210854c22	feat(booking-ui): add confirmation dialog for cancelling bookings and improve mobile UI	2026-06-04 16:39:45 -03:00
Jose Selesan	7ca784d5f5	feat(booking-ui): conditionally render action buttons based on booking status	2026-06-04 16:33:51 -03:00
Jose Selesan	e441f15ee4	feat(complex-selection): enhance auto-selection logic and error handling for complex selection	2026-06-04 14:06:23 -03:00
Jose Selesan	228004a7e0	feat(emails): update email layout padding and remove min-height for improved design consistency	2026-06-03 10:57:23 -03:00
jselesan	b20b5c2b8b	Merge pull request 'feat/improve-emails' (#8 ) from feat/improve-emails into development Reviewed-on: #8	2026-06-03 13:44:12 +00:00
Jose Selesan	457accfbfa	feat(emails): add standardized email templates and layout guidelines	2026-06-03 10:43:17 -03:00
Jose Selesan	43287a4baa	feat(emails): integrate email verification layout into auth email sending process	2026-06-03 10:41:56 -03:00
Jose Selesan	93fea8ecad	feat(emails): enhance booking cancellation and no-show email templates with improved layout and styling	2026-06-03 10:37:07 -03:00
Jose Selesan	ba7b0322ff	Refactor code structure for improved readability and maintainability	2026-06-03 10:31:01 -03:00
Jose Selesan	473686528e	feat(tests): update test configurations and improve mocking setup	2026-06-03 09:35:04 -03:00
jselesan	c1b47674c8	Merge pull request 'feat: add customer email functionality for booking confirmations' (#7 ) from feat/email-booking-confirmation into development Reviewed-on: #7	2026-06-02 22:21:39 +00:00
Jose Selesan	85f234b05e	feat: add customer email functionality for booking confirmations - Implemented email confirmation for admin and public bookings. - Added customerEmail field to booking schemas and services. - Created email templates for booking confirmation, cancellation, and no-show notifications. - Updated booking handlers to send emails upon booking creation and status updates. - Enhanced frontend forms to capture customer email during booking creation.	2026-06-02 19:21:04 -03:00
jselesan	50fa4ed9a5	Merge pull request 'feat/improve-public-booking' (#6 ) from feat/improve-public-booking into development Reviewed-on: #6	2026-06-02 19:56:28 +00:00
Jose Selesan	07496e6673	feat(public-booking): enhance booking confirmation with price and address details	2026-06-02 16:55:47 -03:00
Jose Selesan	9045a8c017	feat(public-booking): add pricing logic to booking slots and update schemas	2026-06-02 16:37:11 -03:00
Jose Selesan	3e314a9b9a	feat(public-booking): refactor court selection and available slots components for improved usability	2026-06-02 16:26:47 -03:00
jselesan	bc4716c48f	Merge pull request 'feat(email-validation): implement email verification checks for booking creation and resend functionality' (#5 ) from feat/require-email-validation into development Reviewed-on: #5	2026-06-02 19:07:50 +00:00
Jose Selesan	0e69759549	feat(email-validation): implement email verification checks for booking creation and resend functionality	2026-06-02 15:47:36 -03:00
Jose Selesan	88ea7e70da	feat(entrypoint): add database seeding step to entrypoint script	2026-06-02 11:05:13 -03:00
Jose Selesan	7a30f9a29b	refactor(routes): convert route components to lazy-loaded for improved performance	2026-06-02 10:55:55 -03:00
jselesan	83fa1ea020	Merge pull request 'feat/onboard-redesign' (#4 ) from feat/onboard-redesign into development Reviewed-on: #4	2026-06-02 13:03:43 +00:00
Jose Selesan	4544911f0e	refactor(onboarding): restructure onboarding routes and components - Removed obsolete onboarding routes: complete, create-complex, index, verify-email, and verify. - Introduced new setup stepper page for onboarding process. - Created a multi-step setup component to handle complex creation with validation. - Added new schemas for complex creation and plan features. - Implemented detailed steps for complex name, location, plan selection, and court setup. - Enhanced error handling and user feedback during the onboarding process.	2026-06-02 10:02:28 -03:00
Jose Selesan	2aaa91444d	feat: add phone field to User model and update authentication flow - Added phone field to User model in Prisma schema and generated types. - Updated backend authentication to include phone as an additional field. - Implemented phone input in the signup form with validation. - Created a new SignupPage component for user registration. - Updated routing to include signup path and redirect authenticated users. - Modified login page to reference Playzer and added link to signup.	2026-06-01 16:43:52 -03:00