Merge pull request 'promote: dev → uat (Renovate config, GRO-1081)' (#11) from dev into uat

promote: dev → uat (Renovate config, GRO-1081)

Merge PR #11: dev → uat promotion
Includes: chore: add Renovate config (GRO-1081)

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main, dev, uat]
+    branches: [main, dev]
   pull_request:
-    branches: [main, dev, uat]
+    branches: [main, dev]
   workflow_dispatch:
     inputs:
       ref:
@@ -78,8 +78,6 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
 
       - name: Log in to Gitea Container Registry
         uses: docker/login-action@v3
@@ -94,7 +92,6 @@ jobs:
           context: .
           file: Dockerfile
           push: true
-          provenance: false
           tags: |
             git.farh.net/groombook/web:${{ steps.version.outputs.tag }}
             ${{ github.ref == 'refs/heads/main' && 'git.farh.net/groombook/web:latest' || '' }}

Dockerfile

@@ -18,4 +18,4 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/dist /usr/share/nginx/html
 EXPOSE 80
 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-  CMD wget --spider -q http://localhost:80/ || exit 1
+  CMD curl -f http://localhost:80/ || exit 1

UAT_PLAYBOOK.md

@@ -69,7 +69,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-AUTH-5.3.1 | Auth client falls back to window.location.origin | Do not set `VITE_API_URL`, load app | Auth client uses `window.location.origin` as base URL |
 | TC-AUTH-5.3.2 | Sign-in on localhost | Load app without `VITE_API_URL` on localhost:3000 | Auth client uses `http://localhost:3000` as base URL |
 | TC-AUTH-5.3.3 | Sign-in on dev environment | Load app without `VITE_API_URL` on `https://dev.groombook.dev` | Auth client uses `https://dev.groombook.dev` as base URL |
-| TC-AUTH-5.3.4 | SSO cookie set after Authentik callback (GRO-1592) | Complete Authentik SSO login on UAT without `VITE_API_URL` set | `__Secure-better-auth.session_token` cookie is present in browser; subsequent `/api/*` calls include the cookie and return 200 |
 
 ### 5.4 Session Persistence
 
@@ -78,26 +77,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-AUTH-5.4.1 | Session persists across page reload | Sign in, reload page | Session remains active |
 | TC-AUTH-5.4.2 | Session clears on sign-out | Sign in, sign out | User is logged out, redirected to login |
 
-### 5.4.1 SSO Login Journey (Authentik OIDC end-to-end)
-
-| # | Scenario | Steps | Pass Criteria | Fail Criteria |
-|---|----------|-------|---------------|---------------|
-| TC-WEB-SSO-1 | Sign-in page shows SSO button | Navigate to app root URL | Sign-in page displayed with "Sign in with SSO" button visible | No SSO button, 403 before page loads |
-| TC-WEB-SSO-2 | Click SSO redirects to Authentik | Click "Sign in with SSO" button | Browser redirected to Authentik login at auth.farh.net | No redirect, error shown, button does nothing |
-| TC-WEB-SSO-3 | Valid OIDC credentials authenticate | At Authentik, enter valid credentials and authenticate | Redirected back to app with active session | Redirect loop, 403, session not established |
-| TC-WEB-SSO-4 | Post-login dashboard accessible | After SSO flow completes, dashboard loads | Dashboard displays correctly with user identity shown | Blank page, 403, session not active |
-| TC-WEB-SSO-5 | User identity displayed correctly | After SSO login, check header/nav | User name/email/initials shown in nav, role reflected in UI | No user indicator, wrong user shown |
-
-### 5.4.2 OOBE Flow Post-Login
-
-| # | Scenario | Steps | Pass Criteria | Fail Criteria |
-|---|----------|-------|---------------|---------------|
-| TC-WEB-OOBE-1 | Fresh DB shows setup wizard | On fresh DB (no super user), navigate to app | Setup wizard / OOBE screen displayed | Regular login page shown instead of setup |
-| TC-WEB-OOBE-2 | Configure OIDC via setup | During OOBE, configure OIDC auth provider via /api/setup/auth-provider | OIDC configured successfully, no 403 | 403 during setup, config rejected |
-| TC-WEB-OOBE-3 | Setup completes and redirects | Complete OOBE setup with business name | Redirected to app dashboard as super user, setup bypassed on reload | Setup errors, wrong redirect, setup reappears |
-| TC-WEB-OOBE-4 | Admin panel accessible after setup | After completing OOBE, navigate to admin panel | Admin features accessible | 403 on admin panel, insufficient permissions |
-| TC-WEB-OOBE-5 | SSO login during OOBE does not interfere | During fresh OOBE, attempt SSO login before completing setup | SSO login redirected appropriately, setup can still complete | Auto-provision creates staff prematurely, setup flow broken |
-
 ### 5.5 Dashboard
 
 | # | Scenario | Steps | Expected |
@@ -124,20 +103,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-WEB-5.7.2 | Add pet | Click "Add Pet", fill form, submit | Pet created and linked to client |
 | TC-WEB-5.7.3 | Edit pet details | Click on pet, modify details, save | Pet updated successfully |
 | TC-WEB-5.7.4 | Grooming history view | View pet profile | Past appointments/grooming sessions displayed |
-| TC-WEB-5.7.5 | Add pet with size/coat | Create pet with Size Category and Coat Type filled | Size and coat type persisted, visible on pet profile |
-| TC-WEB-5.7.6 | Edit pet size/coat | Edit existing pet, change size/coat dropdowns | Updated values saved to pet record |
-| TC-WEB-5.7.7 | Size/coat optional | Create pet without selecting size or coat | Pet created successfully, fields remain unset |
-
-### 5.8.1 Buffer Rules Management UI (GRO-1173)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.8.2 | Buffer rules section visible | Navigate to Settings | "Buffer Rules" section shown with description |
-| TC-WEB-5.8.3 | Create buffer rule | Click "+ Add Rule", select service and buffer minutes, submit | Rule appears in list, matches service/size/coat |
-| TC-WEB-5.8.4 | Edit buffer minutes inline | Click Edit on a rule, change minutes, click Save | New buffer value reflected in list |
-| TC-WEB-5.8.5 | Delete buffer rule | Click Delete, confirm | Rule removed from list |
-| TC-WEB-5.8.6 | Create rule with size/coat | Create rule with Size Category or Coat Type specified | Rule shows size/coat tags in list |
-| TC-WEB-5.8.7 | Empty state | Navigate to Settings with no rules | "No buffer rules configured yet" message shown |
 
 ### 5.8 Appointment Scheduling UI
 
@@ -156,8 +121,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-WEB-5.9.1 | Service catalog loads | Navigate to Services | List of available services displayed |
 | TC-WEB-5.9.2 | Create service | Click "New Service", fill form, submit | Service created successfully |
 | TC-WEB-5.9.3 | Edit service | Click on service, modify details, save | Service updated successfully |
-| TC-WEB-5.9.4 | Create service with default buffer | Create service with "Default buffer time" filled | Buffer shown in service list and form after save |
-| TC-WEB-5.9.5 | Edit service buffer | Open existing service, change default buffer minutes | Updated value persisted after save |
 
 ### 5.10 Staff Management UI
 
@@ -253,77 +216,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-WEB-5.19.8 | Form reset clears size/coat | Complete booking, click "Book another" | Size and coat fields reset to empty |
 | TC-WEB-5.19.9 | New pet record has size/coat | Complete booking, view created pet in admin | Pet record shows selected size and coat type |
 
