astro-tractstack 2.2.10 → 2.3.1

package/templates/src/pages/api/shopify/createCart.ts

@@ -0,0 +1,69 @@
+import type { APIRoute } from '@/types/astro';
+import { resolveTenantId } from '@/utils/tenantResolver';
+
+export const prerender = false;
+
+interface CreateCartPayload {
+  lines: Array<{
+    merchandiseId: string;
+    quantity: number;
+    attributes?: Array<{ key: string; value: string }>;
+  }>;
+  attributes?: Array<{
+    key: string;
+    value: string;
+  }>;
+  email?: string;
+  traceId?: string;
+}
+
+const getBackendUrl = () => {
+  return import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+};
+
+export const POST: APIRoute = async ({ request }) => {
+  const resolution = await resolveTenantId(request);
+  const tenantId = resolution.id;
+
+  const backendEndpoint = `${getBackendUrl()}/api/v1/shopify/checkout`;
+  const cookieHeader = request.headers.get('cookie') || '';
+
+  try {
+    const body = (await request.json()) as CreateCartPayload;
+
+    const backendResponse = await fetch(backendEndpoint, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Tenant-ID': tenantId,
+        Cookie: cookieHeader,
+      },
+      body: JSON.stringify(body),
+    });
+
+    if (!backendResponse.ok) {
+      const errorText = await backendResponse.text();
+      throw new Error(
+        `Backend Proxy Error: ${backendResponse.status} - ${errorText}`
+      );
+    }
+
+    const result = await backendResponse.json();
+
+    return new Response(JSON.stringify(result), {
+      status: 200,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (error) {
+    console.error('Shopify proxy create cart failed:', error);
+    return new Response(
+      JSON.stringify({
+        error: error instanceof Error ? error.message : 'Failed to create cart',
+      }),
+      {
+        status: 500,
+        headers: { 'Content-Type': 'application/json' },
+      }
+    );
+  }
+};

package/templates/src/pages/api/shopify/getProducts.ts

@@ -0,0 +1,64 @@
+import type { APIRoute } from '@/types/astro';
+import { resolveTenantId } from '@/utils/tenantResolver';
+
+export const prerender = false;
+
+const getBackendUrl = () => {
+  return import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+};
+
+export const GET: APIRoute = async ({ request }) => {
+  const resolution = await resolveTenantId(request);
+  const tenantId = resolution.id;
+
+  const url = new URL(request.url);
+  const q = url.searchParams.get('q') || '';
+  const cursor = url.searchParams.get('cursor') || '';
+
+  const backendUrl = new URL(`${getBackendUrl()}/api/v1/shopify/products`);
+  if (q) {
+    backendUrl.searchParams.set('q', q);
+  }
+  if (cursor) {
+    backendUrl.searchParams.set('cursor', cursor);
+  }
+
+  const cookieHeader = request.headers.get('cookie') || '';
+
+  try {
+    const backendResponse = await fetch(backendUrl.toString(), {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Tenant-ID': tenantId,
+        Cookie: cookieHeader,
+      },
+    });
+
+    if (!backendResponse.ok) {
+      const errorText = await backendResponse.text();
+      throw new Error(
+        `Backend Proxy Error: ${backendResponse.status} - ${errorText}`
+      );
+    }
+
+    const result = await backendResponse.json();
+
+    return new Response(JSON.stringify(result), {
+      status: 200,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (error) {
+    console.error('Shopify proxy fetch failed:', error);
+    return new Response(
+      JSON.stringify({
+        error:
+          error instanceof Error ? error.message : 'Failed to fetch products',
+      }),
+      {
+        status: 500,
+        headers: { 'Content-Type': 'application/json' },
+      }
+    );
+  }
+};

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

@@ -31,8 +31,11 @@ const getAssetPath = (configPath: string, fallback: string) => {
   }
   return fallback;
 };
-const logo = getAssetPath(brandConfig?.LOGO, '/brand/logo.svg');
-const wordmark = getAssetPath(brandConfig?.WORDMARK, '/brand/wordmark.svg');
+const logo = getAssetPath(brandConfig?.LOGO || ``, '/brand/logo.svg');
+const wordmark = getAssetPath(
+  brandConfig?.WORDMARK || ``,
+  '/brand/wordmark.svg'
+);
 const mainStylesUrl = isDev
   ? `${cssBasePath}/storykeep.css`
   : `${cssBasePath}/frontend.css`;
@@ -52,20 +55,27 @@ const mainStylesUrl = isDev
       <div class="mx-auto pb-6">
         <!-- Logo and Wordmark -->
         <div class="flex flex-col items-center justify-center gap-4">
-          <div class="h-16 w-auto">
-            <img
-              src={logo}
-              class="pointer-events-none h-full w-auto"
-              alt="Logo"
-            />
-          </div>
-          <div class="h-16 w-auto">
-            <img
-              src={wordmark}
-              class="pointer-events-none h-full w-auto max-w-48 md:max-w-72"
-              alt="Wordmark"
-            />
-          </div>
+          {
+            brandConfig?.WORDMARK_MODE !== 'wordmark' && (
+              <img
+                id="t8k-logo"
+                src={logo}
+                class="pointer-events-none h-16 w-auto"
+                alt="Logo"
+              />
+            )
+          }
+
+          {
+            brandConfig?.WORDMARK_MODE !== 'logo' && (
+              <img
+                id="t8k-wordmark"
+                src={wordmark}
+                class="pointer-events-none h-16 w-auto max-w-48 md:max-w-72"
+                alt="Wordmark"
+              />
+            )
+          }
         </div>
 
         <h2
@@ -193,10 +203,8 @@ const mainStylesUrl = isDev
           const buttonText = submitButton.textContent.trim();
 
           submitButton.addEventListener('click', async function () {
-            // Hide error message
             if (loginErrorDiv) loginErrorDiv.style.display = 'none';
 
-            // Show loading state
             submitButton.disabled = true;
             submitButton.textContent = 'Signing in...';
 
@@ -226,17 +234,11 @@ const mainStylesUrl = isDev
               const result = await response.json();
 
               if (result.success) {
-                // Show success message with role
                 if (loginFormDiv) loginFormDiv.style.display = 'none';
                 if (loginSuccessDiv) loginSuccessDiv.style.display = 'block';
                 if (userRoleSpan)
                   userRoleSpan.textContent = result.role || 'authenticated';
 
-                // Console log for debugging
-                console.log('Login successful:', result);
-                console.log('User role:', result.role);
-
-                // Redirect after short delay
                 setTimeout(() => {
                   window.location.href = result.redirect || redirectPath;
                 }, 1500);

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

@@ -35,10 +35,8 @@
     </div>
 
     <script>
-      // Clear authentication data
       async function logout() {
         try {
-          // Call server-side logout API to clear HTTP-only cookies
           const response = await fetch('/api/auth/logout', {
             method: 'POST',
             headers: {
@@ -48,13 +46,10 @@
 
           const result = await response.json();
 
-          if (result.success) {
-            console.log('StoryKeep: Admin logout successful');
-          } else {
+          if (!result.success) {
             console.error('StoryKeep: Admin logout failed:', result.error);
           }
 
-          // Also clear any remaining TractStack user profile data
           const tractStackKeys = [];
           for (let i = 0; i < localStorage.length; i++) {
             const key = localStorage.key(i);
@@ -64,15 +59,11 @@
           }
           tractStackKeys.forEach((key) => localStorage.removeItem(key));
 
-          console.log('TractStack: Complete logout finished');
-
-          // Redirect to home page
           setTimeout(() => {
             window.location.href = '/';
           }, 1000);
         } catch (error) {
           console.error('Logout error:', error);
-          // Still redirect even if logout API fails
           window.location.href = '/';
         }
       }

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

@@ -0,0 +1,69 @@
+---
+import Layout from '@/layouts/Layout.astro';
+import StoryKeepBackdrop from '@/components/storykeep/StoryKeepBackdrop.astro';
+import StoryKeepDashboard from '@/components/storykeep/Dashboard';
+import ManageContent from '@/components/storykeep/controls/content/ManageContent';
+import { requireAdminOrEditor, isAuthenticated, isAdmin } from '@/utils/auth';
+import { getFullContentMap } from '@/stores/analytics';
+import { getBrandConfig } from '@/utils/api/brandConfig';
+import { preHealthCheck } from '@/utils/backend';
+
+const tenantId =
+  Astro.locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+
+const healthCheckRedirect = await preHealthCheck(tenantId);
+if (healthCheckRedirect !== undefined) {
+  return healthCheckRedirect;
+}
+
+const authCheck = requireAdminOrEditor(Astro);
+if (authCheck) {
+  return authCheck;
+}
+
+const userIsAuthenticated = isAuthenticated(Astro);
+const userIsAdmin = isAdmin(Astro);
+const role = userIsAdmin ? `admin` : userIsAuthenticated ? `editor` : null;
+const brandConfig = await getBrandConfig(tenantId);
+const initializing = !brandConfig.SITE_INIT;
+
+if (initializing) {
+  return Astro.redirect('/storykeep/branding');
+}
+
+const title = 'Manage Content | StoryKeep';
+const createMenu = Astro.url.searchParams.has('create-menu');
+const homeSlug = brandConfig.HOME_SLUG || 'hello';
+let fullContentMap;
+
+try {
+  fullContentMap = await getFullContentMap(tenantId);
+} catch (error) {
+  return Astro.redirect(
+    `/maint?from=${encodeURIComponent(Astro.url.pathname)}`
+  );
+}
+---
+
+<Layout title={title} slug="storykeep" isStoryKeep={true}>
+  <main id="main-content" class="relative min-h-screen w-full">
+    <StoryKeepBackdrop brandConfig={brandConfig} />
+    <div class="max-w-5xl p-3.5 md:p-8">
+      <StoryKeepDashboard
+        client:only="react"
+        fullContentMap={fullContentMap}
+        homeSlug={homeSlug}
+        activeTab="manage"
+        role={role}
+        initializing={initializing}
+      />
+
+      <ManageContent
+        client:only="react"
+        fullContentMap={fullContentMap}
+        homeSlug={homeSlug}
+        createMenu={createMenu}
+      />
+    </div>
+  </main>
+</Layout>

package/templates/src/pages/storykeep/{content.astro → pages.astro}

@@ -7,6 +7,7 @@ import { requireAdminOrEditor, isAuthenticated, isAdmin } from '@/utils/auth';
 import { getFullContentMap } from '@/stores/analytics';
 import { getBrandConfig } from '@/utils/api/brandConfig';
 import { preHealthCheck } from '@/utils/backend';
+import type { FullContentMapItem } from '@/types/compositorTypes';
 
 const tenantId =
   Astro.locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
@@ -24,20 +25,16 @@ if (authCheck) {
 const userIsAuthenticated = isAuthenticated(Astro);
 const userIsAdmin = isAdmin(Astro);
 const role = userIsAdmin ? `admin` : userIsAuthenticated ? `editor` : null;
-
 const brandConfig = await getBrandConfig(tenantId);
 const initializing = !brandConfig.SITE_INIT;
 
-// Redirect to branding page during initial setup
 if (initializing) {
   return Astro.redirect('/storykeep/branding');
 }
 
-const title = 'Content | StoryKeep';
-const createMenu = Astro.url.searchParams.has('create-menu');
-
-let fullContentMap;
+const title = 'Web Pages | StoryKeep';
 const homeSlug = brandConfig.HOME_SLUG || 'hello';
+let fullContentMap: FullContentMapItem[];
 
 try {
   fullContentMap = await getFullContentMap(tenantId);
@@ -56,7 +53,7 @@ try {
         client:only="react"
         fullContentMap={fullContentMap}
         homeSlug={homeSlug}
-        activeTab="content"
+        activeTab="pages"
         role={role}
         initializing={initializing}
       />
@@ -65,7 +62,6 @@ try {
         client:only="react"
         fullContentMap={fullContentMap}
         homeSlug={homeSlug}
-        createMenu={createMenu}
       />
     </div>
   </main>

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

@@ -0,0 +1,101 @@
+---
+import Layout from '@/layouts/Layout.astro';
+import StoryKeepBackdrop from '@/components/storykeep/StoryKeepBackdrop.astro';
+import StoryKeepDashboard from '@/components/storykeep/Dashboard';
+import StoryKeepDashboard_Shopify from '@/components/storykeep/Dashboard_Shopify';
+import { requireAdminOrEditor, isAuthenticated, isAdmin } from '@/utils/auth';
+import { getFullContentMap } from '@/stores/analytics';
+import { getBrandConfig } from '@/utils/api/brandConfig';
+import { getResourcesByIds } from '@/utils/api/resourceConfig';
+import { preHealthCheck } from '@/utils/backend';
+import type { ResourceNode } from '@/types/compositorTypes';
+
+const tenantId =
+  Astro.locals.tenant?.id || import.meta.env.PUBLIC_TENANTID || 'default';
+
+const healthCheckRedirect = await preHealthCheck(tenantId);
+if (healthCheckRedirect !== undefined) {
+  return healthCheckRedirect;
+}
+
+const authCheck = requireAdminOrEditor(Astro);
+if (authCheck) {
+  return authCheck;
+}
+
+// Fetch configuration early to check enablement
+const brandConfig = await getBrandConfig(tenantId);
+
+if (!brandConfig.HAS_SHOPIFY) {
+  return Astro.redirect('/storykeep');
+}
+
+const userIsAuthenticated = isAuthenticated(Astro);
+const userIsAdmin = isAdmin(Astro);
+const role = userIsAdmin ? 'admin' : userIsAuthenticated ? 'editor' : null;
+
+const initializing = !brandConfig.SITE_INIT;
+
+if (initializing) {
+  return Astro.redirect('/storykeep/branding');
+}
+
+const title = 'Shopify | StoryKeep';
+let fullContentMap = [];
+let relevantResources: ResourceNode[] = [];
+const homeSlug = brandConfig.HOME_SLUG || 'hello';
+
+try {
+  fullContentMap = await getFullContentMap(tenantId);
+  const knownResources = brandConfig.KNOWN_RESOURCES || {};
+  const activeCategories = Object.keys(knownResources);
+
+  if (Array.isArray(fullContentMap)) {
+    const slimResources = fullContentMap.filter(
+      (node: any) =>
+        node.type === 'Resource' &&
+        node.categorySlug &&
+        activeCategories.includes(node.categorySlug)
+    ) as ResourceNode[];
+
+    if (slimResources.length > 0) {
+      const ids = slimResources.map((r) => r.id);
+      const configs = await getResourcesByIds(tenantId, ids);
+      relevantResources = configs.map((config) => ({
+        ...config,
+        nodeType: 'Resource',
+        parentId: null,
+      })) as ResourceNode[];
+    } else {
+      relevantResources = [];
+    }
+  }
+} catch (error) {
+  console.error('Failed to load shopify resources:', error);
+  return Astro.redirect(
+    `/maint?from=${encodeURIComponent(Astro.url.pathname)}`
+  );
+}
+---
+
+<Layout title={title} slug="storykeep" isStoryKeep={true}>
+  <main id="main-content" class="relative min-h-screen w-full">
+    <StoryKeepBackdrop brandConfig={brandConfig} />
+    <div class="max-w-5xl p-3.5 md:p-8">
+      <StoryKeepDashboard
+        client:only="react"
+        fullContentMap={fullContentMap}
+        homeSlug={homeSlug}
+        activeTab="shopify"
+        role={role}
+        initializing={initializing}
+        brandConfig={brandConfig}
+      />
+      <StoryKeepDashboard_Shopify
+        client:only="react"
+        brandConfig={brandConfig}
+        existingResources={relevantResources}
+      />
+    </div>
+  </main>
+</Layout>

package/templates/src/stores/navigation.ts

@@ -1,11 +1,8 @@
 import { atom } from 'nanostores';
 
-// Used by StoryKeepWizard
 export const skipWizard = atom<boolean>(false);
 
-// Navigation state structure for Content sub-navigation only
 export interface ContentNavigationState {
-  subtab: 'webpages' | 'manage';
   manageSubtab:
     | 'summary'
     | 'storyfragments'
@@ -17,24 +14,22 @@ export interface ContentNavigationState {
     | 'files';
 }
 
-// Default content navigation state
 const defaultContentNavigationState: ContentNavigationState = {
-  subtab: 'webpages',
   manageSubtab: 'summary',
 };
 
-// Storage key for localStorage persistence
 const CONTENT_NAVIGATION_STORAGE_KEY = 'tractstack_content_navigation_state';
 
-// Helper functions for localStorage
 function loadContentNavigationFromStorage(): ContentNavigationState {
   try {
     const stored = localStorage.getItem(CONTENT_NAVIGATION_STORAGE_KEY);
     if (stored) {
       const parsed = JSON.parse(stored);
+      // Ensure we only merge valid keys, ignoring old 'subtab' if present
       return {
         ...defaultContentNavigationState,
-        ...parsed,
+        manageSubtab:
+          parsed.manageSubtab || defaultContentNavigationState.manageSubtab,
       };
     }
   } catch (error) {
@@ -57,29 +52,15 @@ function saveContentNavigationToStorage(state: ContentNavigationState): void {
   }
 }
 
-// Create the persistent nanostore for content navigation
 export const contentNavigationStore = atom<ContentNavigationState>(
   loadContentNavigationFromStorage()
 );
 
-// Subscribe to changes and persist to localStorage
 contentNavigationStore.subscribe((state) => {
   saveContentNavigationToStorage(state);
 });
 
-// Action creators for content navigation
 export const contentNavigationActions = {
-  /**
-   * Set content subtab (webpages vs manage)
-   */
-  setContentSubtab: (subtab: ContentNavigationState['subtab']) => {
-    const currentState = contentNavigationStore.get();
-    contentNavigationStore.set({
-      ...currentState,
-      subtab,
-    });
-  },
-
   /**
    * Set manage content sub-subtab (summary, storyfragments, etc.)
    */
@@ -106,22 +87,6 @@ export const contentNavigationActions = {
   },
 };
 
-// Navigation helper functions (moved from navigationHelpers.ts)
-
-/**
- * Handle content subtab change with navigation tracking
- */
-export function handleContentSubtabChange(
-  newSubtab: ContentNavigationState['subtab'],
-  setActiveContentTab: (tab: string) => void
-) {
-  // Update the active subtab in the component
-  setActiveContentTab(newSubtab);
-
-  // Update navigation store
-  contentNavigationActions.setContentSubtab(newSubtab);
-}
-
 /**
  * Handle manage content sub-subtab change with navigation tracking
  */
@@ -129,10 +94,7 @@ export function handleManageSubtabChange(
   newSubtab: ContentNavigationState['manageSubtab'],
   setActiveTab: (tab: string) => void
 ) {
-  // Update the active sub-subtab in the component
   setActiveTab(newSubtab);
-
-  // Update navigation store
   contentNavigationActions.setManageSubtab(newSubtab);
 }
 
@@ -143,7 +105,6 @@ export function handleManageSubtabChange(
 export function restoreTabNavigation() {
   const state = contentNavigationStore.get();
   return {
-    subtab: state.subtab,
     manageSubtab: state.manageSubtab,
   };
 }

package/templates/src/stores/nodes.ts

@@ -1893,6 +1893,7 @@ export class NodesContext {
       delete duplicatedPane.gridLayout;
     }
 
+    duplicatedPane.isChanged = true;
     this.addNode(duplicatedPane as PaneNode);
     this.addNodes(allNodes);
     this.notifyNode(ownerId);
@@ -1953,7 +1954,6 @@ export class NodesContext {
     const storyFragmentNode = ownerNode as StoryFragmentNode;
     let specificIdx = -1;
     let elIdx = -1;
-    let storyFragmentWasChanged: boolean = false;
 
     if (
       insertPaneId &&
@@ -1976,8 +1976,10 @@ export class NodesContext {
           );
         }
       }
+      storyFragmentNode.isChanged = true;
     }
 
+    duplicatedPane.isChanged = true;
     this.addNode(duplicatedPane as PaneNode);
     this.linkChildToParent(
       duplicatedPane.id,

package/templates/src/stores/resources.ts

@@ -1,17 +1,14 @@
-import { atom } from 'nanostores';
+import { map } from 'nanostores';
 import type { ResourceNode } from '@/types/compositorTypes';
 
-export interface ResourcesCache {
+export const HEADER_RESOURCES_TTL = 5 * 60 * 1000;
+
+export const headerResourcesStore = map<{
   data: ResourceNode[];
   lastFetched: number;
-}
-
-// Initialize with an empty state. This atom will live on the server and persist
-// across page requests for the lifetime of the server instance.
-export const headerResourcesStore = atom<ResourcesCache>({
+  key?: string;
+}>({
   data: [],
   lastFetched: 0,
+  key: '',
 });
-
-// Default Time-To-Live for the cache: 5 minutes in milliseconds.
-export const HEADER_RESOURCES_TTL = 5 * 60 * 1000;