astro-tractstack 2.3.1 → 2.3.3

package/templates/src/pages/api/google/oauth/callback.ts

@@ -0,0 +1,50 @@
+import type { APIRoute } from '@/types/astro';
+
+export const GET: APIRoute = async ({ request, locals, url }) => {
+  const GO_BACKEND =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+  const tenantId =
+    locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+
+  const forwardedProto =
+    request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
+  const forwardedHost = request.headers.get('x-forwarded-host') || url.host;
+
+  const response = await fetch(
+    `${GO_BACKEND}/api/v1/google/oauth/callback${url.search}`,
+    {
+      method: 'GET',
+      redirect: 'manual',
+      headers: {
+        'X-Tenant-ID': tenantId,
+        'X-Forwarded-Proto': forwardedProto,
+        'X-Forwarded-Host': forwardedHost,
+        ...(request.headers.get('Authorization') && {
+          Authorization: request.headers.get('Authorization')!,
+        }),
+        ...(request.headers.get('Cookie') && {
+          Cookie: request.headers.get('Cookie')!,
+        }),
+      },
+    }
+  );
+
+  const location = response.headers.get('location');
+  if (location) {
+    const frontendOrigin = `${forwardedProto}://${forwardedHost}`;
+    const redirectUrl = new URL(location, frontendOrigin).toString();
+    return Response.redirect(
+      redirectUrl,
+      response.status >= 300 && response.status < 400 ? response.status : 302
+    );
+  }
+
+  const body = await response.text();
+  return new Response(body, {
+    status: response.status,
+    headers: {
+      'Content-Type':
+        response.headers.get('Content-Type') || 'application/json',
+    },
+  });
+};

package/templates/src/pages/api/google/oauth/disconnect.ts

