create-brainerce-store 1.50.5 → 1.51.0

package/templates/nextjs/base/src/app/register/page.tsx

@@ -1,12 +1,12 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter, Link } from '@/lib/navigation';
-import { useAuth } from '@/providers/store-provider';
-import { proxyRegister } from '@/lib/auth';
+import { useRouter, Link } from '@/core/lib/navigation';
+import { useAuth } from '@/core/providers/store-provider';
+import { proxyRegister } from '@/core/lib/auth';
 import { RegisterForm } from '@/components/auth/register-form';
 import { OAuthButtons } from '@/components/auth/oauth-buttons';
-import { useTranslations } from '@/lib/translations';
+import { useTranslations } from '@/core/lib/translations';
 
 export default function RegisterPage() {
   const router = useRouter();

package/templates/nextjs/base/src/app/reset-password/page.tsx

@@ -1,11 +1,11 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter, Link } from '@/lib/navigation';
-import { proxyResetPassword } from '@/lib/auth';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { useTranslations } from '@/lib/translations';
-import { getPasswordError } from '@/lib/validation';
+import { useRouter, Link } from '@/core/lib/navigation';
+import { proxyResetPassword } from '@/core/lib/auth';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { useTranslations } from '@/core/lib/translations';
+import { getPasswordError } from '@/core/lib/validation';
 
 export default function ResetPasswordPage() {
   const router = useRouter();

package/templates/nextjs/base/src/app/sitemap.ts

@@ -1,5 +1,5 @@
 import type { MetadataRoute } from 'next';
-import { getServerClient } from '@/lib/brainerce';
+import { getServerClient } from '@/core/lib/brainerce';
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const baseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://example.com';

package/templates/nextjs/base/src/app/verify-email/page.tsx

@@ -1,11 +1,11 @@
 'use client';
 
 import { Suspense, useState, useRef, useEffect, useCallback } from 'react';
-import { useRouter, Link } from '@/lib/navigation';
-import { useAuth } from '@/providers/store-provider';
-import { proxyVerifyEmail, proxyResendVerification } from '@/lib/auth';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { useTranslations } from '@/lib/translations';
+import { useRouter, Link } from '@/core/lib/navigation';
+import { useAuth } from '@/core/providers/store-provider';
+import { proxyVerifyEmail, proxyResendVerification } from '@/core/lib/auth';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { useTranslations } from '@/core/lib/translations';
 
 const CODE_LENGTH = 6;
 const RESEND_COOLDOWN_SECONDS = 60;

package/templates/nextjs/base/src/components/account/address-book.tsx

@@ -2,9 +2,9 @@
 
 import { useState } from 'react';
 import type { CustomerAddress, CreateAddressDto } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { getClient } from '@/core/lib/brainerce';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface AddressBookProps {
   addresses: CustomerAddress[];

package/templates/nextjs/base/src/components/account/order-customizations.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { OrderItem } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 type Customizations = NonNullable<OrderItem['customizations']>;
 type CustomizationEntry = Customizations[string];

package/templates/nextjs/base/src/components/account/order-history.tsx

@@ -1,13 +1,13 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { Order, OrderStatus, OrderDownloadLink } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useCurrency } from '@/lib/use-currency';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { getClient } from '@/core/lib/brainerce';
+import { useCurrency } from '@/core/lib/use-currency';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 import { OrderCustomizations } from './order-customizations';
 import { OrderStatusTimeline } from './order-status-timeline';
 import { OrderShippingBlock } from './order-shipping-block';
@@ -207,6 +207,14 @@ function OrderCard({ order }: { order: Order }) {
           <OrderShippingBlock order={order} />
           <OrderPaymentBlock order={order} />
 
+          {/* The shopper's own checkout note, read-only */}
+          {order.notes && (
+            <div className="border-border border-t pt-2">
+              <p className="text-foreground text-sm font-medium">{t('orderNotes')}</p>
+              <p className="text-muted-foreground text-sm whitespace-pre-wrap">{order.notes}</p>
+            </div>
+          )}
+
           {/* Downloads section */}
           {order.hasDownloads && <OrderDownloads orderId={order.id} />}
 

package/templates/nextjs/base/src/components/account/order-payment-block.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import type { Order } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface OrderPaymentBlockProps {
   order: Order;

package/templates/nextjs/base/src/components/account/order-shipping-block.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import type { Order } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface OrderShippingBlockProps {
   order: Order;

package/templates/nextjs/base/src/components/account/order-status-timeline.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import type { Order, OrderStatus } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 const STATUS_KEYS: Record<
   OrderStatus,

package/templates/nextjs/base/src/components/account/profile-section.tsx

@@ -2,9 +2,9 @@
 
 import { useState } from 'react';
 import type { CustomerProfile } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { getClient } from '@/core/lib/brainerce';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface ProfileSectionProps {
   profile: CustomerProfile;

package/templates/nextjs/base/src/components/auth/login-form.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useState } from 'react';
-import { Link } from '@/lib/navigation';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
+import { Link } from '@/core/lib/navigation';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
 
 interface LoginFormProps {
   onSubmit: (email: string, password: string) => Promise<void>;

package/templates/nextjs/base/src/components/auth/oauth-buttons.tsx

@@ -2,10 +2,10 @@
 
 import { useState, useEffect } from 'react';
 import type { CustomerOAuthProvider } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
+import { getClient } from '@/core/lib/brainerce';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
 
 const PROVIDER_CONFIG: Record<CustomerOAuthProvider, { labelKey: string; icon: React.ReactNode }> =
   {

package/templates/nextjs/base/src/components/auth/register-form.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useState, useMemo } from 'react';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { getPasswordError } from '@/lib/validation';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { getPasswordError } from '@/core/lib/validation';
 
 interface RegisterData {
   firstName: string;

package/templates/nextjs/base/src/components/brainerce-bot.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useRef } from 'react';
 
-import { useCart } from '@/providers/store-provider';
+import { useCart } from '@/core/providers/store-provider';
 
 /**
  * Mounts the Brainerce AI chat widget (the store's shopping assistant).
@@ -36,7 +36,7 @@ export function BrainerceBotWidget() {
         baseUrl: process.env.NEXT_PUBLIC_BRAINERCE_API_URL || undefined,
         onAddToCart: async ({ productId, variantId, quantity }) => {
           try {
-            const { getClient } = await import('@/lib/brainerce');
+            const { getClient } = await import('@/core/lib/brainerce');
             await getClient().smartAddToCart({
               productId,
               variantId: variantId ?? undefined,

package/templates/nextjs/base/src/components/checkout/checkout-form.tsx

@@ -2,9 +2,9 @@
 
 import { useState, useEffect, useRef } from 'react';
 import type { SetShippingAddressDto, ShippingDestinations } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
-import { isValidEmail } from '@/lib/validation';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
+import { isValidEmail } from '@/core/lib/validation';
 
 interface CheckoutConsent {
   acceptsMarketing: boolean;
@@ -41,6 +41,7 @@ export function CheckoutForm({
     postalCode: initialValues?.postalCode || '',
     country: initialValues?.country || '',
     phone: initialValues?.phone || '',
+    notes: initialValues?.notes || '',
   });
   const [errors, setErrors] = useState<Record<string, string>>({});
   const [privacyAccepted, setPrivacyAccepted] = useState(false);
@@ -65,6 +66,7 @@ export function CheckoutForm({
       postalCode: initialValues.postalCode || prev.postalCode,
       country: initialValues.country || prev.country,
       phone: initialValues.phone || prev.phone || '',
+      notes: prev.notes || '',
     }));
   }, [initialValues]);
 
@@ -346,6 +348,25 @@ export function CheckoutForm({
         </>
       )}
 
+      {/* Order notes (optional) */}
+      <div>
+        <label htmlFor="orderNotes" className="text-foreground mb-1 block text-sm font-medium">
+          {t('orderNotes')}
+        </label>
+        <textarea
+          id="orderNotes"
+          value={formData.notes || ''}
+          onChange={(e) => updateField('notes', e.target.value)}
+          maxLength={2000}
+          rows={3}
+          className={cn(
+            inputClass,
+            'border-border h-auto min-h-[80px] resize-y py-2 leading-relaxed'
+          )}
+          placeholder={t('orderNotesPlaceholder')}
+        />
+      </div>
+
       {/* Privacy Policy (required) */}
       <div>
         <label className="flex cursor-pointer items-start gap-2">

package/templates/nextjs/base/src/components/checkout/custom-fields-step.tsx

@@ -2,8 +2,8 @@
 
 import { useState } from 'react';
 import type { CheckoutCustomFieldDefinition } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { cn } from '@/core/lib/utils';
 
 interface CustomFieldsStepProps {
   fields: CheckoutCustomFieldDefinition[];

package/templates/nextjs/base/src/components/checkout/delivery-method-step.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 DeliveryMethodStepProps {
   onSelect: (method: 'shipping' | 'pickup') => void;

package/templates/nextjs/base/src/components/checkout/order-bump-card.tsx

@@ -1,12 +1,12 @@
 'use client';
 
 import { useState, useMemo } from 'react';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { OrderBump, RecommendationVariant } from 'brainerce';
 import { formatPrice, getVariantOptions } 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 OrderBumpCardProps {
   bump: OrderBump;

package/templates/nextjs/base/src/components/checkout/payment-step.tsx

@@ -3,12 +3,12 @@
 import { useEffect, useState, useRef, useCallback, type CSSProperties } from 'react';
 import type { PaymentIntent, PaymentClientSdk } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useTranslations } from '@/lib/translations';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { useStoreInfo } from '@/providers/store-provider';
-import { cn } from '@/lib/utils';
-import { isAllowedPaymentUrl, isValidCheckoutId, safePaymentRedirect } from '@/lib/safe-redirect';
+import { getClient } from '@/core/lib/brainerce';
+import { useTranslations } from '@/core/lib/translations';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { useStoreInfo } from '@/core/providers/store-provider';
+import { cn } from '@/core/lib/utils';
+import { isAllowedPaymentUrl, isValidCheckoutId, safePaymentRedirect } from '@/core/lib/safe-redirect';
 
 /**
  * Backward-compat defaults when backend doesn't return clientSdk.

package/templates/nextjs/base/src/components/checkout/pickup-step.tsx

@@ -3,9 +3,9 @@
 import { useState } from 'react';
 import type { PickupLocation } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCurrency } from '@/lib/use-currency';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { useCurrency } from '@/core/lib/use-currency';
+import { cn } from '@/core/lib/utils';
 
 interface PickupStepProps {
   locations: PickupLocation[];

package/templates/nextjs/base/src/components/checkout/shipping-step.tsx

@@ -2,9 +2,9 @@
 
 import type { ShippingRate } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCurrency } from '@/lib/use-currency';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { useCurrency } from '@/core/lib/use-currency';
+import { cn } from '@/core/lib/utils';
 
 interface ShippingStepProps {
   rates: ShippingRate[];

package/templates/nextjs/base/src/components/checkout/tax-display.tsx

@@ -2,9 +2,9 @@
 
 import type { TaxBreakdown } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCurrency } from '@/lib/use-currency';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { useCurrency } from '@/core/lib/use-currency';
+import { cn } from '@/core/lib/utils';
 
 interface TaxDisplayProps {
   /** Whether shipping address has been set */

package/templates/nextjs/base/src/components/seo/organization-json-ld.tsx

@@ -1,6 +1,6 @@
 import type { StoreInfo } from 'brainerce';
-import { getNonce } from '@/lib/nonce';
-import { stripHtmlForSeo } from '@/lib/seo';
+import { getNonce } from '@/core/lib/nonce';
+import { stripHtmlForSeo } from '@/core/lib/seo';
 
 interface OrganizationJsonLdProps {
   storeInfo: StoreInfo;

package/templates/nextjs/base/src/components/seo/product-json-ld.tsx

@@ -1,8 +1,8 @@
 import type { Product } from 'brainerce';
 import { getProductPriceInfo } from 'brainerce';
-import { getNonce } from '@/lib/nonce';
-import { resolveCurrency } from '@/lib/resolve-currency';
-import { stripHtmlForSeo } from '@/lib/seo';
+import { getNonce } from '@/core/lib/nonce';
+import { resolveCurrency } from '@/core/lib/resolve-currency';
+import { stripHtmlForSeo } from '@/core/lib/seo';
 
 interface ProductJsonLdProps {
   product: Product;

package/templates/nextjs/base/src/core/hooks/use-cart-page.ts

@@ -0,0 +1,58 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import type {
+  Cart,
+  CartRecommendationsResponse,
+  CartUpgradesResponse,
+  CartBundlesResponse,
+} from 'brainerce';
+import { getClient } from '@/core/lib/brainerce';
+import { useCart } from '@/core/providers/store-provider';
+
+export interface UseCartPageResult {
+  cart: Cart | null;
+  cartLoading: boolean;
+  refreshCart: () => Promise<void>;
+  itemCount: number;
+  /** Cross-sell recommendations for the current cart contents. */
+  cartRecs: CartRecommendationsResponse | null;
+  /** Per-item upgrade suggestions keyed by productId. */
+  upgrades: CartUpgradesResponse | null;
+  /** Bundle offers matching the current cart. */
+  bundles: CartBundlesResponse | null;
+}
+
+/**
+ * Cart-page behavior: the shared cart state (from StoreProvider) plus the
+ * enrichment fetch (recommendations / upgrades / bundles) that runs whenever
+ * the cart contents change. Pure data/behavior — rendering lives in
+ * `ui/cart/cart-view.tsx`.
+ */
+export function useCartPage(): UseCartPageResult {
+  const { cart, cartLoading, refreshCart, itemCount } = useCart();
+  const [cartRecs, setCartRecs] = useState<CartRecommendationsResponse | null>(null);
+  const [upgrades, setUpgrades] = useState<CartUpgradesResponse | null>(null);
+  const [bundles, setBundles] = useState<CartBundlesResponse | null>(null);
+
+  // Load recommendations, upgrades, and bundles in a single request
+  useEffect(() => {
+    if (!cart?.id || cart.items.length === 0) {
+      setCartRecs(null);
+      setUpgrades(null);
+      setBundles(null);
+      return;
+    }
+    const client = getClient();
+    client
+      .getCart(cart.id, { include: ['recommendations', 'upgrades', 'bundles'] })
+      .then((enriched) => {
+        setCartRecs(enriched.recommendations ?? null);
+        setUpgrades(enriched.upgrades ?? null);
+        setBundles(enriched.bundles ?? null);
+      })
+      .catch(() => {});
+  }, [cart?.id, cart?.items.length]);
+
+  return { cart, cartLoading, refreshCart, itemCount, cartRecs, upgrades, bundles };
+}

package/templates/nextjs/base/src/core/hooks/use-home-data.ts

@@ -0,0 +1,51 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import type { Product, DiscountBanner } from 'brainerce';
+import { getClient } from '@/core/lib/brainerce';
+
+export interface UseHomeDataResult {
+  /** Newest products for the featured grid (max 8). */
+  products: Product[];
+  /** Active store-wide discount banners. */
+  banners: DiscountBanner[];
+  /** True while the initial fetch is in flight. */
+  loading: boolean;
+}
+
+/**
+ * Homepage data: featured products + discount banners.
+ * Pure data/behavior — rendering lives in `ui/home/`.
+ */
+export function useHomeData(): UseHomeDataResult {
+  const [products, setProducts] = useState<Product[]>([]);
+  const [banners, setBanners] = useState<DiscountBanner[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    async function load() {
+      try {
+        const client = getClient();
+        const [productsRes, bannersRes] = await Promise.allSettled([
+          client.getProducts({ limit: 8, sortBy: 'createdAt', sortOrder: 'desc' }),
+          client.getDiscountBanners(),
+        ]);
+
+        if (productsRes.status === 'fulfilled') {
+          setProducts(productsRes.value.data);
+        }
+        if (bannersRes.status === 'fulfilled') {
+          setBanners(bannersRes.value);
+        }
+      } catch (err) {
+        console.error('Failed to load home page data:', err);
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    load();
+  }, []);
+
+  return { products, banners, loading };
+}