create-nextblock 0.16.4 → 0.17.1

package/templates/nextblock-template/app/cms/components/TablePagination.tsx

@@ -1,136 +1,136 @@
-"use client";
-
-import React from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import {
-  Button,
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@nextblock-cms/ui";
-import { ChevronLeft, ChevronRight } from "lucide-react";
-
-interface TablePaginationProps {
-  currentPage: number;
-  pageSize: number;
-  totalCount: number;
-  basePath: string;
-  itemLabel?: string;
-  pageSizeOptions?: number[];
-}
-
-export default function TablePagination({
-  currentPage,
-  pageSize,
-  totalCount,
-  basePath,
-  itemLabel = "items",
-  pageSizeOptions = [10, 25, 50, 100],
-}: TablePaginationProps) {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
-  const from = totalCount === 0 ? 0 : (currentPage - 1) * pageSize + 1;
-  const to = Math.min(totalCount, currentPage * pageSize);
-
-  const navigateTo = (newPage: number, newPageSize?: number) => {
-    const current = new URLSearchParams(Array.from(searchParams.entries()));
-
-    if (newPage > 1) {
-      current.set("page", newPage.toString());
-    } else {
-      current.delete("page");
-    }
-
-    const effectivePageSize = newPageSize ?? pageSize;
-    if (effectivePageSize !== 25) {
-      current.set("pageSize", effectivePageSize.toString());
-    } else {
-      current.delete("pageSize");
-    }
-
-    const query = current.toString();
-    router.push(`${basePath}${query ? `?${query}` : ""}`);
-  };
-
-  const handlePageSizeChange = (val: string) => {
-    const nextSize = parseInt(val, 10);
-    if (!Number.isNaN(nextSize) && nextSize > 0) {
-      // Reset to page 1 when changing page size
-      navigateTo(1, nextSize);
-    }
-  };
-
-  return (
-    <div className="flex flex-col sm:flex-row items-center justify-between gap-4 px-4 py-3 bg-muted/20 border-t border-slate-200 dark:border-slate-700 text-xs sm:text-sm text-muted-foreground">
-      {/* Item summary */}
-      <div className="flex items-center gap-1">
-        <span>Showing</span>
-        <span className="font-medium text-foreground">{from}</span>
-        <span>to</span>
-        <span className="font-medium text-foreground">{to}</span>
-        <span>of</span>
-        <span className="font-medium text-foreground">{totalCount}</span>
-        <span>{itemLabel}</span>
-      </div>
-
-      {/* Controls: Page size + Pagination buttons */}
-      <div className="flex items-center gap-4 sm:gap-6 flex-wrap">
-        {/* Rows per page selector */}
-        <div className="flex items-center gap-2">
-          <span className="text-xs">Rows per page:</span>
-          <Select
-            value={pageSize.toString()}
-            onValueChange={handlePageSizeChange}
-          >
-            <SelectTrigger className="h-8 w-[72px] text-xs">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              {pageSizeOptions.map((opt) => (
-                <SelectItem key={opt} value={opt.toString()} className="text-xs">
-                  {opt}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        </div>
-
-        {/* Page counter */}
-        <div className="flex items-center gap-1 text-xs">
-          <span>Page</span>
-          <span className="font-medium text-foreground">{currentPage}</span>
-          <span>of</span>
-          <span className="font-medium text-foreground">{totalPages}</span>
-        </div>
-
-        {/* Prev / Next buttons */}
-        <div className="flex items-center gap-1">
-          <Button
-            variant="outline"
-            size="sm"
-            className="h-8 w-8 p-0"
-            disabled={currentPage <= 1}
-            onClick={() => navigateTo(currentPage - 1)}
-            aria-label="Previous page"
-          >
-            <ChevronLeft className="h-4 w-4" />
-          </Button>
-          <Button
-            variant="outline"
-            size="sm"
-            className="h-8 w-8 p-0"
-            disabled={currentPage >= totalPages}
-            onClick={() => navigateTo(currentPage + 1)}
-            aria-label="Next page"
-          >
-            <ChevronRight className="h-4 w-4" />
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}
+"use client";
+
+import React from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+import {
+  Button,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@nextblock-cms/ui";
+import { ChevronLeft, ChevronRight } from "lucide-react";
+
+interface TablePaginationProps {
+  currentPage: number;
+  pageSize: number;
+  totalCount: number;
+  basePath: string;
+  itemLabel?: string;
+  pageSizeOptions?: number[];
+}
+
+export default function TablePagination({
+  currentPage,
+  pageSize,
+  totalCount,
+  basePath,
+  itemLabel = "items",
+  pageSizeOptions = [10, 25, 50, 100],
+}: TablePaginationProps) {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+  const from = totalCount === 0 ? 0 : (currentPage - 1) * pageSize + 1;
+  const to = Math.min(totalCount, currentPage * pageSize);
+
+  const navigateTo = (newPage: number, newPageSize?: number) => {
+    const current = new URLSearchParams(Array.from(searchParams.entries()));
+
+    if (newPage > 1) {
+      current.set("page", newPage.toString());
+    } else {
+      current.delete("page");
+    }
+
+    const effectivePageSize = newPageSize ?? pageSize;
+    if (effectivePageSize !== 25) {
+      current.set("pageSize", effectivePageSize.toString());
+    } else {
+      current.delete("pageSize");
+    }
+
+    const query = current.toString();
+    router.push(`${basePath}${query ? `?${query}` : ""}`);
+  };
+
+  const handlePageSizeChange = (val: string) => {
+    const nextSize = parseInt(val, 10);
+    if (!Number.isNaN(nextSize) && nextSize > 0) {
+      // Reset to page 1 when changing page size
+      navigateTo(1, nextSize);
+    }
+  };
+
+  return (
+    <div className="flex flex-col sm:flex-row items-center justify-between gap-4 px-4 py-3 bg-muted/20 border-t border-slate-200 dark:border-slate-700 text-xs sm:text-sm text-muted-foreground">
+      {/* Item summary */}
+      <div className="flex items-center gap-1">
+        <span>Showing</span>
+        <span className="font-medium text-foreground">{from}</span>
+        <span>to</span>
+        <span className="font-medium text-foreground">{to}</span>
+        <span>of</span>
+        <span className="font-medium text-foreground">{totalCount}</span>
+        <span>{itemLabel}</span>
+      </div>
+
+      {/* Controls: Page size + Pagination buttons */}
+      <div className="flex items-center gap-4 sm:gap-6 flex-wrap">
+        {/* Rows per page selector */}
+        <div className="flex items-center gap-2">
+          <span className="text-xs">Rows per page:</span>
+          <Select
+            value={pageSize.toString()}
+            onValueChange={handlePageSizeChange}
+          >
+            <SelectTrigger className="h-8 w-[72px] text-xs">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {pageSizeOptions.map((opt) => (
+                <SelectItem key={opt} value={opt.toString()} className="text-xs">
+                  {opt}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+
+        {/* Page counter */}
+        <div className="flex items-center gap-1 text-xs">
+          <span>Page</span>
+          <span className="font-medium text-foreground">{currentPage}</span>
+          <span>of</span>
+          <span className="font-medium text-foreground">{totalPages}</span>
+        </div>
+
+        {/* Prev / Next buttons */}
+        <div className="flex items-center gap-1">
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-8 w-8 p-0"
+            disabled={currentPage <= 1}
+            onClick={() => navigateTo(currentPage - 1)}
+            aria-label="Previous page"
+          >
+            <ChevronLeft className="h-4 w-4" />
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            className="h-8 w-8 p-0"
+            disabled={currentPage >= totalPages}
+            onClick={() => navigateTo(currentPage + 1)}
+            aria-label="Next page"
+          >
+            <ChevronRight className="h-4 w-4" />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/components/TwoFactorReminderBanner.tsx

@@ -1,45 +1,45 @@
-'use client';
-
-import Link from 'next/link';
-import { useState } from 'react';
-import { Button } from '@nextblock-cms/ui';
-import { ShieldAlert, X } from 'lucide-react';
-
-/**
- * In-app reminder for staff (ADMIN/WRITER) who have not enrolled a second factor,
- * shown when the "Encourage staff to enable 2FA" policy is on. Dismissible for the
- * session (state lives in the persistent CMS layout, so it survives client-side
- * navigation but reappears on the next full load until 2FA is set up).
- */
-export default function TwoFactorReminderBanner() {
-  const [dismissed, setDismissed] = useState(false);
-  if (dismissed) return null;
-
-  return (
-    <div className="mb-6 flex items-start gap-3 rounded-lg border border-amber-300 bg-amber-50 px-4 py-3 text-amber-900 dark:border-amber-700/60 dark:bg-amber-900/20 dark:text-amber-200">
-      <ShieldAlert className="mt-0.5 h-5 w-5 shrink-0" />
-      <div className="min-w-0 flex-1">
-        <p className="text-sm font-medium">
-          Your account doesn&rsquo;t have two-factor authentication enabled.
-        </p>
-        <p className="text-xs opacity-90">
-          Protect your CMS account by adding a second factor (authenticator app or email code).
-        </p>
-      </div>
-      <div className="flex shrink-0 items-center gap-2">
-        <Button asChild size="sm" variant="outline" className="border-amber-400">
-          <Link href="/cms/settings/security">Set up 2FA</Link>
-        </Button>
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={() => setDismissed(true)}
-          aria-label="Dismiss for now"
-          className="h-8 w-8"
-        >
-          <X className="h-4 w-4" />
-        </Button>
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import Link from 'next/link';
+import { useState } from 'react';
+import { Button } from '@nextblock-cms/ui';
+import { ShieldAlert, X } from 'lucide-react';
+
+/**
+ * In-app reminder for staff (ADMIN/WRITER) who have not enrolled a second factor,
+ * shown when the "Encourage staff to enable 2FA" policy is on. Dismissible for the
+ * session (state lives in the persistent CMS layout, so it survives client-side
+ * navigation but reappears on the next full load until 2FA is set up).
+ */
+export default function TwoFactorReminderBanner() {
+  const [dismissed, setDismissed] = useState(false);
+  if (dismissed) return null;
+
+  return (
+    <div className="mb-6 flex items-start gap-3 rounded-lg border border-amber-300 bg-amber-50 px-4 py-3 text-amber-900 dark:border-amber-700/60 dark:bg-amber-900/20 dark:text-amber-200">
+      <ShieldAlert className="mt-0.5 h-5 w-5 shrink-0" />
+      <div className="min-w-0 flex-1">
+        <p className="text-sm font-medium">
+          Your account doesn&rsquo;t have two-factor authentication enabled.
+        </p>
+        <p className="text-xs opacity-90">
+          Protect your CMS account by adding a second factor (authenticator app or email code).
+        </p>
+      </div>
+      <div className="flex shrink-0 items-center gap-2">
+        <Button asChild size="sm" variant="outline" className="border-amber-400">
+          <Link href="/cms/settings/security">Set up 2FA</Link>
+        </Button>
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={() => setDismissed(true)}
+          aria-label="Dismiss for now"
+          className="h-8 w-8"
+        >
+          <X className="h-4 w-4" />
+        </Button>
+      </div>
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/components/github-connect-actions.ts

@@ -1,102 +1,102 @@
-'use server';
-
-import { cookies } from 'next/headers';
-import { revalidatePath } from 'next/cache';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  startDeviceFlow,
-  pollDeviceFlowOnce,
-  installSyncWorkflow,
-} from '../../../lib/updates/github-device';
-import { markSyncWorkflowInstalled } from '../../../lib/updates/check-upstream';
-
-const DEVICE_COOKIE = 'nb_gh_device';
-
-/** ADMIN gate, mirroring the rest of the CMS server entry points. */
-async function isAdmin(): Promise<boolean> {
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return false;
-  const { data: profile, error } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .single();
-  return !error && profile?.role === 'ADMIN';
-}
-
-export interface StartConnectResult {
-  ok: boolean;
-  userCode?: string;
-  verificationUri?: string;
-  interval?: number;
-  expiresIn?: number;
-  error?: string;
-}
-
-/** Begin the device flow; stash the device code in an httpOnly cookie for polling. */
-export async function startGithubConnect(): Promise<StartConnectResult> {
-  if (!(await isAdmin())) return { ok: false, error: 'Administrator role required.' };
-
-  try {
-    const flow = await startDeviceFlow();
-    const store = await cookies();
-    store.set(DEVICE_COOKIE, flow.deviceCode, {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
-      sameSite: 'lax',
-      path: '/cms',
-      maxAge: flow.expiresIn,
-    });
-    return {
-      ok: true,
-      userCode: flow.userCode,
-      verificationUri: flow.verificationUri,
-      interval: flow.interval,
-      expiresIn: flow.expiresIn,
-    };
-  } catch (caught) {
-    return { ok: false, error: caught instanceof Error ? caught.message : 'Could not start GitHub connect.' };
-  }
-}
-
-export type PollConnectResult =
-  | { status: 'installed'; htmlUrl?: string }
-  | { status: 'pending'; slowDown?: boolean }
-  | { status: 'error'; error: string };
-
-/** Poll once; on authorization, install the workflow and clear the device cookie. */
-export async function pollGithubConnect(): Promise<PollConnectResult> {
-  if (!(await isAdmin())) return { status: 'error', error: 'Administrator role required.' };
-
-  const store = await cookies();
-  const deviceCode = store.get(DEVICE_COOKIE)?.value;
-  if (!deviceCode) {
-    return { status: 'error', error: 'Connect session expired — start again.' };
-  }
-
-  const poll = await pollDeviceFlowOnce(deviceCode);
-
-  if (poll.status === 'pending') return { status: 'pending', slowDown: poll.slowDown };
-
-  if (poll.status === 'authorized') {
-    const install = await installSyncWorkflow(poll.token);
-    store.delete({ name: DEVICE_COOKIE, path: '/cms' });
-    if (install.ok) {
-      // We just installed the workflow — flip the onboarding state now instead of waiting
-      // for the throttled background poll / GitHub's registration lag.
-      await markSyncWorkflowInstalled();
-      revalidatePath('/cms', 'layout');
-      return { status: 'installed', htmlUrl: install.htmlUrl };
-    }
-    return { status: 'error', error: install.error ?? 'Could not install the workflow.' };
-  }
-
-  // expired / denied / error — clear the session.
-  store.delete({ name: DEVICE_COOKIE, path: '/cms' });
-  if (poll.status === 'expired') return { status: 'error', error: 'Authorization timed out — start again.' };
-  if (poll.status === 'denied') return { status: 'error', error: 'Authorization was declined.' };
-  return { status: 'error', error: poll.error };
-}
+'use server';
+
+import { cookies } from 'next/headers';
+import { revalidatePath } from 'next/cache';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  startDeviceFlow,
+  pollDeviceFlowOnce,
+  installSyncWorkflow,
+} from '../../../lib/updates/github-device';
+import { markSyncWorkflowInstalled } from '../../../lib/updates/check-upstream';
+
+const DEVICE_COOKIE = 'nb_gh_device';
+
+/** ADMIN gate, mirroring the rest of the CMS server entry points. */
+async function isAdmin(): Promise<boolean> {
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return false;
+  const { data: profile, error } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .single();
+  return !error && profile?.role === 'ADMIN';
+}
+
+export interface StartConnectResult {
+  ok: boolean;
+  userCode?: string;
+  verificationUri?: string;
+  interval?: number;
+  expiresIn?: number;
+  error?: string;
+}
+
+/** Begin the device flow; stash the device code in an httpOnly cookie for polling. */
+export async function startGithubConnect(): Promise<StartConnectResult> {
+  if (!(await isAdmin())) return { ok: false, error: 'Administrator role required.' };
+
+  try {
+    const flow = await startDeviceFlow();
+    const store = await cookies();
+    store.set(DEVICE_COOKIE, flow.deviceCode, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'lax',
+      path: '/cms',
+      maxAge: flow.expiresIn,
+    });
+    return {
+      ok: true,
+      userCode: flow.userCode,
+      verificationUri: flow.verificationUri,
+      interval: flow.interval,
+      expiresIn: flow.expiresIn,
+    };
+  } catch (caught) {
+    return { ok: false, error: caught instanceof Error ? caught.message : 'Could not start GitHub connect.' };
+  }
+}
+
+export type PollConnectResult =
+  | { status: 'installed'; htmlUrl?: string }
+  | { status: 'pending'; slowDown?: boolean }
+  | { status: 'error'; error: string };
+
+/** Poll once; on authorization, install the workflow and clear the device cookie. */
+export async function pollGithubConnect(): Promise<PollConnectResult> {
+  if (!(await isAdmin())) return { status: 'error', error: 'Administrator role required.' };
+
+  const store = await cookies();
+  const deviceCode = store.get(DEVICE_COOKIE)?.value;
+  if (!deviceCode) {
+    return { status: 'error', error: 'Connect session expired — start again.' };
+  }
+
+  const poll = await pollDeviceFlowOnce(deviceCode);
+
+  if (poll.status === 'pending') return { status: 'pending', slowDown: poll.slowDown };
+
+  if (poll.status === 'authorized') {
+    const install = await installSyncWorkflow(poll.token);
+    store.delete({ name: DEVICE_COOKIE, path: '/cms' });
+    if (install.ok) {
+      // We just installed the workflow — flip the onboarding state now instead of waiting
+      // for the throttled background poll / GitHub's registration lag.
+      await markSyncWorkflowInstalled();
+      revalidatePath('/cms', 'layout');
+      return { status: 'installed', htmlUrl: install.htmlUrl };
+    }
+    return { status: 'error', error: install.error ?? 'Could not install the workflow.' };
+  }
+
+  // expired / denied / error — clear the session.
+  store.delete({ name: DEVICE_COOKIE, path: '/cms' });
+  if (poll.status === 'expired') return { status: 'error', error: 'Authorization timed out — start again.' };
+  if (poll.status === 'denied') return { status: 'error', error: 'Authorization was declined.' };
+  return { status: 'error', error: poll.error };
+}

package/templates/nextblock-template/app/cms/components/system-alerts-actions.ts

@@ -1,31 +1,31 @@
-'use server';
-
-import { revalidatePath } from 'next/cache';
-import { createClient } from '@nextblock-cms/db/server';
-
-/**
- * Mark a system alert resolved (dismiss it from the dashboard banner). Runs as the
- * signed-in user; the system_alerts UPDATE RLS policy restricts this to ADMINs, so a
- * non-admin caller simply updates zero rows. Inserts are service-role only.
- */
-export async function resolveSystemAlert(
-  id: string,
-): Promise<{ ok: boolean; error?: string }> {
-  if (!id) return { ok: false, error: 'Missing alert id.' };
-
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return { ok: false, error: 'Not authenticated.' };
-
-  const { error } = await supabase
-    .from('system_alerts')
-    .update({ is_resolved: true, resolved_at: new Date().toISOString() })
-    .eq('id', id);
-
-  if (error) return { ok: false, error: error.message };
-
-  revalidatePath('/cms', 'layout');
-  return { ok: true };
-}
+'use server';
+
+import { revalidatePath } from 'next/cache';
+import { createClient } from '@nextblock-cms/db/server';
+
+/**
+ * Mark a system alert resolved (dismiss it from the dashboard banner). Runs as the
+ * signed-in user; the system_alerts UPDATE RLS policy restricts this to ADMINs, so a
+ * non-admin caller simply updates zero rows. Inserts are service-role only.
+ */
+export async function resolveSystemAlert(
+  id: string,
+): Promise<{ ok: boolean; error?: string }> {
+  if (!id) return { ok: false, error: 'Missing alert id.' };
+
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return { ok: false, error: 'Not authenticated.' };
+
+  const { error } = await supabase
+    .from('system_alerts')
+    .update({ is_resolved: true, resolved_at: new Date().toISOString() })
+    .eq('id', id);
+
+  if (error) return { ok: false, error: error.message };
+
+  revalidatePath('/cms', 'layout');
+  return { ok: true };
+}