create-brainerce-store 1.68.0 → 1.72.0

package/templates/nextjs/base/src/ui/product/review-form.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { Star } from 'lucide-react';
+import { Star, X } from 'lucide-react';
 import { getClient } from '@/core/lib/brainerce';
 import { checkAuthStatus } from '@/core/lib/auth';
 import { Link } from '@/core/lib/navigation';
@@ -9,18 +9,28 @@ import { useTranslations } from '@/core/lib/translations';
 import { Button } from '@/components/ui/button';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
-import type { MyProductReview, ProductReview } from 'brainerce';
+import type { MyProductReview, ProductReview, ReviewPhotoUpload } from 'brainerce';
 
 interface ReviewFormProps {
   productId: string;
 }
 
+type PhotoPolicy = MyProductReview['photos'];
+
 type Stage =
   | { kind: 'loading' }
   | { kind: 'signed_out' }
   | { kind: 'not_eligible'; reason: MyProductReview['reason'] }
-  | { kind: 'submit' }
-  | { kind: 'edit'; review: ProductReview };
+  | { kind: 'submit'; photos: PhotoPolicy }
+  // `existingPhotos` comes from myImages, which INCLUDES photos still awaiting
+  // the merchant — so a customer editing their review sees the one they already
+  // uploaded instead of a form that looks like it lost it.
+  | {
+      kind: 'edit';
+      review: ProductReview;
+      photos: PhotoPolicy;
+      existingPhotos: ReviewPhotoUpload[];
+    };
 
 /**
  * Single component that decides which UI to render for a customer on a PDP:
@@ -50,11 +60,17 @@ export function ReviewForm({ productId }: ReviewFormProps) {
           setStage({ kind: 'not_eligible', reason: me.reason });
           return;
         }
+        const existingPhotos: ReviewPhotoUpload[] = me.myImages.map((img) => ({
+          key: img.assetKey,
+          url: img.thumbnailUrl ?? img.url,
+          width: img.width,
+          height: img.height,
+        }));
         if (me.myReview) {
-          setStage({ kind: 'edit', review: me.myReview });
+          setStage({ kind: 'edit', review: me.myReview, photos: me.photos, existingPhotos });
           return;
         }
-        setStage({ kind: 'submit' });
+        setStage({ kind: 'submit', photos: me.photos });
       } catch {
         if (!cancelled) setStage({ kind: 'not_eligible', reason: 'product_not_found' });
       }
@@ -91,12 +107,14 @@ export function ReviewForm({ productId }: ReviewFormProps) {
       <EditReviewBlock
         productId={productId}
         initial={stage.review}
-        onDeleted={() => setStage({ kind: 'submit' })}
+        photos={stage.photos}
+        existingPhotos={stage.existingPhotos}
+        onDeleted={() => setStage({ kind: 'submit', photos: stage.photos })}
       />
     );
   }
 
-  return <SubmitReviewBlock productId={productId} />;
+  return <SubmitReviewBlock productId={productId} photos={stage.photos} />;
 }
 
 function NotEligibleMessage({ reason }: { reason: MyProductReview['reason'] }) {
@@ -119,17 +137,30 @@ function NotEligibleMessage({ reason }: { reason: MyProductReview['reason'] }) {
   );
 }
 
-function SubmitReviewBlock({ productId }: { productId: string }) {
-  return <ReviewEditor productId={productId} mode="create" initialRating={5} initialBody="" />;
+function SubmitReviewBlock({ productId, photos }: { productId: string; photos: PhotoPolicy }) {
+  return (
+    <ReviewEditor
+      productId={productId}
+      mode="create"
+      initialRating={5}
+      initialBody=""
+      photos={photos}
+      initialPhotos={[]}
+    />
+  );
 }
 
 function EditReviewBlock({
   productId,
   initial,
+  photos,
+  existingPhotos,
   onDeleted,
 }: {
   productId: string;
   initial: ProductReview;
+  photos: PhotoPolicy;
+  existingPhotos: ReviewPhotoUpload[];
   onDeleted: () => void;
 }) {
   const [deleting, setDeleting] = useState(false);
@@ -158,6 +189,8 @@ function EditReviewBlock({
         mode="edit"
         initialRating={initial.rating}
         initialBody={initial.body ?? ''}
+        photos={photos}
+        initialPhotos={existingPhotos}
       />
       <div className="flex items-center justify-between rounded-md border border-red-100 bg-red-50/50 p-3">
         <p className="text-xs text-red-700">{t('startOver')}</p>
@@ -189,11 +222,15 @@ function ReviewEditor({
   mode,
   initialRating,
   initialBody,
+  photos,
+  initialPhotos,
 }: {
   productId: string;
   mode: 'create' | 'edit';
   initialRating: number;
   initialBody: string;
+  photos: PhotoPolicy;
+  initialPhotos: ReviewPhotoUpload[];
 }) {
   const [rating, setRating] = useState(initialRating);
   const t = useTranslations('reviews');
@@ -201,6 +238,34 @@ function ReviewEditor({
   const [submitting, setSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [success, setSuccess] = useState(false);
+  const [uploads, setUploads] = useState<ReviewPhotoUpload[]>(initialPhotos);
+  const [uploading, setUploading] = useState(false);
+  const roomLeft = photos.maxPerReview - uploads.length;
+
+  async function handleFiles(event: React.ChangeEvent<HTMLInputElement>) {
+    const picked = Array.from(event.target.files ?? []);
+    // Reset the input so picking the same file twice still fires a change event.
+    event.target.value = '';
+    if (picked.length === 0) return;
+
+    const tooBig = picked.some((file) => file.size > photos.maxBytes);
+    const accepted = picked.filter((file) => file.size <= photos.maxBytes).slice(0, roomLeft);
+    if (tooBig) setError(t('photoTooLarge'));
+
+    if (accepted.length === 0) return;
+    setUploading(true);
+    try {
+      const done = await Promise.all(
+        accepted.map((file) => getClient().uploadReviewPhoto(productId, file))
+      );
+      setUploads((prev) => [...prev, ...done]);
+      if (!tooBig) setError(null);
+    } catch {
+      setError(t('photoUploadFailed'));
+    } finally {
+      setUploading(false);
+    }
+  }
 
   async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
@@ -208,7 +273,13 @@ function ReviewEditor({
     setSubmitting(true);
     try {
       const client = getClient();
-      const input = { rating, body: body.trim() || undefined };
+      // imageKeys REPLACES the photo set, so send every key we still want. Keys,
+      // never urls — the url on an upload is only good for the local preview.
+      const input = {
+        rating,
+        body: body.trim() || undefined,
+        ...(photos.enabled ? { imageKeys: uploads.map((upload) => upload.key) } : {}),
+      };
       if (mode === 'edit') {
         await client.updateMyProductReview(productId, input);
       } else {
@@ -274,13 +345,66 @@ function ReviewEditor({
         />
       </Label>
 
+      {photos.enabled && (
+        <fieldset className="space-y-2">
+          <legend className="text-sm">
+            {t('addPhotos')}{' '}
+            <span className="text-muted-foreground text-xs">
+              ({uploads.length}/{photos.maxPerReview})
+            </span>
+          </legend>
+
+          {uploads.length > 0 && (
+            <ul className="flex flex-wrap gap-2">
+              {uploads.map((upload) => (
+                <li key={upload.key} className="relative">
+                  <img
+                    src={upload.url}
+                    alt=""
+                    width={upload.width ?? undefined}
+                    height={upload.height ?? undefined}
+                    className="h-20 w-20 rounded border object-cover"
+                  />
+                  <button
+                    type="button"
+                    onClick={() =>
+                      setUploads((prev) => prev.filter((item) => item.key !== upload.key))
+                    }
+                    aria-label={t('removePhoto')}
+                    className="rounded-bs-none rounded-be absolute end-0 top-0 bg-black/60 px-1 text-xs text-white"
+                  >
+                    <X className="h-3 w-3" aria-hidden="true" />
+                  </button>
+                </li>
+              ))}
+            </ul>
+          )}
+
+          <input
+            type="file"
+            accept="image/jpeg,image/png,image/webp,image/gif"
+            multiple
+            disabled={uploading || roomLeft <= 0}
+            onChange={handleFiles}
+            className="block text-sm"
+          />
+
+          {uploading && <p className="text-muted-foreground text-xs">{t('photoUploading')}</p>}
+          {/* Say it BEFORE they submit. A shopper who uploads a photo, submits, and
+              then cannot see it will conclude the site is broken. */}
+          {photos.requiresApproval && (
+            <p className="text-muted-foreground text-xs">{t('photosNeedApproval')}</p>
+          )}
+        </fieldset>
+      )}
+
       {error && (
         <p role="alert" className="text-sm text-red-700">
           {error}
         </p>
       )}
 