-### 5.20 Buffer Rules Management — Admin UI (GRO-1173)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.20.1 | Buffer rules section loads | Navigate to Settings page (admin) | "Buffer Rules" section visible with "+ Add Rule" button |
-| TC-WEB-5.20.2 | Add rule — required fields only | Click "+ Add Rule", select a service, enter buffer minutes, submit | Rule created, appears in list below |
-| TC-WEB-5.20.3 | Add rule — with size category | Add rule, select service + size category + buffer minutes | Rule created with size tag shown in list |
-| TC-WEB-5.20.4 | Add rule — with coat type | Add rule, select service + coat type + buffer minutes | Rule created with coat tag shown in list |
-| TC-WEB-5.20.5 | Add rule — with both size and coat | Add rule, select service + size + coat + buffer minutes | Rule created with both tags shown |
-| TC-WEB-5.20.6 | Validation — missing service | Submit form without selecting service | Error: "Service and valid buffer minutes are required" |
-| TC-WEB-5.20.7 | Validation — zero buffer | Submit form with 0 buffer minutes | Error: "Service and valid buffer minutes are required" |
-| TC-WEB-5.20.8 | Edit rule inline | Click "Edit" on a rule, change buffer value, click "Save" | Rule updated in list |
-| TC-WEB-5.20.9 | Cancel edit | Click "Edit", then "Cancel" | Original value unchanged |
-| TC-WEB-5.20.10 | Delete rule — confirmation | Click "Delete" on a rule | Confirmation prompt appears |
-| TC-WEB-5.20.11 | Confirm delete | On confirmation prompt, click "Confirm" | Rule removed from list |
-| TC-WEB-5.20.12 | Cancel delete | On confirmation prompt, click "Cancel" | Rule remains in list |
-| TC-WEB-5.20.13 | Empty state | No rules exist | Message: "No buffer rules configured yet." |
-| TC-WEB-5.20.14 | Toggle form | Click "+ Add Rule", then "Cancel" | Form hidden, no rule created |
-
-### 5.21 Service Default Buffer Minutes (GRO-1173)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.21.1 | Default buffer shown in table | Navigate to Services page | "Default Buffer" column visible in services table |
-| TC-WEB-5.21.2 | New service default is 0 | Click "+ Add Service" | Default Buffer field pre-filled with 0 |
-| TC-WEB-5.21.3 | Create service with buffer | Fill service form, set Default Buffer = 10, submit | Service created with 10 min default buffer |
-| TC-WEB-5.21.4 | Edit service — view buffer | Edit an existing service | Current default buffer value shown in form |
-| TC-WEB-5.21.5 | Update buffer on existing service | Edit service, change Default Buffer to 15, save | Buffer updated, table shows 15 min |
-| TC-WEB-5.21.6 | Buffer field — zero allowed | Set Default Buffer to 0, save | Service saved with 0 (no default buffer) |
-| TC-WEB-5.21.7 | Buffer field — integer only | Enter non-integer value | Field restricts to integer values |
-
-### 5.22 Pet Profile — Size Category & Coat Type (GRO-1173)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.22.1 | Size category dropdown visible | Open Add Pet or Edit Pet form (portal) | "Size Category" dropdown visible with options: Small, Medium, Large, X-Large |
-| TC-WEB-5.22.2 | Coat type dropdown visible | Open Add Pet or Edit Pet form | "Coat Type" dropdown visible with options: Smooth, Double, Curly, Wire, Long, Hairless |
-| TC-WEB-5.22.3 | Size and coat both optional | Submit pet form without selecting size or coat | Pet saved successfully |
-| TC-WEB-5.22.4 | Save pet with size category | Select "Large", fill required fields, save | Pet saved with size = "large" |
-| TC-WEB-5.22.5 | Save pet with coat type | Select "Curly", fill required fields, save | Pet saved with coat = "curly" |
-| TC-WEB-5.22.6 | Size and coat persisted | Save pet with size + coat, edit again | Both fields retain their selected values |
-| TC-WEB-5.22.7 | Clear size | Select size, then clear back to default | Size cleared on save |
-
-### 5.23 Pet Profile — API Persistence & Save UX (GRO-1470)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.23.1 | Save pet — API persistence | Edit a pet, change a field (e.g. coat type), click Save, reload the page | Changed field retained after reload (proves PATCH round-trip to server) |
-| TC-WEB-5.23.2 | Save pet — error state | Trigger an API save failure (e.g. network error) | Error message displayed; edit form stays open; no data cleared |
-| TC-WEB-5.23.3 | Save pet — saving indicator | Click Save | Spinner/indicator shown while request is in flight; form controls disabled |
-
-
-### 5.24 Booking Funnel Analytics Events (GRO-1794)
-
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.24.1 | booking_step_service — public | Select a service in the public booking wizard | `booking_step_service` CustomEvent fires with detail.step="service" and detail.flow="public" |
-| TC-WEB-5.24.2 | booking_step_time — public | Select a time slot and click Continue | `booking_step_time` fires with detail.step="time" and detail.flow="public" |
-| TC-WEB-5.24.3 | booking_step_contact — public | Fill in contact/pet form, click "Review booking" | `booking_step_contact` fires with detail.step="contact" and detail.flow="public" |
-| TC-WEB-5.24.4 | booking_step_submit — public | Confirm and submit the booking | `booking_step_submit` fires with detail.step="submit" and detail.flow="public" |
-| TC-WEB-5.24.5 | booking_confirmed — public | Navigate to /booking-confirmed | `booking_confirmed` fires once on mount with detail.step="confirmed" and detail.flow="public" |
-| TC-WEB-5.24.6 | booking_error — public | Navigate to /booking-error | `booking_error` fires once on mount with detail.step="error" and detail.flow="public" |
-| TC-WEB-5.24.7 | booking_step_service — portal | Select a pet in the portal BookingFlow | `booking_step_service` fires with detail.step="service" and detail.flow="portal" |
-| TC-WEB-5.24.8 | booking_step_time — portal | Pick a date and time in portal BookingFlow | `booking_step_time` fires with detail.step="time" and detail.flow="portal" |
-| TC-WEB-5.24.9 | booking_step_contact — portal | Proceed from groomer selection to review screen | `booking_step_contact` fires with detail.step="groomer" and detail.flow="portal" |
-| TC-WEB-5.24.10 | booking_step_submit — portal | Submit booking in portal BookingFlow | `booking_step_submit` fires with detail.step="submit" and detail.flow="portal" |
-| TC-WEB-5.24.11 | booking_confirmed — portal | Portal booking request succeeds | Inline success state is shown and `booking_confirmed` fires with detail.step="confirmed" and detail.flow="portal" |
-| TC-WEB-5.24.12 | No PII in analytics payloads | Fire each event and inspect detail object | Payload contains only: step, flow, timestamp — no names, emails, phone numbers, or pet names |
-| TC-WEB-5.24.13 | No-op safe | Trigger analytics with window.dispatchEvent blocked (e.g. CSP) | No error thrown; booking flow completes normally |
-
 ## 6. Pass/Fail Criteria
 
 **Pass:**

packages/types/src/index.ts

@@ -71,7 +71,6 @@ export interface Service {
   basePriceCents: number;
   durationMinutes: number;
   active: boolean;
-  defaultBufferMinutes?: number;
   createdAt: string;
   updatedAt: string;
 }

public/demo-pets/dog-basset-brown-white.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96C853FAECD363909C4A0</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-bichon-white-groomed.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96CFC84D7A9333708F278</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-boxer-fawn-athletic.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96D48D7892E37386B9ACB</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-cavalier-cream-gentle.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96C25663D703833F23607</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-cocker-buff-friendly.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96D89851C843332073968</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-dachshund-black-tan.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96C9C5A03D33730C61AD8</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-pomeranian-white-studio.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96BEB91911B30317E3BE8</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-schnauzer-black-groomed.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96BFB7B92D33535D6D90D</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-setter-red-sunlit.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96B8BDF4B473630A2E120</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

