create-nextblock 0.16.1 → 0.16.2

package/templates/nextblock-template/app/cms/messages/page.tsx

@@ -1,87 +1,87 @@
-import { redirect } from 'next/navigation';
-import { createClient } from '@nextblock-cms/db/server';
-
-import { isEmailConfigured } from '../../../lib/config/email-settings';
-import {
-  getStoreContactEmail,
-  resolveSellerContactEmail,
-} from '../../../lib/commerce/seller-contact';
-import { loadInbox, loadThreadDetail, type ThreadDetail } from './loadInbox';
-import MessagesClient from './MessagesClient';
-
-export const metadata = {
-  title: 'Messages | NextBlock™ CMS',
-};
-
-// Messages arrive from the public site at any moment; a cached page would show an admin
-// an empty inbox that is not.
-export const dynamic = 'force-dynamic';
-
-export default async function MessagesPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ source?: string; page?: string; thread?: string; handled?: string }>;
-}) {
-  const params = await searchParams;
-
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) redirect('/sign-in');
-
-  const { data: profile } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .maybeSingle();
-
-  if (profile?.role !== 'ADMIN' && profile?.role !== 'WRITER') {
-    redirect('/unauthorized');
-  }
-
-  const isAdmin = profile?.role === 'ADMIN';
-
-  const [inbox, storeContactEmail, resolvedFallback, smtpConfigured] = await Promise.all([
-    loadInbox({
-      source: params.source,
-      page: params.page ? Number(params.page) : 0,
-      isAdmin,
-      showHandled: params.handled === '1',
-    }),
-    isAdmin ? getStoreContactEmail() : Promise.resolve(''),
-    isAdmin
-      ? resolveSellerContactEmail()
-      : Promise.resolve({ email: null, source: 'none' as const }),
-    isEmailConfigured().catch(() => false),
-  ]);
-
-  // Only the open conversation's history is loaded, not every thread's.
-  let openThread: ThreadDetail | null = null;
-  if (isAdmin && params.thread) {
-    openThread = await loadThreadDetail(params.thread);
-  }
-
-  return (
-    <div className="space-y-6">
-      <div>
-        <h1 className="text-2xl font-bold">Messages</h1>
-        <p className="text-sm text-muted-foreground">
-          Everything people send you — product enquiries, contact forms, reviews and
-          comments — in one place.
-        </p>
-      </div>
-
-      <MessagesClient
-        inbox={inbox}
-        openThread={openThread}
-        isAdmin={isAdmin}
-        activeSource={params.source ?? ''}
-        showHandled={params.handled === '1'}
-        storeContactEmail={storeContactEmail}
-        resolvedFallback={{ email: resolvedFallback.email, source: resolvedFallback.source }}
-        smtpConfigured={smtpConfigured}
-      />
-    </div>
-  );
-}
+import { redirect } from 'next/navigation';
+import { createClient } from '@nextblock-cms/db/server';
+
+import { isEmailConfigured } from '../../../lib/config/email-settings';
+import {
+  getStoreContactEmail,
+  resolveSellerContactEmail,
+} from '../../../lib/commerce/seller-contact';
+import { loadInbox, loadThreadDetail, type ThreadDetail } from './loadInbox';
+import MessagesClient from './MessagesClient';
+
+export const metadata = {
+  title: 'Messages | NextBlock™ CMS',
+};
+
+// Messages arrive from the public site at any moment; a cached page would show an admin
+// an empty inbox that is not.
+export const dynamic = 'force-dynamic';
+
+export default async function MessagesPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ source?: string; page?: string; thread?: string; handled?: string }>;
+}) {
+  const params = await searchParams;
+
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) redirect('/sign-in');
+
+  const { data: profile } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .maybeSingle();
+
+  if (profile?.role !== 'ADMIN' && profile?.role !== 'WRITER') {
+    redirect('/unauthorized');
+  }
+
+  const isAdmin = profile?.role === 'ADMIN';
+
+  const [inbox, storeContactEmail, resolvedFallback, smtpConfigured] = await Promise.all([
+    loadInbox({
+      source: params.source,
+      page: params.page ? Number(params.page) : 0,
+      isAdmin,
+      showHandled: params.handled === '1',
+    }),
+    isAdmin ? getStoreContactEmail() : Promise.resolve(''),
+    isAdmin
+      ? resolveSellerContactEmail()
+      : Promise.resolve({ email: null, source: 'none' as const }),
+    isEmailConfigured().catch(() => false),
+  ]);
+
+  // Only the open conversation's history is loaded, not every thread's.
+  let openThread: ThreadDetail | null = null;
+  if (isAdmin && params.thread) {
+    openThread = await loadThreadDetail(params.thread);
+  }
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-2xl font-bold">Messages</h1>
+        <p className="text-sm text-muted-foreground">
+          Everything people send you — product enquiries, contact forms, reviews and
+          comments — in one place.
+        </p>
+      </div>
+
+      <MessagesClient
+        inbox={inbox}
+        openThread={openThread}
+        isAdmin={isAdmin}
+        activeSource={params.source ?? ''}
+        showHandled={params.handled === '1'}
+        storeContactEmail={storeContactEmail}
+        resolvedFallback={{ email: resolvedFallback.email, source: resolvedFallback.source }}
+        smtpConfigured={smtpConfigured}
+      />
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/messages/require-admin.ts

