diff --git a/deploy.ps1 b/deploy.ps1 index c36cb22..d89e70e 100644 --- a/deploy.ps1 +++ b/deploy.ps1 @@ -24,6 +24,12 @@ $NginxConfigSource = 'nginx/goodwalk.co.nz.svelte.conf.example' $NginxConfigTarget = '/docker/nginx/conf.d/goodwalk.co.nz.conf' $NginxComposeFile = '/docker/nginx/docker-compose.yml' $NginxProjectName = 'nginx' +# Host paths used for the maintenance page. The directory must be bind-mounted +# into the shared nginx container at /var/www/maintenance:ro (see DEPLOYMENT.md). +# The flag file lives in the existing conf.d bind mount; nginx ignores non-.conf +# files, so it does not pollute the include glob. +$MaintenanceHostDir = '/docker/nginx/maintenance' +$MaintenanceFlagPath = '/docker/nginx/conf.d/maintenance.flag' # Optional deployment settings. $VerifyUrl = 'https://www.goodwalk.co.nz/api/health' @@ -169,6 +175,8 @@ Assert-NotBlank -Name 'NginxConfigSource' -Value $NginxConfigSource Assert-NotBlank -Name 'NginxConfigTarget' -Value $NginxConfigTarget Assert-NotBlank -Name 'NginxComposeFile' -Value $NginxComposeFile Assert-NotBlank -Name 'NginxProjectName' -Value $NginxProjectName +Assert-NotBlank -Name 'MaintenanceHostDir' -Value $MaintenanceHostDir +Assert-NotBlank -Name 'MaintenanceFlagPath' -Value $MaintenanceFlagPath if (-not [string]::IsNullOrWhiteSpace($Service)) { $Service = $Service.Trim() @@ -206,6 +214,8 @@ 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" if (-not [string]::IsNullOrWhiteSpace($Service)) { @@ -272,7 +282,11 @@ try { '--nginx-compose-file', $NginxComposeFile, '--nginx-project-name', - $NginxProjectName + $NginxProjectName, + '--maintenance-host-dir', + $MaintenanceHostDir, + '--maintenance-flag', + $MaintenanceFlagPath ) + $(if (-not [string]::IsNullOrWhiteSpace($Service)) { @('--service', $Service) } else { @() })) Write-Host '' diff --git a/nginx/goodwalk.co.nz.svelte.conf.example b/nginx/goodwalk.co.nz.svelte.conf.example index 77192db..98fc5d5 100644 --- a/nginx/goodwalk.co.nz.svelte.conf.example +++ b/nginx/goodwalk.co.nz.svelte.conf.example @@ -59,16 +59,16 @@ server { error_page 503 /maintenance.html; location = /maintenance.html { - root /var/www/html; + root /var/www/maintenance; internal; add_header Cache-Control "no-store" always; } # Static assets used only by the maintenance page (logo, etc.). Served - # directly from the nginx html mount so they remain reachable while the - # SvelteKit app is down. + # from a dedicated bind mount so they remain reachable while the + # SvelteKit app is down and do not collide with any other site's html dir. location /m/ { - root /var/www/html; + root /var/www/maintenance; access_log off; add_header Cache-Control "public, max-age=3600" always; } diff --git a/package.json b/package.json index d531707..8a96787 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodwalk-svelte-port", - "version": "4.1.0", + "version": "4.2.0", "private": true, "type": "module", "scripts": { diff --git a/scripts/deploy-remote.sh b/scripts/deploy-remote.sh index 926f522..97a7a07 100644 --- a/scripts/deploy-remote.sh +++ b/scripts/deploy-remote.sh @@ -10,6 +10,8 @@ NGINX_SOURCE="" NGINX_TARGET="" NGINX_COMPOSE_FILE="" NGINX_PROJECT_NAME="" +MAINTENANCE_HOST_DIR="" +MAINTENANCE_FLAG_PATH="" usage() { cat <<'EOF' @@ -18,7 +20,8 @@ Usage: deploy-remote.sh --archive --deploy-path --compose-file --project-name [--service ] deploy-remote.sh --archive --deploy-path --compose-file --project-name \ [--service ] [--nginx-source ] [--nginx-target ] \ - [--nginx-compose-file ] [--nginx-project-name ] + [--nginx-compose-file ] [--nginx-project-name ] \ + [--maintenance-host-dir ] [--maintenance-flag ] This script only updates the main Goodwalk compose project at the specified deployment path. It does not touch unrelated Docker projects or global Docker @@ -69,6 +72,14 @@ while [[ $# -gt 0 ]]; do NGINX_PROJECT_NAME="${2:-}" shift 2 ;; + --maintenance-host-dir) + MAINTENANCE_HOST_DIR="${2:-}" + shift 2 + ;; + --maintenance-flag) + MAINTENANCE_FLAG_PATH="${2:-}" + shift 2 + ;; -h|--help) usage exit 0 @@ -103,6 +114,8 @@ if (( nginx_args_present )); then [[ -n "$NGINX_TARGET" ]] || fail "--nginx-target is required when nginx deployment is enabled" [[ -n "$NGINX_COMPOSE_FILE" ]] || fail "--nginx-compose-file is required when nginx deployment is enabled" [[ -n "$NGINX_PROJECT_NAME" ]] || fail "--nginx-project-name is required when nginx deployment is enabled" + [[ -n "$MAINTENANCE_HOST_DIR" ]] || fail "--maintenance-host-dir is required when nginx deployment is enabled" + [[ -n "$MAINTENANCE_FLAG_PATH" ]] || fail "--maintenance-flag is required when nginx deployment is enabled" fi if docker compose version >/dev/null 2>&1; then @@ -118,9 +131,8 @@ MAINTENANCE_ACTIVE=0 clear_maintenance_flag() { if (( MAINTENANCE_ACTIVE )) && (( nginx_args_present )); then - echo "[deploy-remote] Clearing maintenance flag" - "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" \ - exec -T nginx rm -f /etc/nginx/conf.d/maintenance.flag || true + echo "[deploy-remote] Clearing maintenance flag at $MAINTENANCE_FLAG_PATH" + rm -f "$MAINTENANCE_FLAG_PATH" || true MAINTENANCE_ACTIVE=0 fi } @@ -144,6 +156,8 @@ if (( nginx_args_present )); then echo "[deploy-remote] Nginx config target: $NGINX_TARGET" echo "[deploy-remote] Nginx compose file: $NGINX_COMPOSE_FILE" echo "[deploy-remote] Nginx project: $NGINX_PROJECT_NAME" + echo "[deploy-remote] Maintenance host dir: $MAINTENANCE_HOST_DIR" + echo "[deploy-remote] Maintenance flag path: $MAINTENANCE_FLAG_PATH" fi echo "[deploy-remote] Staging archive in: $STAGING_DIR" @@ -278,27 +292,44 @@ if (( nginx_args_present )); then [[ -f "$MAINTENANCE_HTML_SRC" ]] || fail "Maintenance page missing from deployment payload: $MAINTENANCE_HTML_SRC" [[ -f "$MAINTENANCE_LOGO_SRC" ]] || fail "Maintenance logo missing from deployment payload: $MAINTENANCE_LOGO_SRC" + # Pre-flight: the nginx container must have a bind mount whose source is + # MAINTENANCE_HOST_DIR and whose destination is /var/www/maintenance. If the + # one-time droplet setup has not been done, fail fast with a clear message + # rather than silently serving stale content. + 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." + + 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. + Expected: ${MAINTENANCE_HOST_DIR}:/var/www/maintenance:ro + One-time setup on the droplet: + mkdir -p ${MAINTENANCE_HOST_DIR}/m + # add this volume to ${NGINX_COMPOSE_FILE}: + # - ${MAINTENANCE_HOST_DIR}:/var/www/maintenance:ro + ${COMPOSE_CMD[*]} -p ${NGINX_PROJECT_NAME} -f ${NGINX_COMPOSE_FILE} up -d" + fi + + FLAG_DIR="$(dirname "$MAINTENANCE_FLAG_PATH")" + [[ -d "$FLAG_DIR" ]] || fail "Maintenance flag directory does not exist on host: $FLAG_DIR" + + echo "[deploy-remote] Writing maintenance assets to host bind dir: $MAINTENANCE_HOST_DIR" + mkdir -p "$MAINTENANCE_HOST_DIR/m" + install -m 0644 "$MAINTENANCE_HTML_SRC" "$MAINTENANCE_HOST_DIR/maintenance.html" + install -m 0644 "$MAINTENANCE_LOGO_SRC" "$MAINTENANCE_HOST_DIR/m/logo.png" + echo "[deploy-remote] Updating shared nginx config (pre-rebuild) so maintenance routing is active" mkdir -p "$(dirname "$NGINX_TARGET")" cp "$DEPLOY_PATH/$NGINX_SOURCE" "$NGINX_TARGET" - echo "[deploy-remote] Installing maintenance page assets into nginx container" - "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" \ - exec -T nginx mkdir -p /var/www/html/m - "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" \ - cp "$MAINTENANCE_HTML_SRC" nginx:/var/www/html/maintenance.html - "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" \ - cp "$MAINTENANCE_LOGO_SRC" nginx:/var/www/html/m/logo.png - echo "[deploy-remote] Validating nginx configuration" "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -t echo "[deploy-remote] Reloading shared nginx so the new config (incl. maintenance routing) is live" "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" exec -T nginx nginx -s reload - echo "[deploy-remote] Engaging maintenance page (touch maintenance.flag)" - "${COMPOSE_CMD[@]}" -p "$NGINX_PROJECT_NAME" -f "$NGINX_COMPOSE_FILE" \ - exec -T nginx touch /etc/nginx/conf.d/maintenance.flag + echo "[deploy-remote] Engaging maintenance page via host flag: $MAINTENANCE_FLAG_PATH" + : > "$MAINTENANCE_FLAG_PATH" MAINTENANCE_ACTIVE=1 fi diff --git a/src/lib/actions/reveal.ts b/src/lib/actions/reveal.ts index 967fe44..a07aef3 100644 --- a/src/lib/actions/reveal.ts +++ b/src/lib/actions/reveal.ts @@ -25,6 +25,25 @@ export function reveal(node: HTMLElement, options: RevealOptions = {}) { node.style.setProperty('--reveal-distance', `${settings.distance}px`); node.classList.add('reveal-ready'); + // If the element is already visible at all in the initial viewport, + // reveal it immediately so the first section below the hero doesn't + // appear blank on page load. + const initialCheck = () => { + const rect = node.getBoundingClientRect(); + const viewportHeight = window.innerHeight || document.documentElement.clientHeight; + if (rect.top < viewportHeight && rect.bottom > 0) { + node.classList.add('reveal-visible'); + return true; + } + return false; + }; + + if (initialCheck()) { + return { + destroy() {} + }; + } + const observer = new IntersectionObserver( (entries) => { for (const entry of entries) { diff --git a/src/lib/components/AboutPage.svelte b/src/lib/components/AboutPage.svelte index 79097e4..dfc7d91 100644 --- a/src/lib/components/AboutPage.svelte +++ b/src/lib/components/AboutPage.svelte @@ -1,6 +1,6 @@
-

