create-vexcms 0.0.19 → 0.1.0-alpha.2

package/templates/marketing-site/convex/siteSettings.ts

@@ -1,14 +1,28 @@
+import { getGlobal } from "@vexcms/core/server"
+
+import { GLOBAL_SLUG_SITE_SETTINGS } from "~/db/constants"
+import config from "~/vex.config"
+
 import { query } from "./_generated/server"
 
 /**
- * Get the published site settings.
- * Used by server components for SEO metadata generation.
+ * Public site settings — name, description, SEO defaults, and the theme
+ * references. `siteSettings` lives in the shared `vex_globals` table, so
+ * this reads through `getGlobal` rather than a dedicated table (unlike the
+ * reference's `ctx.db.query("site_settings")`, which assumes a table that
+ * doesn't exist under the current architecture).
+ *
+ * Access is bypassed: read by `src/lib/metadata.ts` and the root layout for
+ * anonymous visitors before any session exists.
  */
 export const get = query({
   args: {},
   handler: async (ctx) => {
-    const settings = await ctx.db.query("site_settings").first()
-    if (!settings) return null
-    return settings
+    return await getGlobal({
+      ctx,
+      config,
+      slug: GLOBAL_SLUG_SITE_SETTINGS,
+      access: { bypass: true },
+    })
   },
 })

package/templates/marketing-site/convex/theme.ts

@@ -1,75 +1,69 @@
-import { getPreviewSnapshot } from "@vexcms/core"
+import { getGlobal } from "@vexcms/core/server"
+
+import { GLOBAL_SLUG_SITE_SETTINGS, type TABLE_SLUG_THEMES } from "~/db/constants"
+import config from "~/vex.config"
+
+import type { Doc, Id } from "./_generated/dataModel"
+import type { QueryCtx } from "./_generated/server"
 
 import { query } from "./_generated/server"
-import * as Versions from "./vex/model/versions"
+
+/** A theme document, or `null` when none is selected. */
+type ActiveTheme = Doc<typeof TABLE_SLUG_THEMES> | null
 
 /**
- * Get the active theme from site settings (published).
- * Returns the full theme document or null if no active theme is set.
- * Used for server-side CSS variable injection on public pages.
+ * Resolves one of `siteSettings`' theme references to its document.
+ *
+ * `relationship` always stores an array of ids — `hasMany` only controls how
+ * many the admin picker lets you choose — so the first entry is the selection.
+ *
+ * Access control is bypassed: a site's palette is public by definition, and an
+ * anonymous visitor must get the same colours as a signed-in editor.
+ *
+ * @param props - Input props.
+ * @param props.ctx - Convex query context.
+ * @param props.field - Which `siteSettings` reference to follow.
+ * @returns The referenced theme, or `null` when the global is unset, the
+ * reference is empty, or the referenced theme has been deleted.
  */
