astro-tractstack 2.3.1 → 2.3.3

package/templates/src/utils/booking/appointmentMode.ts

@@ -0,0 +1,135 @@
+import type { ResourceNode } from '@/types/compositorTypes';
+import type { CartItemState } from '@/stores/shopify';
+
+export type AppointmentMode = 'IN_PERSON' | 'REMOTE';
+
+export type AppointmentSchedulingInput = {
+  allowRemote?: boolean;
+  remoteOnly?: boolean;
+};
+
+export type AppointmentModeConstraints = {
+  serviceResources: ResourceNode[];
+  anyServiceRemoteOnly: boolean;
+  someServiceForcesInPerson: boolean;
+  allServicesAllowRemote: boolean;
+  effectiveRemoteOnly: boolean;
+  effectiveAllowRemote: boolean;
+  remoteAvailable: boolean;
+  inPersonAvailable: boolean;
+  hasImpossibleRemoteMix: boolean;
+  /** Same as `remoteAvailable`; kept for cart naming parity */
+  canRemote: boolean;
+};
+
+/**
+ * Collects service resources involved in booking (same rules as Cart / CheckoutModal).
+ */
+export function collectBookingServiceResources(
+  cart: Record<string, CartItemState>,
+  resources: ResourceNode[]
+): ResourceNode[] {
+  const dedupe = new Map<string, ResourceNode>();
+  for (const item of Object.values(cart)) {
+    const resource = resources.find((r) => r.id === item.resourceId);
+    if (
+      resource &&
+      (resource.categorySlug === 'service' ||
+        resource.optionsPayload?.bookingLengthMinutes)
+    ) {
+      dedupe.set(resource.id, resource);
+    }
+    if (item.boundResourceId) {
+      const bound = resources.find((r) => r.id === item.boundResourceId);
+      if (bound) {
+        dedupe.set(bound.id, bound);
+      }
+    }
+  }
+  return Array.from(dedupe.values());
+}
+
+/**
+ * Returns true if the cart would mix remote-only services with in-person-only services.
+ */
+export function wouldCartHaveImpossibleRemoteMix(
+  nextCart: Record<string, CartItemState>,
+  resources: ResourceNode[]
+): boolean {
+  const svc = collectBookingServiceResources(nextCart, resources);
+  const anyRemoteOnly = svc.some((r) => Boolean(r.optionsPayload?.remoteOnly));
+  const someInPersonOnly = svc.some(
+    (r) =>
+      !Boolean(r.optionsPayload?.remoteOnly) &&
+      !Boolean(r.optionsPayload?.allowRemote)
+  );
+  return anyRemoteOnly && someInPersonOnly;
+}
+
+/**
+ * Single source of truth for tenant + per-service remote eligibility.
+ */
+export function deriveAppointmentConstraints(
+  cart: Record<string, CartItemState>,
+  resources: ResourceNode[],
+  tenantScheduling: AppointmentSchedulingInput
+): AppointmentModeConstraints {
+  const serviceResources = collectBookingServiceResources(cart, resources);
+  const allowRemote = Boolean(tenantScheduling.allowRemote);
+  const tenantRemoteOnly = Boolean(tenantScheduling.remoteOnly);
+
+  const anyServiceRemoteOnly = serviceResources.some((r) =>
+    Boolean(r.optionsPayload?.remoteOnly)
+  );
+  const someServiceForcesInPerson = serviceResources.some(
+    (r) =>
+      !Boolean(r.optionsPayload?.remoteOnly) &&
+      !Boolean(r.optionsPayload?.allowRemote)
+  );
+  const allServicesAllowRemote =
+    serviceResources.length === 0 ||
+    serviceResources.every(
+      (r) =>
+        Boolean(r.optionsPayload?.remoteOnly) ||
+        Boolean(r.optionsPayload?.allowRemote)
+    );
+
+  const effectiveRemoteOnly = tenantRemoteOnly || anyServiceRemoteOnly;
+  const effectiveAllowRemote = allowRemote || tenantRemoteOnly;
+
+  const remoteAvailable =
+    effectiveRemoteOnly ||
+    (effectiveAllowRemote &&
+      serviceResources.length > 0 &&
+      allServicesAllowRemote);
+
+  const inPersonAvailable = !effectiveRemoteOnly;
+  const hasImpossibleRemoteMix =
+    anyServiceRemoteOnly && someServiceForcesInPerson;
+
+  return {
+    serviceResources,
+    anyServiceRemoteOnly,
+    someServiceForcesInPerson,
+    allServicesAllowRemote,
+    effectiveRemoteOnly,
+    effectiveAllowRemote,
+    remoteAvailable,
+    inPersonAvailable,
+    hasImpossibleRemoteMix,
+    canRemote: remoteAvailable,
+  };
+}
+
+export function pickInitialAppointmentMode(
+  c: AppointmentModeConstraints,
+  currentPreferred: AppointmentMode
+): AppointmentMode {
+  if (c.effectiveRemoteOnly) {
+    return 'REMOTE';
+  }
+  if (currentPreferred === 'REMOTE' && c.remoteAvailable) {
+    return 'REMOTE';
+  }
+  return 'IN_PERSON';
+}