@@ -0,0 +1,32 @@
+import type { APIRoute } from '@/types/astro';
+
+export const POST: APIRoute = async ({ request, locals, url }) => {
+  const GO_BACKEND =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+  const tenantId =
+    locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+  const forwardedProto =
+    request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
+  const forwardedHost = request.headers.get('x-forwarded-host') || url.host;
+
+  const response = await fetch(`${GO_BACKEND}/api/v1/google/oauth/disconnect`, {
+    method: 'POST',
+    headers: {
+      'X-Tenant-ID': tenantId,
+      'X-Forwarded-Proto': forwardedProto,
+      'X-Forwarded-Host': forwardedHost,
+      ...(request.headers.get('Authorization') && {
+        Authorization: request.headers.get('Authorization')!,
+      }),
+      ...(request.headers.get('Cookie') && {
+        Cookie: request.headers.get('Cookie')!,
+      }),
+    },
+  });
+
+  const data = await response.text();
+  return new Response(data, {
+    status: response.status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+};

package/templates/src/pages/api/google/oauth/start.ts

@@ -0,0 +1,32 @@
+import type { APIRoute } from '@/types/astro';
+
+export const GET: APIRoute = async ({ request, locals, url }) => {
+  const GO_BACKEND =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+  const tenantId =
+    locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+  const forwardedProto =
+    request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
+  const forwardedHost = request.headers.get('x-forwarded-host') || url.host;
+
+  const response = await fetch(`${GO_BACKEND}/api/v1/google/oauth/start`, {
+    method: 'GET',
+    headers: {
+      'X-Tenant-ID': tenantId,
+      'X-Forwarded-Proto': forwardedProto,
+      'X-Forwarded-Host': forwardedHost,
+      ...(request.headers.get('Authorization') && {
+        Authorization: request.headers.get('Authorization')!,
+      }),
+      ...(request.headers.get('Cookie') && {
+        Cookie: request.headers.get('Cookie')!,
+      }),
+    },
+  });
+
+  const data = await response.text();
+  return new Response(data, {
+    status: response.status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+};

package/templates/src/pages/api/google/oauth/status.ts

@@ -0,0 +1,32 @@
+import type { APIRoute } from '@/types/astro';
+
+export const GET: APIRoute = async ({ request, locals, url }) => {
+  const GO_BACKEND =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+  const tenantId =
+    locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+  const forwardedProto =
+    request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
+  const forwardedHost = request.headers.get('x-forwarded-host') || url.host;
+
+  const response = await fetch(`${GO_BACKEND}/api/v1/google/oauth/status`, {
+    method: 'GET',
+    headers: {
+      'X-Tenant-ID': tenantId,
+      'X-Forwarded-Proto': forwardedProto,
+      'X-Forwarded-Host': forwardedHost,
+      ...(request.headers.get('Authorization') && {
+        Authorization: request.headers.get('Authorization')!,
+      }),
+      ...(request.headers.get('Cookie') && {
+        Cookie: request.headers.get('Cookie')!,
+      }),
+    },
+  });
+
+  const data = await response.text();
+  return new Response(data, {
+    status: response.status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+};

package/templates/src/pages/privacy.astro

@@ -0,0 +1,84 @@
+---
+const effectiveDate = '2026-05-03';
+---
+
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Privacy Policy</title>
+  </head>
+  <body>
+    <main
+      style="margin: 0 auto; max-width: 48rem; padding: 2rem 1rem; font-family: Inter, Arial, sans-serif; line-height: 1.6;"
+    >
+      <h1>Privacy Policy</h1>
+      <p><strong>Effective date:</strong> {effectiveDate}</p>
+      <p>
+        This site is built with TractStack and is designed to minimize personal
+        data collection while supporting operational analytics.
+      </p>
+
+      <h2>What We Collect</h2>
+      <ul>
+        <li>
+          Pseudonymous usage and activity events for site operation and content
+          performance.
+        </li>
+        <li>
+          Session identifiers used for continuity, including session, visit, and
+          fingerprint IDs.
+        </li>
+        <li>
+          Optional profile/contact details only when you explicitly provide
+          them.
+        </li>
+      </ul>
+
+      <h2>How We Use Data</h2>
+      <ul>
+        <li>To operate site behavior, booking flows, and communications.</li>
+        <li>To measure page and interaction performance.</li>
+        <li>
+          To provide profile-based personalization when a profile is created.
+        </li>
+      </ul>
+
+      <h2>Consent and Controls</h2>
+      <ul>
+        <li>
+          Consent controls profile memory and preference retention in your
+          browser.
+        </li>
+        <li>
+          Operational session and interaction tracking may occur even when full
+          profile consent is not enabled.
+        </li>
+        <li>
+          You can revoke consent from the profile/session controls on this site;
+          this clears browser-stored session/profile data for this browser.
+        </li>
+      </ul>
+
+      <h2>Retention</h2>
+      <p>
+        Revoking consent clears local browser storage for session/profile data,
+        but previously recorded server-side operational logs and analytics
+        events may still exist according to site retention policy.
+      </p>
+
+      <h2>Consent Signal</h2>
+      <p>
+        The consent signal sent during session handshake can be present, denied,
+        or unknown depending on client state.
+      </p>
+
+      <h2>Contact</h2>
+      <p>
+        For privacy questions, contact the site owner using the contact details
+        provided on this website.
+      </p>
+    </main>
+  </body>
+</html>

package/templates/src/pages/terms.astro

@@ -0,0 +1,47 @@
+---
+const effectiveDate = '2026-05-03';
+---
+
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Terms of Service</title>
+  </head>
+  <body>
+    <main
+      style="margin: 0 auto; max-width: 48rem; padding: 2rem 1rem; font-family: Inter, Arial, sans-serif; line-height: 1.6;"
+    >
+      <h1>Terms of Service</h1>
+      <p><strong>Effective date:</strong> {effectiveDate}</p>
+
+      <h2>Acceptance of Terms</h2>
+      <p>By using this website and its services, you agree to these terms.</p>
+
+      <h2>Use of Service</h2>
+      <p>
+        You agree not to misuse the website, attempt unauthorized access, or
+        interfere with normal operation.
+      </p>
+
+      <h2>Bookings and Communications</h2>
+      <p>
+        If this site offers booking services, confirmations and related
+        communications are provided as operational notifications.
+      </p>
+
+      <h2>Disclaimer</h2>
+      <p>
+        Services are provided on an “as is” basis, without warranties except as
+        required by law.
+      </p>
+
+      <h2>Contact</h2>
+      <p>
+        For terms questions, contact the site owner using details provided on
+        this website.
+      </p>
+    </main>
+  </body>
+</html>

package/templates/src/stores/shopify.ts

@@ -227,6 +227,10 @@ export const transactionTraceId = persistentAtom<string>(
   'tractstack_shopify_trace_id',
   ''
 );
+export const preferredAppointmentMode = persistentAtom<'IN_PERSON' | 'REMOTE'>(
+  'tractstack_shopify_appointment_mode',
+  'IN_PERSON'
+);
 
 export interface CustomerDetails {
   name: string;
@@ -262,5 +266,22 @@ export function clearCommerceState() {
     leadId: '',
   });
   transactionTraceId.set('');
+  preferredAppointmentMode.set('IN_PERSON');
   cartState.set(CART_STATES.READY);
 }
+
+export interface CartKeyParams {
+  resourceId: string;
+  variantId?: string;
+  variantIdShipped?: string;
+  variantIdPickup?: string;
+}
+
+export function getCartItemKey(params: CartKeyParams): string {
+  if (params.variantId) {
+    return params.variantId;
+  }
+  return `${params.resourceId}_${params.variantIdShipped || 'null'}_${
+    params.variantIdPickup || 'null'
+  }`;
+}

package/templates/src/types/formTypes.ts

@@ -1,3 +1,5 @@
+import type { ReactNode } from 'react';
+
 // Base props interface for all atomic form components
 export interface BaseFormComponentProps<T> {
   value: T;
@@ -71,7 +73,7 @@ export interface NumberInputProps extends BaseFormComponentProps<number> {
 export interface FormSectionProps {
   title: string;
   description?: string;
-  children: React.ReactNode;
+  children: ReactNode;
   collapsible?: boolean;
   defaultExpanded?: boolean;
 }
@@ -216,7 +218,7 @@ export interface NumberInputProps extends BaseFormComponentProps<number> {
 export interface FormSectionProps {
   title: string;
   description?: string;
-  children: React.ReactNode;
+  children: ReactNode;
   collapsible?: boolean;
   defaultExpanded?: boolean;
 }

package/templates/src/types/tractstack.ts

@@ -1,3 +1,4 @@
+import type { CSSProperties, ReactNode } from 'react';
 import type { StoragePane } from './compositorTypes';
 
 export type DesignLibraryEntry = {
@@ -13,7 +14,7 @@ export type DesignLibraryConfig = DesignLibraryEntry[];
 
 export interface BaseComponentProps {
   class?: string;
-  style?: React.CSSProperties | string;
+  style?: CSSProperties | string;
   id?: string;
 }
 
@@ -74,7 +75,7 @@ export interface FragmentProps
   eager?: boolean;
 
   /** Fallback content while loading */
-  fallback?: React.ReactNode;
+  fallback?: ReactNode;
 }
 
 // Utility type for extracting props from Astro components
@@ -161,6 +162,8 @@ export interface SchedulingConfig {
   timezone: string;
   bufferGapsMinutes: number;
   maxLengthMinutes: number;
+  allowRemote: boolean;
+  remoteOnly: boolean;
   businessHours: Record<string, TimeBlock>;
   unavailableHours: TimeBlock[];
 }
@@ -203,6 +206,7 @@ export interface BrandConfig {
   HAS_RESEND?: boolean;
   HAS_HYDRATION_TOKEN?: boolean;
   SCHEDULING?: SchedulingConfig;
+  ADMIN_EMAIL?: string;
 }
 
 export interface BrandConfigState {
@@ -241,6 +245,7 @@ export interface BrandConfigState {
   hasResend: boolean;
   hasHydrationToken: boolean;
   scheduling: SchedulingConfig;
+  adminEmail: string;
 }
 
 // Form validation types
@@ -282,6 +287,13 @@ export interface AdvancedConfigStatus {
   resendApiKeySet: boolean;
   shopifyAdminSlugSet: boolean;
   userSetupWebhooks: boolean;
+  googleOauthClientIdSet: boolean;
+  googleOauthClientSecretSet: boolean;
+  googleCalendarIdSet: boolean;
+  googleAccessTokenSet: boolean;
+  googleRefreshTokenSet: boolean;
+  googleTokenExpirySet: boolean;
+  hasGoogleSync: boolean;
 }
 
 export interface AdvancedConfigState {
@@ -298,6 +310,9 @@ export interface AdvancedConfigState {
   shopifyAdminSlug: string;
   userSetupWebhooks: boolean;
   resendApiKey: string;
+  googleOauthClientId: string;
+  googleOauthClientSecret: string;
+  googleCalendarId: string;
 }
 
 export interface AdvancedConfigUpdateRequest {
@@ -315,6 +330,9 @@ export interface AdvancedConfigUpdateRequest {
   SHOPIFY_ADMIN_SLUG?: string;
   USER_SETUP_WEBHOOKS?: boolean;
   RESEND_API_KEY?: string;
+  GOOGLE_OAUTH_CLIENT_ID?: string;
+  GOOGLE_OAUTH_CLIENT_SECRET?: string;
+  GOOGLE_CALENDAR_ID?: string;
 }
 
 export interface MenuNodeState {
@@ -517,6 +535,14 @@ export interface CategorizedResults {
 }
 
 export type BookingStatus = 'PENDING' | 'CONFIRMED' | 'CANCELLED';
+export type AppointmentMode = 'IN_PERSON' | 'REMOTE';
+export type GoogleSyncStatus =
+  | 'NOT_SYNCED'
+  | 'PENDING'
+  | 'SYNCED'
+  | 'DELETE_PENDING'
+  | 'DELETE_SYNCED'
+  | 'FAILED';
 
 export interface BookingEntity {
   id: string; // traceId
@@ -525,7 +551,14 @@ export interface BookingEntity {
   startTime: string; // ISO-8601 UTC string
   endTime: string; // ISO-8601 UTC string
   status: BookingStatus;
+  appointmentMode: AppointmentMode;
   shopifyOrderId?: string;
+  googleEventId?: string;
+  googleMeetURL?: string;
+  googleSyncStatus: GoogleSyncStatus;
+  googleLastError?: string;
+  confirmationEmailSent: boolean;
+  linkAddedEmailSent: boolean;
   createdAt: string; // ISO-8601 UTC string
   leadEmail?: string;
   leadName?: string;

package/templates/src/utils/api/advancedHelpers.ts

@@ -27,6 +27,9 @@ export function convertToLocalState(
       resendApiKey: '',
       shopifyAdminSlug: '',
       userSetupWebhooks: false,
+      googleOauthClientId: '',
+      googleOauthClientSecret: '',
+      googleCalendarId: '',
     };
   }
 
@@ -47,6 +50,9 @@ export function convertToLocalState(
     resendApiKey: '',
     shopifyAdminSlug: '',
     userSetupWebhooks: status.userSetupWebhooks,
+    googleOauthClientId: '',
+    googleOauthClientSecret: '',
+    googleCalendarId: '',
   };
 }
 
@@ -108,6 +114,16 @@ export function convertToBackendFormat(
     request.RESEND_API_KEY = state.resendApiKey.trim();
   }
 
+  if (state.googleOauthClientId?.trim()) {
+    request.GOOGLE_OAUTH_CLIENT_ID = state.googleOauthClientId.trim();
+  }
+  if (state.googleOauthClientSecret?.trim()) {
+    request.GOOGLE_OAUTH_CLIENT_SECRET = state.googleOauthClientSecret.trim();
+  }
+  if (state.googleCalendarId?.trim()) {
+    request.GOOGLE_CALENDAR_ID = state.googleCalendarId.trim();
+  }
+
   return request;
 }
 

package/templates/src/utils/api/bookingHelpers.ts

@@ -36,7 +36,8 @@ export const bookingHelpers = {
     traceId: string,
     startTime: string,
     endTime: string,
-    resourceIds: string[]
+    resourceIds: string[],
+    appointmentMode: 'IN_PERSON' | 'REMOTE'
   ) => {
     const details = customerDetails.get();
 
@@ -51,6 +52,7 @@ export const bookingHelpers = {
         resourceIds,
         startTime,
         endTime,
+        appointmentMode,
       }),
     });
     return await response.json();

package/templates/src/utils/api/brandConfig.ts

@@ -66,6 +66,7 @@ export async function getBrandConfig(tenantId: string): Promise<BrandConfig> {
           KNOWN_RESOURCES: {},
           DESIGN_LIBRARY: [],
           HAS_AAI: false,
+          ADMIN_EMAIL: '',
         } as BrandConfig;
       }
       throw new Error(response.error || 'Failed to get brand configuration');
@@ -100,6 +101,7 @@ export async function getBrandConfig(tenantId: string): Promise<BrandConfig> {
         KNOWN_RESOURCES: {},
         DESIGN_LIBRARY: [],
         HAS_AAI: false,
+        ADMIN_EMAIL: '',
       } as BrandConfig;
     }
     throw error;

package/templates/src/utils/api/brandHelpers.ts

@@ -44,10 +44,13 @@ export function convertToLocalState(
     showShopifyHelper: brandConfig.SHOW_SHOPIFY_HELPER ?? false,
     hasResend: brandConfig.HAS_RESEND ?? false,
     hasHydrationToken: brandConfig.HAS_HYDRATION_TOKEN ?? false,
+    adminEmail: brandConfig.ADMIN_EMAIL ?? '',
     scheduling: brandConfig.SCHEDULING ?? {
       timezone: 'UTC',
       bufferGapsMinutes: 15,
       maxLengthMinutes: 0,
+      allowRemote: false,
+      remoteOnly: false,
       businessHours: {},
       unavailableHours: [],
     },
@@ -61,6 +64,11 @@ export function convertToLocalState(
 export function convertToBackendFormat(
   localState: BrandConfigState
 ): BrandConfig {
+  const scheduling = { ...localState.scheduling };
+  if (scheduling.remoteOnly) {
+    scheduling.allowRemote = true;
+  }
+
   return {
     TENANT_ID: localState.tenantId,
     SITE_INIT: localState.siteInit,
@@ -85,7 +93,8 @@ export function convertToBackendFormat(
     HAS_SHOPIFY: localState.hasShopify,
     SHOW_SHOPIFY_HELPER: localState.showShopifyHelper,
     HAS_RESEND: localState.hasResend,
-    SCHEDULING: localState.scheduling,
+    SCHEDULING: scheduling,
+    ADMIN_EMAIL: localState.adminEmail,
 
     // ALWAYS send asset paths (current state)
     LOGO: localState.logo,
@@ -124,6 +133,12 @@ export function validateBrandConfig(state: BrandConfigState): FieldErrors {
     errors.footer = 'Site footer is required';
   }
 
+  if (!state.adminEmail?.trim()) {
+    errors.adminEmail = 'Admin Email is required';
+  } else if (!isValidEmail(state.adminEmail)) {
+    errors.adminEmail = 'Please enter a valid email address';
+  }
+
   // Validate brand colors (must have exactly 8)
   if (!state.brandColours || state.brandColours.length !== 8) {
     errors.brandColours = 'Must have exactly 8 brand colors';
@@ -172,3 +187,11 @@ function isValidHexColor(color: string): boolean {
   const hex = color.startsWith('#') ? color.slice(1) : color;
   return /^([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/.test(hex);
 }
+
+/**
+ * Helper function to validate email addresses
+ */
+function isValidEmail(email: string): boolean {
+  const re = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return re.test(email);
+}

package/templates/src/utils/api/emailHelpers.ts

@@ -0,0 +1,105 @@
+import { TractStackAPI } from '../api';
+
+export interface TextBlock {
+  type: 'text';
+  content: string;
+  align: 'left' | 'center' | 'right';
+  color: string;
+  isBold: boolean;
+}
+
+export interface ButtonBlock {
+  type: 'button';
+  label: string;
+  url: string;
+  bgColor: string;
+  textColor: string;
+}
+
+export interface DividerBlock {
+  type: 'divider';
+  color: string;
+}
+
+export type EmailBlock = TextBlock | ButtonBlock | DividerBlock;
+
+export interface EmailTemplate {
+  subject: string;
+  blocks: EmailBlock[];
+}
+
+export interface PreviewResponse {
+  subject: string;
+  html: string;
+}
+
+/** One row from GET /api/v1/emails/templates (merged manifests). */
+export interface EmailTemplateListEntry {
+  name: string;
+  adminTitle: string;
+}
+
+const getApi = () => {
+  return new TractStackAPI(
+    typeof window !== 'undefined'
+      ? (window as any).TRACTSTACK_CONFIG?.tenantId || 'default'
+      : 'default'
+  );
+};
+
+export const emailHelpers = {
+  getTemplates: async (): Promise<Record<string, EmailTemplateListEntry[]>> => {
+    const api = getApi();
+    const response = await api.get<Record<string, EmailTemplateListEntry[]>>(
+      '/api/v1/emails/templates'
+    );
+    if (!response.success || !response.data) {
+      throw new Error(response.error || 'Failed to fetch templates');
+    }
+    return response.data;
+  },
+
+  getTemplate: async (
+    category: string,
+    template: string
+  ): Promise<EmailTemplate> => {
+    const api = getApi();
+    const response = await api.get<EmailTemplate>(
+      `/api/v1/emails/templates/${category}/${template}`
+    );
+    if (!response.success || !response.data) {
+      throw new Error(response.error || 'Failed to fetch template');
+    }
+    return response.data;
+  },
+
+  saveTemplate: async (
+    category: string,
+    template: string,
+    data: EmailTemplate
+  ): Promise<void> => {
+    const api = getApi();
+    const response = await api.post(
+      `/api/v1/emails/templates/${category}/${template}`,
+      data
+    );
+    if (!response.success) {
+      throw new Error(response.error || 'Failed to save template');
+    }
+  },
+
+  previewTemplate: async (
+    template: EmailTemplate,
+    mockData: Record<string, any>
+  ): Promise<PreviewResponse> => {
+    const api = getApi();
+    const response = await api.post<PreviewResponse>('/api/v1/emails/preview', {
+      template,
+      data: mockData,
+    });
+    if (!response.success || !response.data) {
+      throw new Error(response.error || 'Failed to generate preview');
+    }
+    return response.data;
+  },
+};