create-nextblock 0.13.10 → 0.13.11

package/templates/nextblock-template/app/lib/site-settings.ts

@@ -1,105 +1,105 @@
-import 'server-only';
-import { unstable_cache } from 'next/cache';
-import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
-import type { Database } from '@nextblock-cms/db';
-import {
-  resolveSupabaseAnonKey,
-  resolveSupabaseServiceKey,
-  resolveSupabaseUrl,
-} from '../../lib/setup/env-status';
-import {
-  DEFAULT_SITE_TITLE,
-  DEFAULT_SITE_DESCRIPTION,
-  DEFAULT_SITE_KEYWORDS,
-} from './seo';
-
-export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
-const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
-
-export interface SiteSettings {
-  siteTitle: string;
-  siteDescription: string;
-  siteKeywords: string;
-}
-
-/**
- * Service-role (or anon) Supabase client used for cached, request-agnostic
- * reads of public layout/SEO data. Shared by the root layout and the public
- * route `generateMetadata` functions.
- */
-export function createStaticSupabaseClient() {
-  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
-  // root layout can still render rather than crashing the whole app on boot. Callers
-  // (getSiteSettings + the getCached* helpers) already swallow failures and use
-  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
-  // no Supabase env at all.
-  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
-  const supabaseKey =
-    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
-
-  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
-    auth: {
-      persistSession: false,
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-    },
-  });
-}
-
-/**
- * Cached read of the site-wide SEO identity (title / description / keywords)
- * from the `site_settings` key-value store. This is the single source of truth
- * used for both `<title>`/OpenGraph metadata and the header brand.
- */
-export const getSiteSettings = unstable_cache(
-  async (): Promise<SiteSettings> => {
-    const fallback: SiteSettings = {
-      siteTitle: DEFAULT_SITE_TITLE,
-      siteDescription: DEFAULT_SITE_DESCRIPTION,
-      siteKeywords: DEFAULT_SITE_KEYWORDS,
-    };
-
-    // Unconfigured instance (pre-/setup): the static client would point at the dummy
-    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
-    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
-    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
-      return fallback;
-    }
-
-    try {
-      const supabase = createStaticSupabaseClient();
-      const { data, error } = await supabase
-        .from('site_settings')
-        .select('key, value')
-        .in('key', ['site_title', 'site_description', 'site_keywords']);
-
-      if (error || !data) {
-        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
-        // right after the connection is saved but before `npm run db:migrate`). That's an
-        // expected transient state — don't shout about it. Real errors still log.
-        if (error && error.code !== 'PGRST205') {
-          console.error('Error fetching cached site settings:', error);
-        }
-        return fallback;
-      }
-
-      const settings: Record<string, string> = {};
-      data.forEach((item) => {
-        if (typeof item.value === 'string') {
-          settings[item.key] = item.value;
-        }
-      });
-
-      return {
-        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
-        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
-        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
-      };
-    } catch (caught) {
-      console.error('Unexpected error fetching site settings:', caught);
-      return fallback;
-    }
-  },
-  ['public-site-settings'],
-  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
-);
+import 'server-only';
+import { unstable_cache } from 'next/cache';
+import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
+import {
+  resolveSupabaseAnonKey,
+  resolveSupabaseServiceKey,
+  resolveSupabaseUrl,
+} from '../../lib/setup/env-status';
+import {
+  DEFAULT_SITE_TITLE,
+  DEFAULT_SITE_DESCRIPTION,
+  DEFAULT_SITE_KEYWORDS,
+} from './seo';
+
+export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
+const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
+
+export interface SiteSettings {
+  siteTitle: string;
+  siteDescription: string;
+  siteKeywords: string;
+}
+
+/**
+ * Service-role (or anon) Supabase client used for cached, request-agnostic
+ * reads of public layout/SEO data. Shared by the root layout and the public
+ * route `generateMetadata` functions.
+ */
+export function createStaticSupabaseClient() {
+  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
+  // root layout can still render rather than crashing the whole app on boot. Callers
+  // (getSiteSettings + the getCached* helpers) already swallow failures and use
+  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
+  // no Supabase env at all.
+  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
+  const supabaseKey =
+    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
+
+  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  });
+}
+
+/**
+ * Cached read of the site-wide SEO identity (title / description / keywords)
+ * from the `site_settings` key-value store. This is the single source of truth
+ * used for both `<title>`/OpenGraph metadata and the header brand.
+ */
+export const getSiteSettings = unstable_cache(
+  async (): Promise<SiteSettings> => {
+    const fallback: SiteSettings = {
+      siteTitle: DEFAULT_SITE_TITLE,
+      siteDescription: DEFAULT_SITE_DESCRIPTION,
+      siteKeywords: DEFAULT_SITE_KEYWORDS,
+    };
+
+    // Unconfigured instance (pre-/setup): the static client would point at the dummy
+    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
+    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
+    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
+      return fallback;
+    }
+
+    try {
+      const supabase = createStaticSupabaseClient();
+      const { data, error } = await supabase
+        .from('site_settings')
+        .select('key, value')
+        .in('key', ['site_title', 'site_description', 'site_keywords']);
+
+      if (error || !data) {
+        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
+        // right after the connection is saved but before `npm run db:migrate`). That's an
+        // expected transient state — don't shout about it. Real errors still log.
+        if (error && error.code !== 'PGRST205') {
+          console.error('Error fetching cached site settings:', error);
+        }
+        return fallback;
+      }
+
+      const settings: Record<string, string> = {};
+      data.forEach((item) => {
+        if (typeof item.value === 'string') {
+          settings[item.key] = item.value;
+        }
+      });
+
+      return {
+        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
+        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
+        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
+      };
+    } catch (caught) {
+      console.error('Unexpected error fetching site settings:', caught);
+      return fallback;
+    }
+  },
+  ['public-site-settings'],
+  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
+);

