@o2vend/theme-cli 1.0.35 → 1.0.36

package/lib/lib/liquid-engine.js

@@ -101,63 +101,50 @@ function createLiquidEngine(themePath, options = {}) {
  * @param {string} themePath - Theme path
  */
 function registerCustomTags(liquid, themePath) {
-  // Register section tag
   liquid.registerTag('section', {
     parse: function(tagToken, remainTokens) {
       this.sectionPath = tagToken.args.trim().replace(/^['"]|['"]$/g, '');
     },
     render: async function(scope, hash) {
       let sectionPath = this.sectionPath;
-      if (!sectionPath) {
-        console.error('[SECTION] No section path provided');
-        return '';
-      }
-      
+      if (!sectionPath) return '';
+
       try {
-        // Normalize section path - remove 'sections/' prefix if present
-        // Handle both 'hero' and 'sections/hero' formats
         sectionPath = sectionPath.replace(/^sections\//, '').replace(/^sections\\/, '');
-        
+
         const sectionFile = path.join(themePath, 'sections', `${sectionPath}.liquid`);
-        if (fs.existsSync(sectionFile)) {
-          let sectionContent = fs.readFileSync(sectionFile, 'utf8');
-          
-          // Pre-process section to convert render_widget filter to tag
-          const originalContent = sectionContent;
-          try {
-            sectionContent = preprocessTemplate(sectionContent);
-          } catch (error) {
-            console.error(chalk.red(`[SECTION] ❌ Error preprocessing ${sectionPath}: ${error.message}`));
-            sectionContent = originalContent;
-          }
-          
-          const scopeContexts = Array.isArray(scope?.contexts) ? scope.contexts : [];
-          const primaryScope = scopeContexts.length > 0
-            ? scopeContexts[0]
-            : (scope?.environments || scope?.context || {});
-          
-          // Merge with current rendering context to ensure all data is available
-          const fullContext = currentRenderingContext 
-            ? { ...currentRenderingContext, ...primaryScope }
-            : primaryScope;
-          
-          const context = {
-            ...fullContext,
-            section: fullContext.section || {}
-          };
-          
-          // Render section
-          try {
-            const rendered = await liquid.parseAndRender(sectionContent, context);
-            return rendered;
-          } catch (renderError) {
-            console.error(chalk.red(`[SECTION] ❌ Error rendering ${sectionPath}: ${renderError.message}`));
-            throw renderError;
-          }
-        } else {
+        if (!fs.existsSync(sectionFile)) {
           console.warn(`[SECTION] Section file not found: ${sectionFile}`);
           return '';
         }
+
+        let sectionContent = fs.readFileSync(sectionFile, 'utf8');
+
+        try {
+          sectionContent = preprocessTemplate(sectionContent);
+        } catch (e) {
+          // Keep original content if preprocessing fails
+        }
+
+        const scopeContexts = Array.isArray(scope?.contexts) ? scope.contexts : [];
+        const primaryScope = scopeContexts.length > 0
+          ? scopeContexts[0]
+          : (scope?.environments || scope?.context || {});
+
+        const fullContext = currentRenderingContext
+          ? { ...currentRenderingContext, ...primaryScope }
+          : primaryScope;
+
+        const context = {
+          ...fullContext,
+          section: {
+            id: sectionPath.replace(/\//g, '-'),
+            name: sectionPath.split('/').pop(),
+            settings: fullContext.section?.settings || {}
+          }
+        };
+
+        return await liquid.parseAndRender(sectionContent, context);
       } catch (error) {
         console.error(`[SECTION] Error rendering section ${sectionPath}:`, error.message);
         return '';
@@ -202,16 +189,30 @@ function registerCustomTags(liquid, themePath) {
     }
   });
 
-  // Register endschema tag (closing tag for schema)
   liquid.registerTag('endschema', {
+    parse: function(tagToken, remainTokens) {},
+    render: async function(scope, hash) { return ''; }
+  });
+
+  liquid.registerTag('cache', {
     parse: function(tagToken, remainTokens) {
-      // No-op - just marks the end of schema block
+      this.tpls = [];
+      const stream = liquid.parser.parseStream(remainTokens);
+      stream.on('tag:endcache', () => stream.stop());
+      stream.on('template', (tpl) => this.tpls.push(tpl));
+      stream.on('end', () => { throw new Error('tag cache not closed'); });
+      stream.start();
     },
     render: async function(scope, hash) {
-      return '';
+      return liquid.renderer.renderTemplates(this.tpls, scope);
     }
   });
 
+  liquid.registerTag('endcache', {
+    parse: function() {},
+    render: async function() { return ''; }
+  });
+
   // Register render_widget tag as an alternative to the filter
   // This allows templates to use: {% render_widget widget %}
   liquid.registerTag('render_widget', {
@@ -283,7 +284,6 @@ function registerCustomTags(liquid, themePath) {
   // CRITICAL: Include tag must parse hash arguments like 'product: product' to match production behavior
   liquid.registerTag('include', {
     parse: function(tagToken, remainTokens) {
-      // Parse arguments - handle 'snippets/product-card', product: product format
       const args = tagToken.args.trim();
       
       // Split by comma to separate file path from hash parameters
@@ -296,12 +296,26 @@ function registerCustomTags(liquid, themePath) {
         this.hashArgs = '';
       }
       
+      // Handle "| default:" filter in file argument
+      const pipeIndex = this.fileArg.indexOf('|');
+      if (pipeIndex > 0) {
+        const filterPart = this.fileArg.substring(pipeIndex + 1).trim();
+        this.fileArg = this.fileArg.substring(0, pipeIndex).trim();
+        const defaultMatch = filterPart.match(/^default:\s*['"]([^'"]+)['"]/);
+        this.defaultFile = defaultMatch ? defaultMatch[1] : null;
+      } else {
+        this.defaultFile = null;
+      }
+      
       // Extract file path - remove quotes if present
       const fileMatch = this.fileArg.match(/^['"]([^'"]+)['"]/);
       this.file = fileMatch ? fileMatch[1] : this.fileArg.replace(/^['"]|['"]$/g, '');
     },
     render: async function(scope, hash) {
       let filePath = this.file;
+      if (!filePath && this.defaultFile) {
+        filePath = this.defaultFile;
+      }
       if (!filePath) {
         console.warn('[INCLUDE] No file path provided');
         return '';
@@ -392,8 +406,6 @@ function registerCustomTags(liquid, themePath) {
   // Override the render tag (similar to include but with isolated scope)
   liquid.registerTag('render', {
     parse: function(tagToken, remainTokens) {
-      // Parse the tag arguments
-      // Format: {% render 'path' %} or {% render variable.path, param: value %}
       const args = tagToken.args.trim();
       
       // Split by comma to separate file path from hash parameters
@@ -405,21 +417,28 @@ function registerCustomTags(liquid, themePath) {
         this.fileArg = args;
         this.hashArgs = '';
       }
+      
+      // Handle "| default:" filter on the file argument
+      // e.g., footer_menu_widget.template_path | default: 'widgets/footer-menu'
+      this.defaultPath = null;
+      const pipeIndex = this.fileArg.indexOf('|');
+      if (pipeIndex > 0) {
+        const filterPart = this.fileArg.substring(pipeIndex + 1).trim();
+        this.fileArg = this.fileArg.substring(0, pipeIndex).trim();
+        const defaultMatch = filterPart.match(/^default:\s*['"]([^'"]+)['"]/);
+        if (defaultMatch) {
+          this.defaultPath = defaultMatch[1];
+        }
+      }
     },
     render: async function(scope, hash) {
-      // RECURSION GUARD: Check render depth to prevent infinite loops
       currentRenderDepth++;
       if (currentRenderDepth > MAX_RENDER_DEPTH) {
-        console.error(chalk.red(`[RENDER TAG] ❌ Maximum render depth (${MAX_RENDER_DEPTH}) exceeded - possible infinite loop`));
-        console.error(chalk.red(`[RENDER TAG] Current rendering stack: ${Array.from(renderingStack).join(' -> ')}`));
+        console.error(chalk.red(`[RENDER TAG] Maximum render depth (${MAX_RENDER_DEPTH}) exceeded`));
         currentRenderDepth--;
         return `<div class="widget-error">Error: Maximum render depth exceeded</div>`;
       }
       
-      // CRITICAL: Use scope.get() to properly resolve variables from the LiquidJS scope chain
-      // This correctly handles loop variables like 'widget' in {% for widget in widgets.hero %}
-      
-      // Build context starting with currentRenderingContext
       let fullContext = {};
       if (currentRenderingContext) {
         fullContext = { ...currentRenderingContext };
@@ -428,24 +447,28 @@ function registerCustomTags(liquid, themePath) {
       // Resolve file path - could be a string literal or a variable
       let filePath = this.fileArg;
       
-      // If it's wrapped in quotes, it's a string literal
       if ((filePath.startsWith('"') && filePath.endsWith('"')) || 
           (filePath.startsWith("'") && filePath.endsWith("'"))) {
         filePath = filePath.slice(1, -1);
       } else {
-        // It's a variable - use scope.get() to resolve it properly (this handles loop variables!)
+        // Variable resolution with | default: fallback support
         try {
-          // For paths like 'widget.template_path', we need to resolve via scope.get()
           const resolvedValue = await scope.get(filePath.split('.'));
           if (resolvedValue && typeof resolvedValue === 'string') {
             filePath = resolvedValue;
+          } else if (this.defaultPath) {
+            filePath = this.defaultPath;
           } else {
             currentRenderDepth--;
             return '';
           }
         } catch (error) {
-          currentRenderDepth--;
-          return '';
+          if (this.defaultPath) {
+            filePath = this.defaultPath;
+          } else {
+            currentRenderDepth--;
+            return '';
+          }
         }
       }
       
@@ -741,8 +764,8 @@ async function renderWithLayout(liquid, templatePath, context, themePath) {
           price: sampleProduct.price || sampleProduct.sellingPrice,
           stock: sampleProduct.stock,
           inStock: sampleProduct.inStock,
-          hasImage: !!(sampleProduct.imageUrl || sampleProduct.thumbnailImage1),
-          imageUrl: sampleProduct.imageUrl || sampleProduct.thumbnailImage1?.url,
+          hasImage: !!(sampleProduct.imageUrl || sampleProduct.thumbnailImage),
+          imageUrl: sampleProduct.imageUrl || sampleProduct.thumbnailImage,
           categoryId: sampleProduct.categoryId
         });
       } else {

package/lib/lib/liquid-filters.js

@@ -528,25 +528,22 @@ class LiquidHelperService {
     return `<img src="${input}" alt="${alt}" ${attributes}>`;
   }
 
-  // Product filters
   productUrlFilter(product) {
     if (!product) return '#';
-    // Use handle, slug, or id - ensure it's a string and handle URL encoding
-    const identifier = product.handle || product.slug || product.id;
-    if (!identifier) return '#';
-    // Ensure it's a string and remove any leading slashes
-    const handle = String(identifier).replace(/^\//, '');
-    return `/products/${handle}`;
+    const slug = product.slug || product.handle || product.id;
+    return slug ? `/${String(slug).replace(/^\//, '')}` : '#';
   }
 
   collectionUrlFilter(collection) {
     if (!collection) return '#';
-    return `/collections/${collection.slug || collection.handle || collection.id}`;
+    const slug = collection.slug || collection.handle || collection.id;
+    return slug ? `/${String(slug).replace(/^\//, '')}` : '#';
   }
 
   pageUrlFilter(page) {
     if (!page) return '#';
-    return `/pages/${page.slug || page.handle || page.id}`;
+    const slug = page.slug || page.handle || page.id;
+    return slug ? `/${String(slug).replace(/^\//, '')}` : '#';
   }
 
   // Utility filters
@@ -591,26 +588,10 @@ class LiquidHelperService {
    */
   assetUrlFilter(input) {
     if (!input || typeof input !== 'string') return input;
-    
-    // Remove .min extension if present
-    let url = input.replace(/\.min\.(css|js|jpg|jpeg|png|gif|svg|webp)$/, (match, ext) => `.${ext}`);
-    
-    // Remove /themes/default/ or /themes/theme-name/ prefixes if present
-    // Handle both "/themes/default/assets/logo.png" and "themes/default/assets/logo.png"
-    url = url.replace(/^\/?themes\/[^\/]+\//, '/');
-    
-    // Extract just the filename if path contains assets
-    // Handle paths like "themes/default/assets/logo.png" -> "/assets/logo.png"
-    // or "/themes/default/assets/logo.png" -> "/assets/logo.png"
-    const assetsMatch = url.match(/assets\/(.+)$/);
-    if (assetsMatch) {
-      url = '/assets/' + assetsMatch[1];
-    } else if (!url.startsWith('/assets/') && !url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('data:')) {
-      // Ensure /assets/ prefix if not already present (skip if already absolute URL or data URI)
-      url = '/assets/' + url.replace(/^\/+/, '');
-    }
-    
-    return url;
+
+    if (input.startsWith('/assets/')) return input;
+
+    return `/assets/${input}`;
   }
 
   /**

package/lib/lib/mock-api-server.js

@@ -66,22 +66,10 @@ class MockApiServer {
       // Paginate
       const paginated = products.slice(offset, offset + limit);
 
-      // DEBUG: Verify products have stock/quantity before sending
       if (paginated.length > 0) {
-        const sampleProduct = paginated[0];
-        const hasStock = 'stock' in sampleProduct;
-        // Use nullish coalescing to show 0 values correctly
-        const stockValue = sampleProduct.stock ?? 'N/A';
+        const sp = paginated[0];
         console.log(`[MOCK API] Returning ${paginated.length} products (total: ${products.length})`);
-        console.log(`[MOCK API DEBUG] Sample product - Title: ${sampleProduct.title}, Has stock field: ${hasStock}, Stock value: ${stockValue}`);
-        console.log(`[MOCK API DEBUG] Sample product stock details: stock=${sampleProduct.stock}, inStock=${sampleProduct.inStock}`);
-        if (sampleProduct.variants && sampleProduct.variants.length > 0) {
-          const sampleVariant = sampleProduct.variants[0];
-          const variantHasStock = 'stock' in sampleVariant;
-          const variantStockValue = sampleVariant.stock ?? 'N/A';
-          console.log(`[MOCK API DEBUG] Sample variant - Has stock field: ${variantHasStock}, Stock value: ${variantStockValue}`);
-          console.log(`[MOCK API DEBUG] Sample variant stock details: stock=${sampleVariant.stock}, inStock=${sampleVariant.inStock}, available=${sampleVariant.available}`);
-        }
+        console.log(`[MOCK API] Sample: ${sp.title}, stockQuantity=${sp.stockQuantity}, inStock=${sp.inStock}`);
       }
 
       res.json({
@@ -94,7 +82,10 @@ class MockApiServer {
 
     // Product by ID
     this.app.get('/shopfront/api/v2/products/:id', (req, res) => {
-      const product = this.mockData.products.find(p => p.id === req.params.id);
+      const id = req.params.id;
+      const product = this.mockData.products.find(p =>
+        String(p.id) === id || String(p.productId) === id || p.slug === id || p.handle === id
+      );
       if (product) {
         res.json(product);
       } else {
@@ -138,7 +129,10 @@ class MockApiServer {
 
     // Category by ID
     this.app.get('/shopfront/api/v2/categories/:id', (req, res) => {
-      const category = this.mockData.categories.find(c => c.id === req.params.id);
+      const id = req.params.id;
+      const category = this.mockData.categories.find(c =>
+        String(c.id) === id || String(c.categoryId) === id || c.slug === id || c.handle === id
+      );
       if (category) {
         res.json(category);
       } else {
@@ -165,17 +159,16 @@ class MockApiServer {
       
       let widgets = [...this.mockData.widgets];
       
-      // Filter by section
+      if (pageId) {
+        widgets = widgets.filter(w => w.pageId === 'all' || w.pageId === pageId);
+      }
       if (section) {
         widgets = widgets.filter(w => w.section === section || w.sectionName === section);
       }
       
-      // Filter by status (default to 'active' if not specified)
       const filterStatus = status || 'active';
       widgets = widgets.filter(w => w.status === filterStatus);
-      
-      // Sort by position
-      widgets.sort((a, b) => (a.position || 0) - (b.position || 0));
+      widgets.sort((a, b) => (a.Position || a.position || 0) - (b.Position || b.position || 0));
       
       res.json({
         widgets: widgets,
@@ -189,17 +182,16 @@ class MockApiServer {
       
       let widgets = [...this.mockData.widgets];
       
-      // Filter by section
+      if (pageId) {
+        widgets = widgets.filter(w => w.pageId === 'all' || w.pageId === pageId);
+      }
       if (section) {
         widgets = widgets.filter(w => w.section === section || w.sectionName === section);
       }
       
-      // Filter by status (default to 'active' if not specified)
       const filterStatus = status || 'active';
       widgets = widgets.filter(w => w.status === filterStatus);
-      
-      // Sort by position
-      widgets.sort((a, b) => (a.position || 0) - (b.position || 0));
+      widgets.sort((a, b) => (a.Position || a.position || 0) - (b.Position || b.position || 0));
       
       res.json({
         widgets: widgets,
@@ -207,6 +199,21 @@ class MockApiServer {
       });
     });
 
+    // Page-section widgets endpoint (matches production: POST /pages/{pageId}/sections/{section}/widgets)
+    this.app.post('/pages/:pageId/sections/:section/widgets', (req, res) => {
+      const { pageId, section } = req.params;
+      
+      let widgets = this.mockData.widgets.filter(w => {
+        const matchesPage = w.pageId === 'all' || w.pageId === pageId;
+        const matchesSection = w.section === section || w.sectionName === section;
+        const isActive = w.status === 'active';
+        return matchesPage && matchesSection && isActive;
+      });
+      
+      widgets.sort((a, b) => (a.Position || a.position || 0) - (b.Position || b.position || 0));
+      res.json(widgets);
+    });
+
     // Cart endpoints
     this.app.get('/shopfront/api/v2/cart/:cartId', (req, res) => {
       res.json(this.mockData.cart);
@@ -239,86 +246,35 @@ class MockApiServer {
         {
           id: 'main-menu',
           name: 'Main Menu',
-          type: 'Main Menu',  // Type field for filtering
+          type: 'Main Menu',
           items: [
-            { 
-              id: '1', 
-              name: 'Home', 
-              title: 'Home', 
-              link: '/', 
-              url: '/',
-              displayOrder: 1,
-              childItems: [] 
-            },
-            { 
-              id: '2', 
-              name: 'Products', 
-              title: 'Products', 
-              link: '/products', 
-              url: '/products',
-              displayOrder: 2,
-              childItems: [
-                { id: '2-1', name: 'Electronics', title: 'Electronics', link: '/products?category=electronics', url: '/products?category=electronics', displayOrder: 1 },
-                { id: '2-2', name: 'Clothing', title: 'Clothing', link: '/products?category=clothing', url: '/products?category=clothing', displayOrder: 2 },
-                { id: '2-3', name: 'Accessories', title: 'Accessories', link: '/products?category=accessories', url: '/products?category=accessories', displayOrder: 3 },
-                { id: '2-4', name: 'Home & Garden', title: 'Home & Garden', link: '/products?category=home-garden', url: '/products?category=home-garden', displayOrder: 4 }
-              ]
-            },
-            { 
-              id: '3', 
-              name: 'Collections', 
-              title: 'Collections', 
-              link: '/collections', 
-              url: '/collections',
-              displayOrder: 3,
+            { id: '1', name: 'Home', title: 'Home', link: '/', displayOrder: 1, childItems: [] },
+            {
+              id: '2', name: 'Products', title: 'Products', link: '/categories', displayOrder: 2,
               childItems: [
-                { id: '3-1', name: 'New Arrivals', title: 'New Arrivals', link: '/collections/new-arrivals', url: '/collections/new-arrivals', displayOrder: 1 },
-                { id: '3-2', name: 'Best Sellers', title: 'Best Sellers', link: '/collections/best-sellers', url: '/collections/best-sellers', displayOrder: 2 },
-                { id: '3-3', name: 'On Sale', title: 'On Sale', link: '/collections/sale', url: '/collections/sale', displayOrder: 3 }
+                { id: '2-1', name: 'Electronics', title: 'Electronics', link: '/electronics', displayOrder: 1 },
+                { id: '2-2', name: 'Clothing', title: 'Clothing', link: '/clothing', displayOrder: 2 },
+                { id: '2-3', name: 'Accessories', title: 'Accessories', link: '/accessories', displayOrder: 3 },
+                { id: '2-4', name: 'Home & Garden', title: 'Home & Garden', link: '/home-and-garden', displayOrder: 4 }
               ]
             },
-            { 
-              id: '4', 
-              name: 'About', 
-              title: 'About', 
-              link: '/page/about', 
-              url: '/page/about',
-              displayOrder: 4,
-              childItems: [] 
-            },
-            { 
-              id: '5', 
-              name: 'Contact', 
-              title: 'Contact', 
-              link: '/page/contact', 
-              url: '/page/contact',
-              displayOrder: 5,
-              childItems: [] 
-            }
+            { id: '3', name: 'About', title: 'About', link: '/about', displayOrder: 3, childItems: [] },
+            { id: '4', name: 'Contact', title: 'Contact', link: '/contact', displayOrder: 4, childItems: [] }
           ]
         },
         {
           id: 'footer-menu',
           name: 'Footer Menu',
-          type: 'Footer Menu',  // Type field for filtering
+          type: 'Footer Menu',
           items: [
-            { id: '6', name: 'Privacy Policy', title: 'Privacy Policy', link: '/pages/privacy', url: '/pages/privacy', displayOrder: 1 },
-            { id: '7', name: 'Terms of Service', title: 'Terms of Service', link: '/pages/terms', url: '/pages/terms', displayOrder: 2 },
-            { id: '8', name: 'Shipping', title: 'Shipping', link: '/pages/shipping', url: '/pages/shipping', displayOrder: 3 },
-            { id: '9', name: 'Returns', title: 'Returns', link: '/pages/returns', url: '/pages/returns', displayOrder: 4 }
+            { id: '6', name: 'Privacy Policy', title: 'Privacy Policy', link: '/privacy', displayOrder: 1 },
+            { id: '7', name: 'Terms of Service', title: 'Terms of Service', link: '/terms', displayOrder: 2 },
+            { id: '8', name: 'Shipping', title: 'Shipping', link: '/shipping', displayOrder: 3 },
+            { id: '9', name: 'Returns', title: 'Returns', link: '/returns', displayOrder: 4 }
           ]
         }
       ];
-      
-      // Support both array format (for frontend) and object format (for backward compatibility)
-      if (req.query.format === 'object') {
-        res.json({ 
-          success: true,
-          data: { menus } 
-        });
-      } else {
-        res.json(menus);
-      }
+      res.json(menus);
     });
 
     this.app.get('/webstoreapi/menus/:menuId', (req, res) => {
@@ -329,60 +285,18 @@ class MockApiServer {
           name: 'Main Menu',
           type: 'Main Menu',
           items: [
-            { 
-              id: '1', 
-              name: 'Home', 
-              title: 'Home', 
-              link: '/', 
-              url: '/',
-              displayOrder: 1,
-              childItems: [] 
-            },
-            { 
-              id: '2', 
-              name: 'Products', 
-              title: 'Products', 
-              link: '/products', 
-              url: '/products',
-              displayOrder: 2,
+            { id: '1', name: 'Home', title: 'Home', link: '/', displayOrder: 1, childItems: [] },
+            {
+              id: '2', name: 'Products', title: 'Products', link: '/categories', displayOrder: 2,
               childItems: [
-                { id: '2-1', name: 'Electronics', title: 'Electronics', link: '/products?category=electronics', url: '/products?category=electronics', displayOrder: 1 },
-                { id: '2-2', name: 'Clothing', title: 'Clothing', link: '/products?category=clothing', url: '/products?category=clothing', displayOrder: 2 },
-                { id: '2-3', name: 'Accessories', title: 'Accessories', link: '/products?category=accessories', url: '/products?category=accessories', displayOrder: 3 },
-                { id: '2-4', name: 'Home & Garden', title: 'Home & Garden', link: '/products?category=home-garden', url: '/products?category=home-garden', displayOrder: 4 }
+                { id: '2-1', name: 'Electronics', title: 'Electronics', link: '/electronics', displayOrder: 1 },
+                { id: '2-2', name: 'Clothing', title: 'Clothing', link: '/clothing', displayOrder: 2 },
+                { id: '2-3', name: 'Accessories', title: 'Accessories', link: '/accessories', displayOrder: 3 },
+                { id: '2-4', name: 'Home & Garden', title: 'Home & Garden', link: '/home-and-garden', displayOrder: 4 }
               ]
             },
-            { 
-              id: '3', 
-              name: 'Collections', 
-              title: 'Collections', 
-              link: '/collections', 
-              url: '/collections',
-              displayOrder: 3,
-              childItems: [
-                { id: '3-1', name: 'New Arrivals', title: 'New Arrivals', link: '/collections/new-arrivals', url: '/collections/new-arrivals', displayOrder: 1 },
-                { id: '3-2', name: 'Best Sellers', title: 'Best Sellers', link: '/collections/best-sellers', url: '/collections/best-sellers', displayOrder: 2 },
-                { id: '3-3', name: 'On Sale', title: 'On Sale', link: '/collections/sale', url: '/collections/sale', displayOrder: 3 }
-              ]
-            },
-            { 
-              id: '4', 
-              name: 'About', 
-              title: 'About', 
-              link: '/page/about', 
-              url: '/page/about',
-              displayOrder: 4,
-              childItems: [] 
-            },
-            { 
-              id: '5', 
-              name: 'Contact', 
-              title: 'Contact', 
-              link: '/page/contact', 
-              url: '/page/contact',
-              displayOrder: 5,
-              childItems: [] 
-            }
+            { id: '3', name: 'About', title: 'About', link: '/about', displayOrder: 3, childItems: [] },
+            { id: '4', name: 'Contact', title: 'Contact', link: '/contact', displayOrder: 4, childItems: [] }
           ]
         },
         'footer-menu': {