create-brainerce-store 1.50.1 → 1.51.0

package/templates/nextjs/base/src/app/login/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 { proxyLogin } from '@/lib/auth';
+import { useRouter, Link } from '@/core/lib/navigation';
+import { useAuth } from '@/core/providers/store-provider';
+import { proxyLogin } from '@/core/lib/auth';
 import { LoginForm } from '@/components/auth/login-form';
 import { OAuthButtons } from '@/components/auth/oauth-buttons';
-import { useTranslations } from '@/lib/translations';
+import { useTranslations } from '@/core/lib/translations';
 
 export default function LoginPage() {
   const router = useRouter();

package/templates/nextjs/base/src/app/order-confirmation/page.tsx

@@ -2,12 +2,12 @@
 
 import { Suspense, useEffect, useState } from 'react';
 import { useSearchParams } from 'next/navigation';
-import { Link } from '@/lib/navigation';
+import { Link } from '@/core/lib/navigation';
 import type { WaitForOrderResult, OrderDownloadLink } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useCart } from '@/providers/store-provider';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { useTranslations } from '@/lib/translations';
+import { getClient } from '@/core/lib/brainerce';
+import { useCart } from '@/core/providers/store-provider';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { useTranslations } from '@/core/lib/translations';
 
 function OrderConfirmationContent() {
   const searchParams = useSearchParams();
@@ -35,20 +35,27 @@ function OrderConfirmationContent() {
         client.handlePaymentSuccess(checkoutId!);
         await refreshCart();
 
-        // For redirect-based payment providers (e.g. CardCom), the customer
-        // returns with provider params in the URL (lowprofilecode, etc.).
-        // Send these to the backend for server-side verification via the
-        // provider's API (e.g. GetLpResult) — never trust URL params alone.
+        // For redirect-based payment providers, the customer returns with
+        // provider params in the URL — CardCom: lowprofilecode; PayPal:
+        // token + PayerID. Send these to the backend for server-side
+        // verification via the provider's API (e.g. GetLpResult / PayPal
+        // capture) — never trust URL params alone. For PayPal this call is
+        // what actually captures the approved payment.
         const lowProfileCode =
           searchParams.get('lowprofilecode') || searchParams.get('LowProfileCode');
-        if (lowProfileCode) {
+        const paypalOrderToken =
+          searchParams.get('token') && searchParams.get('PayerID')
+            ? searchParams.get('token')
+            : null;
+        const redirectReturnToken = lowProfileCode || paypalOrderToken;
+        if (redirectReturnToken) {
           try {
             await client.confirmSdkPayment(checkoutId!, {
-              paymentIntentId: lowProfileCode,
+              paymentIntentId: redirectReturnToken,
             });
           } catch (err) {
             console.warn('Redirect payment confirmation failed:', err);
-            // Don't block — webhook may still process the payment
+            // Don't block — payment-status polling re-verifies server-side
           }
         }
 

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

@@ -1,9 +1,9 @@
 import type { Metadata } from 'next';
-import { getServerClient } from '@/lib/brainerce';
-import { buildMetaDescription } from '@/lib/seo';
+import { getServerClient } from '@/core/lib/brainerce';
+import { buildMetaDescription } from '@/core/lib/seo';
 import { OrganizationJsonLd } from '@/components/seo/organization-json-ld';
-import { RichTextBlock } from '@/components/content/rich-text-block';
-import { HomeClient } from './home-client';
+import { RichTextBlock } from '@/ui/layout/rich-text-block';
+import { HomeClient } from '@/ui/home/home-client';
 
 // Build homepage metadata server-side so Google, Facebook, WhatsApp etc.
 // see a real <meta name="description"> on first request. Falls back to the

package/templates/nextjs/base/src/app/pages/[slug]/page.tsx.ejs

@@ -15,9 +15,9 @@ import * as React from 'react';
 import type { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 
-import { getServerClient } from '@/lib/brainerce';
-import { sanitizeHtml } from '@/lib/sanitize';
-import { decodeSlug } from '@/lib/utils';
+import { getServerClient } from '@/core/lib/brainerce';
+import { sanitizeHtml } from '@/core/lib/sanitize';
+import { decodeSlug } from '@/core/lib/utils';
 
 <% if (i18nEnabled) { %>
 type PageProps = {

package/templates/nextjs/base/src/app/payment-complete/page.tsx

@@ -3,7 +3,7 @@
 import { useEffect } from 'react';
 import { useSearchParams } from 'next/navigation';
 import { Suspense } from 'react';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
 
 /**
  * Lightweight callback page for iframe-based payment providers (e.g. CardCom).

package/templates/nextjs/base/src/app/products/[slug]/page.tsx

@@ -1,13 +1,13 @@
 import type { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 import { getProductPriceInfo } from 'brainerce';
-import { getServerClient, fetchStoreInfo } from '@/lib/brainerce';
-import { resolveCurrency } from '@/lib/resolve-currency';
-import { buildMetaDescription } from '@/lib/seo';
-import { decodeSlug } from '@/lib/utils';
+import { getServerClient, fetchStoreInfo } from '@/core/lib/brainerce';
+import { resolveCurrency } from '@/core/lib/resolve-currency';
+import { buildMetaDescription } from '@/core/lib/seo';
+import { decodeSlug } from '@/core/lib/utils';
 import { ProductJsonLd } from '@/components/seo/product-json-ld';
-import { ReviewsSection } from '@/components/reviews/reviews-section';
-import { ProductClientSection } from './product-client-section';
+import { ReviewsSection } from '@/ui/product/reviews-section';
+import { ProductClientSection } from '@/ui/product/product-client-section';
 
 type Props = {
   params: Promise<{ slug: string; locale?: string }>;