create-nextblock 0.12.9 → 0.12.11

package/templates/nextblock-template/app/cms/settings/extra-translations/page.tsx

@@ -1,93 +1,93 @@
-import { Alert, AlertDescription } from '@nextblock-cms/ui';
-
-import { getLanguages } from '../languages/actions';
-import { getTranslations } from './actions';
-import { ExtraTranslationsWorkspace } from './ExtraTranslationsWorkspace';
-
-type Language = NonNullable<Awaited<ReturnType<typeof getLanguages>>['data']>[number];
-
-interface ExtraTranslationsPageProps {
-  searchParams?: Promise<{
-    language?: string;
-    status?: string;
-    success?: string;
-  }>;
-}
-
-function getInitialLanguageCode(languages: Language[], requestedLanguageCode?: string) {
-  if (!languages.length) {
-    return 'en';
-  }
-
-  const trimmedRequestedCode = requestedLanguageCode?.trim().toLowerCase();
-
-  if (trimmedRequestedCode) {
-    const matchedLanguage = languages.find(
-      (language) => language.code.toLowerCase() === trimmedRequestedCode
-    );
-
-    if (matchedLanguage) {
-      return matchedLanguage.code;
-    }
-  }
-
-  const firstNonEnglishLanguage = languages.find(
-    (language) => language.code.toLowerCase() !== 'en'
-  );
-
-  return firstNonEnglishLanguage?.code ?? languages[0]?.code ?? 'en';
-}
-
-function getInitialStatusFilter(
-  requestedStatus?: string,
-  requestedLanguageCode?: string
-) {
-  if (
-    requestedStatus === 'all' ||
-    requestedStatus === 'missing' ||
-    requestedStatus === 'translated'
-  ) {
-    return requestedStatus;
-  }
-
-  return requestedLanguageCode ? 'missing' : 'all';
-}
-
-export default async function ExtraTranslationsPage(
-  props: ExtraTranslationsPageProps
-) {
-  const searchParams = await props.searchParams;
-  const [translations, languagesResult] = await Promise.all([
-    getTranslations(),
-    getLanguages(),
-  ]);
-  const languages = languagesResult.data ?? [];
-  const initialLanguageCode = getInitialLanguageCode(
-    languages,
-    searchParams?.language
-  );
-  const initialStatusFilter = getInitialStatusFilter(
-    searchParams?.status,
-    searchParams?.language
-  );
-  const successMessage = searchParams?.success
-    ? decodeURIComponent(searchParams.success)
-    : null;
-
-  return (
-    <div className="space-y-4 p-6">
-      {successMessage ? (
-        <Alert variant="success">
-          <AlertDescription>{successMessage}</AlertDescription>
-        </Alert>
-      ) : null}
-
-      <ExtraTranslationsWorkspace
-        initialTranslations={translations}
-        languages={languages}
-        initialLanguageCode={initialLanguageCode}
-        initialStatusFilter={initialStatusFilter}
-      />
-    </div>
-  );
-}
+import { Alert, AlertDescription } from '@nextblock-cms/ui';
+
+import { getLanguages } from '../languages/actions';
+import { getTranslations } from './actions';
+import { ExtraTranslationsWorkspace } from './ExtraTranslationsWorkspace';
+
+type Language = NonNullable<Awaited<ReturnType<typeof getLanguages>>['data']>[number];
+
+interface ExtraTranslationsPageProps {
+  searchParams?: Promise<{
+    language?: string;
+    status?: string;
+    success?: string;
+  }>;
+}
+
+function getInitialLanguageCode(languages: Language[], requestedLanguageCode?: string) {
+  if (!languages.length) {
+    return 'en';
+  }
+
+  const trimmedRequestedCode = requestedLanguageCode?.trim().toLowerCase();
+
+  if (trimmedRequestedCode) {
+    const matchedLanguage = languages.find(
+      (language) => language.code.toLowerCase() === trimmedRequestedCode
+    );
+
+    if (matchedLanguage) {
+      return matchedLanguage.code;
+    }
+  }
+
+  const firstNonEnglishLanguage = languages.find(
+    (language) => language.code.toLowerCase() !== 'en'
+  );
+
+  return firstNonEnglishLanguage?.code ?? languages[0]?.code ?? 'en';
+}
+
+function getInitialStatusFilter(
+  requestedStatus?: string,
+  requestedLanguageCode?: string
+) {
+  if (
+    requestedStatus === 'all' ||
+    requestedStatus === 'missing' ||
+    requestedStatus === 'translated'
+  ) {
+    return requestedStatus;
+  }
+
+  return requestedLanguageCode ? 'missing' : 'all';
+}
+
+export default async function ExtraTranslationsPage(
+  props: ExtraTranslationsPageProps
+) {
+  const searchParams = await props.searchParams;
+  const [translations, languagesResult] = await Promise.all([
+    getTranslations(),
+    getLanguages(),
+  ]);
+  const languages = languagesResult.data ?? [];
+  const initialLanguageCode = getInitialLanguageCode(
+    languages,
+    searchParams?.language
+  );
+  const initialStatusFilter = getInitialStatusFilter(
+    searchParams?.status,
+    searchParams?.language
+  );
+  const successMessage = searchParams?.success
+    ? decodeURIComponent(searchParams.success)
+    : null;
+
+  return (
+    <div className="space-y-4 p-6">
+      {successMessage ? (
+        <Alert variant="success">
+          <AlertDescription>{successMessage}</AlertDescription>
+        </Alert>
+      ) : null}
+
+      <ExtraTranslationsWorkspace
+        initialTranslations={translations}
+        languages={languages}
+        initialLanguageCode={initialLanguageCode}
+        initialStatusFilter={initialStatusFilter}
+      />
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/settings/google-analytics/actions.ts

@@ -1,60 +1,60 @@
-'use server';
-
-import { createClient } from '@nextblock-cms/db/server';
-import { revalidatePath } from 'next/cache';
-import {
-  getPrivacySettings as readPrivacySettings,
-  mergePrivacySettings,
-} from '../../../../lib/privacy/settings';
-import type { PrivacySettings } from '../../../../lib/privacy/types';
-
-export interface GoogleAnalyticsSettings {
-  gtm_id: string;
-  ga_measurement_id: string;
-  custom_scripts: string;
-}
-
-export async function getGoogleAnalyticsSettings(): Promise<GoogleAnalyticsSettings> {
-  const settings = await readPrivacySettings();
-  return {
-    gtm_id: settings.gtm_id,
-    ga_measurement_id: settings.ga_measurement_id,
-    custom_scripts: settings.custom_scripts,
-  };
-}
-
-async function assertAdmin(): Promise<void> {
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) {
-    throw new Error('You must be logged in to update settings.');
-  }
-  const { data: profile } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .single();
-  if (!profile || profile.role !== 'ADMIN') {
-    throw new Error('You do not have permission to perform this action.');
-  }
-}
-
-export async function updateGoogleAnalyticsSettings(formData: FormData) {
-  await assertAdmin();
-
-  // Only the analytics fields are touched; mergePrivacySettings preserves the
-  // banner/corporate fields owned by the Privacy & Consent page.
-  const patch: Partial<PrivacySettings> = {
-    gtm_id: (formData.get('gtm_id')?.toString() ?? '').trim(),
-    ga_measurement_id: (formData.get('ga_measurement_id')?.toString() ?? '').trim(),
-    custom_scripts: formData.get('custom_scripts')?.toString() ?? '',
-  };
-
-  await mergePrivacySettings(patch);
-  // The analytics guard (GTM/GA4 + custom scripts) lives in the root layout.
-  revalidatePath('/', 'layout');
-
-  return { success: true, message: 'Google Analytics settings saved.' };
-}
+'use server';
+
+import { createClient } from '@nextblock-cms/db/server';
+import { revalidatePath } from 'next/cache';
+import {
+  getPrivacySettings as readPrivacySettings,
+  mergePrivacySettings,
+} from '../../../../lib/privacy/settings';
+import type { PrivacySettings } from '../../../../lib/privacy/types';
+
+export interface GoogleAnalyticsSettings {
+  gtm_id: string;
+  ga_measurement_id: string;
+  custom_scripts: string;
+}
+
+export async function getGoogleAnalyticsSettings(): Promise<GoogleAnalyticsSettings> {
+  const settings = await readPrivacySettings();
+  return {
+    gtm_id: settings.gtm_id,
+    ga_measurement_id: settings.ga_measurement_id,
+    custom_scripts: settings.custom_scripts,
+  };
+}
+
+async function assertAdmin(): Promise<void> {
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) {
+    throw new Error('You must be logged in to update settings.');
+  }
+  const { data: profile } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .single();
+  if (!profile || profile.role !== 'ADMIN') {
+    throw new Error('You do not have permission to perform this action.');
+  }
+}
+
+export async function updateGoogleAnalyticsSettings(formData: FormData) {
+  await assertAdmin();
+
+  // Only the analytics fields are touched; mergePrivacySettings preserves the
+  // banner/corporate fields owned by the Privacy & Consent page.
+  const patch: Partial<PrivacySettings> = {
+    gtm_id: (formData.get('gtm_id')?.toString() ?? '').trim(),
+    ga_measurement_id: (formData.get('ga_measurement_id')?.toString() ?? '').trim(),
+    custom_scripts: formData.get('custom_scripts')?.toString() ?? '',
+  };
+
+  await mergePrivacySettings(patch);
+  // The analytics guard (GTM/GA4 + custom scripts) lives in the root layout.
+  revalidatePath('/', 'layout');
+
+  return { success: true, message: 'Google Analytics settings saved.' };
+}