What we do

+

{heading}

{#each services as service} diff --git a/src/lib/content/about.ts b/src/lib/content/about.ts index b97ffee..a3e4aff 100644 --- a/src/lib/content/about.ts +++ b/src/lib/content/about.ts @@ -6,7 +6,7 @@ export const aboutPageContent: AboutPageContent = { { title: 'Who we are', body: [ - "At GoodWalk, we're not your average dog walking service. We're a team of passionate dog lovers dedicated to providing top-notch care for your furry friends. Specializing in small dogs, we understand their unique needs firsthand, being small dog owners ourselves!", + "At GoodWalk, we're not your average dog walking service. We're a team of passionate dog lovers dedicated to providing top-notch care for your furry friends. Specialising in small dogs, we understand their unique needs firsthand, being small dog owners ourselves!", "Our commitment to excellence has quickly made us a leader in Auckland Central's dog-walking scene. From pack walks to one-on-one sessions, we ensure the happiness and well-being of every dog in our care." ], imageUrl: '/images/auckland-pack-walk-dog.jpg', diff --git a/src/lib/content/dog-walking.ts b/src/lib/content/dog-walking.ts index c9e5c3c..c737ac0 100644 --- a/src/lib/content/dog-walking.ts +++ b/src/lib/content/dog-walking.ts @@ -6,7 +6,7 @@ export const dogWalkingContent: ServicePageContent = { title: 'Walks for larger breeds, too!', paragraphs: [ 'Looking for personal attention for your big pup? Our professional dog walking service is perfect for larger dogs who walk well on leash and have good recall. Safety is paramount, so we only accommodate dogs with no reactivity issues. At Goodwalk, we pride ourselves on building relationships with both you and your furry family member.', - "Give your dog his best life while joining our growing community of happy pet parents! For those seeking extra care, we offer specialized one-on-one walks tailored to your dog's individual needs and personality" + "Give your dog his best life while joining our growing community of happy pet parents! For those seeking extra care, we offer specialised one-on-one walks tailored to your dog's individual needs and personality" ], imageUrl: '/images/auckland-large-dog-one-on-one-walk.jpg', @@ -14,7 +14,7 @@ export const dogWalkingContent: ServicePageContent = { }, highlight: { eyebrow: '▼・ᴥ・▼', - title: 'Personalized adventures for your dog!', + title: 'Personalised adventures for your dog!', imageUrl: '/images/auckland-dogs-outdoor-pack.jpg', imageAlt: 'Goodwalk dogs gathered together outdoors' }, @@ -46,16 +46,16 @@ export const dogWalkingContent: ServicePageContent = { title: 'Benefits of our 1:1 walks', items: [ { - title: 'Individualized Attention', - body: 'Large breeds receive personalized care and undivided attention from the walker, addressing their unique needs and preferences without competition from other dogs.' + title: 'Individualised Attention', + body: 'Large breeds receive personalised care and undivided attention from the walker, addressing their unique needs and preferences without competition from other dogs.' }, { title: 'Tailored Exercise', - body: 'Walkers can customize the pace, duration, and route of the walk to accommodate the energy levels and physical abilities of large breeds, providing an appropriate level of exercise tailored to their specific needs.' + body: 'Walkers can customise the pace, duration, and route of the walk to accommodate the energy levels and physical abilities of large breeds, providing an appropriate level of exercise tailored to their specific needs.' }, { - title: 'Bonding and Socialization', - body: 'During one-on-one walks, large breeds bond closely with their walker and socialize with people and animals encountered, promoting confidence and social skills' + title: 'Bonding and Socialisation', + body: 'During one-on-one walks, large breeds bond closely with their walker and socialise with people and animals encountered, promoting confidence and social skills' }, { title: 'Enhanced safety', @@ -63,7 +63,7 @@ export const dogWalkingContent: ServicePageContent = { }, { title: 'Training Opportunities', - body: 'One-on-one walks offer dedicated time for training and reinforcement of good behaviors, such as loose leash walking or obedience commands, helping large breeds develop and maintain positive habits.' + body: 'One-on-one walks offer dedicated time for training and reinforcement of good behaviours, such as loose leash walking or obedience commands, helping large breeds develop and maintain positive habits.' }, { title: 'Stress Reduction', diff --git a/src/lib/content/homepage.ts b/src/lib/content/homepage.ts index fd98569..83ae47e 100644 --- a/src/lib/content/homepage.ts +++ b/src/lib/content/homepage.ts @@ -88,7 +88,7 @@ export const homepageContent: HomePageContent = { icon: 'fas fa-heart', title: 'Kindness', body: - 'With gentle care and genuine affection, we make every walk a calm, happy experience. We use positive reinforcement to encourage good behavior because kindness is at the heart of everything we do.' + 'With gentle care and genuine affection, we make every walk a calm, happy experience. We use positive reinforcement to encourage good behaviour because kindness is at the heart of everything we do.' }, { icon: 'fas fa-camera', @@ -176,7 +176,7 @@ export const homepageContent: HomePageContent = { nearbyCta: { label: 'Book a Meet & Greet', href: '#newlead' }, hoursLabel: 'Opening Hours', hours: 'Monday to Friday, 8am - 4pm.', - faqTitle: "FAQ's", + faqTitle: 'FAQs', faqs: [ { question: 'Can any dog use your service?', @@ -219,6 +219,7 @@ export const homepageContent: HomePageContent = { { label: '1:1 Walks', href: '/dog-walking' }, { label: 'Puppy Visits', href: '/puppy-visits' }, { label: 'Our Pricing', href: '/our-pricing' }, + { label: 'About Us', href: '/about' }, { label: 'Contact Us', href: '/contact-us' } ], contactLinks: [ diff --git a/src/lib/content/pack-walks.ts b/src/lib/content/pack-walks.ts index e2474cb..4887c51 100644 --- a/src/lib/content/pack-walks.ts +++ b/src/lib/content/pack-walks.ts @@ -59,11 +59,11 @@ export const packWalksContent: ServicePageContent = { title: 'Tiny Gang membership benefits', items: [ { - title: 'Socialization with other dogs', - body: 'Tiny Gang pack walks help small and medium-sized dogs mingle and learn social skills from each other, boosting their confidence and positive behavior.' + title: 'Socialisation with other dogs', + body: 'Tiny Gang pack walks help small and medium-sized dogs mingle and learn social skills from each other, boosting their confidence and positive behaviour.' }, { - title: 'Taliored peace', + title: 'Tailored pace', body: 'Our handlers can adjust the pace and intensity of the walk to suit the energy levels and abilities of small and medium-sized dogs, ensuring a pleasant and enjoyable experience for all participants.' }, { @@ -75,8 +75,8 @@ export const packWalksContent: ServicePageContent = { body: 'Tiny Gang pack walks foster stronger bonds between dogs and their walker, as well as between the dogs themselves, enhancing trust and companionship among the group.' }, { - title: 'Individualized attention', - body: 'Small pack sizes allow for more personalized care and attention from the walker, addressing the unique needs and preferences of small and medium-sized breeds.' + title: 'Individualised attention', + body: 'Small pack sizes allow for more personalised care and attention from the walker, addressing the unique needs and preferences of small and medium-sized breeds.' }, { title: 'Safety', diff --git a/src/lib/content/puppy-visits.ts b/src/lib/content/puppy-visits.ts index 627bfa2..31cf0f2 100644 --- a/src/lib/content/puppy-visits.ts +++ b/src/lib/content/puppy-visits.ts @@ -46,10 +46,10 @@ export const puppyVisitsContent: ServicePageContent = { }, { title: 'Reduce anxiety', - body: "With time your pup will know when to expect a visit, reducing the chances of accidents while you're away. With regular visits, your pup will feel loved and secure, minimizing any time spent at home alone." + body: "With time your pup will know when to expect a visit, reducing the chances of accidents while you're away. With regular visits, your pup will feel loved and secure, minimising any time spent at home alone." }, { - title: 'Expert advise', + title: 'Expert advice', body: "As experienced dog pawrents, we've been through it all with many adorable puppies. Consider us your go-to for any questions or concerns as your furry friend grows up." } ] diff --git a/src/lib/content/terms-and-conditions.ts b/src/lib/content/terms-and-conditions.ts index 09807bd..77c5fa3 100644 --- a/src/lib/content/terms-and-conditions.ts +++ b/src/lib/content/terms-and-conditions.ts @@ -86,7 +86,7 @@ export const termsAndConditionsContent: LegalPageContent = { { type: 'list', content: [ - '5.1 Following the assessment walks, you must select your preferred permanent days of the week for walks, with a minimum commitment of one walk per week. Dogs must attend on these chosen days regularly for a minimum period of at least 6 months. Walks for dogs that show aggressive behavior may be cancelled with immediate effect.', + '5.1 Following the assessment walks, you must select your preferred permanent days of the week for walks, with a minimum commitment of one walk per week. Dogs must attend on these chosen days regularly for a minimum period of at least 6 months. Walks for dogs that show aggressive behaviour may be cancelled with immediate effect.', '5.2 Walks will not take place during severe weather conditions such as high winds, heavy snow, heavy rain, thunder, and lightning. In these cases, your dog will be returned to your residence, or the walk may be shortened, cancelled or rescheduled.', '5.3 If you decide to cancel a walk due to bad weather or heat, you agree to pay for the cancelled walk in full. However, we will endeavour to walk dogs in heavy rain or hot weather as long as we consider that it is safe for the dogs and our dog walkers.', '5.4 As part of our service, we will work with you to reinforce recall training, leash training, and car behaviour for your dog, using positive reinforcement methods. However, we do not provide individual training sessions and are not responsible for training your dog or for its behaviour.',