create-nextblock 0.12.13 → 0.12.15

package/templates/nextblock-template/app/cms/media/components/MediaUploadForm.tsx

@@ -21,11 +21,13 @@ interface MediaUploadFormProps {
   // And will use onUploadSuccess instead of router.refresh().
   returnJustData?: boolean;
   defaultFolder?: string; // Optional pre-populated folder
+  // If true, tightens spacing/heights so the form fits inside a modal on shorter screens.
+  compact?: boolean;
 }
 
 import { useUploadFolder } from "../UploadFolderContext";
 
-export default function MediaUploadForm({ onUploadSuccess, returnJustData, defaultFolder }: MediaUploadFormProps) {
+export default function MediaUploadForm({ onUploadSuccess, returnJustData, defaultFolder, compact }: MediaUploadFormProps) {
   const router = useRouter();
   const [isPending, startTransition] = useTransition();
   const [file, setFile] = useState<File | null>(null);
@@ -292,26 +294,27 @@ export default function MediaUploadForm({ onUploadSuccess, returnJustData, defau
   };
 
   return (
-    <div className="p-6 border rounded-lg shadow-sm bg-card mb-6">
-      <div role="group" aria-label="Upload new media" className="space-y-4">
+    <div className={`border rounded-lg shadow-sm bg-card ${compact ? "p-4" : "p-6 mb-6"}`}>
+      <div role="group" aria-label="Upload new media" className={compact ? "space-y-3" : "space-y-4"}>
         <div>
-          <Label htmlFor="media-file" className="text-base font-medium">Upload New Media</Label>
-          <div className="mt-2 grid grid-cols-1 sm:grid-cols-2 gap-3">
-            <div>
-              <Label htmlFor="media-folder" className="text-sm">Folder (e.g., uploads/images/)</Label>
+          <div className="flex flex-wrap items-center justify-between gap-x-3 gap-y-2">
+            <Label htmlFor="media-file" className="text-base font-medium">Upload New Media</Label>
+            <div className="flex items-center gap-2">
+              <Label htmlFor="media-folder" className="whitespace-nowrap text-sm text-muted-foreground">Upload Folder:</Label>
               <Input
                 id="media-folder"
                 placeholder="uploads/"
                 value={folder}
                 onChange={(e) => setFolder(e.target.value)}
                 onKeyDown={handleFolderKeyDown}
+                className="h-9 w-44 sm:w-56"
               />
             </div>
           </div>
           <div className="mt-2 flex items-center justify-center w-full">
             <label
               htmlFor="media-file-input"
-              className={`flex flex-col items-center justify-center w-full h-40 border-2 border-dashed rounded-lg cursor-pointer bg-muted/30 hover:bg-muted/50 transition-colors ${
+              className={`flex flex-col items-center justify-center w-full ${compact ? "h-28" : "h-40"} border-2 border-dashed rounded-lg cursor-pointer bg-muted/30 hover:bg-muted/50 transition-colors ${
                 isDraggingOver ? "border-primary bg-primary-foreground/20" : "border-input"
               }`}
               onDrop={handleDrop}
@@ -319,8 +322,8 @@ export default function MediaUploadForm({ onUploadSuccess, returnJustData, defau
               onDragEnter={handleDragEnter}
               onDragLeave={handleDragLeave}
             >
-              <div className="flex flex-col items-center justify-center pt-5 pb-6 pointer-events-none"> {/* pointer-events-none for children */}
-                <UploadCloud className="w-10 h-10 mb-3 text-muted-foreground" />
+              <div className={`flex flex-col items-center justify-center pointer-events-none ${compact ? "pt-3 pb-4" : "pt-5 pb-6"}`}> {/* pointer-events-none for children */}
+                <UploadCloud className={`text-muted-foreground ${compact ? "w-8 h-8 mb-2" : "w-10 h-10 mb-3"}`} />
                 <p className="mb-2 text-sm text-muted-foreground">
                   <span className="font-semibold">Click to upload</span> or drag and drop
                 </p>
@@ -332,7 +335,7 @@ export default function MediaUploadForm({ onUploadSuccess, returnJustData, defau
           {previewUrl && file && file.type.startsWith("image/") && (
             <div className="mt-4">
               <Label>Preview:</Label>
-              <Image src={previewUrl} alt="Preview" width={300} height={192} className="mt-2 rounded-md max-h-48 w-auto object-contain border" />
+              <Image src={previewUrl} alt="Preview" width={300} height={192} className={`mt-2 rounded-md w-auto object-contain border ${compact ? "max-h-32" : "max-h-48"}`} />
             </div>
           )}
           {file && <p className="text-sm mt-2 text-muted-foreground">Selected: {file.name} ({(file.size / 1024 / 1024).toFixed(2)} MB)</p>}

package/templates/nextblock-template/app/cms/products/ProductFormClientShell.tsx

@@ -3,32 +3,80 @@
 import React from 'react';
 import { ProductForm } from '@nextblock-cms/ecommerce';
 import MediaPickerDialog from '../media/components/MediaPickerDialog';
-type ProductFormClientShellProps = React.ComponentProps<typeof ProductForm>;
+import DraftStatusActions from '../components/DraftStatusActions';
+
+type ProductFormProps = React.ComponentProps<typeof ProductForm>;
+type ProductUpdateAction = NonNullable<ProductFormProps['updateAction']>;
+
+type ProductFormClientShellProps = ProductFormProps & {
+  /** Present only in edit mode; drives the "Unpublished Draft" toolbar. */
+  productId?: string;
+  /** Draft existence as computed on the server for the current render. */
+  serverHasDraft?: boolean;
+};
 
 const productFormSkeletonRows = ['details', 'description', 'media', 'inventory'];
 
-export default function ProductFormClientShell(props: ProductFormClientShellProps) {
+export default function ProductFormClientShell({
+  productId,
+  serverHasDraft = false,
+  updateAction,
+  ...props
+}: ProductFormClientShellProps) {
   const [isMounted, setIsMounted] = React.useState(false);
+  // The draft toolbar is gated on the server-computed `hasDraft`, but the form
+  // autosave writes a draft WITHOUT revalidating the route (revalidating would
+  // re-init the form and loop the autosave — see updateProductAction). Track
+  // draft existence on the client so the toolbar can appear the moment an
+  // autosave persists a draft, without a server refetch.
+  const [hasDraft, setHasDraft] = React.useState(serverHasDraft);
 
   React.useEffect(() => {
     setIsMounted(true);
   }, []);
 
-  if (!isMounted) {
-    return <ProductFormShellSkeleton />;
-  }
+  // Keep in sync with the server whenever it reports a draft (e.g. block edits
+  // in BlockEditorArea call router.refresh(), which re-runs the page). Only ever
+  // latch ON here — publish/discard reload the whole page, which resets state.
+  React.useEffect(() => {
+    if (serverHasDraft) {
+      setHasDraft(true);
+    }
+  }, [serverHasDraft]);
+
+  // Reveal the toolbar as soon as a form autosave succeeds. The autosave already
+  // upserted a product_drafts row, so a draft now exists.
+  const wrappedUpdateAction = React.useCallback(
+    async (data: Parameters<ProductUpdateAction>[0]) => {
+      const result = await updateAction!(data);
+      setHasDraft(true);
+      return result;
+    },
+    [updateAction]
+  );
 
   return (
-    <ProductForm
-      {...props}
-      mediaPickerNode={
-        <MediaPickerDialog
-          triggerLabel="+ Add Image"
-          triggerVariant="outline"
-          defaultFolder="uploads/products/"
+    <>
+      {productId ? (
+        <DraftStatusActions parentId={productId} parentType="product" hasDraft={hasDraft} />
+      ) : null}
+      {isMounted ? (
+        <ProductForm
+          {...props}
+          hasOpenDraft={hasDraft}
+          updateAction={updateAction ? wrappedUpdateAction : undefined}
+          mediaPickerNode={
+            <MediaPickerDialog
+              triggerLabel="+ Add Image"
+              triggerVariant="outline"
+              defaultFolder="uploads/products/"
+            />
+          }
         />
-      }
-    />
+      ) : (
+        <ProductFormShellSkeleton />
+      )}
+    </>
   );
 }
 

package/templates/nextblock-template/app/cms/products/[id]/edit/page.tsx

@@ -13,7 +13,6 @@ import {
   DropdownMenuTrigger,
 } from '@nextblock-cms/ui';
 import ProductFormClientShell from '../../ProductFormClientShell';
-import DraftStatusActions from '../../../components/DraftStatusActions';
 import {
   getCmsProduct,
   getEnabledPaymentProviders,
@@ -191,7 +190,6 @@ export default async function EditProductPage({
 
   return (
     <div className="space-y-8 w-full max-w-[1400px] mx-auto px-6 py-8">
-      <DraftStatusActions parentId={product.id} parentType="product" hasDraft={hasDraft} />
       <CortexAiPageContextRegistrar
         context={{
           contentType: 'product',
@@ -279,6 +277,8 @@ export default async function EditProductPage({
       </div>
 
       <ProductFormClientShell
+        productId={product.id}
+        serverHasDraft={hasDraft}
         initialData={normalizedInitialData}
         isEdit
         availableLanguagesProp={languages}

package/templates/nextblock-template/app/cms/revisions/RevisionHistoryButton.tsx

@@ -31,7 +31,7 @@ type RevisionItem = {
   revision_type: 'snapshot' | 'diff';
   created_at: string;
   author_id: string | null;
-  author?: { full_name?: string | null; github_username?: string | null } | null;
+  author?: { full_name?: string | null } | null;
 };
 
 import { Input } from "@nextblock-cms/ui";
@@ -223,7 +223,7 @@ export default function RevisionHistoryButton({ parentType, parentId }: Revision
             <div className="rounded border divide-y">
               {revisions.map((rev: RevisionItem, idx) => {
                 const when = rev.created_at ? formatDistanceToNow(new Date(rev.created_at), { addSuffix: true }) : '';
-                const authorName = rev.author?.full_name || rev.author?.github_username;
+                const authorName = rev.author?.full_name;
                 const isCurrent = currentVersion != null && rev.version === currentVersion;
                 const isInitial = rev.version === 1;
 

package/templates/nextblock-template/app/cms/revisions/actions.ts

@@ -12,7 +12,7 @@ type RevisionListItem = {
   revision_type: 'snapshot' | 'diff';
   created_at: string;
   author_id: string | null;
-  author?: { full_name?: string | null; github_username?: string | null } | null;
+  author?: { full_name?: string | null } | null;
 };
 
 const REVISIONS_PER_PAGE = 10; // Reduced to 10 as requested
@@ -22,7 +22,7 @@ export async function listPageRevisions(pageId: number, page = 1, startDate?: st
 
   let query = supabase
     .from('page_revisions')
-    .select('id, page_id, author_id, version, revision_type, created_at, content, author:profiles(full_name, github_username)', { count: 'exact' })
+    .select('id, page_id, author_id, version, revision_type, created_at, content, author:profiles(full_name)', { count: 'exact' })
     .eq('page_id', pageId)
     .order('version', { ascending: false })
     .limit(1000); // Fetch up to 1000 recent revisions to allow dense pagination after filtering
@@ -105,7 +105,7 @@ export async function listPageRevisions(pageId: number, page = 1, startDate?: st
      revision_type: 'snapshot',
      created_at: pageCreatedAt ?? new Date().toISOString(),
      author_id: null,
-     author: { full_name: 'System (Initial)', github_username: 'system' },
+     author: { full_name: 'System (Initial)' },
      has_changes: true, // V1 always counts
      content: null
    });
@@ -139,7 +139,7 @@ export async function listPostRevisions(postId: number, page = 1, startDate?: st
 
   let query = supabase
     .from('post_revisions')
-    .select('id, post_id, author_id, version, revision_type, created_at, content, author:profiles(full_name, github_username)', { count: 'exact' })
+    .select('id, post_id, author_id, version, revision_type, created_at, content, author:profiles(full_name)', { count: 'exact' })
     .eq('post_id', postId)
     .order('version', { ascending: false })
     .limit(1000);
@@ -221,7 +221,7 @@ export async function listPostRevisions(postId: number, page = 1, startDate?: st
      revision_type: 'snapshot',
      created_at: postCreatedAt ?? new Date().toISOString(),
      author_id: null,
-     author: { full_name: 'System (Initial)', github_username: 'system' },
+     author: { full_name: 'System (Initial)' },
      has_changes: true,
      content: null
    });

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

@@ -2,9 +2,15 @@
 "use server";
 
 import { createClient } from "@nextblock-cms/db/server";
-import { revalidatePath } from "next/cache";
+import { revalidatePath, updateTag } from "next/cache";
 import { redirect } from "next/navigation";
 import type { Database } from "@nextblock-cms/db";
+import {
+  LANGUAGE_DETECTION_SETTING_KEY,
+  LANGUAGE_DETECTION_CACHE_TAG,
+  normalizeLanguageDetectionSettings,
+  type LanguageDetectionSettings,
+} from "../../../../lib/i18n/detection";
 
 type Language = Database["public"]["Tables"]["languages"]["Row"];
 
@@ -260,3 +266,49 @@ export async function deleteLanguage(languageId: number) {
   revalidatePath("/");
   redirect("/cms/settings/languages?success=Language deleted successfully. All associated content has also been removed.");
 }
+
+// --- Language detection settings (site_settings.language_detection_settings) ---
+
+export async function getLanguageDetectionSettings(): Promise<LanguageDetectionSettings> {
+  const supabase = createClient();
+  const { data, error } = await supabase
+    .from("site_settings")
+    .select("value")
+    .eq("key", LANGUAGE_DETECTION_SETTING_KEY)
+    .maybeSingle();
+
+  if (error) {
+    console.error("Error fetching language detection settings:", error);
+  }
+  // Absent row or error = defaults (browser detection, remembered choice).
+  return normalizeLanguageDetectionSettings(error ? null : data?.value);
+}
+
+export async function updateLanguageDetectionSettings(
+  input: LanguageDetectionSettings,
+): Promise<{ success?: string; error?: string }> {
+  const supabase = createClient();
+
+  if (!(await verifyAdmin(supabase))) {
+    return { error: "Unauthorized: Admin role required." };
+  }
+
+  // Never trust the client payload shape — coerce to a valid settings object.
+  const settings = normalizeLanguageDetectionSettings(input);
+
+  const { error } = await supabase
+    .from("site_settings")
+    .upsert({ key: LANGUAGE_DETECTION_SETTING_KEY, value: settings });
+
+  if (error) {
+    console.error("Error saving language detection settings:", error);
+    return { error: `Failed to save detection settings: ${error.message}` };
+  }
+
+  updateTag(LANGUAGE_DETECTION_CACHE_TAG);
+  revalidatePath("/cms/settings/languages");
+  revalidatePath("/", "layout");
+  // The proxy caches detection config in-memory for up to a minute per worker,
+  // so the change isn't instant for new visitors — set that expectation here.
+  return { success: "Language detection settings saved. Changes reach new visitors within about a minute." };
+}

package/templates/nextblock-template/app/cms/settings/languages/components/LanguageDetectionPanel.tsx

@@ -0,0 +1,188 @@
+'use client';
+
+import React, { useState, useTransition } from 'react';
+import {
+  Button,
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+  Checkbox,
+  RadioGroup,
+  RadioGroupItem,
+} from '@nextblock-cms/ui';
+import { toast } from 'react-hot-toast';
+import { Ban, Globe, Info, MapPin, Route } from 'lucide-react';
+import type { LucideIcon } from 'lucide-react';
+import { updateLanguageDetectionSettings } from '../actions';
+import type {
+  LanguageDetectionMode,
+  LanguageDetectionSettings,
+} from '../../../../../lib/i18n/detection';
+
+interface ModeOption {
+  value: LanguageDetectionMode;
+  title: string;
+  description: string;
+  icon: LucideIcon;
+}
+
+const MODE_OPTIONS: ModeOption[] = [
+  {
+    value: 'browser',
+    title: 'Browser language',
+    description:
+      "Serve the language the visitor's browser prefers (Accept-Language header). Recommended — it reflects what each person actually reads.",
+    icon: Globe,
+  },
+  {
+    value: 'country',
+    title: "Visitor's country (IP)",
+    description:
+      'Serve the main language of the country the visitor browses from, using the geolocation headers provided by your host (Vercel, Cloudflare, CloudFront).',
+    icon: MapPin,
+  },
+  {
+    value: 'browser_then_country',
+    title: 'Browser language, then country',
+    description:
+      "Try the browser's preferred language first; when none of your languages match, fall back to the visitor's country.",
+    icon: Route,
+  },
+  {
+    value: 'default',
+    title: 'No detection',
+    description:
+      'Always serve the default language to new visitors. They can still switch manually with the language switcher (shown when more than one language is active).',
+    icon: Ban,
+  },
+];
+
+const COUNTRY_MODES: LanguageDetectionMode[] = ['country', 'browser_then_country'];
+
+export default function LanguageDetectionPanel({
+  initialSettings,
+  activeLanguageCount,
+}: {
+  initialSettings: LanguageDetectionSettings;
+  activeLanguageCount: number;
+}) {
+  const [mode, setMode] = useState<LanguageDetectionMode>(initialSettings.mode);
+  const [rememberVisitorChoice, setRememberVisitorChoice] = useState<boolean>(
+    initialSettings.rememberVisitorChoice,
+  );
+  const [savedSettings, setSavedSettings] = useState<LanguageDetectionSettings>(initialSettings);
+  const [isPending, startTransition] = useTransition();
+
+  // With fewer than two active languages every mode resolves to the same locale,
+  // so the whole panel is a no-op and the public language switcher is hidden.
+  const isMoot = activeLanguageCount < 2;
+
+  const isDirty =
+    mode !== savedSettings.mode || rememberVisitorChoice !== savedSettings.rememberVisitorChoice;
+
+  const handleSave = () => {
+    startTransition(async () => {
+      const result = await updateLanguageDetectionSettings({ mode, rememberVisitorChoice });
+      if (result?.error) {
+        toast.error(result.error);
+        return;
+      }
+      setSavedSettings({ mode, rememberVisitorChoice });
+      toast.success(result?.success ?? 'Language detection settings saved.');
+    });
+  };
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Language Detection</CardTitle>
+        <CardDescription>
+          How the site picks the first language for a new visitor. A language chosen with the
+          language switcher overrides detection for the rest of the visit — and for a year when
+          &ldquo;Remember the visitor&apos;s language&rdquo; is on. Changes reach new visitors
+          within about a minute.
+        </CardDescription>
+      </CardHeader>
+      <CardContent className="space-y-6">
+        {isMoot && (
+          <p className="flex items-start gap-2 rounded-md border border-dashed p-3 text-sm text-muted-foreground">
+            <Info className="mt-0.5 h-4 w-4 shrink-0" />
+            <span>
+              Language detection takes effect once at least two active languages are configured.
+              With a single language every visitor receives that language and the public language
+              switcher is hidden — you can still choose a mode here so it applies as soon as you add
+              another language.
+            </span>
+          </p>
+        )}
+        <RadioGroup
+          value={mode}
+          onValueChange={(value) => setMode(value as LanguageDetectionMode)}
+          className="grid gap-3 md:grid-cols-2"
+        >
+          {MODE_OPTIONS.map((option) => (
+            <label
+              key={option.value}
+              className="flex cursor-pointer items-start gap-3 rounded-md border p-4 transition-colors has-[[data-state=checked]]:border-primary has-[[data-state=checked]]:bg-primary/5 has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-ring has-[:focus-visible]:ring-offset-2"
+            >
+              <RadioGroupItem
+                value={option.value}
+                className="mt-1"
+                aria-label={option.title}
+                aria-describedby={`detection-mode-desc-${option.value}`}
+              />
+              <span className="space-y-1">
+                <span className="flex items-center gap-2 text-sm font-medium">
+                  <option.icon className="h-4 w-4 text-muted-foreground" />
+                  {option.title}
+                </span>
+                <span
+                  id={`detection-mode-desc-${option.value}`}
+                  className="block text-sm text-muted-foreground"
+                >
+                  {option.description}
+                </span>
+              </span>
+            </label>
+          ))}
+        </RadioGroup>
+
+        <div aria-live="polite">
+          {COUNTRY_MODES.includes(mode) && (
+            <p className="rounded-md border border-dashed p-3 text-sm text-muted-foreground">
+              Country detection relies on the geolocation header your hosting platform adds to each
+              request (Vercel, Cloudflare, and CloudFront do this automatically). When the header is
+              missing, visitors get the default language
+              {mode === 'browser_then_country' ? ' unless their browser language matches' : ''}.
+            </p>
+          )}
+        </div>
+
+        <label className="flex cursor-pointer items-start gap-3">
+          <Checkbox
+            checked={rememberVisitorChoice}
+            onCheckedChange={(checked) => setRememberVisitorChoice(checked === true)}
+            className="mt-0.5"
+            aria-label="Remember the visitor's language"
+            aria-describedby="remember-visitor-desc"
+          />
+          <span className="space-y-1">
+            <span className="block text-sm font-medium">Remember the visitor&apos;s language</span>
+            <span id="remember-visitor-desc" className="block text-sm text-muted-foreground">
+              Keep the detected or chosen language in a cookie for a year. When off, the language
+              only sticks for the browsing session and is detected again on the next visit.
+            </span>
+          </span>
+        </label>
+      </CardContent>
+      <CardFooter className="justify-end">
+        <Button onClick={handleSave} disabled={!isDirty || isPending}>
+          {isPending ? 'Saving...' : 'Save Detection Settings'}
+        </Button>
+      </CardFooter>
+    </Card>
+  );
+}

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

@@ -23,6 +23,8 @@ import {
 } from "@nextblock-cms/ui";
 import type { Database } from "@nextblock-cms/db";
 import DeleteLanguageClientButton from './components/DeleteLanguageButton';
+import LanguageDetectionPanel from './components/LanguageDetectionPanel';
+import { getLanguageDetectionSettings } from './actions';
 
 type Language = Database['public']['Tables']['languages']['Row'];
 
@@ -41,7 +43,10 @@ async function getLanguages(): Promise<Language[]> {
 }
 
 export default async function CmsLanguagesListPage() {
-  const languages = await getLanguages();
+  const [languages, detectionSettings] = await Promise.all([
+    getLanguages(),
+    getLanguageDetectionSettings(),
+  ]);
   // The following line for searchParams will cause an error during static generation or if window is not defined.
   // It's better to pass searchParams as props if needed from the page component.
   // For this specific page, success messages are handled by redirect query params which Next.js makes available in page props.
@@ -144,6 +149,12 @@ export default async function CmsLanguagesListPage() {
           </Table>
         </div>
       )}
+      <div className="mt-6">
+        <LanguageDetectionPanel
+          initialSettings={detectionSettings}
+          activeLanguageCount={languages.filter((lang) => lang.is_active !== false).length}
+        />
+      </div>
       <div className="mt-6">
         <Alert variant="warning">
           <ShieldAlert className="h-4 w-4" />

package/templates/nextblock-template/app/cms/users/actions.ts

@@ -38,7 +38,6 @@ type UpdateUserProfilePayload = {
   full_name?: string | null;
   avatar_url?: string | null;
   website?: string | null;
-  github_username?: string | null;
   phone?: string | null;
 };
 
@@ -97,7 +96,6 @@ export async function updateUserProfile(userIdToUpdate: string, formData: FormDa
     full_name: formData.get("full_name") as string || null,
     avatar_url: formData.get("avatar_url") as string || null,
     website: formData.get("website") as string || null,
-    github_username: formData.get("github_username") as string || null,
     phone: formData.get("phone") as string || null,
   };
 
@@ -126,7 +124,6 @@ export async function updateUserProfile(userIdToUpdate: string, formData: FormDa
     full_name: rawFormData.full_name,
     avatar_url: rawFormData.avatar_url,
     website: rawFormData.website,
-    github_username: rawFormData.github_username,
     phone: rawFormData.phone,
   };
 

package/templates/nextblock-template/app/cms/users/components/UserForm.tsx

@@ -30,7 +30,6 @@ export default function UserForm({ userToEditAuth, userToEditProfile, userToEdit
       if (data.full_name !== undefined) formData.append('full_name', data.full_name || '');
       if (data.avatar_url !== undefined) formData.append('avatar_url', data.avatar_url || '');
       if (data.website !== undefined) formData.append('website', data.website || '');
-      if (data.github_username !== undefined) formData.append('github_username', data.github_username || '');
       if (data.phone !== undefined) formData.append('phone', data.phone || '');
       if (data.role !== undefined) formData.append('role', data.role);
       
@@ -48,7 +47,6 @@ export default function UserForm({ userToEditAuth, userToEditProfile, userToEdit
               full_name: userToEditProfile?.full_name || '',
               avatar_url: userToEditProfile?.avatar_url || '',
               website: userToEditProfile?.website || '',
-              github_username: userToEditProfile?.github_username || '',
               phone: userToEditProfile?.phone || '',
               role: userToEditProfile?.role || 'USER',
               billing_address: userToEditAddresses.billingAddress,

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

@@ -129,7 +129,6 @@ export default async function CmsUsersListPage() {
                 <TableHead className="w-[80px]">Avatar</TableHead>
                 <TableHead>Email</TableHead>
                 <TableHead>Full Name</TableHead>
-                <TableHead>GitHub</TableHead>
                 <TableHead>Role</TableHead>
                 <TableHead>Joined</TableHead>
                 <TableHead className="text-right w-[80px]">Actions</TableHead>
@@ -146,7 +145,6 @@ export default async function CmsUsersListPage() {
                   </TableCell>
                   <TableCell className="font-medium">{authUser.email}</TableCell>
                   <TableCell className="text-muted-foreground">{profile?.full_name || "N/A"}</TableCell>
-                  <TableCell className="text-muted-foreground">{profile?.github_username || "-"}</TableCell>
                   <TableCell>
                     <Badge variant={
                         profile?.role === "ADMIN" ? "destructive" :