astro-tractstack 2.3.3 → 2.3.5

package/templates/src/pages/api/sales/metrics.ts

@@ -0,0 +1,60 @@
+import type { APIRoute } from '@/types/astro';
+import { getAdminToken } from '@/utils/auth';
+
+export const GET: APIRoute = async (context) => {
+  const { request, locals } = context;
+  const GO_BACKEND =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 10000);
+    const tenantId =
+      locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+    const token = getAdminToken(context);
+
+    try {
+      const response = await fetch(`${GO_BACKEND}/api/v1/sales/metrics`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Tenant-ID': tenantId,
+          ...(token && { Authorization: `Bearer ${token}` }),
+          ...(request.headers.get('Authorization') && {
+            Authorization: request.headers.get('Authorization')!,
+          }),
+        },
+        signal: controller.signal,
+      });
+
+      clearTimeout(timeoutId);
+      const data = await response.json();
+
+      return new Response(JSON.stringify(data), {
+        status: response.status,
+        headers: { 'Content-Type': 'application/json' },
+      });
+    } catch (fetchError) {
+      clearTimeout(timeoutId);
+      if (fetchError instanceof Error && fetchError.name === 'AbortError') {
+        return new Response(
+          JSON.stringify({
+            success: false,
+            error: 'Sales metrics lookup timeout',
+          }),
+          { status: 408, headers: { 'Content-Type': 'application/json' } }
+        );
+      }
+      throw fetchError;
+    }
+  } catch (error) {
+    console.error('Sales metrics API proxy error:', error);
+    return new Response(
+      JSON.stringify({
+        success: false,
+        error: 'Failed to connect to backend service',
+      }),
+      { status: 500, headers: { 'Content-Type': 'application/json' } }
+    );
+  }
+};

package/templates/src/pages/context/[...contextSlug].astro

@@ -1,9 +1,7 @@
 ---
 import Layout from '@/layouts/Layout.astro';
-import CodeHook from '@/custom/CodeHook.astro';
 import { getBrandConfig } from '@/utils/api/brandConfig';
 import { handleFailedResponse } from '@/utils/backend';
-import { getFullContentMap } from '@/stores/analytics';
 import { preHealthCheck } from '@/utils/backend';
 
 const tenantId =
@@ -58,8 +56,6 @@ try {
 
 const paneId = contextPaneData.id;
 const paneTitle = contextPaneData.title || 'Context';
-const codeHookTarget = contextPaneData.codeHookTarget || null;
-const resourcesPayload = storyData.resourcesPayload || {};
 
 // Get rendered fragment for the context pane
 let fragmentData = '';
@@ -93,8 +89,6 @@ try {
   );
 }
 