public/demo-pets/dog-sheepdog-merle-running.png

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Error>
+  <Code>AccessDenied</Code>
+  <Message>You have no right to access this object because of bucket acl.</Message>
+  <RequestId>69D96D78BFFCAD343037C27C</RequestId>
+  <HostId>hailuo-image-algeng-data-us.oss-us-east-1.aliyuncs.com</HostId>
+  <EC>0003-00000001</EC>
+  <RecommendDoc>https://api.alibabacloud.com/troubleshoot?q=0003-00000001</RecommendDoc>
+</Error>

src/__tests__/BookingCancelled.test.tsx

@@ -1,27 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { render, screen } from "@testing-library/react";
-import { BookingCancelledPage } from "../pages/BookingCancelled.tsx";
-
-describe("BookingCancelledPage", () => {
-  it("renders the cancelled heading", () => {
-    render(<BookingCancelledPage />);
-    expect(screen.getByRole("heading", { name: /Appointment Cancelled/i })).toBeInTheDocument();
-  });
-
-  it("renders the cancelled body text", () => {
-    render(<BookingCancelledPage />);
-    expect(screen.getByText(/Your appointment has been cancelled/i)).toBeInTheDocument();
-  });
-
-  it("has a Book again link pointing to /admin/book", () => {
-    render(<BookingCancelledPage />);
-    const link = screen.getByRole("link", { name: /Book again/i });
-    expect(link).toHaveAttribute("href", "/admin/book");
-  });
-
-  it("has a Back to Portal link pointing to /", () => {
-    render(<BookingCancelledPage />);
-    const link = screen.getByRole("link", { name: /Back to Portal/i });
-    expect(link).toHaveAttribute("href", "/");
-  });
-});

src/__tests__/BookingError.test.tsx

@@ -1,38 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { render, screen } from "@testing-library/react";
-import { BookingErrorPage } from "../pages/BookingError.tsx";
-import { BUSINESS_CONTACT_INFO } from "../lib/contact.ts";
-
-describe("BookingErrorPage", () => {
-  it("renders the error heading", () => {
-    render(<BookingErrorPage />);
-    expect(screen.getByRole("heading", { name: /Link Invalid or Expired/i })).toBeInTheDocument();
-  });
-
-  it("renders the error body text", () => {
-    render(<BookingErrorPage />);
-    expect(screen.getByText(/This confirmation link is invalid/i)).toBeInTheDocument();
-  });
-
-  it("has a Start a new booking link pointing to /admin/book", () => {
-    render(<BookingErrorPage />);
-    const link = screen.getByRole("link", { name: /Start a new booking/i });
-    expect(link).toHaveAttribute("href", "/admin/book");
-  });
-
-  it("has a Back to Portal link pointing to /", () => {
-    render(<BookingErrorPage />);
-    const link = screen.getByRole("link", { name: /Back to Portal/i });
-    expect(link).toHaveAttribute("href", "/");
-  });
-
-  it("displays business contact phone", () => {
-    render(<BookingErrorPage />);
-    expect(screen.getByText(new RegExp(BUSINESS_CONTACT_INFO.phone.replace(/[()]/g, "\\$&")))).toBeInTheDocument();
-  });
-
-  it("displays business contact email", () => {
-    render(<BookingErrorPage />);
-    expect(screen.getByText(new RegExp(BUSINESS_CONTACT_INFO.email))).toBeInTheDocument();
-  });
-});

src/__tests__/PetForm.test.tsx

@@ -111,7 +111,7 @@ describe("PetForm", () => {
     render(<PetForm pet={petWithAlert} onSave={onSave} onCancel={onCancel} />);
     const removeButtons = screen.getAllByRole("button", { name: "" });
     if (removeButtons.length === 0) return;
-    const removeButton = removeButtons[0]!;
+    const removeButton = removeButtons[0];
     if (!removeButton) return;
     fireEvent.click(removeButton);
     expect(screen.queryByText("Allergic to chicken")).toBeNull();

src/__tests__/analytics.test.ts

@@ -1,83 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import { ANALYTICS_EVENTS, fireAnalyticsEvent } from "../lib/analytics";
-
-describe("analytics", () => {
-  describe("ANALYTICS_EVENTS constants", () => {
-    it("exports all required event names", () => {
-      expect(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE).toBe("booking_step_service");
-      expect(ANALYTICS_EVENTS.BOOKING_STEP_TIME).toBe("booking_step_time");
-      expect(ANALYTICS_EVENTS.BOOKING_STEP_CONTACT).toBe("booking_step_contact");
-      expect(ANALYTICS_EVENTS.BOOKING_STEP_SUBMIT).toBe("booking_step_submit");
-      expect(ANALYTICS_EVENTS.BOOKING_CONFIRMED).toBe("booking_confirmed");
-      expect(ANALYTICS_EVENTS.BOOKING_ERROR).toBe("booking_error");
-    });
-
-    it("has no duplicate event names", () => {
-      const values = Object.values(ANALYTICS_EVENTS);
-      const unique = new Set(values);
-      expect(unique.size).toBe(values.length);
-    });
-  });
-
-  describe("fireAnalyticsEvent", () => {
-    it("dispatches a CustomEvent with the correct event name", () => {
-      const listener = vi.fn();
-      window.addEventListener(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE, listener);
-      fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE, { step: "service", flow: "public" });
-      expect(listener).toHaveBeenCalledTimes(1);
-      const event = listener.mock.calls[0]![0] as CustomEvent;
-      expect(event.type).toBe("booking_step_service");
-      expect(event.detail.step).toBe("service");
-      expect(event.detail.flow).toBe("public");
-      expect(event.detail.timestamp).toBeDefined();
-      window.removeEventListener(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE, listener);
-    });
-
-    it("includes a timestamp in the event detail", () => {
-      const listener = vi.fn();
-      window.addEventListener(ANALYTICS_EVENTS.BOOKING_CONFIRMED, listener);
-      fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_CONFIRMED, { step: "confirmed", flow: "public" });
-      const event = listener.mock.calls[0]![0] as CustomEvent;
-      expect(event.detail.timestamp).toBeTruthy();
-      expect(new Date(event.detail.timestamp as string)).toBeInstanceOf(Date);
-      window.removeEventListener(ANALYTICS_EVENTS.BOOKING_CONFIRMED, listener);
-    });
-
-    it("does not throw when called with no payload", () => {
-      expect(() => {
-        fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_ERROR, {});
-      }).not.toThrow();
-    });
-
-    it("does not throw when window.dispatchEvent throws", () => {
-      const original = window.dispatchEvent;
-      window.dispatchEvent = () => {
-        throw new Error("analytics blocked");
-      };
-      expect(() => {
-        fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SUBMIT, { step: "submit", flow: "public" });
-      }).not.toThrow();
-      window.dispatchEvent = original;
-    });
-
-    it("fires events for all event types", () => {
-      const events = Object.values(ANALYTICS_EVENTS);
-      for (const eventName of events) {
-        const listener = vi.fn();
-        window.addEventListener(eventName, listener);
-        fireAnalyticsEvent(eventName as typeof events[number], { step: "test", flow: "public" });
-        expect(listener).toHaveBeenCalledTimes(1);
-        window.removeEventListener(eventName, listener);
-      }
-    });
-
-    it("does not include PII in payload", () => {
-      // Payload only contains step, flow, and timestamp — no names, emails, or phones
-      const payload = { step: "contact", flow: "public" };
-      const keys = Object.keys(payload);
-      const piish = ["name", "email", "phone", "clientName", "clientEmail", "clientPhone", "petName"];
-      const hasPII = piish.some((k) => keys.includes(k));
-      expect(hasPII).toBe(false);
-    });
-  });
-});