package/templates/nextblock-template/app/cms/settings/google-analytics/components/GoogleAnalyticsForm.tsx

@@ -1,129 +1,129 @@
-'use client';
-
-import { useRef, useState, useTransition } from 'react';
-import {
-  Alert,
-  AlertDescription,
-  Button,
-  Input,
-  Label,
-  Spinner,
-  Textarea,
-} from '@nextblock-cms/ui';
-import { Message } from '../../../../../components/form-message';
-import { useHotkeys } from '../../../../../hooks/use-hotkeys';
-import {
-  updateGoogleAnalyticsSettings,
-  type GoogleAnalyticsSettings,
-} from '../actions';
-
-interface GoogleAnalyticsFormProps {
-  initialSettings: GoogleAnalyticsSettings;
-}
-
-export default function GoogleAnalyticsForm({ initialSettings }: GoogleAnalyticsFormProps) {
-  const [isPending, startTransition] = useTransition();
-  const [message, setMessage] = useState<Message | null>(null);
-
-  const [gtmId, setGtmId] = useState(initialSettings.gtm_id);
-  const [gaId, setGaId] = useState(initialSettings.ga_measurement_id);
-  const [customScripts, setCustomScripts] = useState(initialSettings.custom_scripts);
-
-  const formRef = useRef<HTMLFormElement>(null);
-  useHotkeys('ctrl+s', () => formRef.current?.requestSubmit());
-
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    setMessage(null);
-
-    const formData = new FormData();
-    formData.append('gtm_id', gtmId);
-    formData.append('ga_measurement_id', gaId);
-    formData.append('custom_scripts', customScripts);
-
-    startTransition(async () => {
-      try {
-        const result = await updateGoogleAnalyticsSettings(formData);
-        setMessage({ success: result.message });
-      } catch (error) {
-        setMessage({
-          error: error instanceof Error ? error.message : 'An unknown error occurred.',
-        });
-      }
-    });
-  };
-
-  return (
-    <form ref={formRef} onSubmit={handleSubmit} className="space-y-8">
-      <section className="space-y-4">
-        <div>
-          <h3 className="text-sm font-semibold">Analytics &amp; tracking</h3>
-          <p className="text-xs text-slate-500">
-            These load <strong>only</strong> after a visitor consents to analytics in the
-            Law 25 banner (managed under Privacy &amp; Consent), so the default page weight
-            stays at zero tracking bytes.
-          </p>
-        </div>
-        <div className="space-y-2">
-          <Label htmlFor="gtm_id">Google Tag Manager ID</Label>
-          <Input
-            id="gtm_id"
-            value={gtmId}
-            onChange={(e) => setGtmId(e.target.value)}
-            placeholder="GTM-XXXXXXX"
-          />
-        </div>
-        <div className="space-y-2">
-          <Label htmlFor="ga_measurement_id">GA4 Measurement ID</Label>
-          <Input
-            id="ga_measurement_id"
-            value={gaId}
-            onChange={(e) => setGaId(e.target.value)}
-            placeholder="G-XXXXXXXXXX"
-          />
-          <p className="text-xs text-slate-500">
-            Loads Google Analytics 4 directly via <code>gtag</code>. If you also configure
-            GA4 inside your GTM container, set only one of these to avoid double-counting.
-          </p>
-        </div>
-        <div className="space-y-2">
-          <Label htmlFor="custom_scripts">Custom consented scripts (optional)</Label>
-          <Textarea
-            id="custom_scripts"
-            value={customScripts}
-            onChange={(e) => setCustomScripts(e.target.value)}
-            placeholder="<!-- Additional marketing/analytics <script> tags, injected only after consent -->"
-            rows={4}
-            className="font-mono text-xs"
-          />
-        </div>
-      </section>
-
-      <div className="flex items-center gap-4">
-        <Button type="submit" disabled={isPending}>
-          {isPending ? (
-            <>
-              <Spinner className="mr-2 h-4 w-4 animate-spin" /> Saving...
-            </>
-          ) : (
-            'Save Google Analytics Settings'
-          )}
-        </Button>
-        {message && (
-          <Alert
-            variant={'success' in message ? 'success' : 'destructive'}
-            className="py-2 px-4 w-auto inline-flex items-center"
-          >
-            <AlertDescription>
-              {'success' in message
-                ? message.success
-                : 'error' in message
-                  ? message.error
-                  : ''}
-            </AlertDescription>
-          </Alert>
-        )}
-      </div>
-    </form>
-  );
-}
+'use client';
+
+import { useRef, useState, useTransition } from 'react';
+import {
+  Alert,
+  AlertDescription,
+  Button,
+  Input,
+  Label,
+  Spinner,
+  Textarea,
+} from '@nextblock-cms/ui';
+import { Message } from '../../../../../components/form-message';
+import { useHotkeys } from '../../../../../hooks/use-hotkeys';
+import {
+  updateGoogleAnalyticsSettings,
+  type GoogleAnalyticsSettings,
+} from '../actions';
+
+interface GoogleAnalyticsFormProps {
+  initialSettings: GoogleAnalyticsSettings;
+}
+
+export default function GoogleAnalyticsForm({ initialSettings }: GoogleAnalyticsFormProps) {
+  const [isPending, startTransition] = useTransition();
+  const [message, setMessage] = useState<Message | null>(null);
+
+  const [gtmId, setGtmId] = useState(initialSettings.gtm_id);
+  const [gaId, setGaId] = useState(initialSettings.ga_measurement_id);
+  const [customScripts, setCustomScripts] = useState(initialSettings.custom_scripts);
+
+  const formRef = useRef<HTMLFormElement>(null);
+  useHotkeys('ctrl+s', () => formRef.current?.requestSubmit());
+
+  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setMessage(null);
+
+    const formData = new FormData();
+    formData.append('gtm_id', gtmId);
+    formData.append('ga_measurement_id', gaId);
+    formData.append('custom_scripts', customScripts);
+
+    startTransition(async () => {
+      try {
+        const result = await updateGoogleAnalyticsSettings(formData);
+        setMessage({ success: result.message });
+      } catch (error) {
+        setMessage({
+          error: error instanceof Error ? error.message : 'An unknown error occurred.',
+        });
+      }
+    });
+  };
+
+  return (
+    <form ref={formRef} onSubmit={handleSubmit} className="space-y-8">
+      <section className="space-y-4">
+        <div>
+          <h3 className="text-sm font-semibold">Analytics &amp; tracking</h3>
+          <p className="text-xs text-slate-500">
+            These load <strong>only</strong> after a visitor consents to analytics in the
+            Law 25 banner (managed under Privacy &amp; Consent), so the default page weight
+            stays at zero tracking bytes.
+          </p>
+        </div>
+        <div className="space-y-2">
+          <Label htmlFor="gtm_id">Google Tag Manager ID</Label>
+          <Input
+            id="gtm_id"
+            value={gtmId}
+            onChange={(e) => setGtmId(e.target.value)}
+            placeholder="GTM-XXXXXXX"
+          />
+        </div>
+        <div className="space-y-2">
+          <Label htmlFor="ga_measurement_id">GA4 Measurement ID</Label>
+          <Input
+            id="ga_measurement_id"
+            value={gaId}
+            onChange={(e) => setGaId(e.target.value)}
+            placeholder="G-XXXXXXXXXX"
+          />
+          <p className="text-xs text-slate-500">
+            Loads Google Analytics 4 directly via <code>gtag</code>. If you also configure
+            GA4 inside your GTM container, set only one of these to avoid double-counting.
+          </p>
+        </div>
+        <div className="space-y-2">
+          <Label htmlFor="custom_scripts">Custom consented scripts (optional)</Label>
+          <Textarea
+            id="custom_scripts"
+            value={customScripts}
+            onChange={(e) => setCustomScripts(e.target.value)}
+            placeholder="<!-- Additional marketing/analytics <script> tags, injected only after consent -->"
+            rows={4}
+            className="font-mono text-xs"
+          />
+        </div>
+      </section>
+
+      <div className="flex items-center gap-4">
+        <Button type="submit" disabled={isPending}>
+          {isPending ? (
+            <>
+              <Spinner className="mr-2 h-4 w-4 animate-spin" /> Saving...
+            </>
+          ) : (
+            'Save Google Analytics Settings'
+          )}
+        </Button>
+        {message && (
+          <Alert
+            variant={'success' in message ? 'success' : 'destructive'}
+            className="py-2 px-4 w-auto inline-flex items-center"
+          >
+            <AlertDescription>
+              {'success' in message
+                ? message.success
+                : 'error' in message
+                  ? message.error
+                  : ''}
+            </AlertDescription>
+          </Alert>
+        )}
+      </div>
+    </form>
+  );
+}

