Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
018024510b | ||
|
|
8eb20813c8 | ||
|
|
bfd96c677f | ||
|
|
0e88e7bdac | ||
|
|
7d5b72e1d3 | ||
|
|
91b22c6d60 | ||
|
|
135a5a3b83 | ||
|
|
005aab8139 | ||
|
|
171b193498 | ||
|
|
a7f8a619b1 | ||
|
|
5172588488 | ||
|
|
541ae2eeec |
@@ -4,7 +4,19 @@
|
||||
"Bash(kill %1)",
|
||||
"Bash(pkill -f \"vite dev\")",
|
||||
"Bash(npm run *)",
|
||||
"WebFetch(domain:raw.githubusercontent.com)"
|
||||
"WebFetch(domain:raw.githubusercontent.com)",
|
||||
"Bash(node \"C:\\\\Users\\\\mattc\\\\.claude\\\\plugins\\\\cache\\\\impeccable\\\\impeccable\\\\3.1.1\\\\skills\\\\impeccable\\\\scripts\\\\load-context.mjs\")",
|
||||
"Bash(cat \"C:\\\\Users\\\\mattc\\\\.claude\\\\plugins\\\\cache\\\\impeccable\\\\impeccable\\\\3.1.1\\\\skills\\\\impeccable\\\\reference\\\\distill.md\" 2>&1 | head -100)",
|
||||
"Read(//c/Users/mattc/.claude/plugins/cache/impeccable/impeccable/3.1.1/skills/impeccable/reference/**)",
|
||||
"Bash(node *)",
|
||||
"WebFetch(domain:sticksandbones.co.nz)",
|
||||
"WebFetch(domain:fetchdogwalking.co.nz)",
|
||||
"Bash(npx --no-install svelte-check --tsconfig ./tsconfig.json --threshold error)",
|
||||
"Bash(python -c \"import ast; ast.parse\\(open\\('main.py',encoding='utf-8'\\).read\\(\\)\\); ast.parse\\(open\\('mail_api/models.py',encoding='utf-8'\\).read\\(\\)\\); print\\('ok'\\)\")",
|
||||
"Bash(python *)",
|
||||
"Bash(npm test *)",
|
||||
"Bash(npx svelte-kit *)",
|
||||
"Bash(npx svelte-check *)"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,35 @@
|
||||
ARG APP_VERSION=4.2.3
|
||||
# syntax=docker/dockerfile:1.7
|
||||
ARG APP_VERSION=4.0.1
|
||||
|
||||
FROM node:22-alpine AS builder
|
||||
ARG APP_VERSION
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json ./
|
||||
RUN npm install
|
||||
# 1. Dependencies — only re-runs when package*.json change.
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci
|
||||
|
||||
# 2. Image assets in their own layer. Enhanced-img content-hashes its inputs,
|
||||
# so when these files are unchanged the BuildKit cache mount below replays
|
||||
# the previous WebP/AVIF outputs instead of regenerating them.
|
||||
COPY src/lib/images ./src/lib/images
|
||||
COPY static ./static
|
||||
|
||||
# 3. Build config (changes rarely).
|
||||
COPY svelte.config.js vite.config.ts tsconfig.json ./
|
||||
|
||||
# 4. Everything else. Component-only edits invalidate this layer but the vite
|
||||
# transform cache below keeps the expensive image pipeline warm.
|
||||
COPY . .
|
||||
|
||||
RUN node --experimental-strip-types --import="file:///app/scripts/sveltekit-resolver.mjs" scripts/export-homepage-content.mjs
|
||||
RUN npm run build
|
||||
|
||||
# Persist vite's transform cache across builds. Enhanced-img stores its
|
||||
# generated raster variants here keyed by source-image hash, so unchanged
|
||||
# images skip the sharp/resize/encode pass entirely.
|
||||
RUN --mount=type=cache,target=/app/node_modules/.vite,sharing=locked \
|
||||
npm run build
|
||||
|
||||
FROM node:22-alpine AS runner
|
||||
ARG APP_VERSION
|
||||
|
||||
@@ -0,0 +1,160 @@
|
||||
# GEO Analysis — Goodwalk (goodwalk.co.nz)
|
||||
|
||||
_Generative Engine Optimization audit · February 2026 criteria · analyzed 2026-06-23_
|
||||
|
||||
Scope: SvelteKit codebase at `C:\Users\mattc\gw-svelte\gw-svelte` (SSR via `@sveltejs/adapter-node`). This is a single-location Auckland dog-walking service — a local SAB (service-area business), so GEO leverage skews toward local AI answers ("dog walker in Mt Eden", "Auckland pack walks", "puppy visit cost Auckland").
|
||||
|
||||
---
|
||||
|
||||
## 1. GEO Readiness Score: 73 / 100
|
||||
|
||||
A strong technical foundation already in place. The on-site work is close to best-practice; the gap is **off-site brand presence** and **passage-level citability** of the marketing copy.
|
||||
|
||||
| Criterion | Weight | Score | Notes |
|
||||
|-----------|--------|-------|-------|
|
||||
| Citability | 25% | 16/25 | Excellent `llms.txt` facts; on-page copy is punchy brand fragments, not extractable answer blocks |
|
||||
| Structural Readability | 20% | 15/20 | Clean H1→H2, FAQ `<details>`; few tables/comparison blocks |
|
||||
| Multi-Modal | 15% | 9/15 | Rich images + alt text everywhere; no video, infographics, or tools |
|
||||
| Authority & Brand | 20% | 14/20 | Strong on-site E-E-A-T (Person/founder schema, reviews); thin off-site (no Wikipedia/Reddit/YouTube) |
|
||||
| Technical Accessibility | 20% | 19/20 | SSR, AI crawlers explicitly allowed, `llms.txt` present — near perfect |
|
||||
|
||||
---
|
||||
|
||||
## 2. Platform Breakdown
|
||||
|
||||
| Platform | Est. Score | Why |
|
||||
|----------|-----------|-----|
|
||||
| **Google AI Overviews** | 80 | Best-aligned — SSR + rich LocalBusiness/Person/FAQ schema + local entity signals. Citations come from top-ranking pages, so this rides your existing SEO. |
|
||||
| **Bing Copilot** | 68 | Schema and SSR help; needs Bing index coverage + IndexNow. |
|
||||
| **ChatGPT (web search)** | 61 | Leans on Wikipedia (47.9%) and Reddit (11.3%). No entity presence on either → low. |
|
||||
| **Perplexity** | 57 | Reddit-driven (46.7%). No community validation present → weakest channel. |
|
||||
|
||||
**Implication:** you are well-positioned for Google AIO and should focus net-new effort on the off-site signals that feed ChatGPT/Perplexity.
|
||||
|
||||
---
|
||||
|
||||
## 3. AI Crawler Access Status ✅
|
||||
|
||||
`src/routes/robots.txt/+server.ts` explicitly allows the key search crawlers — this is correctly done:
|
||||
|
||||
| Crawler | Status |
|
||||
|---------|--------|
|
||||
| GPTBot (OpenAI) | ✅ Allowed |
|
||||
| OAI-SearchBot (OpenAI) | ✅ Allowed |
|
||||
| ClaudeBot (Anthropic) | ✅ Allowed |
|
||||
| PerplexityBot | ✅ Allowed |
|
||||
| Bingbot / others (`*`) | ✅ Allowed (with sensible `/api/`, `/variants/`, `/contract` disallows) |
|
||||
|
||||
No action required. One optional addition: `ChatGPT-User` (live browsing fetches) is not named but is covered by `User-agent: *`.
|
||||
|
||||
---
|
||||
|
||||
## 4. llms.txt Status ✅
|
||||
|
||||
Present at `static/llms.txt` and well-structured — better than most sites. It already includes founder, contact, hours, pricing summary, service URLs, suburb list, and location-page index.
|
||||
|
||||
Minor improvements:
|
||||
- **Update `Last updated`** (currently `2026-05-18`) on each meaningful content change.
|
||||
- Consider adding a one-line **"What is Goodwalk"** definitional sentence at the very top under `> ` (the quotable blockquote) — AI models lift this verbatim.
|
||||
- Add the **Meet & Greet is free** fact and **free pickup/drop-off** as explicit bullet facts (they're a differentiator AI answers love to surface).
|
||||
|
||||
---
|
||||
|
||||
## 5. Brand Mention Analysis — biggest opportunity
|
||||
|
||||
Per Ahrefs (Dec 2025), **brand mentions correlate ~3× more strongly with AI visibility than backlinks**. This is your largest lever and it is entirely off-site.
|
||||
|
||||
| Platform | Presence | Priority |
|
||||
|----------|----------|----------|
|
||||
| Instagram | ✅ `@goodwalk.nz` (linked, in `sameAs`) | Maintained |
|
||||
| Facebook | ✅ Linked in footer | Maintained |
|
||||
| Google Business Profile | ✅ `g.page` link + 30× 5-star reviews in schema | Strong |
|
||||
| **Reddit** | ❌ None | **High** — drives Perplexity (46.7%) + ChatGPT (11.3%) |
|
||||
| **YouTube** | ❌ None | **High** — strongest single citation correlation (~0.737) |
|
||||
| **Wikipedia/Wikidata** | ❌ None | Medium (hard for a small local business; skip unless notable) |
|
||||
| LinkedIn (Alessandra) | ❌ Not in Person `sameAs` | Medium — easy entity win |
|
||||
|
||||
**Realistic actions for a local business:**
|
||||
1. Get genuine mentions in Auckland subreddits (r/auckland, r/newzealand) — answer dog-care questions helpfully; don't spam.
|
||||
2. Post a few short YouTube clips (pack walk footage, "what is a Meet & Greet") — even low view counts create the entity association.
|
||||
3. List on NZ pet directories and local-business aggregators (consistent NAP).
|
||||
4. Add Alessandra's LinkedIn (if any) to the `Person` schema `sameAs`.
|
||||
|
||||
---
|
||||
|
||||
## 6. Passage-Level Citability
|
||||
|
||||
Optimal AI-citation block length is **134–167 words, self-contained**. Your on-page copy is deliberately fragmented brand voice — great for humans, weak for extraction:
|
||||
|
||||
> "Built for dogs who do better one-on-one. Their pace. Their walk. Same walker every time." _(dog-walking.ts)_
|
||||
|
||||
These single-line fragments rarely get quoted because they don't answer a question standalone. **Recommendation: keep the brand hero copy, but add one extractable answer block per service page**, e.g.:
|
||||
|
||||
> **What is a solo dog walk?** A solo dog walk is a one-on-one outing where a single dog is walked by the same walker every time, at the dog's own pace. Goodwalk offers solo walks across Auckland Central for dogs who do better without a group — reactive dogs, seniors, post-surgery recovery, and anxious rescues. Walks run 30 minutes (seniors/lower energy), 45 minutes (most dogs), or 60 minutes (longer outings), with free door-to-door pickup and drop-off and a photo update after every walk. Solo walks start from $45 per walk. _(≈70 words — expand toward ~140 with a sentence on when to choose solo vs pack.)_
|
||||
|
||||
Your **`llms.txt` already does this well** — the "Key facts" and "Pricing summary" blocks are exactly the quotable format. Mirror that density into visible page HTML.
|
||||
|
||||
---
|
||||
|
||||
## 7. Server-Side Rendering Check ✅
|
||||
|
||||
- SSR is **on** (adapter-node, no `export const ssr = false` anywhere). AI crawlers, which do not execute JS, will see full content.
|
||||
- All structured data is emitted server-side in `<svelte:head>` (SeoHead.svelte, FaqSection.svelte) — good.
|
||||
- ⚠️ One caveat: the `<noscript>` overlay says "Please enable JavaScript to use this site." The rendered HTML is fine for crawlers, but make sure the **primary content is in the SSR payload and not gated behind hydration** — the booking/contact form needing JS is fine; the service descriptions and FAQs must be in source HTML (they are, via the content modules — confirmed).
|
||||
|
||||
---
|
||||
|
||||
## 8. Top 5 Highest-Impact Changes
|
||||
|
||||
1. **Build off-site brand mentions (Reddit + YouTube + NZ directories).** Highest correlation with AI citation; the single biggest unlock for ChatGPT/Perplexity. _(High effort, high impact)_
|
||||
2. **Add a 134–167 word "What is [service]?" answer block** to each service page (pack-walks, dog-walking, puppy-visits) and an "How much does dog walking cost in Auckland?" block to `/our-pricing`. _(Medium effort, high impact)_
|
||||
3. **Add price + priceCurrency to the `Offer` nodes** in the homepage `hasOfferCatalog` (currently name/url only). Lets AI quote exact prices with confidence. _(Low effort, medium impact)_
|
||||
4. **Create an Auckland dog-care FAQ / short guide page** to capture informational AI queries ("how often should I walk my dog", "pack walk vs solo walk"). You have zero informational content today — purely commercial. _(Medium effort, high impact)_
|
||||
5. **Add `sameAs` to the Person (Alessandra) schema** and a visible author/founder byline with credentials (pet first-aid cert, insured) near service content. Strengthens E-E-A-T entity. _(Low effort, medium impact)_
|
||||
|
||||
---
|
||||
|
||||
## 9. Schema Recommendations
|
||||
|
||||
Already excellent: `WebSite`, `LocalBusiness`+`PetCareService` (with `aggregateRating`, `review`, `openingHoursSpecification`, `areaServed`, `hasOfferCatalog`), `Person` (founder, `knowsAbout`), `FAQPage`, `BreadcrumbList`, `Service` (location pages). Gaps to close:
|
||||
|
||||
```jsonc
|
||||
// In hasOfferCatalog → each Offer, add price:
|
||||
{
|
||||
"@type": "Offer",
|
||||
"itemOffered": { "@type": "Service", "name": "Tiny Gang Pack Walks", "url": "https://www.goodwalk.co.nz/pack-walks" },
|
||||
"price": "49.50",
|
||||
"priceCurrency": "NZD"
|
||||
}
|
||||
```
|
||||
|
||||
```jsonc
|
||||
// Person (Alessandra) — add credentials + external entity links:
|
||||
"hasCredential": [
|
||||
{ "@type": "EducationalOccupationalCredential", "credentialCategory": "certificate", "name": "Pet First Aid Certificate" }
|
||||
],
|
||||
"sameAs": ["https://www.linkedin.com/in/..."] // if available
|
||||
```
|
||||
|
||||
- Add **`priceRange`** (e.g. `"$$"`) and a **`geo`** node (`latitude`/`longitude`) to the LocalBusiness — both are standard LocalBusiness AI signals currently absent.
|
||||
- Optionally model each service page as its own `Service` with an `OfferCatalog` so service pages stand alone as cited entities (location pages already do this well).
|
||||
|
||||
---
|
||||
|
||||
## 10. Content Reformatting Suggestions
|
||||
|
||||
| Page | Current | Suggested GEO addition |
|
||||
|------|---------|------------------------|
|
||||
| `/dog-walking` (solo) | Brand fragments, no definition | Add "What is a solo dog walk?" 140-word block (see §6) |
|
||||
| `/pack-walks` | — | Add "What is a Tiny Gang pack walk?" + a **pack vs solo comparison table** (dogs per group, best for, price) |
|
||||
| `/puppy-visits` | — | Add "What happens in a puppy visit?" + duration/price block |
|
||||
| `/our-pricing` | Pricing copy | Add "How much does a dog walker cost in Auckland?" answer block with a clean price table (service / duration / price NZD) |
|
||||
| New: `/guide` or FAQ hub | none | Informational content to win non-commercial AI queries and earn citations |
|
||||
|
||||
**Tables are under-used.** AI Overviews and Perplexity disproportionately cite comparative tables. A single "Pack vs Solo vs Puppy Visit" comparison table would be high-value and on-brand.
|
||||
|
||||
---
|
||||
|
||||
### Bottom line
|
||||
|
||||
Technically this is a **top-decile small-business GEO setup** — SSR, AI crawler allow-list, `llms.txt`, and comprehensive schema are already done and done well. The remaining wins are **content shape** (add extractable answer blocks + tables, prices in schema) and, most of all, **off-site brand presence** (Reddit, YouTube, directories), which the data says matters more than anything on the page itself.
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
"info@goodwalk.co.nz": {
|
||||
"onboarding": {
|
||||
"currentStep": 5,
|
||||
"ownerFirstName": "test@test",
|
||||
"ownerLastName": "test@test",
|
||||
"email": "test@test.com",
|
||||
"phone": "test",
|
||||
"address": "test",
|
||||
"dogName": "test",
|
||||
"dogLastName": "test",
|
||||
"dogBreed": "test",
|
||||
"dogDateOfBirth": "2026-05-19",
|
||||
"servicesNeeded": [
|
||||
"Tiny Gang Pack Walks"
|
||||
],
|
||||
"temperament": "test",
|
||||
"accessInstructions": "",
|
||||
"vetName": "test",
|
||||
"vetAddress": "test",
|
||||
"vetPhone": "test",
|
||||
"emergencyContactName": "test",
|
||||
"emergencyContactPhone": "test",
|
||||
"isVaccinated": "yes",
|
||||
"hasFoodAllergies": "no",
|
||||
"foodAllergiesDetail": "",
|
||||
"hasEnvAllergies": "no",
|
||||
"envAllergiesDetail": "",
|
||||
"onSpecialDiet": "no",
|
||||
"specialDietDetail": "",
|
||||
"onMedication": "no",
|
||||
"medicationDetail": "",
|
||||
"wellSocialised": "yes",
|
||||
"dogsInteractedWeekly": 1,
|
||||
"visitsBeach": "no",
|
||||
"visitsDogParks": "no",
|
||||
"dogParksFrequency": "",
|
||||
"biteHistory": "no",
|
||||
"reactiveToDogs": "no",
|
||||
"reactiveToAnimals": "no",
|
||||
"reactiveToChildren": "no",
|
||||
"reactiveToPeople": "no",
|
||||
"isDesexed": "yes",
|
||||
"isRegistered": "yes",
|
||||
"leashTrained": "yes",
|
||||
"recallRating": 5,
|
||||
"ranAwayBefore": "no",
|
||||
"carBehaviour": "test",
|
||||
"knownCommands": "test",
|
||||
"additionalNotes": "test",
|
||||
"socialMediaAccount": "test",
|
||||
"howDidYouHear": "test",
|
||||
"emergencyVetConsent": true,
|
||||
"termsAccepted": true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
APP_VERSION=4.2.3
|
||||
APP_VERSION=4.0.1
|
||||
TZ=Pacific/Auckland
|
||||
|
||||
POSTGRES_DB=goodwalk
|
||||
@@ -8,12 +8,23 @@ POSTGRES_PASSWORD_URLENCODED=gw_Pg_7Jm9%21Qx4%23Ld2%40Vr8
|
||||
|
||||
RESEND_API_KEY=re_hcDByLp8_HEBW93wDirr7o9g16FgCeYNF
|
||||
OWNER_EMAIL=info@goodwalk.co.nz
|
||||
SECONDARY_CP_EMAIL=mattcohen0@gmail.com
|
||||
SECONDARY_CP_EMAILS=
|
||||
OWNER_BCC=mattcohen0@gmail.com
|
||||
CLIENT_BCC=mattcohen0@gmail.com
|
||||
FROM_EMAIL=GoodWalk <info@goodwalk.co.nz>
|
||||
REPLY_TO=info@goodwalk.co.nz
|
||||
MAIL_API_DATA_DIR=/app/data
|
||||
ENABLE_GENERAL_ENQUIRIES=false
|
||||
PUBLIC_ENABLE_MOBILE_CTA_BUTTON=false
|
||||
PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES=false
|
||||
|
||||
# Server-side GA4 (ad-block-resistant fallback). See docs/server-side-analytics.md.
|
||||
# GA4_MEASUREMENT_ID matches the ID in src/app.html.
|
||||
# GA4_API_SECRET: GA4 admin → Data Streams → web stream → Measurement Protocol API secrets → Create.
|
||||
# Leave blank to disable the forwarder (endpoint still accepts requests but skips the GA4 call).
|
||||
GA4_MEASUREMENT_ID=G-K7TLSFJVP1
|
||||
GA4_API_SECRET=
|
||||
|
||||
FORM_MIN_SECONDS=4
|
||||
FORM_MAX_SECONDS=7200
|
||||
@@ -21,3 +32,27 @@ RATE_LIMIT_WINDOW_SECONDS=900
|
||||
RATE_LIMIT_MAX_PER_IP=5
|
||||
RATE_LIMIT_MAX_PER_EMAIL=3
|
||||
RATE_LIMIT_MIN_INTERVAL_SECONDS=20
|
||||
EMAIL_SEND_TIMEOUT_SECONDS=20
|
||||
|
||||
# Shared secret for the post-deploy form smoke tests. The deploy script reads
|
||||
# this from the live remote .env and presents it via X-Deploy-Smoke; the
|
||||
# mail-api short-circuits matching requests before email/db side effects.
|
||||
# Rotate with: node -e "console.log(require('crypto').randomBytes(32).toString('hex'))"
|
||||
DEPLOY_SMOKE_SECRET=ed7261d3d7a5ac0a51e0cfb2bf4e2bd4009503605d2963d3ee766b7e885e76eb
|
||||
|
||||
# MYOB integration — optional. When all of MYOB_API_KEY / MYOB_API_SECRET /
|
||||
# MYOB_REFRESH_TOKEN / MYOB_COMPANY_FILE_URI are set, the "Also create this
|
||||
# client in MYOB" checkbox in the control panel's Add-client modal creates the
|
||||
# client as a customer contact in MYOB AccountRight. Leave blank to disable.
|
||||
# MYOB_API_KEY=
|
||||
# MYOB_API_SECRET=
|
||||
# MYOB_REFRESH_TOKEN=
|
||||
# MYOB_COMPANY_FILE_URI=https://api.myob.com/accountright/<company-file-guid>
|
||||
# MYOB_CF_USERNAME=Administrator
|
||||
# MYOB_CF_PASSWORD=
|
||||
|
||||
# Security hardening — sensible defaults are in mail_api/config.py.
|
||||
# Override only if the public domains change or you need to allow extra origins.
|
||||
# CORS_ALLOWED_ORIGINS=https://goodwalk.co.nz,https://www.goodwalk.co.nz,https://clients.goodwalk.co.nz,https://cp.goodwalk.co.nz
|
||||
# TRUSTED_HOSTS=goodwalk.co.nz,www.goodwalk.co.nz,clients.goodwalk.co.nz,cp.goodwalk.co.nz,localhost,127.0.0.1
|
||||
# MAX_REQUEST_BODY_BYTES=2097152
|
||||
|
||||
@@ -1,10 +1,101 @@
|
||||
[CmdletBinding()]
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[switch]$Force,
|
||||
[switch]$SkipSiteCheck,
|
||||
[string]$Service
|
||||
[string]$Service,
|
||||
# When set, the next mail-api boot copies admin state (client_profiles,
|
||||
# allowed_emails, drafts) from the on-disk JSON files into the shared
|
||||
# postgres database, overwriting anything currently in admin_kv. After the
|
||||
# deploy completes the flag is automatically reset to 'auto' for subsequent
|
||||
# boots so we don't keep overwriting live data.
|
||||
[switch]$SeedAdminData,
|
||||
# Skip regenerating the legacy-clients-seed.json file. By default every
|
||||
# deploy refreshes it from data/legacy-{clients,onboarding,contracts}.json.
|
||||
# The mail-api merges this on boot, add-only — it never clobbers live data.
|
||||
[switch]$SkipLegacySeed
|
||||
)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# UI helpers — colored output, step headers, timing
|
||||
# ---------------------------------------------------------------------------
|
||||
$script:UseColor = $Host.UI.SupportsVirtualTerminal -or [bool]$env:WT_SESSION -or [bool]$env:TERM_PROGRAM
|
||||
$script:ESC = [char]27
|
||||
|
||||
# Goodwalk brand palette + status colors (24-bit ANSI where supported)
|
||||
$script:CGreen = '38;2;122;170;122' # softened Goodwalk green for legibility on dark terminals
|
||||
$script:CYellow = '38;2;255;209;0' # #FFD100
|
||||
$script:CCyan = '96'
|
||||
$script:CDim = '90'
|
||||
$script:CGrey = '37'
|
||||
$script:COk = '92'
|
||||
$script:CWarn = '93'
|
||||
$script:CErr = '91'
|
||||
|
||||
function Format-Color {
|
||||
param([string]$Text, [string]$Code)
|
||||
if (-not $script:UseColor) { return $Text }
|
||||
return "$script:ESC[${Code}m$Text$script:ESC[0m"
|
||||
}
|
||||
|
||||
function Show-DeployBanner {
|
||||
$border = '──────────────────────────────────────────────────────' # 54 chars
|
||||
$pad22 = ' ' * 22
|
||||
Write-Host ''
|
||||
Write-Host (Format-Color " ╭$border╮" $script:CGreen)
|
||||
Write-Host -NoNewline (Format-Color ' │' $script:CGreen)
|
||||
Write-Host -NoNewline (Format-Color ' GoodWalk' $script:CYellow)
|
||||
Write-Host -NoNewline (Format-Color ' · production deploy' $script:CDim)
|
||||
Write-Host (Format-Color ($pad22 + '│') $script:CGreen)
|
||||
Write-Host (Format-Color " ╰$border╯" $script:CGreen)
|
||||
Write-Host ''
|
||||
}
|
||||
|
||||
function Write-Info {
|
||||
param([string]$Text)
|
||||
Write-Host (Format-Color " $Text" $script:CDim)
|
||||
}
|
||||
|
||||
function Write-Note {
|
||||
param([string]$Text)
|
||||
Write-Host (" " + (Format-Color '·' $script:CYellow) + " " + (Format-Color $Text $script:CGrey))
|
||||
}
|
||||
|
||||
function Write-Field {
|
||||
param([string]$Label, [string]$Value)
|
||||
$padded = $Label.PadRight(22)
|
||||
Write-Host -NoNewline (Format-Color " $padded" $script:CDim)
|
||||
Write-Host (Format-Color $Value $script:CGrey)
|
||||
}
|
||||
|
||||
function Write-Section {
|
||||
param([string]$Text)
|
||||
Write-Host ''
|
||||
Write-Host (Format-Color "── $Text " $script:CCyan)
|
||||
}
|
||||
|
||||
function Write-StepHeader {
|
||||
param([string]$Text)
|
||||
Write-Host ''
|
||||
Write-Host -NoNewline (Format-Color '▶ ' $script:CCyan)
|
||||
Write-Host (Format-Color $Text $script:CGrey)
|
||||
}
|
||||
|
||||
function Write-Ok {
|
||||
param([string]$Text, [double]$Sec = -1)
|
||||
$suffix = if ($Sec -ge 0) { Format-Color (' ({0:N1}s)' -f $Sec) $script:CDim } else { '' }
|
||||
Write-Host (" " + (Format-Color '✓' $script:COk) + " " + (Format-Color $Text $script:CGrey) + $suffix)
|
||||
}
|
||||
|
||||
function Write-Fail {
|
||||
param([string]$Text)
|
||||
Write-Host (" " + (Format-Color '✗' $script:CErr) + " " + (Format-Color $Text $script:CErr))
|
||||
}
|
||||
|
||||
function Write-WarnLine {
|
||||
param([string]$Text)
|
||||
Write-Host (" " + (Format-Color '!' $script:CWarn) + " " + (Format-Color $Text $script:CWarn))
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Goodwalk production deployment settings
|
||||
# Update these values before the first real deployment.
|
||||
@@ -148,6 +239,32 @@ function Export-HomepageContent {
|
||||
}
|
||||
}
|
||||
|
||||
function Build-LegacySeed {
|
||||
param(
|
||||
[string]$ProjectPath
|
||||
)
|
||||
|
||||
$scriptPath = Join-Path $ProjectPath 'scripts\build-legacy-seed.mjs'
|
||||
|
||||
if (-not (Test-Path -LiteralPath $scriptPath)) {
|
||||
throw "Legacy seed builder not found: $scriptPath"
|
||||
}
|
||||
|
||||
Push-Location $ProjectPath
|
||||
try {
|
||||
Invoke-External -FilePath 'node' -Arguments @($scriptPath)
|
||||
}
|
||||
finally {
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
$outputPath = Join-Path $ProjectPath 'mail-api\legacy-clients-seed.json'
|
||||
if (-not (Test-Path -LiteralPath $outputPath)) {
|
||||
throw "Legacy seed builder did not produce expected output: $outputPath"
|
||||
}
|
||||
return $outputPath
|
||||
}
|
||||
|
||||
function New-UnixScriptCopy {
|
||||
param(
|
||||
[string]$SourcePath
|
||||
@@ -169,18 +286,151 @@ function New-UnixScriptCopy {
|
||||
function Invoke-SiteCheck {
|
||||
param([string]$Url)
|
||||
|
||||
Write-Host ''
|
||||
Write-Host "[deploy] Checking production site: $Url"
|
||||
Write-StepHeader 'Production site check'
|
||||
Write-Info $Url
|
||||
|
||||
try {
|
||||
$response = Invoke-WebRequest -Uri $Url -MaximumRedirection 5 -TimeoutSec 30
|
||||
Write-Host "[deploy] Site responded with HTTP $($response.StatusCode)"
|
||||
if ($response.StatusCode -ge 200 -and $response.StatusCode -lt 400) {
|
||||
Write-Ok "HTTP $($response.StatusCode) from production"
|
||||
return
|
||||
}
|
||||
throw "Unexpected HTTP $($response.StatusCode) from $Url"
|
||||
}
|
||||
catch {
|
||||
Write-Warning "Production site check failed: $($_.Exception.Message)"
|
||||
$message = "Post-deploy site check failed: $($_.Exception.Message). Verify URL: $Url"
|
||||
if ($SkipSiteCheck) {
|
||||
Write-WarnLine $message
|
||||
} else {
|
||||
Write-Fail $message
|
||||
throw $message
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function Get-RemoteSmokeSecret {
|
||||
param(
|
||||
[string]$SshTarget,
|
||||
[string[]]$SshArgList,
|
||||
[string]$DeployPath
|
||||
)
|
||||
|
||||
# Pulls DEPLOY_SMOKE_SECRET from the live .env that was just merged by the
|
||||
# deploy. Single source of truth — no need to sync template and live.
|
||||
$remoteCmd = "grep -E '^DEPLOY_SMOKE_SECRET=' '$DeployPath/.env' | tail -n1 | cut -d= -f2-"
|
||||
$output = & ssh @SshArgList $SshTarget $remoteCmd 2>$null
|
||||
if ($LASTEXITCODE -ne 0) { return $null }
|
||||
if ([string]::IsNullOrWhiteSpace($output)) { return $null }
|
||||
return ($output -join '').Trim()
|
||||
}
|
||||
|
||||
function Invoke-FormSmokeTest {
|
||||
param(
|
||||
[string]$Url,
|
||||
[string]$Secret,
|
||||
[hashtable]$Payload,
|
||||
[string]$Label
|
||||
)
|
||||
|
||||
$json = $Payload | ConvertTo-Json -Compress -Depth 6
|
||||
$headers = @{
|
||||
'X-Deploy-Smoke' = $Secret
|
||||
'Content-Type' = 'application/json'
|
||||
'User-Agent' = 'goodwalk-deploy-smoke/1.0'
|
||||
}
|
||||
|
||||
try {
|
||||
$response = Invoke-WebRequest -Uri $Url -Method Post -Headers $headers -Body $json -TimeoutSec 30 -MaximumRedirection 0
|
||||
}
|
||||
catch {
|
||||
throw "$Label smoke test failed: $($_.Exception.Message)"
|
||||
}
|
||||
|
||||
if ($response.StatusCode -ne 200) {
|
||||
throw "$Label smoke test returned HTTP $($response.StatusCode) (expected 200)"
|
||||
}
|
||||
|
||||
$body = $null
|
||||
try { $body = $response.Content | ConvertFrom-Json } catch { }
|
||||
if (-not $body -or -not $body.ok -or -not $body.smoke) {
|
||||
throw "$Label smoke test response did not include ok=true,smoke=true. Body: $($response.Content)"
|
||||
}
|
||||
|
||||
Write-Ok "$Label OK (request_id=$($body.request_id))"
|
||||
}
|
||||
|
||||
function Invoke-AllFormSmokeTests {
|
||||
param(
|
||||
[string]$SshTarget,
|
||||
[string[]]$SshArgList,
|
||||
[string]$DeployPath
|
||||
)
|
||||
|
||||
Write-StepHeader 'Production form smoke tests'
|
||||
|
||||
$secret = Get-RemoteSmokeSecret -SshTarget $SshTarget -SshArgList $SshArgList -DeployPath $DeployPath
|
||||
if ([string]::IsNullOrWhiteSpace($secret)) {
|
||||
$msg = "DEPLOY_SMOKE_SECRET not found in $DeployPath/.env on the server. Smoke tests cannot run."
|
||||
if ($SkipSiteCheck) {
|
||||
Write-WarnLine $msg
|
||||
return
|
||||
}
|
||||
Write-Fail $msg
|
||||
throw $msg
|
||||
}
|
||||
|
||||
# Payloads carry only the fields each Pydantic model requires. Validation,
|
||||
# rate limiting, honeypot, email send and DB writes are all bypassed by the
|
||||
# mail-api smoke shortcut, but Pydantic still parses the body — so this also
|
||||
# catches schema breakage.
|
||||
$smokeEmail = 'deploy-smoke@goodwalk.co.nz'
|
||||
$bookingPayload = @{
|
||||
fullName = 'Deploy Smoke'
|
||||
email = $smokeEmail
|
||||
phone = '+64-00-000-0000'
|
||||
enquiryType = 'booking'
|
||||
page = '/deploy-smoke'
|
||||
}
|
||||
$onboardingPayload = @{
|
||||
fullName = 'Deploy Smoke'
|
||||
email = $smokeEmail
|
||||
phone = '+64-00-000-0000'
|
||||
address = '1 Smoke St, Auckland'
|
||||
dogName = 'Smoke'
|
||||
dogBreed = 'Test'
|
||||
vetName = 'Dr Smoke'
|
||||
vetAddress = '2 Vet Rd, Auckland'
|
||||
vetPhone = '+64-00-000-0000'
|
||||
emergencyContactName = 'Smoke Contact'
|
||||
emergencyContactPhone = '+64-00-000-0000'
|
||||
signatureDataUrl = 'data:image/png;base64,iVBORw0KGgo='
|
||||
page = '/deploy-smoke'
|
||||
}
|
||||
$contractPayload = @{
|
||||
fullName = 'Deploy Smoke'
|
||||
email = $smokeEmail
|
||||
phone = '+64-00-000-0000'
|
||||
address = '1 Smoke St, Auckland'
|
||||
dogName = 'Smoke'
|
||||
dogBreed = 'Test'
|
||||
serviceType = 'pack-walks'
|
||||
startDate = '2099-01-01'
|
||||
signatureDataUrl = 'data:image/png;base64,iVBORw0KGgo='
|
||||
page = '/deploy-smoke'
|
||||
}
|
||||
|
||||
# Each endpoint is exercised on the subdomain that actually hosts it
|
||||
# in production (see nginx/goodwalk.co.nz.svelte.conf.example):
|
||||
# /api/submit → www.goodwalk.co.nz
|
||||
# /api/onboarding-submit → clients.goodwalk.co.nz
|
||||
# /api/contract-submit → clients.goodwalk.co.nz
|
||||
Invoke-FormSmokeTest -Url 'https://www.goodwalk.co.nz/api/submit' -Secret $secret -Payload $bookingPayload -Label 'booking form (www /api/submit)'
|
||||
Invoke-FormSmokeTest -Url 'https://clients.goodwalk.co.nz/api/onboarding-submit' -Secret $secret -Payload $onboardingPayload -Label 'onboarding form (clients /api/onboarding-submit)'
|
||||
Invoke-FormSmokeTest -Url 'https://clients.goodwalk.co.nz/api/contract-submit' -Secret $secret -Payload $contractPayload -Label 'contract form (clients /api/contract-submit)'
|
||||
}
|
||||
|
||||
Show-DeployBanner
|
||||
|
||||
Assert-Command ssh
|
||||
Assert-Command scp
|
||||
Assert-Command tar
|
||||
@@ -228,64 +478,106 @@ $scpArchiveTarget = '{0}:{1}' -f $sshTarget, $RemoteArchivePath
|
||||
$scpHelperTarget = '{0}:{1}' -f $sshTarget, $RemoteHelperPath
|
||||
$sshArgs = Get-SshArgumentList
|
||||
|
||||
Write-Host '[deploy] Main Goodwalk website deployment'
|
||||
Write-Host "[deploy] Local project path: $LocalProjectPath"
|
||||
Write-Host "[deploy] Remote deployment path: $RemoteDeploymentPath"
|
||||
Write-Host "[deploy] Remote compose file: $ComposeFileName"
|
||||
Write-Host "[deploy] Docker project name: $DockerProjectName"
|
||||
Write-Host "[deploy] Shared nginx config: $NginxConfigTarget"
|
||||
Write-Host "[deploy] Shared nginx compose file: $NginxComposeFile"
|
||||
Write-Host "[deploy] Maintenance host dir: $MaintenanceHostDir (must be bind-mounted at /var/www/maintenance:ro)"
|
||||
Write-Host "[deploy] Maintenance flag path: $MaintenanceFlagPath"
|
||||
Write-Host "[deploy] SSH target: $sshTarget"
|
||||
Write-Host "[deploy] SSH config: $SshConfigPath"
|
||||
Write-Section 'Configuration'
|
||||
Write-Field 'Local project' $LocalProjectPath
|
||||
Write-Field 'Remote path' $RemoteDeploymentPath
|
||||
Write-Field 'Compose file' $ComposeFileName
|
||||
Write-Field 'Docker project' $DockerProjectName
|
||||
Write-Field 'Shared nginx conf' $NginxConfigTarget
|
||||
Write-Field 'Shared nginx compose' $NginxComposeFile
|
||||
Write-Field 'Maintenance dir' "$MaintenanceHostDir (mounted at /var/www/maintenance:ro)"
|
||||
Write-Field 'Maintenance flag' $MaintenanceFlagPath
|
||||
Write-Field 'SSH target' $sshTarget
|
||||
Write-Field 'SSH config' $SshConfigPath
|
||||
if (-not [string]::IsNullOrWhiteSpace($Service)) {
|
||||
Write-Host "[deploy] Target service: $Service"
|
||||
Write-Field 'Target service' $Service
|
||||
}
|
||||
if ($SeedAdminData) {
|
||||
Write-Field 'Admin data' 'seed postgres from JSON on next mail-api boot'
|
||||
}
|
||||
if ($SkipLegacySeed) {
|
||||
Write-Field 'Legacy clients seed' 'SKIPPED (existing mail-api/legacy-clients-seed.json reused)'
|
||||
} else {
|
||||
Write-Field 'Legacy clients seed' 'rebuild from data/legacy-*.json (add-only merge on boot)'
|
||||
}
|
||||
if ([string]::IsNullOrWhiteSpace($SshKeyPath)) {
|
||||
Write-Host '[deploy] SSH auth: interactive password prompt'
|
||||
Write-Field 'SSH auth' 'interactive password prompt'
|
||||
} else {
|
||||
Write-Host "[deploy] SSH auth: key file $SshKeyPath"
|
||||
Write-Field 'SSH auth' "key file $SshKeyPath"
|
||||
}
|
||||
|
||||
Write-Section 'Safety notes'
|
||||
Write-Note 'Only the top-level Goodwalk compose project will be updated.'
|
||||
Write-Note 'Legacy WordPress/onboarding compose files are not used.'
|
||||
Write-Note 'Remote .env files are preserved because they are not uploaded.'
|
||||
Write-Note 'No global Docker prune/stop/delete commands are used.'
|
||||
Write-Note 'Shared nginx will be updated and reloaded with the Docker-DNS-based config.'
|
||||
|
||||
Write-Section 'Subdomains served by this stack'
|
||||
Write-Note 'goodwalk.co.nz / www.goodwalk.co.nz — marketing'
|
||||
Write-Note 'clients.goodwalk.co.nz — client onboarding + contracts'
|
||||
Write-Note 'cp.goodwalk.co.nz — owner admin dashboard'
|
||||
Write-Note 'onboarding/admin remain legacy redirect aliases'
|
||||
if ($SeedAdminData) {
|
||||
Write-Host ''
|
||||
Write-WarnLine 'Admin data seed: mail-api will OVERWRITE postgres admin_kv from the JSON volume.'
|
||||
}
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Safety notes:'
|
||||
Write-Host ' - Only the top-level Goodwalk compose project will be updated.'
|
||||
Write-Host ' - Legacy WordPress/onboarding compose files are not used.'
|
||||
Write-Host ' - Remote .env files are preserved because they are not uploaded.'
|
||||
Write-Host ' - No global Docker prune/stop/delete commands are used.'
|
||||
Write-Host ' - Shared nginx will be updated and reloaded with the Docker-DNS-based config.'
|
||||
|
||||
if (-not $Force) {
|
||||
$confirmation = Read-Host "Type DEPLOY to continue with the remote path '$RemoteDeploymentPath'"
|
||||
Write-Host ''
|
||||
Write-Host -NoNewline (" " + (Format-Color '?' $script:CYellow) + " ")
|
||||
Write-Host -NoNewline (Format-Color 'Type ' $script:CGrey)
|
||||
Write-Host -NoNewline (Format-Color 'DEPLOY' $script:CYellow)
|
||||
Write-Host -NoNewline (Format-Color " to continue with remote path '" $script:CGrey)
|
||||
Write-Host -NoNewline (Format-Color $RemoteDeploymentPath $script:CCyan)
|
||||
Write-Host -NoNewline (Format-Color "' " $script:CGrey)
|
||||
$confirmation = Read-Host
|
||||
if ($confirmation -ne 'DEPLOY') {
|
||||
Write-Fail 'Deployment cancelled.'
|
||||
throw 'Deployment cancelled.'
|
||||
}
|
||||
}
|
||||
|
||||
$archivePath = $null
|
||||
$uploadHelperPath = $null
|
||||
$totalWatch = [System.Diagnostics.Stopwatch]::StartNew()
|
||||
$stepWatch = [System.Diagnostics.Stopwatch]::new()
|
||||
|
||||
try {
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Exporting current homepage content for PostgreSQL sync'
|
||||
Write-StepHeader 'Export homepage content for PostgreSQL sync'
|
||||
$stepWatch.Restart()
|
||||
Export-HomepageContent -ProjectPath $LocalProjectPath -OutputPath $GeneratedHomepageContentPath
|
||||
Write-Ok 'Homepage content exported' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Creating deployment archive'
|
||||
if (-not $SkipLegacySeed) {
|
||||
Write-StepHeader 'Build legacy clients seed for mail-api image'
|
||||
$stepWatch.Restart()
|
||||
$legacySeedPath = Build-LegacySeed -ProjectPath $LocalProjectPath
|
||||
Write-Info "Seed file: $legacySeedPath"
|
||||
Write-Ok 'Legacy clients seed ready' $stepWatch.Elapsed.TotalSeconds
|
||||
} else {
|
||||
Write-Note 'Legacy clients seed step skipped (-SkipLegacySeed).'
|
||||
}
|
||||
|
||||
Write-StepHeader 'Create deployment archive'
|
||||
$stepWatch.Restart()
|
||||
$archivePath = New-DeployArchive -ProjectPath $LocalProjectPath
|
||||
Write-Host "[deploy] Archive ready: $archivePath"
|
||||
Write-Info "Archive: $archivePath"
|
||||
Write-Ok 'Archive ready' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Uploading remote helper'
|
||||
Write-StepHeader 'Upload remote helper'
|
||||
$stepWatch.Restart()
|
||||
$uploadHelperPath = New-UnixScriptCopy -SourcePath $LocalRemoteHelperPath
|
||||
Invoke-External -FilePath 'scp' -Arguments ($sshArgs + @($uploadHelperPath, $scpHelperTarget))
|
||||
Write-Ok 'Helper uploaded' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Uploading application archive'
|
||||
Write-StepHeader 'Upload application archive'
|
||||
$stepWatch.Restart()
|
||||
Invoke-External -FilePath 'scp' -Arguments ($sshArgs + @($archivePath, $scpArchiveTarget))
|
||||
Write-Ok 'Archive uploaded' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Running remote deployment'
|
||||
Write-StepHeader 'Run remote deployment'
|
||||
$stepWatch.Restart()
|
||||
Invoke-External -FilePath 'ssh' -Arguments ($sshArgs + @(
|
||||
$sshTarget,
|
||||
'bash',
|
||||
@@ -310,10 +602,12 @@ try {
|
||||
$MaintenanceHostDir,
|
||||
'--maintenance-flag',
|
||||
$MaintenanceFlagPath
|
||||
) + $(if (-not [string]::IsNullOrWhiteSpace($Service)) { @('--service', $Service) } else { @() }))
|
||||
) + $(if (-not [string]::IsNullOrWhiteSpace($Service)) { @('--service', $Service) } else { @() }) `
|
||||
+ $(if ($SeedAdminData) { @('--seed-admin-data') } else { @() }))
|
||||
Write-Ok 'Remote deployment finished' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Cleaning remote temporary files'
|
||||
Write-StepHeader 'Clean remote temporary files'
|
||||
$stepWatch.Restart()
|
||||
Invoke-External -FilePath 'ssh' -Arguments ($sshArgs + @(
|
||||
$sshTarget,
|
||||
'rm',
|
||||
@@ -321,13 +615,28 @@ try {
|
||||
$RemoteArchivePath,
|
||||
$RemoteHelperPath
|
||||
))
|
||||
Write-Ok 'Remote temp files cleaned' $stepWatch.Elapsed.TotalSeconds
|
||||
|
||||
if (-not $SkipSiteCheck) {
|
||||
Invoke-SiteCheck -Url $VerifyUrl
|
||||
Invoke-AllFormSmokeTests -SshTarget $sshTarget -SshArgList $sshArgs -DeployPath $RemoteDeploymentPath
|
||||
}
|
||||
|
||||
$totalWatch.Stop()
|
||||
$border = '──────────────────────────────────────────────────────'
|
||||
Write-Host ''
|
||||
Write-Host (Format-Color " ╭$border╮" $script:CGreen)
|
||||
Write-Host -NoNewline (Format-Color ' │' $script:CGreen)
|
||||
Write-Host -NoNewline (Format-Color ' ✓ ' $script:COk)
|
||||
Write-Host -NoNewline (Format-Color 'Deployment complete' $script:CYellow)
|
||||
$elapsedText = (' · {0:N1}s total' -f $totalWatch.Elapsed.TotalSeconds)
|
||||
Write-Host -NoNewline (Format-Color $elapsedText $script:CDim)
|
||||
$visibleLen = (' ✓ Deployment complete' + $elapsedText).Length
|
||||
$padLen = 54 - $visibleLen
|
||||
if ($padLen -lt 1) { $padLen = 1 }
|
||||
Write-Host (Format-Color ((' ' * $padLen) + '│') $script:CGreen)
|
||||
Write-Host (Format-Color " ╰$border╯" $script:CGreen)
|
||||
Write-Host ''
|
||||
Write-Host '[deploy] Deployment completed successfully'
|
||||
}
|
||||
finally {
|
||||
if ($archivePath -and (Test-Path -LiteralPath $archivePath)) {
|
||||
|
||||
@@ -3,15 +3,18 @@ services:
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
container_name: goodwalk_svelte_app
|
||||
environment:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
DATABASE_URL: postgresql://${POSTGRES_USER:-goodwalk}:${POSTGRES_PASSWORD_URLENCODED:-goodwalk}@db:5432/${POSTGRES_DB:-goodwalk}
|
||||
NODE_ENV: production
|
||||
PORT: 3000
|
||||
ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
|
||||
PUBLIC_ENABLE_MOBILE_CTA_BUTTON: ${PUBLIC_ENABLE_MOBILE_CTA_BUTTON:-false}
|
||||
PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES: ${PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES:-false}
|
||||
GA4_MEASUREMENT_ID: ${GA4_MEASUREMENT_ID:-}
|
||||
GA4_API_SECRET: ${GA4_API_SECRET:-}
|
||||
TZ: ${TZ:-Pacific/Auckland}
|
||||
depends_on:
|
||||
- db
|
||||
@@ -26,28 +29,58 @@ services:
|
||||
build:
|
||||
context: ./mail-api
|
||||
args:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
container_name: goodwalk_svelte_mail_api
|
||||
depends_on:
|
||||
- db
|
||||
environment:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
RESEND_API_KEY: ${RESEND_API_KEY}
|
||||
OWNER_EMAIL: ${OWNER_EMAIL}
|
||||
SECONDARY_CP_EMAIL: ${SECONDARY_CP_EMAIL:-}
|
||||
SECONDARY_CP_EMAILS: ${SECONDARY_CP_EMAILS:-}
|
||||
OWNER_BCC: ${OWNER_BCC:-}
|
||||
CLIENT_BCC: ${CLIENT_BCC:-}
|
||||
FROM_EMAIL: ${FROM_EMAIL:-GoodWalk <info@goodwalk.co.nz>}
|
||||
REPLY_TO: ${REPLY_TO:-aless@goodwalk.co.nz}
|
||||
ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
|
||||
DATA_DIR: ${MAIL_API_DATA_DIR:-/app/data}
|
||||
# Shared postgres for admin state (client_profiles, allowed_emails, drafts).
|
||||
# When unset the mail-api falls back to JSON files under DATA_DIR.
|
||||
DATABASE_URL: postgresql://${POSTGRES_USER:-goodwalk}:${POSTGRES_PASSWORD_URLENCODED:-goodwalk}@db:5432/${POSTGRES_DB:-goodwalk}
|
||||
ADMIN_DATA_SEED_FROM_JSON: ${ADMIN_DATA_SEED_FROM_JSON:-auto}
|
||||
FORM_MIN_SECONDS: ${FORM_MIN_SECONDS:-4}
|
||||
FORM_MAX_SECONDS: ${FORM_MAX_SECONDS:-7200}
|
||||
RATE_LIMIT_WINDOW_SECONDS: ${RATE_LIMIT_WINDOW_SECONDS:-900}
|
||||
RATE_LIMIT_MAX_PER_IP: ${RATE_LIMIT_MAX_PER_IP:-5}
|
||||
RATE_LIMIT_MAX_PER_EMAIL: ${RATE_LIMIT_MAX_PER_EMAIL:-3}
|
||||
RATE_LIMIT_MIN_INTERVAL_SECONDS: ${RATE_LIMIT_MIN_INTERVAL_SECONDS:-20}
|
||||
CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS:-}
|
||||
TRUSTED_HOSTS: ${TRUSTED_HOSTS:-}
|
||||
MAX_REQUEST_BODY_BYTES: ${MAX_REQUEST_BODY_BYTES:-}
|
||||
DEPLOY_SMOKE_SECRET: ${DEPLOY_SMOKE_SECRET:-}
|
||||
# MYOB integration (optional — see deploy.env.template).
|
||||
MYOB_API_KEY: ${MYOB_API_KEY:-}
|
||||
MYOB_API_SECRET: ${MYOB_API_SECRET:-}
|
||||
MYOB_REFRESH_TOKEN: ${MYOB_REFRESH_TOKEN:-}
|
||||
MYOB_COMPANY_FILE_URI: ${MYOB_COMPANY_FILE_URI:-}
|
||||
MYOB_CF_USERNAME: ${MYOB_CF_USERNAME:-Administrator}
|
||||
MYOB_CF_PASSWORD: ${MYOB_CF_PASSWORD:-}
|
||||
PYTHONUNBUFFERED: '1'
|
||||
TZ: ${TZ:-Pacific/Auckland}
|
||||
expose:
|
||||
- '8000'
|
||||
volumes:
|
||||
- mail_api_data:${MAIL_API_DATA_DIR:-/app/data}
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
# Hits /health via the container's own loopback so TrustedHostMiddleware
|
||||
# (allowed_hosts) does not need to know about the bridge-network IP.
|
||||
test: ["CMD-SHELL", "python -c \"import urllib.request,sys; sys.exit(0 if urllib.request.urlopen('http://127.0.0.1:8000/health', timeout=3).status == 200 else 1)\""]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 20s
|
||||
networks:
|
||||
- default
|
||||
- webnet
|
||||
@@ -68,6 +101,7 @@ services:
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
mail_api_data:
|
||||
|
||||
networks:
|
||||
webnet:
|
||||
|
||||
@@ -3,14 +3,15 @@ services:
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
environment:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
DATABASE_URL: postgresql://${POSTGRES_USER:-goodwalk}:${POSTGRES_PASSWORD:-goodwalk}@db:5432/${POSTGRES_DB:-goodwalk}
|
||||
NODE_ENV: production
|
||||
PORT: ${APP_PORT:-3000}
|
||||
ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
|
||||
PUBLIC_ENABLE_MOBILE_CTA_BUTTON: ${PUBLIC_ENABLE_MOBILE_CTA_BUTTON:-false}
|
||||
PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES: ${PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES:-false}
|
||||
TZ: ${TZ:-Pacific/Auckland}
|
||||
depends_on:
|
||||
- db
|
||||
@@ -20,9 +21,9 @@ services:
|
||||
build:
|
||||
context: ./mail-api
|
||||
args:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
environment:
|
||||
APP_VERSION: ${APP_VERSION:-4.2.3}
|
||||
APP_VERSION: ${APP_VERSION:-4.0.1}
|
||||
RESEND_API_KEY: ${RESEND_API_KEY}
|
||||
OWNER_EMAIL: ${OWNER_EMAIL}
|
||||
OWNER_BCC: ${OWNER_BCC:-}
|
||||
@@ -30,7 +31,17 @@ services:
|
||||
FROM_EMAIL: ${FROM_EMAIL:-GoodWalk <info@goodwalk.co.nz>}
|
||||
REPLY_TO: ${REPLY_TO:-info@goodwalk.co.nz}
|
||||
ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
|
||||
DATA_DIR: ${MAIL_API_DATA_DIR:-/app/data}
|
||||
# MYOB integration (optional — see deploy.env.template).
|
||||
MYOB_API_KEY: ${MYOB_API_KEY:-}
|
||||
MYOB_API_SECRET: ${MYOB_API_SECRET:-}
|
||||
MYOB_REFRESH_TOKEN: ${MYOB_REFRESH_TOKEN:-}
|
||||
MYOB_COMPANY_FILE_URI: ${MYOB_COMPANY_FILE_URI:-}
|
||||
MYOB_CF_USERNAME: ${MYOB_CF_USERNAME:-Administrator}
|
||||
MYOB_CF_PASSWORD: ${MYOB_CF_PASSWORD:-}
|
||||
TZ: ${TZ:-Pacific/Auckland}
|
||||
volumes:
|
||||
- mail_api_data:${MAIL_API_DATA_DIR:-/app/data}
|
||||
restart: unless-stopped
|
||||
|
||||
db:
|
||||
@@ -60,3 +71,4 @@ services:
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
mail_api_data:
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
-- Key/value table used by mail-api for admin state.
|
||||
-- Three keys are written from main.py:
|
||||
-- client_profiles -> dict[email, profile]
|
||||
-- allowed_emails -> {"emails": [..]}
|
||||
-- drafts -> dict[email, drafts]
|
||||
-- Stored as JSONB blobs to match the existing dict-shaped storage in the
|
||||
-- application and to avoid coupling the DB schema to mail-api shape changes.
|
||||
create table if not exists admin_kv (
|
||||
key text primary key,
|
||||
value jsonb not null,
|
||||
updated_at timestamptz not null default now()
|
||||
);
|
||||
@@ -0,0 +1,15 @@
|
||||
-- A/B test event log. One row per exposure / cta_click / conversion.
|
||||
-- Kept narrow on purpose: the goal is "did variant X get more conversions
|
||||
-- than control" — not full session reconstruction.
|
||||
create table if not exists ab_events (
|
||||
id bigserial primary key,
|
||||
experiment text not null,
|
||||
variant text not null,
|
||||
event_type text not null check (event_type in ('exposure', 'cta_click', 'conversion')),
|
||||
anon_id text not null,
|
||||
meta jsonb not null default '{}'::jsonb,
|
||||
created_at timestamptz not null default now()
|
||||
);
|
||||
|
||||
create index if not exists ab_events_experiment_variant_idx
|
||||
on ab_events (experiment, variant, event_type, created_at desc);
|
||||
@@ -0,0 +1,48 @@
|
||||
-- Visitor journey reconstruction. Two tables, two retention policies.
|
||||
--
|
||||
-- session_events: every analytics event the SvelteKit /api/track endpoint
|
||||
-- receives, keyed by the anon_id cookie set in hooks.server.ts. This buffer
|
||||
-- is the source for journey reconstruction when a visitor submits the
|
||||
-- booking form. It is pruned aggressively (24h TTL) so we don't hoard
|
||||
-- behavioural data for visitors who never enquire.
|
||||
--
|
||||
-- submission_journeys: when a visitor submits the booking/contact form,
|
||||
-- /api/track/promote copies their recent session_events into this table
|
||||
-- linked to the submission email. These rows are kept so the owner can
|
||||
-- review the journey from the CP dashboard.
|
||||
--
|
||||
-- The promotion step is the only place where an anonymous browsing record
|
||||
-- becomes linked to a named person, and it only happens because that
|
||||
-- person chose to submit a form. The privacy policy covers this.
|
||||
|
||||
create table if not exists session_events (
|
||||
id bigserial primary key,
|
||||
anon_id text not null,
|
||||
event_name text not null,
|
||||
page_path text,
|
||||
params jsonb not null default '{}'::jsonb,
|
||||
created_at timestamptz not null default now()
|
||||
);
|
||||
|
||||
create index if not exists session_events_anon_idx
|
||||
on session_events (anon_id, created_at);
|
||||
|
||||
-- Used by the probabilistic prune in /api/track to find rows past TTL.
|
||||
create index if not exists session_events_created_idx
|
||||
on session_events (created_at);
|
||||
|
||||
create table if not exists submission_journeys (
|
||||
id bigserial primary key,
|
||||
email text not null,
|
||||
anon_id text,
|
||||
-- Snapshot of session_events rows at promotion time (server-captured).
|
||||
events jsonb not null default '[]'::jsonb,
|
||||
-- Client-side sessionStorage buffer sent with the promote request, as a
|
||||
-- fallback for events that never reached /api/track (e.g. blocked at the
|
||||
-- network layer alongside gtag).
|
||||
client_events jsonb not null default '[]'::jsonb,
|
||||
created_at timestamptz not null default now()
|
||||
);
|
||||
|
||||
create index if not exists submission_journeys_email_idx
|
||||
on submission_journeys (email, created_at desc);
|
||||
@@ -0,0 +1,35 @@
|
||||
# Goodwalk docs
|
||||
|
||||
Reference, audit, and planning documents for the Goodwalk site. Project-level rules live in [`/CLAUDE.md`](../CLAUDE.md); everything else lives here.
|
||||
|
||||
## Product & brand
|
||||
|
||||
- [product.md](product.md) — users, purpose, brand personality, design principles
|
||||
- [marketing-principles.md](marketing-principles.md) — Chris Do / Debbie Millman principles, applied to the rebuild
|
||||
- [marketing-voice.md](marketing-voice.md) — copy/voice style guide (calm, certain, warm, specific)
|
||||
|
||||
## Design
|
||||
|
||||
- [design-language.md](design-language.md) — canonical visual system: colour, typography, spacing, motion, surface, photography direction
|
||||
- [design-audit.md](design-audit.md) — codebase-wide design drift audit + token/refactor changelog
|
||||
- [homepage-flow-audit.md](homepage-flow-audit.md) — section-by-section IA review of the homepage
|
||||
- [mobile-polish.md](mobile-polish.md) — mobile conversion & comfort tracker
|
||||
- [ux-polish.md](ux-polish.md) — conversion audit tracker
|
||||
|
||||
## SEO & growth
|
||||
|
||||
- [competitors.md](competitors.md) — Fetch / Sticks & Bones analysis + what to borrow
|
||||
- [comparison-page-plan.md](comparison-page-plan.md) — brief for the dog-walker-vs-daycare-vs-sitter page
|
||||
- [nz-citations.md](nz-citations.md) — canonical NAP block + directory submission list
|
||||
|
||||
## Ops
|
||||
|
||||
- [deployment.md](deployment.md) — production deploy flow, server layout, nginx cutover
|
||||
- [webp-conversion.md](webp-conversion.md) — one-time WebP setup for hero images
|
||||
- [onboarding.md](onboarding.md) — client onboarding flow, lifecycle status, legacy CSV migration, Postgres target schema
|
||||
- [server-side-analytics.md](server-side-analytics.md) — first-party `/api/track` endpoint that forwards to GA4 when ad blockers kill client-side gtag
|
||||
|
||||
## Archive
|
||||
|
||||
- [archive/v3-design-audit.md](archive/v3-design-audit.md) — superseded by [design-audit.md](design-audit.md)
|
||||
- [archive/marketing-voice-v2-proposal.md](archive/marketing-voice-v2-proposal.md) — one-shot copy-change proposal against [marketing-voice.md](marketing-voice.md)
|
||||
@@ -0,0 +1,422 @@
|
||||
# Marketing Voice v2 — Distillation Proposal
|
||||
|
||||
Proposed copy changes across the site, measured against `marketing-voice.md`. Nothing applied yet — review, redline, then I'll commit the survivors.
|
||||
|
||||
The aim: cut hedges, kill restated headings, collapse repetition across pages, and replace abstract phrasing with concrete nouns. Where two sentences carry one idea, one sentence wins.
|
||||
|
||||
---
|
||||
|
||||
## 1. Cross-site naming
|
||||
|
||||
### "1:1" still appears in 6+ places
|
||||
|
||||
We already changed the FAQ heading on the dog-walking page. The phrase still lives in navigation, footer, mega menu, decision blocks, FAQs, and SEO metadata. It's calendar-speak — customers say "solo" or "one-on-one".
|
||||
|
||||
| Location | Current | Proposed |
|
||||
|---|---|---|
|
||||
| `homepage.ts` mobileLinks | `1:1 Walks` | `Solo Walks` |
|
||||
| `homepage.ts` megaMenuServices | `1:1 Walks` / `Personalised solo walks` | `Solo Walks` / `One dog. One walker.` |
|
||||
| `homepage.ts` services[1] | `1:1 Walks` | `Solo Walks` |
|
||||
| `homepage.ts` testimonials.service | `1:1 Walk` | `Solo Walk` |
|
||||
| `homepage.ts` booking.serviceOptions | `1:1 Walks` | `Solo Walks` |
|
||||
| `homepage.ts` footer.navigationLinks | `1:1 Walks` | `Solo Walks` |
|
||||
| `pack-walks.ts` paragraphs[4] | `our 1:1 walks are the better fit` | `our solo walks are the better fit` |
|
||||
| `dog-walking.ts` hero.eyebrow | `1:1 Walks` | `Solo Walks` |
|
||||
| `dog-walking.ts` decision.title | `Is a 1:1 walk right for your dog?` | `Is a solo walk right for your dog?` |
|
||||
| `dog-walking.ts` FAQ | `1:1 walks start from...` | `Solo walks start from...` |
|
||||
|
||||
Open question: keep `1:1` in SEO `<title>` / `description` if it carries search volume, or sweep that too? I'd keep it on `llms.txt` and meta titles where the keyword has weight, drop it in body copy.
|
||||
|
||||
---
|
||||
|
||||
## 2. Homepage (`homepage.ts`)
|
||||
|
||||
### Hero subtitle — already tight, leave it.
|
||||
|
||||
✅ Current: "Reliable dog walking across Auckland Central. Happier dogs. Quieter evenings." Keep.
|
||||
|
||||
### Intro
|
||||
|
||||
Current: `"Professional dog walking services across Auckland."`
|
||||
|
||||
Proposal: **`"Dog walking across Auckland Central."`**
|
||||
Why: "Professional services" is filler — readers already assume it. The location is the real specificity; drop "Auckland", say "Auckland Central" since that's where we actually are.
|
||||
|
||||
### Founder story body
|
||||
|
||||
Current:
|
||||
> "Most companies sell walks. We sell a calmer evening at home."
|
||||
> "Same walker. Small groups. Real attention. Your dog learns to trust one face at the door — not a rotating roster."
|
||||
> "You know who has your dog. Your dog knows who is collecting them. And you come home to a tired, happy one. Ready to"
|
||||
|
||||
Proposal — line 3 is doing two jobs and stumbles into the CTA:
|
||||
> "Most companies sell walks. We sell a calmer evening at home."
|
||||
> "Same walker. Small groups. Real attention. Your dog learns one face at the door, not a rotating roster."
|
||||
> "You know who has your dog. They know who's at the door. You come home to a tired, happy one. Ready to"
|
||||
|
||||
Reasons: kill "trust one face" (abstract + redundant with later "tired, happy one"), trim "to trust" (we just said we sell trust). Contraction on "they know who's" makes it sound spoken.
|
||||
|
||||
### How it works — phase benefits
|
||||
|
||||
The "benefit" line under each phase is doing the job of the title. Right now both compete.
|
||||
|
||||
| Phase | Current title + benefit | Proposal |
|
||||
|---|---|---|
|
||||
| Meet | `No pressure, just clarity` + `A proper Meet & Greet at home` | Drop the benefit subtitle. Title carries enough. |
|
||||
| Settle | `A smoother start for nervous dogs` + `Your dog settles in. No rushing.` | Drop benefit subtitle. |
|
||||
| Thrive | `The outcome you actually want` + `Then the routine does the work` | Drop benefit subtitle — it's meta-commentary. |
|
||||
|
||||
Alternative if benefit subtitles are structural: rewrite as deliverables, not vibes. `Free, 30 mins, your home` / `Two walks before regulars` / `Photo updates, every walk`.
|
||||
|
||||
### Values
|
||||
|
||||
Current titles read OK. Bodies have a few hedges to fix:
|
||||
|
||||
- `"4 to 8 dogs. Always. Calm, structured walks with real attention for every dog."` → **`"4 to 8 dogs. Always. Calm walks, real attention."`** (drop "for every dog" — implied)
|
||||
- `"Pet first aid certified. Careful screening. Proactive handling. Not extras — the baseline."` → keep, but "proactive handling" is fluff. → **`"Pet first aid certified. Careful screening. Not extras — the baseline."`**
|
||||
- `"You should not have to chase your dog walker. Consistent pickup. Clear communication. Nothing to manage."` → **`"You shouldn't have to chase a dog walker. Same pickup time. Clear updates. Nothing to manage."`** (contraction, "consistent pickup" → "same pickup time")
|
||||
|
||||
### Booking subtitles
|
||||
|
||||
Current generalSubtitle: `"A few details. We reply properly within 24 hours."`
|
||||
|
||||
"Properly" is a hedge that sounds defensive. Drop it.
|
||||
→ **`"A few details. We reply within 24 hours."`**
|
||||
|
||||
### Locations & Hours intro
|
||||
|
||||
Current: `"We cover most of Auckland Central's suburbs:"`
|
||||
|
||||
Proposal: **`"We cover Auckland Central:"`**
|
||||
"Most of" is a hedge that undercuts the long list of suburbs immediately below.
|
||||
|
||||
---
|
||||
|
||||
## 3. Pack Walks (`pack-walks.ts`)
|
||||
|
||||
### Hero — 5 paragraphs is too many
|
||||
|
||||
The hero currently delivers: who it's for, how it works, walk length, coverage, who it isn't for. Five paragraphs. Most heroes earn their keep in 2-3. The "who it isn't for" line belongs in the decision block (and it's already there).
|
||||
|
||||
Proposal — collapse to three paragraphs:
|
||||
|
||||
> "Tiny Gang is built for small and medium dogs who like the right kind of company. 4 to 8 dogs, matched on size and energy."
|
||||
>
|
||||
> "Free Meet & Greet at home, then two assessment walks. Regular slot only once we know the fit is right."
|
||||
>
|
||||
> "60 to 75 minutes on the ground. We rotate Western Springs, Fowlds Park, Cornwall Park, Grey Lynn Park, and Oakley Creek — picked on the day for weather and group."
|
||||
|
||||
Coverage line moves down to the Highlight or Pricing block where it does work. The "if your dog isn't a fit" line lives in the decision block — no need to preview it here.
|
||||
|
||||
### Pricing intro
|
||||
|
||||
Current: `"Right amount of exercise. Right amount of social time. Same walker every week."`
|
||||
|
||||
Proposal: **`"Right exercise. Right social time. Same walker every week."`** Cut the repeated "amount of". Reads faster.
|
||||
|
||||
### Pricing plan features
|
||||
|
||||
The features hedge with "Best for…" which sounds product-y. Rewrite as straight facts:
|
||||
|
||||
| Plan | Current 4th feature | Proposal |
|
||||
|---|---|---|
|
||||
| 1 Walk Per Week | `Best for dogs starting out` | `Good for dogs starting out` (or drop) |
|
||||
| 2-3 Walks Per Week | `Best fit for busy owners` | `Most popular routine` (matches `popular: true` flag) |
|
||||
| 4-5 Walks Per Week | `Best for high-energy social dogs` | `For high-energy social dogs` |
|
||||
| Casual Pack Walk | `Higher rate than weekly routines` | Drop — price already shows it |
|
||||
|
||||
### Benefits intro
|
||||
|
||||
Current: `"Small groups. Compatible dogs. No chaos. That is why it works."`
|
||||
|
||||
Proposal: **`"Small groups. Compatible dogs. No chaos. That's why it works."`** Contraction. (Same pattern repeats elsewhere — see § 6.)
|
||||
|
||||
### Benefit titles — abstract vs concrete
|
||||
|
||||
- `"No overwhelming dynamics"` → **`"No bigger dogs to dodge"`** (concrete)
|
||||
- `"A routine you can rely on"` → **`"A weekly routine that sticks"`** (matches highlight block phrasing already used on the same page)
|
||||
- `"Real individual attention"` → **`"Eyes on every dog"`**
|
||||
- `"Safety, built in"` → **`"Safer than a one-size pack"`**
|
||||
|
||||
### Booking dogIntro
|
||||
|
||||
Current: `"Tell us about your dog. Where you are. Anything we should know. We will come back about whether Tiny Gang is the right fit."`
|
||||
|
||||
Proposal: **`"Tell us about your dog. Where you are. Anything we should know. We'll come back about the fit."`** Contraction, drop "whether Tiny Gang is the right" (implied from page).
|
||||
|
||||
---
|
||||
|
||||
## 4. Solo Walks (`dog-walking.ts`)
|
||||
|
||||
### Hero — five paragraphs again, same pattern
|
||||
|
||||
Current paragraphs 1-5 cover: who it's for, the dog types, walk length, coverage, honesty-at-Meet-&-Greet. Same compression opportunity.
|
||||
|
||||
Proposal — three paragraphs:
|
||||
|
||||
> "Built for dogs who do better one-on-one. Their pace. Their walk. Same walker every time."
|
||||
>
|
||||
> "Reactive on the lead. Recovering from surgery. A senior who needs it slower. An anxious rescue still finding their feet. These are the dogs solo walks are for."
|
||||
>
|
||||
> "30 minutes for seniors or lower energy. 45 for most. 60 for dogs who want a longer outing. Door-to-door, photo update after every walk."
|
||||
|
||||
The "honesty at Meet & Greet" sentence is already said on every other page — it's a brand-wide promise, not a hero claim.
|
||||
|
||||
### Highlight points
|
||||
|
||||
- `"For larger or more sensitive dogs"` body: `"When your dog needs more space, more clarity, or more attention — this gives us room to do it properly."` → **`"For dogs who need more space, clarity, or attention. We have room to give it."`** (drop "When your dog needs" → just state who it's for)
|
||||
|
||||
### Pricing intro
|
||||
|
||||
Current: `"Shaped around your dog, not a group schedule. For dogs who need extra attention, a steadier pace, or a more personal routine."`
|
||||
|
||||
Proposal: **`"Shaped around your dog. For dogs who need extra attention, a steadier pace, or more personal time."`** Cuts "not a group schedule" (over-explained by context), trims "more personal routine" → "more personal time" (concrete).
|
||||
|
||||
### Pricing plan features
|
||||
|
||||
Same pattern as pack-walks. Drop hedging "Best for…" labels or rewrite as facts.
|
||||
|
||||
| Plan | Current 4th feature | Proposal |
|
||||
|---|---|---|
|
||||
| 30 Min | `Good fit for lower-energy dogs` | `For seniors and lower-energy dogs` |
|
||||
| 45 Min | `Best fit for many routines` | `Most popular length` |
|
||||
| 60 Min | `Best for dogs needing a fuller outing` | `For dogs who want a longer outing` |
|
||||
|
||||
### Pricing scarcityNote
|
||||
|
||||
Current: `"A limited number of 1:1 slots are available each week."`
|
||||
|
||||
Proposal: **`"Solo slots are limited each week."`** Active, shorter, no passive "are available".
|
||||
|
||||
### Benefits intro
|
||||
|
||||
Current: `"More space. Steadier handling. A pace that fits. The whole week feels easier."`
|
||||
|
||||
Already strong. Keep.
|
||||
|
||||
### Benefit titles
|
||||
|
||||
- `"Full attention. No competition."` — keep. Strong.
|
||||
- `"The walk matches their pace"` → **`"A walk at their pace"`** (more direct)
|
||||
- `"Room to relax"` body has 21 words and ends in "without group pressure" — third time the page implies group pressure. Compress: **`"Without group pressure, anxious dogs move through the world more easily."`**
|
||||
- `"A routine built around you both"` body: `"1:1 gives us flexibility to build a routine that works for your dog and your week."` → **`"We shape the routine around your dog and your week."`** (drop "1:1 gives us flexibility" — meta-framing, redundant)
|
||||
|
||||
### Booking dogIntro
|
||||
|
||||
Current: `"Tell us about your dog. Where you are. Anything we should know. We will come back about the right fit."`
|
||||
|
||||
Proposal: **`"Tell us about your dog. Where you are. Anything we should know. We'll come back about the fit."`** Match pack-walks pattern; contraction.
|
||||
|
||||
---
|
||||
|
||||
## 5. Puppy Visits (`puppy-visits.ts`)
|
||||
|
||||
### Hero subtitle
|
||||
|
||||
Current: `"While you're at work, your puppy is fed, played with, and looked after. At home."`
|
||||
|
||||
This is the v1 voice-doc's chosen example. Keep.
|
||||
|
||||
### Hero paragraphs
|
||||
|
||||
Currently four. Paragraph 3 is the strongest (the growth-plates / vet rationale) and is buried. Reorder + tighten:
|
||||
|
||||
Proposal:
|
||||
> "A visit means a toilet break, fresh water, a feed if scheduled, play, and calm settling time before we leave. Photo update lands in your phone."
|
||||
>
|
||||
> "Short visits beat long walks while your puppy is growing. Vets recommend low-impact exercise until growth plates settle — usually 12 to 18 months. Visits give them company and stimulation without the joint stress."
|
||||
>
|
||||
> "Visits are also where Goodwalk usually starts. We know your puppy early, so the move to solo walks or Tiny Gang later is smooth."
|
||||
|
||||
Coverage line ("Across Auckland Central — Mt Eden, Ponsonby...") goes to the chip / FAQ. Three paragraphs, clearer order: what happens → why it's right for puppies → where it leads.
|
||||
|
||||
### Highlight title
|
||||
|
||||
Current: `"Calm routines now. A smoother Tiny Gang later."`
|
||||
|
||||
Already nice. Keep.
|
||||
|
||||
### Decision footnote
|
||||
|
||||
Current: `"Free Meet & Greet first. Always."`
|
||||
|
||||
Already nice. Keep.
|
||||
|
||||
### Pricing intro
|
||||
|
||||
Current: `"Built around your puppy. Real support now. Foundations for later, if Tiny Gang is the right fit."`
|
||||
|
||||
Proposal: **`"Built around your puppy. Real support now. Foundations for whatever comes next."`** "If Tiny Gang is the right fit" hedges and over-explains. The "whatever comes next" implies the same thing without conditional language.
|
||||
|
||||
### Plan features — same hedge pattern
|
||||
|
||||
| Plan | Current 4th feature | Proposal |
|
||||
|---|---|---|
|
||||
| 20 Min | `Good for shorter midday support` | `For shorter midday support` |
|
||||
| 45 Min | `Best fit for many puppies` | `Most popular visit length` |
|
||||
| 60 Min | `Best for pups needing more time` | `For pups who need more time` |
|
||||
|
||||
### scarcityNote
|
||||
|
||||
Current: `"Puppy Visit spaces are limited so we can keep care consistent."`
|
||||
|
||||
Proposal: **`"Puppy Visit spaces are limited."`** The reason is obvious and over-explained.
|
||||
|
||||
### Benefits intro
|
||||
|
||||
Current: `"The puppy stage moves fast. Daytime visits give your puppy support now — and build the routines that make later life easier."`
|
||||
|
||||
Proposal: **`"The puppy stage moves fast. Daytime visits help now, and build routines that make later life easier."`** Drop "give your puppy support" (abstract), use "help now" (concrete verb).
|
||||
|
||||
### Benefit body fixes
|
||||
|
||||
- `"Foundations for Tiny Gang later"` body: `"For puppies who may join Tiny Gang one day, early visits build the confidence and routines that make the next step smooth."` — TWO hedges in one sentence ("may", "one day"). → **`"For puppies who'll join Tiny Gang later, early visits build the confidence and routines that make the next step smooth."`**
|
||||
- `"Support for busy owners too"` body has `"during a demanding stage"` — vague. → **`"Real help when puppies are learning fast. Guidance from someone who's been through this stage with dozens of dogs."`**
|
||||
|
||||
### FAQ "How long is each visit?"
|
||||
|
||||
Current answer says "30 minutes — the sweet spot" but the pricing plan starts at **20 minutes**. Inconsistency — fix the FAQ, not the price.
|
||||
|
||||
Proposal: **`"20 minutes for shorter midday support. 45 minutes for most puppies. 60 minutes if your pup needs more time."`** Matches the pricing plans exactly.
|
||||
|
||||
### FAQ "Can Puppy Visits lead into Tiny Gang…"
|
||||
|
||||
Current: `"Exactly what they are designed for. When your puppy is old enough and the right temperament fit, we already know them well. The next step is smooth, not new."`
|
||||
|
||||
Proposal: **`"Exactly what they're for. By the time your puppy is old enough, we already know them. The next step is smooth, not new."`** Contraction, drop "and the right temperament fit" (implied), drop "designed for" (passive-corporate).
|
||||
|
||||
### Booking dogIntro
|
||||
|
||||
Current: `"Tell us about your puppy. Where you are. Their routine. Anything we should know — and we will plan the right visit."`
|
||||
|
||||
Proposal: **`"Tell us about your puppy. Where you are. Their routine. We'll plan the right visit."`** Drop "Anything we should know — and we will" (redundant, hedging).
|
||||
|
||||
---
|
||||
|
||||
## 6. About page (`about.ts`)
|
||||
|
||||
### "Who we are" section
|
||||
|
||||
Current:
|
||||
> "Alessandra started Goodwalk because she could not find a walker she trusted. So she became one."
|
||||
> "She walks every dog herself. Posts photos to Instagram so you can see your dog's day. Knows some of the Tiny Gang from ten weeks old."
|
||||
> "Thirty-plus five-star Google reviews say the same thing: the dogs adore her, and their owners finally stop worrying."
|
||||
|
||||
Line 1 is gold. Keep. Line 2 is fine. Line 3 has "say the same thing" which is filler.
|
||||
|
||||
Proposal line 3: **`"Thirty-plus five-star Google reviews: the dogs adore her, and their owners stop worrying."`** Drop "say the same thing" and "finally" (mild hedge).
|
||||
|
||||
### "How we do things"
|
||||
|
||||
Current:
|
||||
> "Calm handling. Positive reinforcement. A walker who already knows your dog. Same principles, every walk."
|
||||
> "Small packs because attention matters. Free pickup and drop-off because your day should not work around us. First aid certified. Public liability insured. That part is not negotiable."
|
||||
|
||||
Line 2 is doing six things at once. Split:
|
||||
|
||||
Proposal:
|
||||
> "Calm handling. Positive reinforcement. A walker who already knows your dog. Same principles, every walk."
|
||||
> "Small packs because attention matters. Free pickup and drop-off because your day shouldn't work around ours."
|
||||
> "First aid certified. Public liability insured. Not negotiable."
|
||||
|
||||
Three paragraphs, three jobs. Contraction on "shouldn't".
|
||||
|
||||
### "Meet the founder" — line 3 (Maya)
|
||||
|
||||
Current: `"Maya is the reason small dogs sit at the centre of everything. A Cavalier King Charles cross Shih Tzu. Opinionated. Dramatic in the rain. Completely impossible to ignore on a walk — and the best argument we have for building a service around small dogs, not one that just makes room for them."`
|
||||
|
||||
Strong texture, but ends with a 27-word sentence past the voice budget (max ~24). Split:
|
||||
|
||||
Proposal:
|
||||
> "Maya is the reason small dogs sit at the centre of everything. A Cavalier King Charles cross Shih Tzu. Opinionated. Dramatic in the rain. Impossible to ignore on a walk."
|
||||
> "She's the best argument we have for a service built around small dogs — not one that just makes room for them."
|
||||
|
||||
### FAQ "Why do you specialise in small dogs?"
|
||||
|
||||
Current: `"Small dogs need different pace, different group dynamics, different handling. Goodwalk was built around that — not adapted from a generic dog-walking model."`
|
||||
|
||||
Proposal: **`"Small dogs need a different pace, different group dynamics, different handling. We were built around that, not adapted from a generic model."`** Active voice ("We were built" instead of "Goodwalk was built"), trim "dog-walking" (implied).
|
||||
|
||||
### FAQ "What suburbs do you cover?"
|
||||
|
||||
Current has 16 suburb names listed inline. The map / chips already show them. Compress:
|
||||
|
||||
Proposal: **`"Most of Auckland Central — Ponsonby, Grey Lynn, Mt Eden, Kingsland, Herne Bay, Remuera and surrounds. If you're nearby and unsure, just ask."`** Cuts the list to the highest-recognition six. The exhaustive list lives on the homepage Locations block and the coverage map.
|
||||
|
||||
---
|
||||
|
||||
## 7. Locations (`locations.ts`) — sweeping pattern
|
||||
|
||||
Every location intro is structured the same way: descriptive lead → "well-suited / natural home / ideal place for…" → Goodwalk services available → free pickup line. Three of these in a row, the pattern shows.
|
||||
|
||||
### Park descriptions — universal cleanup
|
||||
|
||||
The voice doc says "Replace abstract nouns with concrete verbs". Park blurbs lean on adjective-stacks:
|
||||
|
||||
- `"offers wide open paths, panoramic views across Auckland, and a mix of gentle and steeper terrain"` → **`"Wide open paths, panoramic views, gentle and steep terrain."`** (drop "offers")
|
||||
- `"Popular with local dog walkers and a staple route for the Tiny Gang"` → keep.
|
||||
- `"A well-used neighbourhood park… with open grass areas and shade trees"` → **`"Neighbourhood park with open grass and shade."`**
|
||||
|
||||
Recommend a pass on all 30+ park descriptions: cut every "offers", "provides", "with X and Y" sentence opener, and every "well-suited / ideal place / natural home".
|
||||
|
||||
### Intro pattern — propose a template
|
||||
|
||||
Right now Mt Eden's intro is 71 words. Most location intros are 50-80 words. Voice doc says "Body sentences: max ~24". Propose a 3-sentence template:
|
||||
|
||||
> "[Suburb] [one specific thing — geography, vibe, dog density]. [Goodwalk fact — who from here is in the Tiny Gang / what we run here]. Free pickup and drop-off."
|
||||
|
||||
Worked example, Mt Eden:
|
||||
|
||||
> "Mt Eden's volcanic cone, leafy streets, and mix of reserves and quiet paths make it a daily-outing favourite. We run pack walks and solo walks here weekly, with several Tiny Gang regulars based in the suburb. Free pickup and drop-off included."
|
||||
|
||||
53 words → still long, but every clause does work. Apply the template to all 17 suburbs in a follow-up pass.
|
||||
|
||||
---
|
||||
|
||||
## 8. Repeated lines across pages
|
||||
|
||||
The phrase **"Free pickup and drop-off across Auckland Central"** (or close variants) appears 14+ times: in hero chips, paragraph 4 of every service hero, FAQ answers, the coverage map, the locations page, and the about page. It's a real selling point — but said this often it stops landing.
|
||||
|
||||
Proposal — vary the wording by surface:
|
||||
|
||||
- **Chip** (compact): `"Free pickup & drop-off"`
|
||||
- **Hero paragraph**: usually deletable since the chip is right there. If kept: `"Pickup and drop-off included, across Auckland Central."`
|
||||
- **FAQ**: keep specific — that's where someone is actually checking.
|
||||
- **Footer / coverage block**: `"Door-to-door across Auckland Central."`
|
||||
|
||||
Save the full sentence for places where the suburb list matters.
|
||||
|
||||
---
|
||||
|
||||
## 9. Summary of recurring fixes
|
||||
|
||||
If we agree on the principles below, I can sweep these patterns site-wide without you reviewing each one:
|
||||
|
||||
1. **Drop "Best for / Best fit"** in pricing features. State who it's for, or drop.
|
||||
2. **Contractions** ("we'll", "shouldn't", "they're") where the surrounding tone is conversational.
|
||||
3. **"1:1" → "Solo"** in body copy, navigation, decision blocks. Keep "1:1" in SEO meta/title where keyword volume might matter.
|
||||
4. **Cut "properly", "actually", "genuinely", "really"** unless the sentence dies without them.
|
||||
5. **Cut "we will come back about"** → "we'll reply about" / "we'll come back" (less corporate).
|
||||
6. **Park descriptions**: rewrite the "offers / provides / well-suited / a mix of" sentences as concrete noun phrases.
|
||||
7. **Service hero paragraphs**: target 3 paragraphs, not 5. Coverage and disqualifier lines move down the page.
|
||||
8. **Drop reasons that are already obvious from context** — "so we can keep care consistent", "Higher rate than weekly routines", "in your home" after "in-home".
|
||||
|
||||
---
|
||||
|
||||
## What this changes for the reader
|
||||
|
||||
- Faster scan on every service page (3 hero paragraphs instead of 5).
|
||||
- Consistent terminology between nav, body, and CTAs (no "1:1" / "Solo" / "one-on-one" mix).
|
||||
- Pricing tables stop sounding like a SaaS comparison grid.
|
||||
- Location pages stop reading like council brochures.
|
||||
|
||||
## What it does NOT change
|
||||
|
||||
- The brand voice from `marketing-voice.md` — this proposal is a stricter application of that voice, not a rewrite of it.
|
||||
- SEO `<title>` / `meta description` / `llms.txt` keywords — those remain under a separate review (the "1:1" tradeoff lives there).
|
||||
- Customer testimonials — never edited.
|
||||
- Service names ("Tiny Gang", "Meet & Greet") — kept verbatim.
|
||||
|
||||
---
|
||||
|
||||
**Next step**: redline this file. Strike the changes you don't want, mark anything that needs different phrasing, and I'll apply the rest in one sweep. Or pick a single section to start with (homepage? service heroes? locations?) so we can validate the voice before going site-wide.
|
||||
@@ -0,0 +1,89 @@
|
||||
# Competitor analysis — Auckland dog walking
|
||||
|
||||
A look at what two of our closest competitors do well, and what's worth borrowing for Goodwalk. Captured 2026-05-20.
|
||||
|
||||
---
|
||||
|
||||
## Fetch Dog Walking — https://fetchdogwalking.co.nz
|
||||
|
||||
### What they do well
|
||||
|
||||
- **Founder-led narrative.** Andy Evans is named on the site and the philosophy ("freedom to explore in nature is an essential investment in our dog's health") is front and centre. Feels like a person, not a faceless service.
|
||||
- **Content depth.** They go beyond "book a walk" and publish:
|
||||
- Auckland **Dog Parks** guide
|
||||
- Basic **Training** tips
|
||||
- **FAQs** page
|
||||
- "Our Dogs" and "Our People" pages
|
||||
- **"Dog's Highlight of the Week"** — a recurring content hook that gives existing clients a reason to keep visiting the site and gives new visitors social proof.
|
||||
- **Diversified offering.** The 100-acre Waitakere Ranges farm-stay / boarding service is a real differentiator — they're not just selling walks, they're selling a destination.
|
||||
- **Positions on authority.** Tagline "Auckland's Leading Dog Walking Company" is bold and clear.
|
||||
- **Strong primary CTA.** Homepage contact form is short (company, dog name, phone, email, suburb, message) — low friction.
|
||||
|
||||
### What we could implement
|
||||
|
||||
| Idea | Effort | Why |
|
||||
|---|---|---|
|
||||
| **Founder bio / "About Matt" page** with photo and philosophy | S | Personality is a moat. Easy SEO win for branded searches. |
|
||||
| **"Dog of the Week" / Instagram-style spotlight on the homepage** | M | Gives the site an "alive" feel; reuses content we likely already post to social. Could pull from the existing client_profiles table. |
|
||||
| **Dog parks of Auckland** content page | M | Pure SEO play — high-intent local search ("best dog parks Auckland"). Drives top-of-funnel traffic. |
|
||||
| **Training tips / FAQ content hub** | M | Same SEO logic. Also reduces support load. |
|
||||
| **"Our pack" page showing all dogs we walk** (with owner consent) | S | Trust + community. We already collect dog photos in onboarding. |
|
||||
|
||||
---
|
||||
|
||||
## Sticks & Bones — https://sticksandbones.co.nz
|
||||
|
||||
### What they do well
|
||||
|
||||
- **Process is the product.** They sell their *enrollment process* as a trust signal:
|
||||
1. Free Meet & Greet at home
|
||||
2. **Minimum two Assessment Walks** before enrollment
|
||||
3. Handler matching
|
||||
4. App-based booking
|
||||
This makes the service feel professional and screened — they're not taking everyone.
|
||||
- **Real-time walk reports via app.** Clients get photos and a report after every walk. This is the single biggest differentiator and the most-mentioned feature in their testimonials.
|
||||
- **Concrete trust signals.**
|
||||
- Police-checked handlers
|
||||
- Secure key handling process documented
|
||||
- Handlers named individually ("Amanda walks our Cooper")
|
||||
- Maximum 4 dogs per Urban Adventure Walk (explicit cap = safety)
|
||||
- **Personalised client app** for scheduling, history, and reports — clients self-serve.
|
||||
- **In-home dog sitting**, but only for enrolled walking clients (creates retention + upsell).
|
||||
- **Tagline is benefit-led**, not feature-led: "dog walking made easy" + "active dogs behave better."
|
||||
|
||||
### What we could implement
|
||||
|
||||
| Idea | Effort | Why |
|
||||
|---|---|---|
|
||||
| **Post-walk reports** (photo + short note delivered by email or in the client portal) | L | This is the killer feature. Our admin dashboard already touches client_profiles — extending to walk records is a natural next step. Single biggest perceived-value lift available. |
|
||||
| **Document our enrollment process** as a 3-step visual on the homepage (Enquire → Meet & Greet → First Walk) | S | We already do a Meet & Greet — we're just not selling it. Pure copy/design change. |
|
||||
| **Cap group size publicly** (e.g. "max 4 dogs per pack") | S | Free trust signal if it matches reality. |
|
||||
| **Name the team** with photos on About page | S | Sticks & Bones gets specific mentions of handlers by name in reviews — that only happens when you make handlers visible. |
|
||||
| **Police-check / insurance / first-aid badges** in the footer or About page | S | Cheap credibility. |
|
||||
| **Client portal extensions** — walk history, upcoming bookings, ability to reschedule | L | We already have auth + onboarding + admin dashboard. The data model is most of the way there. |
|
||||
| **"Enrolled clients only" services** as a retention hook (e.g. boarding, sitting) | M | Mirrors S&B's sitting model. Existing clients get priority — gives a reason to stay engaged after onboarding. |
|
||||
|
||||
---
|
||||
|
||||
## Cross-cutting themes
|
||||
|
||||
Both competitors do these things; we should too:
|
||||
|
||||
1. **Named humans on the site.** Founder, team, dogs. The word "we" without faces is worth less.
|
||||
2. **Process as proof.** Both make their intake process visible — it doubles as marketing.
|
||||
3. **Service ladder, not a service.** Walks → assessments → boarding/sitting → premium options. Gives clients somewhere to grow into.
|
||||
4. **Locations as content.** Specific Auckland park / suburb mentions throughout — local SEO and "they know my area" trust.
|
||||
|
||||
## What Goodwalk has that they don't (lean into this)
|
||||
|
||||
- **Multi-step onboarding form** with signature, vet, emergency contacts, behavioural profile — already more thorough than what's visible on either competitor.
|
||||
- **Database-backed client profiles** — foundation for a portal richer than S&B's (their app is the obvious next ceiling; we have data they don't seem to capture).
|
||||
- **Brand-coloured design system** already in place (Goodwalk Green / Yellow) — distinct visual identity vs. the generic blue/green dog-walker templates.
|
||||
|
||||
## Suggested priority order
|
||||
|
||||
1. **Founder/team page + named handlers** (1 day, big trust lift)
|
||||
2. **Visualise the enrollment process on the homepage** (1 day, sells the Meet & Greet we already do)
|
||||
3. **Dog Parks of Auckland content page** (2-3 days, SEO compounding)
|
||||
4. **Post-walk reports** in the client portal (1-2 weeks, table-stakes vs. S&B)
|
||||
5. **Walk history / portal extensions** (2-3 weeks, retention moat)
|
||||
@@ -1,5 +1,47 @@
|
||||
# Deployment
|
||||
|
||||
## Hosts served by this stack
|
||||
|
||||
The Goodwalk Svelte stack serves three subdomains from the same SvelteKit app
|
||||
container, routed by Host header at nginx:
|
||||
|
||||
| Hostname | Purpose |
|
||||
|-----------------------------|--------------------------------------------|
|
||||
| `goodwalk.co.nz` / `www.…` | Public marketing site |
|
||||
| `clients.goodwalk.co.nz` | New-client onboarding + contract portal |
|
||||
| `cp.goodwalk.co.nz` | Owner admin dashboard (Aless only) |
|
||||
|
||||
The shared nginx container reads TLS material from its host bind mount at
|
||||
`/docker/certbot/conf`, exposed inside the container as `/etc/letsencrypt`.
|
||||
The deploy scripts now auto-bootstrap any missing certificates referenced by
|
||||
the shared nginx config, including `clients.goodwalk.co.nz`,
|
||||
`cp.goodwalk.co.nz`, and the legacy HTTPS redirect aliases
|
||||
`onboarding.goodwalk.co.nz` and `admin.goodwalk.co.nz`. They do that by
|
||||
temporarily loading an HTTP-only nginx config and running `certbot/certbot`
|
||||
against the mounted ACME webroot. The only prerequisite is that each
|
||||
hostname's DNS A record already points at the droplet and port `80` is
|
||||
reachable.
|
||||
|
||||
The dashboard's data (`client_profiles`, `allowed_emails`, `drafts`) lives in
|
||||
the shared postgres database alongside the marketing site content, in a single
|
||||
`admin_kv` table created by `docker/postgres/init/002-admin-kv.sql`. The
|
||||
mail-api connects with the same `DATABASE_URL` the SvelteKit app uses.
|
||||
|
||||
### Seeding admin_kv from the old JSON files
|
||||
|
||||
Existing installs have admin data in `client_profiles.json`,
|
||||
`allowed_emails.json`, and `drafts.json` on the mail-api Docker volume. To copy
|
||||
that data into postgres on the next deploy, run:
|
||||
|
||||
```powershell
|
||||
./deploy.ps1 -SeedAdminData
|
||||
```
|
||||
|
||||
That sets `ADMIN_DATA_SEED_FROM_JSON=force` for the mail-api container, which
|
||||
overwrites `admin_kv` from the JSON files on the next boot. Subsequent deploys
|
||||
default back to `auto` (seed only when `admin_kv` is empty), so they are no-ops
|
||||
for the seed. Use `-SeedAdminData` again if you ever need to force a re-seed.
|
||||
|
||||
## Server layout confirmed
|
||||
|
||||
The production server currently runs multiple separate Docker Compose projects:
|
||||
@@ -7,7 +49,7 @@ The production server currently runs multiple separate Docker Compose projects:
|
||||
- Main public site WordPress stack:
|
||||
- project: `goodwalkconz`
|
||||
- path: `/docker/wordpress/goodwalk.co.nz`
|
||||
- Onboarding WordPress stack:
|
||||
- Legacy onboarding WordPress stack:
|
||||
- project: `onboardinggoodwalkconz`
|
||||
- path: `/docker/wordpress/onboarding.goodwalk.co.nz`
|
||||
- Shared nginx:
|
||||
@@ -52,7 +94,7 @@ containers untouched.
|
||||
- Repo-local SSH config used by the deployment script.
|
||||
- [nginx/goodwalk.co.nz.svelte.conf.example](nginx/goodwalk.co.nz.svelte.conf.example)
|
||||
- Example shared-nginx config for routing the main public site to the new
|
||||
Svelte app and mail API, including the onboarding subdomain.
|
||||
Svelte app and mail API, including the `clients` and `cp` subdomains.
|
||||
|
||||
## First-time server preparation
|
||||
|
||||
@@ -73,9 +115,10 @@ mkdir -p /docker/goodwalk-svelte
|
||||
It is created from [deploy.env.template](deploy.env.template). Current template contents:
|
||||
|
||||
```env
|
||||
APP_VERSION=4.2.3
|
||||
APP_VERSION=4.0.1
|
||||
ENABLE_GENERAL_ENQUIRIES=false
|
||||
PUBLIC_ENABLE_MOBILE_CTA_BUTTON=false
|
||||
PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES=false
|
||||
TZ=Pacific/Auckland
|
||||
|
||||
POSTGRES_DB=goodwalk
|
||||
@@ -85,8 +128,11 @@ POSTGRES_PASSWORD_URLENCODED=gw_Pg_7Jm9%21Qx4%23Ld2%40Vr8
|
||||
|
||||
RESEND_API_KEY=replace-me
|
||||
OWNER_EMAIL=replace-me
|
||||
SECONDARY_CP_EMAIL=
|
||||
SECONDARY_CP_EMAILS=
|
||||
FROM_EMAIL=GoodWalk <bookings@goodwalk.co.nz>
|
||||
REPLY_TO=aless@goodwalk.co.nz
|
||||
MAIL_API_DATA_DIR=/app/data
|
||||
|
||||
FORM_MIN_SECONDS=4
|
||||
FORM_MAX_SECONDS=7200
|
||||
@@ -94,6 +140,7 @@ RATE_LIMIT_WINDOW_SECONDS=900
|
||||
RATE_LIMIT_MAX_PER_IP=5
|
||||
RATE_LIMIT_MAX_PER_EMAIL=3
|
||||
RATE_LIMIT_MIN_INTERVAL_SECONDS=20
|
||||
EMAIL_SEND_TIMEOUT_SECONDS=20
|
||||
```
|
||||
|
||||
After the first deploy, edit `/docker/goodwalk-svelte/.env` on the server and replace:
|
||||
@@ -101,10 +148,19 @@ After the first deploy, edit `/docker/goodwalk-svelte/.env` on the server and re
|
||||
- `RESEND_API_KEY=replace-me`
|
||||
- `OWNER_EMAIL=replace-me`
|
||||
|
||||
Optional CP dashboard admins:
|
||||
|
||||
- `SECONDARY_CP_EMAIL=person@example.com`
|
||||
- `SECONDARY_CP_EMAILS=bob@smith.com;bobsmith2@smith.com`
|
||||
|
||||
`OWNER_EMAIL` always keeps CP access. The secondary values are optional and may be
|
||||
semicolon-, comma-, or whitespace-separated.
|
||||
|
||||
Frontend flags:
|
||||
|
||||
- `PUBLIC_ENABLE_MOBILE_CTA_BUTTON=false` keeps the sticky mobile booking CTA hidden.
|
||||
- Set `PUBLIC_ENABLE_MOBILE_CTA_BUTTON=true` to show it again.
|
||||
- `PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES=false` skips eager `@sveltejs/enhanced-img` processing for content images during production builds. Turn it on only if you intentionally want non-WebP images from `src/lib/images` to go through the imagetools pipeline.
|
||||
|
||||
4. Confirm the shared Docker network already exists:
|
||||
|
||||
@@ -114,6 +170,17 @@ docker network ls | grep webnet
|
||||
|
||||
Your server already uses `webnet`, so this should already be present.
|
||||
|
||||
5. Confirm the shared nginx compose mounts still point at the host certbot
|
||||
paths expected by the deploy scripts:
|
||||
|
||||
```yaml
|
||||
- /docker/certbot/conf:/etc/letsencrypt:ro
|
||||
- /docker/certbot/www:/var/www/certbot:ro
|
||||
```
|
||||
|
||||
The scripts inspect the running `nginx` container to derive those host paths
|
||||
before checking or issuing certificates.
|
||||
|
||||
## First deploy
|
||||
|
||||
From Windows PowerShell in the repo root:
|
||||
@@ -218,6 +285,18 @@ The deployment flow now handles that automatically:
|
||||
This means future deploys will carry your latest file-based homepage/navigation/
|
||||
shared content changes into production PostgreSQL automatically.
|
||||
|
||||
## Mail auth persistence
|
||||
|
||||
The mail API stores auth state in `DATA_DIR`, including:
|
||||
|
||||
- `allowed_emails.json`
|
||||
- `client_profiles.json`
|
||||
- `drafts.json`
|
||||
|
||||
Both compose files now mount a named Docker volume at `MAIL_API_DATA_DIR`
|
||||
(default `/app/data`) so previously registered client emails and saved drafts
|
||||
survive container rebuilds and redeploys.
|
||||
|
||||
## Cutover nginx
|
||||
|
||||
After the new Svelte stack is up and healthy, update the shared nginx config on
|
||||
@@ -238,8 +317,10 @@ nginx/goodwalk.co.nz.svelte.conf.example
|
||||
Important:
|
||||
- `deploy.ps1` now copies the repo nginx config to `/docker/nginx/conf.d/goodwalk.co.nz.conf` and reloads the shared nginx container as part of deployment.
|
||||
- The repo nginx config uses Docker's internal resolver so future app/mail container rebuilds will not leave nginx pinned to stale upstream IPs.
|
||||
- The same nginx config now also routes `onboarding.goodwalk.co.nz` to the Svelte app and `/api/onboarding-submit` to the shared mail API.
|
||||
- Before cutover, confirm the server has a valid certificate for `onboarding.goodwalk.co.nz`, or adjust the onboarding certificate paths in the nginx config to match your cert layout.
|
||||
- The same nginx config now also routes `clients.goodwalk.co.nz` to the Svelte app and `/api/onboarding-submit` to the shared mail API.
|
||||
- The owner dashboard is now served on `cp.goodwalk.co.nz`.
|
||||
- `onboarding.goodwalk.co.nz` and `admin.goodwalk.co.nz` should be kept only as redirect aliases once their DNS and TLS are in place.
|
||||
- The deploy script will attempt to issue any missing certificates for `clients.goodwalk.co.nz`, `cp.goodwalk.co.nz`, and `onboarding.goodwalk.co.nz` before the final nginx reload.
|
||||
|
||||
Manual nginx commands, if you ever need them:
|
||||
|
||||
@@ -6,7 +6,7 @@ The goal is not trend-chasing. The goal is to create a calm, trustworthy, modern
|
||||
|
||||
---
|
||||
|
||||
# Core Principles
|
||||
## Core Principles
|
||||
|
||||
## 1. Warmth over perfection
|
||||
Goodwalk is a human service business. The experience should feel:
|
||||
@@ -84,7 +84,7 @@ Modern premium design in 2026 is increasingly about restraint.
|
||||
|
||||
---
|
||||
|
||||
# Colour System
|
||||
## Colour System
|
||||
|
||||
Defined in:
|
||||
`src/lib/styles/variables.css`
|
||||
@@ -104,7 +104,7 @@ Defined in:
|
||||
|
||||
---
|
||||
|
||||
# Colour Philosophy
|
||||
## Colour Philosophy
|
||||
|
||||
## Greens
|
||||
The green palette represents:
|
||||
@@ -150,7 +150,7 @@ This creates a warmer, more refined feel.
|
||||
|
||||
---
|
||||
|
||||
# Surface Design
|
||||
## Surface Design
|
||||
|
||||
## Philosophy
|
||||
Modern interfaces should feel layered rather than flat.
|
||||
@@ -214,7 +214,7 @@ These gradients should be nearly invisible.
|
||||
|
||||
---
|
||||
|
||||
# Typography
|
||||
## Typography
|
||||
|
||||
Defined in:
|
||||
`src/lib/styles/typography.css`
|
||||
@@ -226,7 +226,7 @@ Defined in:
|
||||
|
||||
---
|
||||
|
||||
# Typography Philosophy
|
||||
## Typography Philosophy
|
||||
|
||||
Typography should create:
|
||||
- confidence
|
||||
@@ -242,7 +242,7 @@ Avoid:
|
||||
|
||||
---
|
||||
|
||||
# Typography Rules
|
||||
## Typography Rules
|
||||
|
||||
## Body copy
|
||||
Desktop:
|
||||
@@ -289,7 +289,7 @@ Spacing should create hierarchy more than font weight.
|
||||
|
||||
---
|
||||
|
||||
# Spacing System
|
||||
## Spacing System
|
||||
|
||||
## Philosophy
|
||||
Modern premium interfaces feel expensive because they are under-filled.
|
||||
@@ -318,7 +318,7 @@ Avoid arbitrary spacing values.
|
||||
|
||||
---
|
||||
|
||||
# Border Radius
|
||||
## Border Radius
|
||||
|
||||
| Context | Radius |
|
||||
|---|---|
|
||||
@@ -335,7 +335,7 @@ Avoid:
|
||||
|
||||
---
|
||||
|
||||
# Shadows & Depth
|
||||
## Shadows & Depth
|
||||
|
||||
## Philosophy
|
||||
Modern depth is atmospheric, not dramatic.
|
||||
@@ -371,7 +371,7 @@ inset 0 1px 0 rgba(255,255,255,0.04);
|
||||
|
||||
---
|
||||
|
||||
# Texture & Grain
|
||||
## Texture & Grain
|
||||
|
||||
## Philosophy
|
||||
Digital flatness feels artificial.
|
||||
@@ -391,7 +391,7 @@ Texture must never become visibly noisy.
|
||||
|
||||
---
|
||||
|
||||
# Motion System
|
||||
## Motion System
|
||||
|
||||
## Philosophy
|
||||
Motion should feel calm and physical.
|
||||
@@ -433,7 +433,7 @@ filter: brightness(1.02)
|
||||
|
||||
---
|
||||
|
||||
# Cards
|
||||
## Cards
|
||||
|
||||
## Philosophy
|
||||
Cards should not feel disconnected from the layout.
|
||||
@@ -450,7 +450,7 @@ Avoid:
|
||||
|
||||
---
|
||||
|
||||
# Photography Direction
|
||||
## Photography Direction
|
||||
|
||||
## This is one of the most important parts of the brand.
|
||||
|
||||
@@ -487,7 +487,7 @@ not:
|
||||
|
||||
---
|
||||
|
||||
# Layout Philosophy
|
||||
## Layout Philosophy
|
||||
|
||||
## Editorial rhythm
|
||||
Not every section should feel identical.
|
||||
@@ -515,7 +515,7 @@ Avoid perfect grid rigidity everywhere.
|
||||
|
||||
---
|
||||
|
||||
# Interaction Design
|
||||
## Interaction Design
|
||||
|
||||
## Buttons
|
||||
Buttons should feel:
|
||||
@@ -537,7 +537,7 @@ Not distract.
|
||||
|
||||
---
|
||||
|
||||
# Navigation
|
||||
## Navigation
|
||||
|
||||
The navigation should feel:
|
||||
- lightweight
|
||||
@@ -553,7 +553,7 @@ The navigation exists to support trust and conversion.
|
||||
|
||||
---
|
||||
|
||||
# Mobile UX Principles
|
||||
## Mobile UX Principles
|
||||
|
||||
## Thumb-first interaction
|
||||
Primary actions should remain reachable.
|
||||
@@ -572,7 +572,7 @@ Not simply shrink desktop layouts.
|
||||
|
||||
---
|
||||
|
||||
# Accessibility
|
||||
## Accessibility
|
||||
|
||||
Always support:
|
||||
- reduced motion
|
||||
@@ -585,7 +585,7 @@ Accessibility should feel integrated, not bolted on.
|
||||
|
||||
---
|
||||
|
||||
# Design Language Keywords
|
||||
## Design Language Keywords
|
||||
|
||||
The Goodwalk experience should feel:
|
||||
|
||||
@@ -613,7 +613,7 @@ Never:
|
||||
|
||||
---
|
||||
|
||||
# What To Prioritise Next
|
||||
## What To Prioritise Next
|
||||
|
||||
Highest impact improvements:
|
||||
|
||||
@@ -630,7 +630,7 @@ Highest impact improvements:
|
||||
|
||||
---
|
||||
|
||||
# Final Rule
|
||||
## Final Rule
|
||||
|
||||
If a design decision looks impressive but reduces:
|
||||
- clarity
|
||||
@@ -644,7 +644,7 @@ Goodwalk should feel premium because it feels thoughtful — not because it feel
|
||||
|
||||
---
|
||||
|
||||
# Implementation Reference
|
||||
## Implementation Reference
|
||||
|
||||
Technical specs for what is currently live. Update this section when the codebase changes.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# OVERLOAD.md — Section flow audit & cuts
|
||||
# Homepage Section Flow Audit
|
||||
|
||||
Evaluating each section of the Goodwalk homepage against one question: **does this section move a researching dog owner closer to booking, or does it just take up scroll?**
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
A working reference for the Goodwalk site rebuild and ongoing marketing decisions. Drawn from Chris Do (The Futur) and Debbie Millman (Design Matters), applied to the goal of acquiring 10 new clients.
|
||||
|
||||
# Checklist
|
||||
## Checklist
|
||||
* Prioritise emotional trust before visual impressiveness.
|
||||
* Reduce cognitive load on every screen and interaction.
|
||||
* Every page should answer: “Am I in the right place?”
|
||||
@@ -0,0 +1,197 @@
|
||||
# Goodwalk Marketing Voice
|
||||
|
||||
A practical guide for writing site copy that sells without sounding like it's selling.
|
||||
|
||||
## The voice in one line
|
||||
|
||||
**A trusted neighbour who happens to be brilliant at this.** Calm, certain, warm, specific. Not corporate. Not chirpy. Not over-promising.
|
||||
|
||||
## What we're borrowing from Apple
|
||||
|
||||
Apple's marketing works because it does three things ruthlessly:
|
||||
|
||||
1. **Leads with the outcome, not the process.** "A thousand songs in your pocket" — not "5GB of solid-state storage."
|
||||
2. **Makes the decision feel small.** Confident, declarative sentences. No hedging.
|
||||
3. **Cuts every word the meaning doesn't need.** Short. Then one longer line for texture. Then short again.
|
||||
|
||||
For a service business, the equivalent is selling the **evening** (calm dog, settled house, no guilt), not the **walk** (60 minutes, pickup included, group size 4–8).
|
||||
|
||||
## Voice attributes
|
||||
|
||||
| Attribute | What it means | What it isn't |
|
||||
|---|---|---|
|
||||
| **Calm** | Even cadence. No exclamation marks. No "amazing!" or "incredible!" | Hyped, sales-y |
|
||||
| **Certain** | "We do X." Not "We try to X" or "We may be able to X." | Arrogant, brash |
|
||||
| **Warm** | Real feeling for dogs and owners. "Your dog comes home tired and happy." | Saccharine, cutesy ("fur babies", "pawsome") |
|
||||
| **Specific** | Names suburbs, parks, times. Numbers when they help. | Vague ("various", "a wide range", "we offer") |
|
||||
| **Honest** | If a service isn't right for a dog, we say so. | False scarcity, manipulative urgency |
|
||||
|
||||
## Principles
|
||||
|
||||
### 1. Lead with the customer's win, not your feature
|
||||
|
||||
Open every section with what the **owner gets** or what the **dog feels**. The mechanism comes second.
|
||||
|
||||
> ❌ "Tiny Gang Pack Walks are built for Auckland Central owners of small and medium dogs who want a reliable weekly routine."
|
||||
>
|
||||
> ✅ "Your dog comes home tired and happy. You stop worrying through the workday. That's the whole point."
|
||||
|
||||
### 2. Cut every hedge
|
||||
|
||||
Search-and-destroy these words: *can, may, might, try to, more, genuinely, properly, generally, often, typically, possibly.* Each one quietly weakens the sentence.
|
||||
|
||||
> ❌ "Walks tailored to your dog's pace, confidence, and routine."
|
||||
>
|
||||
> ✅ "Built around your dog. Their pace. Their walk."
|
||||
|
||||
### 3. Short. Then long. Then short.
|
||||
|
||||
Vary the rhythm. A wall of medium-length sentences is the most boring possible cadence.
|
||||
|
||||
> ❌ "Goodwalk Tiny Gang Pack Walks are built for Auckland Central owners of small and medium dogs who want a reliable weekly routine, a well-exercised dog, and more peace of mind during the workday."
|
||||
>
|
||||
> ✅ "A walk your dog looks forward to. A routine you don't have to manage. Pickup, walk, drop-off, photo update — every time, without you having to ask."
|
||||
|
||||
### 4. Active voice, present tense
|
||||
|
||||
Things happen. We do them. Your dog enjoys them. Avoid "are designed to" / "is intended for" / "can be tailored."
|
||||
|
||||
> ❌ "Our visits are intended to provide enrichment and support during the day."
|
||||
>
|
||||
> ✅ "We visit. We play. We feed. You get a photo when we leave."
|
||||
|
||||
### 5. Replace abstract nouns with concrete verbs
|
||||
|
||||
"Provide structure" → "settles them." "Build confidence" → "they stop pulling on the lead." "Ensure consistency" → "same walker, every time."
|
||||
|
||||
### 6. Specifics build trust faster than adjectives
|
||||
|
||||
"A well-loved local park" tells me nothing. "Western Springs at 9:15, Cornwall Park on Wednesdays" tells me you're real.
|
||||
|
||||
### 7. Sell the relief
|
||||
|
||||
Owners aren't buying a walk. They're buying: a quieter evening, a guilt-free workday, one fewer thing to manage. Name those.
|
||||
|
||||
### 8. One idea per sentence
|
||||
|
||||
If you wrote a comma, ask whether it should be a full stop.
|
||||
|
||||
## Patterns we use
|
||||
|
||||
### Headlines
|
||||
|
||||
Two flavours, used purposefully:
|
||||
|
||||
- **Outcome line:** "Come home to a calm, happy dog."
|
||||
- **Definitional line:** "Pack walks for small dogs that actually suit small dogs."
|
||||
|
||||
Avoid: "Welcome to Goodwalk." / "About Us." / "Our Services."
|
||||
|
||||
### Subheads / leads
|
||||
|
||||
One sentence. Says what the section delivers, not what it is.
|
||||
|
||||
> ❌ "About our pack walks"
|
||||
>
|
||||
> ✅ "Four to eight dogs. Same walker every time. Home by mid-afternoon."
|
||||
|
||||
### Body copy
|
||||
|
||||
- 1–3 short paragraphs max per section
|
||||
- Lead sentence is the most important; treat it like a headline
|
||||
- One link or CTA per paragraph, max
|
||||
|
||||
### CTAs
|
||||
|
||||
Action + outcome, never just "Submit" or "Learn more."
|
||||
|
||||
| ❌ | ✅ |
|
||||
|---|---|
|
||||
| Submit | Book a free Meet & Greet |
|
||||
| Learn more | See if Tiny Gang fits your dog |
|
||||
| Contact us | Talk to Aless |
|
||||
| Get started | Start with a Meet & Greet |
|
||||
|
||||
### FAQ answers
|
||||
|
||||
- First sentence answers the question completely
|
||||
- Second sentence (if any) adds the texture
|
||||
- No "Great question!" / "Glad you asked"
|
||||
|
||||
> Q: How big are the pack walks?
|
||||
>
|
||||
> ✅ "4–8 dogs, carefully matched on size and energy. We never run oversized packs — the small group size is the whole point."
|
||||
|
||||
## Words and phrases
|
||||
|
||||
### Use
|
||||
|
||||
- **You / your dog** — far more than "owners" or "clients"
|
||||
- **We** — direct, owned. Not "the team" or "our walkers"
|
||||
- **Walk, visit, pickup, drop-off** — the customer's words
|
||||
- **Tiny Gang** — our signature, use sparingly so it stays distinct
|
||||
- **Auckland Central** — anchors local intent
|
||||
- Concrete park names, suburb names, times
|
||||
|
||||
### Avoid
|
||||
|
||||
- "Solutions" — never. We're not enterprise software.
|
||||
- "Services" as a noun in body copy — too distant. Name the thing.
|
||||
- "Pet parents" / "fur babies" / "pup parents" — twee
|
||||
- "Pawsome" / "pawfect" / any pun — never
|
||||
- "We are passionate about" — show, don't tell
|
||||
- "Industry-leading" / "best in class" / "premium" — empty
|
||||
- "Reach out" — say "email" or "text" or "call"
|
||||
- Exclamation marks in headlines or body copy
|
||||
|
||||
## Sentence length budget
|
||||
|
||||
- **Headlines:** ≤ 8 words
|
||||
- **Subheads:** ≤ 14 words
|
||||
- **Body sentences:** average 12–16 words, max ~24
|
||||
- **First sentence of any section:** ≤ 12 words
|
||||
|
||||
If you wrote a 30-word sentence, it's two sentences.
|
||||
|
||||
## Before / after, from the live site
|
||||
|
||||
### Hero subtitle (homepage)
|
||||
|
||||
> ❌ "Reliable dog walking for busy Auckland owners who want happier dogs, calmer evenings, and a team they can trust."
|
||||
>
|
||||
> ✅ "Reliable dog walking across Auckland Central. Happier dogs. Quieter evenings."
|
||||
|
||||
### Pack walks intro paragraph
|
||||
|
||||
> ❌ "Goodwalk Tiny Gang Pack Walks are built for Auckland Central owners of small and medium dogs who want a reliable weekly routine, a well-exercised dog, and more peace of mind during the workday."
|
||||
>
|
||||
> ✅ "Tiny Gang is built for small and medium dogs who like the right kind of company. Small groups. Same walker. A real walk, every time."
|
||||
|
||||
### Puppy visits subtitle
|
||||
|
||||
> ❌ "Toilet breaks, play, feeding, and calm one-on-one attention — at home, while you're out."
|
||||
>
|
||||
> ✅ "While you're at work, your puppy is fed, played with, and looked after. At home."
|
||||
|
||||
### Benefits-section intro
|
||||
|
||||
> ❌ "Small, compatible groups give dogs the exercise, confidence, and routine they need without the chaos of oversized pack walks."
|
||||
>
|
||||
> ✅ "Small groups. Compatible dogs. No chaos. That's why it works."
|
||||
|
||||
## A 60-second editing pass
|
||||
|
||||
Before any new copy ships, run it through this:
|
||||
|
||||
1. **Cut 20%.** If you can't, cut 10%.
|
||||
2. **First sentence test.** Could it be a headline? If not, rewrite.
|
||||
3. **Hedge sweep.** Delete every *can/may/might/try to/generally/typically* and re-read. Most are improvements.
|
||||
4. **Active voice check.** Search for "is/are [verb-ed] by" or "is intended to" and rewrite.
|
||||
5. **Specific vs vague.** Replace one vague phrase per paragraph with a real name, number, or detail.
|
||||
6. **Read it aloud.** If you take a breath mid-sentence, it's too long.
|
||||
|
||||
## When to break these rules
|
||||
|
||||
- **Legal pages, contracts, privacy.** Be precise and complete, not punchy.
|
||||
- **Onboarding instructions.** Clarity > rhythm.
|
||||
- **Genuine warmth moments.** A short, slightly longer line about a dog or a moment is allowed — it's the texture. Just don't make it the default.
|
||||
@@ -0,0 +1,252 @@
|
||||
# Onboarding
|
||||
|
||||
How a Goodwalk client comes into the system, how their record is shaped, and how
|
||||
that record evolves over time.
|
||||
|
||||
## Flow at a glance
|
||||
|
||||
1. **Enquiry / email claim** — the user signs in to `clients.goodwalk.co.nz`
|
||||
with a one-time code. A `client_profiles` entry is created keyed by the
|
||||
lower-cased email.
|
||||
2. **Onboarding form** (`src/lib/components/OnboardingPage.svelte`) — a 5-step
|
||||
form: Owner Details → Dog Details → Health → Behaviour → Sign. Every
|
||||
question must be answered; there is no skip / mark-complete shortcut.
|
||||
3. **Submit** — the form posts to `POST /api/onboarding-submit`. The backend
|
||||
validates, stores a `submissionSnapshot` on the profile, sends the owner an
|
||||
email + PDF, and flips `onboardingCompleted: true`.
|
||||
4. **Admin dashboard** (`src/lib/components/admin-dashboard/AdminDashboard.svelte`)
|
||||
surfaces pending and completed clients, and now lets the owner change a
|
||||
client's lifecycle status.
|
||||
|
||||
## Where data lives today
|
||||
|
||||
| Thing | Storage | Source of truth |
|
||||
| --- | --- | --- |
|
||||
| Client profiles | `mail-api/data/client_profiles.json` (mirrored into `admin_db` KV) | `_client_profiles` dict in `main.py` |
|
||||
| Onboarding drafts (in-progress, per email) | `mail-api/data/drafts.json` | `_drafts` dict |
|
||||
| Submitted onboarding snapshot | Inside the client profile as `onboardingSubmission` / `submissionSnapshot` | same |
|
||||
| Activity feed (admin actions) | SQLite via `admin_db.record_event` | same |
|
||||
| Legacy historical data (Gravity Forms exports) | `data/legacy-onboarding.json`, `data/legacy-contracts.json`, `data/legacy-clients.json` | regenerated from the CSVs in repo root |
|
||||
|
||||
The plan is to move the JSON file to Postgres later; the JSON shape is already
|
||||
relational-friendly (see *Postgres target* below).
|
||||
|
||||
## Client profile shape
|
||||
|
||||
Keyed by lower-cased email. Fields are merged over time as the client moves
|
||||
through the funnel.
|
||||
|
||||
```jsonc
|
||||
{
|
||||
"fullName": "Shelley McCabe",
|
||||
"phone": "+6421328907",
|
||||
"address": "...",
|
||||
"dogName": "Maisie",
|
||||
"dogBreed": "...",
|
||||
"dogAge": "2015-04-28",
|
||||
"services": ["Tiny Gang Pack Walks"],
|
||||
"onboardingCompleted": true,
|
||||
"onboardingSubmittedAt": "2026-03-14T16:14:20",
|
||||
"onboardingSubmission": { /* full 5-step snapshot */ },
|
||||
"welcomePackSentAt": "...",
|
||||
"welcomePackOffer": { "serviceType": "...", "priceDetails": "...", "startDate": "..." },
|
||||
"birthdayAutoSend": false,
|
||||
"birthdayEmailLastSentAt": "...",
|
||||
"lastEnquiryAt": "...",
|
||||
"lifecycle": {
|
||||
"status": "active", // active | paused | cancelled | archived
|
||||
"reason": "",
|
||||
"changedAt": "2026-05-20T10:11:00",
|
||||
"changedBy": "info@goodwalk.co.nz"
|
||||
},
|
||||
"lifecycleHistory": [
|
||||
{ "status": "active", "reason": "", "changedAt": "...", "changedBy": "..." }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## Lifecycle status
|
||||
|
||||
Soft-delete only. **No client is ever removed**, so we keep the full history
|
||||
for retention / newsletter work.
|
||||
|
||||
| Status | Meaning | Outreach included? |
|
||||
| --- | --- | --- |
|
||||
| `active` | Currently walking with us. | Yes — pending + completed + birthdays |
|
||||
| `paused` | Temporarily not walking (holiday, recovery, etc.). | Yes — still on outreach lists |
|
||||
| `cancelled` | No longer a client. Kept on file. | **No** — excluded from outreach |
|
||||
| `archived` | Long-term inactive. Hidden from default views. | **No** — excluded from outreach |
|
||||
|
||||
Defaults: every client starts as `active`. A missing `lifecycle` block is
|
||||
treated as `active` by the API and the dashboard.
|
||||
|
||||
### Filters that respect lifecycle
|
||||
|
||||
`_client_is_reachable(profile)` in `mail-api/main.py` is the single gate.
|
||||
`cancelled` and `archived` are filtered out of:
|
||||
|
||||
- `GET /owner/pending-onboarding`
|
||||
- `GET /owner/completed-onboarding`
|
||||
- `GET /owner/birthdays`
|
||||
|
||||
`GET /owner/all-clients` returns **everyone**, regardless of status, so the
|
||||
admin can always find a former client. The status pill on each row makes the
|
||||
state obvious.
|
||||
|
||||
### Changing a client's status
|
||||
|
||||
Admin dashboard → Clients tab → row action **"Change status"**. Opens a modal
|
||||
with the four status options and an optional 500-char reason. Saving calls:
|
||||
|
||||
```
|
||||
POST /api/owner/client-status
|
||||
Authorization: Bearer <admin session token>
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"email": "owner@example.com",
|
||||
"status": "paused",
|
||||
"reason": "Moving house, back in June"
|
||||
}
|
||||
```
|
||||
|
||||
The backend writes the new `lifecycle` block, appends to `lifecycleHistory`
|
||||
(capped at the last 50 entries), and records an
|
||||
`owner_client_status_changed` event in the activity feed.
|
||||
|
||||
## Legacy data migration
|
||||
|
||||
Two CSV exports from the old Gravity Forms install:
|
||||
|
||||
- `dog-enrolment-form-2026-05-20.csv` — 72 onboarding submissions (2022–2026).
|
||||
- `goodwalk-contract-2026-05-20.csv` — 39 contract signings (2022-06 → 2024-02).
|
||||
|
||||
Two cleansing scripts produce relational-friendly JSON:
|
||||
|
||||
```
|
||||
node scripts/clean-legacy-onboarding.mjs # → data/legacy-onboarding.json
|
||||
node scripts/clean-legacy-contracts.mjs # → data/legacy-contracts.json
|
||||
# also enriches legacy-onboarding.json
|
||||
# and writes data/legacy-clients.json
|
||||
```
|
||||
|
||||
### Importing legacy clients into production
|
||||
|
||||
The deploy pipeline ships these 36 clients into the live system on every
|
||||
deploy. The flow:
|
||||
|
||||
1. `deploy.ps1` runs `scripts/build-legacy-seed.mjs`, which folds the three
|
||||
legacy JSON files into one email-keyed dict shaped like the live
|
||||
`_client_profiles` entries. Output: `mail-api/legacy-clients-seed.json`.
|
||||
2. The mail-api `Dockerfile` `COPY`s that file to `/app/legacy-clients-seed.json`
|
||||
so it lives **outside** the persistent `mail_api_data` volume — every
|
||||
deploy carries a fresh copy.
|
||||
3. On boot, `_merge_legacy_seed_if_present()` adds every email that is not
|
||||
already in `_client_profiles`, persists the result to JSON + admin_kv,
|
||||
and never overwrites a live entry. Re-running is idempotent.
|
||||
|
||||
Each imported client is created with `lifecycle: { status: 'archived' }` so
|
||||
they don't pollute outreach lists. The admin can promote any of them back to
|
||||
`active` from the dashboard. Provenance (entry IDs, signature URL, PDF URLs)
|
||||
is preserved on the `legacy` field of every profile.
|
||||
|
||||
To skip the rebuild on a hotfix deploy use `deploy.ps1 -SkipLegacySeed`; the
|
||||
previous seed file is reused as-is. To regenerate locally:
|
||||
|
||||
```
|
||||
node scripts/build-legacy-seed.mjs
|
||||
```
|
||||
|
||||
The contracts script backfills owner email + postal address onto onboarding
|
||||
records where a contract row matches (by owner name, then dog name, then a
|
||||
unique surname). At present: **38 of 72** onboarding rows now have an email
|
||||
attached; the rest were submitted after the contract form was retired in
|
||||
2024-02 and will need an email-claim flow before they can sign in.
|
||||
|
||||
### Known gaps in the legacy data
|
||||
|
||||
- 34 onboarding rows have no email (mostly post-2024-02).
|
||||
- Dog **breed** was never collected by the old forms — `null` everywhere.
|
||||
- Owner **address** was only collected on the contract form, not on
|
||||
onboarding directly.
|
||||
- One vet phone number (`6307168`) couldn't be normalised to E.164 — kept
|
||||
as `phoneRaw` only.
|
||||
|
||||
## Postgres target
|
||||
|
||||
The JSON shapes already map cleanly onto a relational schema. Suggested tables
|
||||
once we migrate off the JSON file:
|
||||
|
||||
```sql
|
||||
clients (
|
||||
email TEXT PRIMARY KEY,
|
||||
first_name, last_name, phone, phone_raw,
|
||||
address, address_street, address_line2, address_suburb,
|
||||
address_city, address_postal_code, address_country,
|
||||
-- lifecycle
|
||||
lifecycle_status TEXT NOT NULL DEFAULT 'active', -- enum: active|paused|cancelled|archived
|
||||
lifecycle_reason TEXT,
|
||||
lifecycle_changed_at TIMESTAMPTZ,
|
||||
lifecycle_changed_by TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
client_status_history (
|
||||
id SERIAL PRIMARY KEY,
|
||||
client_email TEXT REFERENCES clients(email),
|
||||
status TEXT NOT NULL,
|
||||
reason TEXT,
|
||||
changed_at TIMESTAMPTZ NOT NULL,
|
||||
changed_by TEXT NOT NULL
|
||||
);
|
||||
|
||||
dogs (
|
||||
id SERIAL PRIMARY KEY,
|
||||
client_email TEXT REFERENCES clients(email),
|
||||
name TEXT, surname TEXT, date_of_birth DATE, breed TEXT
|
||||
);
|
||||
|
||||
onboarding_submissions (
|
||||
id SERIAL PRIMARY KEY,
|
||||
client_email TEXT REFERENCES clients(email),
|
||||
dog_id INT REFERENCES dogs(id),
|
||||
legacy_entry_id TEXT,
|
||||
legacy_pdf_url TEXT,
|
||||
signature_url TEXT,
|
||||
vet_name TEXT, vet_address TEXT, vet_phone TEXT, vet_phone_raw TEXT,
|
||||
emergency_contact_name TEXT, emergency_contact_phone TEXT,
|
||||
health JSONB, -- vaccinated / allergies / diet / medication
|
||||
behaviour JSONB, -- recall / reactivity / car / commands
|
||||
misc JSONB, -- additional notes / referrals / socials
|
||||
signed_on DATE,
|
||||
submitted_at TIMESTAMPTZ
|
||||
);
|
||||
|
||||
contracts (
|
||||
id SERIAL PRIMARY KEY,
|
||||
client_email TEXT REFERENCES clients(email),
|
||||
legacy_entry_id TEXT,
|
||||
signature_url TEXT,
|
||||
pdf_url TEXT,
|
||||
consent_text TEXT,
|
||||
signed_on DATE
|
||||
);
|
||||
```
|
||||
|
||||
`health` / `behaviour` / `misc` stay as `JSONB` rather than exploding every
|
||||
nullable yes/no into a column — it matches the existing
|
||||
`submissionSnapshot: dict[str, Any]` shape in
|
||||
`mail-api/mail_api/models.py` and makes the form easier to evolve.
|
||||
|
||||
## Things that intentionally don't exist yet
|
||||
|
||||
- **Hard delete** of a client. Use `archived` instead. Hard delete would also
|
||||
break the activity feed and the legacy import provenance.
|
||||
- **A "former client" notes log.** If we need anything richer than a 500-char
|
||||
reason, the next step is to add a `client_notes` table keyed by email — but
|
||||
hold off until the JSON → Postgres migration is done.
|
||||
- **Re-engagement / win-back emails.** The data is there (lifecycle history +
|
||||
email), so this is unblocked whenever marketing wants to send a newsletter
|
||||
to past clients. `cancelled` and `archived` rows are still in
|
||||
`/owner/all-clients`.
|
||||
@@ -0,0 +1,116 @@
|
||||
# Server-side analytics + visitor journey
|
||||
|
||||
Two things in one pipeline:
|
||||
|
||||
1. **Ad-block-resistant GA4** — forward events server-to-server when client-side `gtag.js` is blocked.
|
||||
2. **Visitor journey reconstruction** — record every event into our own DB, and when a visitor submits the booking form, link their journey to that submission so the owner can review it in the CP dashboard.
|
||||
|
||||
## Why each piece exists
|
||||
|
||||
### Ad-block fallback
|
||||
Browser ad blockers (uBlock, Brave, Safari ITP, AdGuard, Pi-hole) block requests to `googletagmanager.com` and `google-analytics.com`. For NZ consumer traffic that's roughly **20–40% of visits silently lost**. The fix is a first-party endpoint on our own domain that blocklists don't match, which forwards to GA4 via the Measurement Protocol.
|
||||
|
||||
### Journey reconstruction
|
||||
GA4 is aggregate. The owner can see "200 hero CTA clicks this week" but not "this specific submission's journey was /pricing → /about → hero CTA → form." For a small services business, knowing what a *specific lead* engaged with before submitting is more useful than another aggregate dashboard.
|
||||
|
||||
## Architecture
|
||||
|
||||
```
|
||||
Browser ── trackEvent() ──┬─► gtag (when not blocked) ─► GA4
|
||||
│
|
||||
└─► /api/track (always) ─┬─► session_events table
|
||||
│
|
||||
└─► GA4 (only when gtag missing)
|
||||
|
||||
Browser also keeps a rolling sessionStorage buffer of the last 30 events
|
||||
as a fallback (in case /api/track is itself blocked at the network layer).
|
||||
|
||||
On booking form submit success:
|
||||
Browser ── promoteJourney(email) ──► /api/track/promote
|
||||
│
|
||||
├─► reads session_events for this anon_id
|
||||
├─► reads sessionStorage buffer from request body
|
||||
└─► writes one row to submission_journeys
|
||||
|
||||
Owner opens enquiry in CP dashboard:
|
||||
AdminDashboard ── /api/owner/client-enquiry?email=... ──► mail-api
|
||||
│
|
||||
├─► returns enquiry record
|
||||
└─► returns submission_journeys row
|
||||
```
|
||||
|
||||
## Tables (`docker/postgres/init/004-session-events.sql`)
|
||||
|
||||
### `session_events`
|
||||
Every analytics event, keyed by the `anonId` cookie set in `src/hooks.server.ts`. **Pruned after 24h** by a probabilistic cleanup inside `/api/track` (~1 in 200 inserts triggers a `DELETE WHERE created_at < now() - 24h`). No cron container needed — cleanup runs naturally with traffic.
|
||||
|
||||
### `submission_journeys`
|
||||
Promoted journeys keyed by email. **Not auto-pruned.** Owner-facing data. Contains:
|
||||
- `events` — snapshot of `session_events` rows at promotion time (server-captured)
|
||||
- `client_events` — the sessionStorage buffer the client posted (fallback)
|
||||
|
||||
The merge happens in the CP UI (`AdminDashboard.mergedJourneyEvents`), de-duped by `name|page_path|ts`.
|
||||
|
||||
## De-duplication
|
||||
|
||||
- **GA4** receives each event exactly once: client when gtag is loaded, server when it isn't. The `forward_ga4` flag in the `/api/track` body controls this.
|
||||
- **session_events** receives every event once (always written server-side).
|
||||
- **Journey display** merges server + client events with key `name|page_path|ts`.
|
||||
|
||||
## Privacy
|
||||
|
||||
Disclosed in `src/lib/content/privacy-policy.ts` under the **Analytics** section. The key promises:
|
||||
|
||||
- Browsing record contains pages, clicks, timestamps, and a random browser ID — never name/email/phone or form contents.
|
||||
- Unsubmitted journeys are deleted within 24h.
|
||||
- Submitted journeys are linked to the enquiry email, visible only to the Goodwalk team, never shared or used for advertising.
|
||||
- Users can request deletion at info@goodwalk.co.nz.
|
||||
|
||||
**Update the policy in the same PR** if you ever change what's stored or how long.
|
||||
|
||||
## Configuration
|
||||
|
||||
```bash
|
||||
GA4_MEASUREMENT_ID=G-K7TLSFJVP1 # already in deploy.env.template
|
||||
GA4_API_SECRET=<from GA4 admin> # required for the GA4 forward
|
||||
```
|
||||
|
||||
To get the API secret: GA4 admin → Data Streams → web stream → Measurement Protocol API secrets → Create. Without it, `/api/track` still records to `session_events` (journey works) — only the GA4 forward is off.
|
||||
|
||||
## Files
|
||||
|
||||
- `src/routes/api/track/+server.ts` — main ingest, persists + forwards
|
||||
- `src/routes/api/track/promote/+server.ts` — links journey to submission email
|
||||
- `src/lib/analytics.ts` — client `trackEvent`, sessionStorage buffer, `promoteJourney(email)`
|
||||
- `src/lib/components/BookingWizard.svelte` — calls `promoteJourney(email)` on submit success
|
||||
- `mail-api/db.py` — `get_submission_journey(email)` reader
|
||||
- `mail-api/main.py` — `/owner/client-enquiry` returns `{enquiry, journey}`
|
||||
- `src/lib/components/admin-dashboard/AdminDashboard.svelte` — renders the **Visitor journey** section in the enquiry modal
|
||||
- `src/lib/content/privacy-policy.ts` — disclosure
|
||||
- `docker/postgres/init/004-session-events.sql` — table definitions
|
||||
|
||||
## Testing locally
|
||||
|
||||
Without env vars set (no GA4 forwarding):
|
||||
```bash
|
||||
curl -X POST http://localhost:5173/api/track \
|
||||
-H 'content-type: application/json' \
|
||||
-H 'user-agent: Mozilla/5.0' \
|
||||
-d '{"name":"test_event","params":{"label":"manual","page_path":"/"}}'
|
||||
```
|
||||
|
||||
Then check the row landed:
|
||||
```bash
|
||||
docker exec -it goodwalk_svelte_db psql -U goodwalk -d goodwalk \
|
||||
-c "select event_name, page_path, created_at from session_events order by id desc limit 5;"
|
||||
```
|
||||
|
||||
To test the full journey flow locally, submit a booking through the wizard with a test email, then open `cp.goodwalk.local` (or use `?preview=cp` on localhost), open the enquiry for that email, and the **Visitor journey** panel should list every page view and click that led to the submission.
|
||||
|
||||
## What this does NOT do
|
||||
|
||||
- **Meta Pixel / Facebook Ads** — same blocker problem, different fix (Conversions API). Not built.
|
||||
- **Real-time owner notifications** — journey is visible only after submission, not as a live feed of who's on the site.
|
||||
- **Cross-device journey** — anon_id is per-browser. A visitor who researches on phone then submits on laptop produces two separate (mostly empty) journeys.
|
||||
- **Consent banner** — NZ has no explicit cookie law today. If we ever serve EU/UK traffic, we need Consent Mode v2 before this pipeline is legal there for the GA4 forward.
|
||||
- **Pruning of `submission_journeys`** — these are kept indefinitely. If you want a max retention (e.g. delete journeys older than 12 months), add a cron or extend the probabilistic cleanup in `/api/track`.
|
||||
@@ -0,0 +1,134 @@
|
||||
# v5: Simplify the message on service pages
|
||||
|
||||
## Goal
|
||||
|
||||
Every service page should say one clear message, once, in a fixed order, using the
|
||||
homepage's single visual language. No restated sections, no card-grid sprawl. Lead
|
||||
with trust, show the emotional outcome, let the page breathe (PRODUCT.md principles).
|
||||
|
||||
The Tiny Gang page is the finished reference. The rest of this task is applying the
|
||||
same treatment to the other two service pages.
|
||||
|
||||
## The problem we are fixing
|
||||
|
||||
The current `ServiceLandingPage.svelte` stacks ~10 sections that repeat each other:
|
||||
hero, highlight collage, a 6-card benefit pager, an intro badge block, a decision
|
||||
card, a pricing block with an extras grid, an areas card, a FAQ card, and a related
|
||||
services grid. The same promise (matched groups, safe, free pickup) is said three or
|
||||
four times in three or four different card styles. It reads as pages of text and
|
||||
boxes, not one calm argument.
|
||||
|
||||
## The v5 rule
|
||||
|
||||
**Say it once, in order. One design system.**
|
||||
|
||||
Canonical section spine for every service page (this is the order):
|
||||
|
||||
1. **Hero** - what it is (shared `ServiceHero`: green copy left, photo right).
|
||||
2. **What's different** - the 3-4 things that actually set this service apart.
|
||||
3. **How it works** - the steps to get started, made explicit.
|
||||
4. **Honest fit check** - who it suits, who it does not (two columns, one card).
|
||||
5. **Proof** - `TestimonialsSection`.
|
||||
6. **One deliberate image** - a real photo that breaks the text and carries meaning.
|
||||
7. **Price** - even plan cards, plus a short row of promise notes.
|
||||
8. **FAQ** - a calm ruled list, not stacked cards.
|
||||
9. **Service area** - `ServiceAreaCoverage`: an Auckland hub with all suburbs as
|
||||
tappable links. Robust on every screen (no pin map). Per-page stats, so puppy-visits
|
||||
reads "in-home", not "pickup & drop-off".
|
||||
10. **Book** - `BookingWizard`.
|
||||
|
||||
If a piece of content does not fit one of those ten slots, it is probably a repeat.
|
||||
Cut it.
|
||||
|
||||
## Design rules (non-negotiable, taken from the Tiny Gang build)
|
||||
|
||||
- **Lists, not cards.** "What's different" is an icon + text list. "How it works" is
|
||||
numbered items. Reserve real cards for pricing only. Never nest cards.
|
||||
- **One heading grammar.** Every section opens with the same centered eyebrow + H2
|
||||
(`.tg-eyebrow` + `.tg-h2`). No per-section badges, marks, or collages.
|
||||
- **One token set.** Use the shared CSS variables (colours, radius, shadow, spacing).
|
||||
No new gradients or per-section colour systems. Goodwalk green `#213021`, yellow
|
||||
`#FFD100` for buttons only.
|
||||
- **Pricing cards stay even.** Four equal cards in a row on desktop, 2-up at 980px,
|
||||
1-up on mobile. Do not put images inside or beside the cards.
|
||||
- **One image, deliberate.** A single full-width photo band between sections, with a
|
||||
short keyword-bearing caption. It must mean something (the pack, the pickup, the
|
||||
outcome), not decorate. See SEO rules below.
|
||||
- **FAQ is a ruled list.** Hairline dividers between questions, no card chrome.
|
||||
- **Copy: half it, then half it again.** Active voice. No em dashes. No heading that
|
||||
restates the one above it.
|
||||
|
||||
## Image and SEO rules
|
||||
|
||||
- Use real Goodwalk photos from `static/images/` (keyword-rich filenames already).
|
||||
- Register width + height in `src/lib/image-metadata.ts` so there is zero layout shift.
|
||||
- Set explicit `width`, `height`, `loading="lazy"`, `decoding="async"` on every `<img>`.
|
||||
- Alt text is a full, natural, location-aware sentence (e.g. "Four small Tiny Gang dogs
|
||||
looking up together in the long grass at an Auckland park"), not "dogs".
|
||||
- Keep the `FaqSection` schema (`emitSchema`) and the `Service` + `AggregateOffer`
|
||||
structured data in `src/routes/[slug]/+page.svelte` intact.
|
||||
|
||||
## Reference implementation (copy this)
|
||||
|
||||
- Component: `src/lib/components/pages/ServiceClarityPage.svelte` (shared by all three
|
||||
service pages, content-driven)
|
||||
- Pricing variant: `src/lib/components/pages/PricingClarityPage.svelte`
|
||||
- Coverage section: `src/lib/components/sections/ServiceAreaCoverage.svelte`
|
||||
- Preview routes (noindex): `/variants/tiny-gang`, `/variants/solo-walks`,
|
||||
`/variants/puppy-visits`, `/variants/our-pricing`
|
||||
- Content: the `clarity` block in `pack-walks.ts`, `dog-walking.ts`, `puppy-visits.ts`
|
||||
- Variant switcher (preview only): `src/lib/components/ui/VariantNav.svelte`, mounted in
|
||||
`src/routes/+layout.svelte`
|
||||
|
||||
Read the header comment in `ServiceClarityPage.svelte` first. It states the philosophy
|
||||
and the section order in one place.
|
||||
|
||||
## Status
|
||||
|
||||
Done (built, svelte-check clean, server-rendered):
|
||||
|
||||
- `ServiceClarityPage` generalised and content-driven; `ServicePageContent.clarity`
|
||||
added in `src/lib/types.ts`. Old `TinyGangPage.svelte` deleted.
|
||||
- `clarity` content written for pack-walks, dog-walking, puppy-visits. Tiny Gang renders
|
||||
identically to before.
|
||||
- Coverage spine slot added (`ServiceAreaCoverage`), with per-page stats so puppy-visits
|
||||
reads "in-home" not "pickup & drop-off".
|
||||
- Preview routes for all four variants, plus a global `VariantNav` to compare them.
|
||||
|
||||
## Live now
|
||||
|
||||
The clarity pages are the live pages. `src/routes/[slug]/+page.svelte` renders
|
||||
`ServiceClarityPage` for pack-walks / dog-walking / puppy-visits and `PricingClarityPage`
|
||||
for our-pricing. The old `ServiceLandingPage.svelte`, `PricingPage.svelte`, and
|
||||
`ServiceAreaMap.svelte` have been deleted.
|
||||
|
||||
The `/variants/*` routes still exist as a sandbox (the minimal-footer test lives there),
|
||||
but are **dev/localhost only**: `src/hooks.server.ts` returns 500 for the `/variants`
|
||||
namespace off-localhost in production, and `VariantNav` is hidden the same way in
|
||||
`+layout.svelte`. Verified on a real `node build`: public host → 500 for any
|
||||
`/variants/*` and no `VariantNav`; localhost → variants load.
|
||||
|
||||
Footer note: the live pages keep the default footer. The `minimal` footer is still only
|
||||
on the `/variants/*` pages, a separate decision from the page-design swap.
|
||||
|
||||
## Definition of done
|
||||
|
||||
- [x] One `ServiceClarityPage` component drives all three service pages.
|
||||
- [x] Page-specific copy lives in content files, not the component.
|
||||
- [x] All three pages follow the spine, say each point once, share one heading grammar
|
||||
and one token set.
|
||||
- [x] Pricing cards are even on every page. No image in the pricing block.
|
||||
- [x] Exactly one deliberate, captioned, fully-SEO'd image band per service page.
|
||||
- [x] FAQ is a ruled list. Schema preserved.
|
||||
- [x] `npx svelte-check` clean (no new errors).
|
||||
- [x] Live `[slug]` branches swapped to the clarity pages.
|
||||
- [x] Old `ServiceLandingPage.svelte` / `PricingPage.svelte` / `ServiceAreaMap.svelte` deleted.
|
||||
- [x] `/variants/*` blocked in production (500) and `VariantNav` hidden there.
|
||||
- [ ] Decide whether to promote the `minimal` footer to the live pages.
|
||||
|
||||
## Do not
|
||||
|
||||
- Do not redesign the brand or introduce new colours, fonts, or gradients.
|
||||
- Do not add card grids, badges, collages, or mobile pagers back in.
|
||||
- Do not change wording on a page unless it is a repeat being removed or copy being
|
||||
shortened. Keep the meaning.
|
||||
@@ -0,0 +1,277 @@
|
||||
"Dog Name","Dog Surname","Dog's date of birth","Owner Name","Owner Surname","Owner Contact","Emergency Contact Name","Emergency Contact Number","Vet Name","Vet Address","Vet Contact Number","Is your dog vaccinated?","Does your dog have any food allergies?","Specify","Does your dog have any environmental allergy?","Specify","Is your dog on a special diet?","Specify","Is your dog taking any medication that could put him at risk during a walk","Specify","Is your dog well socialised?","How many dogs does your dog interact with weekly (excluding your family dogs)","Does your dog visit the beach?","Does your dog visit dog parks frequently - How many times a week?","Does your dog have a bite history?","Is your dog reactive to other dogs?","Is your dog reactive to other animals?","Is your dog reactive to children?","Is your dog desexed?","Is your dog registered?","Is your dog reactive to other people?","Is your dog leash trained?","Rate your dog's recall from 1 to 5, with one being the lowest score and 5 the highest.","Has your dog ran away before?","Please describe your dog's behaviour in the car","List of commands your dog understands","Anything else you'd like to let us know?","Social Media Account Name","How did you hear about Goodwalk?","Person's name who reffered Goodwalk to you","Signature","Date","Created By (User Id)","Entry Id","Entry Date","Date Updated","Source Url","Transaction Id","Payment Amount","Payment Date","Payment Status","Post Id","User Agent","User IP","PDF: DogOnboardingForm"
|
||||
"Maisie","McCabe","2015-04-28","Shelley","McCabe","021328907","Finn McCabe","02040319829","Auckland Pet Hospital","46 - 48 Pollen Street","09 360 0961","Yes","No","","No","","No","","No","","Yes","1-5","Yes, she loves the beach. Likes being in the water but not keen going in past top of her legs.","7 days per week","No","No","Cats","No","Yes","Yes","Yes","Yes","4","No","Very comfortable in the car. Does not need to be harnessed.","Sit, stay, stop, paw, walkies, come on, let's go for a walk","Nothing in particular","Maisie","Someone reffered me","Brigid McLean","https://onboarding.goodwalk.co.nz/index.php?gf-signature=69b4d28c1f80d3.92082912&form-id=4&field-id=50&hash=e252f70aca9398464a6ef16f21fdc18f4866fd6ba4804d4868373223f945e144","2026-03-14","","140","2026-03-14 16:14:20","2026-03-14 03:14:20","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36 Edg/145.0.0.0","104.23.198.146","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/140/"
|
||||
"Pipi","Steuart","2013-04-13","Ellen","Graney","021740674","Patrick Steuart","0272235853","Royal Oak Vet care","649 Mt Albert Rd, Royal Oak","09 6259729","Yes","No","","No","","No","","No","","Yes","1-5","Yes","Weekly","No","Yes","Other","No","Yes","Yes","No","Yes","3","No","Settles down quickly and sleeps","Come, wait, stay, sit, down","",".","Someone reffered me","Paula Smith","https://onboarding.goodwalk.co.nz/index.php?gf-signature=699ce3df243213.09800906&form-id=4&field-id=50&hash=e84ff9c458b76d71f18cc977c19d0e45ce9866691863fe72b2e4c1b07b055a8a","2026-02-24","","139","2026-02-24 12:33:51","2026-02-23 23:33:51","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.2 Mobile/15E148 Safari/604.1","122.57.112.233","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/139/"
|
||||
"Poppy","Nam","2024-09-23","Yoori","Nam","021777306","Lily","0274880031","Auckland Pet Hospital","46/ pollen Street, Gray Lynn","093600961","Yes","No","","No","","No","","No","","No","1-5","Yes","twice a week","No","Yes","Cats","Yes","Yes","Yes","Yes","Yes","3","No","she is so quiet in the car","sit
|
||||
wait
|
||||
stay
|
||||
shake hands
|
||||
spin
|
||||
hi5","She loves her family and thrives on routine.
|
||||
she is stubborn,but once she gets used to someone, she becomes incredibly affectionate and friendly.
|
||||
she is very wary of other dogs, but she would never attack- she only barks.
|
||||
Honestly, barking is her only real issue.","Kiwiyuuri (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=699cde43dc7b26.23456486&form-id=4&field-id=50&hash=553864499410acd217be476f35b4a07ba0269a1f74eba002932b6c642e366926","2026-02-24","","138","2026-02-24 12:09:55","2026-02-23 23:09:55","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Safari/605.1.15","222.154.51.238","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/138/"
|
||||
"Ollie","Butt","2025-08-26","Maya","Steeper","0211148194","David Butt","021 722256","Balmoral Vets","482 Dominon Rd","6307168","Yes","No","","No","","No","","No","","Yes","1-5","yes","Not started visiting dog parks yet","No","No","Cats","No","No","Yes","No","Yes","5","No","He is good on car rides, normally buckled in with harness and curls up on seat","sit, down, stay, wait","","mayabutt on facebook","Someone reffered me","you did!","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6982533a56dfc8.61964352&form-id=4&field-id=50&hash=d34bd458652da66ae6c0ed90863ba454afac74fbb985f74fe5704fc8f237d297","2026-02-04","","137","2026-02-04 08:57:46","2026-02-03 19:57:46","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0","223.165.69.9","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/137/"
|
||||
"Izzy","Gonzales -Keen","2023-01-02","Veronica","Gonzales","0225402906","Veronica Gonzales","0225402906","The Good Vet","726 New North Road Mount Albert Auckland, 1025","+64 27 297 5506","Yes","No","","Yes","Itchy paws during summer time, just needs a rinse after being in grass after walks","No","","No","","Yes","1-5","Onehunga reserve every morning and does go to the beach sometimes but does not like the water","Yes 4 times a week at least","No","No","Cats","Yes","Yes","Yes","No","Yes","4","No","Loves head out the window, will bark if people come close to car .","Sit, come, leave it, wait , no, yes, watch me, look.","As discussed Izzy is an anxious dog and can get overstimulated easily . It’s best to start the walk on lead and then after some time to then take her off lead . Has chased children before but has never bit them. However if she is with a pack of dogs it is less likely she will engage in that behavior .","Burritotoezz","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=69632786c6bf78.27345173&form-id=4&field-id=50&hash=8e111587451b694e01972381c28693db94261122e8dbb2cf6e9369f6da0c6b59","2026-01-11","","136","2026-01-11 17:31:02","2026-01-11 04:31:02","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_7_12 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6.1 Mobile/15E148 Safari/604.1","118.148.194.197","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/136/"
|
||||
"Scotch","Maxwell","2021-04-22","Anna","Maxwell","0274261363","Benedict Casey","+64 27 879 0948","Emma at Auckland Pet Hospital","46-48 pollen street, grey lynn","(09) 360 0961","Yes","No","","No","","No","","No","","Yes","1-5","Yes - loves it. Will chase a stick into the water but otherwise not big on swimming - unless very hot!","He is off leash at the local parks twice a day. In terms of designated “dog parks” this is less frequent - 1 a month","No","No","Cats","No","Yes","Yes","No","Yes","3.5","No","Good. Loves the windows down! Loves being where he can see what’s happening. Will curl up and sleep too. Loves that he is being included on a journey.","This way, come, leave it, touch, a-way, that’s enough","Not reactive but can be bossy with big male dogs - particularly anything that looks remotely like a wolf -(German shepherd)
|
||||
He will protect humans from big dogs (even their owners)
|
||||
This only happens really with me, not my husband.","a.j.maxwell","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6928e3156d4662.20837423&form-id=4&field-id=50&hash=4337603b6b42e20a9146dba43a0efa517a162d8480145db43f396ee2e46825e6","2025-11-28","","135","2025-11-28 12:47:33","2025-11-27 23:47:33","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 18_6_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/142.0.7444.148 Mobile/15E148 Safari/604.1","122.63.71.137","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/135/"
|
||||
"Yuki","Manu","2025-01-25","Sue","Manu","0220781853","Chris Kasper","0272430925","Balmoral Veterinary Clinic","482 Dominion Rd, Mt Eden","09 6307168","Yes","No","","No","","No","","No","","Yes","1-5","He has been once. He loved it","3 -4","No","Yes","Cats","Yes","Yes","Yes","Yes","Yes","1","Yes","Travelling in car is a daily event.
|
||||
Settled in the car","Sit
|
||||
Down
|
||||
Stay
|
||||
Off
|
||||
Jump down
|
||||
Cross now","Training is still work in progress","Suemanu. Instigram","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=68b6d1bb5cfe90.22636463&form-id=4&field-id=50&hash=093613c10d52a1459f56e63db5b76eb830ca733204d9d46f91b253e8ce57b598","2025-09-02","","134","2025-09-02 23:15:07","2025-09-02 11:15:07","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Mobile Safari/537.36","125.237.54.176","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/134/"
|
||||
"Donut","Todoroki","2023-04-02","Masaya","Todoroki","0273425437","Christine Todoroki","0278978907","Pakuranga Vets","7 Johns Lane, Pakuranga, Auckland","09 576 4108","Yes","No","","No","","No","","No","","No","1-5","Only once","5 - 7 (Victoria Park)","No","Yes","Birds","Yes","Yes","Yes","Yes","Yes","2","Yes","Anxious unless sitting on my lap","Sit
|
||||
Down
|
||||
Stay","Donut has only run away when staying at Noya's parent place. Her parents open the door and he snuck through. He has never tried to run away when with us.","@masayadt (instagram)","Someone reffered me","Noya Xing","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6848f4f12abdc9.30092404&form-id=4&field-id=50&hash=06a0bbfe59b9821440e1d4815c6944fb5945c6e9283bd25de97956a10e069285","2025-06-11","","133","2025-06-11 15:16:01","2025-06-11 03:16:01","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36 OPR/119.0.0.0","125.237.229.122","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/133/"
|
||||
"Mimi","Xing","2020-01-20","Noya","Xing","0210751435","Masaya Todoroki","0273425437","Pakuranga Vets","7 Johns Lane, Pakuranga, Auckland 2010","09 576 4108","Yes","No","","No","","No","","No","","No","1-5","Only once, she enjoyed the beach","Never visited a dog park, just general parks like Victoria Park","No","Yes","Cats","No","Yes","Yes","No","Yes","2","No","Sits on the lap or backseat fine, crate is fine, calm. Stays quite still, or naps","Sit
|
||||
Stay
|
||||
Paw/shake
|
||||
No
|
||||
|
||||
Recall is only good with treats on hand, she is very attentive to treats.","Mimi is reactive to other dogs on walks, generally fine when given time to sniff them out and play, will proceed to walk normally along them after. She's wary of larger dogs.","@Masayadt (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6848f158f06299.86914798&form-id=4&field-id=50&hash=8c70b1420a73f311da6f6cee5780b282a98a589a32ae0e64edb227cd5143fade","2025-06-11","","132","2025-06-11 15:00:41","2025-06-11 03:00:41","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36","125.237.229.122","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/132/"
|
||||
"Billie Bunny","Osborne","2024-03-27","Niki","Osborne","0211337479","Stacy Hyland","02102820035","Remuera Veterinary Hospital","236 Orakei Road, Remuera, Auckland","09-529-2091","Yes","No","","No","","No","","No","","Yes","5-10","Yes - loves the beach. Takapuna, Okahu & Mission Bay are regular spots","10 x per week","No","Yes","Birds","No","Yes","Yes","No","Yes","4","No","Lays down and sleeps right away.","Sit, Come, Stay, No.","Her reactivity to other dogs isn't constant - some dogs she won't even acknowledge. Others (usually bigger dogs), she'll bark at like she wants to play with them.","nikioznz","Someone reffered me","Met Alessandra walking in the park.","https://onboarding.goodwalk.co.nz/index.php?gf-signature=683e73d44fca21.96072834&form-id=4&field-id=50&hash=a2de4a4ebcdca29e3ccec6be1ab18b9758b710c4dc430e61406db858f0da8a46","2025-06-03","","131","2025-06-03 16:02:28","2025-06-03 04:02:28","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0","222.152.69.84","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/131/"
|
||||
"Teddy or Ted","Uhlenberg","2021-11-01","Clare","Uhlenberg","021 508 767 / 846 1820 wk","Hamish Cook","021 713 216","Pohutukawa Vets Beachlands","Wakelin Road, Beachlands","09 320 1472","Yes","No","","No","","No","","No","","Yes","5-10","Yes","Yes - Daily","No","Yes","Other","Yes","Yes","Yes","Yes","Yes","4","No","Pretty good - Likes his head out the window
|
||||
Will sometimes bark at motorbike riders on the motor way","sit/lay down/come etc","","face book - clare uhlenberg","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=682bf263299c64.69501352&form-id=4&field-id=50&hash=0d28d901c266d7d4ea39a526b07928571af76f882a37249605b59d18508fef13","2025-05-20","","130","2025-05-20 15:09:37","2025-05-20 03:09:37","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36","219.89.199.64","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/130/"
|
||||
"Floyd","Carney","2020-08-21","Kylie","Gladwell","0223771926","Sean Carney","0223509475","Royal Oak Veterinary Care","649 Mount Albert Road, Royal Oak","09 625 9729","Yes","No","","No","","No","","No","","Yes","1-5","Yes, he loves the beach and getting in the water","1-2 times a week","No","No","Cats","No","Yes","Yes","No","Yes","3","Yes","He is pretty good in the car. He can get anxious if we are getting close to where we are going and will bark when we park - it's either excitement or making sure we don't leave him in the car - which we never do! He doesn't get car sick.","Floyd, come.
|
||||
Floyd, sit.
|
||||
Down.
|
||||
Ah a (meaning no)
|
||||
Floyd, drop. (doesn't work all the time, but with consistency it does).","Our main concern about Floyd is his anxiety and barking for attention. We would love to help him to be more calm and reduce his anxiety. We are open to advise and will try and be consistent in our approach - something we haven't done too well in the past.","kyliegladwell","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6819b912bbdad1.02837485&form-id=4&field-id=50&hash=a5f9905ebd0bb4bae9eaff6f0371f549f16198e71c88cd419a9632a4e6ffce8e","2025-05-06","","129","2025-05-06 19:24:02","2025-05-06 07:24:02","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36","101.53.219.205","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/129/"
|
||||
"Mickey","Vu","2024-01-04","Sophie","Vu","02108416304","Sophie","02108416304","Normanby Vet","49 Normanby Road, Mt Eden","096388445","Yes","Yes","Beef and chicken - eye stains","No","","Yes","Raw diet","No","","No","1-5","Yes","Yes, 4-5 times per week","No","No","Other","No","Yes","Yes","No","Yes","4","No","He usually shakes in the car. That’s because of his anxiety.","Sit, down, paw, high five, stay, turn around","Mickey is a timid and shy pup but loves going for a walk and does not like to stay in one place for too long. He might be whining and making noise when going out. And we don't know why he is like that :((","mickeyinauckland","Instagram","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=68193e35e2ca84.35518672&form-id=4&field-id=50&hash=68801ef892bfc3579b3cd48a2058a6627357f0dd810d3f885497c72d67d09b82","2025-05-06","","128","2025-05-06 10:39:49","2025-05-05 22:39:49","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 18_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.4 Mobile/15E148 Safari/604.1","125.239.151.7","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/128/"
|
||||
"Jaxson","Yardley","2023-12-06","Layne","Yardley","0220145043","Jeremy (and Layne)","0220145045 or 0220145043","Vet North","45 Commercial Road, Helensvilles","09 420 8325","Yes","No","","No","","Yes","Generally on grain free but not fussed for training treats","No","","Yes","1-5","Yes, though doesnt like going in past chest.","Parks yes but not generally dog parks","Yes","Yes","Other","No","Yes","Yes","No","Yes","2","No","Just generally lies down and naps.
|
||||
|
||||
He can sometimes take awhile to get into the car (mooches around like he cannot get into the car physically and needs to be picked up) but is fine travelling.","Sit, Down, Nose, Spot, Come, Out!, Stay (for about 5m radius)","Bite History: Nibbles when excited to see you. Will generally only do so if Tryggr is around and getting overly excited.
|
||||
|
||||
Reactive to other dogs: Only when Tryggr is around he will get excited and want to be part of it.
|
||||
|
||||
Reactive to other animals: Not really, a bit scared of cats. Will jump around hedgehogs but only if Tryggr is going crazy.
|
||||
|
||||
Was diagnosed by Foster and Foster Vet as partially deaf (hearing high high and low low) but does seem to have the full realm of hearing (a bit belligerent!)","laynejburgess","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=67f360cb5d76a6.54558856&form-id=4&field-id=50&hash=e3ad1e680ee905a2d00960cff2f3fa1e6b59ac66eb0f0c7b64782c9159bdae2c","2025-04-07","","127","2025-04-07 17:21:15","2025-04-07 05:21:15","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0","101.100.142.27","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/127/"
|
||||
"Tryggr","Yardley","2024-02-07","Layne","Yardley","0220145043","Jeremy (or Layne)","0220145045 or 0220145043","Vet North","45 Commerical Road, Helensville","09 420 8325","Yes","No","","No","","Yes","Generally we use grain free kibble but not fussed for training treats","No","","Yes","1-5","Yes, locally we take him. He likes to have a swim and fetch sticks.","Not dog parks but does go to various parks and interacts with dogs","No","Yes","Other","No","Yes","Yes","No","Yes","2","No","Generally will just lie down and go to sleep","Sit, Nose, Spot, Come","REactive to other dogs: Gets quite excited and 'whiney' trying to get close.
|
||||
|
||||
Reactive to other animals: Occasionally will chase a bird, not often. Hates hedgehogs and possums.","laynejburgess","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=67f35e0d2188f2.62328554&form-id=4&field-id=50&hash=686985b072ccbbe5eb48ba4ec0383f9293ca6c73643c46e81a38af4a1e6233b4","2025-04-07","","126","2025-04-07 17:09:33","2025-04-07 05:09:33","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0","101.100.142.27","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/126/"
|
||||
"Fergus","Callender","2022-12-28","Geoff","Callender","022 318 8798","Steph Wilson","0210503830","Green","Green Bay Veterinary","098274625","Yes","Yes","Chicken","No","","Yes","Royal Canin DermaCare","No","","Yes","1-5","Yes - loves it","No","No","Yes","Birds","No","Yes","Yes","No","Yes","2","No","He likes looking out the windows and can bark at other dogs if he sees them. Otherwise he'll usually go to sleep.","Close
|
||||
Heel
|
||||
Sit
|
||||
Down
|
||||
Leave it
|
||||
Wait
|
||||
Stay (sometimes works)
|
||||
Inside
|
||||
Outside
|
||||
Off
|
||||
Come (Close works better)","Fergus has struggled with reactivity after he was attacked when he was a pup. He's super sweet, but it's quite anxious so will often bark. We're working in this with a trainer on this.","Steph.wilson or @FergusandMinnie","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=670ada87024785.23084565&form-id=4&field-id=50&hash=fa8a05c8943c81e576dbae15e8cf3fc1523eac2dbf0a3eb97a5c85f051ec68d2","2024-10-13","","125","2024-10-13 09:22:31","2024-10-12 20:22:31","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Android 14; Mobile; rv:131.0) Gecko/131.0 Firefox/131.0","115.188.37.188","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/125/"
|
||||
"Indy","Yang","2019-03-29","Erica","Mancilla","02041931790","James","0220165396","St Lukes Veterinary Centre","13 Morningside Drive, St lukes, Auckland 1025","098455573","Yes","No","","No","","No","","No","","No","1-5","Yes","Once every week","No","Yes","Birds","No","Yes","Yes","No","Yes","1","No","He loves car rides, he usually stays on my lap on passenger or he back in his bed. First half of the trip will be energetic, wants to look out, second half he will rest on my lap. He doesn't vomit, reactive to only motercycles.","Indy
|
||||
Hand
|
||||
Stay
|
||||
Down
|
||||
Up
|
||||
Wait
|
||||
Bad boy
|
||||
Good boy
|
||||
Come, outside, inside (with hand gesture)","Dominant, doesn't share squeaky toys well.
|
||||
He tugs and pulls during walks.
|
||||
Very persistent to where he wants to go.","Erica_tiffany","Instagram","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=670acbb024b3b3.41379744&form-id=4&field-id=50&hash=d156e39fae40efc2f87038bf19e797b7821aafc1784a86d7a3dde0820ea82344","2024-10-13","","124","2024-10-13 08:19:28","2024-10-12 19:19:28","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.2 Mobile/15E148 Safari/604.1","125.239.44.46","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/124/"
|
||||
"Lara","Macleod","2017-06-01","Chrisy","Macleod","021918814","Chrisy","021918814","Auckland Pet Hospital","Ponsonby","09 360 0961","Yes","No","","No","","No","","No","","Yes","5-10","Yes loves the beach and swimming","Meola Dog park once a fortnight","No","No","Cats","No","Yes","Yes","No","Yes","4","Yes","Happy in the car. WIll often stand up and look around","Sit
|
||||
Stay
|
||||
Bed
|
||||
Come","As Lara's master has just left she may be a little anxious and edgy. She will bark as she hears you on porch and at door. She wags her tail while barking.
|
||||
She is tempted by cats and sometimes barks or strains at leads when she sees one. Sometimes she is ok, she is improving!
|
||||
She does not like German Shepherds as she was attacked by one as a puppy. Sometimes she growls/barks at them.
|
||||
She is very good natured and loves company.","https://www.facebook.com/chrisy.macleod/","Someone reffered me","Fluffy Bums","https://onboarding.goodwalk.co.nz/index.php?gf-signature=66e8abf5687124.26063072&form-id=4&field-id=50&hash=14f89d41ff7e39a7b06af802327b4123894a9c69a960479d35a9cf8407b768f7","2024-09-17","","123","2024-09-17 10:06:45","2024-09-16 22:06:45","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","101.53.219.202","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/123/"
|
||||
"Bernie","","2021-02-22","Robin","Fryer","0279428816","Mark Fryer","021372109","CareVets Oratia","546 West Coast Road, Oratia, Auckland 0604","09 818 4104","Yes","No","","No","","No","","No","","Yes","5-10","Yes, she loves to run by the water","7","No","Yes","Birds","No","Yes","Yes","No","Yes","3","No","Fine","Sit, stay, come, stop. And some tricks","","ellislabel","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=66e68eec701c57.71195225&form-id=4&field-id=50&hash=004202b47300b83145766765695eed4f791cd79e9a7b78fd77aa333b1ef0b1db","2024-09-15","","122","2024-09-15 19:38:20","2024-09-15 07:38:20","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 17_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/128.0.6613.98 Mobile/15E148 Safari/604.1","118.92.99.79","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/122/"
|
||||
"Holly","Millman","2014-04-24","Emma","Millman","0272184446","(Other than me) Chris Millman","027 960 2911","Auckland Pet Hospital","46/48 Pollen Street, Grey Lynn, Auckland 1021","09 360 0961","Yes","No","","No","","No","","No","","Yes","1-5","Loves the beach and chasing sticks in the waves","7","No","Yes","Cats","No","Yes","Yes","No","Yes","5","No","Holly Will get into a scrap if a dog attacks her first or growl at her she will never be the 1st to take action though. In other words she won’t back down from a scuffle.","Understands English so comes to any command","Gets sore if runs too much","Emmaljudge","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=66c7d18060eee9.98659650&form-id=4&field-id=50&hash=1afe6ca11db4f392692f8b4259a6b9096b414cf063866936d4bf53e990b1a491","2024-08-23","","121","2024-08-23 12:02:08","2024-08-23 00:02:08","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 17_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Mobile/15E148 Safari/604.1","104.28.29.65","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/121/"
|
||||
"Wilson","Storr","2014-12-07","Ashleigh","Storr","0211089688","Fran Storr","0211663821","The Vets","08 Manukau Road, Epsom, Auckland 1023","09 625 5556","Yes","No","","No","","No","","No","","Yes","5-10","Yes","10","No","No","Cats","No","Yes","Yes","No","Yes","4","No","Anxious","Sit, Stop, Stay, Come, Off, Down (i.e. lay down)","","@ashstorr","Someone reffered me","Rachel","https://onboarding.goodwalk.co.nz/index.php?gf-signature=66c25a44137723.11498121&form-id=4&field-id=50&hash=f6b3c42a3cd4111ebb5335d582fa6c95a559eed9106da9fcd486e3041cf2e100","2024-08-19","","120","2024-08-19 08:32:04","2024-08-18 20:32:04","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0","103.242.69.153","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/120/"
|
||||
"Archie","Menezes","2023-10-01","Conal","Menezes","0210368104","Conal Menezes","0210368104","Balmoral Veterinary Care","482 Dominion Road, Mt Eden","096307168","Yes","No","","No","","No","","No","","Yes","1-5","Not yet, but we intend to in the summer","I used to take him once a week, but I have not taken him recently, as the behaviour of other dogs at our local dog park can be mixed. Often it is good and Archie is happy to be around them. Sometimes it is bad, with other dogs doing things to Archie that he does not enjoy. This is why we are seeking a pack walk with other dogs, to continue his socialisation in a controlled and structured environment.","No","Yes","Birds","Yes","Yes","Yes","Yes","Yes","3","No","Archie loves car rides and is reasonably well behaved in the car. We have a basket that we have tethered to the seat and Archie sits in that basket during car rides. He is tethered to the basket. The tether is attached to his harness that he wears in the car. We use a harness so that if there is an accident, he is not restrained by the neck.
|
||||
|
||||
Usually the command ""In"" will get him into the car and into his basket. This is sometimes not reliable if we are returning home and he would rather stay at the park. When this happens, I pick him up and put him in the car, and he will happily climb into his basket. While driving, he mostly sits in his basket. Sometimes he climbs out to look out the window, but the commands ""In"", ""Sit"" and ""Down"" get him back into the basket and sitting or lying down. If it is a longer ride, he usually curls up and goes to sleep in his basket. He has never thrown up in the car yet.","Sit - Sits down (index finger extended hand signal)
|
||||
Down - Lie's down (point at the ground)
|
||||
Wait - Wait until I give you the next command (hold palm out in a ""stop"" gesture)
|
||||
Stay - Stay where you are until I come back to you (hold fist up). this command is not very reliable.
|
||||
Come - Return to me
|
||||
Squeeze - Return to me, walk around me and stand between my legs","","@kiwi_h2oboy","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=669dacb8823b43.24584415&form-id=4&field-id=50&hash=d81ab401d4486e911d57e88349d1e42e6362a85d61772f3810aedb64d5d6764f","2024-07-22","","119","2024-07-22 12:50:00","2024-07-22 00:50:00","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36","161.29.73.81","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/119/"
|
||||
"Moss","Lane","2021-12-03","Henry","Lane","0221308980","Henry","0221308980","Royal Oak Vet Clinic","649 Mt Albert Road, Royal Oak","09 625 9729","Yes","No","","No","","No","","No","","Yes","1-5","Occasionally","Yes, everyday","No","No","Other","No","Yes","Yes","No","Yes","4","No","Moss is excitable when we knows he is going to the park. He is otherwise content to sleep or look out the windo","Wait
|
||||
Sit
|
||||
OK
|
||||
Here Boy
|
||||
Drop
|
||||
No","","N/A","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=669d7d9015b428.67048631&form-id=4&field-id=50&hash=93da47387a79563fc48ca88069e7d44ba48235d69eedd8f14eb88bf0a7182d63","2024-07-22","","118","2024-07-22 09:28:48","2024-07-21 21:28:48","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36","103.229.249.250","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/118/"
|
||||
"Pumpkin","Anderson","2023-07-07","Laree and Kevin","Anderson","0220 325121","Kevin Anderson","021679196","Balmoral Vet","482 dominion rd","096307168","Yes","No","","No","","No","","No","","Yes","1-5","Yes","1-2","No","No","Cats","Yes","Yes","Yes","Yes","Yes","1","Yes","She's fine in the car","Down, stay, wait. Come.","","Lareeandkevin","Someone reffered me","Anna Shaw","https://onboarding.goodwalk.co.nz/index.php?gf-signature=669c36f5a53f35.55401462&form-id=4&field-id=50&hash=721e0a06da4b27f76a6d582979cb17a8e68c04e3d5ab72c9d170a976cd5dd40f","2024-07-21","","117","2024-07-21 10:15:31","2024-07-20 22:15:31","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36","125.239.167.102","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/117/"
|
||||
"Zola","Humphrey","2023-03-09","Monique","Humphrey","0212764358","Adam Begg","0211862322","Chris Laurenson","49 Normanby Road, Mt Eden","096388445","Yes","No","","Yes","Vet thinks she has an allergy to a particular grass/weed (so far unidentified) which causes her eyes to go gunky.","No","","No","","Yes","5-10","Yes - on holidays to Whangamata","None","No","No","Cats","Yes","Yes","Yes","No","Yes","5","No","Settled - enjoys looking out the window and sniffing out an open window.","Zola come
|
||||
Sit
|
||||
Down
|
||||
Look
|
||||
Wait
|
||||
Leave
|
||||
Where's Dad?
|
||||
Get (toy) e.g. octopus, duck
|
||||
Relax mat (still working on this one but getting there)","","moniquehumphrey31","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6690c2a50a3550.99332594&form-id=4&field-id=50&hash=d1920dd0952fb767ff4f8f7228cec5c8b4e849befcb03362651148ff941060cb","2024-07-12","","116","2024-07-12 17:44:18","2024-07-12 05:44:18","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36","121.98.13.62","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/116/"
|
||||
"Louis","Shallard","2018-12-08","Annika","Shallard","021 2718707","Dini Ratcliffe","073876878","St Lukes Vet","13 Morningside Drive","098455573","Yes","No","","No","","No","","No","","No","1-5","Yes, on lead as his ears are painted on. He doesn't go into the water doesn't like it.","1 time per week plus goodwalk","No","No","Other","No","Yes","Yes","No","Yes","1","Yes","Louis has wandered.
|
||||
|
||||
Louis is experienced in the car. Enjoys being with you. No issues.","Ad hoc.
|
||||
|
||||
Come. Sit.","Hip and back issues need to be cared for.","AnnikaShallard","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=668b0be2701063.18070877&form-id=4&field-id=50&hash=81d8184fe718f887c40a9f41b29a283ffc538789216a821f190c4d935821c1b2","2024-07-08","","115","2024-07-08 09:42:58","2024-07-07 21:42:58","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/25.0 Chrome/121.0.0.0 Mobile Safari/537.36","203.97.18.134","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/115/"
|
||||
"Moss","Lane","2020-12-03","Henry","Lane","0221308980","Henry Lane","0221308980","Royal Oak Vet Clinic","649 Mt Albert Road, Royal Oak 1024","096259729","Yes","No","","No","","No","","No","","Yes","1-5","Yes","7","No","No","Birds","No","Yes","Yes","No","Yes","4","No","Chilled. Happy to sleep or look out of the window. Is excited and will whine when he knows he is going to the park","“Here boy”
|
||||
“Wait”
|
||||
“OK”
|
||||
“Drop”
|
||||
“Stop”
|
||||
“Down”
|
||||
“Sit”","","Lydia Park (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=666e7df19031a2.70237035&form-id=4&field-id=50&hash=19527f1b9dd630922ba8e6fe067c42a1dd2fee1fa2dea728b5e3c3fd6d5e13fe","2024-06-16","","114","2024-06-16 17:53:53","2024-06-16 05:53:53","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/126.0.6478.54 Mobile/15E148 Safari/604.1","121.73.188.128","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/114/"
|
||||
"Louis","Shallard","2018-12-08","Annika","Shallard","021 2718707","Dini Ratcliffe","0277126554","St Lukes Veterinary Centre","13 Morningside Drive","09 8455573","Yes","No","","No","","No","","No","","Yes","1-5","Yes - on lead, prevent physical over-exertion may affect joints hips","1","No","Yes","Other","No","Yes","Yes","No","Yes","1","No","Relaxed , travels often on the passenger seat without any issue.","Ears seem to be painted on. Louis has had previous training needs to be refreshed.","He can be very excited and also jump when meeting new human and doggy friends. Please avoid due to hip issues.","Annika Shallard","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=665bba626dfb29.88761325&form-id=4&field-id=50&hash=af56bc371f54af34378af3a47137f04fc74178f8e170d2e2ee8008ee27f308f4","2024-06-02","","113","2024-06-02 12:18:42","2024-06-02 00:18:42","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/24.0 Chrome/117.0.0.0 Mobile Safari/537.36","49.224.89.46","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/113/"
|
||||
"Finn","Stock","2015-01-02","Cara","Telle","0212585984","Lueder Stock","021374459","MangereVet Clinic","95 Coronation Rd, Mangere","096366732","Yes","No","","No","","No","","No","","Yes","5-10","Yes","4 times per week","No","No","Cats","No","Yes","Yes","No","Yes","5","No","Sleeps or looks out the window","Heal, Come, Sit, Be Quick (for the toilet), Roll over, Down, Off, Car, Walk, Leave it, Dinner, Paw","Finn does not like male dogs who have not been desexed on our property","facebook Cara Telle","Instagram","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=664478578c97a7.90730553&form-id=4&field-id=50&hash=ee6fcf843fb7e6f15b4b491a5a27c4a650d32db0fd62e8527fd16fef2d14b6c0","2024-05-15","","112","2024-05-15 20:54:47","2024-05-15 08:54:47","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:125.0) Gecko/20100101 Firefox/125.0","161.29.229.57","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/112/"
|
||||
"Griffin","Taylor","2012-11-01","Sam","Taylor","0204202808","Tate Watson","02040182762","St Lukes Veterinary Centre","13 Morningside Drive, Mount Albert","09 845 5573","Yes","No","","No","","Yes","Dental biscuits","No","","No","1-5","Yes – loves the beach","Yes – less so now that Meola Rd is closed. We used to take him to Coyles Park most mornings off lead and he was fine with other dogs.","No","Yes","Cats","Yes","Yes","Yes","No","No","3.5","No","A bit anxious, a bit excited. He's very, very vocal and usually won't sit still. He's a lot more relaxed after a walk.
|
||||
|
||||
He's getting better in the car, but it's hit and miss. The trick is to make him feel secure in his seat.
|
||||
|
||||
Recently we got him a car seat. Because it has a lip, he feels a lot more secure in it. When we're in the van, Griffin sits between us in his seat and is normally pretty relaxed. Often he'll even lie down. But he rarely does this in other cars.","Sit – but he only really does it if there's food.","More details about the questions above:
|
||||
Griffin is ok with other dogs, he just gets annoyed with young or really active dogs who in his face and won't leave him alone. On walks, he happily goes up to other dogs to say hello and have a sniff and 90% of the time it's absolutely fine, particularly when he's off lead. When I say he's reactive, he always notices other dogs and wants to say hello. He won't just walk by another dog without taking notice.
|
||||
|
||||
He is very reactive to cats, but his eyesight isn't as good as it used to be, so if they're far away he likely won't notice them.
|
||||
|
||||
Small children (toddlers) make him nervous and he has nipped a few in the past. He's never nipped anybody off lead at a dog park, just when he's been stuck in a room with them. Still if there are small kids around, we always put him on a short lead until we're past them. Best not to risk it.
|
||||
|
||||
His recall is ok. Most of the time he comes back straight away, or he waits for you to catch up with him. But if he's having a really good time, he might choose to ignore you...","@taylormayd_ @lowercase.nz","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65f093d9438b36.22712932&form-id=4&field-id=50&hash=a3cf79a8ca1dada2f2f073c7a9dee3f71c28c1bd42b0085ada1acc9f2d122218","2024-03-13","","111","2024-03-13 06:41:45","2024-03-12 17:41:45","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36","203.211.108.130","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/111/"
|
||||
"Hudson","Beever","2021-08-22","Lee","Beever","021655859","Lee Beever","021655859","Lee Beever","8 Hereford St, Freemans Bay","09 281 5815","Yes","No","","No","","Yes","He eats mushy food standing on a stool because he has megaoesohagus so his oesophagus doesn’t work properly and he will regurg food and cough if he eats dry kibble. He can eat small amounts of kibble for training, but not too much as it will take quite a while before it moves down to his stomach","No","","Yes","5-10","Yes. He does get ear infections if he puts his head under the water too much.","No","No","No","Birds","No","Yes","Yes","No","Yes","2","No","Travels well. No issues. Either looks out window or lies down.","Sit. Down. Come. Leave. Wait.","We’ve been working on his leash walking to try limit pulling - it’s currently a work in progress.
|
||||
His recall is much better if you have something he wants like a ball or treats.
|
||||
Regarding dry kibble treats - please see comment above.","Lbeever (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65e3d62dc175c1.20462780&form-id=4&field-id=50&hash=df70dd78431d6d977897a60098a1d3f2a2f27732752abfe0395cc3136b933c70","2024-03-03","","110","2024-03-03 14:45:17","2024-03-03 01:45:17","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Mobile/15E148 Safari/604.1","115.189.90.224","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/110/"
|
||||
"Ruru","Short","2016-04-26","Emily","Short","0274124402","Emily Short","0274124402","Lee Beever","8 Hereford Street, Freemans Bay","09 281 5815","Yes","No","","No","","Yes","Hills sensitive stomach and skin","No","","No","1-5","Yes - will run out to water edge and just dip her chest into the water to cool down","None","No","Yes","Other","No","Yes","Yes","No","Yes","4","No","Fine in the car. Usually travels in the back of RAV4 behind a dog barrier.","Come. Sit. Lie down. Stay. Leave. Wait.","Ru is a very vocal Beardie, so barks and makes noises often. Usually this is due to excitement. She often will bark when she sees other dogs and would run towards them if she is off lead. Usually when she gets close she stops barking and they sniff each other and that’s fine. If she’s on lead I often lead her away from other dogs because her barking is loud. She does not growl and has never had a fight with another dog.
|
||||
She is a really sweet girl and I often just walk her through neighbourhood streets rather than going to dog parks because I think she finds that more calm, rather than interacting with lots of random dogs.","Emily Short","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65e3d352cb6797.26378477&form-id=4&field-id=50&hash=9437cae00563f2b47658bb71143dbf7e35d18c2f6bc70ff7cf4f2d42f93ba5fb","2024-03-03","","109","2024-03-03 14:33:06","2024-03-03 01:33:06","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Mobile/15E148 Safari/604.1","115.189.90.224","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/109/"
|
||||
"Louis","Hall","2022-03-21","Rachel","Hall","021777441","Peter Hall","0274222118","Pt Chev Vet","67 Pt Chevalier Road","098150696","Yes","No","","No","","No","","No","","Yes","5-10","Yes, he has been to Thorne Bay and Milford Beach","The Domain (1-2 times per week), Parnell Rose Gardens (1-2 times per week), Myers Park (daily), Albert Park (3-5 times week), Tahaki Reserve (Mt Eden) once a fortnight","No","No","Cats","Yes","Yes","Yes","No","Yes","4","Yes","Usually curls up and goes to sleep once going at 50km/h","Come, sit, wait (for when he sits and you move away and then call him), stay (for when he stays on the spot until you return to him), down, relax (down with back legs tucked to one side),stop (e.g. at road), leave it (not 100% if something irresistible like chicken bones), heel, gentle, up and over (to jump over low fence)","He is ok with children so long as they do not squeal and run up to him fast and then reach over his head. If a child does this he will run away from them or sometimes bark.","_rachel_hall_ (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65bdd6163dc8f5.22341806&form-id=4&field-id=50&hash=de7c4489d6bcdc1bbb0ad3c389a943a9402be5abaa8052a179a8a7ba533b1c14","2024-02-03","","107","2024-02-03 18:58:46","2024-02-03 05:58:46","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15","115.189.128.39","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/107/"
|
||||
"Tinks","Ewen","2021-01-31","sue","Ewen","0274 524722","sue ewen","+64274524722","The Vets","608 Manukau Rd, Greenwoods Corner, Epsom","+64 9 625 5556","Yes","No","","No","","No","","No","","Yes","5-10","Yes","Every day","No","No","Cats","No","Yes","Yes","No","Yes","2","No","Generally quiet but does bark at dogs on the footpath","Sit
|
||||
Down
|
||||
Leave
|
||||
Heel","Interested in birds and cats - I say ""leave""
|
||||
Uses hand signals up - means sit
|
||||
hands pushing down means drop","i.paua.pearl","Someone reffered me","I met Aless in the park","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65b0c5573d2637.72381668&form-id=4&field-id=50&hash=cef171b38a8f109e90675acc0c7b91c491e0ba4dd066928af98fd905af6a693f","2024-01-24","","105","2024-01-24 21:07:51","2024-01-24 08:07:51","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0","125.237.63.27","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/105/"
|
||||
"Honey Crumbles","Shaw","2020-11-08","Anna","Shaw","02102970532","Andrew SHaw","00275237374","St Lukes Veterinary Cllinic","13 Morningside Drive, St Lukes, Auckland 1025","098455573","Yes","No","","Yes","Nothiing major but gets a bit itchy, not sure what triggers it. It's managed well.","No","","No","","Yes","1-5","Yes, not often","No","No","No","Birds","No","Yes","Yes","No","Yes","3","Yes","Honey is content to be in the car. We have never had any issues. She does like to see what is going on, but that is a preference, not an issue.","Sit, Down, Stay (sometimes!) Up (for jump up), Come. Also sometimes ""no barking!!!'","No I think we covered verything in the meet and greet. Also please note that in the question about running away, Honey did escape a few times and has run but this is when she was a puppy. NOw if she gets out she just comes back to the front door and waits to be let in.","@themignonette","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65459e30a3bcc8.74105744&form-id=4&field-id=50&hash=ebf8c00d85a89599214e6b0dddc91fc01e498f8170c87418ad4ed1f2aec0a6f2","2023-11-04","","103","2023-11-04 14:28:50","2023-11-04 01:28:50","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36","123.255.41.22","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/103/"
|
||||
"Hank","O'Donnell","2021-05-14","Shelly","Haggas","0210425095","Zane O'Donnell","021734734","Your Mobile Vet","80d Main Road, Kumeu. 0810","0275590889","Yes","No","","No","","No","","No","","Yes","1-5","We visit Cornwall beach most weekends.","Not too frequently, maybe once every few weeks.","No","No","Birds","Yes","No","Yes","Yes","Yes","4","No","Can be quite unsettled on short journeys. But sometimes very settled, it's sporadic.","Sit. Touch. Down. Get in. Whistles. Middle. Wait","","@hankthekiwivizsla","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=653eb518c7bde8.66228884&form-id=4&field-id=50&hash=b9f295f1f69bdcdf23e3ff0546fec4d7abb924ec31a9b3a1c937e2cdd6c8b61d","2023-10-30","","101","2023-10-30 08:40:08","2023-10-29 19:40:08","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36","203.118.148.26","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/101/"
|
||||
"Molly","Hickey","2014-12-11","Danielle","Barclay","0273972112","Matthew Hickey","021851489","Balmoral Vets","Dominion road","tel:+6496307168","Yes","No","","No","","No","","No","","Yes","5-10","Yes, loves Pt Chev, Takapuna in particular","Yes, 4 to 5 times a week. Monte Cecelia, big king","No","No","Cats","No","Yes","Yes","No","Yes","3","No","Molly is good in the car, usually sleeps","Molly come
|
||||
Wait
|
||||
Sit
|
||||
Down
|
||||
Shake","She likes to bark with excitement but quickly settles down","Danielle Barclay","Someone reffered me","Tiny Paws","https://onboarding.goodwalk.co.nz/index.php?gf-signature=650c9ec862e7f9.75096945&form-id=4&field-id=50&hash=c53404ed82e4c1856d770489779edd316d19d65155c9f202b2330f660212cf39","2023-09-22","","99","2023-09-22 07:51:45","2023-09-21 19:51:45","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/117.0.5938.108 Mobile/15E148 Safari/604.1","121.98.37.166","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/99/"
|
||||
"Otis","Batchelor","2022-02-11","Ross","Batchelor","021799704","Rosemary Batchelor","0274956005","Abbotts Way Veterinary Clinic","199 Abbotts Way, Remuera, Auckland 1050","09 524 8361","Yes","Yes","Possibly allergic to beef products.","No","","Yes","Strictly eats Acana Singles Free Run Duck biscuits only, at least until December 2023","No","","Yes","5-10","Yes, he loves swimming","Yes, every day","No","No","Cats","No","Yes","Yes","No","Yes","3","No","Very familiar with car travel, he usually rides in the boot of the car or sometimes on the front passenger seat with a seatbelt/collar clip.","Come, Wait, Sit, Toilet, Inside, Up, Cushion (bed)","","rossinopecorino (Instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6503b7198a9f77.22408968&form-id=4&field-id=50&hash=2573f783f06a20dec6ce6982c6def8f7e3e0b883a564f8ef88a93aa3efc5cdf6","2023-09-15","","97","2023-09-15 13:44:57","2023-09-15 01:44:57","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1","172.225.244.185","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/97/"
|
||||
"Ollie","Buckley","2017-09-27","Ann","Buckley","0274479293","Emily Peterson","0273407725","Grey Lynn Vet (Vetcare)","46-48 Pollen St","09 3600961","Yes","No","","No","","No","","No","","Yes","5-10","Yes","4-5","No","No","Cats","No","Yes","Yes","Yes","Yes","4","No","Ollie is a little reactive and protective at home and in the car - he will bark at especially cyclists","Wait, Stay, Come, Sit, Down, Leave, Walk with me (walk on leash beside me politely), High five, shake","No","None although I am on facebook","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64bf5e8263bfa4.37532663&form-id=4&field-id=50&hash=108323a32dc92389b36f35f3f2b62fabb488d1cf4e9c9c142813d0fa42cca7f4","2023-07-27","","95","2023-07-25 17:32:50","2023-07-25 05:32:50","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36","210.246.17.164","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/95/"
|
||||
"Zola","Humphrey","2023-03-09","Monique","Humphrey","0212764358","Adam Begg","0211862322","Normanby Road Vets","49 Normanby Road, Mt Eden, 1024","096388445","Yes","No","","No","","No","","No","","Yes","1-5","No not yet but will in the future","No","No","No","Cats","No","No","Yes","Yes","Yes","2","Yes","A little anxious at the start and then settles down and curls up and rests.","Pup, pup, pup (for come)
|
||||
Zola
|
||||
Sit
|
||||
Close
|
||||
Down","","Monique Humphrey","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=648f8b0814a3c0.02837457&form-id=4&field-id=50&hash=97010e06e3b2cb0e650c3505b319534859c56305e935cce4ff94dfe30c316c04","2023-06-19","","93","2023-06-19 10:54:00","2023-06-18 22:54:00","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.2 Safari/605.1.15","121.98.13.62","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/93/"
|
||||
"Sunny","Lloyd","2021-09-03","Ruby","Tautuhi-Lloyd","02041461878","Kanoa Lloyd","021657788","Auckland Pet Hospital","46/48 Pollen Street, Grey Lynn","093600961","Yes","No","","No","","Yes","Royal canin digestion + supplements","No","","Yes","5-10","Yes","3-4","No","No","Cats","No","Yes","Yes","Yes","Yes","4","No","Calm and happy. May want to look out the window.","Sit, come, wait","Sunny has chronic rhianitus and has some breathing issues on and off. May flare up and be snotty from time to time. She is a little overweight at the moment and not as fit as usual","?","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=647f8d98a32e44.61071603&form-id=4&field-id=50&hash=6460be1bcbd773cbb5b389c7a1d9134b98815929b59b4582918f2b7a38b5c3d4","2023-06-07","","90","2023-06-07 07:48:40","2023-06-06 19:48:40","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.121 Mobile/15E148 Safari/604.1","101.100.129.22","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/90/"
|
||||
"Donny","Kenny","2020-12-03","Megan and Adrian","Kenny","Meg 021676959 Adrian 021828902","Megan kenny","021676959","Normanby road vets","49 Normanby road","096388445","Yes","Yes","No red meat","No","","Yes","No raw food only biscuits","No","","Yes","1-5","Yes every weekend","Yes with his day carer 4 times a week","No","No","Other","No","Yes","Yes","No","Yes","3","No","He sits in his car seat or on the front seat he travels to Pauanui every week which is a three hour drive there and back very used to travelling in the car","Come Donny
|
||||
|
||||
Sit
|
||||
|
||||
Down
|
||||
Shake hand","If cold he needs a jumper or jacket
|
||||
If more than one dog runs up to him last he will definitely shy away
|
||||
We try and keep an eye on what he eats on the ground if he is off the lead as he can tend to eat extremely unhealthy things which could make him sick","meg.kenny","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6476ee0f7f6963.08004489&form-id=4&field-id=50&hash=b9bc50afd19e6222c4993f4929950f6d2484bcbfed5ed8e9ec6171b641a711c0","2023-05-31","","88","2023-05-31 18:49:51","2023-05-31 06:49:51","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.121 Mobile/15E148 Safari/604.1","115.188.70.175","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/88/"
|
||||
"Maggie","Read","2021-10-20","Harriet","Read","0212340063","Sue read","02102446843","Glendowie Vets","Riddell Road st Heliers","09 575 7688","Yes","No","","No","","No","","No","","Yes","1-5","Yes","Yes 3","No","No","Birds","No","Yes","Yes","Yes","Yes","4","No","Very happy normally sleeps","Come sit stay","","No socials","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6465739a39fc42.86875372&form-id=4&field-id=50&hash=93533b1bd1928f98414fc8aafb44986fdcf214ecadb129f698b28859d1148a92","2023-05-18","","87","2023-05-18 12:38:50","2023-05-18 00:38:50","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.69 Mobile/15E148 Safari/604.1","203.211.107.249","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/87/"
|
||||
"Monty","Rewiri","2020-11-15","Estelle","Rewiri","0275194228","Nick McGrath","+61 433 864 156","Massey Vets","256 Don Buck Road, Massey","09 832 4895","Yes","No","","No","","No","","No","","Yes","5-10","yes","4","No","No","Cats","No","Yes","Yes","Yes","No","3","No","Whines in the car mostly when the windows are up / reversing","Sit
|
||||
Stay
|
||||
Wait (food)
|
||||
Handshake
|
||||
Bonk
|
||||
Come
|
||||
Turn
|
||||
|
||||
Maori commands..","Doesn’t like his paws being touched / isn’t the biggest fan of men / high vis clothing","Mischief_ Monty","Instagram","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=645c1e471090d2.61524914&form-id=4&field-id=50&hash=2ae19a9423580c651cdf1e2d0070a8bd595fe64ef5daf41389b747997849d4fb","2023-05-11","","84","2023-05-11 10:44:31","2023-05-10 22:44:31","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Mobile/15E148 Safari/604.1","115.189.88.240","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/84/"
|
||||
"Luna","Matthews","2020-04-16","Carl","Matthews","021737727","Vanessa Matthews","021 380 334","Chris at Normandy Rd Vet","49 Normanby Road, Mount Eden,","09 638 8445","Yes","No","","No","","No","","No","","Yes","5-10","Yes she loves the beach","2-3 times","No","No","Birds","Yes","Yes","Yes","Yes","Yes","4","Yes","She travels a lot in the car. Seems to prefer the boot as she can lean better.","Sit, stay, heel (sometimes), come, no. Good Girl (if she has responded to a command)","I put she is reactive to children and other people but only because she is very social and wants to play. She is never aggressive and will very rarely bark.
|
||||
About 3 times a week we go to the local school (Kowhai) and there is often up to 12 of her dog friends there to play with.
|
||||
|
||||
She has run away before when we left the door open but didn't go far. She does have our phone numbers on the collar.
|
||||
|
||||
If we are at a dog park she has never run away or gone to far from us and will come back when called.
|
||||
|
||||
Loves treats!","I don't have any social media.","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=645aa1326e9497.56635043&form-id=4&field-id=50&hash=01947a1ded47ed55e41ee9b5190fb28a25759adecebf22c082dff38df73eef9a","2023-05-10","","83","2023-05-10 07:38:26","2023-05-09 19:38:26","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36","121.99.240.46","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/83/"
|
||||
"Sweep","","2013-12-17","Todd","Benton","021482670","Jose Rodriguez (co-owner)","021846685","Auckland Pet Hospital","46-48 Pollen Street, Grey Lynn, Auckland 1021","09 360 0961","Yes","Yes","Allergic to many different types of fish - please don't give fish based treats / food","Yes","Hayfever (very typical of Spanish water dogs) - he can get quite sneezy and rub his eyes but don't worry too much about it, I'm just telling you because I don't want you to worry too much about it","No","","No","","Yes","5-10","Yes - not often but he likes it (he will chase ducks etc)","14 minimum","No","Yes","Cats","No","Yes","Yes","No","Yes","4","No","He's very good in the car - he has travelled a lot (between UK & Spain and around Spain many times so very used to it). He does like to get out of the car after about 2.5 hours and stretch his legs but I don't think he will be with you in the car for longer than 2.5 hours continuously!","Sweep gets spoken to at home in both English and Spanish - English is fine but Spanish is good if you have any Spanish speaking staff! There's probably more, but the following are the key one's you are likely to use / need:
|
||||
|
||||
Sit - Sentate
|
||||
Come - Ven / ven aqui
|
||||
Cross (to cross the street) - Cruza
|
||||
Wait (if he wants to cross the street and it's not safe) - Espera
|
||||
Let's go - Vamos","I couldn't select above that he will react to both cats and birds - he will chase birds as well but it isn't a severe problem (the cats are worse). To add, when we walk around on the street, I always have him on a lead as if he sees a cat he will go straight after it and won't wait for any traffic (off-lead in the park, beach or other similar safe place is fine but not on the street).
|
||||
|
||||
As said on the phone, he doesn't like dogs jumping on him and isn't super good with small dogs that behave very aggressively ('small dog syndrome')toward him, as he was bitten by a small dog when he was younger.
|
||||
|
||||
As mentioned, he does have arthritis (which he does have medication for) - walking is fine but we try to avoid higher impact activities (chasing balls etc - he does love chasing balls so we need to keep an eye on him and make sure he doesn't go rushing off after other dog's balls in the park).","Let me get back to you on this (will email you) - Jose uses social media more than me","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64570e76700919.28264836&form-id=4&field-id=50&hash=f161774d4c291638db6211700c14419473a773e4d625e02777d5b15517d5b40d","2023-05-07","","80","2023-05-07 14:35:34","2023-05-07 02:35:34","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 OPR/98.0.0.0","121.99.103.51","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/80/"
|
||||
"Bob","Smiyh","2021-06-01","Paula","Smith","021979995","Tony Browne","021505006","Balmoral Vets","Balmoral Road","+64 9 630 7168","Yes","No","","No","","No","","No","","Yes","1-5","He has been a couple of times","2 parks a week","No","No","Birds","No","Yes","Yes","Yes","Yes","4","No","Anxious- Whines and high pitched bark","Sit
|
||||
Stay
|
||||
Come
|
||||
No","","Smithy007","Someone reffered me","Joni Liggins - owner of Basil a cavoodle","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64549b66b5eb99.40000704&form-id=4&field-id=50&hash=6787581b9df2e5d49139bdab8ac6db043ce11b3035c4d0f51d87b4185a1b447e","2023-05-05","","78","2023-05-05 18:00:06","2023-05-05 06:00:06","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1","125.237.205.159","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/78/"
|
||||
"Test","test","1986-10-04","Test","Test","t","test","test","test","test","test","Yes","No","","No","","No","","No","","No","1-5","1","1","No","No","Cats","No","No","Yes","Yes","Yes","5","Yes","test","test","test","test","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6454406fe18cc4.20548864&form-id=4&field-id=50&hash=54ae4c519482f955b5b884c1b7f901ea40c6a3e8a83694cfd7eec842c314e854","1986-10-04","1","77","2023-05-05 11:31:59","2023-05-04 23:31:59","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36","101.98.31.253","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/77/"
|
||||
"Fergie","Taylor","2020-10-06","Caroline","Logan","0272217468","Matt Taylor","0272175951","Auckland Pet Hospital","Pollen Street, Ponsonby","093600961","Yes","No","","No","","No","","No","","Yes","5-10","Yes - she loves the beach","4","No","Yes","Cats","No","Yes","Yes","Yes","Yes","4","No","She is well behaved. She likes to look out the window and gets very excited when she realises where she is going.","Come, heel, leave it, down, sit, Fergie","","@carriestrells","Facebook","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=645430414a9eb8.15054547&form-id=4&field-id=50&hash=7c9cb76001b8ba9925f6d81aacd877fe600e3d15b5dbdd73721d00b6d164c538","2023-05-05","","76","2023-05-05 10:22:57","2023-05-04 22:22:57","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Mobile/15E148 Safari/604.1","122.56.203.158","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/76/"
|
||||
"Buddy","Reynolds","2022-07-13","Lori","Reynolds","0223109861","Sarah Rothwell","021 998 531","Belmont vets","2 Egremont St Belmont Auckland 0622 New Zealand","09446 1155","Yes","No","","No","","No","","No","","Yes","5-10","Yes, weekend walks a few times a month.","Yes, approx 2","No","No","Birds","No","Yes","Yes","No","Yes","3","Yes","Good in the car and frequently rides with me. Loves to look out the window, stirs at times.","Sit and paw","","Instagram loriannreynolds","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6448d7241bccb3.97264724&form-id=4&field-id=50&hash=1f1318ecdf264abe17122ed5d4aa39bd7ff0885a9fce5abcb7ba3aa0b819a887","2023-05-26","","74","2023-04-26 19:48:02","2023-04-26 07:48:02","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Mobile/15E148 Safari/604.1","172.225.244.185","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/74/"
|
||||
"Baylee","Curac","2022-04-24","Tony","Curac","0274432085","Maxine Curac","+64212611082","The Strand Vet","Textile Centre Kenwyn Street Parnell","09 3776667","Yes","No","","No","","No","","No","","No","1-5","Yes","2 to 5","No","No","Birds","Yes","Yes","Yes","Yes","Yes","3","Yes","Likes to look out the window, sleeps after a while","Sit, come, stay shake, no","We need some help with training as she is a constant chewer and her recall needs improving","Max and Muppy - Insta","Someone reffered me","Johnathan","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6448b179106070.98351970&form-id=4&field-id=50&hash=30380f4859624003ebd68f2cb529d47daef907a96df05cd3559e47f879599e89","2023-04-26","","73","2023-04-26 17:07:05","2023-04-26 05:07:05","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36","115.188.146.39","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/73/"
|
||||
"Jake","Korucu","2021-12-01","Stephanie","Korucu","021989369","Murat Korucu","021975369","Pt Chev Veterinary Clinic","67 Point Chevalier Road, Point Chevalier, Auckland 1022","09 815 0696","Yes","No","","No","","No","","No","","Yes","5-10","Yes, he loves the beach and the water, but doesn't actually swim","Twice a day, most days","No","No","Cats","No","Yes","Yes","No","Yes","3","No","Excitable on the way out, calm on the way home! Generally good.","Come, sit, sit nicely, wait , this way (understands and generally obeys)
|
||||
Leave it, get down, stay (understands but variable as to whether he obeys)","Jake loves being off-leash for his morning walk - he enjoys running up and down the sides of the hills (Owairaka Domain is our usual). He knows a lot of the regular dog on the hill and there are several he meets and plays with on a regular basis. With some of his friends there is mutual fun in some fairly rough-looking wrestling play (Especially in the mornings you might encounter Sadie -yellow lab, Freddie -black boxer-labX, Miso -large yellow lab or Pearl -grey staffie - all of them love to play like this).","Steph Korucu (FB and Instagram)","Facebook","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=641d262642c5d7.69182113&form-id=4&field-id=50&hash=dd409536be64dcc6789788c2495fa916bffc40c9ea665d78354acad174a4b183","2023-03-24","","64","2023-03-24 17:25:10","2023-03-24 04:25:10","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","198.41.238.111","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/64/"
|
||||
"Archie","Dine","2013-01-02","Penny","Dine","0225280966","Jessica","0225280966","Cambridge Vet","41 EMPIRE STREET","0800226384","Yes","No","","No","","No","","No","","Yes","1-5","Yes","5","No","No","Other","No","Yes","Yes","Yes","Yes","4","No","Very calm just sits there","come","","same as FLo / Mine","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63ebdb3cddbc13.42446379&form-id=4&field-id=50&hash=71bee8bcc5ac73a3f57eabccf7f82d3c78b757ba7627a8e8d7c647c5012fff92","2023-02-15","","61","2023-02-15 08:04:28","2023-02-14 19:04:28","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36","172.68.66.78","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/61/"
|
||||
"Freddie","Sullivan","2019-12-01","Monique","Sullivan","0275306046","Mark Sullivan","0211639997","Balmoral Vets","482 Dominion Rd, Mt Eden","630 7168","Yes","Yes","Dairy","Yes","Grass","Yes","Sensitive skin diet but can have treats","No","","Yes","5-10","Yes","3-4","No","No","Cats","No","Yes","Yes","No","Yes","4","No","Loves being in the car","Sit, down, come","Please keep Freddie off long grass that has gone to seed. He has needed two surgeries now to remove these seeds and we would like to try and prevent this happening again.","Instagram minksullivan","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63e43156c3cca5.95225021&form-id=4&field-id=50&hash=3bb68d2fa182db969b56928cc459ed91f4584c28a8f9af5cfecaa29741902768","2023-02-09","","59","2023-02-09 12:34:06","2023-02-08 23:34:06","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36","198.41.238.110","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/59/"
|
||||
"Digby","Langdon-Baird","2021-11-21","Kate","Langdon","021411488","Sophie Baird","021931977","Auckland Pet Hospital","46-48 Pollen Street, Ponsonby","09 360 0961","Yes","No","","No","","No","","No","","Yes","1-5","Yes","7 times per week","No","No","Birds","No","Yes","Yes","No","Yes","3","Yes","He ran away once, when he saw scared off by another (huge dog).
|
||||
He is fine in the car. He sits in the boot of the car.","Sit
|
||||
Down
|
||||
Come
|
||||
Wait
|
||||
Up (to get in the car)","He is a boisterous (but friendly) boy who needs lots of exercise!","Kate Langdon (facebook) katelangdon_nz (insta)","Facebook","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63df001dd7e541.37838378&form-id=4&field-id=50&hash=e8f90d72d6f9d3cfc20ff42c9efd5f16088654a14d5e6ccbdbc6609d2392670a","2023-02-05","","57","2023-02-05 14:02:21","2023-02-05 01:02:21","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Safari/605.1.15","172.68.146.3","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/57/"
|
||||
"Lulu","Levermore","2015-02-16","Matthew","Swinburne","02041249994","Victoria Levermore","02041196653","TBC","TBC","TBC","Yes","No","","No","","Yes","Hypoallergenic kibble","No","","No","1-5","Yes","No","Yes","Yes","Other","No","Yes","Yes","No","Yes","4","No","Lulu regularly travels in the boot of our car and has no issues.","Sit. Stay. Wait. Heel. Roll over. Down. Shake.","Lulu is nervous around other dogs and needs to be kept on leash at all times when walked.
|
||||
If she feels threatened by other dogs she can get aggressive.
|
||||
We recommend keeping space from dogs she is not familiar with.","@mattswinny (instagram)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63605b3fcc6f81.39608116&form-id=4&field-id=50&hash=79743c51c5ae9f38787210f42fbe2cdd1a10f84a5138057d2ae676b0e54fcbb3","2022-11-01","","56","2022-11-01 12:33:19","2022-10-31 23:33:19","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36","162.158.2.21","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/56/"
|
||||
"Wallace","Darrah","2022-07-22","Nina","Darrah","0224981015","Siobhan Connelly","02108639903","Pt Chev Vet Clinic","67 Point Chevalier Road, Point Chevalier, Auckland 1022","09 815 0696","Yes","No","","No","","No","","No","","Yes","1-5","Yes, put still on leash","0","No","No","Birds","No","No","Yes","No","No","1","No","She is pretty calm, I have her tethered to the seat so she cant roam far.","Sit
|
||||
Down
|
||||
|
||||
working on: Wait, Stay","","@nina.darrah","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=635ae10606d868.49435145&form-id=4&field-id=50&hash=3db725b1f841bd74ebff7d583cac7b4b032bea51541c88d086df92c4be0a01a3","2022-10-28","","53","2022-10-28 08:50:30","2022-10-27 19:50:30","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36","172.68.66.3","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/53/"
|
||||
"otis","McLean","2020-04-23","Fiona","Clarke","021477546","Brigid McLean","+64 21 051 9770","St Luke’s vets","13 Morningside Drive Mount Albert Auckland 1025 New Zealand","+6498455573","Yes","No","","Yes","Allergic to wandering Jew","No","","No","","Yes","1-5","Yes","Not often","No","No","Other","No","Yes","No","No","Yes","3","No","Calm, but likes cuddles","Sit, stay, come, wait, no, good boy etc","","Feeclarkee","Someone reffered me","Brigid McLean","https://onboarding.goodwalk.co.nz/index.php?gf-signature=633be8142e7824.35905911&form-id=4&field-id=50&hash=1e4809781b32a909dbf95107fe4c759f1de0ff7397bb547f1995f74c04157baf","2022-10-04","","51","2022-10-04 21:01:29","2022-10-04 08:01:29","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.68.146.2","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/51/"
|
||||
"Fergie","Taylor","2020-10-06","Caroline","Logan","0272217468","Matt Taylor","0272175951","Auckland Pet Hospital","46-48 Pollen Street, Grey Lynn, Aucklandd","09 360 0961","Yes","No","","No","","No","","No","","Yes","5-10","Yes regularly on and off leash","1-2 times per week","No","No","Birds","No","Yes","Yes","No","Yes","3","No","Relaxed. Happy to sit wherever but always keen to look out of the window where possible.","Sit, down, stay, come, leave it","I didn't quite understand the questions about being reactive. Fergie will look to chase cats and birds if given the opportunity, albeit has not totally run away previously in doing so. She is happy and confident around other dogs, people and children. She is particularly fond of playing with other dogs so will seek that out when off leash.
|
||||
|
||||
One call out would that she can be nervous walking on leash on pavements. Following a bad experience walking next to a building site during a demolition, she can be twitchy and look to pull away from buses, large trucks or loud noises from building sites etc.","@carriestrells & @matthewtaylorphoto on Instagram","Someone reffered me","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63328f1f08d1d9.93390027&form-id=4&field-id=50&hash=14ec5a99a530fa02e079e24e5a3480f2eb531de1c4689736af62fa056ff3e5b7","2022-09-27","","49","2022-09-27 18:51:12","2022-09-27 05:51:12","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36","172.68.66.2","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/49/"
|
||||
"Flo","Dine","2020-12-01","Jessica","Dine","0225280966","Alex Little","0276888676","Normanby Road Vets","49 Normandy Road","09 6388445","Yes","No","","No","","No","","No","","Yes","1-5","Yes loves it!","6x oer week","No","No","Cats","No","Yes","Yes","Yes","Yes","2","No","Fine, will just sit on seat","Sit
|
||||
Come
|
||||
Down
|
||||
No
|
||||
Walk
|
||||
Treat
|
||||
Dinner","","n/a","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63280e157c1eb5.67652552&form-id=4&field-id=50&hash=8cb69d5e96254bc74621d32638a83a2c7c1954ad316cb1c81b81007e82e96759","2022-09-19","","47","2022-09-19 18:37:46","2022-09-19 06:37:46","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.66.36","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/47/"
|
||||
"Lenny","Stark","2020-07-21","Andy","Stark","0211926498","Andy","0211926498","St Luke Veterinary Clinic","13 Morningside Drive, St Lukes, Auckland 1025","09 845 5573","Yes","No","","Yes","The Mud at Meola Park causes bald patches. We avoid in the winter","No","","No","","Yes","5-10","Yes","one per week","No","No","Other","No","Yes","Yes","No","Yes","4","No","Very good. Loves the car and always relaxed.","Come
|
||||
Stay
|
||||
Sit
|
||||
Down
|
||||
Shake hands
|
||||
No....","","kylie.stark_ and andystark88","Someone reffered me","Nancy from Generator","https://onboarding.goodwalk.co.nz/index.php?gf-signature=631d8173f240b8.62865903&form-id=4&field-id=50&hash=115663b7f127b08654c731bfe60b509bb18f551a77d675edd30ce9561aa9fe37","2022-09-11","","45","2022-09-11 18:35:14","2022-09-11 06:35:14","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36","172.69.62.30","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/45/"
|
||||
"Archie","Lawrence","2019-03-15","Kate","Cadzow","0212052720","Robert Lawrence","0275194579","Auckland Pet Hospital","46 - 48 Pollen Street, Grey Lynn","09 3600961","Yes","No","","No","","No","","No","","Yes","1-5","Yes in summer time. He is unsure about water, but will chase a stick in.","5","No","Yes","Cats","No","Yes","Yes","Yes","Yes","3","Yes","Archie's behavior in a car varies. He will usually just stand where ever he is put, but can get very whiny and try to sit on someone in the car. He is usually fine though.","Sit, Down, Come, Spin, Shake, Stay, Paws, Up, Off, Leave it","Whist off lead Archie can be quite reactive to prams, bikes and people running. He will chase them and bark, but he will not bite them. He is also very reactive to cats whilst on the lead. He can sometimes very rarely be reactive to other dogs sometimes on lead, but also if they are behind fences.","Kate Cadzow (Facebook)","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6317c9766f3ba5.04202227&form-id=4&field-id=50&hash=e2947bb13e0173e9439b5048518bfd588d4f3a3e2b4e699c7646b17f741a3d3b","2022-09-07","","43","2022-09-07 10:28:06","2022-09-06 22:28:06","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.210.84","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/43/"
|
||||
"Franky","Powell","2021-12-05","craig","powell","0223715249","Sean","0272889696","Balmoral vets","482 Dominion Road, Mount Eden, Auckland 1024","09 630 7168","Yes","No","","No","","No","","No","","Yes","5-10","Yes","at least 5 times a wekk","No","No","Other","No","No","Yes","No","Yes","4","No","He gets very excited as he knows hes going for a walk","Sit.
|
||||
|
||||
Stay.
|
||||
|
||||
Here
|
||||
|
||||
Paw.","Hes super friendly with everyone and all animals.
|
||||
|
||||
Will lick you to death if you let him.","craig powell","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63156c03a78f56.56615128&form-id=4&field-id=50&hash=4a623f4948d0dd41cd534843301a14ff3187ac2a53d45ee495bab3a9186d72d2","2022-09-05","","41","2022-09-05 15:24:51","2022-09-05 03:24:51","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.210.6","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/41/"
|
||||
"Digby","McLean","2021-09-11","Brigid","McLean","0210519770","David Kidd","0299765289","St Luke’s Vet","13 Morningside Drive, Mt Albert","09 845 5573","Yes","No","","No","","No","","No","","Yes","1-5","Yes, mainly Pt Chev","4 -5 times mainly Nixon, Grey Lynn Park and Cox’s Bay Reserve","No","No","Birds","No","Yes","Yes","No","Yes","3","Yes","He loves the car because he knows it’s leading to an adventure","Sit
|
||||
Recall","He only has run away once and on a group beach walk with other dogs when he was 8 months and got distracted by some birds. It was his second walk and hadn’t formed a bond with the walker","Brigid McLean","Facebook","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=630efe47eb1f48.98016769&form-id=4&field-id=50&hash=2c097f472e116334b53e543b9e8072082b6698782340692681861f245b7cc121","2022-08-31","","39","2022-08-31 18:23:03","2022-08-31 06:23:03","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Mobile/15E148 Safari/604.1","172.68.66.22","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/39/"
|
||||
"Slava","","2022-01-27","Daria","Derecha","0223972856","Nataliya Shchetkova","0223972860","Normanby Vet Clinic","49 Normanby Road, Mount Eden","09 638 8445","Yes","No","","No","","No","","No","","Yes","1-5","She's been to the beach, but haven't swam yet","1-2","No","No","Cats","Yes","No","No","Yes","Yes","3","Yes","She behaves in the car, but during long drives she can get sick","- Sit
|
||||
- Down
|
||||
- No
|
||||
- Stay
|
||||
- Wait
|
||||
- Watch
|
||||
- Leave it
|
||||
- Roll","Slava will be kept outside when you come in and she'll have a vibration collar on.
|
||||
Could you please take the collar off when you take her for a walk and put it back on when you back?
|
||||
& also please make sure that the side door is closed shut when you leave, thank you :)","Daria Derecha","Facebook","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63082e2ad5ff32.85559674&form-id=4&field-id=50&hash=881863d12cd6127e227a40b851c1817d339386ee277691d5d0fd7fd865ee7cb2","2022-09-26","","38","2022-08-26 14:21:30","2022-08-26 02:21:30","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.146.4","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/38/"
|
||||
"Charlie","Le Harivel","2012-01-01","Caitlin","Le Harivel","022 525 7530","Gerardo","+64224084568","Auckland vet hospital","46-48 Pollen Street, Grey Lynn, Auckland 1021","+64 9 360 0961","Yes","Yes","No grains, soy, dairy","No","","Yes","Raw meat/vege","No","","No","1-5","Yes, loves it","3-5","No","Yes","Cats","No","Yes","Yes","Yes","Yes","3","No","Needs to be in cage, whines and doesn't like turns. Settles on the straight parts of road/after walk.","Sit, come, lie down, down. ""Bah"": deep guttural noise for behavior you don't want.","Quite barky. Better off leash with other dogs","Caitlin le harivel","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6304215c740272.35188451&form-id=4&field-id=50&hash=c7dacf3575b1c220bf9bb512f9737af239b3d2379e7afc71f25c2be86b971aef","2022-08-23","","36","2022-08-23 12:38:24","2022-08-23 00:38:24","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Linux; Android 10; SM-N960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Mobile Safari/537.36 (Ecosia android@101.0.4951.41)","172.68.146.4","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/36/"
|
||||
"Freddie","Douglas","2017-05-01","James","Douglas","0202040525283","Paula Lorgelly","02040646006","Auckland Pet Hospital","46 Pollen St, Grey Lynn, 1021","093600961","Yes","No","","No","","No","","No","","Yes","1-5","Yes, loves running on the beach, but doesn't like the water","5","No","No","Other","No","Yes","Yes","No","Yes","3","No","Likes the car, will generally sleep, he can jump into most cars to get in.","Sit
|
||||
Wait
|
||||
Cross (the road)
|
||||
Come (back)
|
||||
No","","Not applicalbe","Google / Google Ads","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6303f978daad47.67660995&form-id=4&field-id=50&hash=a5fe26196a6e39bdaf111206b1fb45288dac4cc2bdcc99f95f1b38c65dfefc92","2022-08-23","","34","2022-08-23 09:48:09","2022-08-22 21:48:09","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Safari/605.1.15","172.68.146.16","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/34/"
|
||||
"Quest","Kedzlie","2009-08-01","Joanna","Kedzlie","0274484720","Aaron Kedzlie","0274962151","Balmoral Vets","482 Dominion Rd Mt Eden","096307168","Yes","Yes","Beef chicken lamb causes itching","No","","Yes","Venison / Fish varieties of Ziwi Pet dried food","No","","Yes","5-10","yes every 2-3 weeks","5 x week","No","No","Cats","No","Yes","Yes","No","Yes","4","No","sleepy .","Wait , Sit , Go( chase or go see the dog or bird or go run)","Lifting to and from vehicles / couches / beds because of hip joint risk ( left hip fragile )
|
||||
Sometimes not reactive to calling if far away ? getting deaf but knows her name and usually very responsive .
|
||||
If sees cats can chase uncontrollably","Instagram","","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62f22657a8dc11.18756572&form-id=4&field-id=50&hash=4a42a8967744c968154fdf32da58f9442cae6e0a9155558bd60c98d7f2f29bb6","2022-08-09","","32","2022-08-09 21:31:24","2022-08-09 09:31:24","https://onboarding.goodwalk.co.nz/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6 Mobile/15E148 Safari/604.1","172.68.146.14","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/32/"
|
||||
"Sadie","Louise","2021-11-13","Nancy","Louise","0276234406","Sam Moir","+64 22 411 5904","Auckland Pet Hospital","46-48 Pollen Street, Grey Lynn, Auckland 1021","093600961","Yes","No","","No","","No","","No","","Yes","1-5","Yes","2","No","No","Birds","Yes","No","","","Yes","3","No","Sadie likes to sit on laps during a drive, but will snooze. She can sometimes be a bit hyper in the backseat of a car.","","Wants to be the best girl ever, but is still learning. Fine walking off leash and has good recall, but sometimes turns her ears off. Working on it…","","","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c65baf861644.12326872&form-id=4&field-id=50&hash=9f5474c574064ad3fe1e3ed448a567efd5794d6cc1128fedef44d8183cdd085a","2022-07-07","","30","2022-07-07 16:06:25","2022-07-07 04:06:25","https://goodwalk.co.nz/onboarding-form/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.68.210.25","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/30/"
|
||||
"Stella","Blows","2021-08-01","Adrienne","Blows","0212965171","Adrienne","Blows","Balmoral veterinary care","482 Dominion road Mt Edwn","09 6307168","Yes","No","","Select","","No","","No","","Yes","1-5","Yes","No","No","Yes","Birds","No","Yes","","","No","1","No","Moves around a bit and needs a restraint. Likes to stick her head out the window","","","","","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c3d5039fbde6.48018846&form-id=4&field-id=50&hash=1ec5ffc4a70ebe2961deb18a2522231b38fd73c21f017f1c6c50bc725e5d819c","2022-07-05","","27","2022-07-05 18:06:59","2022-07-05 06:06:59","https://goodwalk.co.nz/onboarding-form/","","","","","","Mozilla/5.0 (Linux; Android 12; SM-G988B Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.70 Mobile Safari/537.36 EdgW/1.0","172.68.146.11","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/27/"
|
||||
"Frankie","Richards-Berry","2020-06-08","Renee","Richards-Berry","0275342790","Michele Richards-Berry","021432583","St Luke’s Vet","13 Morningside Dr, st Lukes","09 845 5573","Yes","No","","No","","No","","No","","Yes","5-10","Yes. Loves swimming and fetching sticks","Daily","No","No","Cats","No","No","","","Yes","4","Yes","Excited initially but chills out and goes to sleep when she realises it might be a long journey. She loves the car.","","She loves to chase swallows at parks and they seem to love to taunt her. She usually just sits down in the park when she’s too tired to run any more","","","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c0bc95013e88.79836255&form-id=4&field-id=50&hash=a5170df830c4836db17676312d81ece5adf1d7aa57a6c7c5d7c17131cef108e3","2022-07-02","","24","2022-07-03 09:45:57","2022-07-02 21:45:57","https://goodwalk.co.nz/onboarding-form/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.68.66.85","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/24/"
|
||||
"Ted / Teddy","Jenkinson","2020-10-02","Kim","Jenkinson","0274490005","Kyle Brown (Brownie)","0274887496","Ellerslie Veterinary Clinic","199 Main Highway, Ellerslie","092813481","Yes","No","","Yes","Grass - but he has pills for that. Can help by hosing down his feet after a run around","No","","No","","Yes","1-5","Yes","four times","No","No","Birds","No","No","","","No","3","Yes","Loves it. Loves just being there for a ride. Can leave him in the car (with water/ ventilation) happily for up to 2 hours","","","","","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62bb6c86903b49.56603473&form-id=4&field-id=50&hash=5cdeebf1018eca2ad26f9674dbd27ef095015e3ab9a90881d728ba1ca6de87f0","2022-06-29","","22","2022-06-29 09:03:02","2022-06-28 21:03:02","https://goodwalk.co.nz/onboarding-form/","","","","","","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36","202.3.88.174","https://onboarding.goodwalk.co.nz/pdf/62bad160c3d11/22/"
|
||||
|
@@ -0,0 +1,40 @@
|
||||
"Consent (Consent)","Consent (Text)","Consent (Description)","Owner Signature","GoodWalk Limited Signature","Date contract signed","Owners Name (Prefix)","Owners Name (First Name)","Owners Name (Middle)","Owners Name (Last Name/Surname)","Owners Name (Suffix)","Owner's email (Enter Email)","Phone","Dog's name (include surname)","Residential Address (Street Address)","Residential Address (Address Line 2)","Residential Address (City)","Residential Address (Suburb)","Residential Address (ZIP / Postal Code)","Residential Address (Country)","Created By (User Id)","Entry Id","Entry Date","Date Updated","Source Url","Transaction Id","Payment Amount","Payment Date","Payment Status","Post Id","User Agent","User IP","PDF: PDF Label"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65bddbac696dc2.10945403&form-id=3&field-id=1&hash=4ba1e2e94457e06082630de6de930a252ecb39bd4c56b5e9ffe7093bb5a0d957","","2024-02-03","","Rachel","","Hall","","rachelhall@dimery.co.nz","","Louis Hall","303/26 Poynton Terrace","","Auckland","Auckland Central","","","","108","2024-02-03 19:22:36","2024-02-03 06:22:36","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15","115.189.128.39","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/108/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65b1a8726c9964.16114292&form-id=3&field-id=1&hash=c9ab0ac4b94a84044c5030e2e24afb4134107a75395c766cccc04c28381db6f8","","2024-01-25","","Sue","","Ewen","","sewen@xtra.co.nz","(642) 745-2472","Tinks Ewen","16 Simmonds Ave, Mount Roskill,","16 Simmonds Ave","Mount Roskill Auckland 1041","Mt Roskill / Three Kings","","","","106","2024-01-25 13:17:08","2024-01-25 00:17:08","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0","125.237.63.27","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/106/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=65459ee482d712.77412582&form-id=3&field-id=1&hash=5bcb04c9fe21643fb791372228114a63555f7d3cafaa5d7ef45240b2115ec97a","","2023-11-04","","Anna","","Shaw","","annalshaw@gmail.com","(021) 029-7053","Honey Crumbles Shaw","43 Kings Road","","Auckland","Mt Roskill","","","","104","2023-11-04 14:31:16","2023-11-04 01:31:16","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36","123.255.41.22","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/104/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=653eb664cba249.42033046&form-id=3&field-id=1&hash=b297538263e5233fac01524703fa2cc4c79f8227dca70a551893cb09f273f194","","2023-10-30","","Shelly","","Haggas","","shelly@envoyconstruction.co.nz","(021) 042-5095","Hank O'Donnell","377 New North Road","Level 1","Aickland","Kingsland","","","","102","2023-10-30 08:45:40","2023-10-29 19:45:40","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36","203.118.148.26","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/102/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=650c9f6be75ef7.65308375&form-id=3&field-id=1&hash=a95b743d7995570e67bcb685c374b5028771af177d079eeaa9b256fdffed2b9f","","2023-09-22","","Danielle","","Barclay","","danielle@weblurthelines.com","(027) 397-2112","Molly Hickey","29 Kensington Avenue","","Auckland","Mt Eden","","","","100","2023-09-22 07:54:19","2023-09-21 19:54:19","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/117.0.5938.108 Mobile/15E148 Safari/604.1","121.98.37.166","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/100/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6503b77ec85832.30852194&form-id=3&field-id=1&hash=623ca1485ecedfcb151957fad9f0fc7a7f0d38926897465de892f7afd227289c","","2023-09-15","","Ross","","Batchelor","","ross.batchelor@icloud.com","","Otis Batchelor","203/2 Finch Street","","Auckland","Morningside","","","","98","2023-09-15 13:46:38","2023-09-15 01:46:38","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1","172.225.244.185","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/98/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64bf5fddc33ed7.06471243&form-id=3&field-id=1&hash=ce7a980f14ee232a171ce1ff4d43f0d24e7863d70c3016078c295c2f5a180503","","2023-07-25","","Ann","","Buckley","","ann.buckley9@gmail.com","(027) 447-9293","Ollie Buckley","","12 Stewart Rd","Auckland","Mt Albert","","","","96","2023-07-25 17:38:37","2023-07-25 05:38:37","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36","210.246.17.164","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/96/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=648fd5294cb4d0.32639145&form-id=3&field-id=1&hash=ac2277457a879fd40401f0b29b9349c3bc8125798ca78b3e0051c4b45a17b822","","2023-06-19","","Monique","","Humphrey","","moniquehrtlb@gmail.com","(021) 276-4358","Zola Humphrey","90A Owens Road","","Auckland","Epsom, 1023","","","","94","2023-06-19 16:10:30","2023-06-19 04:10:30","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.2 Safari/605.1.15","121.98.13.62","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/94/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64804b84af2975.29344074&form-id=3&field-id=1&hash=719768bc8e5f1cc180a2255ac84a3c0a32e54f987e0d26499b3210e522c5e721","","2023-06-07","","Ruby Kahurangi","","Tautuhi-Lloyd","","rubytlloyd@gmail.com","(020) 414-1878","Sunny Lloyd","6 Sussex Street","","Auckland","Grey Lynn","","","","92","2023-06-07 21:19:00","2023-06-07 09:19:00","https://onboarding.goodwalk.co.nz/contract/?","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/114.0.5735.99 Mobile/15E148 Safari/604.1","101.100.129.22","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/92/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=647fd5bb62cc48.21415458&form-id=3&field-id=1&hash=63c36109e5e7bb77911bbcb0acc0baf789a450618b8d1b04958a3694db9ae270","","2023-06-07","","Ruby Kahurangi","","Tautuhi-Lloyd","","rubytlloyd@gmail.com","(020) 414-1878","Sunny Lloyd","6 Sussex Street","","Auckland","Grey Lynn","","","","91","2023-06-07 12:56:27","2023-06-07 00:56:27","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/114.0.5735.99 Mobile/15E148 Safari/604.1","122.56.196.93","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/91/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=647d87282fb183.81737041&form-id=3&field-id=1&hash=84d5464dd9b51110878b940c8262e4dfcbcd612ac07feaf24c044f05a2a17b55","","2023-06-05","","Megan & Adrian","","Kenny","","info@kennyandharlow.co.nz","","Donny Kenny","31 b Normanby road","","Mount Eden","","","","","89","2023-06-05 18:57:51","2023-06-05 06:57:51","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.121 Mobile/15E148 Safari/604.1","115.188.134.131","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/89/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6462c5bf460fe8.96828794&form-id=3&field-id=1&hash=b08513e4d2ca635b22a3d1ef52bc35dbf730c3786cac77abc16144edbe73d431","","2023-05-16","","Harriet","","Read","","harriet.a.read@gmail.com","(021) 234-0063","Maggie Read","10 parkdale road,","My Albert","Auckland","Mt Albert","","","","86","2023-05-16 13:44:38","2023-05-16 01:44:38","https://onboarding.goodwalk.co.nz/contract/?","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.69 Mobile/15E148 Safari/604.1","122.56.5.204","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/86/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6462c5bf460fe8.96828794&form-id=3&field-id=1&hash=b08513e4d2ca635b22a3d1ef52bc35dbf730c3786cac77abc16144edbe73d431","","2023-05-16","","Harriet","","Read","","harriet.a.read@gmail.com","(021) 234-0063","Maggie Read","10 parkdale road,","My Albert","Auckland","Mt Albert","","","","85","2023-05-16 11:52:50","2023-05-15 23:52:50","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/113.0.5672.69 Mobile/15E148 Safari/604.1","122.56.5.204","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/85/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=645a9f6a95a969.46711675&form-id=3&field-id=1&hash=4f9b59d32b0c077ada66b5cb44c2aea16d395ea5cd0c20705e2ea2571c2f4722","","2023-05-10","","Carl","","Matthews","","carl@devmark.co.nz","(642) 173-7727","Luna Matthews","57 Marlborough Street","","Mount Eden, AUCKLAND","","","","","82","2023-05-10 07:30:58","2023-05-09 19:30:58","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36","121.99.240.46","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/82/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64589d00752470.47731501&form-id=3&field-id=1&hash=1f578bd344c4e39ca0eb0c962abd3ae4ecb5529f1f9a90017af8b9dd7a8c6cfa","","2023-05-08","","Todd","","Benton","","toddbenton@outlook.com","","Sweep","3/61 Hepburn Street","","Auckland","Freemans Bay","","","","81","2023-05-08 18:56:00","2023-05-08 06:56:00","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 OPR/98.0.0.0","121.99.103.51","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/81/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=64549cabb86241.61504100&form-id=3&field-id=1&hash=a3aedd8ed8cac157b00bfe7d0ed2da461469981031d5a476c276b06d5eb569da","","2023-05-05","","Paula","","Smith","","smithy007@mac.com","","Bob Smith","178 Mount Albert Road","","Sandringham","Auckland","","","","79","2023-05-05 18:05:31","2023-05-05 06:05:31","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1","125.237.205.159","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/79/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6448d984e1f712.46902795&form-id=3&field-id=1&hash=0fe483a8e365b4bfa9555bfe9b327c846d9abd40e6f9af8884b8770b4665774f","","2023-04-26","","Lori","","Reynolds","","lorireynolds5@gmail.com","(022) 310-9861","Buddy Reynolds","14b Lidcombe Place","Avondale","Auckland","Avondale","","","","75","2023-04-26 19:57:56","2023-04-26 07:57:56","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Mobile/15E148 Safari/604.1","172.225.244.181","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/75/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=641d2924990540.87574330&form-id=3&field-id=1&hash=bdfc49b3876c2de4e6f00efd38adb61ce3bbc36e35ca9337da875f00f901886b","","2023-03-24","","Stephanie","","Korucu","","korucusteph@gmail.com","","Jake Korucu","1/98 Owairaka Ave","Mount Albert","Auckland","","","","","65","2023-03-24 17:37:56","2023-03-24 04:37:56","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36","198.41.238.107","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/65/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=641a1be974e772.11405043&form-id=3&field-id=1&hash=25d65613131edf5cd825ef16c4031163b34f1117d8053f7d5e81e1474758cb08","","2023-03-22","","Estelle","","Rewiri","","estelle.rewiri@mainfreight.com","(027) 519-4228","Monty Rewiri","11A Sandringham Road","Mt Eden","Auckland","","","","","63","2023-03-22 10:04:41","2023-03-21 21:04:41","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Mobile/15E148 Safari/604.1","198.41.238.28","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/63/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63ebdb8add55a1.53333768&form-id=3&field-id=1&hash=2349b49c8b1a7a13da3898071653d63de9ce2b754a647728f5ae459ef5f5fb4b","","2023-02-15","","Penny","","Dine","","jess.dine@gmail.com","(022) 528-0966","Archie Dine","57 Bright Street","Eden Terrace","Auckland","Eden Terrace","","","","62","2023-02-15 08:06:04","2023-02-14 19:06:04","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36","198.41.238.110","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/62/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63e4328e530e96.01203691&form-id=3&field-id=1&hash=4283da25a29c8eece570f4683e0cfcd5b393ac347b8fef10bb0faca02467a99f","","2023-02-09","","Monique","","Sullivan","","msullivan@mpm.co.nz","(027) 530-6046","Freddie Sullivan","3 Shaw St","Sandringham","Auckland","Sandringham","","","","60","2023-02-09 12:38:54","2023-02-08 23:38:54","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36","198.41.238.111","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/60/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63df01e41a56e9.54070037&form-id=3&field-id=1&hash=81945645899ec7d3be0002a858fae4ec90474ac1f96ac45a6eb451dc52510740","","2023-02-05","","Kate","","Langdon","","kate@katelangdon.com","","Digby Langdon-Baird","13 Buchanan Street","Kingsland","Auckland","Kingsland","","","","58","2023-02-05 14:09:56","2023-02-05 01:09:56","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Safari/605.1.15","172.68.210.34","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/58/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=636058c639eb93.61392483&form-id=3&field-id=1&hash=1e8946795c3b839220656619ba8dff93772d372dce5ddef915b3a593cdc717e0","","2022-11-01","","Matthew","","Swinburne","","mattswinburne@gmail.com","","Lulu Levermore","12 Herringson Ave","","Auckland 1021","Grey Lynn","","","","55","2022-11-01 12:23:01","2022-10-31 23:23:01","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36","162.158.2.13","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/55/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=635b0152493df6.85330069&form-id=3&field-id=1&hash=b81d54dcafff595f974d09a77ae5c6ea92c56500fe8a024515175098f48c5c72","","2022-10-28","","Nina","","Darrah","","nina.darrah@gmail.com","(022) 498-1015","Wallace Darrah","5 Cadman Ave","Waterview","Auckland","Waterview","","","","54","2022-10-28 11:08:18","2022-10-27 22:08:18","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36","172.68.146.15","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/54/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=633bec2129d2c8.71863735&form-id=3&field-id=1&hash=fe95c8059b6cb3b8b97246c5e0f06c5ac10b54193680f3440040365772140fee","","2022-10-04","","Fiona","","Clarke","","feeclarke@gmail.com","","Otis McLean","33 walters road","Mt eden","","Auckland","","","","52","2022-10-04 21:18:24","2022-10-04 08:18:24","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.68.66.34","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/52/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63329aab7c9154.72679599&form-id=3&field-id=1&hash=a62256fed96d754da7294f5675ecaede73ec45ac890e053dcf0b2c9f8271f498","","2022-09-27","","Caroline","","Logan","","caroline.a.logan@gmail.com","(027) 221-7468","Fergie Taylor","5 Alexander Street","","Auckland","Kingsland","","","","50","2022-09-27 19:39:39","2022-09-27 06:39:39","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Mobile/15E148 Safari/604.1","172.68.210.84","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/50/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63280e8d9c03e0.76063236&form-id=3&field-id=1&hash=3f0ce8d19b1b1667500bff4b993e292b58244b4c137c30e2bbae407b28fe933f","","2022-09-19","","Jessica","","Dine","","jess.dine@gmail.com","(022) 528-0966","Florence Dine","57 Bright Street","Eden Terrace","Auckland","Eden Terrace","","","","48","2022-09-19 18:39:09","2022-09-19 06:39:09","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.210.84","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/48/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=631d82d24472c5.01871772&form-id=3&field-id=1&hash=67496d58daa653a7fe5360b95f73f89a89a0ad2b9a677b2a2d4cb354875a69f5","","2022-09-11","","Andy","","Stark","","andystark88@gmail.com","(021) 192-6498","Lenny Stark","67 Kiwi Road","","Auckland","Point Chevalier","","","","46","2022-09-11 18:40:18","2022-09-11 06:40:18","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36","172.68.66.36","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/46/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6317cb0f063948.03054426&form-id=3&field-id=1&hash=50186e66c8e14daf4cb01de0ad3682ac9afeaa76497bdbb841b6846356248bba","","2022-09-07","","Robert","","Lawrence","","robert.a.lawrence@hotmail.com","(027) 519-4579","Archie Lawrence","4/52 Meadowbank Road","","Auckland","Meadowbank","","","","44","2022-09-07 10:34:55","2022-09-06 22:34:55","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.66.26","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/44/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=63156c4dec6ed5.48344366&form-id=3&field-id=1&hash=77ec6a504b0353f0266c32ee35784668fae2c44040c986a12dccfad54863c1e1","","2022-09-05","","craig","","powell","","c.powell1985@outlook.com","(022) 371-5249","Franky Powell","46 Burnley Terrace","Mount Eden","auckland","","","","","42","2022-09-05 15:26:05","2022-09-05 03:26:05","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36","172.68.210.6","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/42/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=630eff5a769a86.20761083&form-id=3&field-id=1&hash=4cf1e7afd2e705ed2b18d9df15278703946add6ec431cef43d011c4745b2f96d","","2022-08-31","","Brigid","","McLean","","brigidmclean@gmail.com","(021) 051-9770","Digby McLean","Apt 413 / 8 Kingsland Terrace","8 Kingsland Terrace","Kingsland","Auckland","","","","40","2022-08-31 18:27:38","2022-08-31 06:27:38","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Mobile/15E148 Safari/604.1","172.68.66.26","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/40/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=630422ba814ef5.81658908&form-id=3&field-id=1&hash=3c10ceb165845ec67c854f4220a05db9fa9c327d95f5285ce8a7938ede432e88","","2022-08-23","","Caitlin","","Le Harivel","","Caitlinleh@gmail.com","(022) 525-7530","Charlie le harivel","412/145 nelson street","","Auckland","Auckland Central","","","","37","2022-08-23 12:43:38","2022-08-23 00:43:38","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Linux; Android 10; SM-N960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Mobile Safari/537.36 (Ecosia android@101.0.4951.41)","172.69.62.30","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/37/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=6303fa4e4c0848.05382829&form-id=3&field-id=1&hash=ae71e833c9195588975ef592d666f59cb24215987b531be7be4744f09a1c990c","","2022-08-23","","James","","Douglas","","james_douglas@me.com","(020) 405-2528","Freddie Douglas","16 Rossgrove Terrace","Mount Albert","Auckland","Mount Albert, 1025","","","","35","2022-08-23 09:51:10","2022-08-22 21:51:10","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6.1 Safari/605.1.15","172.68.210.56","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/35/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62f5d231bca2a3.30220644&form-id=3&field-id=1&hash=141bd60c7b10b46e0b3efd8bab2cefa474ff07289a751621df98770396058b62","","2022-08-12","","Kedzlie","","Joanna","","kedzlie@xtra.co.nz","(027) 448-4720","Quest Kedzlie","24 A","Woodside Road","Mt Eden","Auckland","","","","33","2022-08-12 16:08:17","2022-08-12 04:08:17","https://onboarding.goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6 Mobile/15E148 Safari/604.1","172.69.62.30","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/33/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c65c66e18d38.45439060&form-id=3&field-id=1&hash=826e6dd0c397424665e72f5f38de6bcd4caccebde17f4f8060fa5f68f967ceaf","","2022-07-07","","Nancy","","Louise","","nancy.louise@icloud.com","","Sadie Louise","414 Scenic Drive, Waiatarua","","Auckland","Waiatarua","","","","31","2022-07-07 16:09:10","2022-07-07 04:09:10","https://goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.68.210.25","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/31/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c52b76d0d3a0.71873578&form-id=3&field-id=1&hash=924287d3ac145b67103e00154588808d23f37b85bf6757baf11493fedb946403","","2022-07-06","","Maddie","","Thomas","","thomasmaddie@ymail.com","","Doug Thomas","12 Dryden Street","DRYDEN STREET","Grey Lynn","Grey Lynn","","","","29","2022-07-06 18:29:48","2022-07-06 06:29:48","https://goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15","172.68.146.45","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/29/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c4c9cf2d2015.66413113&form-id=3&field-id=1&hash=41bb2215be098a3e0cec6f8d294dc1b36a22b9204bc2566294ed2e7c56b20305","","2022-07-06","","Adrienne","","Blows","","adrienneblows@hotmail.com","(021) 296-5171","Stella Blows","1/107 Taylors Road","Mt Albert","Auckland","Mt Albert","","","","28","2022-07-06 11:31:27","2022-07-05 23:31:27","https://goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Linux; Android 12; SM-G988B Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.70 Mobile Safari/537.36 EdgW/1.0","172.68.210.25","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/28/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62c0bdfa32cf79.13628927&form-id=3&field-id=1&hash=98f77c6b8498e390689018ee1d0dc63e5c8a0ccfadd23a7c3dbd6932fd3d6e0d","","2022-07-02","","Renee","","Richards-Berry","","reneeberryrenee@gmail.com","(027) 534-2790","Frankie Richards-Berry","66 Fourth Ave","Kingsland","Auckland 1021","","","","","25","2022-07-03 09:51:54","2022-07-02 21:51:54","https://goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1","172.69.62.73","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/25/"
|
||||
"Checked","I agree that I have fully read and understood the terms and conditions","","https://onboarding.goodwalk.co.nz/index.php?gf-signature=62bb6d456d0595.78626579&form-id=3&field-id=1&hash=1df30f89b71b90ec341a48975474708e25fbe822f939e4b2f73fa959a94a0dd2","","2022-06-29","","Kim","","Jenkinson","","kimajenkinson@gmail.com","(027) 449-0005","Ted Jenkinson","61 Aranui Road,","","Auckland","Mt Wellington","","","","23","2022-06-29 09:06:13","2022-06-28 21:06:13","https://goodwalk.co.nz/contract/","","","","","","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36","202.3.88.174","https://onboarding.goodwalk.co.nz/pdf/62b7e36382d03/23/"
|
||||
|
@@ -0,0 +1,129 @@
|
||||
18/05/2026 19:34:38 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
18/05/2026 19:34:38 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s
|
||||
18/05/2026 19:34:38 New Zealand Standard Time INFO mail-api: Auth: loaded 2 allowed email(s)
|
||||
18/05/2026 19:34:38 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
18/05/2026 19:34:41 New Zealand Standard Time INFO mail-api: [ab4f9aaf] auth: code issued for email=info@goodwalk.co.nz
|
||||
18/05/2026 19:34:41 New Zealand Standard Time WARNING mail-api: [DEV] auth code for info@goodwalk.co.nz: 625809
|
||||
18/05/2026 19:34:41 New Zealand Standard Time INFO mail-api: [ab4f9aaf] POST /auth/request-code → 200 (3ms)
|
||||
18/05/2026 19:34:47 New Zealand Standard Time INFO mail-api: [a5564b23] auth: session created for email=info@goodwalk.co.nz
|
||||
18/05/2026 19:34:47 New Zealand Standard Time INFO mail-api: [a5564b23] POST /auth/verify-code → 200 (1ms)
|
||||
18/05/2026 19:34:47 New Zealand Standard Time INFO mail-api: [f0a2b1fe] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:35:42 New Zealand Standard Time INFO mail-api: [c3a5a829] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:35:42 New Zealand Standard Time INFO mail-api: [0bd54996] GET /owner/pending-onboarding → 200 (1ms)
|
||||
18/05/2026 19:35:43 New Zealand Standard Time INFO mail-api: [ce90270c] GET /auth/verify → 200 (1ms)
|
||||
18/05/2026 19:35:43 New Zealand Standard Time INFO mail-api: [d3d6a292] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:35:52 New Zealand Standard Time INFO mail-api: [758551a5] POST /auth/logout → 200 (0ms)
|
||||
18/05/2026 19:35:55 New Zealand Standard Time INFO mail-api: [901ce77f] auth: code issued for email=info@goodwalk.co.nz
|
||||
18/05/2026 19:35:55 New Zealand Standard Time WARNING mail-api: [DEV] auth code for info@goodwalk.co.nz: 166556
|
||||
18/05/2026 19:35:55 New Zealand Standard Time INFO mail-api: [901ce77f] POST /auth/request-code → 200 (1ms)
|
||||
18/05/2026 19:36:04 New Zealand Standard Time INFO mail-api: [0f092606] auth: session created for email=info@goodwalk.co.nz
|
||||
18/05/2026 19:36:04 New Zealand Standard Time INFO mail-api: [0f092606] POST /auth/verify-code → 200 (1ms)
|
||||
18/05/2026 19:36:04 New Zealand Standard Time INFO mail-api: [2c504fc8] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:04 New Zealand Standard Time INFO mail-api: [5f742030] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:05 New Zealand Standard Time INFO mail-api: [01546195] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:05 New Zealand Standard Time INFO mail-api: [6c10de94] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:20 New Zealand Standard Time INFO mail-api: [8740c583] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:20 New Zealand Standard Time INFO mail-api: [d8025471] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:21 New Zealand Standard Time INFO mail-api: [c45f3685] GET /auth/verify → 200 (1ms)
|
||||
18/05/2026 19:36:21 New Zealand Standard Time INFO mail-api: [2f8d224d] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:33 New Zealand Standard Time INFO mail-api: [48041b64] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:33 New Zealand Standard Time INFO mail-api: [d3946240] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:34 New Zealand Standard Time INFO mail-api: [41be2531] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:34 New Zealand Standard Time INFO mail-api: [02357a33] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:50 New Zealand Standard Time INFO mail-api: [b579012f] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:50 New Zealand Standard Time INFO mail-api: [14ac39b2] GET /owner/pending-onboarding → 200 (0ms)
|
||||
18/05/2026 19:36:50 New Zealand Standard Time INFO mail-api: [01acd4c8] GET /auth/verify → 200 (0ms)
|
||||
18/05/2026 19:36:50 New Zealand Standard Time INFO mail-api: [9a3b3304] GET /owner/pending-onboarding → 200 (0ms)
|
||||
19/05/2026 06:05:18 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 06:05:18 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s
|
||||
19/05/2026 06:05:18 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 06:05:18 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:08:15 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 11:08:15 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s
|
||||
19/05/2026 11:08:15 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 11:08:15 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:28:27 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 11:28:27 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
|
||||
19/05/2026 11:28:27 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 11:28:28 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:28:34 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 11:28:34 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
|
||||
19/05/2026 11:28:34 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 11:28:34 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:36:54 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 11:36:54 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
|
||||
19/05/2026 11:36:54 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 11:36:55 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:37:03 New Zealand Standard Time INFO mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
|
||||
19/05/2026 11:37:03 New Zealand Standard Time INFO mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <bookings@goodwalk.co.nz>' reply_to='aless@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
|
||||
19/05/2026 11:37:03 New Zealand Standard Time INFO mail-api: Auth: loaded 1 allowed email(s)
|
||||
19/05/2026 11:37:03 New Zealand Standard Time INFO mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
|
||||
19/05/2026 11:53:00 New Zealand Standard Time INFO mail-api: [664ade9a] auth: code issued for email=info@goodwalk.co.nz
|
||||
19/05/2026 11:53:00 New Zealand Standard Time WARNING mail-api: [DEV] auth code for info@goodwalk.co.nz: 200354
|
||||
19/05/2026 11:53:00 New Zealand Standard Time INFO mail-api: [664ade9a] POST /auth/request-code → 200 (4ms)
|
||||
19/05/2026 11:54:09 New Zealand Standard Time INFO mail-api: [89885efc] auth: code issued for email=info@goodwalk.co.nz
|
||||
19/05/2026 11:54:09 New Zealand Standard Time WARNING mail-api: [DEV] auth code for info@goodwalk.co.nz: 672952
|
||||
19/05/2026 11:54:09 New Zealand Standard Time INFO mail-api: [89885efc] POST /auth/request-code → 200 (1ms)
|
||||
19/05/2026 11:54:17 New Zealand Standard Time INFO mail-api: [a8f63301] auth: session created for email=info@goodwalk.co.nz
|
||||
19/05/2026 11:54:17 New Zealand Standard Time INFO mail-api: [a8f63301] POST /auth/verify-code → 200 (1ms)
|
||||
19/05/2026 11:54:17 New Zealand Standard Time INFO mail-api: [a55d43ec] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 11:54:22 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:54:22 New Zealand Standard Time INFO mail-api: [4f6216a6] POST /auth/save-draft → 200 (12ms)
|
||||
19/05/2026 11:54:30 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:54:30 New Zealand Standard Time INFO mail-api: [8e9fc8f9] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 11:54:40 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:54:40 New Zealand Standard Time INFO mail-api: [3664fac8] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 11:54:54 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:54:54 New Zealand Standard Time INFO mail-api: [44f478bd] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 11:55:30 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:55:30 New Zealand Standard Time INFO mail-api: [2f362178] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 11:58:50 New Zealand Standard Time INFO mail-api: [f6201361] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 11:59:10 New Zealand Standard Time INFO mail-api: [2009256f] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 11:59:12 New Zealand Standard Time INFO mail-api: [586443ba] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 11:59:23 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:59:23 New Zealand Standard Time INFO mail-api: [3d4c66fa] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 11:59:35 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 11:59:35 New Zealand Standard Time INFO mail-api: [f3254bc3] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:00:04 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:00:04 New Zealand Standard Time INFO mail-api: [536cbb34] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:00:24 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:00:24 New Zealand Standard Time INFO mail-api: [9eeeab2a] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:00:46 New Zealand Standard Time INFO mail-api: [210b3442] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:02:08 New Zealand Standard Time INFO mail-api: [8036af11] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:02:10 New Zealand Standard Time INFO mail-api: [5d6362f3] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:02:49 New Zealand Standard Time INFO mail-api: [f7be21d6] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 12:03:05 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:03:05 New Zealand Standard Time INFO mail-api: [b94d0e50] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:03:20 New Zealand Standard Time INFO mail-api: [b7cdc5fc] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:03:33 New Zealand Standard Time INFO mail-api: [e2f2cafc] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 12:03:41 New Zealand Standard Time INFO mail-api: [9d174f3c] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:03:49 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:03:49 New Zealand Standard Time INFO mail-api: [bf06d193] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:04:23 New Zealand Standard Time INFO mail-api: [0d971ecb] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:04:29 New Zealand Standard Time INFO mail-api: [0ac2045c] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:04:53 New Zealand Standard Time INFO mail-api: [f53afe82] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 12:05:04 New Zealand Standard Time INFO mail-api: [a8af4e31] GET /auth/verify → 200 (1ms)
|
||||
19/05/2026 12:05:09 New Zealand Standard Time INFO mail-api: [72b6b2a6] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:05:21 New Zealand Standard Time INFO mail-api: [e2489ceb] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:05:31 New Zealand Standard Time INFO mail-api: [68abdad1] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:05:37 New Zealand Standard Time INFO mail-api: [b878ea5f] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:05:48 New Zealand Standard Time INFO mail-api: [8dc7536f] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:07:50 New Zealand Standard Time INFO mail-api: [1631f302] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:08:05 New Zealand Standard Time INFO mail-api: [864b59cf] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:09:31 New Zealand Standard Time INFO mail-api: [d7044384] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:09:47 New Zealand Standard Time INFO mail-api: [5db32466] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:09:51 New Zealand Standard Time INFO mail-api: [f4ba7f01] GET /auth/verify → 200 (0ms)
|
||||
19/05/2026 12:11:04 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:11:04 New Zealand Standard Time INFO mail-api: [c08fe213] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:11:11 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:11:11 New Zealand Standard Time INFO mail-api: [54224bbc] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:11:18 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:11:18 New Zealand Standard Time INFO mail-api: [7b3c3b07] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:11:34 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:11:34 New Zealand Standard Time INFO mail-api: [78a70cba] POST /auth/save-draft → 200 (2ms)
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: Draft saved: email=info@goodwalk.co.nz form=onboarding
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: [36fcde7c] POST /auth/save-draft → 200 (3ms)
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: [dcc57378] POST /auth/save-draft → 200 (4ms)
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: [0f97ff9b] POST /auth/logout → 200 (1ms)
|
||||
19/05/2026 12:29:54 New Zealand Standard Time INFO mail-api: [ab3757e1] POST /auth/logout → 200 (0ms)
|
||||
@@ -1,4 +1,4 @@
|
||||
ARG APP_VERSION=4.2.3
|
||||
ARG APP_VERSION=4.0.1
|
||||
|
||||
FROM python:3.12-slim
|
||||
ARG APP_VERSION
|
||||
@@ -10,10 +10,27 @@ LABEL org.opencontainers.image.version="${APP_VERSION}"
|
||||
|
||||
COPY requirements.txt .
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends tzdata \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
tzdata \
|
||||
libpango-1.0-0 \
|
||||
libpangoft2-1.0-0 \
|
||||
libharfbuzz0b \
|
||||
libfribidi0 \
|
||||
libcairo2 \
|
||||
shared-mime-info \
|
||||
fonts-dejavu-core \
|
||||
fonts-liberation \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
COPY main.py .
|
||||
COPY main.py db.py ./
|
||||
COPY mail_api ./mail_api
|
||||
|
||||
# Legacy clients seed, generated by scripts/build-legacy-seed.mjs (called from
|
||||
# deploy.ps1). Lives OUTSIDE the data volume so every deploy carries a fresh
|
||||
# copy. The mail-api merges this on boot, add-only — it never overwrites a
|
||||
# live entry. Must always be present in the build context; for local dev run
|
||||
# `node scripts/build-legacy-seed.mjs` once, or `echo {} > legacy-clients-seed.json`.
|
||||
COPY legacy-clients-seed.json /app/legacy-clients-seed.json
|
||||
|
||||
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
# Mail API local dev
|
||||
|
||||
Use the project virtualenv, not the global Python install. The local environment already resolves compatible `pydantic` and `pydantic-core` versions together.
|
||||
|
||||
## Start on Windows PowerShell
|
||||
|
||||
```powershell
|
||||
cd C:\Users\mattc\gw-svelte\gw-svelte\mail-api
|
||||
.\start-dev.ps1
|
||||
```
|
||||
|
||||
## First-time setup
|
||||
|
||||
```powershell
|
||||
cd C:\Users\mattc\gw-svelte\gw-svelte\mail-api
|
||||
py -3.14 -m venv .venv
|
||||
.\.venv\Scripts\python.exe -m pip install -r requirements.txt
|
||||
```
|
||||
|
||||
## If you see a `pydantic-core` mismatch
|
||||
|
||||
You are almost certainly running against a global interpreter or a stale environment. Reinstall into the project virtualenv and start the app with `.\start-dev.ps1`.
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"emails": [
|
||||
"mattcohen0@gmail.com",
|
||||
"test@test.com"
|
||||
]
|
||||
}
|
||||
@@ -2,11 +2,58 @@
|
||||
"mattcohen0@gmail.com": {
|
||||
"fullName": "Matt Test",
|
||||
"phone": "02124347477",
|
||||
"dogName": "Geoffrey"
|
||||
"dogName": "Geoffrey",
|
||||
"welcomePackSentAt": "2026-05-19T22:59:53",
|
||||
"welcomePackOffer": {
|
||||
"serviceType": "test",
|
||||
"priceDetails": "45",
|
||||
"startDate": "2026-05-18",
|
||||
"sentAt": "2026-05-19T22:59:53"
|
||||
},
|
||||
"lifecycle": {
|
||||
"status": "active",
|
||||
"reason": "",
|
||||
"changedAt": "2026-06-29T20:39:59",
|
||||
"changedBy": "info@goodwalk.co.nz"
|
||||
},
|
||||
"lifecycleHistory": [
|
||||
{
|
||||
"status": "active",
|
||||
"reason": "",
|
||||
"changedAt": "2026-06-29T20:39:59",
|
||||
"changedBy": "info@goodwalk.co.nz"
|
||||
}
|
||||
],
|
||||
"dogs": [
|
||||
{
|
||||
"id": "primary",
|
||||
"name": "Geoffrey",
|
||||
"breed": "",
|
||||
"birthDate": "",
|
||||
"birthdayAutoSend": false,
|
||||
"birthdayEmailLastSentAt": "",
|
||||
"birthdayEmailLastSentYear": ""
|
||||
}
|
||||
],
|
||||
"dogBreed": "",
|
||||
"dogAge": "",
|
||||
"birthdayAutoSend": false,
|
||||
"birthdayEmailLastSentAt": "",
|
||||
"birthdayEmailLastSentYear": ""
|
||||
},
|
||||
"natalie@desseinparke.com": {
|
||||
"fullName":"Natalie Parke",
|
||||
"fullName": "Natalie Parke",
|
||||
"phone": "021616200",
|
||||
"dogName": "Ziggy"
|
||||
},
|
||||
"test@test.com": {
|
||||
"fullName": "test test",
|
||||
"phone": "test@test.com",
|
||||
"address": "test@test.com",
|
||||
"dogName": "X",
|
||||
"dogBreed": "H",
|
||||
"dogAge": "2026-05-18",
|
||||
"onboardingCompleted": true,
|
||||
"birthdayAutoSend": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
"mattcohen0@gmail.com": {
|
||||
"onboarding": {
|
||||
"currentStep": 5,
|
||||
"ownerFirstName": "test",
|
||||
"ownerLastName": "test",
|
||||
"email": "test@test.com",
|
||||
"phone": "test@test.com",
|
||||
"address": "test@test.com",
|
||||
"dogName": "test@test.com",
|
||||
"dogLastName": "test@test.com",
|
||||
"dogBreed": "test@test.com",
|
||||
"dogDateOfBirth": "2026-05-18",
|
||||
"servicesNeeded": [
|
||||
"Tiny Gang Pack Walks"
|
||||
],
|
||||
"temperament": "test",
|
||||
"accessInstructions": "01",
|
||||
"vetName": "test",
|
||||
"vetAddress": "test",
|
||||
"vetPhone": "test",
|
||||
"emergencyContactName": "test",
|
||||
"emergencyContactPhone": "test",
|
||||
"isVaccinated": "no",
|
||||
"hasFoodAllergies": "no",
|
||||
"foodAllergiesDetail": "",
|
||||
"hasEnvAllergies": "no",
|
||||
"envAllergiesDetail": "",
|
||||
"onSpecialDiet": "no",
|
||||
"specialDietDetail": "",
|
||||
"onMedication": "no",
|
||||
"medicationDetail": "",
|
||||
"wellSocialised": "",
|
||||
"dogsInteractedWeekly": "",
|
||||
"visitsBeach": "yes",
|
||||
"visitsDogParks": "no",
|
||||
"dogParksFrequency": "",
|
||||
"biteHistory": "no",
|
||||
"reactiveToDogs": "no",
|
||||
"reactiveToAnimals": "no",
|
||||
"reactiveToChildren": "no",
|
||||
"reactiveToPeople": "no",
|
||||
"isDesexed": "no",
|
||||
"isRegistered": "yes",
|
||||
"leashTrained": "yes",
|
||||
"recallRating": 5,
|
||||
"ranAwayBefore": "yes",
|
||||
"carBehaviour": "test",
|
||||
"knownCommands": "test",
|
||||
"additionalNotes": "",
|
||||
"socialMediaAccount": "",
|
||||
"howDidYouHear": "",
|
||||
"emergencyVetConsent": false,
|
||||
"termsAccepted": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,366 @@
|
||||
"""Postgres-backed key/value persistence for mail-api admin state.
|
||||
|
||||
The mail-api historically stored client_profiles / allowed_emails / drafts
|
||||
as JSON files on a Docker volume. This module lets the same data live in
|
||||
the shared Goodwalk postgres database so the admin dashboard at
|
||||
admin.goodwalk.co.nz reads from a real database instead of a per-container
|
||||
JSON file. JSON files remain as a development/local fallback and as the
|
||||
seed source for the initial postgres migration.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
import asyncpg
|
||||
except Exception: # pragma: no cover - asyncpg is optional in dev
|
||||
asyncpg = None # type: ignore[assignment]
|
||||
|
||||
|
||||
logger = logging.getLogger("mail-api.db")
|
||||
|
||||
_pool: Any = None
|
||||
_pool_lock = asyncio.Lock()
|
||||
_schema_lock = asyncio.Lock()
|
||||
_schema_ensured = False
|
||||
|
||||
|
||||
def database_url() -> str:
|
||||
return (os.environ.get("DATABASE_URL", "") or "").strip()
|
||||
|
||||
|
||||
def is_enabled() -> bool:
|
||||
return bool(database_url()) and asyncpg is not None
|
||||
|
||||
|
||||
async def get_pool() -> Any:
|
||||
"""Return a lazily-initialised asyncpg pool, or None when DB is disabled."""
|
||||
global _pool
|
||||
if not is_enabled():
|
||||
return None
|
||||
if _pool is not None:
|
||||
return _pool
|
||||
async with _pool_lock:
|
||||
if _pool is None:
|
||||
try:
|
||||
_pool = await asyncpg.create_pool(
|
||||
dsn=database_url(),
|
||||
min_size=1,
|
||||
max_size=4,
|
||||
command_timeout=10,
|
||||
)
|
||||
logger.info("Postgres pool ready for admin_kv persistence")
|
||||
except Exception as exc:
|
||||
logger.warning("Postgres pool init failed (%s); falling back to JSON only", exc)
|
||||
return None
|
||||
return _pool
|
||||
|
||||
|
||||
async def _ensure_schema() -> None:
|
||||
global _schema_ensured
|
||||
if _schema_ensured:
|
||||
return
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return
|
||||
async with _schema_lock:
|
||||
if _schema_ensured:
|
||||
return
|
||||
async with pool.acquire() as conn:
|
||||
await conn.execute(
|
||||
"""
|
||||
create table if not exists admin_kv (
|
||||
key text primary key,
|
||||
value jsonb not null,
|
||||
updated_at timestamptz not null default now()
|
||||
);
|
||||
|
||||
create table if not exists events (
|
||||
id bigserial primary key,
|
||||
created_at timestamptz not null default now(),
|
||||
request_id text,
|
||||
event_type text not null,
|
||||
actor_email text,
|
||||
ip text,
|
||||
status text,
|
||||
detail jsonb
|
||||
);
|
||||
create index if not exists events_created_at_idx on events (created_at desc);
|
||||
create index if not exists events_event_type_idx on events (event_type);
|
||||
create index if not exists events_actor_email_idx on events (actor_email);
|
||||
|
||||
create table if not exists submissions (
|
||||
id bigserial primary key,
|
||||
created_at timestamptz not null default now(),
|
||||
request_id text,
|
||||
kind text not null,
|
||||
email text not null,
|
||||
full_name text,
|
||||
phone text,
|
||||
ip text,
|
||||
payload jsonb not null
|
||||
);
|
||||
create index if not exists submissions_created_at_idx on submissions (created_at desc);
|
||||
create index if not exists submissions_email_idx on submissions (email);
|
||||
create index if not exists submissions_kind_idx on submissions (kind);
|
||||
"""
|
||||
)
|
||||
_schema_ensured = True
|
||||
|
||||
|
||||
async def record_event(
|
||||
*,
|
||||
event_type: str,
|
||||
request_id: str | None = None,
|
||||
actor_email: str | None = None,
|
||||
ip: str | None = None,
|
||||
status: str | None = None,
|
||||
detail: dict | None = None,
|
||||
) -> None:
|
||||
"""Append a single business event to the events table. Best-effort:
|
||||
failures are logged and swallowed so they never block request handling."""
|
||||
try:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return
|
||||
await _ensure_schema()
|
||||
payload = json.dumps(detail or {})
|
||||
async with pool.acquire() as conn:
|
||||
await conn.execute(
|
||||
"""
|
||||
insert into events (request_id, event_type, actor_email, ip, status, detail)
|
||||
values ($1, $2, $3, $4, $5, $6::jsonb)
|
||||
""",
|
||||
request_id, event_type, actor_email, ip, status, payload,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning("record_event(%s) failed: %s", event_type, exc)
|
||||
|
||||
|
||||
async def record_submission(
|
||||
*,
|
||||
kind: str,
|
||||
email: str,
|
||||
full_name: str | None,
|
||||
phone: str | None,
|
||||
ip: str | None,
|
||||
request_id: str | None,
|
||||
payload: dict,
|
||||
) -> None:
|
||||
"""Persist a contact-form submission (booking / onboarding / contract)."""
|
||||
try:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return
|
||||
await _ensure_schema()
|
||||
async with pool.acquire() as conn:
|
||||
await conn.execute(
|
||||
"""
|
||||
insert into submissions (request_id, kind, email, full_name, phone, ip, payload)
|
||||
values ($1, $2, $3, $4, $5, $6, $7::jsonb)
|
||||
""",
|
||||
request_id, kind, email, full_name, phone, ip, json.dumps(payload),
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning("record_submission(%s) failed: %s", kind, exc)
|
||||
|
||||
|
||||
async def list_events(
|
||||
*,
|
||||
limit: int = 100,
|
||||
before_id: int | None = None,
|
||||
event_type: str | None = None,
|
||||
actor_email: str | None = None,
|
||||
) -> list[dict]:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return []
|
||||
await _ensure_schema()
|
||||
clauses: list[str] = []
|
||||
params: list[Any] = []
|
||||
if before_id is not None:
|
||||
params.append(before_id)
|
||||
clauses.append(f"id < ${len(params)}")
|
||||
if event_type:
|
||||
params.append(event_type)
|
||||
clauses.append(f"event_type = ${len(params)}")
|
||||
if actor_email:
|
||||
params.append(actor_email.strip().lower())
|
||||
clauses.append(f"actor_email = ${len(params)}")
|
||||
where = ("where " + " and ".join(clauses)) if clauses else ""
|
||||
params.append(max(1, min(500, limit)))
|
||||
sql = (
|
||||
f"select id, created_at, request_id, event_type, actor_email, ip, status, detail "
|
||||
f"from events {where} order by id desc limit ${len(params)}"
|
||||
)
|
||||
async with pool.acquire() as conn:
|
||||
rows = await conn.fetch(sql, *params)
|
||||
return [
|
||||
{
|
||||
"id": r["id"],
|
||||
"createdAt": r["created_at"].isoformat() if r["created_at"] else None,
|
||||
"requestId": r["request_id"],
|
||||
"eventType": r["event_type"],
|
||||
"actorEmail": r["actor_email"],
|
||||
"ip": r["ip"],
|
||||
"status": r["status"],
|
||||
"detail": (json.loads(r["detail"]) if isinstance(r["detail"], (str, bytes, bytearray)) else r["detail"]) or {},
|
||||
}
|
||||
for r in rows
|
||||
]
|
||||
|
||||
|
||||
async def list_submissions(
|
||||
*,
|
||||
limit: int = 100,
|
||||
before_id: int | None = None,
|
||||
kind: str | None = None,
|
||||
email: str | None = None,
|
||||
) -> list[dict]:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return []
|
||||
await _ensure_schema()
|
||||
clauses: list[str] = []
|
||||
params: list[Any] = []
|
||||
if before_id is not None:
|
||||
params.append(before_id)
|
||||
clauses.append(f"id < ${len(params)}")
|
||||
if kind:
|
||||
params.append(kind)
|
||||
clauses.append(f"kind = ${len(params)}")
|
||||
if email:
|
||||
params.append(email.strip().lower())
|
||||
clauses.append(f"email = ${len(params)}")
|
||||
where = ("where " + " and ".join(clauses)) if clauses else ""
|
||||
params.append(max(1, min(500, limit)))
|
||||
sql = (
|
||||
f"select id, created_at, request_id, kind, email, full_name, phone, ip, payload "
|
||||
f"from submissions {where} order by id desc limit ${len(params)}"
|
||||
)
|
||||
async with pool.acquire() as conn:
|
||||
rows = await conn.fetch(sql, *params)
|
||||
return [
|
||||
{
|
||||
"id": r["id"],
|
||||
"createdAt": r["created_at"].isoformat() if r["created_at"] else None,
|
||||
"requestId": r["request_id"],
|
||||
"kind": r["kind"],
|
||||
"email": r["email"],
|
||||
"fullName": r["full_name"],
|
||||
"phone": r["phone"],
|
||||
"ip": r["ip"],
|
||||
"payload": (json.loads(r["payload"]) if isinstance(r["payload"], (str, bytes, bytearray)) else r["payload"]) or {},
|
||||
}
|
||||
for r in rows
|
||||
]
|
||||
|
||||
|
||||
async def get_kv(key: str) -> Any | None:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return None
|
||||
await _ensure_schema()
|
||||
async with pool.acquire() as conn:
|
||||
row = await conn.fetchrow("select value from admin_kv where key = $1", key)
|
||||
if not row:
|
||||
return None
|
||||
raw = row["value"]
|
||||
# asyncpg returns jsonb as a Python str; parse to native value.
|
||||
if isinstance(raw, (dict, list)):
|
||||
return raw
|
||||
if isinstance(raw, (bytes, bytearray)):
|
||||
raw = raw.decode("utf-8")
|
||||
try:
|
||||
return json.loads(raw)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
async def set_kv(key: str, value: Any) -> bool:
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return False
|
||||
await _ensure_schema()
|
||||
payload = json.dumps(value)
|
||||
async with pool.acquire() as conn:
|
||||
await conn.execute(
|
||||
"""
|
||||
insert into admin_kv (key, value, updated_at)
|
||||
values ($1, $2::jsonb, now())
|
||||
on conflict (key) do update
|
||||
set value = excluded.value,
|
||||
updated_at = excluded.updated_at
|
||||
""",
|
||||
key,
|
||||
payload,
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
async def get_submission_journey(email: str) -> dict | None:
|
||||
"""Return the most recent submission_journeys row for the given email, or
|
||||
None when no journey was promoted (or DB is off). The table is owned by
|
||||
the SvelteKit app — see src/routes/api/track/promote — but the mail-api
|
||||
reads it here so the owner dashboard's enquiry view can render it
|
||||
alongside the booking record."""
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return None
|
||||
normalized = (email or "").strip().lower()
|
||||
if not normalized:
|
||||
return None
|
||||
try:
|
||||
async with pool.acquire() as conn:
|
||||
row = await conn.fetchrow(
|
||||
"""
|
||||
select id, anon_id, events, client_events, created_at
|
||||
from submission_journeys
|
||||
where email = $1
|
||||
order by created_at desc
|
||||
limit 1
|
||||
""",
|
||||
normalized,
|
||||
)
|
||||
except Exception as exc:
|
||||
# Table may not exist yet in environments where the new init script
|
||||
# hasn't run. Don't break the enquiry view over it.
|
||||
logger.warning("submission_journeys read failed: %s", exc)
|
||||
return None
|
||||
if not row:
|
||||
return None
|
||||
|
||||
def _parse(value: Any) -> Any:
|
||||
if isinstance(value, (list, dict)):
|
||||
return value
|
||||
if isinstance(value, (bytes, bytearray)):
|
||||
value = value.decode("utf-8")
|
||||
try:
|
||||
return json.loads(value) if value else []
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
return {
|
||||
"id": row["id"],
|
||||
"anonId": row["anon_id"],
|
||||
"events": _parse(row["events"]),
|
||||
"clientEvents": _parse(row["client_events"]),
|
||||
"createdAt": row["created_at"].isoformat() if row["created_at"] else None,
|
||||
}
|
||||
|
||||
|
||||
async def has_any_value() -> bool:
|
||||
"""Return True if admin_kv already has any rows. Used to decide whether
|
||||
to seed from JSON files on first boot."""
|
||||
pool = await get_pool()
|
||||
if pool is None:
|
||||
return False
|
||||
await _ensure_schema()
|
||||
async with pool.acquire() as conn:
|
||||
row = await conn.fetchrow("select 1 from admin_kv limit 1")
|
||||
return row is not None
|
||||
@@ -0,0 +1 @@
|
||||
"""Mail API package — split out of the legacy single-file main.py."""
|
||||
@@ -0,0 +1,300 @@
|
||||
"""Runtime configuration for the mail API.
|
||||
|
||||
Loads environment variables once at import time, validates required values,
|
||||
and exposes a frozen :class:`Settings` dataclass plus module-level constants
|
||||
for compatibility with code that still imports the legacy names.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import logging.handlers
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
import resend
|
||||
|
||||
|
||||
# ── Logging ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def setup_logging() -> logging.Logger:
|
||||
log_dir = Path(os.environ.get("LOG_DIR", "logs"))
|
||||
log_dir.mkdir(parents=True, exist_ok=True)
|
||||
log_file = log_dir / "mail-api.log"
|
||||
|
||||
fmt = logging.Formatter(
|
||||
"%(asctime)s %(levelname)-8s %(name)s: %(message)s",
|
||||
datefmt="%d/%m/%Y %H:%M:%S %Z",
|
||||
)
|
||||
|
||||
root = logging.getLogger()
|
||||
root.setLevel(logging.DEBUG)
|
||||
for handler in list(root.handlers):
|
||||
root.removeHandler(handler)
|
||||
|
||||
console = logging.StreamHandler(sys.stdout)
|
||||
console.setLevel(logging.INFO)
|
||||
console.setFormatter(fmt)
|
||||
root.addHandler(console)
|
||||
|
||||
rotating = logging.handlers.RotatingFileHandler(
|
||||
log_file, maxBytes=2_000_000, backupCount=5, encoding="utf-8"
|
||||
)
|
||||
rotating.setLevel(logging.DEBUG)
|
||||
rotating.setFormatter(fmt)
|
||||
root.addHandler(rotating)
|
||||
|
||||
log = logging.getLogger("mail-api")
|
||||
log.info("Logging initialised -> console=INFO, file=%s (DEBUG, rotating)", log_file)
|
||||
return log
|
||||
|
||||
|
||||
logger = setup_logging()
|
||||
|
||||
|
||||
# ── Settings ─────────────────────────────────────────────────────────────────
|
||||
|
||||
DEV_MODE = os.environ.get("DEV_MODE", "").strip().lower() in {"1", "true", "yes"}
|
||||
|
||||
REQUIRED_ENV = {
|
||||
"RESEND_API_KEY": "API key from https://resend.com/api-keys",
|
||||
"OWNER_EMAIL": "Email address that receives new lead notifications",
|
||||
}
|
||||
|
||||
|
||||
def _parse_email_env_list(*values: str | None) -> list[str]:
|
||||
emails: list[str] = []
|
||||
seen: set[str] = set()
|
||||
for raw in values:
|
||||
if not raw:
|
||||
continue
|
||||
for part in re.split(r"[;,\s]+", raw.strip()):
|
||||
normalized = part.strip().lower()
|
||||
if normalized and normalized not in seen:
|
||||
seen.add(normalized)
|
||||
emails.append(normalized)
|
||||
return emails
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Settings:
|
||||
resend_api_key: str
|
||||
owner_email: str
|
||||
cp_admin_emails: tuple[str, ...]
|
||||
from_email: str
|
||||
reply_to: str
|
||||
owner_bcc: str
|
||||
client_bcc: str
|
||||
enable_general_enquiries: bool
|
||||
max_attempts: int
|
||||
form_min_seconds: int
|
||||
form_max_seconds: int
|
||||
rate_limit_window_seconds: int
|
||||
rate_limit_max_per_ip: int
|
||||
rate_limit_max_per_email: int
|
||||
rate_limit_min_interval_seconds: int
|
||||
email_send_timeout_seconds: int
|
||||
|
||||
|
||||
def _load_settings() -> Settings:
|
||||
if DEV_MODE:
|
||||
owner_email = os.environ.get("OWNER_EMAIL", "dev@localhost").strip().lower()
|
||||
return Settings(
|
||||
resend_api_key=os.environ.get("RESEND_API_KEY", "dev"),
|
||||
owner_email=owner_email,
|
||||
cp_admin_emails=tuple(_parse_email_env_list(
|
||||
owner_email,
|
||||
os.environ.get("SECONDARY_CP_EMAIL"),
|
||||
os.environ.get("SECONDARY_CP_EMAILS"),
|
||||
)),
|
||||
from_email=os.environ.get("FROM_EMAIL", "GoodWalk <info@goodwalk.co.nz>"),
|
||||
reply_to=os.environ.get("REPLY_TO", "info@goodwalk.co.nz"),
|
||||
owner_bcc="",
|
||||
client_bcc="",
|
||||
enable_general_enquiries=False,
|
||||
max_attempts=3,
|
||||
form_min_seconds=1,
|
||||
form_max_seconds=7200,
|
||||
rate_limit_window_seconds=900,
|
||||
rate_limit_max_per_ip=50,
|
||||
rate_limit_max_per_email=50,
|
||||
rate_limit_min_interval_seconds=1,
|
||||
email_send_timeout_seconds=20,
|
||||
)
|
||||
|
||||
missing = [(name, hint) for name, hint in REQUIRED_ENV.items() if not os.environ.get(name)]
|
||||
if missing:
|
||||
lines = [
|
||||
"",
|
||||
"Mail API cannot start — required environment variables are not set:",
|
||||
"",
|
||||
]
|
||||
for name, hint in missing:
|
||||
lines.append(f" • {name} ({hint})")
|
||||
lines += [
|
||||
"",
|
||||
"Set them in your shell and try again. For example, in PowerShell:",
|
||||
"",
|
||||
]
|
||||
for name, _ in missing:
|
||||
lines.append(f' $env:{name} = "..."')
|
||||
lines.append("")
|
||||
message = "\n".join(lines)
|
||||
logger.critical("Startup aborted: missing env vars: %s", [n for n, _ in missing])
|
||||
print(message, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
owner_email = os.environ["OWNER_EMAIL"].strip().lower()
|
||||
return Settings(
|
||||
resend_api_key=os.environ["RESEND_API_KEY"],
|
||||
owner_email=owner_email,
|
||||
cp_admin_emails=tuple(_parse_email_env_list(
|
||||
owner_email,
|
||||
os.environ.get("SECONDARY_CP_EMAIL"),
|
||||
os.environ.get("SECONDARY_CP_EMAILS"),
|
||||
)),
|
||||
from_email=os.environ.get("FROM_EMAIL", "GoodWalk <info@goodwalk.co.nz>"),
|
||||
reply_to=os.environ.get("REPLY_TO", "info@goodwalk.co.nz"),
|
||||
owner_bcc=os.environ.get("OWNER_BCC", "example@example.com").strip(),
|
||||
client_bcc=os.environ.get("CLIENT_BCC", "").strip(),
|
||||
enable_general_enquiries=os.environ.get("ENABLE_GENERAL_ENQUIRIES", "false").strip().lower()
|
||||
in {"1", "true", "yes", "on", "enabled"},
|
||||
max_attempts=max(1, int(os.environ.get("MAIL_MAX_ATTEMPTS", "3"))),
|
||||
form_min_seconds=max(1, int(os.environ.get("FORM_MIN_SECONDS", "4"))),
|
||||
form_max_seconds=max(60, int(os.environ.get("FORM_MAX_SECONDS", "7200"))),
|
||||
rate_limit_window_seconds=max(60, int(os.environ.get("RATE_LIMIT_WINDOW_SECONDS", "900"))),
|
||||
rate_limit_max_per_ip=max(1, int(os.environ.get("RATE_LIMIT_MAX_PER_IP", "5"))),
|
||||
rate_limit_max_per_email=max(1, int(os.environ.get("RATE_LIMIT_MAX_PER_EMAIL", "3"))),
|
||||
rate_limit_min_interval_seconds=max(1, int(os.environ.get("RATE_LIMIT_MIN_INTERVAL_SECONDS", "20"))),
|
||||
email_send_timeout_seconds=max(5, int(os.environ.get("EMAIL_SEND_TIMEOUT_SECONDS", "20"))),
|
||||
)
|
||||
|
||||
|
||||
settings = _load_settings()
|
||||
resend.api_key = settings.resend_api_key
|
||||
|
||||
APP_VERSION = os.environ.get("APP_VERSION", "unknown")
|
||||
AUTH_CODE_TTL_SECONDS = max(60, int(os.environ.get("AUTH_CODE_TTL_SECONDS", "600")))
|
||||
AUTH_SESSION_TTL_SECONDS = max(3600, int(os.environ.get("AUTH_SESSION_TTL_SECONDS", str(7 * 24 * 3600))))
|
||||
AUTH_CODE_MAX_ATTEMPTS = 5
|
||||
AUTH_CODE_REQUESTS_PER_HOUR = 5
|
||||
AUTH_IP_MAX_FAILURES = max(3, int(os.environ.get("AUTH_IP_MAX_FAILURES", "10")))
|
||||
AUTH_IP_FAILURE_WINDOW = max(60, int(os.environ.get("AUTH_IP_FAILURE_WINDOW", "600")))
|
||||
AUTH_IP_BLOCK_DURATION = max(60, int(os.environ.get("AUTH_IP_BLOCK_DURATION", "3600")))
|
||||
BIRTHDAY_CHECK_INTERVAL_SECONDS = max(3600, int(os.environ.get("BIRTHDAY_CHECK_INTERVAL_SECONDS", str(12 * 3600))))
|
||||
# How often the scheduled-email worker wakes to dispatch any sends that have
|
||||
# come due. Scheduled welcome emails need finer granularity than the birthday
|
||||
# sweep, so this defaults to one minute (floored at 15s).
|
||||
SCHEDULED_CHECK_INTERVAL_SECONDS = max(15, int(os.environ.get("SCHEDULED_CHECK_INTERVAL_SECONDS", "60")))
|
||||
|
||||
|
||||
def _split_csv_env(name: str, default: str) -> tuple[str, ...]:
|
||||
# Treat empty-string env (e.g. compose `${VAR:-}`) the same as "unset" so
|
||||
# an unset compose key falls back to the default, not to an empty allowlist.
|
||||
raw = (os.environ.get(name) or "").strip() or default
|
||||
parts = [p.strip() for p in raw.split(",")]
|
||||
return tuple(p for p in parts if p)
|
||||
|
||||
|
||||
CORS_ALLOWED_ORIGINS = _split_csv_env(
|
||||
"CORS_ALLOWED_ORIGINS",
|
||||
"https://goodwalk.co.nz,https://www.goodwalk.co.nz,https://clients.goodwalk.co.nz,https://cp.goodwalk.co.nz",
|
||||
)
|
||||
TRUSTED_HOSTS = _split_csv_env(
|
||||
"TRUSTED_HOSTS",
|
||||
"goodwalk.co.nz,www.goodwalk.co.nz,clients.goodwalk.co.nz,cp.goodwalk.co.nz,localhost,127.0.0.1",
|
||||
)
|
||||
# Hard cap on request body size. Signed contracts include a base64 PNG of the
|
||||
# signature (~30 KB) plus form fields, so 2 MB is a generous ceiling.
|
||||
MAX_REQUEST_BODY_BYTES = max(64 * 1024, int((os.environ.get("MAX_REQUEST_BODY_BYTES") or str(2 * 1024 * 1024)).strip() or str(2 * 1024 * 1024)))
|
||||
|
||||
_DATA_DIR = Path(os.environ.get("DATA_DIR", "data"))
|
||||
ALLOWED_EMAILS_FILE = _DATA_DIR / "allowed_emails.json"
|
||||
CLIENT_PROFILES_FILE = _DATA_DIR / "client_profiles.json"
|
||||
DRAFTS_FILE = _DATA_DIR / "drafts.json"
|
||||
# Durable queue of owner-scheduled emails (welcome packs queued for later send).
|
||||
# Mirrors the client_profiles persistence model: postgres admin_kv is canonical
|
||||
# in production, with this JSON file as the dev/local fallback and seed source.
|
||||
SCHEDULED_EMAILS_FILE = _DATA_DIR / "scheduled_emails.json"
|
||||
# Legacy seed lives OUTSIDE the data volume — it's shipped in the image so a
|
||||
# fresh deploy always carries the same baked-in copy. On boot the mail-api
|
||||
# merges this dict into _client_profiles, adding any emails that aren't
|
||||
# already present. It never overwrites a live entry.
|
||||
LEGACY_SEED_FILE = Path(
|
||||
os.environ.get("LEGACY_SEED_FILE", "/app/legacy-clients-seed.json")
|
||||
)
|
||||
|
||||
LOGO_URL = "https://www.goodwalk.co.nz/images/goodwalk-auckland-dog-walking-logo.png"
|
||||
|
||||
# ── MYOB integration ───────────────────────────────────────────────────────────
|
||||
# Optional: create new clients as customer contacts in MYOB AccountRight Live.
|
||||
# The integration stays disabled until every required value is present, so an
|
||||
# unconfigured environment behaves exactly as before.
|
||||
#
|
||||
# MYOB_API_KEY / MYOB_API_SECRET the developer app's OAuth client id/secret
|
||||
# MYOB_REFRESH_TOKEN long-lived token used to mint access tokens
|
||||
# MYOB_COMPANY_FILE_URI base API URI of the target company file,
|
||||
# e.g. https://api.myob.com/accountright/<guid>
|
||||
# MYOB_CF_USERNAME / MYOB_CF_PASSWORD company-file login (password may be blank)
|
||||
# MYOB_TOKEN_URL OAuth token endpoint (override only for tests)
|
||||
MYOB_API_KEY = (os.environ.get("MYOB_API_KEY") or "").strip()
|
||||
MYOB_API_SECRET = (os.environ.get("MYOB_API_SECRET") or "").strip()
|
||||
MYOB_REFRESH_TOKEN = (os.environ.get("MYOB_REFRESH_TOKEN") or "").strip()
|
||||
MYOB_COMPANY_FILE_URI = (os.environ.get("MYOB_COMPANY_FILE_URI") or "").strip().rstrip("/")
|
||||
MYOB_CF_USERNAME = (os.environ.get("MYOB_CF_USERNAME") or "Administrator").strip()
|
||||
MYOB_CF_PASSWORD = os.environ.get("MYOB_CF_PASSWORD", "")
|
||||
MYOB_TOKEN_URL = (os.environ.get("MYOB_TOKEN_URL") or "https://secure.myob.com/oauth2/v1/authorize").strip()
|
||||
MYOB_HTTP_TIMEOUT_SECONDS = max(5, int(os.environ.get("MYOB_HTTP_TIMEOUT_SECONDS", "20")))
|
||||
MYOB_ENABLED = bool(MYOB_API_KEY and MYOB_API_SECRET and MYOB_REFRESH_TOKEN and MYOB_COMPANY_FILE_URI)
|
||||
|
||||
# ── Legacy module constants (kept for compatibility with the existing main.py) ──
|
||||
|
||||
OWNER_EMAIL = settings.owner_email
|
||||
CP_ADMIN_EMAILS = set(settings.cp_admin_emails)
|
||||
OWNER_BCC = settings.owner_bcc
|
||||
CLIENT_BCC = settings.client_bcc
|
||||
FROM_EMAIL = settings.from_email
|
||||
REPLY_TO = settings.reply_to
|
||||
ENABLE_GENERAL_ENQUIRIES = settings.enable_general_enquiries
|
||||
MAX_SEND_ATTEMPTS = settings.max_attempts
|
||||
FORM_MIN_SECONDS = settings.form_min_seconds
|
||||
FORM_MAX_SECONDS = settings.form_max_seconds
|
||||
RATE_LIMIT_WINDOW_SECONDS = settings.rate_limit_window_seconds
|
||||
RATE_LIMIT_MAX_PER_IP = settings.rate_limit_max_per_ip
|
||||
RATE_LIMIT_MAX_PER_EMAIL = settings.rate_limit_max_per_email
|
||||
RATE_LIMIT_MIN_INTERVAL_SECONDS = settings.rate_limit_min_interval_seconds
|
||||
EMAIL_SEND_TIMEOUT_SECONDS = settings.email_send_timeout_seconds
|
||||
|
||||
# Owner-BCC placeholder used by deploy.env.template; treat it as "unset" for the smoke email.
|
||||
STARTUP_TEST_RECIPIENT = OWNER_BCC if OWNER_BCC and OWNER_BCC.lower() != "example@example.com" else ""
|
||||
|
||||
# Shared secret presented by the deploy script's post-deploy form smoke tests.
|
||||
# When set, requests carrying a matching X-Deploy-Smoke header short-circuit the
|
||||
# form handlers before any email/db side effects so production submissions stay
|
||||
# clean. When unset, the bypass is fully disabled.
|
||||
DEPLOY_SMOKE_SECRET = (os.environ.get("DEPLOY_SMOKE_SECRET") or "").strip()
|
||||
|
||||
logger.info(
|
||||
"Mail API config: version=%r timezone=%r from=%r reply_to=%r owner=%r cp_admins=%r owner_bcc=%r client_bcc=%r general_enquiries=%r max_attempts=%d form_min=%ss form_max=%ss rate_window=%ss per_ip=%d per_email=%d min_interval=%ss send_timeout=%ss",
|
||||
APP_VERSION,
|
||||
os.environ.get("TZ", "system-default"),
|
||||
FROM_EMAIL,
|
||||
REPLY_TO,
|
||||
OWNER_EMAIL,
|
||||
sorted(CP_ADMIN_EMAILS),
|
||||
OWNER_BCC,
|
||||
CLIENT_BCC,
|
||||
ENABLE_GENERAL_ENQUIRIES,
|
||||
MAX_SEND_ATTEMPTS,
|
||||
FORM_MIN_SECONDS,
|
||||
FORM_MAX_SECONDS,
|
||||
RATE_LIMIT_WINDOW_SECONDS,
|
||||
RATE_LIMIT_MAX_PER_IP,
|
||||
RATE_LIMIT_MAX_PER_EMAIL,
|
||||
RATE_LIMIT_MIN_INTERVAL_SECONDS,
|
||||
EMAIL_SEND_TIMEOUT_SECONDS,
|
||||
)
|
||||
logger.info("MYOB integration: %s", "enabled" if MYOB_ENABLED else "disabled (set MYOB_* env vars to enable)")
|
||||
@@ -0,0 +1,239 @@
|
||||
"""Pydantic request/response models for the mail API."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Literal
|
||||
|
||||
from pydantic import BaseModel, EmailStr
|
||||
|
||||
|
||||
class BaseSubmission(BaseModel):
|
||||
fullName: str
|
||||
email: EmailStr
|
||||
phone: str
|
||||
website: str = ""
|
||||
formStartedAt: int | None = None
|
||||
visitStartedAt: int | None = None
|
||||
pageEnteredAt: int | None = None
|
||||
firstInteractionAt: int | None = None
|
||||
sendClickedAt: int | None = None
|
||||
referrer: str = ""
|
||||
page: str = ""
|
||||
|
||||
|
||||
class BookingSubmission(BaseSubmission):
|
||||
enquiryType: str = "booking"
|
||||
petName: str = ""
|
||||
location: str = ""
|
||||
message: str = ""
|
||||
services: list[str] = []
|
||||
stepChanges: int = 0
|
||||
journey: list[str] = []
|
||||
|
||||
|
||||
class OnboardingSubmission(BaseSubmission):
|
||||
address: str
|
||||
dogName: str
|
||||
dogBreed: str
|
||||
dogAge: str = ""
|
||||
servicesNeeded: list[str] = []
|
||||
temperament: str = ""
|
||||
medicalNotes: str = ""
|
||||
accessInstructions: str = ""
|
||||
vetName: str
|
||||
vetAddress: str
|
||||
vetPhone: str
|
||||
emergencyContactName: str
|
||||
emergencyContactPhone: str
|
||||
regularFleaTickTreatment: str = ""
|
||||
petInsurance: str = ""
|
||||
petInsuranceOwnerExpenseAccepted: bool = False
|
||||
councilRegistrationConfirmed: bool = False
|
||||
vaccinationsConfirmed: bool = False
|
||||
emergencyVetConsent: bool = False
|
||||
termsAccepted: bool = False
|
||||
signatureDataUrl: str
|
||||
submissionSnapshot: dict[str, Any] = {}
|
||||
|
||||
|
||||
class WelcomePackEmailRequest(BaseModel):
|
||||
email: EmailStr
|
||||
# Owner-set subject line. Defaults to "Goodwalk Onboarding - <Dog Name>" when
|
||||
# blank (resolved server-side so scheduled sends keep a sensible subject too).
|
||||
subject: str = ""
|
||||
# Structured offer details rendered in the details table. Now fully optional —
|
||||
# the owner can hide the table entirely (showDetails=False) and write a free
|
||||
# email instead. Left blank, a row is simply omitted from the table.
|
||||
serviceType: str = ""
|
||||
priceDetails: str = ""
|
||||
startDate: str = ""
|
||||
# Free-text customisation. All blank => the email falls back to the original
|
||||
# default copy, so existing callers keep working unchanged. `{first_name}`
|
||||
# and `{dog_name}` tokens are substituted server-side.
|
||||
heading: str = ""
|
||||
intro: str = ""
|
||||
outro: str = ""
|
||||
tagLabel: str = ""
|
||||
# Customisable button block. Defaults to "Complete onboarding" pointing at the
|
||||
# client onboarding portal. Clearing either field hides the button.
|
||||
ctaLabel: str = ""
|
||||
ctaUrl: str = ""
|
||||
# Whether to render the Service / Price / Start date table at all.
|
||||
showDetails: bool = True
|
||||
# Rich-text (WYSIWYG) message body. When present it replaces the
|
||||
# heading/intro/outro copy above and is sanitised to an email-safe subset of
|
||||
# HTML server-side. `includeButton` toggles the onboarding button beneath it.
|
||||
bodyHtml: str = ""
|
||||
includeButton: bool = True
|
||||
preview: bool = False
|
||||
previewRecipients: list[EmailStr] = []
|
||||
# When sending for real (not a preview), also copy the owner so they keep a
|
||||
# record of exactly what the client received. CC is visible to the client;
|
||||
# BCC is hidden. Independent. Ignored on previews and scheduled sends.
|
||||
ccOwner: bool = False
|
||||
bccOwner: bool = False
|
||||
# ISO 8601 local datetime (e.g. "2026-06-20T14:30"). When set on a non-preview
|
||||
# request, the welcome email is queued for reliable delivery at that time
|
||||
# instead of being sent immediately.
|
||||
scheduledFor: str | None = None
|
||||
|
||||
|
||||
class ScheduledEmailCancelRequest(BaseModel):
|
||||
id: str
|
||||
|
||||
|
||||
class ScheduledEmailRescheduleRequest(BaseModel):
|
||||
id: str
|
||||
scheduledFor: str
|
||||
|
||||
|
||||
class BirthdayEmailRequest(BaseModel):
|
||||
email: EmailStr
|
||||
dogId: str | None = None
|
||||
# Owner-editable subject line. Blank falls back to the default
|
||||
# "Happy birthday <dog>" subject.
|
||||
subject: str = ""
|
||||
preview: bool = False
|
||||
previewRecipients: list[EmailStr] = []
|
||||
|
||||
|
||||
class BirthdayAutoSendRequest(BaseModel):
|
||||
email: EmailStr
|
||||
dogId: str | None = None
|
||||
enabled: bool
|
||||
|
||||
|
||||
# Client lifecycle status. Soft-delete only — every client stays on file so the
|
||||
# history is preserved for future newsletter / retention work.
|
||||
ClientLifecycleStatus = Literal["active", "paused", "cancelled", "archived"]
|
||||
|
||||
|
||||
class ClientStatusUpdate(BaseModel):
|
||||
email: EmailStr
|
||||
status: ClientLifecycleStatus
|
||||
reason: str = ""
|
||||
|
||||
|
||||
class ClientProfileUpdate(BaseModel):
|
||||
email: EmailStr
|
||||
nextEmail: EmailStr
|
||||
fullName: str
|
||||
phone: str = ""
|
||||
address: str = ""
|
||||
dogName: str
|
||||
dogBreed: str = ""
|
||||
dogAge: str = ""
|
||||
|
||||
|
||||
class ResetOnboardingRequest(BaseModel):
|
||||
"""Owner-initiated reset: keep the client's saved details but mark their
|
||||
onboarding incomplete so they can sign in and complete the new form
|
||||
(used for clients imported from the legacy Gravity Forms data)."""
|
||||
|
||||
email: EmailStr
|
||||
|
||||
|
||||
class DeleteClientRequest(BaseModel):
|
||||
"""Owner-initiated permanent deletion of a client and their access."""
|
||||
|
||||
email: EmailStr
|
||||
|
||||
|
||||
class NewClientRequest(BaseModel):
|
||||
"""Owner-initiated client creation (e.g. leads from Instagram / Facebook
|
||||
that never came through the public enquiry form). Registers the email so
|
||||
the client can access the onboarding form, and seeds a profile."""
|
||||
|
||||
email: EmailStr
|
||||
fullName: str
|
||||
phone: str = ""
|
||||
address: str = ""
|
||||
dogName: str = ""
|
||||
dogBreed: str = ""
|
||||
dogAge: str = ""
|
||||
# Where the client came from, e.g. "Instagram", "Facebook", "Referral".
|
||||
source: str = ""
|
||||
# The date the client joined Goodwalk (ISO yyyy-mm-dd). Owner-supplied, since
|
||||
# only the owner knows it. Used to surface joining anniversaries.
|
||||
joiningDate: str = ""
|
||||
# When true (and the MYOB integration is configured), also create the client
|
||||
# as a customer contact in MYOB. Non-fatal: a MYOB failure never blocks the
|
||||
# local client from being created.
|
||||
createInMyob: bool = False
|
||||
|
||||
|
||||
class ClientDogUpsertRequest(BaseModel):
|
||||
email: EmailStr
|
||||
dogId: str | None = None
|
||||
dogName: str
|
||||
dogBreed: str = ""
|
||||
dogAge: str = ""
|
||||
birthdayAutoSend: bool = False
|
||||
|
||||
|
||||
class ContractSubmission(BaseSubmission):
|
||||
address: str
|
||||
dogName: str
|
||||
dogBreed: str
|
||||
dogAge: str = ""
|
||||
serviceType: str
|
||||
startDate: str
|
||||
walkFrequency: str = ""
|
||||
additionalNotes: str = ""
|
||||
agreeServiceTerms: bool = False
|
||||
agreeCancellation: bool = False
|
||||
agreePayment: bool = False
|
||||
agreeEmergency: bool = False
|
||||
agreeLiability: bool = False
|
||||
agreeAccuracy: bool = False
|
||||
signatureDataUrl: str
|
||||
|
||||
|
||||
class RenderMessageRequest(BaseModel):
|
||||
templateId: str
|
||||
heading: str = ""
|
||||
body: str = ""
|
||||
ctaLabel: str = ""
|
||||
ctaUrl: str = ""
|
||||
subHeading: str = ""
|
||||
highlightText: str = ""
|
||||
signOff: str = ""
|
||||
footerNote: str = ""
|
||||
fontId: str = "system"
|
||||
|
||||
|
||||
class SendMessageRequest(BaseModel):
|
||||
templateId: str
|
||||
subject: str
|
||||
heading: str = ""
|
||||
body: str = ""
|
||||
ctaLabel: str = ""
|
||||
ctaUrl: str = ""
|
||||
subHeading: str = ""
|
||||
highlightText: str = ""
|
||||
signOff: str = ""
|
||||
footerNote: str = ""
|
||||
fontId: str = "system"
|
||||
recipients: list[EmailStr] = []
|
||||
preview: bool = False
|
||||
previewRecipients: list[EmailStr] = []
|
||||
@@ -0,0 +1,212 @@
|
||||
"""MYOB AccountRight Live integration — create customer contacts.
|
||||
|
||||
Used when the owner ticks "Also create in MYOB" while adding a new client in the
|
||||
control panel. The integration is optional: when the required environment
|
||||
variables are not set, :func:`is_configured` returns ``False`` and the caller
|
||||
skips MYOB entirely (the local client is still created).
|
||||
|
||||
Auth model (MYOB OAuth 2.0):
|
||||
* A developer key/secret (``client_id`` / ``client_secret``) identifies this
|
||||
app to MYOB.
|
||||
* A long-lived refresh token mints short-lived bearer access tokens. We cache
|
||||
the access token in memory and refresh it shortly before it expires.
|
||||
* Each AccountRight company file lives at its own base URI and is gated by a
|
||||
company-file token: ``base64("username:password")`` sent as the
|
||||
``x-myobapi-cftoken`` header (password may be blank).
|
||||
|
||||
All HTTP calls are synchronous (``requests``); the async app invokes the public
|
||||
helpers via ``asyncio.to_thread`` so the event loop is never blocked.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import threading
|
||||
import time
|
||||
|
||||
import requests
|
||||
|
||||
from mail_api.config import (
|
||||
MYOB_API_KEY,
|
||||
MYOB_API_SECRET,
|
||||
MYOB_CF_PASSWORD,
|
||||
MYOB_CF_USERNAME,
|
||||
MYOB_COMPANY_FILE_URI,
|
||||
MYOB_ENABLED,
|
||||
MYOB_HTTP_TIMEOUT_SECONDS,
|
||||
MYOB_REFRESH_TOKEN,
|
||||
MYOB_TOKEN_URL,
|
||||
logger,
|
||||
)
|
||||
|
||||
|
||||
class MyobError(Exception):
|
||||
"""Raised when a MYOB API call cannot be completed."""
|
||||
|
||||
|
||||
# Access tokens are short-lived (MYOB returns ~20 min). Cache the current token
|
||||
# and its expiry so back-to-back client creations reuse a single refresh.
|
||||
_token_lock = threading.Lock()
|
||||
_cached_token: str = ""
|
||||
_cached_token_expires_at: float = 0.0
|
||||
# Refresh a little early so a token never expires mid-request.
|
||||
_TOKEN_EXPIRY_SKEW_SECONDS = 60
|
||||
|
||||
|
||||
def is_configured() -> bool:
|
||||
"""True when every credential needed to talk to MYOB is present."""
|
||||
return MYOB_ENABLED
|
||||
|
||||
|
||||
def _cf_token() -> str:
|
||||
raw = f"{MYOB_CF_USERNAME}:{MYOB_CF_PASSWORD}".encode("utf-8")
|
||||
return base64.b64encode(raw).decode("ascii")
|
||||
|
||||
|
||||
def _refresh_access_token() -> str:
|
||||
"""Exchange the stored refresh token for a fresh access token.
|
||||
|
||||
Caches the result in module state. Raises :class:`MyobError` on failure.
|
||||
"""
|
||||
global _cached_token, _cached_token_expires_at
|
||||
|
||||
try:
|
||||
resp = requests.post(
|
||||
MYOB_TOKEN_URL,
|
||||
data={
|
||||
"client_id": MYOB_API_KEY,
|
||||
"client_secret": MYOB_API_SECRET,
|
||||
"grant_type": "refresh_token",
|
||||
"refresh_token": MYOB_REFRESH_TOKEN,
|
||||
},
|
||||
headers={"Content-Type": "application/x-www-form-urlencoded"},
|
||||
timeout=MYOB_HTTP_TIMEOUT_SECONDS,
|
||||
)
|
||||
except requests.RequestException as exc:
|
||||
raise MyobError(f"Could not reach the MYOB token service: {exc}") from exc
|
||||
|
||||
if resp.status_code != 200:
|
||||
raise MyobError(
|
||||
f"MYOB token refresh failed (HTTP {resp.status_code}). "
|
||||
"Check MYOB_API_KEY / MYOB_API_SECRET / MYOB_REFRESH_TOKEN."
|
||||
)
|
||||
|
||||
try:
|
||||
payload = resp.json()
|
||||
except ValueError as exc:
|
||||
raise MyobError("MYOB token service returned an unreadable response.") from exc
|
||||
|
||||
token = str(payload.get("access_token") or "").strip()
|
||||
if not token:
|
||||
raise MyobError("MYOB token service did not return an access token.")
|
||||
|
||||
try:
|
||||
expires_in = int(payload.get("expires_in", 1200))
|
||||
except (TypeError, ValueError):
|
||||
expires_in = 1200
|
||||
|
||||
_cached_token = token
|
||||
_cached_token_expires_at = time.monotonic() + max(0, expires_in - _TOKEN_EXPIRY_SKEW_SECONDS)
|
||||
logger.info("MYOB: access token refreshed (valid ~%ds)", expires_in)
|
||||
return token
|
||||
|
||||
|
||||
def _access_token() -> str:
|
||||
with _token_lock:
|
||||
if _cached_token and time.monotonic() < _cached_token_expires_at:
|
||||
return _cached_token
|
||||
return _refresh_access_token()
|
||||
|
||||
|
||||
def _api_headers() -> dict[str, str]:
|
||||
return {
|
||||
"Authorization": f"Bearer {_access_token()}",
|
||||
"x-myobapi-key": MYOB_API_KEY,
|
||||
"x-myobapi-version": "v2",
|
||||
"x-myobapi-cftoken": _cf_token(),
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
}
|
||||
|
||||
|
||||
def _split_name(full_name: str) -> tuple[str, str]:
|
||||
"""Best-effort split of a single owner name into first/last for MYOB."""
|
||||
parts = full_name.split()
|
||||
if not parts:
|
||||
return ("", "")
|
||||
if len(parts) == 1:
|
||||
return (parts[0], "")
|
||||
return (parts[0], " ".join(parts[1:]))
|
||||
|
||||
|
||||
def create_customer(
|
||||
*,
|
||||
email: str,
|
||||
full_name: str,
|
||||
phone: str = "",
|
||||
street: str = "",
|
||||
source: str = "",
|
||||
) -> dict[str, str]:
|
||||
"""Create an individual customer contact in MYOB.
|
||||
|
||||
Returns ``{"uid": ..., "uri": ...}`` parsed from the ``Location`` header MYOB
|
||||
returns on a successful create. Raises :class:`MyobError` on any failure so
|
||||
the caller can record it without aborting the local client creation.
|
||||
"""
|
||||
if not is_configured():
|
||||
raise MyobError("MYOB integration is not configured.")
|
||||
|
||||
first_name, last_name = _split_name(full_name)
|
||||
body = {
|
||||
"IsIndividual": True,
|
||||
"FirstName": first_name,
|
||||
"LastName": last_name,
|
||||
"IsActive": True,
|
||||
"Addresses": [
|
||||
{
|
||||
"Location": 1,
|
||||
"Email": email,
|
||||
"Phone1": phone,
|
||||
"Street": street,
|
||||
}
|
||||
],
|
||||
}
|
||||
if source:
|
||||
body["Notes"] = f"Added via Goodwalk control panel — source: {source}"
|
||||
|
||||
url = f"{MYOB_COMPANY_FILE_URI}/Contact/Customer"
|
||||
try:
|
||||
resp = requests.post(
|
||||
url,
|
||||
json=body,
|
||||
headers=_api_headers(),
|
||||
timeout=MYOB_HTTP_TIMEOUT_SECONDS,
|
||||
)
|
||||
except requests.RequestException as exc:
|
||||
raise MyobError(f"Could not reach MYOB: {exc}") from exc
|
||||
|
||||
# 200/201 both indicate success depending on API version; MYOB returns the
|
||||
# new record's URI in the Location header.
|
||||
if resp.status_code not in (200, 201):
|
||||
detail = _error_detail(resp)
|
||||
raise MyobError(f"MYOB rejected the customer (HTTP {resp.status_code}): {detail}")
|
||||
|
||||
location = resp.headers.get("Location", "")
|
||||
uid = location.rstrip("/").rsplit("/", 1)[-1] if location else ""
|
||||
logger.info("MYOB: created customer uid=%s for %s", uid or "?", email)
|
||||
return {"uid": uid, "uri": location}
|
||||
|
||||
|
||||
def _error_detail(resp: requests.Response) -> str:
|
||||
"""Extract a human-readable error message from a MYOB error response."""
|
||||
try:
|
||||
data = resp.json()
|
||||
except ValueError:
|
||||
return (resp.text or "").strip()[:300] or "no detail provided"
|
||||
errors = data.get("Errors") if isinstance(data, dict) else None
|
||||
if isinstance(errors, list) and errors:
|
||||
messages = [str(e.get("Message", "")).strip() for e in errors if isinstance(e, dict)]
|
||||
joined = "; ".join(m for m in messages if m)
|
||||
if joined:
|
||||
return joined
|
||||
return str(data)[:300]
|
||||
@@ -2,3 +2,6 @@ fastapi>=0.115
|
||||
uvicorn[standard]>=0.32
|
||||
resend>=2.0
|
||||
pydantic[email]>=2.10
|
||||
asyncpg>=0.30
|
||||
weasyprint>=63
|
||||
requests>=2.32
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
$ErrorActionPreference = 'Stop'
|
||||
|
||||
Set-Location $PSScriptRoot
|
||||
|
||||
$env:DEV_MODE = '1'
|
||||
if (-not $env:OWNER_EMAIL) {
|
||||
$env:OWNER_EMAIL = 'info@goodwalk.co.nz'
|
||||
}
|
||||
|
||||
$python = Join-Path $PSScriptRoot '.venv\Scripts\python.exe'
|
||||
if (-not (Test-Path $python)) {
|
||||
throw "Missing virtualenv interpreter at $python. Create it first with: py -3.14 -m venv .venv"
|
||||
}
|
||||
|
||||
& $python -m uvicorn main:app --host 127.0.0.1 --port 8000 --reload
|
||||
@@ -16,7 +16,7 @@ server {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name onboarding.goodwalk.co.nz;
|
||||
server_name clients.goodwalk.co.nz onboarding.goodwalk.co.nz;
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
@@ -24,7 +24,21 @@ server {
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://onboarding.goodwalk.co.nz$request_uri;
|
||||
return 301 https://clients.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name cp.goodwalk.co.nz admin.goodwalk.co.nz;
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://cp.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +70,8 @@ server {
|
||||
add_header X-Frame-Options SAMEORIGIN always;
|
||||
add_header X-Content-Type-Options nosniff always;
|
||||
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||
add_header Permissions-Policy "geolocation=(), microphone=(), camera=(), payment=()" always;
|
||||
client_max_body_size 2m;
|
||||
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
@@ -99,6 +115,16 @@ server {
|
||||
return 404;
|
||||
}
|
||||
|
||||
location = /api/health {
|
||||
access_log off;
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
proxy_pass http://$goodwalk_mail_api/health;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_connect_timeout 2s;
|
||||
proxy_read_timeout 5s;
|
||||
}
|
||||
|
||||
location /api/submit {
|
||||
if (-f /etc/nginx/conf.d/maintenance.flag) {
|
||||
return 503;
|
||||
@@ -138,6 +164,16 @@ server {
|
||||
ssl_certificate /etc/letsencrypt/live/onboarding.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/onboarding.goodwalk.co.nz/privkey.pem;
|
||||
|
||||
return 301 https://clients.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name clients.goodwalk.co.nz;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/clients.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/clients.goodwalk.co.nz/privkey.pem;
|
||||
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384;
|
||||
ssl_prefer_server_ciphers off;
|
||||
@@ -149,6 +185,8 @@ server {
|
||||
add_header X-Frame-Options SAMEORIGIN always;
|
||||
add_header X-Content-Type-Options nosniff always;
|
||||
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||
add_header Permissions-Policy "geolocation=(), microphone=(), camera=(), payment=()" always;
|
||||
client_max_body_size 2m;
|
||||
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
@@ -162,6 +200,16 @@ server {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location = /api/health {
|
||||
access_log off;
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
proxy_pass http://$goodwalk_mail_api/health;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_connect_timeout 2s;
|
||||
proxy_read_timeout 5s;
|
||||
}
|
||||
|
||||
location /api/onboarding-submit {
|
||||
if (-f /etc/nginx/conf.d/maintenance.flag) {
|
||||
return 503;
|
||||
@@ -177,6 +225,21 @@ server {
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /api/contract-submit {
|
||||
if (-f /etc/nginx/conf.d/maintenance.flag) {
|
||||
return 503;
|
||||
}
|
||||
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
limit_req zone=goodwalk_limit burst=10 nodelay;
|
||||
proxy_pass http://$goodwalk_mail_api/contract-submit;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /api/auth/ {
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
limit_req zone=goodwalk_limit burst=10 nodelay;
|
||||
@@ -205,3 +268,86 @@ server {
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name cp.goodwalk.co.nz;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/cp.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/cp.goodwalk.co.nz/privkey.pem;
|
||||
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384;
|
||||
ssl_prefer_server_ciphers off;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
ssl_session_timeout 1d;
|
||||
ssl_session_tickets off;
|
||||
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
|
||||
add_header X-Frame-Options DENY always;
|
||||
add_header X-Content-Type-Options nosniff always;
|
||||
add_header Referrer-Policy "no-referrer" always;
|
||||
add_header Permissions-Policy "geolocation=(), microphone=(), camera=(), payment=()" always;
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
client_max_body_size 2m;
|
||||
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
gzip_proxied any;
|
||||
gzip_comp_level 6;
|
||||
gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss image/svg+xml;
|
||||
|
||||
resolver 127.0.0.11 ipv6=off valid=30s;
|
||||
|
||||
location ~* /\.(git|env|htaccess) {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location = /api/health {
|
||||
access_log off;
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
proxy_pass http://$goodwalk_mail_api/health;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_connect_timeout 2s;
|
||||
proxy_read_timeout 5s;
|
||||
}
|
||||
|
||||
# Auth endpoints proxied to mail-api (verify / login / logout).
|
||||
location /api/auth/ {
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
limit_req zone=goodwalk_limit burst=10 nodelay;
|
||||
rewrite ^/api/auth/(.*)$ /auth/$1 break;
|
||||
proxy_pass http://$goodwalk_mail_api;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
# All /api/owner/* endpoints proxied to mail-api.
|
||||
location /api/owner/ {
|
||||
set $goodwalk_mail_api goodwalk_svelte_mail_api:8000;
|
||||
limit_req zone=goodwalk_limit burst=20 nodelay;
|
||||
rewrite ^/api/owner/(.*)$ /owner/$1 break;
|
||||
proxy_pass http://$goodwalk_mail_api;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
set $goodwalk_frontend goodwalk_svelte_app:3000;
|
||||
proxy_pass http://$goodwalk_frontend;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,14 +4,19 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="robots" content="noindex" />
|
||||
<title>Be right back | Goodwalk</title>
|
||||
<title>Back soon | Goodwalk</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Readex+Pro:wght@400;500&family=Unbounded:wght@700;800&display=swap"
|
||||
rel="stylesheet"
|
||||
/>
|
||||
<style>
|
||||
:root {
|
||||
--green: #213021;
|
||||
--green-soft: #2c3f2c;
|
||||
--yellow: #ffd100;
|
||||
--ink: #1a1a1a;
|
||||
--muted: #4c5056;
|
||||
--off-white: #f8f7f2;
|
||||
--line: rgba(255, 255, 255, 0.16);
|
||||
}
|
||||
|
||||
* {
|
||||
@@ -21,166 +26,83 @@
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||
color: var(--ink);
|
||||
background:
|
||||
radial-gradient(circle at top left, rgba(255, 209, 0, 0.12), transparent 55%),
|
||||
radial-gradient(circle at bottom right, rgba(255, 209, 0, 0.08), transparent 60%),
|
||||
var(--green);
|
||||
min-height: 100vh;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
padding: 32px;
|
||||
line-height: 1.5;
|
||||
padding: 24px;
|
||||
background: var(--green);
|
||||
color: var(--off-white);
|
||||
font-family: "Readex Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.stage {
|
||||
width: 100%;
|
||||
max-width: 560px;
|
||||
}
|
||||
|
||||
.brand-bar {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-bottom: 28px;
|
||||
}
|
||||
|
||||
.brand-bar img {
|
||||
display: block;
|
||||
height: 44px;
|
||||
width: auto;
|
||||
max-width: 100%;
|
||||
filter: brightness(0) invert(1);
|
||||
}
|
||||
|
||||
.card {
|
||||
position: relative;
|
||||
background: #fff;
|
||||
border-radius: 28px;
|
||||
padding: 44px 40px 38px;
|
||||
box-shadow: 0 24px 60px rgba(0, 0, 0, 0.25);
|
||||
main {
|
||||
width: min(100%, 30rem);
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.card::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: 0 0 auto 0;
|
||||
height: 6px;
|
||||
background: var(--yellow);
|
||||
}
|
||||
|
||||
.paw {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 64px;
|
||||
height: 64px;
|
||||
margin: 4px auto 18px;
|
||||
border-radius: 50%;
|
||||
background: rgba(33, 48, 33, 0.08);
|
||||
color: var(--green);
|
||||
}
|
||||
|
||||
.paw svg {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
.eyebrow {
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.18em;
|
||||
text-transform: uppercase;
|
||||
color: var(--green);
|
||||
margin: 0 0 10px;
|
||||
.logo {
|
||||
height: 36px;
|
||||
width: auto;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0 0 14px;
|
||||
font-size: clamp(28px, 4vw, 38px);
|
||||
margin: 0 0 16px;
|
||||
font-family: "Unbounded", sans-serif;
|
||||
font-size: clamp(1.6rem, 5vw, 2.1rem);
|
||||
font-weight: 800;
|
||||
line-height: 1.1;
|
||||
letter-spacing: -0.02em;
|
||||
color: var(--ink);
|
||||
letter-spacing: -0.03em;
|
||||
color: var(--off-white);
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0 0 12px;
|
||||
color: var(--muted);
|
||||
font-size: 16px;
|
||||
margin: 0 auto;
|
||||
max-width: 26rem;
|
||||
color: rgba(248, 247, 242, 0.82);
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.meta {
|
||||
margin-top: 24px;
|
||||
padding-top: 22px;
|
||||
border-top: 1px solid rgba(17, 20, 24, 0.08);
|
||||
font-size: 14px;
|
||||
color: var(--muted);
|
||||
.contact {
|
||||
margin-top: 32px;
|
||||
padding-top: 28px;
|
||||
border-top: 1px solid var(--line);
|
||||
font-size: 0.95rem;
|
||||
color: rgba(248, 247, 242, 0.7);
|
||||
}
|
||||
|
||||
.meta a {
|
||||
color: var(--green);
|
||||
font-weight: 700;
|
||||
.contact a {
|
||||
color: var(--yellow);
|
||||
font-weight: 500;
|
||||
text-decoration: none;
|
||||
border-bottom: 1px solid rgba(255, 209, 0, 0.4);
|
||||
padding-bottom: 1px;
|
||||
}
|
||||
|
||||
.meta a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.footnote {
|
||||
margin-top: 22px;
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
color: rgba(255, 255, 255, 0.7);
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
.card {
|
||||
padding: 36px 24px 28px;
|
||||
border-radius: 22px;
|
||||
}
|
||||
|
||||
.brand-bar img {
|
||||
height: 36px;
|
||||
}
|
||||
.contact a:hover {
|
||||
border-bottom-color: var(--yellow);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="stage">
|
||||
<div class="brand-bar">
|
||||
<img src="/m/logo.png" alt="Goodwalk" width="241" height="48" />
|
||||
</div>
|
||||
|
||||
<main class="card" role="main">
|
||||
<span class="paw" aria-hidden="true">
|
||||
<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.5 10.5c1.1 0 2-1.3 2-3s-.9-3-2-3-2 1.3-2 3 .9 3 2 3Zm9 0c1.1 0 2-1.3 2-3s-.9-3-2-3-2 1.3-2 3 .9 3 2 3ZM4 13.5c1 0 1.8-1.1 1.8-2.5S5 8.5 4 8.5s-1.8 1.1-1.8 2.5S3 13.5 4 13.5Zm16 0c1 0 1.8-1.1 1.8-2.5S21 8.5 20 8.5s-1.8 1.1-1.8 2.5.8 2.5 1.8 2.5ZM12 13.5c-3.3 0-6 2.5-6 5.4 0 1.4 1.1 2.6 2.5 2.6 1 0 1.5-.4 2.2-.8.4-.2.8-.4 1.3-.4s.9.2 1.3.4c.7.4 1.2.8 2.2.8 1.4 0 2.5-1.2 2.5-2.6 0-2.9-2.7-5.4-6-5.4Z"/>
|
||||
</svg>
|
||||
</span>
|
||||
|
||||
<p class="eyebrow">Goodwalk</p>
|
||||
<h1>Be right back!</h1>
|
||||
<p>We're updating the site — should only take a minute. Thanks for your patience.</p>
|
||||
|
||||
<div class="meta">
|
||||
Need us now? Email <a href="mailto:info@goodwalk.co.nz">info@goodwalk.co.nz</a>
|
||||
or call <a href="tel:+64226421011">(022) 642 1011</a>.
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<p class="footnote">Auckland Central dog walking · Tiny Gang pack walks · 1:1 walks · Puppy visits</p>
|
||||
</div>
|
||||
<main>
|
||||
<img class="logo" src="/m/logo.png" alt="Goodwalk" width="241" height="48" />
|
||||
<h1>Back on the lead shortly</h1>
|
||||
<p>
|
||||
We’re making a few quick updates. The site will be back to normal in a moment — thanks for your patience.
|
||||
</p>
|
||||
<p class="contact">
|
||||
Need us now? Email
|
||||
<a href="mailto:info@goodwalk.co.nz">info@goodwalk.co.nz</a>
|
||||
or call <a href="tel:+64226421011">(022) 642 1011</a>.
|
||||
</p>
|
||||
</main>
|
||||
|
||||
<script>
|
||||
// Auto-recheck once a minute so visitors don't sit on this page forever.
|
||||
setTimeout(function () {
|
||||
window.location.reload();
|
||||
}, 60000);
|
||||
|
||||
@@ -14,14 +14,27 @@ server {
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name onboarding.goodwalk.co.nz;
|
||||
server_name clients.goodwalk.co.nz onboarding.goodwalk.co.nz;
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
return 301 https://clients.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name cp.goodwalk.co.nz admin.goodwalk.co.nz;
|
||||
|
||||
location /.well-known/acme-challenge/ {
|
||||
root /var/www/certbot;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://cp.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,6 +85,18 @@ server {
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
return 301 https://clients.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name clients.goodwalk.co.nz;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/clients.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/clients.goodwalk.co.nz/privkey.pem;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
|
||||
add_header X-Frame-Options SAMEORIGIN always;
|
||||
add_header X-Content-Type-Options nosniff always;
|
||||
@@ -89,6 +114,78 @@ server {
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /api/auth/ {
|
||||
rewrite ^/api/auth/(.*)$ /auth/$1 break;
|
||||
proxy_pass http://mail-api:8000;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://app:3000;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name admin.goodwalk.co.nz;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/admin.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/admin.goodwalk.co.nz/privkey.pem;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
return 301 https://cp.goodwalk.co.nz$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name cp.goodwalk.co.nz;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/cp.goodwalk.co.nz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/cp.goodwalk.co.nz/privkey.pem;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
|
||||
add_header X-Frame-Options DENY always;
|
||||
add_header X-Content-Type-Options nosniff always;
|
||||
add_header Referrer-Policy no-referrer always;
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
|
||||
gzip on;
|
||||
gzip_types text/plain text/css application/javascript application/json image/svg+xml;
|
||||
|
||||
location /api/auth/ {
|
||||
rewrite ^/api/auth/(.*)$ /auth/$1 break;
|
||||
proxy_pass http://mail-api:8000;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /api/owner/ {
|
||||
rewrite ^/api/owner/(.*)$ /owner/$1 break;
|
||||
proxy_pass http://mail-api:8000;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://app:3000;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "goodwalk-svelte-port",
|
||||
"version": "4.2.3",
|
||||
"name": "gw-svelte",
|
||||
"version": "4.0.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "goodwalk-svelte-port",
|
||||
"version": "4.2.3",
|
||||
"name": "gw-svelte",
|
||||
"version": "4.0.1",
|
||||
"dependencies": {
|
||||
"canvas-confetti": "^1.9.4",
|
||||
"pg": "^8.13.1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "goodwalk-svelte-port",
|
||||
"version": "4.2.3",
|
||||
"name": "gw-svelte",
|
||||
"version": "4.0.5",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -0,0 +1,234 @@
|
||||
#!/usr/bin/env node
|
||||
// Builds mail-api/legacy-clients-seed.json from the three cleaned legacy JSON
|
||||
// files. The seed file is shipped into the mail-api Docker image and merged
|
||||
// into _client_profiles on first boot — never overwriting a live entry.
|
||||
//
|
||||
// Inputs:
|
||||
// data/legacy-clients.json
|
||||
// data/legacy-onboarding.json
|
||||
// data/legacy-contracts.json
|
||||
//
|
||||
// Output:
|
||||
// mail-api/legacy-clients-seed.json (email -> profile dict)
|
||||
//
|
||||
// The output shape mirrors the live _client_profiles entries that the mail-api
|
||||
// already serializes to JSON, so the merge path doesn't need to translate
|
||||
// anything.
|
||||
|
||||
import { readFileSync, writeFileSync, existsSync } from 'node:fs';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = resolve(__dirname, '..');
|
||||
const CLIENTS_FILE = resolve(ROOT, 'data/legacy-clients.json');
|
||||
const ONBOARDING_FILE = resolve(ROOT, 'data/legacy-onboarding.json');
|
||||
const CONTRACTS_FILE = resolve(ROOT, 'data/legacy-contracts.json');
|
||||
const OUTPUT = resolve(ROOT, 'mail-api/legacy-clients-seed.json');
|
||||
|
||||
for (const p of [CLIENTS_FILE, ONBOARDING_FILE, CONTRACTS_FILE]) {
|
||||
if (!existsSync(p)) {
|
||||
console.error(`Required legacy file missing: ${p}`);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
const clientsDoc = JSON.parse(readFileSync(CLIENTS_FILE, 'utf8'));
|
||||
const onboardingDoc = JSON.parse(readFileSync(ONBOARDING_FILE, 'utf8'));
|
||||
const contractsDoc = JSON.parse(readFileSync(CONTRACTS_FILE, 'utf8'));
|
||||
|
||||
const onboardingByEntryId = new Map();
|
||||
for (const rec of onboardingDoc.records ?? []) {
|
||||
if (rec?.legacy?.entryId) onboardingByEntryId.set(String(rec.legacy.entryId), rec);
|
||||
}
|
||||
|
||||
const contractsByEntryId = new Map();
|
||||
for (const rec of contractsDoc.records ?? []) {
|
||||
if (rec?.legacy?.entryId) contractsByEntryId.set(String(rec.legacy.entryId), rec);
|
||||
}
|
||||
|
||||
const importedAt = new Date().toISOString();
|
||||
|
||||
function pickOnboarding(client) {
|
||||
// Take the latest onboarding entry referenced for this client. Entry IDs
|
||||
// are numeric — higher == newer.
|
||||
const ids = (client.onboardingEntryIds ?? [])
|
||||
.map((id) => String(id))
|
||||
.filter((id) => onboardingByEntryId.has(id))
|
||||
.sort((a, b) => Number(b) - Number(a));
|
||||
return ids.length ? onboardingByEntryId.get(ids[0]) : null;
|
||||
}
|
||||
|
||||
function pickContract(client) {
|
||||
const ids = (client.contractEntryIds ?? [])
|
||||
.map((id) => String(id))
|
||||
.filter((id) => contractsByEntryId.has(id))
|
||||
.sort((a, b) => Number(b) - Number(a));
|
||||
return ids.length ? contractsByEntryId.get(ids[0]) : null;
|
||||
}
|
||||
|
||||
function nonEmpty(v) {
|
||||
return typeof v === 'string' ? v.trim() : v;
|
||||
}
|
||||
|
||||
function fullName(client) {
|
||||
const parts = [client.firstName, client.lastName].map(nonEmpty).filter(Boolean);
|
||||
return parts.join(' ');
|
||||
}
|
||||
|
||||
function buildProfile(client) {
|
||||
const onboarding = pickOnboarding(client);
|
||||
const contract = pickContract(client);
|
||||
|
||||
const dog = (client.dogs || [])[0] || {};
|
||||
const dogName = dog.name || onboarding?.dog?.name || '';
|
||||
const dogBreed = dog.breed || onboarding?.dog?.breed || '';
|
||||
const dogDob = dog.dateOfBirth || onboarding?.dog?.dateOfBirth || '';
|
||||
|
||||
// Pick a submittedAt timestamp from the best signal we have.
|
||||
const submittedAt =
|
||||
onboarding?.declaration?.signedOn ||
|
||||
onboarding?.legacy?.entryDate ||
|
||||
contract?.consent?.signedOn ||
|
||||
contract?.legacy?.entryDate ||
|
||||
'';
|
||||
|
||||
// Build the snapshot the admin dashboard expects when viewing a completed
|
||||
// client. The shape matches what OnboardingPage.svelte writes today:
|
||||
// { submittedAt, sections: [{ title, icon, fields: [{label, value}] }] }.
|
||||
const sections = [];
|
||||
if (onboarding) {
|
||||
const yn = (v) => (v === true ? 'Yes' : v === false ? 'No' : '—');
|
||||
const fv = (v) => (typeof v === 'string' && v.trim()) ? v.trim() : '—';
|
||||
sections.push({
|
||||
title: 'Owner Details',
|
||||
icon: 'fas fa-user',
|
||||
fields: [
|
||||
{ label: 'Owner First Name', value: fv(onboarding.owner?.firstName) },
|
||||
{ label: 'Owner Surname', value: fv(onboarding.owner?.lastName) },
|
||||
{ label: 'Email', value: fv(client.email) },
|
||||
{ label: 'Contact Number', value: fv(client.phoneRaw || client.phone) },
|
||||
{ label: 'Home Address', value: fv(client.address) },
|
||||
],
|
||||
});
|
||||
sections.push({
|
||||
title: 'Dog Details',
|
||||
icon: 'fas fa-paw',
|
||||
fields: [
|
||||
{ label: 'Dog Name', value: fv(onboarding.dog?.name) },
|
||||
{ label: 'Dog Surname', value: fv(onboarding.dog?.surname) },
|
||||
{ label: 'Breed', value: fv(onboarding.dog?.breed) },
|
||||
{ label: 'Date of Birth', value: fv(onboarding.dog?.dateOfBirth) },
|
||||
],
|
||||
});
|
||||
sections.push({
|
||||
title: 'Vet & Emergency',
|
||||
icon: 'fas fa-heart-pulse',
|
||||
fields: [
|
||||
{ label: 'Vet Name', value: fv(onboarding.vet?.name) },
|
||||
{ label: 'Vet Address', value: fv(onboarding.vet?.address) },
|
||||
{ label: 'Vet Phone', value: fv(onboarding.vet?.phoneRaw || onboarding.vet?.phone) },
|
||||
{ label: 'Emergency Contact Name', value: fv(onboarding.emergencyContact?.name) },
|
||||
{ label: 'Emergency Contact Phone', value: fv(onboarding.emergencyContact?.phoneRaw || onboarding.emergencyContact?.phone) },
|
||||
],
|
||||
});
|
||||
sections.push({
|
||||
title: 'Health',
|
||||
icon: 'fas fa-stethoscope',
|
||||
fields: [
|
||||
{ label: 'Vaccinations current?', value: yn(onboarding.health?.vaccinated) },
|
||||
{ label: 'Food allergies', value: onboarding.health?.foodAllergy?.present ? fv(onboarding.health.foodAllergy.detail) : yn(onboarding.health?.foodAllergy?.present) },
|
||||
{ label: 'Environmental allergies', value: onboarding.health?.environmentalAllergy?.present ? fv(onboarding.health.environmentalAllergy.detail) : yn(onboarding.health?.environmentalAllergy?.present) },
|
||||
{ label: 'Special diet', value: onboarding.health?.specialDiet?.present ? fv(onboarding.health.specialDiet.detail) : yn(onboarding.health?.specialDiet?.present) },
|
||||
{ label: 'Medication', value: onboarding.health?.medication?.present ? fv(onboarding.health.medication.detail) : yn(onboarding.health?.medication?.present) },
|
||||
],
|
||||
});
|
||||
sections.push({
|
||||
title: 'Behaviour',
|
||||
icon: 'fas fa-bone',
|
||||
fields: [
|
||||
{ label: 'Well socialised?', value: yn(onboarding.behaviour?.wellSocialised) },
|
||||
{ label: 'Dogs interacted with weekly', value: fv(onboarding.behaviour?.dogsInteractedWeekly) },
|
||||
{ label: 'Beach notes', value: fv(onboarding.behaviour?.beachNotes) },
|
||||
{ label: 'Dog park notes', value: fv(onboarding.behaviour?.dogParkNotes) },
|
||||
{ label: 'Bite history?', value: yn(onboarding.behaviour?.biteHistory) },
|
||||
{ label: 'Reactive to dogs?', value: yn(onboarding.behaviour?.reactiveToDogs) },
|
||||
{ label: 'Reactive to animals?', value: onboarding.behaviour?.reactiveToAnimals?.reactive ? fv(onboarding.behaviour.reactiveToAnimals.detail) : yn(onboarding.behaviour?.reactiveToAnimals?.reactive) },
|
||||
{ label: 'Reactive to children?', value: yn(onboarding.behaviour?.reactiveToChildren) },
|
||||
{ label: 'Reactive to people?', value: yn(onboarding.behaviour?.reactiveToPeople) },
|
||||
{ label: 'Desexed?', value: yn(onboarding.behaviour?.desexed) },
|
||||
{ label: 'Council registered?', value: yn(onboarding.behaviour?.councilRegistered) },
|
||||
{ label: 'Leash trained?', value: yn(onboarding.behaviour?.leashTrained) },
|
||||
{ label: 'Recall rating', value: onboarding.behaviour?.recallRating != null ? String(onboarding.behaviour.recallRating) : '—' },
|
||||
{ label: 'Ever run away?', value: yn(onboarding.behaviour?.ranAwayBefore) },
|
||||
{ label: 'Behaviour in car', value: fv(onboarding.behaviour?.carBehaviour) },
|
||||
{ label: 'Known commands', value: fv(onboarding.behaviour?.knownCommands) },
|
||||
],
|
||||
});
|
||||
sections.push({
|
||||
title: 'Other',
|
||||
icon: 'fas fa-file-signature',
|
||||
fields: [
|
||||
{ label: 'Additional notes', value: fv(onboarding.misc?.additionalNotes) },
|
||||
{ label: 'Social media', value: fv(onboarding.misc?.socialMediaAccount) },
|
||||
{ label: 'How did you hear?', value: fv(onboarding.misc?.howDidYouHear) },
|
||||
{ label: 'Referred by', value: fv(onboarding.misc?.referredBy) },
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
const profile = {
|
||||
fullName: fullName(client),
|
||||
phone: client.phone || '',
|
||||
address: client.address || '',
|
||||
dogName: dogName || '',
|
||||
dogBreed: dogBreed || '',
|
||||
dogAge: dogDob || '',
|
||||
onboardingCompleted: Boolean(onboarding),
|
||||
onboardingSubmittedAt: submittedAt || '',
|
||||
onboardingSubmission: sections.length ? { submittedAt: submittedAt || '', sections } : undefined,
|
||||
// Mark legacy imports as archived by default — they pre-date the new
|
||||
// system and shouldn't pollute "active" outreach lists. The admin can
|
||||
// promote any of them back to 'active' from the dashboard.
|
||||
lifecycle: {
|
||||
status: 'archived',
|
||||
reason: 'Imported from legacy Gravity Forms data',
|
||||
changedAt: importedAt,
|
||||
changedBy: 'legacy-import',
|
||||
},
|
||||
// Provenance so we can always trace what came from the migration.
|
||||
legacy: {
|
||||
source: 'gravity-forms-csv',
|
||||
importedAt,
|
||||
onboardingEntryIds: client.onboardingEntryIds ?? [],
|
||||
contractEntryIds: client.contractEntryIds ?? [],
|
||||
onboardingPdfUrl: onboarding?.legacy?.pdfUrl ?? null,
|
||||
contractPdfUrl: contract?.legacy?.pdfUrl ?? null,
|
||||
signatureUrl: onboarding?.declaration?.signatureUrl ?? contract?.legacy?.signatureUrl ?? null,
|
||||
},
|
||||
};
|
||||
|
||||
// Drop any keys that are empty strings so the mail-api merge path doesn't
|
||||
// store noisy blanks.
|
||||
for (const k of Object.keys(profile)) {
|
||||
if (profile[k] === '' || profile[k] === undefined) delete profile[k];
|
||||
}
|
||||
return profile;
|
||||
}
|
||||
|
||||
const out = {};
|
||||
let written = 0;
|
||||
for (const client of clientsDoc.clients ?? []) {
|
||||
const email = String(client.email || '').trim().toLowerCase();
|
||||
if (!email) continue;
|
||||
out[email] = buildProfile(client);
|
||||
written++;
|
||||
}
|
||||
|
||||
writeFileSync(OUTPUT, JSON.stringify(out, null, 2) + '\n', 'utf8');
|
||||
console.log(JSON.stringify({
|
||||
ok: true,
|
||||
emails: written,
|
||||
outputPath: OUTPUT,
|
||||
note: 'Ship this file in the mail-api Docker image. Merged on boot — never overwrites live entries.',
|
||||
}, null, 2));
|
||||
@@ -0,0 +1,360 @@
|
||||
#!/usr/bin/env node
|
||||
// Cleans the legacy Gravity Forms contract CSV into structured JSON, then
|
||||
// enriches data/legacy-onboarding.json with the owner email + postal address
|
||||
// (and missing phone) wherever an onboarding row matches a contract row.
|
||||
//
|
||||
// Input:
|
||||
// goodwalk-contract-2026-05-20.csv (repo root)
|
||||
// data/legacy-onboarding.json (produced by clean-legacy-onboarding.mjs)
|
||||
//
|
||||
// Output:
|
||||
// data/legacy-contracts.json (cleaned contracts)
|
||||
// data/legacy-onboarding.json (enriched in place)
|
||||
// data/legacy-clients.json (owner-email-keyed merged view)
|
||||
//
|
||||
// Run: node scripts/clean-legacy-contracts.mjs
|
||||
|
||||
import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = resolve(__dirname, '..');
|
||||
const CONTRACT_CSV = resolve(ROOT, 'goodwalk-contract-2026-05-20.csv');
|
||||
const ONBOARDING_JSON = resolve(ROOT, 'data/legacy-onboarding.json');
|
||||
const CONTRACTS_OUT = resolve(ROOT, 'data/legacy-contracts.json');
|
||||
const CLIENTS_OUT = resolve(ROOT, 'data/legacy-clients.json');
|
||||
|
||||
function parseCsv(text) {
|
||||
const rows = [];
|
||||
let cur = [];
|
||||
let val = '';
|
||||
let inQ = false;
|
||||
for (let i = 0; i < text.length; i++) {
|
||||
const c = text[i];
|
||||
if (inQ) {
|
||||
if (c === '"') {
|
||||
if (text[i + 1] === '"') { val += '"'; i++; }
|
||||
else inQ = false;
|
||||
} else val += c;
|
||||
} else {
|
||||
if (c === '"') inQ = true;
|
||||
else if (c === ',') { cur.push(val); val = ''; }
|
||||
else if (c === '\n') { cur.push(val); rows.push(cur); cur = []; val = ''; }
|
||||
else if (c === '\r') { /* skip */ }
|
||||
else val += c;
|
||||
}
|
||||
}
|
||||
if (val.length || cur.length) { cur.push(val); rows.push(cur); }
|
||||
return rows;
|
||||
}
|
||||
|
||||
const trimOrNull = (v) => {
|
||||
const s = (v ?? '').trim();
|
||||
return s ? s : null;
|
||||
};
|
||||
|
||||
const lowerKey = (v) => (v ?? '').trim().toLowerCase().replace(/\s+/g, ' ');
|
||||
|
||||
function normalizePhone(raw) {
|
||||
const original = (raw ?? '').trim();
|
||||
if (!original) return { raw: null, e164: null };
|
||||
let digits = original.replace(/[^\d+]/g, '');
|
||||
if (digits.startsWith('+')) return { raw: original, e164: '+' + digits.slice(1).replace(/\D/g, '') };
|
||||
digits = digits.replace(/\D/g, '');
|
||||
if (!digits) return { raw: original, e164: null };
|
||||
if (digits.startsWith('64')) return { raw: original, e164: '+' + digits };
|
||||
if (digits.startsWith('0')) return { raw: original, e164: '+64' + digits.slice(1) };
|
||||
return { raw: original, e164: null };
|
||||
}
|
||||
|
||||
function composeAddress({ street, line2, city, suburb, postal, country }) {
|
||||
const parts = [street, line2, suburb, city, postal, country]
|
||||
.map((p) => (p ?? '').trim())
|
||||
.filter(Boolean);
|
||||
// De-dupe consecutive identical fragments (suburb sometimes duplicates city).
|
||||
const deduped = [];
|
||||
for (const p of parts) {
|
||||
if (!deduped.length || deduped[deduped.length - 1].toLowerCase() !== p.toLowerCase()) {
|
||||
deduped.push(p);
|
||||
}
|
||||
}
|
||||
return deduped.length ? deduped.join(', ') : null;
|
||||
}
|
||||
|
||||
// -- Parse contract CSV --------------------------------------------------------
|
||||
const raw = readFileSync(CONTRACT_CSV, 'utf8').replace(/^/, '');
|
||||
const rows = parseCsv(raw);
|
||||
const headers = rows[0].map((h) => h.trim());
|
||||
const data = rows.slice(1).filter((r) => r.some((c) => (c ?? '').trim() !== ''));
|
||||
const idx = Object.fromEntries(headers.map((h, i) => [h, i]));
|
||||
const col = (row, name) => row[idx[name]] ?? '';
|
||||
|
||||
const contracts = data.map((row) => {
|
||||
const first = trimOrNull(col(row, 'Owners Name (First Name)'));
|
||||
const middle = trimOrNull(col(row, 'Owners Name (Middle)'));
|
||||
const last = trimOrNull(col(row, 'Owners Name (Last Name/Surname)'));
|
||||
const fullName = [first, middle, last].filter(Boolean).join(' ') || null;
|
||||
const phone = normalizePhone(col(row, 'Phone'));
|
||||
|
||||
return {
|
||||
legacy: {
|
||||
entryId: trimOrNull(col(row, 'Entry Id')),
|
||||
entryDate: trimOrNull(col(row, 'Entry Date')),
|
||||
dateUpdated: trimOrNull(col(row, 'Date Updated')),
|
||||
createdByUserId: trimOrNull(col(row, 'Created By (User Id)')),
|
||||
sourceUrl: trimOrNull(col(row, 'Source Url')),
|
||||
userAgent: trimOrNull(col(row, 'User Agent')),
|
||||
userIp: trimOrNull(col(row, 'User IP')),
|
||||
pdfUrl: trimOrNull(col(row, 'PDF: PDF Label')),
|
||||
signatureUrl: trimOrNull(col(row, 'Owner Signature')),
|
||||
},
|
||||
owner: {
|
||||
firstName: first,
|
||||
middleName: middle,
|
||||
lastName: last,
|
||||
fullName,
|
||||
email: trimOrNull(col(row, "Owner's email (Enter Email)")),
|
||||
phone: phone.e164,
|
||||
phoneRaw: phone.raw,
|
||||
address: composeAddress({
|
||||
street: col(row, 'Residential Address (Street Address)'),
|
||||
line2: col(row, 'Residential Address (Address Line 2)'),
|
||||
city: col(row, 'Residential Address (City)'),
|
||||
suburb: col(row, 'Residential Address (Suburb)'),
|
||||
postal: col(row, 'Residential Address (ZIP / Postal Code)'),
|
||||
country: col(row, 'Residential Address (Country)'),
|
||||
}),
|
||||
addressParts: {
|
||||
street: trimOrNull(col(row, 'Residential Address (Street Address)')),
|
||||
line2: trimOrNull(col(row, 'Residential Address (Address Line 2)')),
|
||||
suburb: trimOrNull(col(row, 'Residential Address (Suburb)')),
|
||||
city: trimOrNull(col(row, 'Residential Address (City)')),
|
||||
postalCode: trimOrNull(col(row, 'Residential Address (ZIP / Postal Code)')),
|
||||
country: trimOrNull(col(row, 'Residential Address (Country)')),
|
||||
},
|
||||
},
|
||||
dog: {
|
||||
fullName: trimOrNull(col(row, "Dog's name (include surname)")),
|
||||
},
|
||||
consent: {
|
||||
checked: (col(row, 'Consent (Consent)') ?? '').trim().toLowerCase() === 'checked',
|
||||
text: trimOrNull(col(row, 'Consent (Text)')),
|
||||
signedOn: trimOrNull(col(row, 'Date contract signed')),
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
// -- Build contract lookup -----------------------------------------------------
|
||||
// Some owners appear twice (re-signing) — keep the highest entryId per key.
|
||||
function keepNewer(map, key, contract) {
|
||||
const existing = map.get(key);
|
||||
if (!existing) { map.set(key, contract); return; }
|
||||
const a = Number(contract.legacy.entryId) || 0;
|
||||
const b = Number(existing.legacy.entryId) || 0;
|
||||
if (a > b) map.set(key, contract);
|
||||
}
|
||||
|
||||
const byNameKey = new Map(); // "last|first"
|
||||
const byLastKey = new Map(); // "last"
|
||||
const byDogKey = new Map(); // dog full name lowercased
|
||||
const byDogFirstWord = new Map(); // first token of dog name (handles surname mismatches)
|
||||
|
||||
for (const c of contracts) {
|
||||
const last = lowerKey(c.owner.lastName);
|
||||
const first = lowerKey(c.owner.firstName);
|
||||
if (last && first) keepNewer(byNameKey, `${last}|${first}`, c);
|
||||
if (last) keepNewer(byLastKey, last, c);
|
||||
if (c.dog.fullName) {
|
||||
keepNewer(byDogKey, lowerKey(c.dog.fullName), c);
|
||||
const firstToken = lowerKey(c.dog.fullName).split(/\s+/)[0];
|
||||
if (firstToken) keepNewer(byDogFirstWord, `${firstToken}|${last}`, c);
|
||||
}
|
||||
}
|
||||
|
||||
// -- Enrich onboarding ---------------------------------------------------------
|
||||
if (!existsSync(ONBOARDING_JSON)) {
|
||||
console.error(`Onboarding JSON not found at ${ONBOARDING_JSON}. Run clean-legacy-onboarding.mjs first.`);
|
||||
process.exit(1);
|
||||
}
|
||||
const onboardingPayload = JSON.parse(readFileSync(ONBOARDING_JSON, 'utf8'));
|
||||
|
||||
let matched = 0;
|
||||
let backfilledEmail = 0;
|
||||
let backfilledAddress = 0;
|
||||
let backfilledPhone = 0;
|
||||
const unmatched = [];
|
||||
|
||||
for (const rec of onboardingPayload.records) {
|
||||
const last = lowerKey(rec.owner.lastName);
|
||||
const first = lowerKey(rec.owner.firstName);
|
||||
const dogFull = lowerKey([rec.dog.name, rec.dog.surname].filter(Boolean).join(' '));
|
||||
const dogFirst = lowerKey(rec.dog.name);
|
||||
|
||||
let match = null;
|
||||
let matchedBy = null;
|
||||
if (last && first && byNameKey.has(`${last}|${first}`)) {
|
||||
match = byNameKey.get(`${last}|${first}`);
|
||||
matchedBy = 'owner_name';
|
||||
} else if (dogFull && byDogKey.has(dogFull)) {
|
||||
match = byDogKey.get(dogFull);
|
||||
matchedBy = 'dog_full_name';
|
||||
} else if (dogFirst && last && byDogFirstWord.has(`${dogFirst}|${last}`)) {
|
||||
match = byDogFirstWord.get(`${dogFirst}|${last}`);
|
||||
matchedBy = 'dog_first_owner_last';
|
||||
} else if (last && byLastKey.has(last)) {
|
||||
// Last-resort: lone surname match. Only accept if surname is unique enough
|
||||
// (i.e. only one contract has it).
|
||||
const candidates = contracts.filter((c) => lowerKey(c.owner.lastName) === last);
|
||||
if (candidates.length === 1) {
|
||||
match = candidates[0];
|
||||
matchedBy = 'owner_last_only';
|
||||
}
|
||||
}
|
||||
|
||||
if (!match) {
|
||||
unmatched.push({
|
||||
onboardingEntryId: rec.legacy.entryId,
|
||||
owner: rec.owner.fullName,
|
||||
dog: [rec.dog.name, rec.dog.surname].filter(Boolean).join(' '),
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
matched++;
|
||||
if (!rec.owner.email && match.owner.email) {
|
||||
rec.owner.email = match.owner.email;
|
||||
backfilledEmail++;
|
||||
}
|
||||
if (!rec.owner.address && match.owner.address) {
|
||||
rec.owner.address = match.owner.address;
|
||||
rec.owner.addressParts = match.owner.addressParts;
|
||||
backfilledAddress++;
|
||||
}
|
||||
if (!rec.owner.phone && match.owner.phone) {
|
||||
rec.owner.phone = match.owner.phone;
|
||||
rec.owner.phoneRaw = match.owner.phoneRaw;
|
||||
backfilledPhone++;
|
||||
}
|
||||
rec.legacy.contractMatch = {
|
||||
entryId: match.legacy.entryId,
|
||||
matchedBy,
|
||||
signedOn: match.consent.signedOn,
|
||||
contractPdfUrl: match.legacy.pdfUrl,
|
||||
};
|
||||
}
|
||||
|
||||
// -- Write outputs -------------------------------------------------------------
|
||||
mkdirSync(dirname(CONTRACTS_OUT), { recursive: true });
|
||||
|
||||
writeFileSync(
|
||||
CONTRACTS_OUT,
|
||||
JSON.stringify({
|
||||
exportedAt: new Date().toISOString(),
|
||||
source: { file: 'goodwalk-contract-2026-05-20.csv', rows: data.length, columns: headers.length },
|
||||
records: contracts,
|
||||
}, null, 2) + '\n',
|
||||
'utf8',
|
||||
);
|
||||
|
||||
onboardingPayload.enrichedAt = new Date().toISOString();
|
||||
onboardingPayload.notes = [
|
||||
...(onboardingPayload.notes ?? []),
|
||||
'Enriched from goodwalk-contract-2026-05-20.csv: owner email + postal address backfilled where a contract row matched.',
|
||||
];
|
||||
writeFileSync(ONBOARDING_JSON, JSON.stringify(onboardingPayload, null, 2) + '\n', 'utf8');
|
||||
|
||||
// -- Build a clients view keyed by email ---------------------------------------
|
||||
// This is the shape that maps most naturally to a Postgres `clients` table.
|
||||
const clientsByEmail = new Map();
|
||||
|
||||
function upsertClient(email, partial) {
|
||||
const key = (email ?? '').toLowerCase().trim();
|
||||
if (!key) return;
|
||||
const existing = clientsByEmail.get(key) ?? {
|
||||
email: key,
|
||||
firstName: null,
|
||||
lastName: null,
|
||||
phone: null,
|
||||
phoneRaw: null,
|
||||
address: null,
|
||||
addressParts: null,
|
||||
dogs: [],
|
||||
onboardingEntryIds: [],
|
||||
contractEntryIds: [],
|
||||
};
|
||||
for (const [k, v] of Object.entries(partial)) {
|
||||
if (v == null) continue;
|
||||
if (k === 'dogs') {
|
||||
for (const dog of v) {
|
||||
if (!existing.dogs.find((d) => (d.name ?? '').toLowerCase() === (dog.name ?? '').toLowerCase())) {
|
||||
existing.dogs.push(dog);
|
||||
}
|
||||
}
|
||||
} else if (k === 'onboardingEntryIds' || k === 'contractEntryIds') {
|
||||
for (const id of v) if (!existing[k].includes(id)) existing[k].push(id);
|
||||
} else if (existing[k] == null) {
|
||||
existing[k] = v;
|
||||
}
|
||||
}
|
||||
clientsByEmail.set(key, existing);
|
||||
}
|
||||
|
||||
for (const c of contracts) {
|
||||
if (!c.owner.email) continue;
|
||||
upsertClient(c.owner.email, {
|
||||
firstName: c.owner.firstName,
|
||||
lastName: c.owner.lastName,
|
||||
phone: c.owner.phone,
|
||||
phoneRaw: c.owner.phoneRaw,
|
||||
address: c.owner.address,
|
||||
addressParts: c.owner.addressParts,
|
||||
dogs: c.dog.fullName ? [{ name: c.dog.fullName, source: 'contract' }] : [],
|
||||
contractEntryIds: c.legacy.entryId ? [c.legacy.entryId] : [],
|
||||
});
|
||||
}
|
||||
|
||||
for (const rec of onboardingPayload.records) {
|
||||
if (!rec.owner.email) continue;
|
||||
const dogName = [rec.dog.name, rec.dog.surname].filter(Boolean).join(' ');
|
||||
upsertClient(rec.owner.email, {
|
||||
firstName: rec.owner.firstName,
|
||||
lastName: rec.owner.lastName,
|
||||
phone: rec.owner.phone,
|
||||
phoneRaw: rec.owner.phoneRaw,
|
||||
address: rec.owner.address,
|
||||
addressParts: rec.owner.addressParts,
|
||||
dogs: dogName ? [{
|
||||
name: dogName,
|
||||
dateOfBirth: rec.dog.dateOfBirth,
|
||||
breed: rec.dog.breed,
|
||||
source: 'onboarding',
|
||||
}] : [],
|
||||
onboardingEntryIds: rec.legacy.entryId ? [rec.legacy.entryId] : [],
|
||||
});
|
||||
}
|
||||
|
||||
writeFileSync(
|
||||
CLIENTS_OUT,
|
||||
JSON.stringify({
|
||||
exportedAt: new Date().toISOString(),
|
||||
note: 'Owner-email-keyed merged view. Maps 1:1 to a Postgres `clients` table; the `dogs` array maps to a `dogs` table with a clients_id FK.',
|
||||
clients: [...clientsByEmail.values()].sort((a, b) => a.email.localeCompare(b.email)),
|
||||
}, null, 2) + '\n',
|
||||
'utf8',
|
||||
);
|
||||
|
||||
// -- Summary -------------------------------------------------------------------
|
||||
console.log(JSON.stringify({
|
||||
contracts: contracts.length,
|
||||
contractsWithEmail: contracts.filter((c) => c.owner.email).length,
|
||||
onboardingRecords: onboardingPayload.records.length,
|
||||
matched,
|
||||
unmatched: unmatched.length,
|
||||
backfilledEmail,
|
||||
backfilledAddress,
|
||||
backfilledPhone,
|
||||
uniqueClientsByEmail: clientsByEmail.size,
|
||||
unmatchedSample: unmatched.slice(0, 10),
|
||||
outputs: { CONTRACTS_OUT, ONBOARDING_JSON, CLIENTS_OUT },
|
||||
}, null, 2));
|
||||
@@ -0,0 +1,269 @@
|
||||
#!/usr/bin/env node
|
||||
// Cleans the legacy Gravity Forms onboarding CSV export into a structured JSON
|
||||
// file ready for later import into Postgres.
|
||||
//
|
||||
// Input: dog-enrolment-form-2026-05-20.csv (repo root)
|
||||
// Output: data/legacy-onboarding.json
|
||||
//
|
||||
// Run: node scripts/clean-legacy-onboarding.mjs
|
||||
|
||||
import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = resolve(__dirname, '..');
|
||||
const INPUT = resolve(ROOT, 'dog-enrolment-form-2026-05-20.csv');
|
||||
const OUTPUT = resolve(ROOT, 'data/legacy-onboarding.json');
|
||||
|
||||
function parseCsv(text) {
|
||||
const rows = [];
|
||||
let cur = [];
|
||||
let val = '';
|
||||
let inQ = false;
|
||||
for (let i = 0; i < text.length; i++) {
|
||||
const c = text[i];
|
||||
if (inQ) {
|
||||
if (c === '"') {
|
||||
if (text[i + 1] === '"') { val += '"'; i++; }
|
||||
else inQ = false;
|
||||
} else val += c;
|
||||
} else {
|
||||
if (c === '"') inQ = true;
|
||||
else if (c === ',') { cur.push(val); val = ''; }
|
||||
else if (c === '\n') { cur.push(val); rows.push(cur); cur = []; val = ''; }
|
||||
else if (c === '\r') { /* skip */ }
|
||||
else val += c;
|
||||
}
|
||||
}
|
||||
if (val.length || cur.length) { cur.push(val); rows.push(cur); }
|
||||
return rows;
|
||||
}
|
||||
|
||||
const trimOrNull = (v) => {
|
||||
const s = (v ?? '').trim();
|
||||
if (!s) return null;
|
||||
if (s.toLowerCase() === 'select') return null;
|
||||
return s;
|
||||
};
|
||||
|
||||
const yesNo = (v) => {
|
||||
const s = (v ?? '').trim().toLowerCase();
|
||||
if (!s || s === 'select') return null;
|
||||
if (s === 'yes') return true;
|
||||
if (s === 'no') return false;
|
||||
return null;
|
||||
};
|
||||
|
||||
// reactive-to-animals style: 'Yes'/'No'/'' or a free-text species ('Cats', 'Birds', 'Other').
|
||||
const reactiveField = (v) => {
|
||||
const s = (v ?? '').trim();
|
||||
if (!s) return { reactive: null, detail: null };
|
||||
const lower = s.toLowerCase();
|
||||
if (lower === 'yes') return { reactive: true, detail: null };
|
||||
if (lower === 'no') return { reactive: false, detail: null };
|
||||
if (lower === 'select') return { reactive: null, detail: null };
|
||||
return { reactive: true, detail: s };
|
||||
};
|
||||
|
||||
const parseFloatOrNull = (v) => {
|
||||
const s = (v ?? '').trim();
|
||||
if (!s) return null;
|
||||
const n = Number(s);
|
||||
return Number.isFinite(n) ? n : null;
|
||||
};
|
||||
|
||||
// Best-effort NZ phone normalisation. Keeps the raw, adds an e164 when we can
|
||||
// confidently produce one. Doesn't try to invent missing data.
|
||||
function normalizePhone(raw) {
|
||||
const original = (raw ?? '').trim();
|
||||
if (!original) return { raw: null, e164: null };
|
||||
let digits = original.replace(/[^\d+]/g, '');
|
||||
if (digits.startsWith('+')) {
|
||||
return { raw: original, e164: '+' + digits.slice(1).replace(/\D/g, '') };
|
||||
}
|
||||
digits = digits.replace(/\D/g, '');
|
||||
if (!digits) return { raw: original, e164: null };
|
||||
if (digits.startsWith('64')) return { raw: original, e164: '+' + digits };
|
||||
if (digits.startsWith('0')) return { raw: original, e164: '+64' + digits.slice(1) };
|
||||
return { raw: original, e164: null };
|
||||
}
|
||||
|
||||
const isoDateOrNull = (v) => {
|
||||
const s = (v ?? '').trim();
|
||||
if (!s) return null;
|
||||
// CSV already uses YYYY-MM-DD or 'YYYY-MM-DD HH:MM:SS'
|
||||
return s;
|
||||
};
|
||||
|
||||
function emailGuess(ownerName, ownerSurname) {
|
||||
// Legacy CSV doesn't include owner email. Leaving null so the Postgres
|
||||
// import treats these as needing email-claim before they can sign in.
|
||||
return null;
|
||||
}
|
||||
|
||||
const raw = readFileSync(INPUT, 'utf8').replace(/^/, '');
|
||||
const rows = parseCsv(raw);
|
||||
const headers = rows[0];
|
||||
const data = rows.slice(1).filter((r) => r.some((cell) => (cell ?? '').trim() !== ''));
|
||||
|
||||
// Column index lookups (defensive in case header order shifts).
|
||||
const idx = Object.fromEntries(headers.map((h, i) => [h.trim(), i]));
|
||||
const col = (row, name) => row[idx[name]] ?? '';
|
||||
|
||||
const records = data.map((row) => {
|
||||
const hasFoodAllergy = yesNo(col(row, 'Does your dog have any food allergies?'));
|
||||
const foodAllergyDetail = trimOrNull(col(row, 'Specify'));
|
||||
// Two columns are labelled 'Specify'. The first is food, then env, then diet,
|
||||
// then medication — pick them by position.
|
||||
const specifyCols = headers
|
||||
.map((h, i) => ({ h, i }))
|
||||
.filter((x) => x.h.trim() === 'Specify')
|
||||
.map((x) => x.i);
|
||||
const [foodSpecifyIdx, envSpecifyIdx, dietSpecifyIdx, medSpecifyIdx] = specifyCols;
|
||||
|
||||
const phone = normalizePhone(col(row, 'Owner Contact'));
|
||||
const emergencyPhone = normalizePhone(col(row, 'Emergency Contact Number'));
|
||||
const vetPhone = normalizePhone(col(row, 'Vet Contact Number'));
|
||||
|
||||
const dogBirth = isoDateOrNull(col(row, "Dog's date of birth"));
|
||||
const signedOn = isoDateOrNull(col(row, 'Date'));
|
||||
const entryDate = isoDateOrNull(col(row, 'Entry Date'));
|
||||
const updatedDate = isoDateOrNull(col(row, 'Date Updated'));
|
||||
|
||||
const ownerFirst = trimOrNull(col(row, 'Owner Name'));
|
||||
const ownerLast = trimOrNull(col(row, 'Owner Surname'));
|
||||
|
||||
return {
|
||||
legacy: {
|
||||
entryId: trimOrNull(col(row, 'Entry Id')),
|
||||
entryDate,
|
||||
dateUpdated: updatedDate,
|
||||
createdByUserId: trimOrNull(col(row, 'Created By (User Id)')),
|
||||
sourceUrl: trimOrNull(col(row, 'Source Url')),
|
||||
signatureUrl: trimOrNull(col(row, 'Signature')),
|
||||
pdfUrl: trimOrNull(col(row, 'PDF: DogOnboardingForm')),
|
||||
userAgent: trimOrNull(col(row, 'User Agent')),
|
||||
userIp: trimOrNull(col(row, 'User IP')),
|
||||
},
|
||||
owner: {
|
||||
firstName: ownerFirst,
|
||||
lastName: ownerLast,
|
||||
fullName: [ownerFirst, ownerLast].filter(Boolean).join(' ') || null,
|
||||
email: emailGuess(ownerFirst, ownerLast),
|
||||
phone: phone.e164,
|
||||
phoneRaw: phone.raw,
|
||||
address: null, // not collected in legacy form
|
||||
},
|
||||
emergencyContact: {
|
||||
name: trimOrNull(col(row, 'Emergency Contact Name')),
|
||||
phone: emergencyPhone.e164,
|
||||
phoneRaw: emergencyPhone.raw,
|
||||
},
|
||||
dog: {
|
||||
name: trimOrNull(col(row, 'Dog Name')),
|
||||
surname: trimOrNull(col(row, 'Dog Surname')),
|
||||
dateOfBirth: dogBirth,
|
||||
breed: null, // not collected in legacy form
|
||||
},
|
||||
vet: {
|
||||
name: trimOrNull(col(row, 'Vet Name')),
|
||||
address: trimOrNull(col(row, 'Vet Address')),
|
||||
phone: vetPhone.e164,
|
||||
phoneRaw: vetPhone.raw,
|
||||
},
|
||||
health: {
|
||||
vaccinated: yesNo(col(row, 'Is your dog vaccinated?')),
|
||||
foodAllergy: {
|
||||
present: hasFoodAllergy,
|
||||
detail: hasFoodAllergy === true ? trimOrNull(row[foodSpecifyIdx]) : null,
|
||||
},
|
||||
environmentalAllergy: (() => {
|
||||
const present = yesNo(col(row, 'Does your dog have any environmental allergy?'));
|
||||
return {
|
||||
present,
|
||||
detail: present === true ? trimOrNull(row[envSpecifyIdx]) : null,
|
||||
};
|
||||
})(),
|
||||
specialDiet: (() => {
|
||||
const present = yesNo(col(row, 'Is your dog on a special diet?'));
|
||||
return {
|
||||
present,
|
||||
detail: present === true ? trimOrNull(row[dietSpecifyIdx]) : null,
|
||||
};
|
||||
})(),
|
||||
medication: (() => {
|
||||
const present = yesNo(col(row, 'Is your dog taking any medication that could put him at risk during a walk'));
|
||||
return {
|
||||
present,
|
||||
detail: present === true ? trimOrNull(row[medSpecifyIdx]) : null,
|
||||
};
|
||||
})(),
|
||||
},
|
||||
behaviour: {
|
||||
wellSocialised: yesNo(col(row, 'Is your dog well socialised?')),
|
||||
dogsInteractedWeekly: trimOrNull(col(row, 'How many dogs does your dog interact with weekly (excluding your family dogs)')),
|
||||
beachNotes: trimOrNull(col(row, 'Does your dog visit the beach?')),
|
||||
dogParkNotes: trimOrNull(col(row, 'Does your dog visit dog parks frequently - How many times a week?')),
|
||||
biteHistory: yesNo(col(row, 'Does your dog have a bite history?')),
|
||||
reactiveToDogs: yesNo(col(row, 'Is your dog reactive to other dogs?')),
|
||||
reactiveToAnimals: reactiveField(col(row, 'Is your dog reactive to other animals?')),
|
||||
reactiveToChildren: yesNo(col(row, 'Is your dog reactive to children?')),
|
||||
reactiveToPeople: yesNo(col(row, 'Is your dog reactive to other people?')),
|
||||
desexed: yesNo(col(row, 'Is your dog desexed?')),
|
||||
councilRegistered: yesNo(col(row, 'Is your dog registered?')),
|
||||
leashTrained: yesNo(col(row, 'Is your dog leash trained?')),
|
||||
recallRating: parseFloatOrNull(col(row, "Rate your dog's recall from 1 to 5, with one being the lowest score and 5 the highest.")),
|
||||
ranAwayBefore: yesNo(col(row, 'Has your dog ran away before?')),
|
||||
carBehaviour: trimOrNull(col(row, "Please describe your dog's behaviour in the car")),
|
||||
knownCommands: trimOrNull(col(row, 'List of commands your dog understands')),
|
||||
},
|
||||
misc: {
|
||||
additionalNotes: trimOrNull(col(row, "Anything else you'd like to let us know?")),
|
||||
socialMediaAccount: trimOrNull(col(row, 'Social Media Account Name')),
|
||||
howDidYouHear: trimOrNull(col(row, 'How did you hear about Goodwalk?')),
|
||||
referredBy: trimOrNull(col(row, "Person's name who reffered Goodwalk to you")),
|
||||
},
|
||||
declaration: {
|
||||
signedOn,
|
||||
signatureUrl: trimOrNull(col(row, 'Signature')),
|
||||
// Legacy submissions implicitly accepted T&Cs when submitted.
|
||||
termsAccepted: true,
|
||||
emergencyVetConsent: true,
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
mkdirSync(dirname(OUTPUT), { recursive: true });
|
||||
|
||||
const payload = {
|
||||
exportedAt: new Date().toISOString(),
|
||||
source: {
|
||||
file: 'dog-enrolment-form-2026-05-20.csv',
|
||||
rows: data.length,
|
||||
columns: headers.length,
|
||||
},
|
||||
notes: [
|
||||
'Legacy Gravity Forms export. Owner email/address were not collected by the old form.',
|
||||
'Dog breed not collected by the old form.',
|
||||
'Phone numbers retained as raw + best-effort E.164 (+64). Verify before dialling.',
|
||||
"Yes/No fields parsed to booleans; 'Select' and blanks become null.",
|
||||
"'Reactive to other animals' values like Cats/Birds/Other map to { reactive: true, detail }.",
|
||||
],
|
||||
records,
|
||||
};
|
||||
|
||||
writeFileSync(OUTPUT, JSON.stringify(payload, null, 2) + '\n', 'utf8');
|
||||
|
||||
// Print a small summary so the operator can sanity-check.
|
||||
const summary = {
|
||||
records: records.length,
|
||||
withOwnerPhone: records.filter((r) => r.owner.phone).length,
|
||||
withVetPhone: records.filter((r) => r.vet.phone).length,
|
||||
withEmergencyPhone: records.filter((r) => r.emergencyContact.phone).length,
|
||||
withSignature: records.filter((r) => r.declaration.signatureUrl).length,
|
||||
vaccinatedTrue: records.filter((r) => r.health.vaccinated === true).length,
|
||||
councilRegistered: records.filter((r) => r.behaviour.councilRegistered === true).length,
|
||||
output: OUTPUT,
|
||||
};
|
||||
console.log(JSON.stringify(summary, null, 2));
|
||||
@@ -43,6 +43,108 @@ fail() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
get_mount_source_for_destination() {
|
||||
local container_id="$1"
|
||||
local destination="$2"
|
||||
|
||||
docker inspect -f '{{range .Mounts}}{{.Source}}|{{.Destination}}{{println}}{{end}}' "$container_id" \
|
||||
| awk -F'|' -v wanted="$destination" '$2 == wanted { print $1; exit }'
|
||||
}
|
||||
|
||||
write_acme_bootstrap_config() {
|
||||
local source_config="$1"
|
||||
local target_config="$2"
|
||||
shift 2
|
||||
|
||||
awk -v skip_domains="$*" '
|
||||
BEGIN {
|
||||
split(skip_domains, items, " ")
|
||||
for (i in items) {
|
||||
if (items[i] != "") skip[items[i]] = 1
|
||||
}
|
||||
in_server = 0
|
||||
depth = 0
|
||||
block = ""
|
||||
is_ssl = 0
|
||||
has_skipped_domain = 0
|
||||
}
|
||||
function emit_block() {
|
||||
if (!(is_ssl && has_skipped_domain)) {
|
||||
printf "%s", block
|
||||
}
|
||||
in_server = 0
|
||||
depth = 0
|
||||
block = ""
|
||||
is_ssl = 0
|
||||
has_skipped_domain = 0
|
||||
}
|
||||
{
|
||||
line = $0 ORS
|
||||
|
||||
if (!in_server) {
|
||||
if ($0 ~ /^[[:space:]]*server[[:space:]]*\{[[:space:]]*$/) {
|
||||
in_server = 1
|
||||
depth = 1
|
||||
block = line
|
||||
next
|
||||
}
|
||||
|
||||
printf "%s", line
|
||||
next
|
||||
}
|
||||
|
||||
block = block line
|
||||
|
||||
if ($0 ~ /^[[:space:]]*listen[[:space:]]+443[[:space:]]+ssl([[:space:]]|;)/) {
|
||||
is_ssl = 1
|
||||
}
|
||||
|
||||
if ($0 ~ /^[[:space:]]*server_name[[:space:]]+/) {
|
||||
count = split($0, parts, /[[:space:];]+/)
|
||||
for (i = 2; i <= count; i++) {
|
||||
if (parts[i] in skip) {
|
||||
has_skipped_domain = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
opens = gsub(/\{/, "{", $0)
|
||||
closes = gsub(/\}/, "}", $0)
|
||||
depth += opens - closes
|
||||
|
||||
if (depth == 0) {
|
||||
emit_block()
|
||||
}
|
||||
}
|
||||
END {
|
||||
if (in_server) {
|
||||
emit_block()
|
||||
}
|
||||
}
|
||||
' "$source_config" > "$target_config"
|
||||
}
|
||||
|
||||
obtain_certificate() {
|
||||
local domain="$1"
|
||||
local cert_root="$2"
|
||||
local acme_webroot="$3"
|
||||
local certbot_email="info@goodwalk.co.nz"
|
||||
|
||||
echo "[deploy-git] Obtaining TLS certificate for $domain"
|
||||
docker run --rm \
|
||||
-v "$cert_root:/etc/letsencrypt" \
|
||||
-v "$acme_webroot:/var/www/certbot" \
|
||||
certbot/certbot:latest \
|
||||
certonly \
|
||||
--webroot \
|
||||
-w /var/www/certbot \
|
||||
--cert-name "$domain" \
|
||||
-d "$domain" \
|
||||
--non-interactive \
|
||||
--agree-tos \
|
||||
-m "$certbot_email"
|
||||
}
|
||||
|
||||
assert_command() {
|
||||
command -v "$1" >/dev/null 2>&1 || fail "Required command '$1' is not installed on the server"
|
||||
}
|
||||
@@ -429,22 +531,6 @@ if (( nginx_args_present )); then
|
||||
[[ -f "$DEPLOY_PATH/$NGINX_SOURCE" ]] || fail "Nginx config missing from deployment payload: $DEPLOY_PATH/$NGINX_SOURCE"
|
||||
[[ -f "$NGINX_COMPOSE_FILE" ]] || fail "Nginx compose file was not found on the server: $NGINX_COMPOSE_FILE"
|
||||
|
||||
# Pre-flight: SSL certificate for onboarding.goodwalk.co.nz must exist before
|
||||
# nginx can reload — the config references this cert path directly.
|
||||
ONBOARDING_CERT="/etc/letsencrypt/live/onboarding.goodwalk.co.nz/fullchain.pem"
|
||||
ONBOARDING_KEY="/etc/letsencrypt/live/onboarding.goodwalk.co.nz/privkey.pem"
|
||||
if [[ ! -f "$ONBOARDING_CERT" || ! -f "$ONBOARDING_KEY" ]]; then
|
||||
fail "SSL certificate for onboarding.goodwalk.co.nz is not present on this server.
|
||||
Expected: $ONBOARDING_CERT
|
||||
One-time setup on the droplet:
|
||||
1. Ensure the DNS A record for onboarding.goodwalk.co.nz points to this server's IP
|
||||
2. Bring nginx up so the ACME webroot is reachable, then obtain the certificate:
|
||||
certbot certonly --webroot -w /var/www/certbot \\
|
||||
-d onboarding.goodwalk.co.nz \\
|
||||
--non-interactive --agree-tos -m info@goodwalk.co.nz
|
||||
3. Re-run this deploy script"
|
||||
fi
|
||||
|
||||
MAINTENANCE_HTML_SRC="$DEPLOY_PATH/nginx/maintenance.html"
|
||||
MAINTENANCE_LOGO_SRC="$DEPLOY_PATH/nginx/logo.png"
|
||||
[[ -f "$MAINTENANCE_HTML_SRC" ]] || fail "Maintenance page missing from deployment payload: $MAINTENANCE_HTML_SRC"
|
||||
@@ -453,6 +539,55 @@ if (( nginx_args_present )); then
|
||||
NGINX_CID="$(docker ps -qf name=^nginx$ | head -n1 || true)"
|
||||
[[ -n "$NGINX_CID" ]] || fail "Shared nginx container is not running (expected name 'nginx'). Bring it up before deploying."
|
||||
|
||||
CERT_ROOT_HOST_DIR="$(get_mount_source_for_destination "$NGINX_CID" "/etc/letsencrypt")"
|
||||
[[ -n "$CERT_ROOT_HOST_DIR" ]] || fail "nginx container is missing the certificate bind mount for /etc/letsencrypt."
|
||||
|
||||
CERTBOT_WEBROOT_HOST_DIR="$(get_mount_source_for_destination "$NGINX_CID" "/var/www/certbot")"
|
||||
[[ -n "$CERTBOT_WEBROOT_HOST_DIR" ]] || fail "nginx container is missing the ACME webroot bind mount for /var/www/certbot."
|
||||
|
||||
ONBOARDING_CERT="$CERT_ROOT_HOST_DIR/live/onboarding.goodwalk.co.nz/fullchain.pem"
|
||||
ONBOARDING_KEY="$CERT_ROOT_HOST_DIR/live/onboarding.goodwalk.co.nz/privkey.pem"
|
||||
CLIENTS_CERT="$CERT_ROOT_HOST_DIR/live/clients.goodwalk.co.nz/fullchain.pem"
|
||||
CLIENTS_KEY="$CERT_ROOT_HOST_DIR/live/clients.goodwalk.co.nz/privkey.pem"
|
||||
CP_CERT="$CERT_ROOT_HOST_DIR/live/cp.goodwalk.co.nz/fullchain.pem"
|
||||
CP_KEY="$CERT_ROOT_HOST_DIR/live/cp.goodwalk.co.nz/privkey.pem"
|
||||
MISSING_CERT_DOMAINS=()
|
||||
if [[ ! -f "$ONBOARDING_CERT" || ! -f "$ONBOARDING_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("onboarding.goodwalk.co.nz")
|
||||
fi
|
||||
if [[ ! -f "$CLIENTS_CERT" || ! -f "$CLIENTS_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("clients.goodwalk.co.nz")
|
||||
fi
|
||||
if [[ ! -f "$CP_CERT" || ! -f "$CP_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("cp.goodwalk.co.nz")
|
||||
fi
|
||||
|
||||
if (( ${#MISSING_CERT_DOMAINS[@]} > 0 )); then
|
||||
echo "[deploy-git] Missing TLS certificates detected: ${MISSING_CERT_DOMAINS[*]}"
|
||||
echo "[deploy-git] Bootstrapping nginx HTTP config so ACME challenges can be served"
|
||||
mkdir -p "$(dirname "$NGINX_TARGET")"
|
||||
BOOTSTRAP_CONFIG="$(mktemp "${TMPDIR:-/tmp}/goodwalk-nginx-acme.XXXXXX.conf")"
|
||||
write_acme_bootstrap_config "$DEPLOY_PATH/$NGINX_SOURCE" "$BOOTSTRAP_CONFIG" "${MISSING_CERT_DOMAINS[@]}"
|
||||
cp "$BOOTSTRAP_CONFIG" "$NGINX_TARGET"
|
||||
rm -f "$BOOTSTRAP_CONFIG"
|
||||
|
||||
echo "[deploy-git] Validating bootstrap nginx configuration"
|
||||
"${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -t
|
||||
|
||||
echo "[deploy-git] Reloading shared nginx with bootstrap config"
|
||||
"${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -s reload
|
||||
|
||||
for domain in "${MISSING_CERT_DOMAINS[@]}"; do
|
||||
echo "[deploy-git] Ensure the DNS A record for $domain points to this server before certificate issuance"
|
||||
obtain_certificate "$domain" "$CERT_ROOT_HOST_DIR" "$CERTBOT_WEBROOT_HOST_DIR" \
|
||||
|| fail "Automatic certificate issuance failed for $domain. Confirm DNS resolves here and port 80 is reachable."
|
||||
done
|
||||
|
||||
[[ -f "$ONBOARDING_CERT" && -f "$ONBOARDING_KEY" ]] || fail "Automatic certificate issuance did not create onboarding.goodwalk.co.nz at $ONBOARDING_CERT"
|
||||
[[ -f "$CLIENTS_CERT" && -f "$CLIENTS_KEY" ]] || fail "Automatic certificate issuance did not create clients.goodwalk.co.nz at $CLIENTS_CERT"
|
||||
[[ -f "$CP_CERT" && -f "$CP_KEY" ]] || fail "Automatic certificate issuance did not create cp.goodwalk.co.nz at $CP_CERT"
|
||||
fi
|
||||
|
||||
if ! docker inspect -f '{{range .Mounts}}{{.Source}}|{{.Destination}}{{println}}{{end}}' "$NGINX_CID" \
|
||||
| grep -Fxq "${MAINTENANCE_HOST_DIR}|/var/www/maintenance"; then
|
||||
fail "nginx container is missing the maintenance bind mount.
|
||||
|
||||
@@ -12,6 +12,7 @@ NGINX_COMPOSE_FILE=""
|
||||
NGINX_PROJECT_NAME=""
|
||||
MAINTENANCE_HOST_DIR=""
|
||||
MAINTENANCE_FLAG_PATH=""
|
||||
SEED_ADMIN_DATA=0
|
||||
|
||||
usage() {
|
||||
cat <<'EOF'
|
||||
@@ -34,6 +35,108 @@ fail() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
get_mount_source_for_destination() {
|
||||
local container_id="$1"
|
||||
local destination="$2"
|
||||
|
||||
docker inspect -f '{{range .Mounts}}{{.Source}}|{{.Destination}}{{println}}{{end}}' "$container_id" \
|
||||
| awk -F'|' -v wanted="$destination" '$2 == wanted { print $1; exit }'
|
||||
}
|
||||
|
||||
write_acme_bootstrap_config() {
|
||||
local source_config="$1"
|
||||
local target_config="$2"
|
||||
shift 2
|
||||
|
||||
awk -v skip_domains="$*" '
|
||||
BEGIN {
|
||||
split(skip_domains, items, " ")
|
||||
for (i in items) {
|
||||
if (items[i] != "") skip[items[i]] = 1
|
||||
}
|
||||
in_server = 0
|
||||
depth = 0
|
||||
block = ""
|
||||
is_ssl = 0
|
||||
has_skipped_domain = 0
|
||||
}
|
||||
function emit_block() {
|
||||
if (!(is_ssl && has_skipped_domain)) {
|
||||
printf "%s", block
|
||||
}
|
||||
in_server = 0
|
||||
depth = 0
|
||||
block = ""
|
||||
is_ssl = 0
|
||||
has_skipped_domain = 0
|
||||
}
|
||||
{
|
||||
line = $0 ORS
|
||||
|
||||
if (!in_server) {
|
||||
if ($0 ~ /^[[:space:]]*server[[:space:]]*\{[[:space:]]*$/) {
|
||||
in_server = 1
|
||||
depth = 1
|
||||
block = line
|
||||
next
|
||||
}
|
||||
|
||||
printf "%s", line
|
||||
next
|
||||
}
|
||||
|
||||
block = block line
|
||||
|
||||
if ($0 ~ /^[[:space:]]*listen[[:space:]]+443[[:space:]]+ssl([[:space:]]|;)/) {
|
||||
is_ssl = 1
|
||||
}
|
||||
|
||||
if ($0 ~ /^[[:space:]]*server_name[[:space:]]+/) {
|
||||
count = split($0, parts, /[[:space:];]+/)
|
||||
for (i = 2; i <= count; i++) {
|
||||
if (parts[i] in skip) {
|
||||
has_skipped_domain = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
opens = gsub(/\{/, "{", $0)
|
||||
closes = gsub(/\}/, "}", $0)
|
||||
depth += opens - closes
|
||||
|
||||
if (depth == 0) {
|
||||
emit_block()
|
||||
}
|
||||
}
|
||||
END {
|
||||
if (in_server) {
|
||||
emit_block()
|
||||
}
|
||||
}
|
||||
' "$source_config" > "$target_config"
|
||||
}
|
||||
|
||||
obtain_certificate() {
|
||||
local domain="$1"
|
||||
local cert_root="$2"
|
||||
local acme_webroot="$3"
|
||||
local certbot_email="info@goodwalk.co.nz"
|
||||
|
||||
echo "[deploy-remote] Obtaining TLS certificate for $domain"
|
||||
docker run --rm \
|
||||
-v "$cert_root:/etc/letsencrypt" \
|
||||
-v "$acme_webroot:/var/www/certbot" \
|
||||
certbot/certbot:latest \
|
||||
certonly \
|
||||
--webroot \
|
||||
-w /var/www/certbot \
|
||||
--cert-name "$domain" \
|
||||
-d "$domain" \
|
||||
--non-interactive \
|
||||
--agree-tos \
|
||||
-m "$certbot_email"
|
||||
}
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--archive)
|
||||
@@ -84,6 +187,10 @@ while [[ $# -gt 0 ]]; do
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
--seed-admin-data)
|
||||
SEED_ADMIN_DATA=1
|
||||
shift 1
|
||||
;;
|
||||
*)
|
||||
fail "Unknown argument: $1"
|
||||
;;
|
||||
@@ -170,6 +277,17 @@ if [[ -f "$DEPLOY_PATH/.env" ]]; then
|
||||
echo "[deploy-remote] Preserving existing $DEPLOY_PATH/.env"
|
||||
fi
|
||||
|
||||
# The application source tree is fully owned by the repo and is only used as
|
||||
# Docker build context — it holds no runtime data. The rsync below uses no
|
||||
# --delete, so a file removed or renamed in the repo (e.g. a moved SvelteKit
|
||||
# route) would otherwise linger here and break the build with a route conflict.
|
||||
# Wipe src/ first so it is rebuilt exactly from the archive. Runtime data,
|
||||
# .env, and Docker volumes live outside src/ and are untouched.
|
||||
if [[ -d "$DEPLOY_PATH/src" ]]; then
|
||||
echo "[deploy-remote] Refreshing $DEPLOY_PATH/src from archive (pruning stale files)"
|
||||
rm -rf "$DEPLOY_PATH/src"
|
||||
fi
|
||||
|
||||
echo "[deploy-remote] Copying application files into $DEPLOY_PATH"
|
||||
if command -v rsync >/dev/null 2>&1; then
|
||||
rsync -a \
|
||||
@@ -287,22 +405,6 @@ if (( nginx_args_present )); then
|
||||
[[ -f "$DEPLOY_PATH/$NGINX_SOURCE" ]] || fail "Nginx config missing from deployment payload: $DEPLOY_PATH/$NGINX_SOURCE"
|
||||
[[ -f "$NGINX_COMPOSE_FILE" ]] || fail "Nginx compose file was not found on the server: $NGINX_COMPOSE_FILE"
|
||||
|
||||
# Pre-flight: SSL certificate for onboarding.goodwalk.co.nz must exist before
|
||||
# nginx can reload — the config references this cert path directly.
|
||||
ONBOARDING_CERT="/etc/letsencrypt/live/onboarding.goodwalk.co.nz/fullchain.pem"
|
||||
ONBOARDING_KEY="/etc/letsencrypt/live/onboarding.goodwalk.co.nz/privkey.pem"
|
||||
if [[ ! -f "$ONBOARDING_CERT" || ! -f "$ONBOARDING_KEY" ]]; then
|
||||
fail "SSL certificate for onboarding.goodwalk.co.nz is not present on this server.
|
||||
Expected: $ONBOARDING_CERT
|
||||
One-time setup on the droplet:
|
||||
1. Ensure the DNS A record for onboarding.goodwalk.co.nz points to this server's IP
|
||||
2. Bring nginx up so the ACME webroot is reachable, then obtain the certificate:
|
||||
certbot certonly --webroot -w /var/www/certbot \\
|
||||
-d onboarding.goodwalk.co.nz \\
|
||||
--non-interactive --agree-tos -m info@goodwalk.co.nz
|
||||
3. Re-run this deploy script"
|
||||
fi
|
||||
|
||||
MAINTENANCE_HTML_SRC="$DEPLOY_PATH/nginx/maintenance.html"
|
||||
MAINTENANCE_LOGO_SRC="$DEPLOY_PATH/nginx/logo.png"
|
||||
[[ -f "$MAINTENANCE_HTML_SRC" ]] || fail "Maintenance page missing from deployment payload: $MAINTENANCE_HTML_SRC"
|
||||
@@ -315,6 +417,55 @@ if (( nginx_args_present )); then
|
||||
NGINX_CID="$(docker ps -qf name=^nginx$ | head -n1 || true)"
|
||||
[[ -n "$NGINX_CID" ]] || fail "Shared nginx container is not running (expected name 'nginx'). Bring it up before deploying."
|
||||
|
||||
CERT_ROOT_HOST_DIR="$(get_mount_source_for_destination "$NGINX_CID" "/etc/letsencrypt")"
|
||||
[[ -n "$CERT_ROOT_HOST_DIR" ]] || fail "nginx container is missing the certificate bind mount for /etc/letsencrypt."
|
||||
|
||||
CERTBOT_WEBROOT_HOST_DIR="$(get_mount_source_for_destination "$NGINX_CID" "/var/www/certbot")"
|
||||
[[ -n "$CERTBOT_WEBROOT_HOST_DIR" ]] || fail "nginx container is missing the ACME webroot bind mount for /var/www/certbot."
|
||||
|
||||
ONBOARDING_CERT="$CERT_ROOT_HOST_DIR/live/onboarding.goodwalk.co.nz/fullchain.pem"
|
||||
ONBOARDING_KEY="$CERT_ROOT_HOST_DIR/live/onboarding.goodwalk.co.nz/privkey.pem"
|
||||
CLIENTS_CERT="$CERT_ROOT_HOST_DIR/live/clients.goodwalk.co.nz/fullchain.pem"
|
||||
CLIENTS_KEY="$CERT_ROOT_HOST_DIR/live/clients.goodwalk.co.nz/privkey.pem"
|
||||
CP_CERT="$CERT_ROOT_HOST_DIR/live/cp.goodwalk.co.nz/fullchain.pem"
|
||||
CP_KEY="$CERT_ROOT_HOST_DIR/live/cp.goodwalk.co.nz/privkey.pem"
|
||||
MISSING_CERT_DOMAINS=()
|
||||
if [[ ! -f "$ONBOARDING_CERT" || ! -f "$ONBOARDING_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("onboarding.goodwalk.co.nz")
|
||||
fi
|
||||
if [[ ! -f "$CLIENTS_CERT" || ! -f "$CLIENTS_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("clients.goodwalk.co.nz")
|
||||
fi
|
||||
if [[ ! -f "$CP_CERT" || ! -f "$CP_KEY" ]]; then
|
||||
MISSING_CERT_DOMAINS+=("cp.goodwalk.co.nz")
|
||||
fi
|
||||
|
||||
if (( ${#MISSING_CERT_DOMAINS[@]} > 0 )); then
|
||||
echo "[deploy-remote] Missing TLS certificates detected: ${MISSING_CERT_DOMAINS[*]}"
|
||||
echo "[deploy-remote] Bootstrapping nginx HTTP config so ACME challenges can be served"
|
||||
mkdir -p "$(dirname "$NGINX_TARGET")"
|
||||
BOOTSTRAP_CONFIG="$(mktemp "${TMPDIR:-/tmp}/goodwalk-nginx-acme.XXXXXX.conf")"
|
||||
write_acme_bootstrap_config "$DEPLOY_PATH/$NGINX_SOURCE" "$BOOTSTRAP_CONFIG" "${MISSING_CERT_DOMAINS[@]}"
|
||||
cp "$BOOTSTRAP_CONFIG" "$NGINX_TARGET"
|
||||
rm -f "$BOOTSTRAP_CONFIG"
|
||||
|
||||
echo "[deploy-remote] Validating bootstrap nginx configuration"
|
||||
"${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -t
|
||||
|
||||
echo "[deploy-remote] Reloading shared nginx with bootstrap config"
|
||||
"${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -s reload
|
||||
|
||||
for domain in "${MISSING_CERT_DOMAINS[@]}"; do
|
||||
echo "[deploy-remote] Ensure the DNS A record for $domain points to this server before certificate issuance"
|
||||
obtain_certificate "$domain" "$CERT_ROOT_HOST_DIR" "$CERTBOT_WEBROOT_HOST_DIR" \
|
||||
|| fail "Automatic certificate issuance failed for $domain. Confirm DNS resolves here and port 80 is reachable."
|
||||
done
|
||||
|
||||
[[ -f "$ONBOARDING_CERT" && -f "$ONBOARDING_KEY" ]] || fail "Automatic certificate issuance did not create onboarding.goodwalk.co.nz at $ONBOARDING_CERT"
|
||||
[[ -f "$CLIENTS_CERT" && -f "$CLIENTS_KEY" ]] || fail "Automatic certificate issuance did not create clients.goodwalk.co.nz at $CLIENTS_CERT"
|
||||
[[ -f "$CP_CERT" && -f "$CP_KEY" ]] || fail "Automatic certificate issuance did not create cp.goodwalk.co.nz at $CP_CERT"
|
||||
fi
|
||||
|
||||
if ! docker inspect -f '{{range .Mounts}}{{.Source}}|{{.Destination}}{{println}}{{end}}' "$NGINX_CID" \
|
||||
| grep -Fxq "${MAINTENANCE_HOST_DIR}|/var/www/maintenance"; then
|
||||
fail "nginx container is missing the maintenance bind mount.
|
||||
@@ -349,6 +500,13 @@ if (( nginx_args_present )); then
|
||||
MAINTENANCE_ACTIVE=1
|
||||
fi
|
||||
|
||||
if [[ "$SEED_ADMIN_DATA" -eq 1 ]]; then
|
||||
echo "[deploy-remote] Admin data seed requested: mail-api will overwrite admin_kv from JSON on next boot"
|
||||
export ADMIN_DATA_SEED_FROM_JSON="force"
|
||||
else
|
||||
export ADMIN_DATA_SEED_FROM_JSON="auto"
|
||||
fi
|
||||
|
||||
if [[ -n "$SERVICE_NAME" ]]; then
|
||||
echo "[deploy-remote] Stopping only the Goodwalk service: $SERVICE_NAME"
|
||||
"${COMPOSE_CMD[@]}" -p "$PROJECT_NAME" -f "$COMPOSE_FILE" stop "$SERVICE_NAME" || true
|
||||
|
||||
|
After Width: | Height: | Size: 351 KiB |
|
After Width: | Height: | Size: 429 KiB |
|
After Width: | Height: | Size: 362 KiB |
@@ -4,6 +4,7 @@ import { join, extname, basename } from 'node:path';
|
||||
|
||||
const MAX_WIDTH = 1600;
|
||||
const MIN_BYTES_TO_OPTIMISE = 250 * 1024;
|
||||
const OPTIMISE_WEBP = process.env.OPTIMISE_WEBP === '1';
|
||||
|
||||
const dirs = ['src/lib/images', 'static/images'];
|
||||
|
||||
@@ -31,6 +32,7 @@ async function optimiseFile(file) {
|
||||
} else if (ext === '.jpg' || ext === '.jpeg') {
|
||||
buf = await pipeline.jpeg({ quality: 82, mozjpeg: true }).toBuffer();
|
||||
} else if (ext === '.webp') {
|
||||
if (!OPTIMISE_WEBP) return { file, original: (await stat(file)).size, optimised: (await stat(file)).size, skipped: true };
|
||||
buf = await pipeline.webp({ quality: 80, effort: 6 }).toBuffer();
|
||||
} else {
|
||||
return null;
|
||||
@@ -54,6 +56,10 @@ for (const dir of dirs) {
|
||||
const file = join(dir, name);
|
||||
const s = await stat(file);
|
||||
if (s.size < MIN_BYTES_TO_OPTIMISE) continue;
|
||||
if (/\.webp$/i.test(name) && !OPTIMISE_WEBP) {
|
||||
console.log(`${basename(file).padEnd(58)} ${(s.size / 1024).toFixed(0).padStart(5)}KB (skipped: existing WebP)`);
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
const res = await optimiseFile(file);
|
||||
if (!res) continue;
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
"""Drive the homepage BookingWizard in a mobile viewport and check the success modal appears."""
|
||||
from playwright.sync_api import sync_playwright
|
||||
import sys, io
|
||||
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
|
||||
|
||||
BASE = "http://127.0.0.1:5180"
|
||||
|
||||
def run():
|
||||
with sync_playwright() as p:
|
||||
browser = p.chromium.launch()
|
||||
ctx = browser.new_context(
|
||||
viewport={"width": 390, "height": 844},
|
||||
user_agent="Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 Mobile/15E148 Safari/604.1",
|
||||
is_mobile=True,
|
||||
has_touch=True,
|
||||
device_scale_factor=3,
|
||||
)
|
||||
page = ctx.new_page()
|
||||
console_logs = []
|
||||
page.on("console", lambda msg: console_logs.append(f"[{msg.type}] {msg.text}"))
|
||||
page.on("pageerror", lambda err: console_logs.append(f"[pageerror] {err}"))
|
||||
|
||||
def handle_submit(route):
|
||||
print(f" intercepted /api/submit -> returning 200")
|
||||
route.fulfill(status=200, content_type="application/json", body='{"ok":true}')
|
||||
page.route("**/api/submit", handle_submit)
|
||||
|
||||
print("[1] Loading homepage…")
|
||||
page.goto(BASE + "/#newlead", wait_until="networkidle", timeout=30000)
|
||||
page.locator("#newlead").scroll_into_view_if_needed()
|
||||
page.wait_for_timeout(400)
|
||||
|
||||
print("[2] Step 1 — dog details")
|
||||
# Pet name (avoid honeypot which uses autocomplete="new-password")
|
||||
page.locator('.wiz-form input[placeholder*="Teddy"]').fill("Rex")
|
||||
# Pick first service
|
||||
page.locator('.wiz-service').first.click()
|
||||
# Message (textarea)
|
||||
page.locator('.wiz-form textarea').first.fill("Friendly dog, two years old, recall fine.")
|
||||
|
||||
# Continue
|
||||
cont = page.get_by_role("button", name="Continue")
|
||||
print(f" Continue button visible: {cont.is_visible()}")
|
||||
cont.click()
|
||||
page.wait_for_timeout(1200)
|
||||
page.locator("#newlead").screenshot(path="scripts/mobile-step2.png")
|
||||
errs = page.locator('.wiz-error').all()
|
||||
print(f" visible errors after Continue: {len(errs)}")
|
||||
for e in errs:
|
||||
try: print(f" -> {e.inner_text()}")
|
||||
except: pass
|
||||
print(f" inputs after Continue: {page.locator('.wiz-form input').count()}")
|
||||
for inp in page.locator('.wiz-form input').all():
|
||||
print(f" autocomplete={inp.get_attribute('autocomplete')!r} type={inp.get_attribute('type')!r} visible={inp.is_visible()}")
|
||||
|
||||
print("[3] Step 2 — owner details")
|
||||
page.locator('.wiz-form input[autocomplete="name"]').fill("Test User")
|
||||
page.locator('.wiz-form input[type="email"]').fill("test@example.com")
|
||||
page.locator('.wiz-form input[type="tel"]').fill("0211234567")
|
||||
page.locator('.wiz-form input[autocomplete="address-level2"]').fill("Mt Eden")
|
||||
|
||||
print("[4] Submit")
|
||||
page.get_by_role("button", name="Send my details").click()
|
||||
|
||||
print("[5] Waiting for success modal…")
|
||||
try:
|
||||
page.wait_for_selector('[role="dialog"]', timeout=8000, state="attached")
|
||||
print(" PASS: dialog attached")
|
||||
except Exception:
|
||||
print(" FAIL: dialog never attached")
|
||||
return 1
|
||||
|
||||
# Snapshot immediately
|
||||
page.screenshot(path="scripts/mobile-modal-immediate.png", full_page=False)
|
||||
c0 = page.locator('canvas').count()
|
||||
d0 = page.locator('[role="dialog"]').count()
|
||||
print(f" t=0ms: dialogs={d0} canvases={c0}")
|
||||
|
||||
for delay in (200, 500, 1000, 2000):
|
||||
page.wait_for_timeout(delay)
|
||||
d = page.locator('[role="dialog"]').count()
|
||||
c = page.locator('canvas').count()
|
||||
print(f" after +{delay}ms: dialogs={d} canvases={c}")
|
||||
if d == 0:
|
||||
print(" Modal vanished!")
|
||||
page.screenshot(path=f"scripts/mobile-vanished-{delay}.png", full_page=False)
|
||||
break
|
||||
|
||||
page.screenshot(path="scripts/mobile-modal-final.png", full_page=False)
|
||||
|
||||
print("\nConsole tail:")
|
||||
for line in console_logs[-12:]:
|
||||
print(f" {line}")
|
||||
|
||||
browser.close()
|
||||
return 0
|
||||
|
||||
sys.exit(run())
|
||||
@@ -0,0 +1,87 @@
|
||||
"""Reproduce: testimonials cards blank after SPA navigation from another page."""
|
||||
from playwright.sync_api import sync_playwright
|
||||
import sys, io
|
||||
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
|
||||
|
||||
BASE = "https://www.goodwalk.co.nz"
|
||||
|
||||
def run():
|
||||
with sync_playwright() as p:
|
||||
browser = p.chromium.launch()
|
||||
for label, ctx_opts in [
|
||||
("mobile", {"viewport": {"width": 390, "height": 844}, "is_mobile": True, "has_touch": True,
|
||||
"user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 Mobile/15E148 Safari/604.1"}),
|
||||
]:
|
||||
print(f"\n=== {label} ===")
|
||||
ctx = browser.new_context(**ctx_opts)
|
||||
page = ctx.new_page()
|
||||
logs = []
|
||||
page.on("console", lambda m, L=logs: L.append(f"[{m.type}] {m.text}"))
|
||||
page.on("pageerror", lambda e, L=logs: L.append(f"[pageerror] {e}"))
|
||||
|
||||
print(" Loading homepage…")
|
||||
page.goto(BASE + "/", wait_until="networkidle", timeout=30000)
|
||||
page.wait_for_timeout(800)
|
||||
all_links = page.locator('a[href*="testimonials"]').all()
|
||||
print(f" testimonials links found: {len(all_links)}")
|
||||
for a in all_links[:5]:
|
||||
print(f" href={a.get_attribute('href')!r} visible={a.is_visible()}")
|
||||
|
||||
# Try opening mobile menu (hamburger) then click testimonials
|
||||
burger = page.locator('button[aria-label*="menu" i], button.header-burger, [aria-label*="open" i]').first
|
||||
if burger.count() and burger.is_visible():
|
||||
burger.click()
|
||||
page.wait_for_timeout(400)
|
||||
# Click first now-visible testimonials link (SPA nav, no reload)
|
||||
visible_link = None
|
||||
for a in page.locator('a[href*="testimonials"]').all():
|
||||
if a.is_visible():
|
||||
visible_link = a
|
||||
break
|
||||
if visible_link is None:
|
||||
print(" no visible link to click")
|
||||
return
|
||||
print(" clicking testimonials link…")
|
||||
with page.expect_navigation(wait_until="load", timeout=5000) as nav_info:
|
||||
visible_link.click()
|
||||
print(f" nav type detected: same-document={nav_info.value is None}")
|
||||
page.wait_for_timeout(2000)
|
||||
|
||||
page.wait_for_timeout(2500)
|
||||
print(f" url now: {page.url}")
|
||||
|
||||
section = page.locator(".testimonials-page-grid-section")
|
||||
print(f" section count: {section.count()}")
|
||||
if section.count():
|
||||
classes = section.first.get_attribute("class")
|
||||
print(f" section classes: {classes!r}")
|
||||
|
||||
cards = page.locator(".testimonials-page-card")
|
||||
print(f" cards count: {cards.count()}")
|
||||
if cards.count():
|
||||
first = cards.first
|
||||
computed = first.evaluate("el => { const cs = getComputedStyle(el); return { opacity: cs.opacity, transform: cs.transform }; }")
|
||||
print(f" first card computed: {computed}")
|
||||
last = cards.last
|
||||
last_comp = last.evaluate("el => { const cs = getComputedStyle(el); return { opacity: cs.opacity }; }")
|
||||
print(f" last card computed: {last_comp}")
|
||||
|
||||
page.screenshot(path=f"scripts/testimonials-spa-{label}.png", full_page=True)
|
||||
print(f" screenshot: scripts/testimonials-spa-{label}.png")
|
||||
|
||||
# Now scroll and recheck
|
||||
page.mouse.wheel(0, 600)
|
||||
page.wait_for_timeout(500)
|
||||
if cards.count():
|
||||
op_after = cards.first.evaluate("el => getComputedStyle(el).opacity")
|
||||
print(f" first card opacity after scroll 600px: {op_after}")
|
||||
page.screenshot(path=f"scripts/testimonials-spa-scrolled-{label}.png", full_page=True)
|
||||
|
||||
if logs:
|
||||
print(" console:")
|
||||
for l in logs[-12:]:
|
||||
print(f" {l}")
|
||||
ctx.close()
|
||||
browser.close()
|
||||
|
||||
run()
|
||||
@@ -0,0 +1,63 @@
|
||||
"""Load /testimonials and report what's actually visible."""
|
||||
from playwright.sync_api import sync_playwright
|
||||
import sys, io
|
||||
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
|
||||
|
||||
BASE = "http://127.0.0.1:5180"
|
||||
|
||||
def run():
|
||||
with sync_playwright() as p:
|
||||
browser = p.chromium.launch()
|
||||
for label, ctx_opts in [
|
||||
("desktop", {"viewport": {"width": 1280, "height": 900}}),
|
||||
("mobile", {"viewport": {"width": 390, "height": 844}, "is_mobile": True, "has_touch": True,
|
||||
"user_agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 Mobile/15E148 Safari/604.1"}),
|
||||
]:
|
||||
print(f"\n=== {label} ===")
|
||||
ctx = browser.new_context(**ctx_opts)
|
||||
page = ctx.new_page()
|
||||
logs = []
|
||||
page.on("console", lambda m, L=logs: L.append(f"[{m.type}] {m.text}"))
|
||||
page.on("pageerror", lambda e, L=logs: L.append(f"[pageerror] {e}"))
|
||||
|
||||
page.goto(BASE + "/testimonials", wait_until="networkidle", timeout=30000)
|
||||
page.wait_for_timeout(600)
|
||||
|
||||
section = page.locator(".testimonials-page-grid-section")
|
||||
print(f" section count: {section.count()}")
|
||||
classes = section.first.get_attribute("class") if section.count() else None
|
||||
print(f" section classes: {classes!r}")
|
||||
|
||||
cards = page.locator(".testimonials-page-card")
|
||||
print(f" cards count: {cards.count()}")
|
||||
|
||||
if cards.count():
|
||||
first = cards.first
|
||||
computed = first.evaluate("el => { const cs = getComputedStyle(el); return { opacity: cs.opacity, transform: cs.transform, display: cs.display, visibility: cs.visibility }; }")
|
||||
print(f" first card computed: {computed}")
|
||||
bb = first.bounding_box()
|
||||
print(f" first card bbox: {bb}")
|
||||
txt = first.inner_text()
|
||||
print(f" first card text: {txt[:200]!r}")
|
||||
|
||||
# Scroll into view and re-check
|
||||
if section.count():
|
||||
section.first.scroll_into_view_if_needed()
|
||||
page.wait_for_timeout(800)
|
||||
classes2 = section.first.get_attribute("class")
|
||||
print(f" section classes after scroll: {classes2!r}")
|
||||
if cards.count():
|
||||
op2 = cards.first.evaluate("el => getComputedStyle(el).opacity")
|
||||
print(f" first card opacity after scroll: {op2}")
|
||||
|
||||
page.screenshot(path=f"scripts/testimonials-{label}.png", full_page=True)
|
||||
print(f" screenshot: scripts/testimonials-{label}.png")
|
||||
|
||||
if logs:
|
||||
print(" console:")
|
||||
for l in logs[-15:]:
|
||||
print(f" {l}")
|
||||
ctx.close()
|
||||
browser.close()
|
||||
|
||||
run()
|
||||
|
After Width: | Height: | Size: 3.3 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 1.2 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
@@ -1,5 +1,9 @@
|
||||
declare global {
|
||||
namespace App {
|
||||
interface Locals {
|
||||
abHero?: import('$lib/server/ab').HeroVariant;
|
||||
anonId?: string;
|
||||
}
|
||||
interface PageData {
|
||||
content: import('$lib/types').HomePageContent | import('$lib/types').SiteSharedContent;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import type { Handle } from '@sveltejs/kit';
|
||||
import { dev } from '$app/environment';
|
||||
import { resolveSurface } from '$lib/server/surface';
|
||||
import { resolveAnonId, resolveHeroVariant } from '$lib/server/ab';
|
||||
|
||||
const ADMIN_PATH = '/owner/welcome';
|
||||
|
||||
export const handle: Handle = async ({ event, resolve }) => {
|
||||
const { surface } = resolveSurface(event.url, event.cookies);
|
||||
const path = event.url.pathname;
|
||||
|
||||
// Design variant previews are not for production. The whole /variants
|
||||
// namespace returns 500 off-localhost so unfinished work never leaks to the
|
||||
// public site. Localhost (the dev server, or a local prod build) is allowed.
|
||||
const onLocalhost = ['localhost', '127.0.0.1', '[::1]'].includes(event.url.hostname);
|
||||
if (!dev && !onLocalhost && (path === '/variants' || path.startsWith('/variants/'))) {
|
||||
return new Response('Internal Server Error', { status: 500 });
|
||||
}
|
||||
|
||||
// Sticky A/B assignment, marketing surface only — no point polluting the
|
||||
// owner/clients hosts with marketing-experiment cookies, and it skews
|
||||
// exposure counts when staff hit the public site from the dashboard.
|
||||
if (surface === 'marketing') {
|
||||
event.locals.anonId = resolveAnonId(event.cookies);
|
||||
event.locals.abHero = resolveHeroVariant(event.url, event.cookies);
|
||||
}
|
||||
|
||||
// The admin host (cp.*) serves the dashboard at its root. In production the
|
||||
// universal `reroute` hook maps / (and /clients, /birthdays, …) onto the
|
||||
// internal /owner/welcome routes without changing the URL. In dev the cp
|
||||
// surface is reached via ?preview=cp on localhost, where reroute can't detect
|
||||
// the host, so fall back to redirecting the root to the dashboard path.
|
||||
if (dev && surface === 'cp' && (path === '/' || path === '')) {
|
||||
return new Response(null, {
|
||||
status: 302,
|
||||
headers: { location: ADMIN_PATH },
|
||||
});
|
||||
}
|
||||
|
||||
// Block the admin dashboard from the public marketing site so /owner/*
|
||||
// only renders on the cp surface (or on the clients surface during the
|
||||
// legacy onboarding-host transition window). Localhost dev preview is
|
||||
// allowed: resolveSurface returns 'cp' there too when ?preview=cp or
|
||||
// ?preview=admin is set.
|
||||
if (surface === 'marketing' && path.startsWith('/owner/')) {
|
||||
return new Response('Not Found', { status: 404 });
|
||||
}
|
||||
|
||||
return resolve(event);
|
||||
};
|
||||
@@ -0,0 +1,31 @@
|
||||
import type { Reroute } from '@sveltejs/kit';
|
||||
|
||||
/**
|
||||
* Clean URLs for the control panel.
|
||||
*
|
||||
* The owner dashboard lives internally at /owner/welcome (home) and
|
||||
* /owner/welcome/<tab>. On the cp.* / admin.* hosts we serve it at the root so
|
||||
* the visible URLs are /, /clients, /birthdays, /messaging, /scheduled and
|
||||
* /activity. This hook rewrites those clean paths to the real route without
|
||||
* changing the URL in the browser, and runs on both the server and the client
|
||||
* so SSR and client-side navigation stay in sync.
|
||||
*
|
||||
* Keep CP_HOSTS in sync with $lib/server/surface.ts — it can't be imported here
|
||||
* because this hook also runs in the browser and $lib/server is server-only.
|
||||
*/
|
||||
const CP_HOSTS = new Set(['cp.goodwalk.co.nz', 'admin.goodwalk.co.nz']);
|
||||
const ADMIN_BASE = '/owner/welcome';
|
||||
const CP_TABS = new Set(['clients', 'birthdays', 'messaging', 'scheduled', 'activity']);
|
||||
|
||||
export const reroute: Reroute = ({ url }) => {
|
||||
if (!CP_HOSTS.has(url.hostname.toLowerCase())) return;
|
||||
|
||||
// Already addressing the internal admin routes (e.g. a direct hit) — leave it.
|
||||
if (url.pathname === ADMIN_BASE || url.pathname.startsWith(`${ADMIN_BASE}/`)) return;
|
||||
|
||||
const segment = url.pathname.replace(/^\/+/, '').split('/')[0];
|
||||
if (segment === '') return ADMIN_BASE; // / → dashboard home
|
||||
if (CP_TABS.has(segment)) return `${ADMIN_BASE}/${segment}`;
|
||||
|
||||
// Anything else (static assets, /owner/experiments, …) routes normally.
|
||||
};
|
||||
@@ -0,0 +1,61 @@
|
||||
/**
|
||||
* Client-side A/B event reporter. Server already assigned the variant; the
|
||||
* client just reports exposures + conversions back. Uses sendBeacon when
|
||||
* available so it survives page navigation (e.g. CTA click → external href).
|
||||
*/
|
||||
|
||||
export interface AbContext {
|
||||
experiment: string;
|
||||
variant: string;
|
||||
}
|
||||
|
||||
export interface AbEventPayload extends AbContext {
|
||||
event_type: 'exposure' | 'cta_click' | 'conversion';
|
||||
meta?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
const ENDPOINT = '/api/ab';
|
||||
const SESSION_FIRED_KEY = 'gw_ab_fired';
|
||||
|
||||
// Dedupe `exposure` and `cta_click` per session — we only need one row per
|
||||
// visitor per surface to compute CVR. Conversions are not deduped: every
|
||||
// genuine booking submit should be recorded.
|
||||
function shouldDedupe(payload: AbEventPayload): boolean {
|
||||
if (payload.event_type === 'conversion') return false;
|
||||
if (typeof sessionStorage === 'undefined') return false;
|
||||
const key = `${payload.experiment}:${payload.variant}:${payload.event_type}:${payload.meta?.surface ?? ''}`;
|
||||
try {
|
||||
const raw = sessionStorage.getItem(SESSION_FIRED_KEY);
|
||||
const fired = raw ? (JSON.parse(raw) as string[]) : [];
|
||||
if (fired.includes(key)) return true;
|
||||
fired.push(key);
|
||||
sessionStorage.setItem(SESSION_FIRED_KEY, JSON.stringify(fired));
|
||||
return false;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export function trackAb(payload: AbEventPayload): void {
|
||||
if (typeof window === 'undefined') return;
|
||||
if (!payload.experiment || !payload.variant) return;
|
||||
if (shouldDedupe(payload)) return;
|
||||
|
||||
const body = JSON.stringify(payload);
|
||||
|
||||
try {
|
||||
if (typeof navigator !== 'undefined' && typeof navigator.sendBeacon === 'function') {
|
||||
const blob = new Blob([body], { type: 'application/json' });
|
||||
if (navigator.sendBeacon(ENDPOINT, blob)) return;
|
||||
}
|
||||
} catch {
|
||||
// fall through to fetch
|
||||
}
|
||||
|
||||
void fetch(ENDPOINT, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body,
|
||||
keepalive: true,
|
||||
}).catch(() => {});
|
||||
}
|
||||
@@ -28,8 +28,12 @@ describe('reveal action', () => {
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
it('toggles visibility as the element enters and leaves the viewport', () => {
|
||||
it('reveals the element when the observer reports intersection', () => {
|
||||
vi.stubGlobal('IntersectionObserver', TestIntersectionObserver);
|
||||
vi.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
|
||||
cb(0);
|
||||
return 0;
|
||||
});
|
||||
vi.spyOn(window, 'matchMedia').mockReturnValue({
|
||||
matches: false,
|
||||
media: '(prefers-reduced-motion: reduce)',
|
||||
@@ -67,9 +71,7 @@ describe('reveal action', () => {
|
||||
|
||||
observer.trigger(node, true);
|
||||
expect(node.classList.contains('reveal-visible')).toBe(true);
|
||||
|
||||
observer.trigger(node, false);
|
||||
expect(node.classList.contains('reveal-visible')).toBe(false);
|
||||
expect(observer.unobserve).toHaveBeenCalledWith(node);
|
||||
|
||||
action.destroy();
|
||||
expect(observer.disconnect).toHaveBeenCalledTimes(1);
|
||||
|
||||
@@ -34,6 +34,17 @@ export function reveal(node: HTMLElement, options: RevealOptions = {}) {
|
||||
let observer: IntersectionObserver | null = null;
|
||||
let cancelled = false;
|
||||
|
||||
// Failsafe: if hydration mismatch or any other edge case prevents the rAF
|
||||
// check and IntersectionObserver from running, force visibility after a
|
||||
// short delay so content never stays stuck at opacity 0.
|
||||
const failsafe = window.setTimeout(() => {
|
||||
if (cancelled) return;
|
||||
if (!node.classList.contains('reveal-visible')) {
|
||||
node.classList.add('reveal-visible');
|
||||
observer?.disconnect();
|
||||
}
|
||||
}, 1200);
|
||||
|
||||
// Defer the layout-reading initial check + observer setup to the next
|
||||
// frame. With 20+ `use:reveal` instances mounting in a row, calling
|
||||
// getBoundingClientRect() synchronously after a class mutation forces
|
||||
@@ -72,6 +83,7 @@ export function reveal(node: HTMLElement, options: RevealOptions = {}) {
|
||||
return {
|
||||
destroy() {
|
||||
cancelled = true;
|
||||
window.clearTimeout(failsafe);
|
||||
observer?.disconnect();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
type GtagFn = (...args: unknown[]) => void;
|
||||
|
||||
const TEXT_LIMIT = 80;
|
||||
const EVENT_NAME_LIMIT = 40;
|
||||
|
||||
function gtag(): GtagFn | null {
|
||||
if (typeof window === 'undefined') return null;
|
||||
@@ -8,10 +9,156 @@ function gtag(): GtagFn | null {
|
||||
return typeof fn === 'function' ? fn : null;
|
||||
}
|
||||
|
||||
export function trackPageView(path: string, title: string): void {
|
||||
function sanitizeValue(value: string): string {
|
||||
return value.trim().replace(/\s+/g, ' ').slice(0, TEXT_LIMIT);
|
||||
}
|
||||
|
||||
function sanitizeEventName(value: string): string {
|
||||
return value
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.replace(/[^a-z0-9_]+/g, '_')
|
||||
.replace(/^_+|_+$/g, '')
|
||||
.slice(0, EVENT_NAME_LIMIT);
|
||||
}
|
||||
|
||||
const JOURNEY_STORAGE_KEY = 'goodwalk:journey:v1';
|
||||
const JOURNEY_BUFFER_LIMIT = 30;
|
||||
|
||||
type JourneyEntry = {
|
||||
name: string;
|
||||
page_path: string;
|
||||
label: string;
|
||||
ts: number;
|
||||
};
|
||||
|
||||
function pushJourneyBuffer(entry: JourneyEntry): void {
|
||||
if (typeof sessionStorage === 'undefined') return;
|
||||
try {
|
||||
const raw = sessionStorage.getItem(JOURNEY_STORAGE_KEY);
|
||||
const list: JourneyEntry[] = raw ? JSON.parse(raw) : [];
|
||||
list.push(entry);
|
||||
if (list.length > JOURNEY_BUFFER_LIMIT) list.splice(0, list.length - JOURNEY_BUFFER_LIMIT);
|
||||
sessionStorage.setItem(JOURNEY_STORAGE_KEY, JSON.stringify(list));
|
||||
} catch {
|
||||
// sessionStorage can throw on quota / private mode — ignore.
|
||||
}
|
||||
}
|
||||
|
||||
function readJourneyBuffer(): JourneyEntry[] {
|
||||
if (typeof sessionStorage === 'undefined') return [];
|
||||
try {
|
||||
const raw = sessionStorage.getItem(JOURNEY_STORAGE_KEY);
|
||||
return raw ? (JSON.parse(raw) as JourneyEntry[]) : [];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function clearJourneyBuffer(): void {
|
||||
if (typeof sessionStorage === 'undefined') return;
|
||||
try {
|
||||
sessionStorage.removeItem(JOURNEY_STORAGE_KEY);
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
function sendToServerTrack(payload: Record<string, unknown>): void {
|
||||
if (typeof navigator === 'undefined') return;
|
||||
const body = JSON.stringify(payload);
|
||||
// sendBeacon survives page unloads (link clicks, form submits) where a
|
||||
// regular fetch would be cancelled. Falls back to fetch+keepalive.
|
||||
if (typeof navigator.sendBeacon === 'function') {
|
||||
const blob = new Blob([body], { type: 'application/json' });
|
||||
if (navigator.sendBeacon('/api/track', blob)) return;
|
||||
}
|
||||
try {
|
||||
fetch('/api/track', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body,
|
||||
keepalive: true
|
||||
}).catch(() => {});
|
||||
} catch {
|
||||
// analytics must never throw into the UI
|
||||
}
|
||||
}
|
||||
|
||||
export function trackEvent(eventName: string, params: Record<string, unknown> = {}): void {
|
||||
const normalizedName = sanitizeEventName(eventName);
|
||||
if (!normalizedName) return;
|
||||
|
||||
const enriched: Record<string, unknown> = {
|
||||
page_path: window.location.pathname + window.location.search,
|
||||
page_location: window.location.href,
|
||||
...params
|
||||
};
|
||||
|
||||
const send = gtag();
|
||||
if (!send) return;
|
||||
send('event', 'page_view', {
|
||||
const gtagMissing = !send;
|
||||
if (send) {
|
||||
send('event', normalizedName, enriched);
|
||||
}
|
||||
|
||||
// Always fire to /api/track for two reasons:
|
||||
// 1. Persists into session_events for journey reconstruction on submit.
|
||||
// 2. When gtag is missing (ad blocker), `forward_ga4: true` tells the
|
||||
// server to also forward to GA4 so we don't lose the hit.
|
||||
// De-dup: when gtag IS present, GA4 receives the event exactly once
|
||||
// (client). When gtag is missing, GA4 receives it exactly once (server).
|
||||
sendToServerTrack({
|
||||
name: normalizedName,
|
||||
params: enriched,
|
||||
forward_ga4: gtagMissing
|
||||
});
|
||||
|
||||
// Client-side rolling buffer used as a fallback inside /api/track/promote
|
||||
// for environments where the server-side write was also blocked.
|
||||
pushJourneyBuffer({
|
||||
name: normalizedName,
|
||||
page_path: typeof enriched.page_path === 'string' ? enriched.page_path : '',
|
||||
label: typeof enriched.label === 'string' ? enriched.label : '',
|
||||
ts: Date.now()
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Called from the booking form on successful submission to link the
|
||||
* visitor's recent browsing journey to their submitted email. See
|
||||
* docs/server-side-analytics.md for the full flow.
|
||||
*/
|
||||
export function promoteJourney(email: string): void {
|
||||
if (typeof navigator === 'undefined') return;
|
||||
const trimmed = email.trim().toLowerCase();
|
||||
if (!trimmed) return;
|
||||
const payload = JSON.stringify({
|
||||
email: trimmed,
|
||||
client_events: readJourneyBuffer()
|
||||
});
|
||||
if (typeof navigator.sendBeacon === 'function') {
|
||||
const blob = new Blob([payload], { type: 'application/json' });
|
||||
if (navigator.sendBeacon('/api/track/promote', blob)) {
|
||||
clearJourneyBuffer();
|
||||
return;
|
||||
}
|
||||
}
|
||||
try {
|
||||
fetch('/api/track/promote', {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: payload,
|
||||
keepalive: true
|
||||
})
|
||||
.then(() => clearJourneyBuffer())
|
||||
.catch(() => {});
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
export function trackPageView(path: string, title: string): void {
|
||||
trackEvent('page_view', {
|
||||
page_path: path,
|
||||
page_title: title,
|
||||
page_location: window.location.href
|
||||
@@ -20,11 +167,11 @@ export function trackPageView(path: string, title: string): void {
|
||||
|
||||
function getLabel(el: HTMLElement): string {
|
||||
const aria = el.getAttribute('aria-label');
|
||||
if (aria) return aria.trim().slice(0, TEXT_LIMIT);
|
||||
const text = (el.textContent ?? '').replace(/\s+/g, ' ').trim();
|
||||
if (text) return text.slice(0, TEXT_LIMIT);
|
||||
if (aria) return sanitizeValue(aria);
|
||||
const text = sanitizeValue(el.textContent ?? '');
|
||||
if (text) return text;
|
||||
const title = el.getAttribute('title');
|
||||
if (title) return title.trim().slice(0, TEXT_LIMIT);
|
||||
if (title) return sanitizeValue(title);
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -41,38 +188,58 @@ function getLocation(el: HTMLElement): string {
|
||||
return 'body';
|
||||
}
|
||||
|
||||
function getTextParam(el: HTMLElement): string {
|
||||
const explicit = el.dataset.trackText;
|
||||
if (explicit) return sanitizeValue(explicit);
|
||||
return getLabel(el);
|
||||
}
|
||||
|
||||
function getHrefParams(href: string) {
|
||||
try {
|
||||
const url = new URL(href, window.location.href);
|
||||
return {
|
||||
link_url: href,
|
||||
destination_path: `${url.pathname}${url.search}${url.hash}`,
|
||||
destination_host: url.hostname,
|
||||
outbound: url.hostname !== window.location.hostname
|
||||
};
|
||||
} catch {
|
||||
return {
|
||||
link_url: href,
|
||||
outbound: false
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export function initClickTracking(): () => void {
|
||||
if (typeof window === 'undefined') return () => {};
|
||||
|
||||
const handler = (event: MouseEvent) => {
|
||||
const send = gtag();
|
||||
if (!send) return;
|
||||
const target = event.target;
|
||||
if (!(target instanceof Element)) return;
|
||||
const interactive = target.closest<HTMLElement>('a, button, [role="button"]');
|
||||
if (!interactive) return;
|
||||
|
||||
const isLink = interactive.tagName === 'A';
|
||||
const label = getLabel(interactive);
|
||||
const eventName = interactive.dataset.trackEvent || (isLink ? 'link_click' : 'button_click');
|
||||
const label = interactive.dataset.trackLabel ? sanitizeValue(interactive.dataset.trackLabel) : getLabel(interactive);
|
||||
const location = getLocation(interactive);
|
||||
|
||||
const params: Record<string, unknown> = {
|
||||
element: isLink ? 'link' : 'button',
|
||||
label,
|
||||
location,
|
||||
page_path: window.location.pathname
|
||||
text: getTextParam(interactive)
|
||||
};
|
||||
|
||||
if (interactive.dataset.trackType) params.track_type = sanitizeValue(interactive.dataset.trackType);
|
||||
if (interactive.dataset.trackContext) params.track_context = sanitizeValue(interactive.dataset.trackContext);
|
||||
if (interactive.dataset.trackVariant) params.track_variant = sanitizeValue(interactive.dataset.trackVariant);
|
||||
|
||||
if (isLink) {
|
||||
const href = (interactive as HTMLAnchorElement).href;
|
||||
if (href) {
|
||||
params.link_url = href;
|
||||
try {
|
||||
const url = new URL(href, window.location.href);
|
||||
params.outbound = url.hostname !== window.location.hostname;
|
||||
} catch {
|
||||
params.outbound = false;
|
||||
}
|
||||
Object.assign(params, getHrefParams(href));
|
||||
}
|
||||
} else {
|
||||
const btn = interactive as HTMLButtonElement;
|
||||
@@ -80,7 +247,7 @@ export function initClickTracking(): () => void {
|
||||
if (btn.name) params.button_name = btn.name;
|
||||
}
|
||||
|
||||
send('event', isLink ? 'link_click' : 'button_click', params);
|
||||
trackEvent(eventName, params);
|
||||
};
|
||||
|
||||
document.addEventListener('click', handler, { capture: true });
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
<script lang="ts">
|
||||
import BookingSection from '$lib/components/BookingSection.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import InfoSection from '$lib/components/InfoSection.svelte';
|
||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||
import type { BookingContent, InfoContent } from '$lib/types';
|
||||
|
||||
export let booking: BookingContent;
|
||||
export let info: InfoContent;
|
||||
export let allowGeneralEnquiry = false;
|
||||
|
||||
const email = 'info@goodwalk.co.nz';
|
||||
const phone = '(022) 642 1011';
|
||||
const phoneHref = `tel:${phone.replace(/[^0-9+]/g, '')}`;
|
||||
</script>
|
||||
|
||||
<main class="booking-page">
|
||||
<PageHeader
|
||||
variant="green"
|
||||
title="Contact Us"
|
||||
subtitle={allowGeneralEnquiry
|
||||
? "Book a Meet & Greet or send a general enquiry. We'll come back within 24 hours."
|
||||
: "Tell us a little about your dog and we'll be in touch within 24 hours to arrange a free Meet & Greet."}
|
||||
>
|
||||
<div class="booking-page-contact">
|
||||
<a href="mailto:{email}" class="booking-contact-link">
|
||||
<Icon name="fas fa-envelope" />
|
||||
{email}
|
||||
</a>
|
||||
<a href={phoneHref} class="booking-contact-link">
|
||||
<Icon name="fas fa-phone" />
|
||||
{phone}
|
||||
</a>
|
||||
</div>
|
||||
</PageHeader>
|
||||
|
||||
<BookingSection {booking} {allowGeneralEnquiry} variant="contact-modern" />
|
||||
<InfoSection {info} />
|
||||
</main>
|
||||
|
||||
<style>
|
||||
.booking-page {
|
||||
background: var(--off-white);
|
||||
}
|
||||
|
||||
.booking-page-contact {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 24px;
|
||||
flex-wrap: wrap;
|
||||
margin-top: 28px;
|
||||
}
|
||||
|
||||
.booking-contact-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px 20px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.12);
|
||||
border: 1px solid rgba(255, 255, 255, 0.18);
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
line-height: 1.2;
|
||||
letter-spacing: 0.01em;
|
||||
color: #fff;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.booking-contact-link:hover {
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.booking-page-contact {
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.booking-contact-link {
|
||||
font-size: 13px;
|
||||
padding: 9px 16px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,162 +0,0 @@
|
||||
<script lang="ts">
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import type { HomePageContent } from '$lib/types';
|
||||
|
||||
export let instagram: HomePageContent['instagram'];
|
||||
|
||||
</script>
|
||||
|
||||
<aside id="instagram" aria-label="Follow Goodwalk on Instagram">
|
||||
<div class="instagram-stage">
|
||||
<div class="instagram-panel">
|
||||
<div class="instagram-copy">
|
||||
<span class="eyebrow instagram-kicker">Daily walks, happy dogs</span>
|
||||
<h2>{instagram.title}</h2>
|
||||
<p class="instagram-blurb">See our dogs in action — walks, play, and happy pups</p>
|
||||
<a href={instagram.href} target="_blank" rel="noopener" class="btn btn-green instagram-button">
|
||||
<Icon name="fab fa-instagram" />
|
||||
{instagram.label}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="instagram-dog-wrap" aria-hidden="true">
|
||||
<enhanced:img src="$lib/images/goodwalk-instagram-dog-cutout.webp" alt="" class="instagram-dog" loading="lazy" decoding="async" />
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<style>
|
||||
#instagram {
|
||||
content-visibility: auto;
|
||||
contain-intrinsic-size: 360px;
|
||||
overflow: hidden;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.instagram-stage {
|
||||
position: relative;
|
||||
max-width: 1040px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.instagram-panel {
|
||||
position: relative;
|
||||
min-height: 150px;
|
||||
padding: 24px 320px 24px 44px;
|
||||
border-radius: 28px;
|
||||
background:
|
||||
radial-gradient(circle at top left, rgba(255, 255, 255, 0.52), transparent 42%),
|
||||
linear-gradient(135deg, rgba(255, 252, 242, 0.98), rgba(255, 243, 198, 0.96));
|
||||
box-shadow:
|
||||
inset 0 0 0 1px rgba(17, 20, 24, 0.06),
|
||||
0 26px 50px rgba(106, 80, 16, 0.14);
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.instagram-copy {
|
||||
max-width: 580px;
|
||||
margin: 0;
|
||||
text-align: left;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.instagram-kicker {
|
||||
/* All visual styling comes from the shared .eyebrow utility. */
|
||||
display: inline-block;
|
||||
margin: 0 0 10px;
|
||||
}
|
||||
|
||||
.instagram-copy :global(h2) {
|
||||
max-width: none;
|
||||
margin: 0 0 6px;
|
||||
font-size: 22px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.instagram-blurb {
|
||||
max-width: 520px;
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.instagram-button {
|
||||
margin-top: 14px;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.instagram-dog-wrap {
|
||||
position: absolute;
|
||||
right: -56px;
|
||||
bottom: -14px;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
justify-content: center;
|
||||
width: 380px;
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.instagram-dog {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
@media (min-width: 1800px) {
|
||||
.instagram-stage {
|
||||
max-width: 1144px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
#instagram {
|
||||
padding-bottom: 120px;
|
||||
}
|
||||
|
||||
.instagram-panel {
|
||||
padding: 30px 24px 180px;
|
||||
border-radius: 28px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.instagram-copy {
|
||||
max-width: none;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.instagram-copy :global(h2) {
|
||||
max-width: none;
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
.instagram-blurb {
|
||||
max-width: none;
|
||||
font-size: inherit;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.instagram-button {
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
.instagram-dog-wrap {
|
||||
left: 50%;
|
||||
right: auto;
|
||||
bottom: -96px;
|
||||
width: min(300px, calc(100% - 32px));
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.instagram-dog {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,688 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { reveal } from '$lib/actions/reveal';
|
||||
import BookingSection from '$lib/components/BookingSection.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||
import PricingPlanCard from '$lib/components/PricingPlanCard.svelte';
|
||||
import TestimonialsSection from '$lib/components/TestimonialsSection.svelte';
|
||||
import { decoratePlans } from '$lib/utils/pricing';
|
||||
import type { PricingPageContent, SiteSharedContent } from '$lib/types';
|
||||
|
||||
export let content: SiteSharedContent;
|
||||
export let pageContent: PricingPageContent;
|
||||
|
||||
onMount(() => {
|
||||
/* eslint-disable no-console */
|
||||
console.log(
|
||||
'%c🐾 If you are reading this, you love dogs.\n So do we. Come say hi: hello@goodwalk.co.nz',
|
||||
'color:#213021;font:600 13px/1.5 system-ui;padding:6px 0'
|
||||
);
|
||||
});
|
||||
|
||||
const includedPromises = [
|
||||
{ icon: 'fas fa-handshake', label: 'Free Meet & Greet first' },
|
||||
{ icon: 'fas fa-car', label: 'Pickup and drop-off included' },
|
||||
{ icon: 'fas fa-user-check', label: 'Same walker every week' },
|
||||
{ icon: 'fas fa-rotate-left', label: 'No contracts, cancel anytime' }
|
||||
];
|
||||
|
||||
</script>
|
||||
|
||||
<main class="pricing-page">
|
||||
<PageHeader variant="green" title={pageContent.title} subtitle={pageContent.subtitle}>
|
||||
<a
|
||||
class="pricing-trust"
|
||||
href="https://g.page/r/CUsvrWPhkYrAEB0/"
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
aria-label="Read our 5-star Google reviews"
|
||||
>
|
||||
<img
|
||||
class="pricing-trust-logo"
|
||||
src="/images/google-g-logo.svg"
|
||||
alt=""
|
||||
width="18"
|
||||
height="19"
|
||||
/>
|
||||
<span class="pricing-trust-stars" aria-hidden="true">
|
||||
{#each Array(5) as _}
|
||||
<Icon name="fas fa-star" />
|
||||
{/each}
|
||||
</span>
|
||||
<span class="pricing-trust-label">30+ 5-star Google reviews, trusted by Auckland dog owners</span>
|
||||
<Icon name="fas fa-arrow-right" className="pricing-trust-arrow" />
|
||||
</a>
|
||||
</PageHeader>
|
||||
|
||||
{#if pageContent.comparison}
|
||||
<section use:reveal class="pricing-block pricing-block--lead reveal-block">
|
||||
<div class="page-inner">
|
||||
<div class="section-header pricing-section-header">
|
||||
<span class="eyebrow">How to choose</span>
|
||||
<h2 class="section-heading">{pageContent.comparison.title}</h2>
|
||||
{#if pageContent.comparison.intro}
|
||||
<p class="section-intro">{pageContent.comparison.intro}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<p class="pricing-attribution">
|
||||
<img
|
||||
class="pricing-attribution-avatar"
|
||||
src="/images/alessandra-goodwalk-founder-auckland.webp"
|
||||
alt="Aless, Goodwalk founder"
|
||||
width="40"
|
||||
height="40"
|
||||
/>
|
||||
<span class="pricing-attribution-body">
|
||||
<span class="pricing-attribution-name">
|
||||
<span class="pricing-attribution-paw" aria-hidden="true">
|
||||
<Icon name="fas fa-paw" />
|
||||
</span>
|
||||
Aless, Goodwalk founder
|
||||
<svg
|
||||
class="pricing-attribution-sig"
|
||||
viewBox="0 0 120 8"
|
||||
fill="none"
|
||||
aria-hidden="true"
|
||||
focusable="false"
|
||||
>
|
||||
<path
|
||||
d="M2 5 Q 14 1, 26 4 T 50 4 T 74 5 T 98 3 T 118 4"
|
||||
stroke="currentColor"
|
||||
stroke-width="1.6"
|
||||
stroke-linecap="round"
|
||||
/>
|
||||
</svg>
|
||||
</span>
|
||||
<span class="pricing-attribution-text">
|
||||
Most owners start with Tiny Gang, but the right answer is whichever fits your dog.
|
||||
If you are not sure, the free Meet & Greet is the easiest way to work it out.
|
||||
</span>
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
</section>
|
||||
{/if}
|
||||
|
||||
{#each pageContent.sections as section, sectionIndex}
|
||||
<section
|
||||
use:reveal
|
||||
class="pricing-block pricing-block--plans reveal-block"
|
||||
class:pricing-block--tinted={sectionIndex % 2 === 1}
|
||||
>
|
||||
<div class="page-inner">
|
||||
{#if sectionIndex > 0}
|
||||
<div class="pricing-section-divider" aria-hidden="true">
|
||||
<span class="pricing-section-divider-mark">
|
||||
<Icon name="fas fa-paw" />
|
||||
</span>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="section-header pricing-section-header">
|
||||
{#if section.icon}
|
||||
<span class="pricing-section-emblem" aria-hidden="true">
|
||||
<Icon name={section.icon} className="pricing-section-emblem-glyph" />
|
||||
</span>
|
||||
{/if}
|
||||
{#if section.eyebrow}
|
||||
<span class="eyebrow">{section.eyebrow}</span>
|
||||
{/if}
|
||||
<h2 class="section-heading">{section.title}</h2>
|
||||
{#if section.lede ?? section.blurb}
|
||||
<p class="section-intro">{section.lede ?? section.blurb}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if section.meta?.length}
|
||||
<ul class="pricing-meta-chips" aria-label="{section.title} at a glance">
|
||||
{#each section.meta as item}
|
||||
<li class="pricing-meta-chip">
|
||||
<span class="pricing-meta-chip-label">{item.label}</span>
|
||||
<span class="pricing-meta-chip-value">{item.value}</span>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
|
||||
{#if section.detailCta}
|
||||
<p class="pricing-section-link-wrap">
|
||||
<a class="pricing-block-link" href={section.detailCta.href}>
|
||||
<span>{section.detailCta.label}</span>
|
||||
<Icon name="fas fa-arrow-right" />
|
||||
</a>
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
<div class:pricing-plan-grid-three={section.plans.length === 3} class="pricing-plan-grid">
|
||||
{#each decoratePlans(section.plans) as plan}
|
||||
<PricingPlanCard {plan} variant="pricing" />
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{/each}
|
||||
|
||||
<section use:reveal class="pricing-block pricing-block--promise pricing-block--tinted reveal-block">
|
||||
<div class="page-inner">
|
||||
<div class="section-header pricing-section-header">
|
||||
<span class="eyebrow">What every booking includes</span>
|
||||
<h2 class="section-heading">Built around trust, not contracts.</h2>
|
||||
</div>
|
||||
|
||||
<ul class="pricing-promise-row" aria-label="What every Goodwalk booking includes">
|
||||
{#each includedPromises as promise}
|
||||
<li class="pricing-promise">
|
||||
<span class="pricing-promise-icon" aria-hidden="true">
|
||||
<Icon name={promise.icon} />
|
||||
</span>
|
||||
<span class="pricing-promise-label">{promise.label}</span>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<TestimonialsSection
|
||||
heading={pageContent.testimonialsHeading}
|
||||
testimonials={content.testimonials}
|
||||
seedKey="/our-pricing"
|
||||
/>
|
||||
<BookingSection booking={pageContent.booking} variant="card-stepper" />
|
||||
</main>
|
||||
|
||||
<style>
|
||||
.pricing-page {
|
||||
background: var(--off-white);
|
||||
}
|
||||
|
||||
/* ── Trust pill in header ── */
|
||||
.pricing-trust {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin-top: 22px;
|
||||
padding: 9px 18px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.10);
|
||||
border: 1px solid rgba(255, 255, 255, 0.18);
|
||||
color: var(--text-inverse);
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
line-height: 1.2;
|
||||
letter-spacing: 0.01em;
|
||||
text-decoration: none;
|
||||
transition:
|
||||
background 0.2s ease,
|
||||
transform 0.22s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.pricing-trust-logo {
|
||||
width: 18px;
|
||||
height: 19px;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.pricing-trust:hover {
|
||||
background: rgba(255, 255, 255, 0.18);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
.pricing-trust-stars {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
color: var(--yellow);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
:global(.pricing-trust .pricing-trust-arrow) {
|
||||
font-size: 12px;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
/* ── Section rhythm ── */
|
||||
.pricing-block {
|
||||
padding: 56px 0 40px;
|
||||
}
|
||||
|
||||
.pricing-block--lead {
|
||||
padding-top: 48px;
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.pricing-block:last-of-type {
|
||||
padding-bottom: 64px;
|
||||
}
|
||||
|
||||
.pricing-block--plans {
|
||||
padding-top: 56px;
|
||||
padding-bottom: 56px;
|
||||
}
|
||||
|
||||
.pricing-block--promise {
|
||||
padding-top: 56px;
|
||||
padding-bottom: 56px;
|
||||
}
|
||||
|
||||
/* ── Surface alternation (chapter banding) ─────────
|
||||
Lead + sections 1/3 stay on the page cream.
|
||||
Section 2 + promise sit on a slightly warmer cream.
|
||||
*/
|
||||
.pricing-block--tinted {
|
||||
background: var(--surface-panel-cream);
|
||||
}
|
||||
|
||||
/* ── Section divider (paw on hairline) ── */
|
||||
.pricing-section-divider {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
max-width: 460px;
|
||||
margin: 0 auto 32px;
|
||||
color: var(--gw-green);
|
||||
opacity: 0.55;
|
||||
}
|
||||
|
||||
.pricing-section-divider::before,
|
||||
.pricing-section-divider::after {
|
||||
content: '';
|
||||
flex: 1;
|
||||
height: 1px;
|
||||
background: currentColor;
|
||||
opacity: 0.35;
|
||||
}
|
||||
|
||||
.pricing-section-divider-mark {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
border-radius: 999px;
|
||||
background: var(--off-white);
|
||||
color: var(--gw-green);
|
||||
font-size: 13px;
|
||||
box-shadow: inset 0 0 0 1px rgba(33, 48, 33, 0.18);
|
||||
}
|
||||
|
||||
.pricing-block--tinted .pricing-section-divider-mark {
|
||||
background: var(--surface-panel-cream);
|
||||
}
|
||||
|
||||
/* ── Section header (uses global .section-header / .section-heading / .eyebrow / .section-intro) ── */
|
||||
.pricing-section-header {
|
||||
margin-bottom: 22px;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
/* Green emblem tile — canonical Goodwalk identity above each service heading */
|
||||
.pricing-section-emblem {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 64px;
|
||||
height: 64px;
|
||||
margin-bottom: 4px;
|
||||
justify-self: center;
|
||||
border-radius: 20px;
|
||||
background: var(--gw-green);
|
||||
box-shadow: 0 12px 28px rgba(33, 48, 33, 0.20);
|
||||
}
|
||||
|
||||
:global(.pricing-section-emblem .pricing-section-emblem-glyph) {
|
||||
color: var(--yellow);
|
||||
font-size: 26px;
|
||||
}
|
||||
|
||||
/* ── Meta chip row (centered label · value pills) ── */
|
||||
.pricing-meta-chips {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
margin: 0 auto 18px;
|
||||
padding: 0;
|
||||
max-width: 940px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.pricing-meta-chip {
|
||||
display: inline-flex;
|
||||
align-items: baseline;
|
||||
gap: 10px;
|
||||
padding: 9px 16px;
|
||||
border-radius: 999px;
|
||||
background: var(--surface-panel);
|
||||
border: 1px solid rgba(33, 48, 33, 0.10);
|
||||
color: var(--text-heading);
|
||||
font-size: 13px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.pricing-meta-chip-label {
|
||||
color: var(--gw-green);
|
||||
font-family: var(--font-head);
|
||||
font-size: 10.5px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.10em;
|
||||
text-transform: uppercase;
|
||||
opacity: 0.78;
|
||||
}
|
||||
|
||||
.pricing-meta-chip-value {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
/* ── Section CTA link (centered under chips) ── */
|
||||
.pricing-section-link-wrap {
|
||||
margin: 0 auto 28px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.pricing-block-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
color: var(--gw-green);
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
text-decoration: none;
|
||||
transition: gap 0.22s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.pricing-block-link :global(.icon) {
|
||||
font-size: 11px;
|
||||
transition: transform 0.22s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.pricing-block-link:hover {
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.pricing-block-link:hover :global(.icon) {
|
||||
transform: translateX(2px);
|
||||
}
|
||||
|
||||
/* ── Aless attribution (signed-note feel, centered) ── */
|
||||
.pricing-attribution {
|
||||
display: inline-flex;
|
||||
align-items: flex-start;
|
||||
gap: 16px;
|
||||
margin: 26px auto 0;
|
||||
padding: 16px 22px 16px 14px;
|
||||
border-radius: 20px;
|
||||
background: var(--surface-panel);
|
||||
border: 1px solid rgba(33, 48, 33, 0.12);
|
||||
color: var(--text-heading);
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
max-width: 640px;
|
||||
text-align: left;
|
||||
transition:
|
||||
transform 0.32s cubic-bezier(0.22, 1, 0.36, 1),
|
||||
border-color 0.22s ease;
|
||||
}
|
||||
|
||||
.pricing-block--lead .page-inner {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.pricing-attribution:hover {
|
||||
transform: rotate(-0.4deg) translateY(-2px);
|
||||
border-color: rgba(33, 48, 33, 0.22);
|
||||
}
|
||||
|
||||
.pricing-attribution:hover .pricing-attribution-avatar {
|
||||
transform: rotate(2deg) scale(1.04);
|
||||
}
|
||||
}
|
||||
|
||||
.pricing-attribution-avatar {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
object-position: center top;
|
||||
flex: 0 0 auto;
|
||||
transition: transform 0.32s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.pricing-attribution-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.pricing-attribution-name {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
position: relative;
|
||||
align-self: flex-start;
|
||||
color: var(--gw-green);
|
||||
font-family: var(--font-head);
|
||||
font-weight: 700;
|
||||
font-size: 13px;
|
||||
letter-spacing: 0.01em;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
||||
.pricing-attribution-paw {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
color: var(--gw-green);
|
||||
font-size: 10px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.pricing-attribution-sig {
|
||||
position: absolute;
|
||||
left: 26px;
|
||||
right: 0;
|
||||
bottom: -2px;
|
||||
width: calc(100% - 26px);
|
||||
height: 8px;
|
||||
color: var(--gw-green);
|
||||
opacity: 0.55;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.pricing-attribution-text {
|
||||
color: var(--text-heading);
|
||||
}
|
||||
|
||||
/* ── Plan grid (centered, tighter) ── */
|
||||
.pricing-plan-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
gap: 16px;
|
||||
max-width: 1120px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.pricing-plan-grid-three {
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
max-width: 880px;
|
||||
}
|
||||
|
||||
/* ── Promise row (centered, no card chrome) ── */
|
||||
.pricing-promise-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 18px 32px;
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
max-width: 860px;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.pricing-promise {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
transition: transform 0.28s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.pricing-promise-icon {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
border-radius: 10px;
|
||||
background: rgba(33, 48, 33, 0.06);
|
||||
color: var(--gw-green);
|
||||
font-size: 13px;
|
||||
flex: 0 0 auto;
|
||||
transition:
|
||||
background 0.28s ease,
|
||||
color 0.28s ease,
|
||||
transform 0.32s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.pricing-promise:hover {
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.pricing-promise:hover .pricing-promise-icon {
|
||||
background: var(--gw-green);
|
||||
color: var(--yellow);
|
||||
transform: rotate(-4deg);
|
||||
}
|
||||
}
|
||||
|
||||
.pricing-promise-label {
|
||||
color: var(--text-heading);
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
/* ── Reduced motion: drop rotational delights, keep color/lift ── */
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.pricing-attribution,
|
||||
.pricing-attribution-avatar,
|
||||
.pricing-promise,
|
||||
.pricing-promise-icon {
|
||||
transition: none;
|
||||
}
|
||||
|
||||
.pricing-attribution:hover,
|
||||
.pricing-attribution:hover .pricing-attribution-avatar,
|
||||
.pricing-promise:hover .pricing-promise-icon {
|
||||
transform: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Responsive ── */
|
||||
@media (max-width: 1024px) {
|
||||
.pricing-plan-grid,
|
||||
.pricing-plan-grid-three {
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.pricing-block {
|
||||
padding: 40px 0 32px;
|
||||
}
|
||||
|
||||
.pricing-block--lead {
|
||||
padding-top: 32px;
|
||||
padding-bottom: 12px;
|
||||
}
|
||||
|
||||
.pricing-block:last-of-type {
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.pricing-block--plans,
|
||||
.pricing-block--promise {
|
||||
padding-top: 40px;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.pricing-section-divider {
|
||||
margin-bottom: 24px;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.pricing-section-divider-mark {
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.pricing-section-header {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
.pricing-section-emblem {
|
||||
width: 54px;
|
||||
height: 54px;
|
||||
margin-bottom: 2px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
:global(.pricing-section-emblem .pricing-section-emblem-glyph) {
|
||||
font-size: 21px;
|
||||
}
|
||||
|
||||
.pricing-meta-chips {
|
||||
gap: 8px;
|
||||
margin-bottom: 22px;
|
||||
}
|
||||
|
||||
.pricing-meta-chip {
|
||||
padding: 8px 14px;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
|
||||
.pricing-section-link-wrap {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.pricing-attribution {
|
||||
max-width: none;
|
||||
gap: 12px;
|
||||
padding: 12px 16px 12px 10px;
|
||||
border-radius: 22px;
|
||||
font-size: 13px;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.pricing-attribution-avatar {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
.pricing-trust {
|
||||
gap: 10px;
|
||||
padding: 10px 14px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.pricing-plan-grid,
|
||||
.pricing-plan-grid-three {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.pricing-promise-row {
|
||||
gap: 18px 24px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,297 @@
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher, onMount } from 'svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
|
||||
export let value = '';
|
||||
export let disabled = false;
|
||||
export let placeholder = 'Write your message…';
|
||||
// Optional one-tap insert chips, e.g. the client's first name / dog name.
|
||||
export let tokens: { label: string; value: string }[] = [];
|
||||
|
||||
const dispatch = createEventDispatcher<{ input: string }>();
|
||||
|
||||
let editor: HTMLDivElement;
|
||||
let focused = false;
|
||||
// Remember the HTML we last pushed into the DOM so external `value` changes
|
||||
// (presets, reopening the dialog) update the editor without fighting the
|
||||
// caret while the owner is actively typing.
|
||||
let lastSet = '';
|
||||
|
||||
function sync() {
|
||||
const html = editor?.innerHTML ?? '';
|
||||
value = html;
|
||||
lastSet = html;
|
||||
dispatch('input', html);
|
||||
}
|
||||
|
||||
$: if (editor && value !== lastSet && !focused) {
|
||||
editor.innerHTML = value || '';
|
||||
lastSet = value;
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
if (editor) {
|
||||
editor.innerHTML = value || '';
|
||||
lastSet = value || '';
|
||||
}
|
||||
});
|
||||
|
||||
function exec(command: string, arg?: string) {
|
||||
if (disabled) return;
|
||||
editor?.focus();
|
||||
document.execCommand(command, false, arg);
|
||||
sync();
|
||||
}
|
||||
|
||||
// Turn the selected line(s) into a heading (or back to a normal paragraph).
|
||||
// The bracketed tag form is the one browsers accept consistently for formatBlock.
|
||||
function setBlock(tag: string) {
|
||||
if (disabled) return;
|
||||
editor?.focus();
|
||||
document.execCommand('formatBlock', false, `<${tag}>`);
|
||||
sync();
|
||||
}
|
||||
|
||||
function addLink() {
|
||||
if (disabled) return;
|
||||
editor?.focus();
|
||||
const url = window.prompt('Link address (e.g. https://goodwalk.co.nz)');
|
||||
if (!url) return;
|
||||
const trimmed = url.trim();
|
||||
const href = /^(https?:|mailto:)/i.test(trimmed) ? trimmed : `https://${trimmed}`;
|
||||
document.execCommand('createLink', false, href);
|
||||
sync();
|
||||
}
|
||||
|
||||
function insertToken(token: string) {
|
||||
if (disabled) return;
|
||||
editor?.focus();
|
||||
document.execCommand('insertText', false, token);
|
||||
sync();
|
||||
}
|
||||
|
||||
// Plain-text view of the content drives the placeholder + lets the parent
|
||||
// validate that the message isn't empty.
|
||||
$: plainText = (value || '').replace(/<[^>]*>/g, '').replace(/ /g, ' ').trim();
|
||||
$: isEmpty = plainText.length === 0;
|
||||
</script>
|
||||
|
||||
<div class="rte" class:rte-disabled={disabled}>
|
||||
<div class="rte-toolbar">
|
||||
<button type="button" class="rte-btn rte-btn-text" title="Large heading" aria-label="Large heading" on:click={() => setBlock('h1')} disabled={disabled}>
|
||||
H1
|
||||
</button>
|
||||
<button type="button" class="rte-btn rte-btn-text" title="Medium heading" aria-label="Medium heading" on:click={() => setBlock('h2')} disabled={disabled}>
|
||||
H2
|
||||
</button>
|
||||
<button type="button" class="rte-btn rte-btn-text" title="Small heading" aria-label="Small heading" on:click={() => setBlock('h3')} disabled={disabled}>
|
||||
H3
|
||||
</button>
|
||||
<button type="button" class="rte-btn" title="Normal text" aria-label="Normal text" on:click={() => setBlock('p')} disabled={disabled}>
|
||||
<Icon name="fas fa-paragraph" />
|
||||
</button>
|
||||
<span class="rte-sep" aria-hidden="true"></span>
|
||||
<button type="button" class="rte-btn" title="Bold" aria-label="Bold" on:click={() => exec('bold')} disabled={disabled}>
|
||||
<Icon name="fas fa-bold" />
|
||||
</button>
|
||||
<button type="button" class="rte-btn" title="Italic" aria-label="Italic" on:click={() => exec('italic')} disabled={disabled}>
|
||||
<Icon name="fas fa-italic" />
|
||||
</button>
|
||||
<button type="button" class="rte-btn" title="Bulleted list" aria-label="Bulleted list" on:click={() => exec('insertUnorderedList')} disabled={disabled}>
|
||||
<Icon name="fas fa-list-ul" />
|
||||
</button>
|
||||
<button type="button" class="rte-btn" title="Add a link" aria-label="Add a link" on:click={addLink} disabled={disabled}>
|
||||
<Icon name="fas fa-link" />
|
||||
</button>
|
||||
{#if tokens.length}
|
||||
<span class="rte-sep" aria-hidden="true"></span>
|
||||
{#each tokens as t}
|
||||
<button type="button" class="rte-token" on:click={() => insertToken(t.value)} disabled={disabled}>
|
||||
+ {t.label}
|
||||
</button>
|
||||
{/each}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="rte-surface">
|
||||
<div
|
||||
class="rte-input"
|
||||
bind:this={editor}
|
||||
contenteditable={!disabled}
|
||||
role="textbox"
|
||||
aria-multiline="true"
|
||||
aria-label="Message"
|
||||
tabindex="0"
|
||||
on:input={sync}
|
||||
on:focus={() => (focused = true)}
|
||||
on:blur={() => { focused = false; sync(); }}
|
||||
></div>
|
||||
{#if isEmpty}
|
||||
<div class="rte-placeholder" aria-hidden="true">{placeholder}</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.rte {
|
||||
border: 1px solid rgba(33, 48, 33, 0.16);
|
||||
border-radius: 14px;
|
||||
background: #fff;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.rte-disabled {
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.rte-toolbar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 8px 10px;
|
||||
background: #f4f5f2;
|
||||
border-bottom: 1px solid rgba(33, 48, 33, 0.1);
|
||||
}
|
||||
|
||||
.rte-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid rgba(33, 48, 33, 0.14);
|
||||
background: #fff;
|
||||
color: #213021;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s ease, border-color 0.15s ease;
|
||||
}
|
||||
|
||||
.rte-btn:hover:not(:disabled) {
|
||||
background: var(--yellow, #ffd100);
|
||||
border-color: var(--yellow, #ffd100);
|
||||
}
|
||||
|
||||
.rte-btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.rte-btn-text {
|
||||
width: auto;
|
||||
min-width: 32px;
|
||||
padding: 0 9px;
|
||||
font-family: var(--font-head, inherit);
|
||||
font-size: 12px;
|
||||
font-weight: 800;
|
||||
letter-spacing: 0.01em;
|
||||
}
|
||||
|
||||
.rte-sep {
|
||||
width: 1px;
|
||||
height: 22px;
|
||||
background: rgba(33, 48, 33, 0.16);
|
||||
margin: 0 2px;
|
||||
}
|
||||
|
||||
.rte-token {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 0 12px;
|
||||
height: 32px;
|
||||
border-radius: 999px;
|
||||
border: 1px dashed rgba(33, 48, 33, 0.28);
|
||||
background: #fff;
|
||||
color: #213021;
|
||||
font-family: var(--font-head);
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s ease, border-color 0.15s ease;
|
||||
}
|
||||
|
||||
.rte-token:hover:not(:disabled) {
|
||||
background: #213021;
|
||||
border-color: #213021;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.rte-token:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.rte-surface {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.rte-input {
|
||||
min-height: 180px;
|
||||
max-height: 360px;
|
||||
overflow-y: auto;
|
||||
padding: 14px 16px;
|
||||
font-family: var(--font-body, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif);
|
||||
font-size: 15px;
|
||||
line-height: 1.6;
|
||||
color: #213021;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.rte-input:focus {
|
||||
box-shadow: inset 0 0 0 2px rgba(255, 209, 0, 0.5);
|
||||
}
|
||||
|
||||
/* Tidy the rich content the owner produces. */
|
||||
.rte-input :global(p) {
|
||||
margin: 0 0 12px;
|
||||
}
|
||||
|
||||
.rte-input :global(h1) {
|
||||
margin: 0 0 10px;
|
||||
font-size: 25px;
|
||||
line-height: 1.2;
|
||||
letter-spacing: -0.02em;
|
||||
font-weight: 800;
|
||||
color: #171b20;
|
||||
}
|
||||
|
||||
.rte-input :global(h2) {
|
||||
margin: 16px 0 8px;
|
||||
font-size: 20px;
|
||||
line-height: 1.25;
|
||||
font-weight: 800;
|
||||
color: #171b20;
|
||||
}
|
||||
|
||||
.rte-input :global(h3) {
|
||||
margin: 14px 0 6px;
|
||||
font-size: 16px;
|
||||
line-height: 1.3;
|
||||
font-weight: 800;
|
||||
color: #213021;
|
||||
}
|
||||
|
||||
.rte-input :global(ul),
|
||||
.rte-input :global(ol) {
|
||||
margin: 0 0 12px;
|
||||
padding-left: 22px;
|
||||
}
|
||||
|
||||
.rte-input :global(a) {
|
||||
color: #213021;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.rte-placeholder {
|
||||
position: absolute;
|
||||
top: 14px;
|
||||
left: 16px;
|
||||
right: 16px;
|
||||
font-size: 15px;
|
||||
line-height: 1.6;
|
||||
color: #9aa39a;
|
||||
pointer-events: none;
|
||||
}
|
||||
</style>
|
||||
@@ -109,7 +109,7 @@
|
||||
</label>
|
||||
<label class="vf-choice">
|
||||
<input type="radio" name={`${idPrefix}-service-fit`} value="one-to-one" />
|
||||
<span>1:1 Walks</span>
|
||||
<span>Solo Walks</span>
|
||||
</label>
|
||||
<label class="vf-choice">
|
||||
<input type="radio" name={`${idPrefix}-service-fit`} value="puppy-visits" />
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { accordion } from '$lib/actions/accordion';
|
||||
import { reveal } from '$lib/actions/reveal';
|
||||
import CtaCard from '$lib/components/CtaCard.svelte';
|
||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import CtaCard from '$lib/components/ui/CtaCard.svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
|
||||
import { getEnhancedImage } from '$lib/enhanced-images';
|
||||
import type { AboutPageContent } from '$lib/types';
|
||||
|
||||
@@ -11,53 +11,45 @@
|
||||
|
||||
$: standardSections = pageContent.sections.filter((s) => s.accent !== 'founder');
|
||||
$: founderSection = pageContent.sections.find((s) => s.accent === 'founder') ?? null;
|
||||
const heroChips = [
|
||||
{ icon: 'fas fa-star', label: '30+ five-star Google reviews' },
|
||||
{ icon: 'fas fa-location-dot', label: 'Auckland Central' },
|
||||
{ icon: 'fas fa-paw', label: 'Small dog specialists' }
|
||||
];
|
||||
const founderHeadingLead = 'Meet Aless,';
|
||||
const founderHeadingHighlight = 'the heart of Goodwalk';
|
||||
</script>
|
||||
|
||||
<main class="about-page">
|
||||
|
||||
<!-- ── Hero ── -->
|
||||
<PageHeader
|
||||
variant="green"
|
||||
<ServiceHero
|
||||
eyebrow="About Goodwalk"
|
||||
title={pageContent.title}
|
||||
subtitle="Small dog specialists serving Auckland Central. A team your dog knows by name."
|
||||
>
|
||||
<div class="ph-chips">
|
||||
<a
|
||||
href="https://g.page/r/CUsvrWPhkYrAEB0/"
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
class="ph-chip ph-chip--link"
|
||||
>
|
||||
<span class="about-chip-stars" aria-hidden="true">★★★★★</span>
|
||||
30+ five-star Google reviews
|
||||
</a>
|
||||
<span class="ph-chip">Auckland Central</span>
|
||||
<span class="ph-chip">Small dog specialists</span>
|
||||
</div>
|
||||
</PageHeader>
|
||||
imageUrl="/images/about-good-walk.webp"
|
||||
imageAlt="Goodwalk dogs gathered together in the back of the car before a walk"
|
||||
chips={heroChips}
|
||||
cta={{ label: 'Book a Meet & Greet', href: '/contact-us', variant: 'yellow' }}
|
||||
/>
|
||||
|
||||
<!-- ── Standard sections (Who we are, Our impact) ── -->
|
||||
{#each standardSections as section}
|
||||
{@const enhanced = getEnhancedImage(section.imageUrl)}
|
||||
<section
|
||||
use:reveal
|
||||
use:reveal={{ distance: 0 }}
|
||||
class="about-section reveal-block"
|
||||
class:about-section-gradient={section.accent === 'gradient'}
|
||||
>
|
||||
<div class="page-inner about-section-grid" class:about-section-reverse={section.reverse}>
|
||||
<div class="about-copy">
|
||||
<div class="about-copy fade-up">
|
||||
{#if section.eyebrow}
|
||||
<span class="about-eyebrow">{section.eyebrow}</span>
|
||||
<span class="eyebrow about-eyebrow">{section.eyebrow}</span>
|
||||
{/if}
|
||||
<h2>{section.title}</h2>
|
||||
{#each section.body as paragraph}
|
||||
<p>{paragraph}</p>
|
||||
{/each}
|
||||
</div>
|
||||
<div class="about-media">
|
||||
<div class="about-media scale-soft">
|
||||
{#if enhanced}
|
||||
<enhanced:img src={enhanced} alt={section.imageAlt} loading="lazy" decoding="async" />
|
||||
{:else}
|
||||
@@ -71,9 +63,9 @@
|
||||
<!-- ── Founder section ── -->
|
||||
{#if founderSection}
|
||||
{@const founderEnhanced = getEnhancedImage(founderSection.imageUrl)}
|
||||
<section use:reveal={{ delay: 50 }} class="about-founder reveal-block">
|
||||
<section use:reveal={{ delay: 50, distance: 0 }} class="about-founder reveal-block">
|
||||
<div class="page-inner about-founder-grid">
|
||||
<div class="about-founder-media">
|
||||
<div class="about-founder-media scale-soft">
|
||||
{#if founderEnhanced}
|
||||
<enhanced:img
|
||||
src={founderEnhanced}
|
||||
@@ -90,10 +82,10 @@
|
||||
/>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="about-founder-copy">
|
||||
<div class="about-founder-copy fade-up">
|
||||
<article class="about-founder-note">
|
||||
{#if founderSection.eyebrow}
|
||||
<span class="about-eyebrow about-founder-kicker">{founderSection.eyebrow}</span>
|
||||
<span class="eyebrow about-eyebrow about-founder-kicker">{founderSection.eyebrow}</span>
|
||||
{/if}
|
||||
<h2 class="about-founder-heading">
|
||||
<span class="about-founder-heading-desktop">
|
||||
@@ -130,7 +122,7 @@
|
||||
<span>If you are unsure about anything, feel free to email me anytime.</span>
|
||||
</a>
|
||||
|
||||
<a href="/contact-us" class="btn btn-green btn-mobile-center about-founder-cta">
|
||||
<a href="/contact-us" class="btn btn-green btn-mobile-center about-founder-cta cta-shimmer">
|
||||
Book a free Meet & Greet
|
||||
</a>
|
||||
</article>
|
||||
@@ -141,13 +133,13 @@
|
||||
|
||||
<!-- ── FAQs ── -->
|
||||
{#if pageContent.faqs && pageContent.faqs.length}
|
||||
<section use:reveal={{ delay: 30 }} class="about-faq reveal-block">
|
||||
<section use:reveal={{ delay: 30, distance: 0 }} class="about-faq reveal-block">
|
||||
<div class="page-inner">
|
||||
<div class="about-faq-header">
|
||||
<span class="about-eyebrow">FAQ</span>
|
||||
<div class="about-faq-header fade-up">
|
||||
<span class="eyebrow about-eyebrow">FAQ</span>
|
||||
<h2>{pageContent.faqTitle ?? 'Common questions'}</h2>
|
||||
</div>
|
||||
<div use:accordion class="faq about-faq-list">
|
||||
<div use:accordion class="faq about-faq-list fade-up">
|
||||
{#each pageContent.faqs as item}
|
||||
<details>
|
||||
<summary>{item.question}</summary>
|
||||
@@ -164,11 +156,13 @@
|
||||
<div class="page-inner">
|
||||
<CtaCard
|
||||
title={pageContent.contact.title}
|
||||
description="Questions, pricing, or your first Meet & Greet — start here and we'll reply within 24 hours."
|
||||
description="Questions, pricing, or a first Meet & Greet. Email, call, or send an Instagram DM. We'll reply within 24 hours."
|
||||
ctaHref={pageContent.contact.cta.href}
|
||||
ctaLabel={pageContent.contact.cta.label}
|
||||
email={pageContent.contact.email}
|
||||
phone={pageContent.contact.phone}
|
||||
instagramHref="https://www.instagram.com/goodwalk.nz/"
|
||||
contactNote="Email, call, or send an Instagram DM. We want to be easy to reach in the way that suits you best."
|
||||
showIcons={true}
|
||||
/>
|
||||
</div>
|
||||
@@ -185,21 +179,6 @@
|
||||
.about-eyebrow {
|
||||
display: inline-block;
|
||||
margin-bottom: 14px;
|
||||
padding: 7px 12px;
|
||||
border-radius: 999px;
|
||||
background: rgba(33, 48, 33, 0.08);
|
||||
color: var(--gw-green);
|
||||
box-shadow: inset 0 0 0 1px rgba(17, 20, 24, 0.05);
|
||||
font-size: 12px;
|
||||
font-weight: 800;
|
||||
letter-spacing: 0.08em;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.about-chip-stars {
|
||||
color: var(--yellow);
|
||||
letter-spacing: 1px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
/* ── Standard sections ── */
|
||||
@@ -592,4 +571,15 @@
|
||||
animation: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* Per-section choreography — copy leads, then the media settles after a
|
||||
short beat. Repeated across each about-section instance. */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
:global(.reveal-visible) .about-copy { transition-delay: 40ms; }
|
||||
:global(.reveal-visible) .about-media { transition-delay: 200ms; }
|
||||
:global(.reveal-visible) .about-founder-media { transition-delay: 60ms; }
|
||||
:global(.reveal-visible) .about-founder-copy { transition-delay: 220ms; }
|
||||
:global(.reveal-visible) .about-faq-header { transition-delay: 40ms; }
|
||||
:global(.reveal-visible) .about-faq-list { transition-delay: 180ms; }
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,101 @@
|
||||
<script lang="ts">
|
||||
import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
import InfoSection from '$lib/components/sections/InfoSection.svelte';
|
||||
import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
|
||||
import type { BookingContent, InfoContent } from '$lib/types';
|
||||
|
||||
export let booking: BookingContent;
|
||||
export let info: InfoContent;
|
||||
// General-enquiry mode disabled site-wide for now. Accepted as a prop so
|
||||
// existing callers keep type-checking, but the value is intentionally ignored.
|
||||
export let allowGeneralEnquiry = false;
|
||||
void allowGeneralEnquiry;
|
||||
|
||||
const email = 'info@goodwalk.co.nz';
|
||||
const phone = '(022) 642 1011';
|
||||
const phoneHref = `tel:${phone.replace(/[^0-9+]/g, '')}`;
|
||||
</script>
|
||||
|
||||
<main class="booking-page">
|
||||
<ServiceHero
|
||||
eyebrow="Contact Goodwalk"
|
||||
title="Contact Us"
|
||||
subtitle="Tell us a little about your dog and we'll be in touch within 24 hours to arrange a free Meet & Greet."
|
||||
imageUrl="/images/happy-customer-anna.webp"
|
||||
imageAlt="Happy Goodwalk customer Anna with her dog in Auckland"
|
||||
chips={[
|
||||
{ icon: 'fas fa-bolt', label: 'Reply within 24 hours' },
|
||||
{ icon: 'fas fa-handshake', label: 'Free Meet & Greet' },
|
||||
{ icon: 'fas fa-location-dot', label: 'Auckland Central' }
|
||||
]}
|
||||
cta={{ label: 'Start your enquiry', href: '#newlead', variant: 'yellow' }}
|
||||
/>
|
||||
|
||||
<div class="booking-page-contact-strip">
|
||||
<div class="page-inner booking-page-contact">
|
||||
<a href="mailto:{email}" class="booking-contact-link">
|
||||
<Icon name="fas fa-envelope" />
|
||||
{email}
|
||||
</a>
|
||||
<a href={phoneHref} class="booking-contact-link">
|
||||
<Icon name="fas fa-phone" />
|
||||
{phone}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<BookingWizard {booking} pagePath="/contact-us" />
|
||||
<InfoSection {info} />
|
||||
</main>
|
||||
|
||||
<style>
|
||||
.booking-page {
|
||||
background: var(--off-white);
|
||||
}
|
||||
|
||||
.booking-page-contact-strip {
|
||||
padding: 18px 0 0;
|
||||
}
|
||||
|
||||
.booking-page-contact {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 24px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.booking-contact-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px 20px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.82);
|
||||
border: 1px solid rgba(17, 20, 24, 0.08);
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
line-height: 1.2;
|
||||
letter-spacing: 0.01em;
|
||||
color: var(--text-heading);
|
||||
transition: background 0.2s, transform 0.2s;
|
||||
}
|
||||
|
||||
.booking-contact-link:hover {
|
||||
background: rgba(255, 255, 255, 0.95);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.booking-page-contact {
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.booking-contact-link {
|
||||
font-size: 13px;
|
||||
padding: 9px 16px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,9 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import Icon from '$lib/components/Icon.svelte';
|
||||
import OnboardingSignaturePad from '$lib/components/OnboardingSignaturePad.svelte';
|
||||
import OnboardingAuth from '$lib/components/OnboardingAuth.svelte';
|
||||
import OnboardingFooter from '$lib/components/OnboardingFooter.svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
import OnboardingSignaturePad from '$lib/components/ui/OnboardingSignaturePad.svelte';
|
||||
import OnboardingAuth from '$lib/components/sections/OnboardingAuth.svelte';
|
||||
import OnboardingFooter from '$lib/components/ui/OnboardingFooter.svelte';
|
||||
import logoDesktop from '$lib/images/goodwalk-auckland-dog-walking-logo.png?enhanced';
|
||||
import type { Picture } from '@sveltejs/enhanced-img';
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
const ownerEmail = 'info@goodwalk.co.nz';
|
||||
const ownerPhone = '(022) 642 1011';
|
||||
const services = ['Tiny Gang Pack Walks', '1:1 Walks', 'Puppy Visits'];
|
||||
const services = ['Tiny Gang Pack Walks', 'Solo Walks', 'Puppy Visits'];
|
||||
const visitStartedStorageKey = 'goodwalk_visit_started_at';
|
||||
const draftStorageKey = 'goodwalk_contract_draft';
|
||||
|
||||
@@ -173,14 +173,14 @@
|
||||
} catch { /* storage unavailable */ }
|
||||
}
|
||||
|
||||
function applyProfile(serverEmail: string, profile: Record<string, string> = {}) {
|
||||
function applyProfile(serverEmail: string, profile: Record<string, unknown> = {}) {
|
||||
if (!email) email = serverEmail;
|
||||
if (!fullName) fullName = profile.fullName ?? '';
|
||||
if (!phone) phone = profile.phone ?? '';
|
||||
if (!address) address = profile.address ?? '';
|
||||
if (!dogName) dogName = profile.dogName ?? '';
|
||||
if (!dogBreed) dogBreed = profile.dogBreed ?? '';
|
||||
if (!dogAge) dogAge = profile.dogAge ?? '';
|
||||
if (!fullName && typeof profile.fullName === 'string') fullName = profile.fullName;
|
||||
if (!phone && typeof profile.phone === 'string') phone = profile.phone;
|
||||
if (!address && typeof profile.address === 'string') address = profile.address;
|
||||
if (!dogName && typeof profile.dogName === 'string') dogName = profile.dogName;
|
||||
if (!dogBreed && typeof profile.dogBreed === 'string') dogBreed = profile.dogBreed;
|
||||
if (!dogAge && typeof profile.dogAge === 'string') dogAge = profile.dogAge;
|
||||
onboardingCompleted = Boolean((profile as Record<string, unknown>).onboardingCompleted);
|
||||
contractCompleted = Boolean((profile as Record<string, unknown>).contractCompleted);
|
||||
}
|
||||
@@ -206,7 +206,7 @@
|
||||
authChecking = false;
|
||||
}
|
||||
|
||||
function handleAuthenticated(e: CustomEvent<{ email: string; profile?: Record<string, string>; draft?: Record<string, unknown> }>) {
|
||||
function handleAuthenticated(e: CustomEvent<{ email: string; profile?: Record<string, unknown>; draft?: Record<string, unknown> }>) {
|
||||
isAuthenticated = true;
|
||||
userEmail = e.detail.email;
|
||||
applyProfile(e.detail.email, e.detail.profile ?? {});
|
||||
@@ -387,7 +387,7 @@
|
||||
content="Sign your Goodwalk service agreement online."
|
||||
/>
|
||||
<meta name="robots" content="noindex, nofollow" />
|
||||
<link rel="canonical" href="https://onboarding.goodwalk.co.nz/contract/" />
|
||||
<link rel="canonical" href="https://clients.goodwalk.co.nz/contract/" />
|
||||
</svelte:head>
|
||||
|
||||
<main class="contract-page">
|
||||
@@ -847,7 +847,7 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<OnboardingFooter email={userEmail} on:logout={handleLogout} />
|
||||
<OnboardingFooter on:logout={handleLogout} />
|
||||
|
||||
{/if}
|
||||
</main>
|
||||
@@ -1396,8 +1396,7 @@
|
||||
}
|
||||
|
||||
.field input,
|
||||
.field textarea,
|
||||
.field select {
|
||||
.field textarea {
|
||||
width: 100%;
|
||||
padding: 15px 16px;
|
||||
border: 1px solid rgba(33, 48, 33, 0.14);
|
||||
@@ -1411,8 +1410,7 @@
|
||||
}
|
||||
|
||||
.field input:focus,
|
||||
.field textarea:focus,
|
||||
.field select:focus {
|
||||
.field textarea:focus {
|
||||
border-color: rgba(255, 209, 0, 0.9);
|
||||
box-shadow: 0 0 0 4px rgba(255, 209, 0, 0.16);
|
||||
}
|
||||
@@ -0,0 +1,548 @@
|
||||
<script lang="ts">
|
||||
/*
|
||||
* Clarity homepage design (the live homepage as of the swap).
|
||||
*
|
||||
* Purpose-built green hero that says the specialism in the first second
|
||||
* (small & medium dogs), a founder philosophy strip, then offer-first order:
|
||||
* Services -> How it works -> Values -> the rest. A view component only: the
|
||||
* route that renders it owns data loading, SEO head, and structured data.
|
||||
*
|
||||
* Paired design: HomeClassic.svelte. To roll back, swap the component the
|
||||
* homepage route renders. See src/routes/+page.svelte.
|
||||
*/
|
||||
import Footer from '$lib/components/ui/Footer.svelte';
|
||||
import Header from '$lib/components/ui/Header.svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
import HowItWorksSection from '$lib/components/sections/HowItWorksSection.svelte';
|
||||
import InfoSection from '$lib/components/sections/InfoSection.svelte';
|
||||
import InstagramSection from '$lib/components/sections/InstagramSection.svelte';
|
||||
import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
|
||||
import FounderStorySection from '$lib/components/sections/FounderStorySection.svelte';
|
||||
import ServicesSection from '$lib/components/sections/ServicesSection.svelte';
|
||||
import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
|
||||
import ValuesSection from '$lib/components/sections/ValuesSection.svelte';
|
||||
import type { HomePageContent } from '$lib/types';
|
||||
import type { AbContext } from '$lib/ab';
|
||||
|
||||
export let content: HomePageContent;
|
||||
export let ab: AbContext | undefined = undefined;
|
||||
export let pagePath = '/';
|
||||
// The booking form is swappable so variants can preview an alternate Meet &
|
||||
// Greet form on the same homepage design. Defaults to the live wizard, so the
|
||||
// homepage route renders unchanged. See /variants/meet-greet.
|
||||
export let BookingComponent: typeof BookingWizard = BookingWizard;
|
||||
|
||||
const meetGreetVariantPath = '/variants/meet-greet';
|
||||
$: isMeetGreetVariant = pagePath === meetGreetVariantPath;
|
||||
const reviewCta = content.intro.reviewCta;
|
||||
const heroImage = '/images/smiling-happy-dog-maya.webp';
|
||||
const stars = Array.from({ length: 5 });
|
||||
$: heroLead = isMeetGreetVariant
|
||||
? 'Small group walks, solo support, and puppy visits for Auckland dogs who do better with a calm, consistent routine.'
|
||||
: 'Real adventures with the Tiny Gang, in small, matched groups across Auckland. Same walker every time, so your dog comes home happy, tired, and ready to settle.';
|
||||
$: founderQuote = isMeetGreetVariant
|
||||
? "Small groups, careful matching, and the same walker each time. That's how a walk feels safe, social, and worth looking forward to."
|
||||
: "Every dog gets a walk built around them, not a one-size pack: the right small group, a walker who knows their name and their quirks, and adventures that grow with their confidence. That's how a walk becomes the best part of a dog's day.";
|
||||
$: servicesHeading = isMeetGreetVariant
|
||||
? 'Choose the setup that fits your dog.'
|
||||
: undefined;
|
||||
$: servicesIntro = isMeetGreetVariant
|
||||
? 'Pack walks for social dogs, solo walks for dogs who need more space, and puppy visits for the early routine.'
|
||||
: undefined;
|
||||
$: howItWorksContent = isMeetGreetVariant
|
||||
? {
|
||||
...content.howItWorks,
|
||||
intro: 'Start with a free Meet & Greet. We assess the fit, then build the right routine for your dog.'
|
||||
}
|
||||
: content.howItWorks;
|
||||
$: bookingContent = isMeetGreetVariant
|
||||
? {
|
||||
...content.booking,
|
||||
subtitle: 'Tell us a little about your dog. We reply within 24 hours to arrange your free Meet & Greet.'
|
||||
}
|
||||
: content.booking;
|
||||
</script>
|
||||
|
||||
<Header navigation={content.navigation} />
|
||||
|
||||
<section class="chero" data-track-location="hero" aria-label="Goodwalk dog walking">
|
||||
<div class="chero-inner">
|
||||
<div class="chero-copy">
|
||||
<p class="chero-eyebrow">Goodwalk · Auckland dog walking</p>
|
||||
<h1 class="chero-title">
|
||||
<span class="chero-title-lead">Specialist walks for small & medium dogs</span>
|
||||
<span class="chero-title-main">Meet the Tiny Gang.</span>
|
||||
</h1>
|
||||
<p class="chero-lead">{heroLead}</p>
|
||||
</div>
|
||||
|
||||
<div class="chero-media">
|
||||
<div class="chero-photo">
|
||||
<img
|
||||
src={heroImage}
|
||||
alt="Maya, a happy small dog, after a Goodwalk walk in Auckland"
|
||||
width="1536"
|
||||
height="1024"
|
||||
loading="eager"
|
||||
fetchpriority="high"
|
||||
decoding="async"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="chero-actions">
|
||||
<a
|
||||
href="#newlead"
|
||||
class="btn btn-yellow btn-with-arrow"
|
||||
data-track-event="cta_click"
|
||||
data-track-type="hero_primary"
|
||||
data-track-label="Book a free Meet & Greet"
|
||||
>
|
||||
Book a free Meet & Greet
|
||||
<Icon name="fas fa-arrow-right" />
|
||||
</a>
|
||||
|
||||
<a
|
||||
class="chero-reviews"
|
||||
href={reviewCta.href}
|
||||
target={reviewCta.external ? '_blank' : undefined}
|
||||
rel={reviewCta.external ? 'noopener' : undefined}
|
||||
aria-label="30+ five-star Google reviews"
|
||||
data-track-event="social_proof_click"
|
||||
data-track-type="hero_reviews"
|
||||
>
|
||||
<span class="chero-reviews-mark" aria-hidden="true">
|
||||
<img src="/images/google-g-logo.svg" alt="" width="15" height="16" />
|
||||
</span>
|
||||
<span class="chero-reviews-stars" aria-hidden="true">
|
||||
{#each stars as _}
|
||||
<Icon name="fas fa-star" />
|
||||
{/each}
|
||||
</span>
|
||||
<span class="chero-reviews-label">30+ five-star reviews</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Founder philosophy strip: the sincere counter to a competitor's
|
||||
"total freedom in nature" pitch. Frames the upside the owner is paying
|
||||
for: a day built around their dog, not a one-size pack. -->
|
||||
<section class="cfounder" aria-label="Our approach">
|
||||
<div class="cfounder-inner">
|
||||
<figure class="cfounder-quote">
|
||||
<blockquote class="cfounder-blockquote">
|
||||
<p class="cfounder-text">
|
||||
{founderQuote}
|
||||
</p>
|
||||
</blockquote>
|
||||
<figcaption class="cfounder-attr">
|
||||
<img
|
||||
class="cfounder-avatar"
|
||||
src="/images/alessandra-goodwalk-founder-auckland.webp"
|
||||
alt="Alessandra, founder of Goodwalk, walking a dog in Auckland"
|
||||
width="96"
|
||||
height="96"
|
||||
loading="lazy"
|
||||
decoding="async"
|
||||
/>
|
||||
<span class="cfounder-byline">
|
||||
<span class="cfounder-name">Alessandra</span>
|
||||
<span class="cfounder-role">Founder of Goodwalk</span>
|
||||
</span>
|
||||
</figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Offer first: what can I actually book, and roughly what does it cost? -->
|
||||
<ServicesSection services={content.services} heading={servicesHeading} intro={servicesIntro} />
|
||||
|
||||
<!-- Then the process: what happens after I enquire? Lowers the unknown. -->
|
||||
<HowItWorksSection content={howItWorksContent} />
|
||||
|
||||
{#if isMeetGreetVariant}
|
||||
<TestimonialsSection testimonials={content.testimonials} seedKey={pagePath} />
|
||||
<InfoSection info={content.info} />
|
||||
<svelte:component this={BookingComponent} booking={bookingContent} {pagePath} {ab} />
|
||||
{:else}
|
||||
<!-- Only now the reasons to choose us. -->
|
||||
<ValuesSection values={content.values} />
|
||||
<TestimonialsSection testimonials={content.testimonials} seedKey={pagePath} />
|
||||
<FounderStorySection founderStory={content.founderStory} />
|
||||
<InfoSection info={content.info} />
|
||||
<svelte:component this={BookingComponent} booking={bookingContent} {pagePath} {ab} />
|
||||
<InstagramSection instagram={content.instagram} />
|
||||
{/if}
|
||||
<Footer footer={content.footer} />
|
||||
|
||||
<style>
|
||||
/* ── Hero ──────────────────────────────────────────────────────────── */
|
||||
|
||||
.chero {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
background: var(--gw-green);
|
||||
color: var(--text-inverse);
|
||||
}
|
||||
|
||||
/* A single soft warm light, top-right, for depth. Not glassmorphism,
|
||||
not a gradient headline: just one breath of the brand yellow. */
|
||||
.chero::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: -28%;
|
||||
right: -10%;
|
||||
width: 60%;
|
||||
height: 90%;
|
||||
background: radial-gradient(closest-side, rgba(var(--accent-rgb), 0.16), transparent 70%);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.chero-inner {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
max-width: var(--max-w);
|
||||
min-height: clamp(500px, 68vh, 640px);
|
||||
margin: 0 auto;
|
||||
padding: clamp(48px, 5.5vw, 80px) var(--space-container-x);
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1.05fr) minmax(0, 0.95fr);
|
||||
grid-template-areas:
|
||||
'copy media'
|
||||
'actions media';
|
||||
column-gap: clamp(32px, 5vw, 76px);
|
||||
row-gap: clamp(22px, 3vw, 32px);
|
||||
align-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.chero-copy {
|
||||
grid-area: copy;
|
||||
}
|
||||
|
||||
.chero-eyebrow {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin: 0 0 18px;
|
||||
font-family: var(--font-body);
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.16em;
|
||||
text-transform: uppercase;
|
||||
color: rgba(var(--white-rgb), 0.7);
|
||||
}
|
||||
|
||||
.chero-eyebrow::before {
|
||||
content: '';
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
border-radius: 2px;
|
||||
background: var(--yellow);
|
||||
}
|
||||
|
||||
.chero-title {
|
||||
margin: 0;
|
||||
font-family: var(--font-head);
|
||||
}
|
||||
|
||||
.chero-title-lead {
|
||||
display: block;
|
||||
margin-bottom: 6px;
|
||||
font-size: clamp(18px, 2.1vw, 26px);
|
||||
font-weight: 600;
|
||||
line-height: 1.15;
|
||||
letter-spacing: -0.01em;
|
||||
color: rgba(var(--white-rgb), 0.82);
|
||||
}
|
||||
|
||||
.chero-title-main {
|
||||
display: block;
|
||||
font-size: clamp(42px, 6.4vw, 78px);
|
||||
font-weight: 800;
|
||||
line-height: 0.98;
|
||||
letter-spacing: -0.04em;
|
||||
color: var(--yellow);
|
||||
text-wrap: balance;
|
||||
}
|
||||
|
||||
.chero-lead {
|
||||
margin: 22px 0 0;
|
||||
max-width: 40ch;
|
||||
font-size: clamp(16px, 1.3vw, 19px);
|
||||
line-height: 1.6;
|
||||
color: rgba(var(--white-rgb), 0.82);
|
||||
}
|
||||
|
||||
.chero-actions {
|
||||
grid-area: actions;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 16px 26px;
|
||||
}
|
||||
|
||||
.chero-reviews {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 9px;
|
||||
text-decoration: none;
|
||||
color: rgba(var(--white-rgb), 0.9);
|
||||
transition: color var(--motion-fast);
|
||||
}
|
||||
|
||||
.chero-reviews-mark {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
border-radius: 50%;
|
||||
background: var(--surface-page);
|
||||
box-shadow: var(--shadow-card);
|
||||
}
|
||||
|
||||
.chero-reviews-mark img {
|
||||
display: block;
|
||||
width: 15px;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.chero-reviews-stars {
|
||||
display: inline-flex;
|
||||
gap: 2px;
|
||||
color: var(--yellow);
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.chero-reviews-label {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: rgba(var(--white-rgb), 0.9);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.chero-reviews:hover {
|
||||
color: var(--text-inverse);
|
||||
}
|
||||
}
|
||||
|
||||
.chero-reviews:focus-visible {
|
||||
outline: 2px solid var(--yellow);
|
||||
outline-offset: 3px;
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
/* Media */
|
||||
.chero-media {
|
||||
grid-area: media;
|
||||
position: relative;
|
||||
justify-self: end;
|
||||
width: 100%;
|
||||
max-width: 460px;
|
||||
}
|
||||
|
||||
.chero-media::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
inset: 8% -6% -10% 10%;
|
||||
border-radius: var(--radius-xl);
|
||||
background: rgba(var(--accent-rgb), 0.22);
|
||||
filter: blur(46px);
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.chero-photo {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
aspect-ratio: 4 / 5;
|
||||
border-radius: 28px;
|
||||
overflow: hidden;
|
||||
box-shadow:
|
||||
inset 0 0 0 1px rgba(var(--white-rgb), 0.12),
|
||||
var(--shadow-2xl);
|
||||
}
|
||||
|
||||
.chero-photo img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
object-position: center 28%;
|
||||
}
|
||||
|
||||
/* ── Founder philosophy strip ──────────────────────────────────────── */
|
||||
|
||||
.cfounder {
|
||||
background: var(--surface-panel-cream);
|
||||
border-bottom: 1px solid var(--border-soft);
|
||||
}
|
||||
|
||||
.cfounder-inner {
|
||||
max-width: 940px;
|
||||
margin: 0 auto;
|
||||
padding: clamp(30px, 3.6vw, 48px) var(--space-container-x);
|
||||
}
|
||||
|
||||
.cfounder-quote {
|
||||
margin: 0;
|
||||
position: relative;
|
||||
padding-left: clamp(40px, 5vw, 60px);
|
||||
}
|
||||
|
||||
.cfounder-blockquote {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* A single large opening quote mark, brand yellow, as the editorial cue.
|
||||
Keeps the strip recognisably a statement without a repeated eyebrow. */
|
||||
.cfounder-quote::before {
|
||||
content: '\201C';
|
||||
position: absolute;
|
||||
left: -4px;
|
||||
top: -0.18em;
|
||||
font-family: var(--font-head);
|
||||
font-size: clamp(64px, 9vw, 104px);
|
||||
font-weight: 800;
|
||||
line-height: 1;
|
||||
color: var(--yellow);
|
||||
}
|
||||
|
||||
.cfounder-text {
|
||||
margin: 0;
|
||||
max-width: 46ch;
|
||||
font-family: var(--font-body);
|
||||
font-size: clamp(19px, 2.1vw, 27px);
|
||||
font-weight: 500;
|
||||
line-height: 1.45;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--text-heading);
|
||||
text-wrap: pretty;
|
||||
}
|
||||
|
||||
.cfounder-attr {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 14px;
|
||||
margin-top: clamp(18px, 2.4vw, 26px);
|
||||
}
|
||||
|
||||
.cfounder-avatar {
|
||||
width: 56px;
|
||||
height: 56px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
object-position: center 25%;
|
||||
box-shadow:
|
||||
inset 0 0 0 2px rgba(var(--white-rgb), 0.9),
|
||||
var(--shadow-card);
|
||||
}
|
||||
|
||||
.cfounder-byline {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
line-height: 1.25;
|
||||
}
|
||||
|
||||
.cfounder-name {
|
||||
font-family: var(--font-head);
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
color: var(--text-heading);
|
||||
}
|
||||
|
||||
.cfounder-role {
|
||||
font-size: 13px;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
/* Entrance */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
.chero-eyebrow,
|
||||
.chero-title,
|
||||
.chero-lead,
|
||||
.chero-actions {
|
||||
animation: cheroRise 0.6s var(--ease-out-soft) both;
|
||||
}
|
||||
|
||||
.chero-title {
|
||||
animation-delay: 0.08s;
|
||||
}
|
||||
.chero-lead {
|
||||
animation-delay: 0.16s;
|
||||
}
|
||||
.chero-actions {
|
||||
animation-delay: 0.26s;
|
||||
}
|
||||
|
||||
.chero-photo {
|
||||
animation: cheroPhoto 0.8s var(--ease-out-soft) both;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes cheroRise {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(14px);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes cheroPhoto {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: scale(1.04);
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Mobile: one calm column, message first, then Maya, then action ── */
|
||||
@media (max-width: 768px) {
|
||||
.chero-inner {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
padding: 28px var(--space-container-x-mobile) 36px;
|
||||
row-gap: 0;
|
||||
}
|
||||
|
||||
.chero-copy {
|
||||
order: 1;
|
||||
}
|
||||
|
||||
.chero-media {
|
||||
order: 2;
|
||||
justify-self: stretch;
|
||||
max-width: none;
|
||||
margin: 24px 0 26px;
|
||||
}
|
||||
|
||||
.chero-actions {
|
||||
order: 3;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 18px;
|
||||
}
|
||||
|
||||
.chero-photo {
|
||||
aspect-ratio: 5 / 4;
|
||||
}
|
||||
|
||||
.chero-lead {
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.chero-actions .btn {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.cfounder-quote {
|
||||
padding-left: 40px;
|
||||
}
|
||||
|
||||
.cfounder-quote::before {
|
||||
left: -2px;
|
||||
top: -0.08em;
|
||||
font-size: 52px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,47 @@
|
||||
<script lang="ts">
|
||||
/*
|
||||
* Classic homepage design (the original layout, pre-clarity swap).
|
||||
*
|
||||
* Hero -> Values -> Services -> How it works -> Testimonials -> Founder ->
|
||||
* Info -> Booking -> Instagram. Preserved so the homepage can be rolled back
|
||||
* to it by swapping the component rendered in src/routes/+page.svelte.
|
||||
*
|
||||
* Paired design: HomeClarity.svelte. A view component only: the route that
|
||||
* renders it owns data loading, SEO head, and structured data.
|
||||
*/
|
||||
import Footer from '$lib/components/ui/Footer.svelte';
|
||||
import Header from '$lib/components/ui/Header.svelte';
|
||||
import HeroSection from '$lib/components/sections/HeroSection.svelte';
|
||||
import HowItWorksSection from '$lib/components/sections/HowItWorksSection.svelte';
|
||||
import InfoSection from '$lib/components/sections/InfoSection.svelte';
|
||||
import InstagramSection from '$lib/components/sections/InstagramSection.svelte';
|
||||
import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
|
||||
import FounderStorySection from '$lib/components/sections/FounderStorySection.svelte';
|
||||
import ServicesSection from '$lib/components/sections/ServicesSection.svelte';
|
||||
import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
|
||||
import ValuesSection from '$lib/components/sections/ValuesSection.svelte';
|
||||
import type { CallToAction, HomePageContent } from '$lib/types';
|
||||
import type { AbContext } from '$lib/ab';
|
||||
|
||||
export let content: HomePageContent;
|
||||
export let ab: AbContext | undefined = undefined;
|
||||
export let primaryCtaOverride: CallToAction | undefined = undefined;
|
||||
export let pagePath = '/';
|
||||
</script>
|
||||
|
||||
<Header navigation={content.navigation} />
|
||||
<HeroSection
|
||||
hero={content.hero}
|
||||
reviewCta={content.intro.reviewCta}
|
||||
{primaryCtaOverride}
|
||||
{ab}
|
||||
/>
|
||||
<ValuesSection values={content.values} />
|
||||
<ServicesSection services={content.services} />
|
||||
<HowItWorksSection content={content.howItWorks} />
|
||||
<TestimonialsSection testimonials={content.testimonials} seedKey={pagePath} />
|
||||
<FounderStorySection founderStory={content.founderStory} />
|
||||
<InfoSection info={content.info} />
|
||||
<BookingWizard booking={content.booking} {pagePath} {ab} />
|
||||
<InstagramSection instagram={content.instagram} />
|
||||
<Footer footer={content.footer} />
|
||||
@@ -0,0 +1,737 @@
|
||||
<script lang="ts">
|
||||
/*
|
||||
* Services-focus homepage variant.
|
||||
*
|
||||
* Same design language as HomeClarity (green hero, yellow CTAs, the shared
|
||||
* ServicesSection / ValuesSection / TestimonialsSection), but every section is
|
||||
* pointed at one job: get the visitor to click through into a service page.
|
||||
*
|
||||
* The site gets traffic but few leads, so this variant removes the big-commitment
|
||||
* booking form from the homepage and lowers the first ask to "pick the walk that
|
||||
* fits your dog". The three services are offered as quick-picks in the hero
|
||||
* itself, repeated as the main ServicesSection cards, reinforced with proof, and
|
||||
* offered a final time in a closing band. A view component only: the route that
|
||||
* renders it owns data loading, SEO head, and structured data.
|
||||
*
|
||||
* Preview route: /variants/services-first (noindex).
|
||||
*/
|
||||
import Footer from '$lib/components/ui/Footer.svelte';
|
||||
import Header from '$lib/components/ui/Header.svelte';
|
||||
import Icon from '$lib/components/ui/Icon.svelte';
|
||||
import ServicesSection from '$lib/components/sections/ServicesSection.svelte';
|
||||
import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
|
||||
import type { HomePageContent } from '$lib/types';
|
||||
|
||||
export let content: HomePageContent;
|
||||
export let pagePath = '/variants/services-first';
|
||||
|
||||
const reviewCta = content.intro.reviewCta;
|
||||
const heroImage = '/images/smiling-happy-dog-maya.webp';
|
||||
const stars = Array.from({ length: 5 });
|
||||
|
||||
// The assurance bar replaces the old grid of value cards: four plain facts,
|
||||
// stated once. Each is a reason to trust the click, not a feature to skim.
|
||||
const assurances = [
|
||||
{ icon: 'fas fa-user-check', label: 'Same walker, every time' },
|
||||
{ icon: 'fas fa-users', label: 'Small, matched groups' },
|
||||
{ icon: 'fas fa-shield-heart', label: 'Pet first-aid certified & insured' },
|
||||
{ icon: 'fas fa-star', label: '5.0 from 30+ owners' }
|
||||
];
|
||||
|
||||
// The hero quick-picks and the closing band both draw from the same services
|
||||
// data the main ServicesSection uses, so the click targets never drift apart.
|
||||
$: services = content.services;
|
||||
</script>
|
||||
|
||||
<Header navigation={content.navigation} />
|
||||
|
||||
<section class="sfhero" data-track-location="hero" aria-label="Goodwalk dog walking">
|
||||
<div class="sfhero-inner">
|
||||
<div class="sfhero-copy">
|
||||
<p class="sfhero-eyebrow">Professional dog walkers</p>
|
||||
<h1 class="sfhero-title">
|
||||
<span class="sfhero-title-main">Come home to a calmer dog.</span>
|
||||
</h1>
|
||||
<p class="sfhero-lead">
|
||||
Small, matched groups for small & medium dogs. The same walker, every time.
|
||||
</p>
|
||||
|
||||
<div class="sfhero-actions">
|
||||
<a
|
||||
href="#services"
|
||||
class="btn btn-yellow btn-with-arrow"
|
||||
data-track-event="cta_click"
|
||||
data-track-type="hero_primary"
|
||||
data-track-label="See our walks"
|
||||
>
|
||||
See our walks
|
||||
<Icon name="fas fa-arrow-right" />
|
||||
</a>
|
||||
|
||||
<a
|
||||
class="sfhero-reviews"
|
||||
href={reviewCta.href}
|
||||
target={reviewCta.external ? '_blank' : undefined}
|
||||
rel={reviewCta.external ? 'noopener' : undefined}
|
||||
aria-label="30+ five-star Google reviews"
|
||||
data-track-event="social_proof_click"
|
||||
data-track-type="hero_reviews"
|
||||
>
|
||||
<span class="sfhero-reviews-mark" aria-hidden="true">
|
||||
<img src="/images/google-g-logo.svg" alt="" width="15" height="16" />
|
||||
</span>
|
||||
<span class="sfhero-reviews-stars" aria-hidden="true">
|
||||
{#each stars as _}
|
||||
<Icon name="fas fa-star" />
|
||||
{/each}
|
||||
</span>
|
||||
<span class="sfhero-reviews-label">30+ five-star reviews</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="sfhero-media">
|
||||
<div class="sfhero-photo">
|
||||
<img
|
||||
src={heroImage}
|
||||
alt="Maya, a happy small dog, after a Goodwalk walk in Auckland"
|
||||
width="1536"
|
||||
height="1024"
|
||||
loading="eager"
|
||||
fetchpriority="high"
|
||||
decoding="async"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Quick-picks: the three services as clickable choices, in the hero, above
|
||||
the fold. This is the conversion move — the visitor's first decision is
|
||||
"which walk", not "fill in a form". -->
|
||||
<nav class="sfhero-picks" aria-label="Choose a service">
|
||||
{#each services as service}
|
||||
<a
|
||||
class="sfhero-pick"
|
||||
href={service.href}
|
||||
data-track-event="service_quickpick_click"
|
||||
data-track-type="hero_quickpick"
|
||||
data-track-label={service.title}
|
||||
>
|
||||
<span class="sfhero-pick-glyph" aria-hidden="true">
|
||||
<Icon name={service.icon} />
|
||||
</span>
|
||||
<span class="sfhero-pick-text">
|
||||
<span class="sfhero-pick-title">{service.title}</span>
|
||||
{#if service.priceFrom}
|
||||
<span class="sfhero-pick-price">{service.priceFrom}</span>
|
||||
{/if}
|
||||
</span>
|
||||
<Icon name="fas fa-arrow-right" className="sfhero-pick-arrow" />
|
||||
</a>
|
||||
{/each}
|
||||
</nav>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- The conversion engine: the service cards themselves link straight through to
|
||||
each service page. -->
|
||||
<ServicesSection
|
||||
services={content.services}
|
||||
heading="Choose your dog's walk."
|
||||
intro="Three ways to walk — pack, solo, or puppy visits. Same walker, small groups, built around your dog."
|
||||
/>
|
||||
|
||||
<!-- One calm assurance beat. Replaces the old wall of value cards: four plain
|
||||
facts, stated once, then straight on to proof. No competing form. -->
|
||||
<section class="sfproof" aria-label="What every Goodwalk includes">
|
||||
<ul class="sfproof-row">
|
||||
{#each assurances as item}
|
||||
<li class="sfproof-item">
|
||||
<Icon name={item.icon} className="sfproof-icon" />
|
||||
<span>{item.label}</span>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<TestimonialsSection testimonials={content.testimonials} seedKey={pagePath} />
|
||||
|
||||
<!-- Closing band: offer the same three choices one more time, on brand green. -->
|
||||
<section class="sfclose" aria-label="Choose your dog's walk">
|
||||
<div class="sfclose-inner">
|
||||
<div class="sfclose-head">
|
||||
<h2 class="sfclose-title">Find the right walk for your dog.</h2>
|
||||
<p class="sfclose-lead">
|
||||
Three options. No commitment. Just pick the one that sounds like your dog.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="sfclose-grid">
|
||||
{#each services as service}
|
||||
<a
|
||||
class="sfclose-card"
|
||||
href={service.href}
|
||||
data-track-event="service_card_click"
|
||||
data-track-type="closing_band"
|
||||
data-track-label={service.title}
|
||||
>
|
||||
<span class="sfclose-card-glyph" aria-hidden="true">
|
||||
<Icon name={service.icon} />
|
||||
</span>
|
||||
<span class="sfclose-card-title">{service.title}</span>
|
||||
<span class="sfclose-card-body">{service.body}</span>
|
||||
{#if service.priceFrom}
|
||||
<span class="sfclose-card-price">{service.priceFrom}</span>
|
||||
{/if}
|
||||
<span class="sfclose-card-cta">
|
||||
View this walk
|
||||
<Icon name="fas fa-arrow-right" className="sfclose-card-arrow" />
|
||||
</span>
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<Footer footer={content.footer} />
|
||||
|
||||
<style>
|
||||
/* ── Hero ──────────────────────────────────────────────────────────────
|
||||
Mirrors HomeClarity's .chero so the variant reads as the same site:
|
||||
green field, one soft yellow light, identical type scale. The layout
|
||||
adds a third row for the service quick-picks. */
|
||||
|
||||
.sfhero {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
background: var(--gw-green);
|
||||
color: var(--text-inverse);
|
||||
}
|
||||
|
||||
.sfhero::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: -28%;
|
||||
right: -10%;
|
||||
width: 60%;
|
||||
height: 90%;
|
||||
background: radial-gradient(closest-side, rgba(var(--accent-rgb), 0.16), transparent 70%);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.sfhero-inner {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
max-width: var(--max-w);
|
||||
margin: 0 auto;
|
||||
padding: clamp(48px, 5.5vw, 80px) var(--space-container-x);
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1.05fr) minmax(0, 0.95fr);
|
||||
grid-template-areas:
|
||||
'copy media'
|
||||
'picks picks';
|
||||
column-gap: clamp(32px, 5vw, 76px);
|
||||
row-gap: clamp(32px, 4vw, 48px);
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.sfhero-copy {
|
||||
grid-area: copy;
|
||||
}
|
||||
|
||||
.sfhero-eyebrow {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin: 0 0 18px;
|
||||
font-family: var(--font-body);
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.16em;
|
||||
text-transform: uppercase;
|
||||
color: rgba(var(--white-rgb), 0.7);
|
||||
}
|
||||
|
||||
.sfhero-eyebrow::before {
|
||||
content: '';
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
border-radius: 2px;
|
||||
background: var(--yellow);
|
||||
}
|
||||
|
||||
.sfhero-title {
|
||||
margin: 0;
|
||||
font-family: var(--font-head);
|
||||
}
|
||||
|
||||
.sfhero-title-main {
|
||||
display: block;
|
||||
font-size: clamp(42px, 6.4vw, 78px);
|
||||
font-weight: 800;
|
||||
line-height: 0.98;
|
||||
letter-spacing: -0.04em;
|
||||
color: var(--yellow);
|
||||
text-wrap: balance;
|
||||
}
|
||||
|
||||
.sfhero-lead {
|
||||
margin: 22px 0 0;
|
||||
max-width: 42ch;
|
||||
font-size: clamp(16px, 1.3vw, 19px);
|
||||
line-height: 1.6;
|
||||
color: rgba(var(--white-rgb), 0.82);
|
||||
}
|
||||
|
||||
.sfhero-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 16px 26px;
|
||||
margin-top: 28px;
|
||||
}
|
||||
|
||||
.sfhero-reviews {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 9px;
|
||||
text-decoration: none;
|
||||
color: rgba(var(--white-rgb), 0.9);
|
||||
transition: color var(--motion-fast);
|
||||
}
|
||||
|
||||
.sfhero-reviews-mark {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
border-radius: 50%;
|
||||
background: var(--surface-page);
|
||||
box-shadow: var(--shadow-card);
|
||||
}
|
||||
|
||||
.sfhero-reviews-mark img {
|
||||
display: block;
|
||||
width: 15px;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.sfhero-reviews-stars {
|
||||
display: inline-flex;
|
||||
gap: 2px;
|
||||
color: var(--yellow);
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.sfhero-reviews-label {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: rgba(var(--white-rgb), 0.9);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.sfhero-reviews:hover {
|
||||
color: var(--text-inverse);
|
||||
}
|
||||
}
|
||||
|
||||
.sfhero-reviews:focus-visible {
|
||||
outline: 2px solid var(--yellow);
|
||||
outline-offset: 3px;
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
/* Media */
|
||||
.sfhero-media {
|
||||
grid-area: media;
|
||||
position: relative;
|
||||
justify-self: end;
|
||||
width: 100%;
|
||||
max-width: 460px;
|
||||
}
|
||||
|
||||
.sfhero-media::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
inset: 8% -6% -10% 10%;
|
||||
border-radius: var(--radius-xl);
|
||||
background: rgba(var(--accent-rgb), 0.22);
|
||||
filter: blur(46px);
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.sfhero-photo {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
aspect-ratio: 4 / 5;
|
||||
border-radius: 28px;
|
||||
overflow: hidden;
|
||||
box-shadow:
|
||||
inset 0 0 0 1px rgba(var(--white-rgb), 0.12),
|
||||
var(--shadow-2xl);
|
||||
}
|
||||
|
||||
.sfhero-photo img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
object-position: center 28%;
|
||||
}
|
||||
|
||||
/* ── Hero quick-picks ────────────────────────────────────────────────── */
|
||||
|
||||
.sfhero-picks {
|
||||
grid-area: picks;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 14px;
|
||||
padding-top: clamp(8px, 1.5vw, 16px);
|
||||
border-top: 1px solid rgba(var(--white-rgb), 0.12);
|
||||
}
|
||||
|
||||
.sfhero-pick {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 14px;
|
||||
padding: 16px 18px;
|
||||
border-radius: 18px;
|
||||
background: rgba(var(--white-rgb), 0.05);
|
||||
box-shadow: inset 0 0 0 1px rgba(var(--white-rgb), 0.1);
|
||||
color: var(--text-inverse);
|
||||
text-decoration: none;
|
||||
transition:
|
||||
background 0.22s ease,
|
||||
box-shadow 0.22s ease,
|
||||
transform 0.22s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.sfhero-pick-glyph {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 42px;
|
||||
height: 42px;
|
||||
flex: 0 0 auto;
|
||||
border-radius: 13px;
|
||||
background: rgba(var(--accent-rgb), 0.16);
|
||||
color: var(--yellow);
|
||||
font-size: 17px;
|
||||
}
|
||||
|
||||
.sfhero-pick-text {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
min-width: 0;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.sfhero-pick-title {
|
||||
font-family: var(--font-head);
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
letter-spacing: -0.01em;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.sfhero-pick-price {
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: rgba(var(--white-rgb), 0.66);
|
||||
}
|
||||
|
||||
:global(.sfhero-pick-arrow) {
|
||||
font-size: 12px;
|
||||
color: var(--yellow);
|
||||
flex: 0 0 auto;
|
||||
transition: transform 0.2s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.sfhero-pick:hover {
|
||||
background: rgba(var(--white-rgb), 0.09);
|
||||
box-shadow: inset 0 0 0 1px rgba(var(--white-rgb), 0.22);
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
.sfhero-pick:hover :global(.sfhero-pick-arrow) {
|
||||
transform: translateX(3px);
|
||||
}
|
||||
}
|
||||
|
||||
.sfhero-pick:focus-visible {
|
||||
outline: 2px solid var(--yellow);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
/* Entrance — same choreography as the clarity hero. */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
.sfhero-copy,
|
||||
.sfhero-picks {
|
||||
animation: sfheroRise 0.6s var(--ease-out-soft) both;
|
||||
}
|
||||
|
||||
.sfhero-picks {
|
||||
animation-delay: 0.2s;
|
||||
}
|
||||
|
||||
.sfhero-photo {
|
||||
animation: sfheroPhoto 0.8s var(--ease-out-soft) both;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes sfheroRise {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(14px);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes sfheroPhoto {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: scale(1.04);
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Assurance bar ─────────────────────────────────────────────────────
|
||||
A single calm strip of facts — the "say it plainly" beat that replaces a
|
||||
long grid of value cards. Warm cream divider between services and proof. */
|
||||
|
||||
.sfproof {
|
||||
background: var(--surface-panel-cream);
|
||||
border-top: 1px solid var(--border-soft);
|
||||
border-bottom: 1px solid var(--border-soft);
|
||||
}
|
||||
|
||||
.sfproof-row {
|
||||
list-style: none;
|
||||
margin: 0 auto;
|
||||
max-width: var(--max-w);
|
||||
padding: clamp(18px, 2.4vw, 26px) var(--space-container-x);
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 14px clamp(24px, 4vw, 52px);
|
||||
}
|
||||
|
||||
.sfproof-item {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
font-family: var(--font-head);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--text-heading);
|
||||
}
|
||||
|
||||
:global(.sfproof-icon) {
|
||||
font-size: 15px;
|
||||
color: var(--gw-green);
|
||||
}
|
||||
|
||||
/* ── Closing band ──────────────────────────────────────────────────────
|
||||
Brand-green field that repeats the three service choices. Mirrors the
|
||||
service-card styling so the page closes on the same call it opened with. */
|
||||
|
||||
.sfclose {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
background: var(--gw-green);
|
||||
color: var(--text-inverse);
|
||||
padding: var(--space-section-support-y) 0;
|
||||
}
|
||||
|
||||
.sfclose::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
bottom: -30%;
|
||||
left: -8%;
|
||||
width: 55%;
|
||||
height: 90%;
|
||||
background: radial-gradient(closest-side, rgba(var(--accent-rgb), 0.14), transparent 70%);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.sfclose-inner {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
max-width: min(1180px, calc(var(--max-w) - 40px));
|
||||
margin: 0 auto;
|
||||
padding: 0 var(--space-container-x);
|
||||
}
|
||||
|
||||
.sfclose-head {
|
||||
max-width: 46ch;
|
||||
margin: 0 auto clamp(28px, 4vw, 44px);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.sfclose-title {
|
||||
margin: 0 0 12px;
|
||||
font-family: var(--font-head);
|
||||
font-size: clamp(28px, 4vw, 44px);
|
||||
font-weight: 800;
|
||||
line-height: 1.05;
|
||||
letter-spacing: -0.03em;
|
||||
color: var(--text-inverse);
|
||||
text-wrap: balance;
|
||||
}
|
||||
|
||||
.sfclose-lead {
|
||||
margin: 0;
|
||||
font-size: clamp(15px, 1.3vw, 18px);
|
||||
line-height: 1.6;
|
||||
color: rgba(var(--white-rgb), 0.82);
|
||||
}
|
||||
|
||||
.sfclose-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
.sfclose-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
padding: 28px 24px;
|
||||
border-radius: 22px;
|
||||
background: rgba(var(--white-rgb), 0.05);
|
||||
box-shadow: inset 0 0 0 1px rgba(var(--white-rgb), 0.1);
|
||||
color: var(--text-inverse);
|
||||
text-decoration: none;
|
||||
transition:
|
||||
background 0.24s ease,
|
||||
box-shadow 0.24s ease,
|
||||
transform 0.24s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
.sfclose-card-glyph {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
margin-bottom: 18px;
|
||||
border-radius: 15px;
|
||||
background: rgba(var(--accent-rgb), 0.16);
|
||||
color: var(--yellow);
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.sfclose-card-title {
|
||||
font-family: var(--font-head);
|
||||
font-size: 19px;
|
||||
font-weight: 700;
|
||||
letter-spacing: -0.02em;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.sfclose-card-body {
|
||||
margin-top: 8px;
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
color: rgba(var(--white-rgb), 0.78);
|
||||
}
|
||||
|
||||
.sfclose-card-price {
|
||||
margin-top: 14px;
|
||||
font-family: var(--font-head);
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
color: var(--yellow);
|
||||
}
|
||||
|
||||
.sfclose-card-cta {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-top: 20px;
|
||||
padding-top: 18px;
|
||||
width: 100%;
|
||||
border-top: 1px solid rgba(var(--white-rgb), 0.12);
|
||||
font-family: var(--font-head);
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
color: var(--text-inverse);
|
||||
}
|
||||
|
||||
:global(.sfclose-card-arrow) {
|
||||
font-size: 11px;
|
||||
color: var(--yellow);
|
||||
transition: transform 0.2s cubic-bezier(0.22, 1, 0.36, 1);
|
||||
}
|
||||
|
||||
@media (hover: hover) {
|
||||
.sfclose-card:hover {
|
||||
background: rgba(var(--white-rgb), 0.09);
|
||||
box-shadow: inset 0 0 0 1px rgba(var(--white-rgb), 0.22);
|
||||
transform: translateY(-4px);
|
||||
}
|
||||
|
||||
.sfclose-card:hover :global(.sfclose-card-arrow) {
|
||||
transform: translateX(4px);
|
||||
}
|
||||
}
|
||||
|
||||
.sfclose-card:focus-visible {
|
||||
outline: 2px solid var(--yellow);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
/* ── Mobile ────────────────────────────────────────────────────────────
|
||||
Same single-column logic as the clarity hero: message, photo, action,
|
||||
then the picks stack full width. */
|
||||
@media (max-width: 900px) {
|
||||
.sfhero-picks {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.sfhero-inner {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 28px var(--space-container-x-mobile) 36px;
|
||||
row-gap: 0;
|
||||
}
|
||||
|
||||
.sfhero-copy {
|
||||
order: 1;
|
||||
}
|
||||
|
||||
.sfhero-media {
|
||||
order: 2;
|
||||
justify-self: stretch;
|
||||
max-width: none;
|
||||
margin: 24px 0 26px;
|
||||
}
|
||||
|
||||
.sfhero-picks {
|
||||
order: 3;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.sfhero-photo {
|
||||
aspect-ratio: 5 / 4;
|
||||
}
|
||||
|
||||
.sfhero-lead {
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.sfhero-actions .btn {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.sfclose-grid {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 14px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||