-// Get supporting data
-const fullContentMap = await getFullContentMap(tenantId);
 const brandConfig = await getBrandConfig(tenantId);
 
 if (!brandConfig.SITE_INIT) {
@@ -122,18 +116,7 @@ if (!brandConfig.SITE_INIT) {
       hx-trigger="refresh"
       hx-swap="innerHTML scroll:none"
     >
-      {
-        codeHookTarget ? (
-          <CodeHook
-            target={codeHookTarget}
-            paneId={paneId}
-            resourcesPayload={resourcesPayload}
-            fullContentMap={fullContentMap}
-          />
-        ) : (
-          <Fragment set:html={fragmentData} />
-        )
-      }
+      <Fragment set:html={fragmentData} />
     </div>
 
     <div class="py-12 text-center text-2xl md:text-3xl">
@@ -148,20 +131,56 @@ if (!brandConfig.SITE_INIT) {
 </Layout>
 
 <script>
-  document.addEventListener('DOMContentLoaded', function () {
+  const IN_SITE_FROM_KEY = 'tractstack:inSiteFrom';
+
+  function getInSiteFrom() {
+    const rawFromPath = sessionStorage.getItem(IN_SITE_FROM_KEY);
+    if (!rawFromPath) {
+      return null;
+    }
+
+    try {
+      const fromUrl = new URL(rawFromPath, window.location.origin);
+      if (fromUrl.origin !== window.location.origin) {
+        return null;
+      }
+
+      const fromPath = fromUrl.pathname + fromUrl.search + fromUrl.hash;
+      const currentPath =
+        window.location.pathname +
+        window.location.search +
+        window.location.hash;
+
+      if (fromPath === currentPath) {
+        return null;
+      }
+
+      return fromPath;
+    } catch {
+      return null;
+    }
+  }
+
+  function setupContextCloseButton() {
     const closeBtn = document.getElementById('context-close-btn');
 
-    if (closeBtn) {
-      closeBtn.addEventListener('click', function () {
-        // Check if we have history to go back to
-        if (window.history.length > 1 && document.referrer) {
-          // Go back to previous page
-          window.history.back();
-        } else {
-          // Fallback to home page
-          window.location.href = '/';
-        }
-      });
+    if (!closeBtn) {
+      return;
     }
-  });
+
+    const fromPath = getInSiteFrom();
+    closeBtn.textContent = fromPath ? 'Close' : 'Home';
+
+    closeBtn.onclick = function () {
+      if (fromPath) {
+        window.location.assign(fromPath);
+        return;
+      }
+
+      window.location.assign('/');
+    };
+  }
+
+  setupContextCloseButton();
+  document.addEventListener('astro:page-load', setupContextCloseButton);
 </script>

package/templates/src/pages/storykeep/advanced.astro

@@ -64,7 +64,10 @@ try {
         role={role}
         initializing={initializing}
       />
-      <StoryKeepDashboard_Advanced client:only="react" />
+      <StoryKeepDashboard_Advanced
+        client:only="react"
+        brandConfig={brandConfig}
+      />
     </div>
   </main>
 </Layout>

package/templates/src/stores/nodes.ts

@@ -1876,6 +1876,14 @@ export class NodesContext {
     if (ownerNode && 'slug' in ownerNode && typeof ownerNode.slug === `string`)
       duplicatedPane.slug = ownerNode.slug;
 
+    this.deleteChildren(ownerId);
+
+    if (pane.htmlAst) {
+      duplicatedPane.htmlAst = pane.htmlAst;
+    } else {
+      delete duplicatedPane.htmlAst;
+    }
+
     // Track all nodes that need to be added
     // Call the new helper to process markdown, gridLayout, and bgPane
     const allNodes: BaseNode[] = this._processPaneTemplate(

package/templates/src/types/tractstack.ts

@@ -207,6 +207,7 @@ export interface BrandConfig {
   HAS_HYDRATION_TOKEN?: boolean;
   SCHEDULING?: SchedulingConfig;
   ADMIN_EMAIL?: string;
+  ADMIN_EMAIL_NAME?: string;
 }
 
 export interface BrandConfigState {
@@ -246,6 +247,7 @@ export interface BrandConfigState {
   hasHydrationToken: boolean;
   scheduling: SchedulingConfig;
   adminEmail: string;
+  adminEmailName: string;
 }
 
 // Form validation types
@@ -294,6 +296,7 @@ export interface AdvancedConfigStatus {
   googleRefreshTokenSet: boolean;
   googleTokenExpirySet: boolean;
   hasGoogleSync: boolean;
+  hasResend: boolean;
 }
 
 export interface AdvancedConfigState {
@@ -310,6 +313,8 @@ export interface AdvancedConfigState {
   shopifyAdminSlug: string;
   userSetupWebhooks: boolean;
   resendApiKey: string;
+  adminEmail: string;
+  adminEmailName: string;
   googleOauthClientId: string;
   googleOauthClientSecret: string;
   googleCalendarId: string;
@@ -569,6 +574,58 @@ export interface BookingListResponse {
   totalCount: number;
 }
 
+export type SaleStatus = 'PAID';
+export type SaleTag = 'local-pickup' | 'orphan' | 'in-person' | 'remote';
+
+export interface SaleProductLine {
+  resourceId: string;
+  gid: string;
+  variantId: string;
+  quantity: number;
+  title: string;
+  price: string;
+  currencyCode: string;
+  isLocalPickup: boolean;
+}
+
+export interface SaleEntity {
+  id: string; // traceId
+  leadId: string;
+  leadEmail?: string;
+  leadName?: string;
+  bookingId: string | null;
+  shopifyOrderId: string;
+  totalAmount: string;
+  status: SaleStatus;
+  products: SaleProductLine[];
+  appointmentIntent: boolean;
+  tags: SaleTag[];
+  booking: BookingEntity | null;
+  createdAt: string; // ISO-8601 UTC string
+}
+
+export interface SaleListResponse {
+  data: SaleEntity[];
+  totalCount: number;
+}
+
+export interface SaleMetricsResponse {
+  paidOrderTotalMonth: string;
+  paidOrderTotalYear: string;
+  paidOrderTotalAllTime: string;
+  paidOrdersMonth: number;
+  paidOrdersYear: number;
+  paidOrdersAllTime: number;
+  averagePaidOrderMonth: string;
+  uniquePayingCustomers: number;
+  localPickupLineTotalMonth: string;
+  localPickupOrdersMonth: number;
+  appointmentOrdersMonth: number;
+  productOnlyOrdersMonth: number;
+  orphanOrdersMonth: number;
+  currencyCode: string;
+}
+
 export interface BookingMetricsResponse {
   totalMonthlyConfirmed: number;
   totalAnnualConfirmed: number;

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

@@ -34,7 +34,8 @@ export async function getAdvancedConfigStatus(
       typeof data.shopifyStoreDomainSet !== 'boolean' ||
       typeof data.shopifyAdminSlugSet !== 'boolean' ||
       typeof data.userSetupWebhooks !== 'boolean' ||
-      typeof data.resendApiKeySet !== 'boolean'
+      typeof data.resendApiKeySet !== 'boolean' ||
+      typeof data.hasResend !== 'boolean'
     ) {
       throw new Error('Invalid response format from server');
     }

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

@@ -30,6 +30,8 @@ export function convertToLocalState(
       googleOauthClientId: '',
       googleOauthClientSecret: '',
       googleCalendarId: '',
+      adminEmail: '',
+      adminEmailName: '',
     };
   }
 
@@ -53,6 +55,8 @@ export function convertToLocalState(
     googleOauthClientId: '',
     googleOauthClientSecret: '',
     googleCalendarId: '',
+    adminEmail: '',
+    adminEmailName: '',
   };
 }
 

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

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

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

@@ -45,6 +45,7 @@ export function convertToLocalState(
     hasResend: brandConfig.HAS_RESEND ?? false,
     hasHydrationToken: brandConfig.HAS_HYDRATION_TOKEN ?? false,
     adminEmail: brandConfig.ADMIN_EMAIL ?? '',
+    adminEmailName: brandConfig.ADMIN_EMAIL_NAME ?? '',
     scheduling: brandConfig.SCHEDULING ?? {
       timezone: 'UTC',
       bufferGapsMinutes: 15,
@@ -95,6 +96,7 @@ export function convertToBackendFormat(
     HAS_RESEND: localState.hasResend,
     SCHEDULING: scheduling,
     ADMIN_EMAIL: localState.adminEmail,
+    ADMIN_EMAIL_NAME: localState.adminEmailName,
 
     // ALWAYS send asset paths (current state)
     LOGO: localState.logo,
@@ -139,6 +141,10 @@ export function validateBrandConfig(state: BrandConfigState): FieldErrors {
     errors.adminEmail = 'Please enter a valid email address';
   }
 
+  if (!state.adminEmailName?.trim()) {
+    errors.adminEmailName = 'Admin Email Name is required';
+  }
+
   // Validate brand colors (must have exactly 8)
   if (!state.brandColours || state.brandColours.length !== 8) {
     errors.brandColours = 'Must have exactly 8 brand colors';

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

@@ -0,0 +1,21 @@
+export const salesHelpers = {
+  /**
+   * Retrieves a paginated list of paid Shopify sales for the administrative dashboard.
+   */
+  listSales: async (limit: number = 50, offset: number = 0) => {
+    const query = new URLSearchParams({
+      limit: limit.toString(),
+      offset: offset.toString(),
+    });
+    const response = await fetch(`/api/sales/list?${query.toString()}`);
+    return await response.json();
+  },
+
+  /**
+   * Retrieves paid Shopify sales metrics for the administrative dashboard.
+   */
+  getMetrics: async () => {
+    const response = await fetch('/api/sales/metrics');
+    return await response.json();
+  },
+};

package/utils/inject-files.ts

@@ -822,6 +822,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/utils/api/bookingHelpers.ts'),
       dest: 'src/utils/api/bookingHelpers.ts',
     },
+    {
+      src: resolve('../templates/src/utils/api/salesHelpers.ts'),
+      dest: 'src/utils/api/salesHelpers.ts',
+    },
     {
       src: resolve('../templates/src/utils/api/menuHelpers.ts'),
       dest: 'src/utils/api/menuHelpers.ts',
@@ -960,6 +964,14 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/pages/api/booking/list.ts'),
       dest: 'src/pages/api/booking/list.ts',
     },
+    {
+      src: resolve('../templates/src/pages/api/sales/list.ts'),
+      dest: 'src/pages/api/sales/list.ts',
+    },
+    {
+      src: resolve('../templates/src/pages/api/sales/metrics.ts'),
+      dest: 'src/pages/api/sales/metrics.ts',
+    },
     {
       src: resolve('../templates/src/pages/api/booking/metrics.ts'),
       dest: 'src/pages/api/booking/metrics.ts',
@@ -1284,6 +1296,12 @@ export async function injectTemplateFiles(
       ),
       dest: 'src/components/storykeep/shopify/ShopifyDashboard_Emails.tsx',
     },
+    {
+      src: resolve(
+        '../templates/src/components/storykeep/shopify/ShopifyDashboard_Sales.tsx'
+      ),
+      dest: 'src/components/storykeep/shopify/ShopifyDashboard_Sales.tsx',
+    },
     {
       src: resolve(
         '../templates/src/components/storykeep/email-builder/EmailBuilder.tsx'
@@ -2367,13 +2385,23 @@ export async function injectTemplateFiles(
       protected: true,
     },
     {
-      src: resolve('../templates/src/utils/customHelpers.ts'),
-      dest: 'src/utils/customHelpers.ts',
+      src: resolve('../templates/custom/customHelpers.ts'),
+      dest: 'src/custom/customHelpers.ts',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/shopifyCustomHelper.ts'),
+      dest: 'src/custom/shopify/shopifyCustomHelper.ts',
+      protected: true,
+    },
+    {
+      src: resolve('../templates/custom/shopify/shopifyHelpers.ts'),
+      dest: 'src/custom/shopify/shopifyHelpers.ts',
       protected: true,
     },
     {
-      src: resolve('../templates/src/utils/booking/appointmentMode.ts'),
-      dest: 'src/utils/booking/appointmentMode.ts',
+      src: resolve('../templates/custom/shopify/appointmentMode.ts'),
+      dest: 'src/custom/shopify/appointmentMode.ts',
       protected: true,
     },
     {

package/templates/src/utils/customHelpers.ts

@@ -1,89 +0,0 @@
-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 {
-  const prefix = `${categorySlug}-`;
-  return fullSlug.startsWith(prefix) ? fullSlug.slice(prefix.length) : fullSlug;
-}
-
-// Build proper URL for resource
-// e.g., category="people", slug="people-bleako" -> "/people/bleako"
-export function getResourceUrl(categorySlug: string, fullSlug: string): string {
-  const cleanSlug = getCleanSlug(categorySlug, fullSlug);
-  return `/${categorySlug}/${cleanSlug}`;
-}
-
-// Image Helper: Placeholder implementation
-export function getResourceImage(
-  id: string,
-  slug: string,
-  category: string
-): string {
-  console.log(`please define getResourceImage`, id, slug, category);
-  return '/static.jpg';
-}
-
-export function getResourceDescription(
-  id: string,
-  slug: string,
-  category: string
-): string | null {
-  console.log(`please define getResourceDescription`, id, slug, category);
-  return null;
-}
-
-// Initialize search data - override in custom implementation
-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.`,
-  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.`,
-};
-
-// 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);
-}