package/templates/nextblock-template/app/profile/ProfilePageHeader.tsx

@@ -1,16 +1,16 @@
-'use client';
-
-import { useTranslations } from '@nextblock-cms/utils';
-
-export function ProfilePageHeader() {
-  const { t } = useTranslations();
-
-  return (
-    <div className="mb-8">
-      <h1 className="text-3xl font-bold tracking-tight">{t('profile_settings_title')}</h1>
-      <p className="text-muted-foreground mt-2">
-        {t('profile_settings_description')}
-      </p>
-    </div>
-  );
-}
+'use client';
+
+import { useTranslations } from '@nextblock-cms/utils';
+
+export function ProfilePageHeader() {
+  const { t } = useTranslations();
+
+  return (
+    <div className="mb-8">
+      <h1 className="text-3xl font-bold tracking-tight">{t('profile_settings_title')}</h1>
+      <p className="text-muted-foreground mt-2">
+        {t('profile_settings_description')}
+      </p>
+    </div>
+  );
+}

package/templates/nextblock-template/app/profile/ProfilePageMissingState.tsx

@@ -1,9 +1,9 @@
-'use client';
-
-import { useTranslations } from '@nextblock-cms/utils';
-
-export function ProfilePageMissingState() {
-  const { t } = useTranslations();
-
-  return <div>{t('profile_not_found')}</div>;
-}
+'use client';
+
+import { useTranslations } from '@nextblock-cms/utils';
+
+export function ProfilePageMissingState() {
+  const { t } = useTranslations();
+
+  return <div>{t('profile_not_found')}</div>;
+}

package/templates/nextblock-template/app/profile/account-links.ts

@@ -1,22 +1,22 @@
-import type { AccountNavigationLink } from '@nextblock-cms/ecommerce';
-
-const isSandbox = process.env.NEXT_PUBLIC_IS_SANDBOX === 'true';
-
-export const profileAccountLinks: AccountNavigationLink[] = [
-  {
-    href: '/profile/orders',
-    labelKey: 'account_orders',
-    fallbackLabel: 'Orders',
-    icon: 'orders',
-  },
-  ...(!isSandbox
-    ? [
-        {
-          href: '/profile/password',
-          labelKey: 'change_my_password',
-          fallbackLabel: 'Change my password',
-          icon: 'password' as const,
-        },
-      ]
-    : []),
-];
+import type { AccountNavigationLink } from '@nextblock-cms/ecommerce';
+
+const isSandbox = process.env.NEXT_PUBLIC_IS_SANDBOX === 'true';
+
+export const profileAccountLinks: AccountNavigationLink[] = [
+  {
+    href: '/profile/orders',
+    labelKey: 'account_orders',
+    fallbackLabel: 'Orders',
+    icon: 'orders',
+  },
+  ...(!isSandbox
+    ? [
+        {
+          href: '/profile/password',
+          labelKey: 'change_my_password',
+          fallbackLabel: 'Change my password',
+          icon: 'password' as const,
+        },
+      ]
+    : []),
+];