package/templates/nextblock-template/app/cms/settings/google-analytics/page.tsx

@@ -1,26 +1,26 @@
-// app/cms/settings/google-analytics/page.tsx
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextblock-cms/ui';
-import { getGoogleAnalyticsSettings } from './actions';
-import GoogleAnalyticsForm from './components/GoogleAnalyticsForm';
-
-export default async function GoogleAnalyticsSettingsPage() {
-  const settings = await getGoogleAnalyticsSettings();
-
-  return (
-    <div className="max-w-4xl mx-auto">
-      <Card>
-        <CardHeader>
-          <CardTitle>Google Analytics</CardTitle>
-          <CardDescription>
-            Configure Google Tag Manager and Google Analytics 4. These tags load only
-            after a visitor accepts analytics in the Law 25 consent banner (managed under
-            Privacy &amp; Consent), so the default page weight stays at zero tracking bytes.
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <GoogleAnalyticsForm initialSettings={settings} />
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
+// app/cms/settings/google-analytics/page.tsx
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextblock-cms/ui';
+import { getGoogleAnalyticsSettings } from './actions';
+import GoogleAnalyticsForm from './components/GoogleAnalyticsForm';
+
+export default async function GoogleAnalyticsSettingsPage() {
+  const settings = await getGoogleAnalyticsSettings();
+
+  return (
+    <div className="max-w-4xl mx-auto">
+      <Card>
+        <CardHeader>
+          <CardTitle>Google Analytics</CardTitle>
+          <CardDescription>
+            Configure Google Tag Manager and Google Analytics 4. These tags load only
+            after a visitor accepts analytics in the Law 25 consent banner (managed under
+            Privacy &amp; Consent), so the default page weight stays at zero tracking bytes.
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <GoogleAnalyticsForm initialSettings={settings} />
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/settings/languages/actions.ts

@@ -121,28 +121,28 @@ export async function createLanguage(formData: FormData) {
     .select()
     .single();
 
-  if (error) {
-    console.error("Error creating language:", error);
-    if (error.code === '23505') { // Unique violation
-        if (error.message.includes('languages_code_key')) {
-            return { error: `Language code '${languageData.code}' already exists.` };
+  if (error) {
+    console.error("Error creating language:", error);
+    if (error.code === '23505') { // Unique violation
+        if (error.message.includes('languages_code_key')) {
+            return { error: `Language code '${languageData.code}' already exists.` };
         }
         if (error.message.includes('ensure_single_default_language_idx')) {
              return { error: `Cannot set this language as default. Another language is already default, or an error occurred unsetting it.` };
         }
     }
     return { error: `Failed to create language: ${error.message}` };
-  }
-
-  revalidatePath("/cms/settings/languages");
-  revalidatePath("/"); // Revalidate home page as language switcher might change
-  revalidatePath("/cms/settings/extra-translations");
-  if (data?.id) {
-    redirect(`/cms/settings/extra-translations?language=${encodeURIComponent(data.code)}&success=${encodeURIComponent("Language created successfully. Please fill the extra translations.")}`);
-  } else {
-    redirect(`/cms/settings/extra-translations?success=${encodeURIComponent("Language created successfully. Please fill the extra translations.")}`);
-  }
-}
+  }
+
+  revalidatePath("/cms/settings/languages");
+  revalidatePath("/"); // Revalidate home page as language switcher might change
+  revalidatePath("/cms/settings/extra-translations");
+  if (data?.id) {
+    redirect(`/cms/settings/extra-translations?language=${encodeURIComponent(data.code)}&success=${encodeURIComponent("Language created successfully. Please fill the extra translations.")}`);
+  } else {
+    redirect(`/cms/settings/extra-translations?success=${encodeURIComponent("Language created successfully. Please fill the extra translations.")}`);
+  }
+}
 
 export async function updateLanguage(languageId: number, formData: FormData) {
   const supabase = createClient();