package/templates/src/utils/customHelpers.ts

@@ -53,6 +53,8 @@ export const RESTRICTION_MESSAGES = {
   TERMS: 'Please review the terms for this item before adding it to your cart.',
   MAX_DURATION: (max: number) =>
     `You cannot book more than ${max} minutes of services in one session.`,
+  INCOMPATIBLE_REMOTE:
+    'This service cannot be combined with the services already in your cart. Some require remote-only delivery while others can only be delivered in person.',
   DEFAULT_ADD: (title: string) => `${title} has been added to your cart.`,
 };
 

package/templates/src/utils/tenantResolver.ts

@@ -1,4 +1,4 @@
-const VERBOSE = false;
+const VERBOSE = true;
 
 interface TenantResolution {
   id: string;

package/utils/inject-files.ts

@@ -753,10 +753,6 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/utils/actions/preParse_Action.ts'),
       dest: 'src/utils/actions/preParse_Action.ts',
     },
-    {
-      src: resolve('../templates/src/utils/actions/preParse_Clicked.ts'),
-      dest: 'src/utils/actions/preParse_Clicked.ts',
-    },
     {
       src: resolve('../templates/src/utils/actions/preParse_Impression.ts'),
       dest: 'src/utils/actions/preParse_Impression.ts',
@@ -900,6 +896,14 @@ export async function injectTemplateFiles(
       src: resolve('../templates/custom/shopify/cart.astro'),
       dest: 'src/pages/cart.astro',
     },
+    {
+      src: resolve('../templates/src/pages/privacy.astro'),
+      dest: 'src/pages/privacy.astro',
+    },
+    {
+      src: resolve('../templates/src/pages/terms.astro'),
+      dest: 'src/pages/terms.astro',
+    },
     {
       src: resolve('../templates/src/pages/404.astro'),
       dest: 'src/pages/404.astro',
@@ -1000,6 +1004,22 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/pages/api/auth/logout.ts'),
       dest: 'src/pages/api/auth/logout.ts',
     },
+    {
+      src: resolve('../templates/src/pages/api/google/oauth/start.ts'),
+      dest: 'src/pages/api/google/oauth/start.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/google/oauth/status.ts'),
+      dest: 'src/pages/api/google/oauth/status.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/google/oauth/disconnect.ts'),
+      dest: 'src/pages/api/google/oauth/disconnect.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/google/oauth/callback.ts'),
+      dest: 'src/pages/api/google/oauth/callback.ts',
+    },
     {
       src: resolve('../templates/src/pages/api/orphan-analysis.ts'),
       dest: 'src/pages/api/orphan-analysis.ts',
@@ -1258,6 +1278,36 @@ export async function injectTemplateFiles(
       ),
       dest: 'src/components/storykeep/shopify/ShopifyDashboard_Services.tsx',
     },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Emails.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Emails.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/email-builder/EmailBuilder.tsx'