package/templates/nextblock-template/app/profile/orders/CustomerOrdersPageClient.tsx

@@ -1,124 +1,124 @@
-'use client';
-
-import { formatInvoiceCurrency, formatInvoiceDate, translateOrderStatus, translateOrFallback, getInvoiceLocale } from '@nextblock-cms/ecommerce';
-import { useTranslations } from '@nextblock-cms/utils';
-import {
-  Badge,
-  Button,
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@nextblock-cms/ui';
-import Link from 'next/link';
-
-import type { ProfileAccountSummary, ProfileAccountUser } from '../account-types';
-import { ProfileAccountSidebar } from '../ProfileAccountSidebar';
-
-interface CustomerOrdersPageClientProps {
-  orders: Array<{
-    id: string;
-    invoice_number: string | null;
-    paid_at: string | null;
-    created_at: string | null;
-    currency: string | null;
-    status: string;
-    total: number;
-  }>;
-  profile: ProfileAccountSummary;
-  user: ProfileAccountUser;
-}
-
-export function CustomerOrdersPageClient({
-  orders,
-  profile,
-  user,
-}: CustomerOrdersPageClientProps) {
-  const { t, lang } = useTranslations();
-  const locale = getInvoiceLocale(lang);
-
-  return (
-    <div className="mx-auto w-full max-w-6xl px-4 py-12 md:px-6">
-      <div className="grid gap-6 md:grid-cols-12">
-        <div className="md:col-span-4">
-          <ProfileAccountSidebar profile={profile} user={user} />
-        </div>
-
-        <Card className="md:col-span-8">
-          <CardHeader>
-            <CardTitle>
-              {translateOrFallback(t, 'profile_orders_title', 'My orders')}
-            </CardTitle>
-            <CardDescription>
-              {translateOrFallback(
-                t,
-                'profile_orders_description',
-                'Review your recent purchases and open printable invoices.'
-              )}
-            </CardDescription>
-          </CardHeader>
-
-          <CardContent className="space-y-4">
-            {orders.length ? (
-              orders.map((order) => (
-                <div
-                  key={order.id}
-                  className="flex flex-col gap-4 rounded-xl border px-4 py-4 md:flex-row md:items-center md:justify-between"
-                >
-                  <div className="space-y-2">
-                    <div className="flex flex-wrap items-center gap-2">
-                      <p className="font-semibold">
-                        {translateOrFallback(t, 'order_number', 'Order #')} {order.id}
-                      </p>
-                      <Badge variant="secondary" className="capitalize">
-                        {translateOrderStatus(order.status, t)}
-                      </Badge>
-                    </div>
-
-                    <div className="space-y-1 text-sm text-muted-foreground">
-                      <p>
-                        {translateOrFallback(t, 'invoice_number', 'Invoice #')}:{' '}
-                        {order.invoice_number || '--'}
-                      </p>
-                      <p>
-                        {translateOrFallback(t, 'order_date', 'Date')}:{' '}
-                        {formatInvoiceDate(order.created_at, locale) || '--'}
-                      </p>
-                      <p>
-                        {translateOrFallback(t, 'ecommerce.total', 'Total')}:{' '}
-                        {formatInvoiceCurrency(
-                          order.total,
-                          order.currency || 'usd',
-                          locale
-                        )}
-                      </p>
-                    </div>
-                  </div>
-
-                  <Button asChild>
-                    <Link href={`/profile/orders/${order.id}`}>
-                      {translateOrFallback(
-                        t,
-                        'ecommerce.view_details',
-                        'View Details'
-                      )}
-                    </Link>
-                  </Button>
-                </div>
-              ))
-            ) : (
-              <div className="rounded-xl border border-dashed px-6 py-12 text-center text-muted-foreground">
-                {translateOrFallback(
-                  t,
-                  'profile_orders_empty',
-                  'You do not have any orders yet.'
-                )}
-              </div>
-            )}
-          </CardContent>
-        </Card>
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { formatInvoiceCurrency, formatInvoiceDate, translateOrderStatus, translateOrFallback, getInvoiceLocale } from '@nextblock-cms/ecommerce';
+import { useTranslations } from '@nextblock-cms/utils';
+import {
+  Badge,
+  Button,
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@nextblock-cms/ui';
+import Link from 'next/link';
+
+import type { ProfileAccountSummary, ProfileAccountUser } from '../account-types';
+import { ProfileAccountSidebar } from '../ProfileAccountSidebar';
+
+interface CustomerOrdersPageClientProps {
+  orders: Array<{
+    id: string;
+    invoice_number: string | null;
+    paid_at: string | null;
+    created_at: string | null;
+    currency: string | null;
+    status: string;
+    total: number;
+  }>;
+  profile: ProfileAccountSummary;
+  user: ProfileAccountUser;
+}
+
+export function CustomerOrdersPageClient({
+  orders,
+  profile,
+  user,
+}: CustomerOrdersPageClientProps) {
+  const { t, lang } = useTranslations();
+  const locale = getInvoiceLocale(lang);
+
+  return (
+    <div className="mx-auto w-full max-w-6xl px-4 py-12 md:px-6">
+      <div className="grid gap-6 md:grid-cols-12">
+        <div className="md:col-span-4">
+          <ProfileAccountSidebar profile={profile} user={user} />
+        </div>
+
+        <Card className="md:col-span-8">
+          <CardHeader>
+            <CardTitle>
+              {translateOrFallback(t, 'profile_orders_title', 'My orders')}
+            </CardTitle>
+            <CardDescription>
+              {translateOrFallback(
+                t,
+                'profile_orders_description',
+                'Review your recent purchases and open printable invoices.'
+              )}
+            </CardDescription>
+          </CardHeader>
+
+          <CardContent className="space-y-4">
+            {orders.length ? (
+              orders.map((order) => (
+                <div
+                  key={order.id}
+                  className="flex flex-col gap-4 rounded-xl border px-4 py-4 md:flex-row md:items-center md:justify-between"
+                >
+                  <div className="space-y-2">
+                    <div className="flex flex-wrap items-center gap-2">
+                      <p className="font-semibold">
+                        {translateOrFallback(t, 'order_number', 'Order #')} {order.id}
+                      </p>
+                      <Badge variant="secondary" className="capitalize">
+                        {translateOrderStatus(order.status, t)}
+                      </Badge>
+                    </div>
+
+                    <div className="space-y-1 text-sm text-muted-foreground">
+                      <p>
+                        {translateOrFallback(t, 'invoice_number', 'Invoice #')}:{' '}
+                        {order.invoice_number || '--'}
+                      </p>
+                      <p>
+                        {translateOrFallback(t, 'order_date', 'Date')}:{' '}
+                        {formatInvoiceDate(order.created_at, locale) || '--'}
+                      </p>
+                      <p>
+                        {translateOrFallback(t, 'ecommerce.total', 'Total')}:{' '}
+                        {formatInvoiceCurrency(
+                          order.total,
+                          order.currency || 'usd',
+                          locale
+                        )}
+                      </p>
+                    </div>
+                  </div>
+
+                  <Button asChild>
+                    <Link href={`/profile/orders/${order.id}`}>
+                      {translateOrFallback(
+                        t,
+                        'ecommerce.view_details',
+                        'View Details'
+                      )}
+                    </Link>
+                  </Button>
+                </div>
+              ))
+            ) : (
+              <div className="rounded-xl border border-dashed px-6 py-12 text-center text-muted-foreground">
+                {translateOrFallback(
+                  t,
+                  'profile_orders_empty',
+                  'You do not have any orders yet.'
+                )}
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  );
+}

package/templates/nextblock-template/app/profile/orders/page.tsx

@@ -1,19 +1,19 @@
-import { getCurrentCustomerOrders } from '@nextblock-cms/ecommerce/server';
-
-import { requireProfileAccountContext } from '../account-data';
-import { CustomerOrdersPageClient } from './CustomerOrdersPageClient';
-
-export default async function ProfileOrdersPage() {
-  const { supabase, profile, user } = await requireProfileAccountContext(
-    '/profile/orders'
-  );
-  const orders = await getCurrentCustomerOrders(supabase as any);
-
-  return (
-    <CustomerOrdersPageClient
-      orders={orders}
-      profile={profile}
-      user={user}
-    />
-  );
-}
+import { getCurrentCustomerOrders } from '@nextblock-cms/ecommerce/server';
+
+import { requireProfileAccountContext } from '../account-data';
+import { CustomerOrdersPageClient } from './CustomerOrdersPageClient';
+
+export default async function ProfileOrdersPage() {
+  const { supabase, profile, user } = await requireProfileAccountContext(
+    '/profile/orders'
+  );
+  const orders = await getCurrentCustomerOrders(supabase as any);
+
+  return (
+    <CustomerOrdersPageClient
+      orders={orders}
+      profile={profile}
+      user={user}
+    />
+  );
+}