@wix/himalaya-cli 0.1614.0 → 0.1615.0

package/templates/salon-spa/tokens.json

@@ -0,0 +1,341 @@
+{
+  "colors": {
+    "surfacePrimary": {
+      "light": "#FAF6EF",
+      "dark": "#141712",
+      "highContrast": "#FFFFFF"
+    },
+    "surfaceSecondary": {
+      "light": "#F2ECE2",
+      "dark": "#1B1F19",
+      "highContrast": "#F2F2F2"
+    },
+    "surfaceElevated": {
+      "light": "#FFFFFF",
+      "dark": "#222720",
+      "highContrast": "#FFFFFF"
+    },
+    "surfaceSubtle": {
+      "light": "#F6F1E8",
+      "dark": "#181B16",
+      "highContrast": "#FFFFFF"
+    },
+    "surfaceTertiary": {
+      "light": "#E9E1D4",
+      "dark": "#2A3027",
+      "highContrast": "#E6E6E6"
+    },
+    "textPrimary": {
+      "light": "#252A22",
+      "dark": "#F2EFE7",
+      "highContrast": "#000000"
+    },
+    "textSecondary": {
+      "light": "#585E53",
+      "dark": "#C2BDB1",
+      "highContrast": "#1F1F1F"
+    },
+    "textTertiary": {
+      "light": "#767A6E",
+      "dark": "#97938A",
+      "highContrast": "#333333"
+    },
+    "textOnAccent": {
+      "light": "#FFFFFF",
+      "dark": "#10130E",
+      "highContrast": "#FFFFFF"
+    },
+    "accentPrimary": {
+      "light": "#46594A",
+      "dark": "#A7C0A9",
+      "highContrast": "#1E2D21"
+    },
+    "accentSecondary": {
+      "light": "#A9834C",
+      "dark": "#D4B47F",
+      "highContrast": "#5A4220"
+    },
+    "accentSurface": {
+      "light": "#F3E0D8",
+      "dark": "#2C3830",
+      "highContrast": "#F7E9E3"
+    },
+    "accentText": {
+      "light": "#3E5042",
+      "dark": "#B4CCB6",
+      "highContrast": "#1E2D21"
+    },
+    "success": {
+      "light": "#2F6A47",
+      "dark": "#8CC9A2",
+      "highContrast": "#0F4526"
+    },
+    "successSurface": {
+      "light": "#E7F0E9",
+      "dark": "#15211A",
+      "highContrast": "#E7F0E9"
+    },
+    "warning": {
+      "light": "#8A6118",
+      "dark": "#D6B061",
+      "highContrast": "#5C3E07"
+    },
+    "warningSurface": {
+      "light": "#F6EEDC",
+      "dark": "#231D10",
+      "highContrast": "#F6EEDC"
+    },
+    "danger": {
+      "light": "#A63D33",
+      "dark": "#E0928A",
+      "highContrast": "#7A1F17"
+    },
+    "dangerSurface": {
+      "light": "#F7E8E5",
+      "dark": "#261513",
+      "highContrast": "#F7E8E5"
+    },
+    "border": {
+      "light": "#E5DCCD",
+      "dark": "#30362D",
+      "highContrast": "#5C5C5C"
+    }
+  },
+  "spacing": {
+    "xs": 4,
+    "sm": 8,
+    "md": 12,
+    "lg": 16,
+    "xl": 24,
+    "xxl": 32
+  },
+  "typography": {
+    "display": {
+      "size": 38,
+      "weight": 400,
+      "line": 1.12,
+      "letterSpacing": -0.4,
+      "family": "Georgia"
+    },
+    "heroTitle": {
+      "size": 34,
+      "weight": 400,
+      "line": 1.12,
+      "letterSpacing": -0.3,
+      "family": "Georgia"
+    },
+    "pageTitle": {
+      "size": 28,
+      "weight": 400,
+      "line": 1.2,
+      "letterSpacing": -0.2,
+      "family": "Georgia"
+    },
+    "title1": {
+      "size": 30,
+      "weight": 400,
+      "line": 1.2,
+      "letterSpacing": -0.3,
+      "family": "Georgia"
+    },
+    "title2": {
+      "size": 24,
+      "weight": 400,
+      "line": 1.25,
+      "letterSpacing": -0.2,
+      "family": "Georgia"
+    },
+    "title3": {
+      "size": 18,
+      "weight": 600,
+      "line": 1.3,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "headline": {
+      "size": 16,
+      "weight": 600,
+      "line": 1.35,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "body": {
+      "size": 16,
+      "weight": 400,
+      "line": 1.5,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "bodyEmphasis": {
+      "size": 16,
+      "weight": 600,
+      "line": 1.4,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "callout": {
+      "size": 15,
+      "weight": 500,
+      "line": 1.4,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "label": {
+      "size": 14,
+      "weight": 600,
+      "line": 1.3,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "footnote": {
+      "size": 14,
+      "weight": 400,
+      "line": 1.45,
+      "letterSpacing": 0,
+      "family": "Wix Madefor Text"
+    },
+    "caption": {
+      "size": 12,
+      "weight": 500,
+      "line": 1.4,
+      "letterSpacing": 0.2,
+      "family": "Wix Madefor Text"
+    },
+    "greetingScript": {
+      "size": 22,
+      "weight": 400,
+      "line": 1.2,
+      "letterSpacing": 0,
+      "family": "Georgia",
+      "style": "italic"
+    }
+  },
+  "radius": {
+    "sm": 8,
+    "md": 14,
+    "lg": 20,
+    "pill": 999
+  },
+  "kit": {
+    "material": "flat",
+    "variant": "default",
+    "density": "spacious",
+    "motion": "smooth",
+    "motionDefaults": "subtle"
+  },
+  "shadows": {
+    "sm": {
+      "color": "#2B2418",
+      "opacity": 0.06,
+      "radius": 8,
+      "x": 0,
+      "y": 2
+    },
+    "md": {
+      "color": "#2B2418",
+      "opacity": 0.09,
+      "radius": 18,
+      "x": 0,
+      "y": 6
+    },
+    "lg": {
+      "color": "#2B2418",
+      "opacity": 0.12,
+      "radius": 30,
+      "x": 0,
+      "y": 12
+    }
+  },
+  "gradients": {
+    "brand": {
+      "colors": [
+        "accentPrimary",
+        "accentText"
+      ],
+      "angle": 135
+    },
+    "subtle": {
+      "colors": [
+        "surfaceSecondary",
+        "surfacePrimary"
+      ],
+      "angle": 180
+    },
+    "hero": {
+      "colors": [
+        "accentSurface",
+        "surfacePrimary"
+      ],
+      "angle": 160
+    }
+  },
+  "materials": {
+    "flat": {
+      "style": "flat",
+      "tint": "surfaceSecondary",
+      "opacity": 1
+    }
+  },
+  "motions": {
+    "smooth": {
+      "duration": 260,
+      "easing": "easeInOut"
+    },
+    "quick": {
+      "duration": 140,
+      "easing": "easeOut"
+    },
+    "appearSoft": {
+      "duration": 480,
+      "easing": "easeOut"
+    }
+  },
+  "tabBar": {
+    "background": {
+      "color": "surfaceElevated"
+    },
+    "shape": {
+      "kind": "full"
+    },
+    "border": {
+      "topHairline": true,
+      "color": "border"
+    },
+    "selectedIndicator": {
+      "kind": "colorOnly",
+      "color": "accentPrimary"
+    },
+    "activeTint": "accentPrimary",
+    "inactiveTint": "textTertiary",
+    "labels": {
+      "show": true,
+      "typography": "caption"
+    },
+    "iconSize": 22,
+    "motion": "smooth"
+  },
+  "drawer": {
+    "background": {
+      "color": "surfaceSecondary"
+    },
+    "width": 300,
+    "activeTint": "accentPrimary",
+    "inactiveTint": "textSecondary",
+    "selectedIndicator": {
+      "kind": "pill",
+      "color": "accentPrimary"
+    },
+    "labels": {
+      "show": true,
+      "typography": "body"
+    },
+    "iconSize": 22,
+    "edgeInsets": 12,
+    "motion": "smooth"
+  },
+  "contentMaxWidth": {
+    "base": 480,
+    "medium": 600,
+    "expanded": 760
+  }
+}

package/templates/yoga-studio/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

package/templates/yoga-studio/tier5-src/_shared/himi-account.ts

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",

package/templates/yoga-studio/tier5-src/_shared/himi-booking-saved.ts

@@ -0,0 +1,88 @@
+// Saved (favorite) booking services use the host's durable, app-scoped KV, shared by every
+// screen worker — the service detail toggles a row (himi-booking-service `toggleSaved`), the
+// Favorites list reads them (himi-booking-saved). Same model as _shared/himi-store-saved.ts: a
+// failed write must never claim that a save succeeded.
+export interface SavedService {
+  id: string;
+  name: string;
+  /** The price line as the detail showed it ("$250"), kept so the list paints offline. */
+  price: string;
+  /** The duration line ("1 hr"). */
+  duration: string;
+  image: string;
+  category: string;
+  /** A course: the list's Book passes `course` to the time screen, which then refuses a course
+   *  whose record failed to load instead of offering its sessions one by one. */
+  course?: boolean;
+}
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+type Host = { himalaya?: { storage?: StorageLike; input?: Record<string, unknown> }; localStorage?: StorageLike };
+const BASE = "himi-booking:saved-services:v1";
+function storage(): StorageLike {
+  const host = globalThis as Host;
+  const kv = host.himalaya?.storage ?? host.localStorage;
+  if (!kv) throw new Error("Saved-service storage is unavailable");
+  return kv;
+}
+const validPart = (value: unknown): value is string => typeof value === "string" && /^[A-Za-z0-9_.:-]{1,128}$/.test(value) && value !== "default";
+/** Saves belong to whoever made them. A signed-in member's live under the host's authenticated
+ *  account + business — the partition collection preferences use, so a second member on the same
+ *  device never sees them; a visitor's live on the device. A member's partition, read for the
+ *  first time, takes the visitor's saves on this device (signing in carries them, like a cart),
+ *  once — the device list is then emptied. */
+function storeKey(kv: StorageLike): string {
+  const input = (globalThis as Host).himalaya?.input;
+  const account = input?.__himiPreferenceAccount, business = input?.__himiPreferenceBusiness;
+  if (!validPart(account) || !validPart(business)) return BASE;
+  const key = `${BASE}.${account}.${encodeURIComponent(business)}`;
+  if (kv.getItem(key) === null) {
+    const visitor = kv.getItem(BASE);
+    if (visitor !== null) {
+      kv.setItem(key, visitor);
+      // Empty the device list only once the member's copy is confirmed: a web host may swallow a
+      // failed write, and clearing then would lose the visitor's saves.
+      if (kv.getItem(key) === visitor) kv.setItem(BASE, "[]");
+    }
+  }
+  return key;
+}
+const str = (value: unknown): string => (typeof value === "string" ? value : "");
+export function readSavedServices(): SavedService[] {
+  const kv = storage();
+  const raw = kv.getItem(storeKey(kv));
+  if (!raw) return [];
+  const parsed: unknown = JSON.parse(raw);
+  if (!Array.isArray(parsed)) throw new Error("Invalid saved-service data");
+  const rows = new Map<string, SavedService>();
+  for (const value of parsed) {
+    if (!value || typeof value !== "object") continue;
+    const row = value as Record<string, unknown>;
+    if (typeof row.id !== "string" || !row.id.trim() || typeof row.name !== "string") continue;
+    rows.set(row.id, { id: row.id, name: row.name, price: str(row.price), duration: str(row.duration), image: str(row.image), category: str(row.category), ...(row.course === true ? { course: true } : {}) });
+  }
+  return [...rows.values()];
+}
+
+export function isServiceSaved(id: string): boolean {
+  return readSavedServices().some(row => row.id === id);
+}
+export function writeSavedServices(rows: SavedService[]): void {
+  const kv = storage();
+  const key = storeKey(kv);
+  const value = JSON.stringify(rows);
+  kv.setItem(key, value);
+  // Web hosts may swallow quota/security errors. Confirm the synchronous write
+  // before displaying success; a missing/mismatched read is a failed save.
+  if (kv.getItem(key) !== value) throw new Error("Saved-service write did not persist");
+}
+/** Save or unsave; returns the new saved state. The newest save is listed first. */
+export function toggleSavedService(service: SavedService): boolean {
+  if (!service.id.trim() || !service.name.trim()) throw new Error("No service to save");
+  const rows = readSavedServices();
+  const saved = !rows.some(row => row.id === service.id);
+  writeSavedServices(saved ? [service, ...rows] : rows.filter(row => row.id !== service.id));
+  return saved;
+}
+export function removeSavedService(id: string): void {
+  writeSavedServices(readSavedServices().filter(row => row.id !== id));
+}

package/templates/yoga-studio/tier5-src/himi-booking-service/index.ts

@@ -22,6 +22,7 @@ import { wixMediaUrl, WIX_DETAIL_IMAGE, WIX_LIST_IMAGE } from "@himalaya/wix-med
 import { formatClock, formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { descriptionBody } from "../_shared/rich-body.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
+import { isServiceSaved, toggleSavedService } from "../_shared/himi-booking-saved.js";
 
 // Offline-first (data-offline): the service detail is a public read-through. On a
 // fetch failure we fall back to the last-synced row for this service written by
@@ -182,6 +183,13 @@ interface S {
   sessionMessageOk: boolean;
   sessionMessageFailed: boolean;
   noSessionMessage: boolean;
+  // ---- Favorites (the heart an app adds with withServiceSaveToggle; _shared/himi-booking-saved.ts) ----
+  saved: boolean;
+  notSaved: boolean;
+  /** The heart's spoken label: what a tap does now. */
+  saveLabel: string;
+  /** "" unless the last save or unsave failed. */
+  saveMessage: string;
 }
 
 function inputId(): string {
@@ -790,6 +798,10 @@ function derive(s: S): S {
     // Change Time opens the time screen, which cannot book a service closed to online booking.
     noChangeTime: (control !== "book" && control !== "waitlist" && control !== "closed") || !s.bookableOnline,
     noSessionMessage: !s.sessionMessage,
+    notSaved: !s.saved,
+    saveLabel: s.saved
+      ? copyParam("service.unsaveLabel", "Remove from favorites")
+      : copyParam("service.saveLabel", "Save to favorites"),
     notBookableOnline: !s.bookableOnline,
     noAbout: !s.about && !s.aboutJson,
     noPolicy: s.policyLines.length === 0,
@@ -866,9 +878,16 @@ function withService(s: S, service: WixService): S {
     // WS-C — canonical param-less target; the descriptor's choose-time CTA
     // binds the separate `id` state field as a first-class nav param.
     timeScreenId: "himi_time",
+    saved: savedNow(serviceId),
   });
 }
 
+/** Whether the service is a favorite. Unreadable storage reads as not saved: the heart is a
+ *  convenience and never holds the screen back. */
+function savedNow(id: string): boolean {
+  try { return !!id && isServiceSaved(id); } catch { return false; }
+}
+
 /** The service record: with staff details when this token may read them, else without. */
 async function fetchService(id: string): Promise<WixService | undefined> {
   try {
@@ -897,9 +916,10 @@ const svc = defineService<S, {
   book: (s: S) => S;
   changeTime: (s: S) => S;
   joinWaitlist: (s: S, arg?: unknown) => Promise<S>;
+  toggleSaved: (s: S) => S;
 }>("himiBookingService", {
   // A join's outcome belongs to that visit: a cold start must not replay it from saved state.
-  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage"],
+  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage", "saveMessage"],
   state: derive({
     status: "loading",
     id,
@@ -1005,6 +1025,10 @@ const svc = defineService<S, {
     noChangeTime: true,
     ...NO_SESSION_MESSAGE,
     noSessionMessage: true,
+    saved: false,
+    notSaved: true,
+    saveLabel: "",
+    saveMessage: "",
   }),
   actions: {
     load: async (s, arg) => {
@@ -1012,14 +1036,16 @@ const svc = defineService<S, {
       rememberSignIn(arg);
       if (!s.id) return derive({ ...s, status: "ready", errored: true });
       // A new view: a join's outcome from before is not news when the screen shows again.
-      const start = { ...s, policyExpanded: false, scheduleExpanded: false, ...NO_SESSION_MESSAGE };
+      const start = { ...s, policyExpanded: false, scheduleExpanded: false, saveMessage: "", ...NO_SESSION_MESSAGE };
       try {
         const service = await fetchService(s.id);
         if (!service) return withSession(derive({ ...start, status: "ready" }), undefined);
         loadedService = service;
         // The session the Agenda row opened on, read beside the service-wide availability.
         const [shown, sel] = await Promise.all([withGroupAvailability(withService(start, service), service), readSessionBounded(service)]);
-        return withSession(shown, sel);
+        // The heart is read again after the waits (the session read takes up to 10 s): a toggle
+        // tapped meanwhile wrote storage, and the snapshot taken before would undo it.
+        return withSession({ ...shown, saved: savedNow(s.id) }, sel);
       } catch {
         // Offline: paint from the last-synced services cache (written by the list
         // worker) before falling back to the error state. The cache holds the name,
@@ -1038,6 +1064,7 @@ const svc = defineService<S, {
             category: String(cached.category ?? ""),
             images: image ? [{ url: image, alt: name }] : [],
             timeScreenId: `himi_time_${s.id}`,
+            saved: savedNow(s.id),
           }, undefined);
         }
         return withSession({ ...start, status: "ready", errored: true, name: "" }, undefined);
@@ -1056,6 +1083,26 @@ const svc = defineService<S, {
     },
     togglePolicy: (s) => derive({ ...s, policyExpanded: !s.policyExpanded }),
     toggleSchedule: (s) => derive({ ...s, scheduleExpanded: !s.scheduleExpanded }),
+    // The heart: save or unsave this service on the device (the member's own list once signed
+    // in). The row keeps what the Favorites list shows offline; a failed write says so and never
+    // shows the heart as saved.
+    toggleSaved: (s) => {
+      if (!s.id || !s.hasService || s.errored) return s;
+      try {
+        const saved = toggleSavedService({
+          id: s.id,
+          name: s.name,
+          price: s.priceIsText ? "" : s.priceText,
+          duration: s.durationText,
+          image: s.image,
+          category: s.category,
+          ...(s.isCourse ? { course: true } : {}),
+        });
+        return derive({ ...s, saved, saveMessage: "" });
+      } catch {
+        return derive({ ...s, saved: savedNow(s.id), saveMessage: copyParam("service.saveError", "Could not update your favorites. Try again.") });
+      }
+    },
     // The footer button opens the time screen for the loaded service. A worker directive,
     // not a `himi.open` with a `$service:` id param: the iOS and Android sticky footers
     // dispatch their taps without resolving `$service:` params, so the id never arrived.