create-nextblock 0.12.8 → 0.12.11

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}
+    />
+  );
+}

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

@@ -1,14 +1,14 @@
-import { createClient } from "@nextblock-cms/db/server";
-import { redirect } from "next/navigation";
-import { CustomerProfileForm, addressesMatch } from "@nextblock-cms/ecommerce";
-import { getDefaultUserAddresses } from "@nextblock-cms/ecommerce/server";
-import MediaPickerDialog from "../cms/media/components/MediaPickerDialog";
-import { ProfilePageHeader } from "./ProfilePageHeader";
-import { ProfilePageMissingState } from "./ProfilePageMissingState";
-import { profileAccountLinks } from "./account-links";
-
-export default async function ProfilePage() {
-  const supabase = createClient();
+import { createClient } from "@nextblock-cms/db/server";
+import { redirect } from "next/navigation";
+import { CustomerProfileForm, addressesMatch } from "@nextblock-cms/ecommerce";
+import { getDefaultUserAddresses } from "@nextblock-cms/ecommerce/server";
+import MediaPickerDialog from "../cms/media/components/MediaPickerDialog";
+import { ProfilePageHeader } from "./ProfilePageHeader";
+import { ProfilePageMissingState } from "./ProfilePageMissingState";
+import { profileAccountLinks } from "./account-links";
+
+export default async function ProfilePage() {
+  const supabase = createClient();
 
   const {
     data: { user },
@@ -18,34 +18,34 @@ export default async function ProfilePage() {
     return redirect("/sign-in");
   }
 
-  const [{ data: profile }, { billingAddress, shippingAddress }] = await Promise.all([
-    supabase.from("profiles").select("*").eq("id", user.id).single(),
-    getDefaultUserAddresses(user.id, supabase),
-  ]);
-
-  if (!profile) {
-    return <ProfilePageMissingState />;
-  }
-
-  return (
-    <div className="w-full max-w-6xl mx-auto py-12 px-4 md:px-6">
-      <ProfilePageHeader />
-      
-      <CustomerProfileForm 
-        initialData={{
-            full_name: profile.full_name || '',
-            avatar_url: profile.avatar_url || '',
-            website: profile.website || '',
-            github_username: profile.github_username || '',
-            phone: profile.phone || '',
-            billing_address: billingAddress,
-            shipping_address: shippingAddress,
-            use_billing_for_shipping: !shippingAddress || addressesMatch(billingAddress, shippingAddress),
-        }} 
-        MediaPickerComponent={MediaPickerDialog}
-        email={user.email}
-        accountLinks={profileAccountLinks}
-      />
-    </div>
-  );
-}
+  const [{ data: profile }, { billingAddress, shippingAddress }] = await Promise.all([
+    supabase.from("profiles").select("*").eq("id", user.id).single(),
+    getDefaultUserAddresses(user.id, supabase),
+  ]);
+
+  if (!profile) {
+    return <ProfilePageMissingState />;
+  }
+
+  return (
+    <div className="w-full max-w-6xl mx-auto py-12 px-4 md:px-6">
+      <ProfilePageHeader />
+      
+      <CustomerProfileForm 
+        initialData={{
+            full_name: profile.full_name || '',
+            avatar_url: profile.avatar_url || '',
+            website: profile.website || '',
+            github_username: profile.github_username || '',
+            phone: profile.phone || '',
+            billing_address: billingAddress,
+            shipping_address: shippingAddress,
+            use_billing_for_shipping: !shippingAddress || addressesMatch(billingAddress, shippingAddress),
+        }} 
+        MediaPickerComponent={MediaPickerDialog}
+        email={user.email}
+        accountLinks={profileAccountLinks}
+      />
+    </div>
+  );
+}

package/templates/nextblock-template/app/profile/password/PasswordSettingsPageClient.tsx

@@ -1,128 +1,128 @@
-'use client';
-
-import { useTranslations } from '@nextblock-cms/utils';
-import {
-  Button,
-  Card,
-  CardContent,
-  CardDescription,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-  Input,
-  Label,
-} from '@nextblock-cms/ui';
-
-import type { ProfileAccountSummary, ProfileAccountUser } from '../account-types';
-import { ProfileAccountSidebar } from '../ProfileAccountSidebar';
-import { changePasswordAction } from './actions';
-
-interface PasswordSettingsPageClientProps {
-  profile: ProfileAccountSummary;
-  user: ProfileAccountUser;
-  successMessage?: string | null;
-  errorMessage?: string | null;
-}
-
-function translateMessage(
-  t: (key: string, params?: Record<string, string | number>) => string,
-  value?: string | null
-) {
-  if (!value) {
-    return null;
-  }
-
-  const translated = t(value);
-  return translated === value ? value : translated;
-}
-
-export function PasswordSettingsPageClient({
-  profile,
-  user,
-  successMessage,
-  errorMessage,
-}: PasswordSettingsPageClientProps) {
-  const { t } = useTranslations();
-
-  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">
-          <form action={changePasswordAction}>
-            <CardHeader>
-              <CardTitle>
-                {t('profile_password_title') === 'profile_password_title'
-                  ? 'Change your password'
-                  : t('profile_password_title')}
-              </CardTitle>
-              <CardDescription>
-                {t('profile_password_description') ===
-                'profile_password_description'
-                  ? 'Update your account password without leaving your profile.'
-                  : t('profile_password_description')}
-              </CardDescription>
-            </CardHeader>
-
-            <CardContent className="space-y-6">
-              <div className="grid gap-4 md:grid-cols-2">
-                <div className="space-y-2">
-                  <Label htmlFor="password">
-                    {t('new_password') === 'new_password'
-                      ? 'New password'
-                      : t('new_password')}
-                  </Label>
-                  <Input
-                    id="password"
-                    name="password"
-                    type="password"
-                    autoComplete="new-password"
-                    required
-                  />
-                </div>
-
-                <div className="space-y-2">
-                  <Label htmlFor="confirmPassword">
-                    {t('confirm_new_password') === 'confirm_new_password'
-                      ? 'Confirm new password'
-                      : t('confirm_new_password')}
-                  </Label>
-                  <Input
-                    id="confirmPassword"
-                    name="confirmPassword"
-                    type="password"
-                    autoComplete="new-password"
-                    required
-                  />
-                </div>
-              </div>
-
-              {successMessage ? (
-                <div className="rounded-xl border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm text-emerald-700">
-                  {translateMessage(t, successMessage)}
-                </div>
-              ) : null}
-
-              {errorMessage ? (
-                <div className="rounded-xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
-                  {translateMessage(t, errorMessage)}
-                </div>
-              ) : null}
-            </CardContent>
-
-            <CardFooter className="flex justify-end">
-              <Button type="submit" size="lg">
-                {t('save_changes') === 'save_changes'
-                  ? 'Save changes'
-                  : t('save_changes')}
-              </Button>
-            </CardFooter>
-          </form>
-        </Card>
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { useTranslations } from '@nextblock-cms/utils';
+import {
+  Button,
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+  Input,
+  Label,
+} from '@nextblock-cms/ui';
+
+import type { ProfileAccountSummary, ProfileAccountUser } from '../account-types';
+import { ProfileAccountSidebar } from '../ProfileAccountSidebar';
+import { changePasswordAction } from './actions';
+
+interface PasswordSettingsPageClientProps {
+  profile: ProfileAccountSummary;
+  user: ProfileAccountUser;
+  successMessage?: string | null;
+  errorMessage?: string | null;
+}
+
+function translateMessage(
+  t: (key: string, params?: Record<string, string | number>) => string,
+  value?: string | null
+) {
+  if (!value) {
+    return null;
+  }
+
+  const translated = t(value);
+  return translated === value ? value : translated;
+}
+
+export function PasswordSettingsPageClient({
+  profile,
+  user,
+  successMessage,
+  errorMessage,
+}: PasswordSettingsPageClientProps) {
+  const { t } = useTranslations();
+
+  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">
+          <form action={changePasswordAction}>
+            <CardHeader>
+              <CardTitle>
+                {t('profile_password_title') === 'profile_password_title'
+                  ? 'Change your password'
+                  : t('profile_password_title')}
+              </CardTitle>
+              <CardDescription>
+                {t('profile_password_description') ===
+                'profile_password_description'
+                  ? 'Update your account password without leaving your profile.'
+                  : t('profile_password_description')}
+              </CardDescription>
+            </CardHeader>
+
+            <CardContent className="space-y-6">
+              <div className="grid gap-4 md:grid-cols-2">
+                <div className="space-y-2">
+                  <Label htmlFor="password">
+                    {t('new_password') === 'new_password'
+                      ? 'New password'
+                      : t('new_password')}
+                  </Label>
+                  <Input
+                    id="password"
+                    name="password"
+                    type="password"
+                    autoComplete="new-password"
+                    required
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <Label htmlFor="confirmPassword">
+                    {t('confirm_new_password') === 'confirm_new_password'
+                      ? 'Confirm new password'
+                      : t('confirm_new_password')}
+                  </Label>
+                  <Input
+                    id="confirmPassword"
+                    name="confirmPassword"
+                    type="password"
+                    autoComplete="new-password"
+                    required
+                  />
+                </div>
+              </div>
+
+              {successMessage ? (
+                <div className="rounded-xl border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm text-emerald-700">
+                  {translateMessage(t, successMessage)}
+                </div>
+              ) : null}
+
+              {errorMessage ? (
+                <div className="rounded-xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
+                  {translateMessage(t, errorMessage)}
+                </div>
+              ) : null}
+            </CardContent>
+
+            <CardFooter className="flex justify-end">
+              <Button type="submit" size="lg">
+                {t('save_changes') === 'save_changes'
+                  ? 'Save changes'
+                  : t('save_changes')}
+              </Button>
+            </CardFooter>
+          </form>
+        </Card>
+      </div>
+    </div>
+  );
+}

package/templates/nextblock-template/app/profile/password/actions.ts

@@ -1,59 +1,59 @@
-'use server';
-
-import { createClient } from '@nextblock-cms/db/server';
-import { encodedRedirect } from '@nextblock-cms/utils/server';
-import { redirect } from 'next/navigation';
-
-export async function changePasswordAction(formData: FormData) {
-  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
-    redirect('/profile');
-  }
-
-  const supabase = createClient();
-  const {
-    data: { user },
-    error: authError,
-  } = await supabase.auth.getUser();
-
-  if (authError || !user) {
-    redirect('/sign-in?redirect=%2Fprofile%2Fpassword');
-  }
-
-  const password = formData.get('password')?.toString() || '';
-  const confirmPassword =
-    formData.get('confirmPassword')?.toString() || '';
-
-  if (!password || !confirmPassword) {
-    return encodedRedirect(
-      'error',
-      '/profile/password',
-      'password_update_failed'
-    );
-  }
-
-  if (password !== confirmPassword) {
-    return encodedRedirect(
-      'error',
-      '/profile/password',
-      'passwords_do_not_match'
-    );
-  }
-
-  const { error } = await supabase.auth.updateUser({
-    password,
-  });
-
-  if (error) {
-    return encodedRedirect(
-      'error',
-      '/profile/password',
-      'password_update_failed'
-    );
-  }
-
-  return encodedRedirect(
-    'success',
-    '/profile/password',
-    'password_updated_success'
-  );
-}
+'use server';
+
+import { createClient } from '@nextblock-cms/db/server';
+import { encodedRedirect } from '@nextblock-cms/utils/server';
+import { redirect } from 'next/navigation';
+
+export async function changePasswordAction(formData: FormData) {
+  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
+    redirect('/profile');
+  }
+
+  const supabase = createClient();
+  const {
+    data: { user },
+    error: authError,
+  } = await supabase.auth.getUser();
+
+  if (authError || !user) {
+    redirect('/sign-in?redirect=%2Fprofile%2Fpassword');
+  }
+
+  const password = formData.get('password')?.toString() || '';
+  const confirmPassword =
+    formData.get('confirmPassword')?.toString() || '';
+
+  if (!password || !confirmPassword) {
+    return encodedRedirect(
+      'error',
+      '/profile/password',
+      'password_update_failed'
+    );
+  }
+
+  if (password !== confirmPassword) {
+    return encodedRedirect(
+      'error',
+      '/profile/password',
+      'passwords_do_not_match'
+    );
+  }
+
+  const { error } = await supabase.auth.updateUser({
+    password,
+  });
+
+  if (error) {
+    return encodedRedirect(
+      'error',
+      '/profile/password',
+      'password_update_failed'
+    );
+  }
+
+  return encodedRedirect(
+    'success',
+    '/profile/password',
+    'password_updated_success'
+  );
+}

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

