create-brainerce-store 1.50.5 → 1.51.0

package/templates/nextjs/base/src/ui/product/product-listing.tsx

@@ -0,0 +1,429 @@
+'use client';
+
+import { useEffect, useState, useRef } from 'react';
+import {
+  useProductListing,
+  sortOptions,
+  isActiveInTree,
+  type CategoryNode,
+} from '@/core/hooks/use-product-listing';
+import { ProductGrid } from '@/ui/product/product-grid';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
+
+/** Chevron down SVG */
+function ChevronDown({ className }: { className?: string }) {
+  return (
+    <svg
+      className={className}
+      width="12"
+      height="12"
+      viewBox="0 0 12 12"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <path d="M3 4.5L6 7.5L9 4.5" />
+    </svg>
+  );
+}
+
+/** Recursive dropdown items for nested categories */
+function CategoryDropdownItems({
+  items,
+  depth,
+  selectedId,
+  onSelect,
+}: {
+  items: CategoryNode[];
+  depth: number;
+  selectedId: string;
+  onSelect: (id: string) => void;
+}) {
+  return (
+    <>
+      {items.map((child) => (
+        <div key={child.id}>
+          <button
+            onClick={() => onSelect(child.id)}
+            className={cn(
+              'hover:bg-muted w-full px-4 py-2 text-start text-sm transition-colors',
+              selectedId === child.id && 'bg-primary/10 text-primary font-medium'
+            )}
+            style={{ paddingInlineStart: `${(depth + 1) * 16}px` }}
+          >
+            {child.name}
+          </button>
+          {child.children.length > 0 && (
+            <CategoryDropdownItems
+              items={child.children}
+              depth={depth + 1}
+              selectedId={selectedId}
+              onSelect={onSelect}
+            />
+          )}
+        </div>
+      ))}
+    </>
+  );
+}
+
+/** Category chip with dropdown for subcategories */
+function CategoryChip({
+  category,
+  selectedId,
+  onSelect,
+  tc,
+}: {
+  category: CategoryNode;
+  selectedId: string;
+  onSelect: (id: string) => void;
+  tc: (key: string) => string;
+}) {
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+  const hasChildren = category.children.length > 0;
+  const isActive = isActiveInTree(category, selectedId);
+
+  // Find the display name for the selected subcategory
+  function findName(nodes: CategoryNode[], id: string): string | null {
+    for (const n of nodes) {
+      if (n.id === id) return n.name;
+      const found = findName(n.children, id);
+      if (found) return found;
+    }
+    return null;
+  }
+
+  const selectedChildName =
+    isActive && selectedId !== category.id ? findName(category.children, selectedId) : null;
+
+  // Close dropdown on outside click
+  useEffect(() => {
+    if (!open) return;
+    function handleClick(e: MouseEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    }
+    document.addEventListener('mousedown', handleClick);
+    return () => document.removeEventListener('mousedown', handleClick);
+  }, [open]);
+
+  if (!hasChildren) {
+    return (
+      <button
+        onClick={() => onSelect(category.id)}
+        className={cn(
+          'rounded-full border px-3 py-1.5 text-sm transition-colors',
+          selectedId === category.id
+            ? 'bg-primary text-primary-foreground border-primary'
+            : 'border-border text-muted-foreground hover:border-primary hover:text-foreground'
+        )}
+      >
+        {category.name}
+      </button>
+    );
+  }
+
+  return (
+    <div ref={ref} className="relative">
+      <button
+        onClick={() => setOpen((prev) => !prev)}
+        className={cn(
+          'inline-flex items-center gap-1 rounded-full border px-3 py-1.5 text-sm transition-colors',
+          isActive
+            ? 'bg-primary text-primary-foreground border-primary'
+            : 'border-border text-muted-foreground hover:border-primary hover:text-foreground'
+        )}
+      >
+        {category.name}
+        {selectedChildName && (
+          <span className="opacity-80">
+            {'·'} {selectedChildName}
+          </span>
+        )}
+        <ChevronDown className={cn('ms-0.5 transition-transform', open && 'rotate-180')} />
+      </button>
+
+      {open && (
+        <div className="bg-background border-border absolute start-0 top-full z-50 mt-1 min-w-[180px] overflow-hidden rounded-lg border shadow-lg">
+          {/* "All in [category]" option */}
+          <button
+            onClick={() => {
+              onSelect(category.id);
+              setOpen(false);
+            }}
+            className={cn(
+              'hover:bg-muted w-full px-4 py-2 text-start text-sm font-medium transition-colors',
+              selectedId === category.id && 'bg-primary/10 text-primary'
+            )}
+          >
+            {tc('all')} {category.name}
+          </button>
+          <div className="bg-border mx-2 h-px" />
+          {/* Recursive children */}
+          <div onClick={() => setOpen(false)}>
+            <CategoryDropdownItems
+              items={category.children}
+              depth={0}
+              selectedId={selectedId}
+              onSelect={onSelect}
+            />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+/**
+ * Product listing page (filters + sort + grid + load-more). All data and
+ * URL-state behavior comes from `useProductListing`; this component is
+ * presentation only. Must be rendered inside `<Suspense>` (URL params).
+ */
+export function ProductListing() {
+  const t = useTranslations('products');
+  const tc = useTranslations('common');
+
+  const {
+    products,
+    loading,
+    loadingMore,
+    page,
+    totalPages,
+    total,
+    categories,
+    brands,
+    tags,
+    metafieldDefs,
+    searchQuery,
+    categoryId,
+    brandId,
+    tagId,
+    sortIndex,
+    handleLoadMore,
+    updateParam,
+    handleCategorySelect,
+    getSelectedMetafieldValues,
+    setMetafieldValue,
+  } = useProductListing();
+
+  return (
+    <div className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
+      {/* Page Header */}
+      <div className="mb-8">
+        <h1 className="text-foreground text-3xl font-bold">
+          {searchQuery ? `${t('searchPrefix')} "${searchQuery}"` : t('allProducts')}
+        </h1>
+        {!loading && (
+          <p className="text-muted-foreground mt-1 text-sm">
+            {total} {total === 1 ? tc('product') : tc('products')} {tc('found')}
+          </p>
+        )}
+      </div>
+
+      {/* Filters and Sort */}
+      <div className="mb-6 flex flex-col gap-4">
+        {/* Category Filter */}
+        {categories.length > 0 && (
+          <div className="flex flex-wrap gap-2">
+            <button
+              onClick={() => updateParam('category', '')}
+              className={cn(
+                'rounded-full border px-3 py-1.5 text-sm transition-colors',
+                !categoryId
+                  ? 'bg-primary text-primary-foreground border-primary'
+                  : 'border-border text-muted-foreground hover:border-primary hover:text-foreground'
+              )}
+            >
+              {tc('all')}
+            </button>
+            {categories.map((cat) => (
+              <CategoryChip
+                key={cat.id}
+                category={cat}
+                selectedId={categoryId}
+                onSelect={handleCategorySelect}
+                tc={tc as (key: string) => string}
+              />
+            ))}
+          </div>
+        )}
+
+        {/* Brand, Tag & Sort row */}
+        <div className="flex flex-wrap items-center gap-3">
+          {/* Brand Filter */}
+          {brands.length > 0 && (
+            <select
+              value={brandId}
+              onChange={(e) => updateParam('brand', e.target.value)}
+              className="border-border bg-background text-foreground focus:ring-primary/20 focus:border-primary h-9 rounded border px-3 text-sm focus:outline-none focus:ring-2"
+            >
+              <option value="">{t('allBrands')}</option>
+              {brands.map((b) => (
+                <option key={b.id} value={b.id}>
+                  {b.name}
+                </option>
+              ))}
+            </select>
+          )}
+
+          {/* Tag Filter */}
+          {tags.length > 0 && (
+            <select
+              value={tagId}
+              onChange={(e) => updateParam('tag', e.target.value)}
+              className="border-border bg-background text-foreground focus:ring-primary/20 focus:border-primary h-9 rounded border px-3 text-sm focus:outline-none focus:ring-2"
+            >
+              <option value="">{t('allTags')}</option>
+              {tags.map((tg) => (
+                <option key={tg.id} value={tg.id}>
+                  {tg.name}
+                </option>
+              ))}
+            </select>
+          )}
+
+          {/* Custom-field (metafield) facets — rendered per definition type.
+              Only definitions flagged `filterable: true` and published to
+              this sales channel reach this list (see `metafieldDefs` filter
+              in the hook). The merchant's display name (`def.name`) is shown
+              as-is — `enumValues` come from the merchant's dashboard config. */}
+          {metafieldDefs.map((def) => {
+            const selected = getSelectedMetafieldValues(def.key);
+
+            if (def.type === 'BOOLEAN') {
+              const isOn = selected.includes('true');
+              return (
+                <label
+                  key={def.id}
+                  className="border-border text-foreground hover:border-primary inline-flex h-9 cursor-pointer items-center gap-2 rounded border px-3 text-sm transition-colors"
+                >
+                  <input
+                    type="checkbox"
+                    checked={isOn}
+                    onChange={(e) => setMetafieldValue(def.key, e.target.checked ? ['true'] : [])}
+                    className="accent-primary h-4 w-4"
+                  />
+                  {def.name}
+                </label>
+              );
+            }
+
+            if (def.type === 'SELECT') {
+              return (
+                <select
+                  key={def.id}
+                  value={selected[0] || ''}
+                  onChange={(e) =>
+                    setMetafieldValue(def.key, e.target.value ? [e.target.value] : [])
+                  }
+                  aria-label={def.name}
+                  className="border-border bg-background text-foreground focus:ring-primary/20 focus:border-primary h-9 rounded border px-3 text-sm focus:outline-none focus:ring-2"
+                >
+                  <option value="">{`${tc('all')} ${def.name}`}</option>
+                  {(def.enumValues || []).map((v) => (
+                    <option key={v.value} value={v.value}>
+                      {v.label || v.value}
+                    </option>
+                  ))}
+                </select>
+              );
+            }
+
+            // MULTI_SELECT — chip toggles. Each click adds/removes one value.
+            return (
+              <div
+                key={def.id}
+                className="border-border inline-flex items-center gap-1 rounded border px-2 py-1"
+                aria-label={def.name}
+              >
+                <span className="text-muted-foreground px-1 text-xs">{def.name}:</span>
+                {(def.enumValues || []).map((v) => {
+                  const active = selected.includes(v.value);
+                  return (
+                    <button
+                      key={v.value}
+                      type="button"
+                      onClick={() =>
+                        setMetafieldValue(
+                          def.key,
+                          active ? selected.filter((s) => s !== v.value) : [...selected, v.value]
+                        )
+                      }
+                      className={cn(
+                        'rounded-full border px-2 py-0.5 text-xs transition-colors',
+                        active
+                          ? 'bg-primary text-primary-foreground border-primary'
+                          : 'border-border text-muted-foreground hover:border-primary hover:text-foreground'
+                      )}
+                    >
+                      {v.label || v.value}
+                    </button>
+                  );
+                })}
+              </div>
+            );
+          })}
+
+          {/* Sort */}
+          <div className="flex items-center gap-2 sm:ms-auto">
+            <label htmlFor="sort" className="text-muted-foreground whitespace-nowrap text-sm">
+              {tc('sortBy')}
+            </label>
+            <select
+              id="sort"
+              value={sortIndex}
+              onChange={(e) => updateParam('sort', e.target.value)}
+              className="border-border bg-background text-foreground focus:ring-primary/20 focus:border-primary h-9 rounded border px-3 text-sm focus:outline-none focus:ring-2"
+            >
+              {sortOptions.map((opt, idx) => (
+                <option key={idx} value={idx}>
+                  {t(opt.labelKey)}
+                </option>
+              ))}
+            </select>
+          </div>
+        </div>
+      </div>
+
+      {/* Products Grid */}
+      {loading ? (
+        <div className="flex items-center justify-center py-20">
+          <LoadingSpinner size="lg" />
+        </div>
+      ) : (
+        <>
+          <ProductGrid products={products} />
+
+          {/* Load More */}
+          {page < totalPages && (
+            <div className="mt-10 flex justify-center">
+              <button
+                onClick={handleLoadMore}
+                disabled={loadingMore}
+                className="bg-primary text-primary-foreground inline-flex items-center gap-2 rounded px-6 py-2.5 font-medium transition-opacity hover:opacity-90 disabled:opacity-50"
+              >
+                {loadingMore ? (
+                  <>
+                    <LoadingSpinner
+                      size="sm"
+                      className="border-primary-foreground/30 border-t-primary-foreground"
+                    />
+                    {tc('loading')}
+                  </>
+                ) : (
+                  t('loadMore')
+                )}
+              </button>
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}

package/templates/nextjs/base/src/{components/products → ui/product}/recommendation-section.tsx

@@ -1,11 +1,11 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { Link } from '@/lib/navigation';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { Link } from '@/core/lib/navigation';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { ProductRecommendation } from 'brainerce';
-import { PriceDisplay } from '@/components/shared/price-display';
-import { cn } from '@/lib/utils';
+import { PriceDisplay } from '@/ui/product/price-display';
+import { cn } from '@/core/lib/utils';
 
 interface RecommendationCardProps {
   item: ProductRecommendation;

package/templates/nextjs/base/src/{components/reviews → ui/product}/review-form.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { getClient } from '@/lib/brainerce';
-import { checkAuthStatus } from '@/lib/auth';
+import { getClient } from '@/core/lib/brainerce';
+import { checkAuthStatus } from '@/core/lib/auth';
 import type { MyProductReview, ProductReview } from 'brainerce';
 
 interface ReviewFormProps {

package/templates/nextjs/base/src/{components/reviews → ui/product}/reviews-section.tsx

@@ -1,5 +1,5 @@
 import type { ProductReview } from 'brainerce';
-import { getServerClient } from '@/lib/brainerce';
+import { getServerClient } from '@/core/lib/brainerce';
 import { ReviewForm } from './review-form';
 
 interface ReviewsSectionProps {

package/templates/nextjs/base/src/{components/products → ui/product}/stock-badge.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import type { InventoryInfo } from 'brainerce';
-import { cn } from '@/lib/utils';
-import { useTranslations } from '@/lib/translations';
+import { cn } from '@/core/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
 
 interface StockBadgeProps {
   inventory: InventoryInfo | null | undefined;

package/templates/nextjs/base/src/{components/products → ui/product}/variant-selector.tsx

@@ -4,9 +4,9 @@ import { useMemo } from 'react';
 import type { Product, ProductVariant } from 'brainerce';
 import { getVariantOptions, getProductSwatches, formatPrice } from 'brainerce';
 import type { InventoryInfo } from 'brainerce';
-import { useCurrency } from '@/lib/use-currency';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useCurrency } from '@/core/lib/use-currency';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface VariantSelectorProps {
   product: Product;

package/templates/nextjs/base/src/{components → ui}/shared/cdn-image.tsx

@@ -1,5 +1,5 @@
 import Image, { type ImageProps } from 'next/image';
-import { OPTIMIZED_IMAGE_HOSTS } from '@/lib/image-hosts';
+import { OPTIMIZED_IMAGE_HOSTS } from '@/core/lib/image-hosts';
 
 const OPTIMIZED_HOSTS = new Set(OPTIMIZED_IMAGE_HOSTS);
 

package/templates/nextjs/base/src/{components → ui}/shared/loading-spinner.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface LoadingSpinnerProps {
   size?: 'sm' | 'md' | 'lg';

package/templates/nextjs/base/tailwind.config.ts

@@ -18,6 +18,18 @@ const config: Config = {
         'destructive-foreground': 'hsl(var(--destructive-foreground))',
         accent: 'hsl(var(--accent))',
         'accent-foreground': 'hsl(var(--accent-foreground))',
+        // Extended tokens used by design packs (defined in their globals.css).
+        // Harmless when a design doesn't set the CSS variables — the classes
+        // simply aren't used by the base ui.
+        surface: 'hsl(var(--surface))',
+        plinth: 'hsl(var(--plinth))',
+      },
+      fontFamily: {
+        // Design packs set --font-sans / --font-serif via next/font variables
+        // in app/layout.tsx; the fallbacks keep font-sans/font-serif usable
+        // even when a layout doesn't define them.
+        sans: ['var(--font-sans)', 'ui-sans-serif', 'system-ui', 'sans-serif'],
+        serif: ['var(--font-serif)', 'ui-serif', 'Georgia', 'serif'],
       },
       borderRadius: {
         DEFAULT: 'var(--radius)',