@betterstart/cli 0.1.4 → 0.1.5

package/dist/cli.js

@@ -8395,91 +8395,178 @@ import fs25 from "fs-extra";
 
 // src/init/templates/components/cms-globals.ts
 function cmsGlobalsCssTemplate() {
-  return `/* CMS-scoped design tokens \u2014 does NOT import Tailwind (host app provides it) */
-
-@layer cms {
-  .cms-root {
-    --radius: 0.625rem;
-    --background: oklch(1 0 0);
-    --foreground: oklch(0.145 0 0);
-    --card: oklch(1 0 0);
-    --card-foreground: oklch(0.145 0 0);
-    --popover: oklch(1 0 0);
-    --popover-foreground: oklch(0.145 0 0);
-    --primary: oklch(0.205 0 0);
-    --primary-foreground: oklch(0.985 0 0);
-    --secondary: oklch(0.97 0 0);
-    --secondary-foreground: oklch(0.205 0 0);
-    --muted: oklch(0.97 0 0);
-    --muted-foreground: oklch(0.556 0 0);
-    --accent: oklch(0.97 0 0);
-    --accent-foreground: oklch(0.205 0 0);
-    --destructive: oklch(0.577 0.245 27.325);
-    --destructive-foreground: oklch(0.577 0.245 27.325);
-    --border: oklch(0.922 0 0);
-    --input: oklch(98.5% 0 0);
-    --input-border: oklch(96.7% 0.001 286.375);
-    --ring: oklch(0.708 0 0);
-    --chart-1: oklch(0.646 0.222 41.116);
-    --chart-2: oklch(0.6 0.118 184.704);
-    --chart-3: oklch(0.398 0.07 227.392);
-    --chart-4: oklch(0.828 0.189 84.429);
-    --chart-5: oklch(0.769 0.188 70.08);
-    --sidebar: oklch(0.985 0 0);
-    --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: oklch(0.205 0 0);
-    --sidebar-primary-foreground: oklch(0.985 0 0);
-    --sidebar-accent: oklch(0.97 0 0);
-    --sidebar-accent-foreground: oklch(0.205 0 0);
-    --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: oklch(0.708 0 0);
-  }
-
-  .cms-root.dark {
-    --background: oklch(0.145 0 0);
-    --foreground: oklch(0.985 0 0);
-    --card: oklch(0.145 0 0);
-    --card-foreground: oklch(0.985 0 0);
-    --popover: oklch(0.145 0 0);
-    --popover-foreground: oklch(0.985 0 0);
-    --primary: oklch(0.985 0 0);
-    --primary-foreground: oklch(0.205 0 0);
-    --secondary: oklch(0.269 0 0);
-    --secondary-foreground: oklch(0.985 0 0);
-    --muted: oklch(0.269 0 0);
-    --muted-foreground: oklch(0.708 0 0);
-    --accent: oklch(0.269 0 0);
-    --accent-foreground: oklch(0.985 0 0);
-    --destructive: oklch(0.396 0.141 25.723);
-    --destructive-foreground: oklch(0.637 0.237 25.331);
-    --border: oklch(0.269 0 0);
-    --input: oklch(26.9% 0 0);
-    --input-border: oklch(25.1% 0.001 286.375);
-    --ring: oklch(0.439 0 0);
-    --chart-1: oklch(0.488 0.243 264.376);
-    --chart-2: oklch(0.696 0.17 162.48);
-    --chart-3: oklch(0.769 0.188 70.08);
-    --chart-4: oklch(0.627 0.265 303.9);
-    --chart-5: oklch(0.645 0.246 16.439);
-    --sidebar: oklch(0.205 0 0);
-    --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: oklch(0.488 0.243 264.376);
-    --sidebar-primary-foreground: oklch(0.985 0 0);
-    --sidebar-accent: oklch(0.269 0 0);
-    --sidebar-accent-foreground: oklch(0.985 0 0);
-    --sidebar-border: oklch(0.269 0 0);
-    --sidebar-ring: oklch(0.439 0 0);
-  }
-}
-
-/* CMS base styles */
-.cms-root * {
-  border-color: var(--border);
-}
-
-.cms-root {
-  background-color: var(--background);
-  color: var(--foreground);
+  return `@import "tailwindcss";
+
+@custom-variant dark (&:is(.dark *));
+
+:root {
+  --background: oklch(0.9850 0 0);
+  --foreground: oklch(0 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0 0 0);
+  --popover: oklch(0.9900 0 0);
+  --popover-foreground: oklch(0 0 0);
+  --primary: oklch(0 0 0);
+  --primary-foreground: oklch(1 0 0);
+  --secondary: oklch(0.9700 0 0);
+  --secondary-foreground: oklch(0 0 0);
+  --muted: oklch(0.9700 0 0);
+  --muted-foreground: oklch(0.4400 0 0);
+  --accent: oklch(0.9700 0 0);
+  --accent-foreground: oklch(0 0 0);
+  --destructive: oklch(0.6300 0.1900 23.0300);
+  --destructive-foreground: oklch(1 0 0);
+  --border: oklch(0.9200 0 0);
+  --input: oklch(0.9400 0 0);
+  --ring: oklch(0 0 0);
+  --chart-1: oklch(0.8100 0.1700 75.3500);
+  --chart-2: oklch(0.5500 0.2200 264.5300);
+  --chart-3: oklch(0.7200 0 0);
+  --chart-4: oklch(0.9200 0 0);
+  --chart-5: oklch(0.5600 0 0);
+  --sidebar: oklch(1 0 0);
+  --sidebar-foreground: oklch(0 0 0);
+  --sidebar-primary: oklch(0 0 0);
+  --sidebar-primary-foreground: oklch(1 0 0);
+  --sidebar-accent: oklch(0.9400 0 0);
+  --sidebar-accent-foreground: oklch(0 0 0);
+  --sidebar-border: oklch(0.9400 0 0);
+  --sidebar-ring: oklch(0 0 0);
+  --font-sans: Geist, sans-serif;
+  --font-serif: Georgia, serif;
+  --font-mono: Geist Mono, monospace;
+  --radius: 0.4rem;
+  --shadow-x: 0px;
+  --shadow-y: 1px;
+  --shadow-blur: 3px;
+  --shadow-spread: 0px;
+  --shadow-opacity: 0.02;
+  --shadow-color: hsl(0 0% 0%);
+  --shadow-2xs: 0px 1px 3px 0px hsl(0 0% 0% / 0.01);
+  --shadow-xs: 0px 1px 3px 0px hsl(0 0% 0% / 0.01);
+  --shadow-sm: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 1px 2px -1px hsl(0 0% 0% / 0.02);
+  --shadow: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 1px 2px -1px hsl(0 0% 0% / 0.02);
+  --shadow-md: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 2px 4px -1px hsl(0 0% 0% / 0.02);
+  --shadow-lg: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 4px 6px -1px hsl(0 0% 0% / 0.02);
+  --shadow-xl: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 8px 10px -1px hsl(0 0% 0% / 0.02);
+  --shadow-2xl: 0px 1px 3px 0px hsl(0 0% 0% / 0.05);
+  --tracking-normal: 0em;
+  --spacing: 0.25rem;
+}
+
+.dark {
+  --background: oklch(0 0 0);
+  --foreground: oklch(1 0 0);
+  --card: oklch(0.1400 0 0);
+  --card-foreground: oklch(1 0 0);
+  --popover: oklch(0.1800 0 0);
+  --popover-foreground: oklch(1 0 0);
+  --primary: oklch(1 0 0);
+  --primary-foreground: oklch(0 0 0);
+  --secondary: oklch(0.2500 0 0);
+  --secondary-foreground: oklch(1 0 0);
+  --muted: oklch(0.2300 0 0);
+  --muted-foreground: oklch(0.7200 0 0);
+  --accent: oklch(0.3200 0 0);
+  --accent-foreground: oklch(1 0 0);
+  --destructive: oklch(0.6900 0.2000 23.9100);
+  --destructive-foreground: oklch(0 0 0);
+  --border: oklch(0.2600 0 0);
+  --input: oklch(0.3200 0 0);
+  --ring: oklch(0.7200 0 0);
+  --chart-1: oklch(0.8100 0.1700 75.3500);
+  --chart-2: oklch(0.5800 0.2100 260.8400);
+  --chart-3: oklch(0.5600 0 0);
+  --chart-4: oklch(0.4400 0 0);
+  --chart-5: oklch(0.9200 0 0);
+  --sidebar: oklch(0.1800 0 0);
+  --sidebar-foreground: oklch(1 0 0);
+  --sidebar-primary: oklch(1 0 0);
+  --sidebar-primary-foreground: oklch(0 0 0);
+  --sidebar-accent: oklch(0.3200 0 0);
+  --sidebar-accent-foreground: oklch(1 0 0);
+  --sidebar-border: oklch(0.3200 0 0);
+  --sidebar-ring: oklch(0.7200 0 0);
+  --font-sans: Geist, sans-serif;
+  --font-serif: Georgia, serif;
+  --font-mono: Geist Mono, monospace;
+  --radius: 0.4rem;
+  --shadow-x: 0px;
+  --shadow-y: 1px;
+  --shadow-blur: 3px;
+  --shadow-spread: 0px;
+  --shadow-opacity: 0.02;
+  --shadow-color: hsl(0 0% 0%);
+  --shadow-2xs: 0px 1px 3px 0px hsl(0 0% 0% / 0.01);
+  --shadow-xs: 0px 1px 3px 0px hsl(0 0% 0% / 0.01);
+  --shadow-sm: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 1px 2px -1px hsl(0 0% 0% / 0.02);
+  --shadow: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 1px 2px -1px hsl(0 0% 0% / 0.02);
+  --shadow-md: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 2px 4px -1px hsl(0 0% 0% / 0.02);
+  --shadow-lg: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 4px 6px -1px hsl(0 0% 0% / 0.02);
+  --shadow-xl: 0px 1px 3px 0px hsl(0 0% 0% / 0.02), 0px 8px 10px -1px hsl(0 0% 0% / 0.02);
+  --shadow-2xl: 0px 1px 3px 0px hsl(0 0% 0% / 0.05);
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-popover: var(--popover);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-destructive-foreground: var(--destructive-foreground);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  --color-chart-1: var(--chart-1);
+  --color-chart-2: var(--chart-2);
+  --color-chart-3: var(--chart-3);
+  --color-chart-4: var(--chart-4);
+  --color-chart-5: var(--chart-5);
+  --color-sidebar: var(--sidebar);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-ring: var(--sidebar-ring);
+
+  --font-sans: var(--font-sans);
+  --font-mono: var(--font-mono);
+  --font-serif: var(--font-serif);
+
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+
+  --shadow-2xs: var(--shadow-2xs);
+  --shadow-xs: var(--shadow-xs);
+  --shadow-sm: var(--shadow-sm);
+  --shadow: var(--shadow);
+  --shadow-md: var(--shadow-md);
+  --shadow-lg: var(--shadow-lg);
+  --shadow-xl: var(--shadow-xl);
+  --shadow-2xl: var(--shadow-2xl);
+}
+
+@layer base {
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
 }
 
 /* Editor styles */
@@ -8970,7 +9057,14 @@ export function CmsProviders({ children }: { children: React.ReactNode }) {
 
 // src/init/templates/components/layout/cms-sidebar.ts
 function cmsSidebarTemplate() {
-  return `import {
+  return `import { getSession } from '@cms/auth/middleware'
+import { Avatar, AvatarFallback, AvatarImage } from '@cms/components/ui/avatar'
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from '@cms/components/ui/collapsible'
+import {
   Sidebar,
   SidebarContent,
   SidebarFooter,
@@ -8984,15 +9078,9 @@ function cmsSidebarTemplate() {
   SidebarRail,
   SidebarTrigger,
 } from '@cms/components/ui/sidebar'
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from '@cms/components/ui/collapsible'
-import { cmsNavigation, type CmsNavigationItem } from '@cms/data/navigation'
-import { getSession } from '@cms/auth/middleware'
-import Link from 'next/link'
+import { type CmsNavigationItem, cmsNavigation } from '@cms/data/navigation'
 import { ChevronRight } from 'lucide-react'
+import Link from 'next/link'
 
 function NavItem({ item }: { item: CmsNavigationItem }) {
   if (item.children && item.children.length > 0) {
@@ -9043,10 +9131,18 @@ export async function CmsSidebar(props: React.ComponentProps<typeof Sidebar>) {
 
   return (
     <Sidebar collapsible="icon" {...props}>
-      <SidebarHeader className="border-b border-border h-13 items-center flex w-full">
+      <SidebarHeader className="border-b border-border h-14 items-center flex w-full">
         <div className="flex items-center gap-2 w-full relative h-full">
-          <div className="flex items-center pl-2 gap-1 w-full group-data-[collapsible=icon]:hidden">
-            <span className="text-base font-bold">CMS</span>
+          <div className="flex items-center gap-2 w-full">
+            <Avatar className="size-8">
+              <AvatarImage src={user?.image ?? ''} />
+              <AvatarFallback className="text-sm font-semibold">
+                {user?.name?.charAt(0)}
+              </AvatarFallback>
+            </Avatar>
+            <div className="flex items-center gap-1 w-full group-data-[collapsible=icon]:hidden">
+              <span className="text-base font-bold">CMS</span>
+            </div>
           </div>
           <SidebarTrigger className="hidden md:flex" />
         </div>
@@ -11389,6 +11485,7 @@ export default function CmsLayout({ children }: { children: React.ReactNode }) {
 function dashboardPageTemplate() {
   return `import { PageHeader } from '@cms/components/shared/page-header'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@cms/components/ui/card'
+import { Badge } from '@cms/components/ui/badge'
 import { FileText, Settings, Users } from 'lucide-react'
 import Link from 'next/link'
 
@@ -11446,6 +11543,38 @@ export default function DashboardPage() {
             </Link>
           ))}
         </div>
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-sm font-medium">Environment</CardTitle>
+            <CardDescription>Current configuration status</CardDescription>
+          </CardHeader>
+          <CardContent className="space-y-3">
+            <div className="flex items-center justify-between">
+              <span className="text-sm text-muted-foreground">Environment</span>
+              <Badge variant="outline">
+                {process.env.NODE_ENV === 'production' ? 'Production' : 'Development'}
+              </Badge>
+            </div>
+            <div className="flex items-center justify-between">
+              <span className="text-sm text-muted-foreground">Database</span>
+              <Badge variant="outline">
+                {process.env.BETTERSTART_DATABASE_URL ? 'Connected' : 'Not configured'}
+              </Badge>
+            </div>
+            <div className="flex items-center justify-between">
+              <span className="text-sm text-muted-foreground">Storage (R2)</span>
+              <Badge variant="outline">
+                {process.env.BETTERSTART_R2_BUCKET_NAME ? 'Configured' : 'Not configured'}
+              </Badge>
+            </div>
+            <div className="flex items-center justify-between">
+              <span className="text-sm text-muted-foreground">Email (Resend)</span>
+              <Badge variant="outline">
+                {process.env.BETTERSTART_RESEND_API_KEY ? 'Configured' : 'Not configured'}
+              </Badge>
+            </div>
+          </CardContent>
+        </Card>
       </div>
     </div>
   )
@@ -11567,67 +11696,6 @@ export function LoginForm() {
 `;
 }
 
-// src/init/templates/pages/settings-page.ts
-function settingsPageTemplate() {
-  return `import { PageHeader } from '@cms/components/shared/page-header'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle
-} from '@cms/components/ui/card'
-import { Badge } from '@cms/components/ui/badge'
-
-export default function SettingsPage() {
-  return (
-    <div className="flex flex-col">
-      <div className="flex items-center justify-between bg-card px-6 py-4 border-b">
-        <PageHeader
-          title="Settings"
-          description="Manage your CMS configuration"
-        />
-      </div>
-      <div className="p-6 space-y-6 max-w-2xl">
-        <Card>
-          <CardHeader>
-            <CardTitle className="text-sm font-medium">General</CardTitle>
-            <CardDescription>CMS environment information</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-3">
-            <div className="flex items-center justify-between">
-              <span className="text-sm text-muted-foreground">Environment</span>
-              <Badge variant="outline">
-                {process.env.NODE_ENV === 'production' ? 'Production' : 'Development'}
-              </Badge>
-            </div>
-            <div className="flex items-center justify-between">
-              <span className="text-sm text-muted-foreground">Database</span>
-              <Badge variant="outline">
-                {process.env.BETTERSTART_DATABASE_URL ? 'Connected' : 'Not configured'}
-              </Badge>
-            </div>
-            <div className="flex items-center justify-between">
-              <span className="text-sm text-muted-foreground">Storage (R2)</span>
-              <Badge variant="outline">
-                {process.env.BETTERSTART_R2_BUCKET_NAME ? 'Configured' : 'Not configured'}
-              </Badge>
-            </div>
-            <div className="flex items-center justify-between">
-              <span className="text-sm text-muted-foreground">Email (Resend)</span>
-              <Badge variant="outline">
-                {process.env.BETTERSTART_RESEND_API_KEY ? 'Configured' : 'Not configured'}
-              </Badge>
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-    </div>
-  )
-}
-`;
-}
-
 // src/init/templates/pages/users/create-user-dialog.ts
 function createUserDialogTemplate() {
   return `'use client'
@@ -12212,7 +12280,6 @@ function scaffoldLayout({ cwd, config }) {
   write(path31.join(usersDir, "columns.tsx"), usersColumnsTemplate());
   write(path31.join(usersDir, "create-user-dialog.tsx"), createUserDialogTemplate());
   write(path31.join(usersDir, "edit-role-dialog.tsx"), editRoleDialogTemplate());
-  write(path31.join(config.paths.pages, "settings", "page.tsx"), settingsPageTemplate());
   return created;
 }
 
@@ -12394,6 +12461,34 @@ function blogPostsSchema() {
   );
 }
 
+// src/init/templates/presets/default-settings.ts
+function defaultSettingsSchema() {
+  return JSON.stringify(
+    {
+      name: "settings",
+      type: "single",
+      label: "Settings",
+      description: "General site settings",
+      icon: "Settings",
+      fields: [
+        { name: "siteName", type: "string", label: "Site Name", required: true },
+        { name: "tagline", type: "string", label: "Tagline" },
+        { name: "separator1", type: "separator" },
+        { name: "logo", type: "image", label: "Logo" },
+        { name: "favicon", type: "image", label: "Favicon" },
+        { name: "separator2", type: "separator" },
+        { name: "contactEmail", type: "string", label: "Contact Email" },
+        { name: "socialTwitter", type: "string", label: "Twitter / X URL" },
+        { name: "socialInstagram", type: "string", label: "Instagram URL" },
+        { name: "socialLinkedin", type: "string", label: "LinkedIn URL" },
+        { name: "socialGithub", type: "string", label: "GitHub URL" }
+      ]
+    },
+    null,
+    2
+  );
+}
+
 // src/init/templates/presets/full-contact.ts
 function fullContactSchema() {
   return JSON.stringify(
@@ -12551,16 +12646,25 @@ function fullNavigationSchema() {
 
 // src/init/scaffolders/preset.ts
 function getPresetSchemas(preset) {
-  if (preset === "blank") return [];
   const schemas = [
     {
-      filename: "categories.json",
-      content: blogCategoriesSchema(),
+      filename: "settings.json",
+      content: defaultSettingsSchema(),
       isForm: false,
-      isSingle: false
-    },
-    { filename: "posts.json", content: blogPostsSchema(), isForm: false, isSingle: false }
+      isSingle: true
+    }
   ];
+  if (preset !== "blank") {
+    schemas.push(
+      {
+        filename: "categories.json",
+        content: blogCategoriesSchema(),
+        isForm: false,
+        isSingle: false
+      },
+      { filename: "posts.json", content: blogPostsSchema(), isForm: false, isSingle: false }
+    );
+  }
   if (preset === "full") {
     schemas.push(
       {
@@ -12589,7 +12693,6 @@ function scaffoldPreset({
     generatedFiles: [],
     errors: []
   };
-  if (preset === "blank") return result;
   const schemasDir = path32.join(cwd, config.paths?.schemas ?? "./cms/schemas");
   const presetSchemas = getPresetSchemas(preset);
   for (const ps of presetSchemas) {
@@ -13097,19 +13200,17 @@ var initCommand = new Command2("init").description("Scaffold CMS into a new or e
   ${pc.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
     );
   }
-  if (features.preset !== "blank") {
-    s.start(`Applying ${features.preset} preset...`);
-    const presetResult = scaffoldPreset({ cwd, config, preset: features.preset });
-    if (presetResult.errors.length > 0) {
-      s.stop(`Preset applied with ${presetResult.errors.length} warning(s)`);
-      for (const err of presetResult.errors) {
-        p3.log.warning(`  ${err}`);
-      }
-    } else {
-      s.stop(
-        `Created ${presetResult.schemas.length} schemas, generated ${presetResult.generatedFiles.length} files`
-      );
+  s.start(`Applying ${features.preset} preset...`);
+  const presetResult = scaffoldPreset({ cwd, config, preset: features.preset });
+  if (presetResult.errors.length > 0) {
+    s.stop(`Preset applied with ${presetResult.errors.length} warning(s)`);
+    for (const err of presetResult.errors) {
+      p3.log.warning(`  ${err}`);
     }
+  } else {
+    s.stop(
+      `Created ${presetResult.schemas.length} schemas, generated ${presetResult.generatedFiles.length} files`
+    );
   }
   if (depsResult.success && hasDbUrl(cwd)) {
     s.start("Pushing database schema (drizzle-kit push)...");