@@ -1,27 +1,27 @@
-import { requireProfileAccountContext } from '../account-data';
-import { PasswordSettingsPageClient } from './PasswordSettingsPageClient';
-import { notFound } from 'next/navigation';
-
-export default async function ProfilePasswordPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ success?: string; error?: string }>;
-}) {
-  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
-    notFound();
-  }
-
-  const { profile, user } = await requireProfileAccountContext(
-    '/profile/password'
-  );
-  const params = await searchParams;
-
-  return (
-    <PasswordSettingsPageClient
-      profile={profile}
-      user={user}
-      successMessage={params.success || null}
-      errorMessage={params.error || null}
-    />
-  );
-}
+import { requireProfileAccountContext } from '../account-data';
+import { PasswordSettingsPageClient } from './PasswordSettingsPageClient';
+import { notFound } from 'next/navigation';
+
+export default async function ProfilePasswordPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ success?: string; error?: string }>;
+}) {
+  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
+    notFound();
+  }
+
+  const { profile, user } = await requireProfileAccountContext(
+    '/profile/password'
+  );
+  const params = await searchParams;
+
+  return (
+    <PasswordSettingsPageClient
+      profile={profile}
+      user={user}
+      successMessage={params.success || null}
+      errorMessage={params.error || null}
+    />
+  );
+}