@@ -1,37 +1,37 @@
-import { createClient } from '@nextblock-cms/db/server';
-
-/**
- * Admin gate shared by the Messages server actions.
- *
- * Lives outside `actions.ts` because that file is `'use server'`, where every export
- * must itself be a valid server action — a helper returning a Supabase client cannot be
- * exported from there.
- *
- * This is the check standing between a WRITER and every private conversation on the
- * site: visitor names, addresses, and free text. RLS enforces the same rule
- * independently, so a bug here fails closed rather than open, but the redundancy is the
- * point.
- */
-export async function requireAdminSupabaseClient() {
-  const supabase = createClient();
-  const {
-    data: { user },
-    error: userError,
-  } = await supabase.auth.getUser();
-
-  if (userError || !user) {
-    throw new Error('You must be logged in to manage messages.');
-  }
-
-  const { data: profile, error: profileError } = await supabase
-    .from('profiles')
-    .select('role, full_name')
-    .eq('id', user.id)
-    .single();
-
-  if (profileError || !profile || profile.role !== 'ADMIN') {
-    throw new Error('You do not have permission to manage messages.');
-  }
-
-  return { supabase, userId: user.id, fullName: profile.full_name as string | null };
-}
+import { createClient } from '@nextblock-cms/db/server';
+
+/**
+ * Admin gate shared by the Messages server actions.
+ *
+ * Lives outside `actions.ts` because that file is `'use server'`, where every export
+ * must itself be a valid server action — a helper returning a Supabase client cannot be
+ * exported from there.
+ *
+ * This is the check standing between a WRITER and every private conversation on the
+ * site: visitor names, addresses, and free text. RLS enforces the same rule
+ * independently, so a bug here fails closed rather than open, but the redundancy is the
+ * point.
+ */
+export async function requireAdminSupabaseClient() {
+  const supabase = createClient();
+  const {
+    data: { user },
+    error: userError,
+  } = await supabase.auth.getUser();
+
+  if (userError || !user) {
+    throw new Error('You must be logged in to manage messages.');
+  }
+
+  const { data: profile, error: profileError } = await supabase
+    .from('profiles')
+    .select('role, full_name')
+    .eq('id', user.id)
+    .single();
+
+  if (profileError || !profile || profile.role !== 'ADMIN') {
+    throw new Error('You do not have permission to manage messages.');
+  }
+
+  return { supabase, userId: user.id, fullName: profile.full_name as string | null };
+}

package/templates/nextblock-template/app/cms/navigation/components/NavigationMenuDnd.tsx

@@ -176,9 +176,9 @@ interface NavigationMenuDndProps {
   initialItems: NavigationItem[];
 }
 
-export default function NavigationMenuDnd({ menuKey, languageCode, initialItems }: NavigationMenuDndProps) {
-  void menuKey;
-  // Prevent SSR/hydration mismatches from dnd-kit by rendering on client only
+export default function NavigationMenuDnd({ menuKey, languageCode, initialItems }: NavigationMenuDndProps) {
+  void menuKey;
+  // Prevent SSR/hydration mismatches from dnd-kit by rendering on client only
   // Keep hooks order stable; move early return after hooks
   const [isMounted, setIsMounted] = useState(false);
   useEffect(() => { setIsMounted(true); }, []);