src/components/BufferRules.tsx

@@ -1,282 +0,0 @@
-import { useEffect, useState } from "react";
-import { Loader2 } from "lucide-react";
-
-interface Service {
-  id: string;
-  name: string;
-  description?: string;
-  basePriceCents: number;
-  durationMinutes: number;
-  active: boolean;
-}
-
-interface BufferRule {
-  id: string;
-  serviceId: string;
-  serviceName: string;
-  sizeCategory?: string;
-  coatType?: string;
-  bufferMinutes: number;
-  createdAt: string;
-  updatedAt: string;
-}
-
-interface BufferRuleForm {
-  serviceId: string;
-  sizeCategory: string;
-  coatType: string;
-  bufferMinutes: string;
-}
-
-const EMPTY_FORM: BufferRuleForm = {
-  serviceId: "",
-  sizeCategory: "",
-  coatType: "",
-  bufferMinutes: "",
-};
-
-const SIZE_OPTIONS = ["", "small", "medium", "large", "xlarge"] as const;
-const COAT_OPTIONS = ["", "smooth", "double", "wire", "curly", "long", "hairless"] as const;
-
-export function BufferRulesSection() {
-  const [rules, setRules] = useState<BufferRule[]>([]);
-  const [services, setServices] = useState<Service[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [showForm, setShowForm] = useState(false);
-  const [form, setForm] = useState<BufferRuleForm>(EMPTY_FORM);
-  const [saving, setSaving] = useState(false);
-  const [formError, setFormError] = useState<string | null>(null);
-  const [deletingId, setDeletingId] = useState<string | null>(null);
-  const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null);
-  const [editingId, setEditingId] = useState<string | null>(null);
-  const [editBuffer, setEditBuffer] = useState<string>("");
-
-  useEffect(() => {
-    Promise.all([
-      fetch("/api/buffer-rules").then(r => r.ok ? r.json() : []),
-      fetch("/api/services?includeInactive=true").then(r => r.ok ? r.json() : []),
-    ]).then(([rulesData, servicesData]) => {
-      setRules(rulesData as BufferRule[]);
-      setServices(servicesData as Service[]);
-    }).catch(() => setError("Failed to load")).finally(() => setLoading(false));
-  }, []);
-
-  async function handleCreate(e: React.FormEvent) {
-    e.preventDefault();
-    const mins = parseInt(form.bufferMinutes);
-    if (!form.serviceId || isNaN(mins) || mins <= 0) {
-      setFormError("Service and valid buffer minutes are required.");
-      return;
-    }
-    setSaving(true);
-    setFormError(null);
-    try {
-      const body: Record<string, string | number> = {
-        serviceId: form.serviceId,
-        bufferMinutes: mins,
-      };
-      if (form.sizeCategory) body.sizeCategory = form.sizeCategory;
-      if (form.coatType) body.coatType = form.coatType;
-      const res = await fetch("/api/buffer-rules", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body),
-      });
-      if (!res.ok) {
-        const err = await res.json().catch(() => ({})) as { error?: string };
-        throw new Error(err.error ?? `HTTP ${res.status}`);
-      }
-      const newRule = await res.json() as BufferRule;
-      setRules(prev => [...prev, newRule]);
-      setShowForm(false);
-      setForm(EMPTY_FORM);
-    } catch (e: unknown) {
-      setFormError(e instanceof Error ? e.message : "Failed to create rule");
-    } finally {
-      setSaving(false);
-    }
-  }
-
-  async function handleDelete(id: string) {
-    setDeletingId(id);
-    try {
-      await fetch(`/api/buffer-rules/${id}`, { method: "DELETE" });
-      setRules(prev => prev.filter(r => r.id !== id));
-    } finally {
-      setDeletingId(null);
-      setConfirmDeleteId(null);
-    }
-  }
-
-  function startEdit(rule: BufferRule) {
-    setEditingId(rule.id);
-    setEditBuffer(String(rule.bufferMinutes));
-  }
-
-  async function saveEdit(rule: BufferRule) {
-    const mins = parseInt(editBuffer);
-    if (isNaN(mins) || mins <= 0) return;
-    setSaving(true);
-    try {
-      const res = await fetch(`/api/buffer-rules/${rule.id}`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ bufferMinutes: mins }),
-      });
-      if (!res.ok) throw new Error(`HTTP ${res.status}`);
-      const updated = await res.json() as BufferRule;
-      setRules(prev => prev.map(r => r.id === updated.id ? updated : r));
-    } catch {
-      // silent fail
-    } finally {
-      setSaving(false);
-      setEditingId(null);
-      setEditBuffer("");
-    }
-  }
-
-  if (loading) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <Loader2 size={20} className="animate-spin text-stone-400" />
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className="py-4 text-sm text-red-500">{error}</div>
-    );
-  }
-
-  return (
-    <div>
-      <div className="flex items-center justify-between mb-4">
-        <div>
-          <h2 className="text-base font-semibold text-stone-800">Buffer Rules</h2>
-          <p className="text-sm text-stone-500">Extra time rules per service / pet size / coat type</p>
-        </div>
-        <button
-          onClick={() => { setShowForm(!showForm); setFormError(null); }}
-          className="px-3 py-1.5 bg-(--color-primary) text-white text-sm rounded-lg hover:bg-(--color-primary-hover)"
-        >
-          {showForm ? "Cancel" : "+ Add Rule"}
-        </button>
-      </div>
-
-      {showForm && (
-        <form onSubmit={handleCreate} className="mb-6 p-4 bg-stone-50 rounded-xl border border-stone-200 space-y-3">
-          <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-            <div>
-              <label className="block text-xs font-medium text-stone-600 mb-1">Service *</label>
-              <select
-                value={form.serviceId}
-                onChange={e => setForm(f => ({ ...f, serviceId: e.target.value }))}
-                required
-                className="w-full border border-stone-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-(--color-accent)"
-              >
-                <option value="">Select service…</option>
-                {services.map(s => (
-                  <option key={s.id} value={s.id}>{s.name}</option>
-                ))}
-              </select>
-            </div>
-            <div>
-              <label className="block text-xs font-medium text-stone-600 mb-1">Buffer (minutes) *</label>
-              <input
-                type="number"
-                min="1"
-                step="1"
-                value={form.bufferMinutes}
-                onChange={e => setForm(f => ({ ...f, bufferMinutes: e.target.value }))}
-                required
-                className="w-full border border-stone-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-(--color-accent)"
-              />
-            </div>
-            <div>
-              <label className="block text-xs font-medium text-stone-600 mb-1">Size Category</label>
-              <select
-                value={form.sizeCategory}
-                onChange={e => setForm(f => ({ ...f, sizeCategory: e.target.value }))}
-                className="w-full border border-stone-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-(--color-accent)"
-              >
-                <option value="">Any</option>
-                {SIZE_OPTIONS.filter(s => s).map(s => (
-                  <option key={s} value={s}>{s.charAt(0).toUpperCase() + s.slice(1)}</option>
-                ))}
-              </select>
-            </div>
-            <div>
-              <label className="block text-xs font-medium text-stone-600 mb-1">Coat Type</label>
-              <select
-                value={form.coatType}
-                onChange={e => setForm(f => ({ ...f, coatType: e.target.value }))}
-                className="w-full border border-stone-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-(--color-accent)"
-              >
-                <option value="">Any</option>
-                {COAT_OPTIONS.filter(c => c).map(c => (
-                  <option key={c} value={c}>{c.charAt(0).toUpperCase() + c.slice(1)}</option>
-                ))}
-              </select>
-            </div>
-          </div>
-          {formError && <p className="text-sm text-red-500">{formError}</p>}
-          <button
-            type="submit"
-            disabled={saving}
-            className="px-4 py-2 bg-(--color-primary) text-white text-sm rounded-lg hover:bg-(--color-primary-hover) disabled:opacity-60"
-          >
-            {saving ? "Saving…" : "Create Rule"}
-          </button>
-        </form>
-      )}
-
-      {rules.length === 0 && !showForm ? (
-        <p className="text-sm text-stone-400 py-6 text-center">No buffer rules configured yet.</p>
-      ) : (
-        <div className="space-y-2">
-          {rules.map(rule => (
-            <div key={rule.id} className="flex items-center gap-3 p-3 bg-white rounded-xl border border-stone-200">
-              <div className="flex-1 min-w-0">
-                <div className="text-sm font-medium text-stone-800 truncate">{rule.serviceName}</div>
-                <div className="text-xs text-stone-500 flex gap-2 flex-wrap">
-                  {rule.sizeCategory && <span>Size: {rule.sizeCategory}</span>}
-                  {rule.coatType && <span>Coat: {rule.coatType}</span>}
-                </div>
-              </div>
-              {editingId === rule.id ? (
-                <div className="flex items-center gap-2">
-                  <input
-                    type="number"
-                    min="1"
-                    value={editBuffer}
-                    onChange={e => setEditBuffer(e.target.value)}
-                    className="w-20 border border-stone-200 rounded px-2 py-1 text-sm"
-                  />
-                  <span className="text-xs text-stone-500">min</span>
-                  <button onClick={() => saveEdit(rule)} disabled={saving} className="text-xs text-green-600 font-medium">Save</button>
-                  <button onClick={() => setEditingId(null)} className="text-xs text-stone-500">Cancel</button>
-                </div>
-              ) : (
-                <>
-                  <span className="text-sm font-medium text-stone-700">{rule.bufferMinutes} min</span>
-                  <button onClick={() => startEdit(rule)} className="text-xs text-stone-500 hover:text-stone-700 px-2">Edit</button>
-                </>
-              )}
-              {confirmDeleteId === rule.id ? (
-                <div className="flex items-center gap-2">
-                  <span className="text-xs text-red-500">Delete?</span>
-                  <button onClick={() => handleDelete(rule.id)} disabled={deletingId === rule.id} className="text-xs text-red-600 font-medium">Confirm</button>
-                  <button onClick={() => setConfirmDeleteId(null)} className="text-xs text-stone-500">Cancel</button>
-                </div>
-              ) : (
-                <button onClick={() => setConfirmDeleteId(rule.id)} className="text-xs text-red-400 hover:text-red-600">Delete</button>
-              )}
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}

src/index.css

@@ -8,19 +8,6 @@
   --color-accent-dark: color-mix(in srgb, var(--color-accent) 78%, #000);
   --color-accent-light: color-mix(in srgb, var(--color-accent) 18%, #fff);
   --color-accent-lighter: color-mix(in srgb, var(--color-accent) 9%, #fff);
-
-  /* Semantic / booking page tokens */
-  --color-error: #dc2626;
-  --color-error-dark: #b91c1c;
-  --color-error-bg: #fef2f2;
-  --color-cancelled: #ea580c;
-  --color-cancelled-dark: #c2410c;
-  --color-cancelled-bg: #fff7ed;
-  --color-success: #16a34a;
-  --color-success-dark: #15803d;
-  --color-success-bg: #f0fdf4;
-  --color-text-secondary: #4b5563;
-  --color-surface: #fff;
 }
 
 *, *::before, *::after {

src/lib/analytics.ts

@@ -1,40 +0,0 @@
-// Analytics event names — single source of truth
-export const ANALYTICS_EVENTS = {
-  BOOKING_STEP_SERVICE: "booking_step_service",
-  BOOKING_STEP_TIME: "booking_step_time",
-  BOOKING_STEP_CONTACT: "booking_step_contact",
-  BOOKING_STEP_SUBMIT: "booking_step_submit",
-  BOOKING_CONFIRMED: "booking_confirmed",
-  BOOKING_ERROR: "booking_error",
-} as const;
-
-export type AnalyticsEventName = (typeof ANALYTICS_EVENTS)[keyof typeof ANALYTICS_EVENTS];
-
-export type AnalyticsPayload = {
-  step?: string;
-  flow?: "public" | "portal";
-  [key: string]: string | undefined;
-};
-
-/**
- * Fires a lightweight analytics event via window.dispatchEvent.
- * No-op safe: failures are swallowed so analytics never breaks the booking flow.
- * Designed for later Plausible/GTM integration.
- */
-export function fireAnalyticsEvent(
-  eventName: AnalyticsEventName,
-  payload: AnalyticsPayload = {}
-): void {
-  try {
-    window.dispatchEvent(
-      new CustomEvent(eventName, {
-        detail: {
-          ...payload,
-          timestamp: new Date().toISOString(),
-        },
-      })
-    );
-  } catch {
-    // no-op: analytics must never break the booking flow
-  }
-}

src/lib/auth-client.ts

@@ -1,7 +1,7 @@
 import { createAuthClient } from "better-auth/react";
 
 export const authClient = createAuthClient({
-  baseURL: import.meta.env.VITE_API_URL || (typeof window !== "undefined" ? window.location.origin : ""),
+  baseURL: import.meta.env.VITE_API_URL ?? "",
 });
 
 export const { signIn, signOut, useSession, changePassword } = authClient;

src/lib/contact.ts

@@ -1,7 +0,0 @@
-// Business contact information — update values to reflect actual business details.
-// Used on error/cancellation pages to help customers reach the business.
-export const BUSINESS_CONTACT_INFO = {
-  phone: "(555) 000-1234",
-  email: "hello@groombook.example.com",
-  address: "123 Main St, Anytown, USA",
-} as const;

src/pages/Book.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 import type { Service } from "@groombook/types";
-import { ANALYTICS_EVENTS, fireAnalyticsEvent } from "../lib/analytics";
 
 // ─── Types ───────────────────────────────────────────────────────────────────
 
@@ -194,14 +193,12 @@ export function BookPage() {
     setSelectedService(svc);
     setForm((f) => ({ ...f, serviceId: svc.id }));
     setStep(2);
-    fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE, { step: "service", flow: "public" });
   }
 
   function goToStep3() {
     if (!selectedSlot) return;
     setForm((f) => ({ ...f, startTime: selectedSlot }));
     setStep(3);
-    fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_TIME, { step: "time", flow: "public" });
   }
 
   function goToStep4() {
@@ -211,7 +208,6 @@ export function BookPage() {
     }
     setFormError(null);
     setStep(4);
-    fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_CONTACT, { step: "contact", flow: "public" });
   }
 
   async function submitBooking() {
@@ -240,7 +236,6 @@ export function BookPage() {
         throw new Error(body.error ?? `HTTP ${res.status}`);
       }
       const data = (await res.json()) as BookingResult;
-      fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SUBMIT, { step: "submit", flow: "public" });
       setResult(data);
       setStep(5);
     } catch (e: unknown) {
@@ -524,7 +519,7 @@ export function BookPage() {
                     <option value="small">Small (under 15 lbs)</option>
                     <option value="medium">Medium (15–40 lbs)</option>
                     <option value="large">Large (40–80 lbs)</option>
-                    <option value="xlarge">X-Large (over 80 lbs)</option>
+                    <option value="x-large">X-Large (over 80 lbs)</option>
                   </select>
                 </div>
                 <div>

src/pages/BookingCancelled.tsx

@@ -1,10 +1,3 @@
-const STRINGS = {
-  heading: "Appointment Cancelled",
-  body: "Your appointment has been cancelled. If this was a mistake or you'd like to rebook, please contact us.",
-  bookAgain: "Book again",
-  backToPortal: "Back to Portal",
-} as const;
-
 export function BookingCancelledPage() {
   return (
     <div
@@ -14,12 +7,12 @@ export function BookingCancelledPage() {
         alignItems: "center",
         justifyContent: "center",
         fontFamily: "system-ui, sans-serif",
-        background: "var(--color-cancelled-bg)",
+        background: "#fff7ed",
       }}
     >
       <div
         style={{
-          background: "var(--color-surface)",
+          background: "#fff",
           borderRadius: 12,
           padding: "2.5rem 3rem",
           boxShadow: "0 4px 24px rgba(0,0,0,0.08)",
@@ -28,35 +21,19 @@ export function BookingCancelledPage() {
         }}
       >
         <div style={{ fontSize: 56, marginBottom: "0.5rem" }}>✗</div>
-        <h1 style={{ color: "var(--color-cancelled-dark)", fontSize: 24, margin: "0 0 0.5rem" }}>
+        <h1 style={{ color: "#c2410c", fontSize: 24, margin: "0 0 0.5rem" }}>
-          {STRINGS.heading}
+          Appointment Cancelled
         </h1>
-        <p style={{ color: "var(--color-text-secondary)", margin: "0 0 1.5rem" }}>
+        <p style={{ color: "#4b5563", margin: "0 0 1.5rem" }}>
-          {STRINGS.body}
+          Your appointment has been cancelled. If this was a mistake or you'd
+          like to rebook, please contact us.
         </p>
-
-        <div style={{ display: "flex", flexDirection: "column", gap: "0.75rem", alignItems: "center" }}>
-          <a
-            href="/admin/book"
-            style={{
-              display: "inline-block",
-              padding: "0.6rem 1.5rem",
-              background: "var(--color-primary)",
-              color: "#fff",
-              borderRadius: 6,
-              textDecoration: "none",
-              fontWeight: 600,
-              fontSize: 14,
-            }}
-          >
-            {STRINGS.bookAgain}
-          </a>
         <a
           href="/"
           style={{
             display: "inline-block",
             padding: "0.6rem 1.5rem",
-              background: "var(--color-cancelled)",
+            background: "#ea580c",
             color: "#fff",
             borderRadius: 6,
             textDecoration: "none",
@@ -64,10 +41,9 @@ export function BookingCancelledPage() {
             fontSize: 14,
           }}
         >
-            {STRINGS.backToPortal}
+          Back to Portal
         </a>
       </div>
     </div>
-    </div>
   );
 }

src/pages/BookingConfirmed.tsx

@@ -1,11 +1,4 @@
-import { useEffect } from "react";
-import { ANALYTICS_EVENTS, fireAnalyticsEvent } from "../lib/analytics";
-
 export function BookingConfirmedPage() {
-  useEffect(() => {
-    fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_CONFIRMED, { step: "confirmed", flow: "public" });
-  }, []);
-
   return (
     <div
       style={{

src/pages/BookingError.tsx

@@ -1,20 +1,4 @@
-import { useEffect } from "react";
-import { BUSINESS_CONTACT_INFO } from "../lib/contact";
-import { ANALYTICS_EVENTS, fireAnalyticsEvent } from "../lib/analytics";
-
-const STRINGS = {
-  heading: "Link Invalid or Expired",
-  body: "This confirmation link is invalid, has already been used, or your appointment has already passed. Please contact us if you need help.",
-  newBooking: "Start a new booking",
-  backToPortal: "Back to Portal",
-  contactLabel: "Need help?",
-} as const;
-
 export function BookingErrorPage() {
-  useEffect(() => {
-    fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_ERROR, { step: "error", flow: "public" });
-  }, []);
-
   return (
     <div
       style={{
@@ -23,12 +7,12 @@ export function BookingErrorPage() {
         alignItems: "center",
         justifyContent: "center",
         fontFamily: "system-ui, sans-serif",
-        background: "var(--color-error-bg)",
+        background: "#fef2f2",
       }}
     >
       <div
         style={{
-          background: "var(--color-surface)",
+          background: "#fff",
           borderRadius: 12,
           padding: "2.5rem 3rem",
           boxShadow: "0 4px 24px rgba(0,0,0,0.08)",
@@ -37,35 +21,19 @@ export function BookingErrorPage() {
         }}
       >
         <div style={{ fontSize: 56, marginBottom: "0.5rem" }}>⚠️</div>
-        <h1 style={{ color: "var(--color-error-dark)", fontSize: 24, margin: "0 0 0.5rem" }}>
+        <h1 style={{ color: "#b91c1c", fontSize: 24, margin: "0 0 0.5rem" }}>
-          {STRINGS.heading}
+          Link Invalid or Expired
         </h1>
-        <p style={{ color: "var(--color-text-secondary)", margin: "0 0 1.5rem" }}>
+        <p style={{ color: "#4b5563", margin: "0 0 1.5rem" }}>
-          {STRINGS.body}
+          This confirmation link is invalid, has already been used, or your
+          appointment has already passed. Please contact us if you need help.
         </p>
-
-        <div style={{ display: "flex", flexDirection: "column", gap: "0.75rem", alignItems: "center" }}>
-          <a
-            href="/admin/book"
-            style={{
-              display: "inline-block",
-              padding: "0.6rem 1.5rem",
-              background: "var(--color-primary)",
-              color: "#fff",
-              borderRadius: 6,
-              textDecoration: "none",
-              fontWeight: 600,
-              fontSize: 14,
-            }}
-          >
-            {STRINGS.newBooking}
-          </a>
         <a
           href="/"
           style={{
             display: "inline-block",
             padding: "0.6rem 1.5rem",
-              background: "var(--color-error)",
+            background: "#dc2626",
             color: "#fff",
             borderRadius: 6,
             textDecoration: "none",
@@ -73,17 +41,9 @@ export function BookingErrorPage() {
             fontSize: 14,
           }}
         >
-            {STRINGS.backToPortal}
+          Back to Portal
         </a>
       </div>
-
-        <div style={{ marginTop: "1.5rem", paddingTop: "1rem", borderTop: "1px solid #e5e7eb", fontSize: 13, color: "var(--color-text-secondary)" }}>
-          <p style={{ margin: "0 0 0.25rem", fontWeight: 600 }}>{STRINGS.contactLabel}</p>
-          <p style={{ margin: 0 }}>
-            {BUSINESS_CONTACT_INFO.phone} · {BUSINESS_CONTACT_INFO.email}
-          </p>
-        </div>
-      </div>
     </div>
   );
 }

src/pages/Clients.tsx

@@ -25,8 +25,6 @@ interface PetForm {
   cutStyle: string;
   shampooPreference: string;
   specialCareNotes: string;
-  coatType: string;
-  sizeCategory: string;
 }
 
 interface VisitLogForm {
@@ -40,7 +38,6 @@ const EMPTY_CLIENT: ClientForm = { name: "", email: "", phone: "", address: "",
 const EMPTY_PET: PetForm = {
   name: "", species: "Dog", breed: "", weightStr: "", dob: "",
   healthAlerts: "", groomingNotes: "", cutStyle: "", shampooPreference: "", specialCareNotes: "",
-  coatType: "", sizeCategory: "",
 };
 const EMPTY_VISIT_LOG: VisitLogForm = { cutStyle: "", productsUsed: "", notes: "", groomedAt: "" };
 
@@ -212,8 +209,6 @@ export function ClientsPage() {
       cutStyle: p.cutStyle ?? "",
       shampooPreference: p.shampooPreference ?? "",
       specialCareNotes: p.specialCareNotes ?? "",
-      coatType: p.coatType ?? "",
-      sizeCategory: p.petSizeCategory ?? "",
     });
     setPetFormError(null);
     setShowPetForm(true);
@@ -320,8 +315,6 @@ export function ClientsPage() {
         cutStyle: petForm.cutStyle || undefined,
         shampooPreference: petForm.shampooPreference || undefined,
         specialCareNotes: petForm.specialCareNotes || undefined,
-        coatType: petForm.coatType || undefined,
-        petSizeCategory: petForm.sizeCategory || undefined,
       };
       const res = editingPet
         ? await fetch(`/api/pets/${editingPet.id}`, { method: "PATCH", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body) })
@@ -697,34 +690,6 @@ export function ClientsPage() {
             <Field label="Breed (optional)">
               <input value={petForm.breed} onChange={(e) => setPetForm((f) => ({ ...f, breed: e.target.value }))} style={inputStyle} />
             </Field>
-            <Field label="Size Category (optional)">
-              <select
-                value={petForm.sizeCategory}
-                onChange={(e) => setPetForm((f) => ({ ...f, sizeCategory: e.target.value }))}
-                style={inputStyle}
-              >
-                <option value="">Not set</option>
-                <option value="small">Small</option>
-                <option value="medium">Medium</option>
-                <option value="large">Large</option>
-                <option value="xlarge">X-Large</option>
-              </select>
-            </Field>
-            <Field label="Coat Type (optional)">
-              <select
-                value={petForm.coatType}
-                onChange={(e) => setPetForm((f) => ({ ...f, coatType: e.target.value }))}
-                style={inputStyle}
-              >
-                <option value="">Not set</option>
-                <option value="smooth">Smooth</option>
-                <option value="double">Double</option>
-                <option value="curly">Curly</option>
-                <option value="wire">Wire</option>
-                <option value="long">Long</option>
-                <option value="hairless">Hairless</option>
-              </select>
-            </Field>
             <Field label="Weight kg (optional)">
               <input type="number" step="0.1" min="0" value={petForm.weightStr} onChange={(e) => setPetForm((f) => ({ ...f, weightStr: e.target.value }))} style={inputStyle} />
             </Field>

src/pages/Services.tsx

@@ -6,7 +6,6 @@ interface ServiceForm {
   description: string;
   priceStr: string;
   durationMinutes: number;
-  defaultBufferMinutes: number;
   active: boolean;
 }
 
@@ -15,7 +14,6 @@ const EMPTY_FORM: ServiceForm = {
   description: "",
   priceStr: "",
   durationMinutes: 60,
-  defaultBufferMinutes: 0,
   active: true,
 };
 
@@ -57,7 +55,6 @@ export function ServicesPage() {
       description: s.description ?? "",
       priceStr: (s.basePriceCents / 100).toFixed(2),
       durationMinutes: s.durationMinutes,
-      defaultBufferMinutes: s.defaultBufferMinutes ?? 0,
       active: s.active,
     });
     setFormError(null);
@@ -79,7 +76,6 @@ export function ServicesPage() {
         description: form.description || undefined,
         basePriceCents: Math.round(price * 100),
         durationMinutes: form.durationMinutes,
-        defaultBufferMinutes: form.defaultBufferMinutes,
         active: form.active,
       };
       const res = editing
@@ -142,7 +138,7 @@ export function ServicesPage() {
         <table style={{ width: "100%", borderCollapse: "collapse", fontSize: 14 }}>
           <thead>
             <tr style={{ background: "#f8fafc" }}>
-              {["Name", "Description", "Price", "Duration", "Default Buffer", "Status", ""].map((h) => (
+              {["Name", "Description", "Price", "Duration", "Status", ""].map((h) => (
                 <th key={h} style={{ textAlign: "left", padding: "0.55rem 0.75rem", borderBottom: "1px solid #e5e7eb", fontSize: 11, fontWeight: 600, color: "#6b7280", textTransform: "uppercase", letterSpacing: "0.04em" }}>
                   {h}
                 </th>
@@ -156,7 +152,6 @@ export function ServicesPage() {
                 <td style={tdStyle}>{s.description ?? "—"}</td>
                 <td style={tdStyle}>${(s.basePriceCents / 100).toFixed(2)}</td>
                 <td style={tdStyle}>{s.durationMinutes} min</td>
-                <td style={tdStyle}>{(s as Service & { defaultBufferMinutes?: number }).defaultBufferMinutes ?? 0} min</td>
                 <td style={tdStyle}>
                   <button
                     onClick={() => toggleActive(s)}
@@ -245,19 +240,6 @@ export function ServicesPage() {
                 style={inputStyle}
               />
             </Field>
-            <Field label="Default Buffer (minutes)">
-              <input
-                type="number"
-                min="0"
-                step="1"
-                value={form.defaultBufferMinutes}
-                onChange={(e) => setForm((f) => ({ ...f, defaultBufferMinutes: parseInt(e.target.value) || 0 }))}
-                style={inputStyle}
-              />
-              <p style={{ fontSize: 12, color: "#9ca3af", marginTop: "0.2rem" }}>
-                Default buffer time applied when no specific rule matches
-              </p>
-            </Field>
             <Field label="Status">
               <label style={{ display: "flex", alignItems: "center", gap: "0.5rem", cursor: "pointer" }}>
                 <input

src/pages/Settings.tsx

@@ -1,6 +1,5 @@
 import { useState, useEffect, useRef } from "react";
 import { useBranding } from "../BrandingContext.js";
-import { BufferRulesSection } from "../components/BufferRules.js";
 
 interface AuthProviderConfig {
   id: number;
@@ -534,10 +533,6 @@ issuerUrl: authForm.issuerUrl,
         {saving ? "Saving..." : "Save Changes"}
       </button>
 
-      {/* Buffer Rules Section */}
-      <hr style={{ margin: "2rem 0", border: "none", borderTop: "1px solid #e5e7eb" }} />
-      <BufferRulesSection />
-
       {/* Auth Provider Section — super users only */}
       {currentUser?.isSuperUser && (
         <>

src/portal/sections/Appointments.tsx

@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
 import { Calendar, Clock, Plus, ChevronRight, ChevronDown, Loader2 } from 'lucide-react';
-import { ANALYTICS_EVENTS, fireAnalyticsEvent } from '../../lib/analytics';
 
 export interface Appointment {
   id: string;
@@ -721,11 +720,6 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
   const [notes, setNotes] = useState('');
   const [recurring, setRecurring] = useState('');
   const [confirmed, setConfirmed] = useState(false);
-  useEffect(() => {
-    if (confirmed) {
-      fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_CONFIRMED, { step: "confirmed", flow: "portal" });
-    }
-  }, [confirmed]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [submitting, setSubmitting] = useState(false);
@@ -807,7 +801,6 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
 
       if (response.ok) {
         setConfirmed(true);
-        fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SUBMIT, { step: "submit", flow: "portal" });
         setTimeout(() => {
           window.location.reload();
         }, 1500);
@@ -883,7 +876,6 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
                         onClick={() => {
                           setSelectedPet(pet);
                           setStep(2);
-                          fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_SERVICE, { step: "service", flow: "portal" });
                         }}
                         className={`w-full flex items-center gap-3 p-3 rounded-xl border text-left transition-colors ${
                           selectedPet?.id === pet.id
@@ -1042,10 +1034,7 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
                       Back
                     </button>
                     <button
-                      onClick={() => {
+                      onClick={() => setStep(4)}
-                        setStep(4);
-                        fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_CONTACT, { step: "groomer", flow: "portal" });
-                      }}
                       className="flex-1 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm font-medium"
                     >
                       Next
@@ -1104,10 +1093,7 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
                       Back
                     </button>
                     <button
-                      onClick={() => {
+                      onClick={() => setStep(5)}
-                        setStep(5);
-                        fireAnalyticsEvent(ANALYTICS_EVENTS.BOOKING_STEP_TIME, { step: "time", flow: "portal" });
-                      }}
                       disabled={!selectedDate || !selectedTime}
                       className="flex-1 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm font-medium disabled:opacity-50"
                     >

src/portal/sections/PetForm.tsx

@@ -1,31 +1,26 @@
 import { useState } from "react";
-import { X, Save, Plus, Star, Loader2 } from "lucide-react";
+import { X, Save, Plus, Star } from "lucide-react";
 import type { Pet, MedicalAlert, CoatType, AlertSeverity } from "@groombook/types";
 
 const COAT_TYPES: CoatType[] = ["double", "wire", "curly", "smooth", "long", "hairless"];
 const SEVERITY_OPTIONS: AlertSeverity[] = ["low", "medium", "high"];
-const SIZE_OPTIONS = ["small", "medium", "large", "xlarge"] as const;
-type SizeOption = typeof SIZE_OPTIONS[number];
 
 interface Props {
   pet?: Pet;
-  onSave: (pet: Pet) => void | Promise<void>;
+  onSave: (pet: Pet) => void;
   onCancel: () => void;
-  saving?: boolean;
-  saveError?: string | null;
 }
 
 function newAlert(): Omit<MedicalAlert, "id"> {
   return { type: "", description: "", severity: "low" };
 }
 
-export function PetForm({ pet, onSave, onCancel, saving, saveError }: Props) {
+export function PetForm({ pet, onSave, onCancel }: Props) {
   const [name, setName] = useState(pet?.name ?? "");
   const [breed, setBreed] = useState(pet?.breed ?? "");
   const [weight, setWeight] = useState(pet?.weightKg ?? 0);
   const [notes, setNotes] = useState(pet?.healthAlerts ?? "");
   const [coatType, setCoatType] = useState<CoatType | "">((pet?.coatType as CoatType) ?? "");
-  const [petSizeCategory, setPetSizeCategory] = useState<SizeOption | "">(pet?.petSizeCategory as SizeOption ?? "");
   const [preferredCuts, setPreferredCuts] = useState<string[]>(pet?.preferredCuts ?? []);
   const [cutInput, setCutInput] = useState("");
   const [alerts, setAlerts] = useState<Omit<MedicalAlert, "id">[]>(
@@ -86,7 +81,6 @@ export function PetForm({ pet, onSave, onCancel, saving, saveError }: Props) {
       weightKg: weight || null,
       healthAlerts: notes,
       coatType: coatType || null,
-      petSizeCategory: petSizeCategory || null,
       preferredCuts,
       medicalAlerts: alerts.map((a, i) => ({ ...a, id: pet.medicalAlerts?.[i]?.id ?? crypto.randomUUID() })),
     };
@@ -165,22 +159,6 @@ export function PetForm({ pet, onSave, onCancel, saving, saveError }: Props) {
           </select>
         </div>
 
-        {/* Size Category */}
-        <div>
-          <label htmlFor="size-category" className="block text-sm font-medium text-stone-600 mb-1">Size Category</label>
-          <select
-            id="size-category"
-            value={petSizeCategory}
-            onChange={e => setPetSizeCategory(e.target.value as SizeOption)}
-            className="w-full border border-stone-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-(--color-accent) bg-white"
-          >
-            <option value="">Select size</option>
-            {SIZE_OPTIONS.map(s => (
-              <option key={s} value={s}>{s.charAt(0).toUpperCase() + s.slice(1)}</option>
-            ))}
-          </select>
-        </div>
-
         {/* Temperament (read-only) */}
         {(temperamentScore != null || temperamentFlags.length > 0) && (
           <div className="bg-stone-50 rounded-xl p-4 space-y-2">
@@ -307,23 +285,18 @@ export function PetForm({ pet, onSave, onCancel, saving, saveError }: Props) {
           <button
             type="button"
             onClick={onCancel}
-            disabled={saving}
+            className="flex-1 px-4 py-2 border border-stone-200 rounded-lg text-sm text-stone-600 hover:bg-stone-50"
-            className="flex-1 px-4 py-2 border border-stone-200 rounded-lg text-sm text-stone-600 hover:bg-stone-50 disabled:opacity-50"
           >
             Cancel
           </button>
           <button
             type="submit"
-            disabled={saving}
+            className="flex-1 flex items-center justify-center gap-1.5 px-4 py-2 bg-(--color-accent) text-white rounded-lg text-sm font-medium hover:bg-(--color-accent-hover)"
-            className="flex-1 flex items-center justify-center gap-1.5 px-4 py-2 bg-(--color-accent) text-white rounded-lg text-sm font-medium hover:bg-(--color-accent-hover) disabled:opacity-50"
           >
-            {saving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
+            <Save size={14} />
-            {saving ? "Saving…" : "Save"}
+            Save
           </button>
         </div>
-        {saveError && (
-          <p className="text-sm text-red-500 text-center">{saveError}</p>
-        )}
       </form>
     </div>
   );

src/portal/sections/PetProfiles.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import { PawPrint, Heart, Scissors, Clock, Edit3, Loader2, Star } from "lucide-react";
+import { PawPrint, Heart, Scissors, Clock, Edit3, Loader2, Star, X } from "lucide-react";
 import { PetForm } from "./PetForm.js";
 import type { Pet } from "@groombook/types";
 
@@ -83,27 +83,9 @@ export function PetProfiles({ sessionId, readOnly }: Props) {
   const petHistory = appointments.appointments.filter(a => a.pet?.id === selectedPetId && new Date(a.startTime) <= new Date());
   const editingPet = editingPetId ? pets.find(p => p.id === editingPetId) ?? null : null;
 
-  const [saving, setSaving] = useState(false);
+  function handlePetSave(updatedPet: Pet) {
-  const [saveError, setSaveError] = useState<string | null>(null);
+    setPets(prev => prev.map(p => p.id === updatedPet.id ? updatedPet : p));
-
-  async function handlePetSave(updatedPet: Pet) {
-    setSaving(true);
-    setSaveError(null);
-    try {
-      const res = await fetch(`/api/portal/pets/${updatedPet.id}`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json", ...buildHeaders(sessionId) },
-        body: JSON.stringify(updatedPet),
-      });
-      if (!res.ok) throw new Error("Failed to save pet");
-      const saved: Pet = await res.json();
-      setPets(prev => prev.map(p => p.id === saved.id ? saved : p));
     setEditingPetId(null);
-    } catch (e) {
-      setSaveError(e instanceof Error ? e.message : "Failed to save pet");
-    } finally {
-      setSaving(false);
-    }
   }
 
   if (editingPet) {
@@ -112,8 +94,6 @@ export function PetProfiles({ sessionId, readOnly }: Props) {
         pet={editingPet}
         onSave={handlePetSave}
         onCancel={() => setEditingPetId(null)}
-        saving={saving}
-        saveError={saveError}
       />
     );
   }