-export const getActive = query({
-  args: {},
-  handler: async (ctx) => {
-    const settings = await ctx.db.query("site_settings").first()
-    if (!settings?.activeTheme) return null
+async function resolveTheme(props: {
+  ctx: QueryCtx
+  field: "activeTheme" | "adminTheme"
+}): Promise<ActiveTheme> {
+  const settings = await getGlobal({
+    ctx: props.ctx,
+    config,
+    slug: GLOBAL_SLUG_SITE_SETTINGS,
+    access: { bypass: true },
+  })
+  if (!settings) return null
 
-    const theme = await ctx.db.get(settings.activeTheme)
-    if (!theme) return null
+  const reference = settings[props.field] as string[] | undefined
+  const themeId = reference?.[0]
+  if (!themeId) return null
 
-    // Only return published themes
-    if (theme.vex_status === "draft") return null
+  return await props.ctx.db.get(themeId as Id<typeof TABLE_SLUG_THEMES>)
+}
 
-    return theme
-  },
+/**
+ * The theme applied to the public site — `siteSettings.activeTheme`.
+ *
+ * Read by `<ThemeStyle />` in the root layout on every render.
+ */
+export const getActive = query({
+  args: {},
+  handler: async (ctx): Promise<ActiveTheme> => await resolveTheme({ ctx, field: "activeTheme" }),
 })
 
 /**
- * Get the active theme for preview/draft mode.
- * Reads site settings with preview snapshot overlay to get the draft activeTheme,
- * then fetches the latest version of that theme (draft or published).
- * Used for server-side CSS variable injection on preview pages.
+ * The theme applied to the admin panel.
+ *
+ * Falls back to `activeTheme` when `adminTheme` is unset, which is the default:
+ * the admin adopts the site's palette. Setting `adminTheme` is the opt-out.
  */
-export const getActivePreview = query({
+export const getAdmin = query({
   args: {},
-  handler: async (ctx) => {
-    // Get site settings, overlaying any preview snapshot
-    const settings = await ctx.db.query("site_settings").first()
-    if (!settings) return null
-
-    const settingsId = settings._id as string
-
-    // Check for a preview snapshot on site_settings
-    const snapshot = await getPreviewSnapshot({
-      ctx,
-      collection: "site_settings",
-      documentId: settingsId,
-    })
-
-    const merged = snapshot
-      ? { ...settings, ...(snapshot as Record<string, unknown>) }
-      : settings
-
-    const activeThemeId = (merged as any).activeTheme as string | undefined
-    if (!activeThemeId) return null
-
-    // Get the theme — prefer the latest draft version
-    const theme = await ctx.db.get(activeThemeId as any)
-    if (!theme) return null
-
-    const latestVersion = await Versions.getLatestVersion({
-      ctx,
-      collection: "themes",
-      documentId: activeThemeId,
-    })
-
-    if (latestVersion?.snapshot) {
-      return {
-        ...theme,
-        ...(latestVersion.snapshot as Record<string, unknown>),
-      }
-    }
-
-    return theme
-  },
+  handler: async (ctx): Promise<ActiveTheme> =>
+    (await resolveTheme({ ctx, field: "adminTheme" })) ??
+    (await resolveTheme({ ctx, field: "activeTheme" })),
 })

package/templates/marketing-site/convex/vex.schema.ts

@@ -0,0 +1,355 @@
+// ⚠️ AUTO-GENERATED BY VEX CMS — DO NOT EDIT ⚠️
+// Run 'vex dev' or 'vex generate' to update this file.
+
+import { defineTable } from "convex/server"
+import { v } from "convex/values"
+
+export const user = defineTable({
+  name: v.string(),
+  email: v.string(),
+  emailVerified: v.boolean(),
+  image: v.optional(v.string()),
+  createdAt: v.number(),
+  updatedAt: v.number(),
+  role: v.optional(v.string()),
+  banned: v.optional(v.boolean()),
+  banReason: v.optional(v.string()),
+  banExpires: v.optional(v.number()),
+  isAnonymous: v.optional(v.boolean()),
+  userId: v.optional(v.string()),
+  roles: v.array(v.string()),
+}).index("by_email", ["email"])
+
+export const pages = defineTable({
+  title: v.string(),
+  slug: v.string(),
+  blocks: v.optional(
+    v.array(
+      v.union(
+        v.object({
+          blockType: v.literal("hero"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          badgeText: v.optional(v.string()),
+          badgeLink: v.optional(v.string()),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          primaryCtaLabel: v.string(),
+          primaryCtaHref: v.string(),
+          secondaryCtaLabel: v.optional(v.string()),
+          secondaryCtaHref: v.optional(v.string()),
+        }),
+        v.object({
+          blockType: v.literal("features"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          features: v.array(
+            v.object({ title: v.string(), description: v.string(), icon: v.optional(v.string()) })
+          ),
+        }),
+        v.object({
+          blockType: v.literal("how_it_works"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          steps: v.array(
+            v.object({ icon: v.optional(v.string()), title: v.string(), description: v.string() })
+          ),
+        }),
+        v.object({
+          blockType: v.literal("roadmap"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          items: v.array(
+            v.object({
+              feature: v.string(),
+              description: v.optional(v.string()),
+              status: v.array(
+                v.union(v.literal("shipped"), v.literal("coming-soon"), v.literal("planned"))
+              ),
+            })
+          ),
+        }),
+        v.object({
+          blockType: v.literal("cta"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          actions: v.optional(v.array(v.object({ label: v.string(), href: v.string() }))),
+        }),
+        v.object({
+          blockType: v.literal("faq"),
+          blockName: v.optional(v.string()),
+          id: v.string(),
+          heading: v.string(),
+          subheading: v.optional(v.string()),
+          supportLink: v.optional(v.string()),
+          items: v.array(v.object({ question: v.string(), answer: v.string() })),
+        })
+      )
+    )
+  ),
+  metaTitle: v.optional(v.string()),
+  metaDescription: v.optional(v.string()),
+  ogImage: v.optional(v.array(v.id("images"))),
+}).index("by_slug", ["slug"])
+
+export const headers = defineTable({
+  name: v.string(),
+  content: v.optional(
+    v.array(
+      v.object({
+        blockType: v.literal("header"),
+        blockName: v.optional(v.string()),
+        id: v.string(),
+        logoText: v.optional(v.string()),
+        logoImage: v.optional(v.array(v.id("images"))),
+        logoHref: v.optional(v.string()),
+        menuItems: v.optional(v.array(v.object({ label: v.string(), href: v.string() }))),
+        actionButtons: v.optional(
+          v.array(
+            v.object({
+              label: v.string(),
+              href: v.string(),
+              variant: v.optional(
+                v.array(v.union(v.literal("default"), v.literal("outline"), v.literal("ghost")))
+              ),
+            })
+          )
+        ),
+      })
+    )
+  ),
+}).index("by_name", ["name"])
+
+export const footers = defineTable({
+  name: v.string(),
+  content: v.optional(
+    v.array(
+      v.object({
+        blockType: v.literal("footer"),
+        blockName: v.optional(v.string()),
+        id: v.string(),
+        logoText: v.optional(v.string()),
+        logoImage: v.optional(v.array(v.id("images"))),
+        copyright: v.optional(v.string()),
+        links: v.optional(v.array(v.object({ label: v.string(), href: v.string() }))),
+        socialLinks: v.optional(
+          v.array(
+            v.object({ platform: v.string(), href: v.string(), icon: v.optional(v.string()) })
+          )
+        ),
+      })
+    )
+  ),
+}).index("by_name", ["name"])
+
+export const themes = defineTable({
+  name: v.string(),
+  fontFamily: v.optional(v.string()),
+  radius: v.optional(v.string()),
+  light: v.optional(
+    v.object({
+      background: v.optional(v.string()),
+      foreground: v.optional(v.string()),
+      card: v.optional(v.string()),
+      cardForeground: v.optional(v.string()),
+      popover: v.optional(v.string()),
+      popoverForeground: v.optional(v.string()),
+      primary: v.optional(v.string()),
+      primaryForeground: v.optional(v.string()),
+      secondary: v.optional(v.string()),
+      secondaryForeground: v.optional(v.string()),
+      muted: v.optional(v.string()),
+      mutedForeground: v.optional(v.string()),
+      accent: v.optional(v.string()),
+      accentForeground: v.optional(v.string()),
+      destructive: v.optional(v.string()),
+      destructiveForeground: v.optional(v.string()),
+      border: v.optional(v.string()),
+      input: v.optional(v.string()),
+      ring: v.optional(v.string()),
+      chart1: v.optional(v.string()),
+      chart2: v.optional(v.string()),
+      chart3: v.optional(v.string()),
+      chart4: v.optional(v.string()),
+      chart5: v.optional(v.string()),
+      sidebar: v.optional(v.string()),
+      sidebarForeground: v.optional(v.string()),
+      sidebarPrimary: v.optional(v.string()),
+      sidebarPrimaryForeground: v.optional(v.string()),
+      sidebarAccent: v.optional(v.string()),
+      sidebarAccentForeground: v.optional(v.string()),
+      sidebarBorder: v.optional(v.string()),
+      sidebarRing: v.optional(v.string()),
+    })
+  ),
+  dark: v.optional(
+    v.object({
+      background: v.optional(v.string()),
+      foreground: v.optional(v.string()),
+      card: v.optional(v.string()),
+      cardForeground: v.optional(v.string()),
+      popover: v.optional(v.string()),
+      popoverForeground: v.optional(v.string()),
+      primary: v.optional(v.string()),
+      primaryForeground: v.optional(v.string()),
+      secondary: v.optional(v.string()),
+      secondaryForeground: v.optional(v.string()),
+      muted: v.optional(v.string()),
+      mutedForeground: v.optional(v.string()),
+      accent: v.optional(v.string()),
+      accentForeground: v.optional(v.string()),
+      destructive: v.optional(v.string()),
+      destructiveForeground: v.optional(v.string()),
+      border: v.optional(v.string()),
+      input: v.optional(v.string()),
+      ring: v.optional(v.string()),
+      chart1: v.optional(v.string()),
+      chart2: v.optional(v.string()),
+      chart3: v.optional(v.string()),
+      chart4: v.optional(v.string()),
+      chart5: v.optional(v.string()),
+      sidebar: v.optional(v.string()),
+      sidebarForeground: v.optional(v.string()),
+      sidebarPrimary: v.optional(v.string()),
+      sidebarPrimaryForeground: v.optional(v.string()),
+      sidebarAccent: v.optional(v.string()),
+      sidebarAccentForeground: v.optional(v.string()),
+      sidebarBorder: v.optional(v.string()),
+      sidebarRing: v.optional(v.string()),
+    })
+  ),
+}).index("by_name", ["name"])
+
+export const session = defineTable({
+  expiresAt: v.number(),
+  token: v.string(),
+  createdAt: v.number(),
+  updatedAt: v.number(),
+  ipAddress: v.optional(v.string()),
+  userAgent: v.optional(v.string()),
+  userId: v.string(),
+  impersonatedBy: v.optional(v.string()),
+  activeOrganizationId: v.optional(v.string()),
+})
+  .index("by_token", ["token"])
+  .index("by_userId", ["userId"])
+
+export const account = defineTable({
+  accountId: v.string(),
+  providerId: v.string(),
+  userId: v.string(),
+  accessToken: v.optional(v.string()),
+  refreshToken: v.optional(v.string()),
+  idToken: v.optional(v.string()),
+  accessTokenExpiresAt: v.optional(v.number()),
+  refreshTokenExpiresAt: v.optional(v.number()),
+  scope: v.optional(v.string()),
+  password: v.optional(v.string()),
+  createdAt: v.number(),
+  updatedAt: v.number(),
+}).index("by_userId", ["userId"])
+
+export const verification = defineTable({
+  identifier: v.string(),
+  value: v.string(),
+  expiresAt: v.number(),
+  createdAt: v.number(),
+  updatedAt: v.number(),
+}).index("by_identifier", ["identifier"])
+
+export const apikey = defineTable({
+  configId: v.string(),
+  name: v.optional(v.string()),
+  start: v.optional(v.string()),
+  referenceId: v.string(),
+  prefix: v.optional(v.string()),
+  key: v.string(),
+  refillInterval: v.optional(v.number()),
+  refillAmount: v.optional(v.number()),
+  lastRefillAt: v.optional(v.number()),
+  enabled: v.optional(v.boolean()),
+  rateLimitEnabled: v.optional(v.boolean()),
+  rateLimitTimeWindow: v.optional(v.number()),
+  rateLimitMax: v.optional(v.number()),
+  requestCount: v.optional(v.number()),
+  remaining: v.optional(v.number()),
+  lastRequest: v.optional(v.number()),
+  expiresAt: v.optional(v.number()),
+  createdAt: v.number(),
+  updatedAt: v.number(),
+  permissions: v.optional(v.string()),
+  metadata: v.optional(v.string()),
+})
+  .index("by_configId", ["configId"])
+  .index("by_referenceId", ["referenceId"])
+  .index("by_key", ["key"])
+
+export const jwks = defineTable({
+  publicKey: v.string(),
+  privateKey: v.string(),
+  createdAt: v.number(),
+  expiresAt: v.optional(v.number()),
+})
+
+export const organization = defineTable({
+  name: v.string(),
+  slug: v.string(),
+  logo: v.optional(v.string()),
+  createdAt: v.number(),
+  metadata: v.optional(v.string()),
+}).index("by_slug", ["slug"])
+
+export const member = defineTable({
+  organizationId: v.string(),
+  userId: v.string(),
+  role: v.string(),
+  createdAt: v.number(),
+})
+  .index("by_organizationId", ["organizationId"])
+  .index("by_userId", ["userId"])
+
+export const invitation = defineTable({
+  organizationId: v.string(),
+  email: v.string(),
+  role: v.optional(v.string()),
+  status: v.string(),
+  expiresAt: v.number(),
+  createdAt: v.number(),
+  inviterId: v.string(),
+})
+  .index("by_organizationId", ["organizationId"])
+  .index("by_email", ["email"])
+
+export const images = defineTable({
+  filename: v.string(),
+  alt: v.string(),
+  mimeType: v.string(),
+  size: v.number(),
+  storageId: v.string(),
+  deleted: v.optional(v.boolean()),
+  src: v.string(),
+  width: v.optional(v.number()),
+  height: v.optional(v.number()),
+})
+  .index("by_deleted", ["deleted"])
+  .searchIndex("search_filename", {
+    searchField: "filename",
+    filterFields: ["alt"],
+  })
+
+/**
+ * VEX GLOBALS — singleton documents, one row per registered global slug
+ **/
+
+export const vex_globals = defineTable({
+  slug: v.string(),
+  data: v.any(),
+}).index("by_slug", ["slug"])