astro-tractstack 2.2.10 → 2.3.1

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

@@ -104,11 +104,13 @@ export async function deleteResource(
 
 export async function getAllResourceIds(tenantId: string): Promise<string[]> {
   const api = new TractStackAPI(tenantId);
-  const response = await api.get('/api/v1/nodes/resources');
+  const response = await api.get<{ count: number; resourceIds: string[] }>(
+    '/api/v1/nodes/resources'
+  );
   if (!response.success) {
     throw new Error(response.error || 'Failed to get resource IDs');
   }
-  return response.data;
+  return response.data?.resourceIds || [];
 }
 
 export async function getResourcesByIds(
@@ -116,11 +118,14 @@ export async function getResourcesByIds(
   ids: string[]
 ): Promise<ResourceConfig[]> {
   const api = new TractStackAPI(tenantId);
-  const response = await api.post('/api/v1/nodes/resources', { ids });
-  if (!response.success) {
+  const response = await api.post<{ resources: ResourceConfig[] }>(
+    '/api/v1/nodes/resources',
+    { resourceIds: ids }
+  );
+  if (!response.success || !response.data) {
     throw new Error(response.error || 'Failed to get resources by IDs');
   }
-  return response.data;
+  return response.data.resources;
 }
 
 export async function getResourcesByCategory(
@@ -128,6 +133,9 @@ export async function getResourcesByCategory(
   categorySlug: string
 ): Promise<ResourceConfig[]> {
   const allIds = await getAllResourceIds(tenantId);
+  if (!allIds || allIds.length === 0) {
+    return [];
+  }
   const allResources = await getResourcesByIds(tenantId, allIds);
   return allResources.filter(
     (resource) => resource.categorySlug === categorySlug

package/templates/src/utils/auth.ts

@@ -11,20 +11,30 @@ export interface AdminAuthClaims {
   exp: number;
 }
 
+/**
+ * Helper to get the current expected tenant ID from the Astro context
+ */
+function getExpectedTenantId(astro: any): string {
+  return (
+    astro.locals?.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default'
+  );
+}
+
 /**
  * Check if user is authenticated (either admin or editor)
  */
 export function isAuthenticated(astro: any): boolean {
+  const expectedTenantId = getExpectedTenantId(astro);
   const adminCookie = astro.cookies.get('admin_auth');
   const editorCookie = astro.cookies.get('editor_auth');
 
   if (adminCookie?.value) {
-    const claims = validateAdminToken(adminCookie.value);
+    const claims = validateAdminToken(adminCookie.value, expectedTenantId);
     if (claims && claims.role === 'admin') return true;
   }
 
   if (editorCookie?.value) {
-    const claims = validateAdminToken(editorCookie.value);
+    const claims = validateAdminToken(editorCookie.value, expectedTenantId);
     if (claims && claims.role === 'editor') return true;
   }
 
@@ -35,10 +45,11 @@ export function isAuthenticated(astro: any): boolean {
  * Check if user has admin role
  */
 export function isAdmin(astro: any): boolean {
+  const expectedTenantId = getExpectedTenantId(astro);
   const adminCookie = astro.cookies.get('admin_auth');
   if (!adminCookie?.value) return false;
 
-  const claims = validateAdminToken(adminCookie.value);
+  const claims = validateAdminToken(adminCookie.value, expectedTenantId);
   return claims?.role === 'admin';
 }
 
@@ -46,10 +57,11 @@ export function isAdmin(astro: any): boolean {
  * Check if user has editor role
  */
 export function isEditor(astro: any): boolean {
+  const expectedTenantId = getExpectedTenantId(astro);
   const editorCookie = astro.cookies.get('editor_auth');
   if (!editorCookie?.value) return false;
 
-  const claims = validateAdminToken(editorCookie.value);
+  const claims = validateAdminToken(editorCookie.value, expectedTenantId);
   return claims?.role === 'editor';
 }
 
@@ -57,15 +69,16 @@ export function isEditor(astro: any): boolean {
  * Get user role (admin, editor, or null)
  */
 export function getUserRole(astro: any): 'admin' | 'editor' | null {
+  const expectedTenantId = getExpectedTenantId(astro);
   const adminCookie = astro.cookies.get('admin_auth');
   if (adminCookie?.value) {
-    const claims = validateAdminToken(adminCookie.value);
+    const claims = validateAdminToken(adminCookie.value, expectedTenantId);
     if (claims?.role === 'admin') return 'admin';
   }
 
   const editorCookie = astro.cookies.get('editor_auth');
   if (editorCookie?.value) {
-    const claims = validateAdminToken(editorCookie.value);
+    const claims = validateAdminToken(editorCookie.value, expectedTenantId);
     if (claims?.role === 'editor') return 'editor';
   }
 
@@ -110,15 +123,16 @@ export function requireAdminOrEditor(astro: any): Response | undefined {
  * Returns the JWT token from the appropriate cookie
  */
 export function getAdminToken(astro: any): string | null {
+  const expectedTenantId = getExpectedTenantId(astro);
   const adminCookie = astro.cookies.get('admin_auth');
   if (adminCookie?.value) {
-    const claims = validateAdminToken(adminCookie.value);
+    const claims = validateAdminToken(adminCookie.value, expectedTenantId);
     if (claims?.role === 'admin') return adminCookie.value;
   }
 
   const editorCookie = astro.cookies.get('editor_auth');
   if (editorCookie?.value) {
-    const claims = validateAdminToken(editorCookie.value);
+    const claims = validateAdminToken(editorCookie.value, expectedTenantId);
     if (claims?.role === 'editor') return editorCookie.value;
   }
 
@@ -130,7 +144,10 @@ export function getAdminToken(astro: any): string | null {
  * Note: This is a simplified client-side validation
  * Real validation happens on the backend
  */
-function validateAdminToken(token: string): AdminAuthClaims | null {
+function validateAdminToken(
+  token: string,
+  expectedTenantId: string
+): AdminAuthClaims | null {
   try {
     // Split JWT token
     const parts = token.split('.');
@@ -146,6 +163,9 @@ function validateAdminToken(token: string): AdminAuthClaims | null {
     if (!claims.role || !['admin', 'editor'].includes(claims.role)) return null;
     if (Date.now() / 1000 > claims.exp) return null; // Token expired
 
+    // Tenant validation
+    if (claims.tenantId !== expectedTenantId) return null; // Must match current environment
+
     return claims;
   } catch {
     return null;

package/templates/src/utils/compositor/aiGeneration.ts

@@ -10,7 +10,7 @@ interface AiGenerationOptions {
   temperature?: number;
 }
 
-export const callAskLemurAPI = async ({
+export const callAaiAPI = async ({
   prompt,
   context,
   expectJson,
@@ -43,7 +43,7 @@ export const callAskLemurAPI = async ({
         'X-Sandbox-Token': token || '',
       },
       credentials: 'include',
-      body: JSON.stringify({ action: 'askLemur', payload: requestBody }),
+      body: JSON.stringify({ action: 'aai', payload: requestBody }),
     });
 
     if (!response.ok) {
@@ -58,7 +58,7 @@ export const callAskLemurAPI = async ({
     resultData = json.data;
   } else {
     const api = new TractStackAPI(tenantId);
-    const response = await api.post('/api/v1/aai/askLemur', requestBody);
+    const response = await api.post('/api/v1/aai/aai', requestBody);
 
     if (!response.success) {
       throw new Error(

package/templates/src/utils/compositor/aiPaneParser.ts

@@ -771,11 +771,11 @@ export function createDefaultShell(layout: 'standard' | 'grid'): ShellJson {
       mobile: 'mb-2',
     },
     a: {
-      mobile: 'text-indigo-600 hover:text-indigo-500 font-semibold',
+      mobile: 'text-cyan-600 hover:text-cyan-500 font-bold',
     },
     button: {
       mobile:
-        'rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600',
+        'rounded-md bg-cyan-600 px-3.5 py-2.5 text-sm font-bold text-white shadow-sm hover:bg-cyan-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-cyan-600',
     },
   };
 

package/templates/src/utils/customHelpers.ts

@@ -1,3 +1,6 @@
+import type { ResourceNode } from '@/types/compositorTypes';
+import type { CartItemState } from '@/stores/shopify';
+
 // URL Helper: Strip category prefix from slug
 // e.g., "people-bleako" -> "bleako"
 export function getCleanSlug(categorySlug: string, fullSlug: string): string {
@@ -36,3 +39,49 @@ export function initSearch(): void {
   // Default implementation does nothing
   // Override this function in your custom implementation to load search data
 }
+
+// Field Visibility Controls for ResourceForm
+export const resourceFormHideFields = ['gid', 'shopifyImage'];
+
+// Field Formatting Controls for ResourceForm
+// Fields listed here will be treated as JSON objects but rendered as stringified text areas
+export const resourceJsonifyFields = ['shopifyData', 'shopifyImage'];
+
+export const RESTRICTION_MESSAGES = {
+  BOOKING: (duration: number) =>
+    `This is a ${duration} minute service. On checkout we'll help you book at your convenience.`,
+  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.`,
+  DEFAULT_ADD: (title: string) => `${title} has been added to your cart.`,
+};
+
+// For CartModal.tsx
+export function checkRestrictions(resource: ResourceNode): boolean {
+  // 1. Service / Booking Requirement
+  // We check for the explicit option payload value used by services
+  if (resource.optionsPayload?.bookingLengthMinutes) {
+    return true;
+  }
+
+  // 2. Final Sale / Terms Check
+  // Placeholder: In the future, check for flags like resource.optionsPayload?.finalSale
+  // if (resource.optionsPayload?.finalSale) {
+  //   return true;
+  // }
+
+  return false;
+}
+
+export function calculateCartDuration(
+  cart: Record<string, CartItemState>,
+  resources: ResourceNode[]
+): number {
+  return Object.values(cart).reduce((total, item) => {
+    const resource = resources.find((r) => r.id === item.resourceId);
+    const duration = Number(
+      resource?.optionsPayload?.bookingLengthMinutes || 0
+    );
+    return total + (isNaN(duration) ? 0 : duration * item.quantity);
+  }, 0);
+}

package/templates/src/utils/helpers.ts

@@ -2,6 +2,7 @@ import { useState, useEffect, useCallback } from 'react';
 import { stopWords } from '@/constants/stopWords';
 import type { RefObject } from 'react';
 import type { MenuNode } from '@/types/tractstack';
+import type { ResourceNode } from '@/types/compositorTypes';
 
 let progressInterval: NodeJS.Timeout | null = null;
 let safetyTimeout: NodeJS.Timeout | null = null;
@@ -536,3 +537,61 @@ export const resolveCollisions = () => {
     }
   });
 };
+
+// Shopify Image Helper: Returns responsive WebP paths for the resource image
+export function getShopifyImage(
+  resource: ResourceNode,
+  size: '600' | '1080' | '1920' = '600',
+  variantId?: string
+): { src: string; srcSet: string } {
+  let imageId = resource.optionsPayload?.image;
+
+  if (variantId && typeof resource.optionsPayload?.shopifyImage === 'string') {
+    try {
+      const variantMap = JSON.parse(resource.optionsPayload.shopifyImage);
+      if (variantMap[variantId]?.fileId) {
+        imageId = variantMap[variantId].fileId;
+      }
+    } catch (e) {
+      console.warn(
+        `[Shopify] Failed to parse shopifyImage map for resource ${resource.id}`,
+        e
+      );
+    }
+  }
+
+  if (imageId && typeof imageId === 'string') {
+    const baseUrl = `/media/images/resources/${imageId}`;
+    return {
+      src: `${baseUrl}_${size}px.webp`,
+      srcSet: `${baseUrl}_1920px.webp 1920w, ${baseUrl}_1080px.webp 1080w, ${baseUrl}_600px.webp 600w`,
+    };
+  }
+
+  return {
+    src: '/static.jpg',
+    srcSet: '',
+  };
+}
+
+// Image Helper: Returns responsive WebP paths for the resource image
+export function getResourceImage(
+  resource: ResourceNode,
+  size: '600' | '1080' | '1920' = '600'
+): { src: string; srcSet: string } {
+  const imageId = resource.optionsPayload?.image;
+
+  if (imageId && typeof imageId === 'string') {
+    const baseUrl = `/media/images/resources/${imageId}`;
+    return {
+      src: `${baseUrl}_${size}px.webp`,
+      srcSet: `${baseUrl}_1920px.webp 1920w, ${baseUrl}_1080px.webp 1080w, ${baseUrl}_600px.webp 600w`,
+    };
+  }
+
+  // Fallback for resources with no synced image
+  return {
+    src: '/static.jpg',
+    srcSet: '',
+  };
+}

package/templates/src/utils/profileStorage.ts

@@ -1,3 +1,5 @@
+import { clearCommerceState } from '@/stores/shopify';
+
 export interface ProfileData {
   firstname?: string;
   contactPersona?: string;
@@ -148,6 +150,7 @@ export class ProfileStorage {
     StorageManager.set(this.STORAGE_KEYS.profileToken, token);
     StorageManager.set(this.STORAGE_KEYS.hasProfile, '1');
     StorageManager.set(this.STORAGE_KEYS.unlockedProfile, '1');
+    StorageManager.remove('shopify_customer');
 
     try {
       const maxAge = 60 * 60 * 24;
@@ -205,6 +208,7 @@ export class ProfileStorage {
     }
 
     console.log('TractStack: Session cleared completely including session ID');
+    clearCommerceState();
   }
 
   /**
@@ -218,6 +222,7 @@ export class ProfileStorage {
     StorageManager.remove(this.STORAGE_KEYS.contactPersona);
     StorageManager.remove(this.STORAGE_KEYS.email);
     StorageManager.remove(this.STORAGE_KEYS.shortBio);
+    clearCommerceState();
   }
 
   /**

package/templates/src/utils/tenantResolver.ts

@@ -65,13 +65,14 @@ export async function resolveTenantId(
   // Strategy 3: Backend Lookup (Fallback - Network Request)
   try {
     const backendUrl =
-      import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:10000';
+      import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
     const urlObj = new URL(backendUrl);
     // Force localhost to avoid Hairpin NAT / Loopback firewall blocks
     const localBackend = `${urlObj.protocol}//127.0.0.1:${urlObj.port}`;
 
     if (VERBOSE) console.log(`[TenantResolver] Fetching from: ${localBackend}`);
 
+    console.log(`[TenantResolver] Activating local bypass`);
     // Temporarily disable TLS validation because 127.0.0.1 won't match the cert
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 

package/utils/inject-files.ts

@@ -588,6 +588,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/stores/resources.ts'),
       dest: 'src/stores/resources.ts',
     },
+    {
+      src: resolve('../templates/src/stores/shopify.ts'),
+      dest: 'src/stores/shopify.ts',
+    },
 
     // Compositor stores
     {
@@ -818,6 +822,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/utils/api/resourceHelpers.ts'),
       dest: 'src/utils/api/resourceHelpers.ts',
     },
+    {
+      src: resolve('../templates/src/utils/api/bookingHelpers.ts'),
+      dest: 'src/utils/api/bookingHelpers.ts',
+    },
     {
       src: resolve('../templates/src/utils/api/menuHelpers.ts'),
       dest: 'src/utils/api/menuHelpers.ts',
@@ -865,8 +873,12 @@ export async function injectTemplateFiles(
       dest: 'src/pages/storykeep.astro',
     },
     {
-      src: resolve('../templates/src/pages/storykeep/content.astro'),
-      dest: 'src/pages/storykeep/content.astro',
+      src: resolve('../templates/src/pages/storykeep/pages.astro'),
+      dest: 'src/pages/storykeep/pages.astro',
+    },
+    {
+      src: resolve('../templates/src/pages/storykeep/manage.astro'),
+      dest: 'src/pages/storykeep/manage.astro',
     },
     {
       src: resolve('../templates/src/pages/storykeep/branding.astro'),
@@ -876,10 +888,18 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/pages/storykeep/advanced.astro'),
       dest: 'src/pages/storykeep/advanced.astro',
     },
+    {
+      src: resolve('../templates/src/pages/storykeep/shopify.astro'),
+      dest: 'src/pages/storykeep/shopify.astro',
+    },
     {
       src: resolve('../templates/src/pages/maint.astro'),
       dest: 'src/pages/maint.astro',
     },
+    {
+      src: resolve('../templates/custom/shopify/cart.astro'),
+      dest: 'src/pages/cart.astro',
+    },
     {
       src: resolve('../templates/src/pages/404.astro'),
       dest: 'src/pages/404.astro',
@@ -896,6 +916,14 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/pages/sitemap.xml.ts'),
       dest: 'src/pages/sitemap.xml.ts',
     },
+    {
+      src: resolve('../templates/src/pages/api/shopify/getProducts.ts'),
+      dest: 'src/pages/api/shopify/getProducts.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/shopify/createCart.ts'),
+      dest: 'src/pages/api/shopify/createCart.ts',
+    },
     {
       src: resolve('../templates/src/pages/api/tailwind.ts'),
       dest: 'src/pages/api/tailwind.ts',
@@ -924,6 +952,38 @@ export async function injectTemplateFiles(
     },
 
     // API Routes
+    {
+      src: resolve('../templates/src/pages/api/booking/list.ts'),
+      dest: 'src/pages/api/booking/list.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/metrics.ts'),
+      dest: 'src/pages/api/booking/metrics.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/cancel.ts'),
+      dest: 'src/pages/api/booking/cancel.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/confirm.ts'),
+      dest: 'src/pages/api/booking/confirm.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/release.ts'),
+      dest: 'src/pages/api/booking/release.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/availability.ts'),
+      dest: 'src/pages/api/booking/availability.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/booking/hold.ts'),
+      dest: 'src/pages/api/booking/hold.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/auth/lookup-lead.ts'),
+      dest: 'src/pages/api/auth/lookup-lead.ts',
+    },
     {
       src: resolve('../templates/src/pages/api/auth/profile.ts'),
       dest: 'src/pages/api/auth/profile.ts',
@@ -1108,6 +1168,12 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/components/form/brand/SEOSection.tsx'),
       dest: 'src/components/form/brand/SEOSection.tsx',
     },
+    {
+      src: resolve(
+        '../templates/src/components/form/shopify/SchedulingSection.tsx'
+      ),
+      dest: 'src/components/form/shopify/SchedulingSection.tsx',
+    },
 
     // Advanced Configuration Components
     {
@@ -1156,6 +1222,48 @@ export async function injectTemplateFiles(
       ),
       dest: 'src/components/storykeep/Dashboard_Advanced.tsx',
     },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/Dashboard_Shopify.tsx'
+      ),
+      dest: 'src/components/storykeep/Dashboard_Shopify.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Bookings.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Bookings.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Schedule.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Schedule.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Products.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Products.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Services.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Services.tsx',
+    },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Search.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Search.tsx',
+    },
     {
       src: resolve(
         '../templates/src/components/storykeep/Dashboard_Analytics.tsx'
@@ -1212,6 +1320,12 @@ export async function injectTemplateFiles(
       ),
       dest: 'src/components/storykeep/controls/content/PaneTable.tsx',
     },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/controls/content/ProductTable.tsx'
+      ),
+      dest: 'src/components/storykeep/controls/content/ProductTable.tsx',
+    },
     {
       src: resolve(
         '../templates/src/components/storykeep/controls/content/ContentBrowser.tsx'
@@ -2203,6 +2317,51 @@ export async function injectTemplateFiles(
       dest: 'src/utils/customHelpers.ts',
       protected: true,
     },
+    {
+      src: resolve('../templates/custom/shopify/ShopifyProductGrid.tsx'),
+      dest: 'src/custom/shopify/ShopifyProductGrid.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/ShopifyServiceList.tsx'),
+      dest: 'src/custom/shopify/ShopifyServiceList.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/CartIcon.tsx'),
+      dest: 'src/custom/shopify/CartIcon.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/ShopifyCartManager.tsx'),
+      dest: 'src/custom/shopify/ShopifyCartManager.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/CartModal.tsx'),
+      dest: 'src/custom/shopify/CartModal.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/CheckoutModal.tsx'),
+      dest: 'src/custom/shopify/CheckoutModal.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/Cart.tsx'),
+      dest: 'src/custom/shopify/Cart.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/ShopifyCheckout.tsx'),
+      dest: 'src/custom/shopify/ShopifyCheckout.tsx',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/NativeBookingCalendar.tsx'),
+      dest: 'src/custom/shopify/NativeBookingCalendar.tsx',
+      protected: true,
+    },
 
     // Example Components (Conditional)
     ...(config?.includeExamples