Resolve merge conflicts between upstream auth/data refactors and local guest portal navigation updates, then align imports and room data so the combined branch builds successfully.
Made-with: Cursor
- Add /services with Spa-only and Gym-only offerings, filters, add/remove selection
- Selection panel with subtotal and mailto request; mobile sticky bar when items selected
- ShitayeLogoLoader + route loading.tsx with breathe/ring animations in globals.css
- Home: replace full services grid with promo strip linking to /services
- Nav/footer point to /services; include logo assets and map-related components
Made-with: Cursor
Gradients were not rendering consistently after build/deploy. Replace
accent-highlight/deep gradient tokens with solid --color-accent and
soft fills so staging and production match local.
Made-with: Cursor
- Replace flat mustard with softer champagne tones and gentler shadows
- Hero eyebrow: Book direct · Shitaye Suite Hotel
- Lighter pattern grid, chips, badges, card hover ring; meetings band ring toned down
- Ignore .dev.vars and .wrangler for local secrets and cache
Made-with: Cursor