+      ),
+      dest: 'src/components/storykeep/email-builder/EmailBuilder.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/email-builder/Blocks.tsx'
+      ),
+      dest: 'src/components/storykeep/email-builder/Blocks.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/email-builder/PropertyPanel.tsx'
+      ),
+      dest: 'src/components/storykeep/email-builder/PropertyPanel.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/email-builder/PreviewModal.tsx'
+      ),
+      dest: 'src/components/storykeep/email-builder/PreviewModal.tsx',
+    },
     {
       src: resolve(
         '../templates/src/components/storykeep/shopify/ShopifyDashboard_Search.tsx'
@@ -2267,6 +2317,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/utils/api/setupHelpers.ts'),
       dest: 'src/utils/api/setupHelpers.ts',
     },
+    {
+      src: resolve('../templates/src/utils/api/emailHelpers.ts'),
+      dest: 'src/utils/api/emailHelpers.ts',
+    },
     {
       src: resolve(
         '../templates/src/components/storykeep/widgets/HydrateWizard.tsx'
@@ -2317,6 +2371,11 @@ export async function injectTemplateFiles(
       dest: 'src/utils/customHelpers.ts',
       protected: true,
     },
+    {
+      src: resolve('../templates/src/utils/booking/appointmentMode.ts'),
+      dest: 'src/utils/booking/appointmentMode.ts',
+      protected: true,
+    },
     {
       src: resolve('../templates/custom/shopify/ShopifyProductGrid.tsx'),
       dest: 'src/custom/shopify/ShopifyProductGrid.tsx',
@@ -2465,7 +2524,6 @@ function createPlaceholder(filePath: string): string {
 
   if (filePath.endsWith('.tsx')) {
     return `// TractStack placeholder component
-import React from 'react';
 export default function Placeholder() {
   return <div>TractStack placeholder: ${filePath}</div>;
 }`;

package/templates/src/components/codehooks/SandboxAuthWrapper.tsx

@@ -1,101 +0,0 @@
-import { useState, useEffect } from 'react';
-import { Dialog } from '@ark-ui/react/dialog';
-import { Portal } from '@ark-ui/react/portal';
-import XMarkIcon from '@heroicons/react/24/solid/XMarkIcon';
-import { ProfileStorage } from '@/utils/profileStorage';
-import SandboxRegisterForm from '@/components/codehooks/SandboxRegisterForm';
-
-interface SandboxAuthWrapperProps {
-  isServerSideAuthenticated: boolean;
-}
-
-export default function SandboxAuthWrapper({
-  isServerSideAuthenticated,
-}: SandboxAuthWrapperProps) {
-  const [profileExists, setProfileExists] = useState<boolean | null>(null);
-
-  useEffect(() => {
-    const hasLocalProfile = ProfileStorage.hasProfile();
-
-    if (hasLocalProfile && !isServerSideAuthenticated) {
-      const token = localStorage.getItem('tractstack_profile_token');
-
-      if (token) {
-        ProfileStorage.storeProfileToken(token);
-        window.location.reload();
-        return;
-      } else {
-        ProfileStorage.clearProfile();
-        setProfileExists(false);
-      }
-    } else {
-      setProfileExists(hasLocalProfile);
-    }
-  }, [isServerSideAuthenticated]);
-
-  const handleRegistrationSuccess = () => {
-    setProfileExists(true);
-    window.location.reload();
-  };
-
-  const handleClose = () => {
-    window.location.href = '/';
-  };
-
-  if (profileExists === true && isServerSideAuthenticated) {
-    return null;
-  }
-
-  if (profileExists === null) {
-    return null;
-  }
-
-  return (
-    <Dialog.Root open={true} modal={true} trapFocus={false}>
-      <Portal>
-        <Dialog.Backdrop
-          className="fixed inset-0 bg-black bg-opacity-75"
-          style={{ zIndex: 9005 }}
-        />
-        <Dialog.Positioner
-          className="fixed inset-0 flex items-center justify-center p-4"
-          style={{ zIndex: 9005 }}
-        >
-          <Dialog.Content className="relative grid w-full max-w-6xl grid-cols-1 overflow-hidden rounded-lg bg-white shadow-2xl md:grid-cols-2">
-            <button
-              onClick={handleClose}
-              className="absolute right-4 top-4 z-10 rounded-full bg-gray-100 p-2 text-gray-600 shadow-sm transition-colors hover:bg-gray-200"
-              title="Close and exit Sandbox"
-            >
-              <XMarkIcon className="h-5 w-5" />
-            </button>
-
-            <div className="flex flex-col justify-center bg-gray-50 p-8 text-right">
-              <h2 className="text-4xl font-bold text-gray-900 md:text-5xl">
-                Press <span className="italic text-blue-600">your own</span>{' '}
-                Tract Stack
-              </h2>
-              <p className="mt-4 text-lg text-gray-600">
-                Create an interactive webpage in a sandbox! No credit card
-                required.
-              </p>
-              <p className="mt-8 text-sm text-gray-500">
-                Already connected?{' '}
-                <a
-                  href="/storykeep/profile"
-                  className="font-bold text-blue-600 underline hover:text-blue-500"
-                >
-                  Unlock your profile
-                </a>
-              </p>
-            </div>
-
-            <div className="flex flex-col justify-center p-8">
-              <SandboxRegisterForm onSuccess={handleRegistrationSuccess} />
-            </div>
-          </Dialog.Content>
-        </Dialog.Positioner>
-      </Portal>
-    </Dialog.Root>
-  );
-}

package/templates/src/utils/actions/actionButton.ts

@@ -1,103 +0,0 @@
-import { preParseClicked } from './preParse_Clicked';
-import type { BrandConfig } from '@/types/tractstack';
-
-interface ActionButtonParams {
-  callbackPayload: any;
-  targetUrl: string;
-  paneId: string;
-  config: BrandConfig;
-}
-
-// Import the sendAnalyticsEvent function to send events to backend
-async function sendAnalyticsEvent(event: {
-  contentId: string;
-  contentType: 'Pane' | 'StoryFragment';
-  eventVerb: string;
-  duration?: number;
-}): Promise<void> {
-  try {
-    const config = window.TRACTSTACK_CONFIG;
-    if (!config || !config.sessionId) return;
-    const backendUrl =
-      import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
-
-    const sessionId = config.sessionId;
-    const formData: { [key: string]: string } = {
-      beliefId: event.contentId,
-      beliefType: event.contentType,
-      beliefValue: event.eventVerb,
-      paneId: '',
-    };
-
-    if (event.duration !== undefined) {
-      formData.duration = event.duration.toString();
-    }
-
-    await fetch(`${backendUrl}/api/v1/state`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'X-Tenant-ID': config.tenantId,
-        'X-TractStack-Session-ID': sessionId,
-        'X-StoryFragment-ID': config.storyfragmentId,
-      },
-      body: new URLSearchParams(formData),
-    });
-  } catch (error) {
-    console.error('⛔ API ERROR: Analytics event failed', error, event);
-  }
-}
-
-export function handleActionButtonClick({
-  callbackPayload,
-  targetUrl,
-  paneId,
-  config,
-}: ActionButtonParams): void {
-  const event = preParseClicked(paneId, callbackPayload, config);
-
-  if (event) {
-    console.log(event);
-    sendAnalyticsEvent({
-      contentId: event.targetId || event.targetSlug || event.id,
-      contentType: 'Pane',
-      eventVerb: event.verb,
-    });
-  }
-
-  // Handle URL navigation and scroll
-  if (targetUrl.startsWith('#') || targetUrl.includes('#')) {
-    const id = targetUrl.split('#')[1];
-    const element = document.getElementById(id);
-
-    if (element) {
-      // Calculate the target position
-      const elementRect = element.getBoundingClientRect();
-      const targetPosition = elementRect.top + window.scrollY;
-
-      // Perform smooth scroll
-      window.scrollTo({
-        top: targetPosition,
-        behavior: 'smooth',
-      });
-
-      // After scrolling, ensure the page layout is preserved
-      const checkScrollEnd = setInterval(() => {
-        if (
-          window.scrollY === targetPosition ||
-          Math.abs(window.scrollY - targetPosition) < 2
-        ) {
-          clearInterval(checkScrollEnd);
-          document.body.style.minHeight = `${Math.max(
-            document.body.scrollHeight,
-            document.documentElement.scrollHeight
-          )}px`;
-        }
-      }, 100);
-    } else {
-      window.location.href = targetUrl;
-    }
-  } else {
-    window.location.href = targetUrl;
-  }
-}

package/templates/src/utils/actions/preParse_Clicked.ts

@@ -1,87 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import type { BrandConfig } from '@/types/tractstack';
-
-export const preParseClicked = (
-  id: string,
-  payload: any,
-  config: BrandConfig
-) => {
-  const thisPayload = (payload && payload[0]) || false;
-
-  if (!thisPayload || !config?.HOME_SLUG) {
-    return null;
-  }
-
-  const command = (thisPayload && thisPayload[0] && thisPayload[0][0]) || null;
-  const parameters =
-    (thisPayload && thisPayload[0] && thisPayload[0][1]) || null;
-
-  if (command === 'bunnyMoment' && parameters) {
-    const videoId = parameters[0];
-    return {
-      id: id,
-      type: `StartVideoMoment`,
-      verb: `WATCHED`,
-      targetId: videoId || null,
-    };
-  }
-
-  if (command === `goto` && parameters) {
-    const parameterOne = parameters[0] || null;
-    const parameterTwo = parameters[1] || null;
-    //const parameterThree = parameters[2] || null;
-
-    switch (parameterOne) {
-      case `home`:
-        return {
-          id: id,
-          type: `PaneClicked`,
-          verb: `CLICKED`,
-          targetSlug: config?.HOME_SLUG,
-        };
-
-      case `storyFragment`:
-      case `storyFragmentPane`:
-        return {
-          id: id,
-          type: `PaneClicked`,
-          verb: `CLICKED`,
-          targetSlug: parameterTwo,
-        };
-
-      case `bunny`:
-        return {
-          id: id,
-          type: `StartVideo`,
-          verb: `WATCHED`,
-          targetSlug: parameterTwo,
-        };
-
-      case `sandbox`:
-        return {
-          id: id,
-          type: `SandboxAction`,
-          verb: `CLICKED`,
-          targetSlug: parameterTwo || 'main',
-        };
-
-      case `storykeep`:
-      case `context`:
-      case `concierge`:
-      case `product`:
-      case `url`:
-        // ignore these
-        break;
-
-      default:
-        console.log(
-          `LispActionPayload preParseEvent misfire`,
-          command,
-          parameters
-        );
-        break;
-    }
-  }
-
-  return null;
-};