-      <Button type="submit" disabled={submitting}>
+      <Button type="submit" disabled={submitting || uploading}>
         {submitting
           ? mode === 'edit'
             ? t('saving')

package/templates/nextjs/base/src/ui/product/reviews-section.tsx.ejs

@@ -1,108 +1,139 @@
-import { Star } from 'lucide-react';
-import type { ProductReview } from 'brainerce';
-import { getServerClient } from '@/core/lib/brainerce.server';
-import { Badge } from '@/components/ui/badge';
-<% if (i18nEnabled) { %>import { getMessages, defaultLocale } from '@/i18n';<% } else { %>import { defaultLocale, messages } from '@/i18n';<% } %>
-import { ReviewForm } from './review-form';
-
-// Server component — it renders before any client i18n context exists, so the
-// wrapper strings (title / empty state / verified badge) are read straight
-// from the `reviews` namespace in messages/, keyed by the store locale.
-type ReviewStrings = Record<string, string>;
-
-<% if (i18nEnabled) { %>async function getReviewStrings(locale: string): Promise<ReviewStrings> {
-  return ((await getMessages(locale)).reviews ?? {}) as ReviewStrings;
-}<% } else { %>async function getReviewStrings(_locale: string): Promise<ReviewStrings> {
-  return messages.reviews as ReviewStrings;
-}<% } %>
-
-interface ReviewsSectionProps {
-  productId: string;
-  initialReviews?: ProductReview[];
-  locale?: string;
-  /** Where to send users back to after submit (defaults to the current product URL). */
-  returnUrl?: string;
-}
-
-/**
- * Renders the visible reviews for a product plus a submit form.
- *
- * Server component — fetches with the SDK on the server so reviews are in
- * the initial HTML payload (good for SEO; JSON-LD on the same page already
- * carries `aggregateRating` when reviewCount > 0).
- */
-export async function ReviewsSection({
-  productId,
-  initialReviews,
-  locale = defaultLocale,
-}: ReviewsSectionProps) {
-  const t = await getReviewStrings(locale);
-  let reviews: ProductReview[] = initialReviews ?? [];
-
-  if (!initialReviews) {
-    try {
-      const result = await (await getServerClient()).listProductReviews(productId, { page: 1, limit: 20 });
-      reviews = result.data;
-    } catch {
-      // Review listing disabled at store level or network error — render the form anyway.
-      reviews = [];
-    }
-  }
-
-  return (
-    <section className="mt-8" aria-labelledby="reviews-heading">
-      <h2 id="reviews-heading" className="mb-4 text-xl font-semibold">
-        {t.title}
-      </h2>
-
-      {reviews.length === 0 ? (
-        <p className="text-muted-foreground mb-6 text-sm">{t.noReviews}</p>
-      ) : (
-        <ul className="mb-6 space-y-4">
-          {reviews.map((review) => (
-            <ReviewCard key={review.id} review={review} verifiedLabel={t.verifiedPurchase} />
-          ))}
-        </ul>
-      )}
-
-      <ReviewForm productId={productId} />
-    </section>
-  );
-}
-
-function ReviewCard({ review, verifiedLabel }: { review: ProductReview; verifiedLabel: string }) {
-  return (
-    <li className="rounded-md border p-4">
-      <header className="flex flex-wrap items-center gap-2">
-        <Stars rating={review.rating} />
-        <span className="text-sm font-medium">{review.authorName}</span>
-        {review.verifiedPurchase && (
-          <Badge
-            variant="outline"
-            className="rounded border-transparent bg-emerald-50 px-2 py-0.5 font-normal text-emerald-700"
-          >
-            {verifiedLabel}
-          </Badge>
-        )}
-        <time className="text-muted-foreground ms-auto text-xs">
-          {new Date(review.createdAt).toLocaleDateString()}
-        </time>
-      </header>
-      {review.body && <p className="mt-2 whitespace-pre-line break-words text-sm">{review.body}</p>}
-    </li>
-  );
-}
-
-function Stars({ rating }: { rating: number }) {
-  return (
-    <span aria-label={`${rating} of 5 stars`} className="inline-flex">
-      {[1, 2, 3, 4, 5].map((n) => (
-        <Star
-          key={n}
-          className={`h-4 w-4 fill-current ${n <= rating ? 'text-yellow-500' : 'text-gray-300'}`}
-          aria-hidden="true"
-        />
-      ))}
-    </span>
-  );
-}
+import { Star } from 'lucide-react';
+import type { ProductReview } from 'brainerce';
+import { getServerClient } from '@/core/lib/brainerce.server';
+import { CdnImage } from '@/ui/shared/cdn-image';
+import { Badge } from '@/components/ui/badge';
+<% if (i18nEnabled) { %>import { getMessages, defaultLocale } from '@/i18n';<% } else { %>import { defaultLocale, messages } from '@/i18n';<% } %>
+import { ReviewForm } from './review-form';
+
+// Server component — it renders before any client i18n context exists, so the
+// wrapper strings (title / empty state / verified badge) are read straight
+// from the `reviews` namespace in messages/, keyed by the store locale.
+type ReviewStrings = Record<string, string>;
+
+<% if (i18nEnabled) { %>async function getReviewStrings(locale: string): Promise<ReviewStrings> {
+  return ((await getMessages(locale)).reviews ?? {}) as ReviewStrings;
+}<% } else { %>async function getReviewStrings(_locale: string): Promise<ReviewStrings> {
+  return messages.reviews as ReviewStrings;
+}<% } %>
+
+interface ReviewsSectionProps {
+  productId: string;
+  initialReviews?: ProductReview[];
+  locale?: string;
+  /** Where to send users back to after submit (defaults to the current product URL). */
+  returnUrl?: string;
+}
+
+/**
+ * Renders the visible reviews for a product plus a submit form.
+ *
+ * Server component — fetches with the SDK on the server so reviews are in
+ * the initial HTML payload (good for SEO; JSON-LD on the same page already
+ * carries `aggregateRating` when reviewCount > 0).
+ */
+export async function ReviewsSection({
+  productId,
+  initialReviews,
+  locale = defaultLocale,
+}: ReviewsSectionProps) {
+  const t = await getReviewStrings(locale);
+  let reviews: ProductReview[] = initialReviews ?? [];
+
+  if (!initialReviews) {
+    try {
+      const result = await (await getServerClient()).listProductReviews(productId, { page: 1, limit: 20, sort: 'photos_first' });
+      reviews = result.data;
+    } catch {
+      // Review listing disabled at store level or network error — render the form anyway.
+      reviews = [];
+    }
+  }
+
+  return (
+    <section className="mt-8" aria-labelledby="reviews-heading">
+      <h2 id="reviews-heading" className="mb-4 text-xl font-semibold">
+        {t.title}
+      </h2>
+
+      {reviews.length === 0 ? (
+        <p className="text-muted-foreground mb-6 text-sm">{t.noReviews}</p>
+      ) : (
+        <ul className="mb-6 space-y-4">
+          {reviews.map((review) => (
+            <ReviewCard key={review.id} review={review} verifiedLabel={t.verifiedPurchase} />
+          ))}
+        </ul>
+      )}
+
+      <ReviewForm productId={productId} />
+    </section>
+  );
+}
+
+function ReviewCard({ review, verifiedLabel }: { review: ProductReview; verifiedLabel: string }) {
+  return (
+    <li className="rounded-md border p-4">
+      <header className="flex flex-wrap items-center gap-2">
+        <Stars rating={review.rating} />
+        <span className="text-sm font-medium">{review.authorName}</span>
+        {review.verifiedPurchase && (
+          <Badge
+            variant="outline"
+            className="rounded border-transparent bg-emerald-50 px-2 py-0.5 font-normal text-emerald-700"
+          >
+            {verifiedLabel}
+          </Badge>
+        )}
+        <time className="text-muted-foreground ms-auto text-xs">
+          {new Date(review.createdAt).toLocaleDateString()}
+        </time>
+      </header>
+      {review.body && <p className="mt-2 whitespace-pre-line break-words text-sm">{review.body}</p>}
+      <ReviewPhotos review={review} />
+    </li>
+  );
+}
+
+/**
+ * Photos the reviewer attached. `review.images` is always an array and already
+ * carries only what shoppers are allowed to see, so there is nothing to filter.
+ *
+ * The intrinsic width/height come back from the API — passing them through is
+ * what stops the page jumping as the photos load.
+ */
+function ReviewPhotos({ review }: { review: ProductReview }) {
+  if (review.images.length === 0) return null;
+
+  return (
+    <ul className="mt-3 flex flex-wrap gap-2">
+      {review.images.map((image) => (
+        <li key={image.id}>
+          <a href={image.url} target="_blank" rel="noopener noreferrer">
+            <CdnImage
+              src={image.thumbnailUrl ?? image.url}
+              alt=""
+              width={image.width ?? 96}
+              height={image.height ?? 96}
+              className="h-24 w-24 rounded-md border object-cover"
+            />
+          </a>
+        </li>
+      ))}
+    </ul>
+  );
+}
+
+function Stars({ rating }: { rating: number }) {
+  return (
+    <span aria-label={`${rating} of 5 stars`} className="inline-flex">
+      {[1, 2, 3, 4, 5].map((n) => (
+        <Star
+          key={n}
+          className={`h-4 w-4 fill-current ${n <= rating ? 'text-yellow-500' : 'text-gray-300'}`}
+          aria-hidden="true"
+        />
+      ))}
+    </span>
+  );
+}

package/templates/nextjs/designs/atelier/ui/cart/cart-drawer.tsx

@@ -147,9 +147,27 @@ export function CartDrawer() {
               )}
               <p className="text-muted-foreground mt-1 text-xs">{t('shippingAtCheckout')}</p>
               <div className="mt-4 grid gap-2">
-                <Link href="/checkout" onClick={close} className="btn-primary btn-lg w-full">
-                  {t('proceedToCheckout')}
-                </Link>
+                {/* Same gate as the cart page: a line the server marked
+                    unavailable blocks checkout. A disabled-looking anchor
+                    would still navigate, so use a real disabled button. */}
+                {items.some((item) => item.isAvailable === false) ? (
+                  <>
+                    <button
+                      type="button"
+                      disabled
+                      className="btn-primary btn-lg w-full opacity-50"
+                    >
+                      {t('proceedToCheckout')}
+                    </button>
+                    <p className="text-destructive text-center text-xs">
+                      {t('unavailableItemsHint')}
+                    </p>
+                  </>
+                ) : (
+                  <Link href="/checkout" onClick={close} className="btn-primary btn-lg w-full">
+                    {t('proceedToCheckout')}
+                  </Link>
+                )}
                 <Link href="/cart" onClick={close} className="btn-outline btn-lg w-full">
                   {t('viewCart')}
                 </Link>

package/templates/nextjs/designs/atelier/ui/cart/cart-item.tsx

@@ -34,6 +34,17 @@ export function CartItem({ item, onUpdate, className }: CartItemProps) {
   const unitPrice = parseFloat(item.unitPrice);
   const lineTotal = unitPrice * item.quantity;
 
+  // The server decides purchasability, per line. `isAvailable === false` means
+  // this line blocks checkout until it is removed, whether the stock ran out
+  // (a released reservation is the common cause) or the product/variant was
+  // withdrawn from sale. `unavailableReason` separates the two for the label.
+  const isUnavailable = item.isAvailable === false;
+  const unavailableLabel = isUnavailable
+    ? item.unavailableReason === 'OUT_OF_STOCK'
+      ? td('outOfStock')
+      : td('unavailable')
+    : null;
+
   async function handleQuantityChange(newQuantity: number) {
     if (newQuantity < 1 || updating) return;
 
@@ -81,6 +92,13 @@ export function CartItem({ item, onUpdate, className }: CartItemProps) {
           {productName}
         </h3>
 
+        {/* Availability badge. This line blocks checkout while it shows. */}
+        {unavailableLabel && (
+          <span className="mt-1 inline-flex items-center rounded-full bg-destructive/10 px-2 py-0.5 text-xs font-medium text-destructive">
+            {unavailableLabel}
+          </span>
+        )}
+
         {/* Variant name */}
         {variantName && <p className="mt-0.5 text-xs text-muted-foreground">{variantName}</p>}
 
@@ -111,7 +129,7 @@ export function CartItem({ item, onUpdate, className }: CartItemProps) {
             <button
               type="button"
               onClick={() => handleQuantityChange(item.quantity + 1)}
-              disabled={updating}
+              disabled={updating || isUnavailable}
               aria-label={td('increaseQuantity')}
               className="flex h-full w-9 items-center justify-center rounded-e-full transition-colors hover:bg-secondary disabled:opacity-40"
             >

package/templates/nextjs/designs/atelier/ui/cart/cart-view.tsx

@@ -18,7 +18,20 @@ import { IconBag, IconArrowEnd, IconShield } from '@/ui/shared/icons';
 export function CartView() {
   const t = useTranslations('cart');
   const tc = useTranslations('common');
-  const { cart, cartLoading, refreshCart, itemCount, cartRecs, upgrades, bundles } = useCartPage();
+  const tr = useTranslations('reservation');
+  const {
+    cart,
+    cartLoading,
+    refreshCart,
+    itemCount,
+    cartRecs,
+    upgrades,
+    bundles,
+    reservationExpired,
+    unavailableItems,
+    canProceedToCheckout,
+    onReservationExpired,
+  } = useCartPage();
 
   if (cartLoading) {
     return <LoadingSpinner size="lg" className="min-h-[60vh]" />;
@@ -52,9 +65,14 @@ export function CartView() {
         </span>
       </h1>
 
-      {/* Reservation countdown */}
+      {/* Reservation countdown. onExpire refreshes the cart and closes the
+          checkout gate below. Passing it is what makes expiry mean anything. */}
       {cart.reservation?.hasReservation && (
-        <ReservationCountdown reservation={cart.reservation} className="mt-4" />
+        <ReservationCountdown
+          reservation={cart.reservation}
+          onExpire={onReservationExpired}
+          className="mt-4"
+        />
       )}
 
       <div className="mt-6 grid grid-cols-1 items-start gap-8 lg:grid-cols-3 lg:gap-10">
@@ -112,10 +130,29 @@ export function CartView() {
             <FreeShippingBar />
             <CartSummary />
 
-            <Link href="/checkout" className="btn-primary btn-lg w-full">
-              {t('proceedToCheckout')}
-              <IconArrowEnd size={20} className="rtl-flip" />
-            </Link>
+            {/* Proceed to checkout. When the gate is closed this must be a
+                real disabled control, never a styled-down link: an anchor
+                ignores `disabled` and would still navigate. */}
+            {canProceedToCheckout ? (
+              <Link href="/checkout" className="btn-primary btn-lg w-full">
+                {t('proceedToCheckout')}
+                <IconArrowEnd size={20} className="rtl-flip" />
+              </Link>
+            ) : (
+              <div>
+                <button type="button" disabled className="btn-primary btn-lg w-full opacity-50">
+                  {t('proceedToCheckout')}
+                  <IconArrowEnd size={20} className="rtl-flip" />
+                </button>
+                <p className="mt-2 text-center text-xs text-destructive">
+                  {unavailableItems.length > 0
+                    ? t('unavailableItemsHint')
+                    : reservationExpired
+                      ? tr('expiredHint')
+                      : null}
+                </p>
+              </div>
+            )}
 
             <p className="flex items-center justify-center gap-1.5 text-xs text-muted-foreground">
               <IconShield size={16} />