create-ej-app 26.0.0 → 28.0.0

package/template/nextjs/src/components/ui/table.tsx

@@ -0,0 +1,116 @@
+'use client'
+
+import * as React from 'react'
+
+import { cn } from '~/lib/cn'
+
+function Table({ className, ...props }: React.ComponentProps<'table'>) {
+  return (
+    <div
+      data-slot="table-container"
+      className="relative w-full overflow-x-auto"
+    >
+      <table
+        data-slot="table"
+        className={cn('w-full caption-bottom text-sm', className)}
+        {...props}
+      />
+    </div>
+  )
+}
+
+function TableHeader({ className, ...props }: React.ComponentProps<'thead'>) {
+  return (
+    <thead
+      data-slot="table-header"
+      className={cn('[&_tr]:border-b', className)}
+      {...props}
+    />
+  )
+}
+
+function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) {
+  return (
+    <tbody
+      data-slot="table-body"
+      className={cn('[&_tr:last-child]:border-0', className)}
+      {...props}
+    />
+  )
+}
+
+function TableFooter({ className, ...props }: React.ComponentProps<'tfoot'>) {
+  return (
+    <tfoot
+      data-slot="table-footer"
+      className={cn(
+        'bg-muted/50 border-t font-medium [&>tr]:last:border-b-0',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TableRow({ className, ...props }: React.ComponentProps<'tr'>) {
+  return (
+    <tr
+      data-slot="table-row"
+      className={cn(
+        'hover:bg-muted/50 has-aria-expanded:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TableHead({ className, ...props }: React.ComponentProps<'th'>) {
+  return (
+    <th
+      data-slot="table-head"
+      className={cn(
+        'text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TableCell({ className, ...props }: React.ComponentProps<'td'>) {
+  return (
+    <td
+      data-slot="table-cell"
+      className={cn(
+        'p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function TableCaption({
+  className,
+  ...props
+}: React.ComponentProps<'caption'>) {
+  return (
+    <caption
+      data-slot="table-caption"
+      className={cn('text-muted-foreground mt-4 text-sm', className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  Table,
+  TableBody,
+  TableCaption,
+  TableCell,
+  TableFooter,
+  TableHead,
+  TableHeader,
+  TableRow
+}

package/template/nextjs/src/components/ui/textarea.tsx

@@ -0,0 +1,18 @@
+import * as React from 'react'
+
+import { cn } from '~/lib/cn'
+
+function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
+  return (
+    <textarea
+      data-slot="textarea"
+      className={cn(
+        'border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-2.5 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:ring-3 md:text-sm',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { Textarea }

package/template/nextjs/src/components/ui/tooltip.tsx

@@ -0,0 +1,57 @@
+'use client'
+
+import { Tooltip as TooltipPrimitive } from 'radix-ui'
+import * as React from 'react'
+
+import { cn } from '~/lib/cn'
+
+function TooltipProvider({
+  delayDuration = 0,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
+  return (
+    <TooltipPrimitive.Provider
+      data-slot="tooltip-provider"
+      delayDuration={delayDuration}
+      {...props}
+    />
+  )
+}
+
+function Tooltip({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
+  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />
+}
+
+function TooltipTrigger({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />
+}
+
+function TooltipContent({
+  className,
+  sideOffset = 0,
+  children,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+  return (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Content
+        data-slot="tooltip-content"
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-foreground text-background data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 z-50 inline-flex w-fit max-w-xs origin-(--radix-tooltip-content-transform-origin) items-center gap-1.5 rounded-md px-3 py-1.5 text-xs has-data-[slot=kbd]:pr-1.5 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <TooltipPrimitive.Arrow className="bg-foreground fill-foreground z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Portal>
+  )
+}
+
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }

package/template/nextjs/src/components/user-menu.tsx

@@ -0,0 +1,206 @@
+'use client'
+
+import {
+  House,
+  LayoutGrid,
+  LogOut,
+  ShieldCheck,
+  UserCog,
+  UserX
+} from 'lucide-react'
+import Link from 'next/link'
+import { usePathname, useRouter } from 'next/navigation'
+import { useState } from 'react'
+import { ThemeToggle } from '~/components/theme-toggle'
+import { Avatar, AvatarFallback, AvatarImage } from '~/components/ui/avatar'
+import { Button } from '~/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from '~/components/ui/dropdown-menu'
+import { admin, signOut } from '~/lib/auth-client'
+import { cn } from '~/lib/cn'
+
+type UserMenuProps = {
+  user: {
+    name?: string | null
+    email?: string | null
+    image?: string | null
+  }
+  fallbackName?: string
+  fallbackInitials?: string
+  wrapperClassName?: string
+  /** Superadmins work in both panels, so they get a way to cross over. */
+  isSuperAdmin?: boolean
+  /** This session is an admin acting as someone else. */
+  isImpersonating?: boolean
+}
+
+export function UserMenu({
+  user,
+  fallbackName = 'Unknown',
+  fallbackInitials = 'NA',
+  wrapperClassName = 'flex items-center gap-2',
+  isSuperAdmin = false,
+  isImpersonating = false
+}: UserMenuProps) {
+  const router = useRouter()
+  const pathname = usePathname()
+  const [isStopping, setIsStopping] = useState(false)
+
+  // One entry, pointing at the panel you are not in. Account pages sit outside
+  // both, and lead back to the admin panel.
+  const inAdminPanel = pathname?.startsWith('/admin') ?? false
+  const switchTo = inAdminPanel
+    ? { href: '/app', label: 'Switch to App', Icon: LayoutGrid }
+    : { href: '/admin', label: 'Switch to Admin', Icon: ShieldCheck }
+
+  const displayName = user.name ?? fallbackName
+  const initials =
+    user.name
+      ?.split(' ')
+      .slice(0, 2)
+      .map(part => part[0])
+      .join('') || fallbackInitials
+
+  async function stopImpersonating() {
+    setIsStopping(true)
+    try {
+      await admin.stopImpersonating()
+      // Back to the admin panel: the restored session may have no access to the
+      // page the impersonated user was looking at.
+      router.push('/admin')
+      router.refresh()
+    } catch {
+      setIsStopping(false)
+    }
+  }
+
+  return (
+    <div className={wrapperClassName}>
+      <ThemeToggle />
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button
+            variant="ghost"
+            className="relative size-8 rounded-full"
+            aria-label={
+              isImpersonating
+                ? `Account menu, impersonating ${displayName}`
+                : 'Account menu'
+            }
+          >
+            <Avatar
+              className={cn(
+                'size-8',
+                isImpersonating &&
+                  'ring-warning ring-offset-background ring-2 ring-offset-2'
+              )}
+            >
+              <AvatarFallback className="text-foreground">
+                {initials}
+              </AvatarFallback>
+              {user.image ? (
+                <AvatarImage src={user.image} alt={displayName} />
+              ) : null}
+            </Avatar>
+            {isImpersonating ? (
+              <span className="bg-warning text-warning-foreground ring-background absolute -right-0.5 -bottom-0.5 flex size-3.5 items-center justify-center rounded-full ring-2">
+                <UserX className="size-2.5" aria-hidden="true" />
+              </span>
+            ) : null}
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent className="w-60" align="end" forceMount>
+          <DropdownMenuLabel className="font-normal">
+            <div className="flex flex-col space-y-1">
+              <p className="text-foreground text-sm leading-none font-medium">
+                {displayName}
+              </p>
+              <p className="text-muted-foreground text-xs leading-none">
+                {user.email ?? ''}
+              </p>
+            </div>
+          </DropdownMenuLabel>
+
+          {isImpersonating ? (
+            <>
+              <DropdownMenuSeparator />
+              <div className="border-warning/40 bg-warning/10 mx-1 mb-1 flex items-start gap-2 rounded-md border px-2 py-1.5">
+                <UserX
+                  className="text-warning mt-0.5 size-3.5 shrink-0"
+                  aria-hidden="true"
+                />
+                <p className="text-foreground text-xs leading-snug">
+                  You are signed in as this user. Anything you do is recorded
+                  against their account.
+                </p>
+              </div>
+              <DropdownMenuGroup>
+                <DropdownMenuItem
+                  variant="destructive"
+                  disabled={isStopping}
+                  onSelect={event => {
+                    // Hold the menu open while the session swaps back.
+                    event.preventDefault()
+                    void stopImpersonating()
+                  }}
+                >
+                  <UserX className="mr-2 size-4" />
+                  <span>{isStopping ? 'Stopping…' : 'Stop Impersonating'}</span>
+                </DropdownMenuItem>
+              </DropdownMenuGroup>
+            </>
+          ) : null}
+
+          {isSuperAdmin ? (
+            <>
+              <DropdownMenuSeparator />
+              <DropdownMenuGroup>
+                <DropdownMenuItem asChild>
+                  <Link href={switchTo.href}>
+                    <switchTo.Icon className="mr-2 size-4" />
+                    <span>{switchTo.label}</span>
+                  </Link>
+                </DropdownMenuItem>
+              </DropdownMenuGroup>
+            </>
+          ) : null}
+
+          <DropdownMenuSeparator />
+          <DropdownMenuGroup>
+            <DropdownMenuItem asChild>
+              <Link href="/">
+                <House className="mr-2 size-4" />
+                <span>Home</span>
+              </Link>
+            </DropdownMenuItem>
+            <DropdownMenuItem asChild>
+              <Link href="/profile">
+                <UserCog className="mr-2 size-4" />
+                <span>Profile</span>
+              </Link>
+            </DropdownMenuItem>
+          </DropdownMenuGroup>
+          <DropdownMenuSeparator />
+          <DropdownMenuGroup>
+            <DropdownMenuItem
+              onClick={async () => {
+                await signOut()
+                router.push('/login')
+              }}
+            >
+              <LogOut className="mr-2 size-4" />
+              <span>Log Out</span>
+            </DropdownMenuItem>
+          </DropdownMenuGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  )
+}

package/template/nextjs/src/db/common.ts

@@ -1,17 +1,26 @@
+/**
+ * @fileoverview Reusable Drizzle column definitions shared across tables.
+ *
+ * Centralises common patterns (prefixed CUID primary keys, timestamps) so
+ * every table stays consistent. Add CHECK helpers here as tables need them.
+ */
 import { createId } from '@paralleldrive/cuid2'
 import { sql } from 'drizzle-orm'
 import { boolean, timestamp, varchar } from 'drizzle-orm/pg-core'
 
 export const commonFieldDefs = {
+  /** Generates a prefixed CUID2 primary key, such as `user_clx1234567890`. */
   id: (prefix: string) =>
     varchar('id')
       .primaryKey()
       .$defaultFn(() => prefix + '_' + createId()),
+  /** Nullable timezone-aware timestamp column. */
   date: (name: string) =>
     timestamp(name, {
       mode: 'date',
       withTimezone: true
     }),
+  /** Auto-populated `created_at` and `updated_at` timestamp pair. */
   dates: {
     createdAt: timestamp('created_at', {
       mode: 'date',
@@ -27,5 +36,6 @@ export const commonFieldDefs = {
       .$onUpdate(() => sql`NOW()`)
       .defaultNow()
   },
+  /** Boolean `is_active` flag, defaults to `true`. */
   isActive: boolean('is_active').notNull().default(true)
 }

package/template/nextjs/src/db/index.ts

@@ -1,6 +1,9 @@
+import 'server-only'
+
 import { drizzle } from 'drizzle-orm/postgres-js'
 import postgres from 'postgres'
 import { env } from '~/env'
+import * as relations from './relations'
 import * as schema from './schema'
 
 // In development, Next.js hot-reloading can re-evaluate modules frequently.
@@ -11,14 +14,21 @@ const globalForDb = globalThis as unknown as {
 }
 
 // Prefer the cached client (dev) and fall back to creating a new one.
-// `max: 1` limits the pool size, and `prepare: false` disables prepared
-// statements for compatibility with environments where prepared statements
-// can be problematic.
+// `prepare: false` disables prepared statements, which transaction-mode
+// poolers such as PgBouncer and Neon's pooler reject.
 const client =
   globalForDb.client ??
   postgres(env.DATABASE_URL, {
-    max: 1,
-    prepare: false
+    prepare: false,
+    // For neon.tech postgres db, as its serverless
+    ...(env.DATABASE_URL.includes('neon.tech')
+      ? {
+          max: 5,
+          idle_timeout: 30, // seconds an idle connection is kept before closing
+          max_lifetime: 60 * 5, // recycle a connection after 5 minutes
+          connect_timeout: 60 // seconds to wait for a connection (Neon cold start)
+        }
+      : {})
   })
 
 // Only cache the client outside production to avoid unexpected cross-request
@@ -43,7 +53,7 @@ if (env.APP_ENV !== 'production') globalForDb.client = client
  * })
  */
 export const db = drizzle(client, {
-  schema: { ...schema }
+  schema: { ...schema, ...relations }
 })
 
 /** The transaction client type passed into `db.transaction(async (tx) => ...)`. */

package/template/nextjs/src/db/relations.ts

@@ -0,0 +1,21 @@
+import { relations } from 'drizzle-orm'
+import { accountsTable, sessionsTable, usersTable } from './schema'
+
+export const userRelations = relations(usersTable, ({ many }) => ({
+  sessions: many(sessionsTable),
+  accounts: many(accountsTable)
+}))
+
+export const sessionRelations = relations(sessionsTable, ({ one }) => ({
+  user: one(usersTable, {
+    fields: [sessionsTable.userId],
+    references: [usersTable.id]
+  })
+}))
+
+export const accountRelations = relations(accountsTable, ({ one }) => ({
+  user: one(usersTable, {
+    fields: [accountsTable.userId],
+    references: [usersTable.id]
+  })
+}))

package/template/nextjs/src/db/schema.ts

@@ -1,53 +1,92 @@
-import { boolean, pgTable, text } from 'drizzle-orm/pg-core'
+/**
+ * @fileoverview Drizzle table definitions.
+ *
+ * Reusable column helpers live in `./common.ts`. Put Postgres enums in a
+ * sibling `./enums.ts` and re-export them from here.
+ * Every foreign key leads an index and declares an explicit `onDelete`;
+ * `tests/db/fk-indexes.test.ts` enforces both.
+ */
+import { boolean, index, pgTable, text, varchar } from 'drizzle-orm/pg-core'
 import { commonFieldDefs } from './common'
 
-export const usersTable = pgTable('users', {
-  id: commonFieldDefs.id('user'),
-  email: text('email').notNull().unique(),
-  name: text('name').notNull(),
-  emailVerified: boolean('email_verified').default(false).notNull(),
-  image: text('image'),
-  role: text('role'),
-  banned: boolean('banned').default(false),
-  banReason: text('ban_reason'),
-  banExpires: commonFieldDefs.date('ban_expires'),
-  ...commonFieldDefs.dates
-})
+// ─── Auth (Better Auth) ─────────────────────────────────────────
 
-export const sessionsTable = pgTable('sessions', {
-  id: commonFieldDefs.id('session'),
-  expiresAt: commonFieldDefs.date('expires_at').notNull(),
-  token: text('token').notNull().unique(),
-  ipAddress: text('ip_address'),
-  userAgent: text('user_agent'),
-  userId: text('user_id')
-    .notNull()
-    .references(() => usersTable.id, { onDelete: 'cascade' }),
-  impersonatedBy: text('impersonated_by'),
-  ...commonFieldDefs.dates
-})
+export const usersTable = pgTable(
+  'users',
+  {
+    id: commonFieldDefs.id('user'),
+    name: text('name').notNull(),
+    email: text('email').notNull().unique(),
+    emailVerified: boolean('email_verified').default(false).notNull(),
+    image: text('image'),
+    role: text('role'),
+    banned: boolean('banned').default(false),
+    banReason: text('ban_reason'),
+    banExpires: commonFieldDefs.date('ban_expires'),
+    ...commonFieldDefs.dates
+  },
+  table => [index().on(table.createdAt), index().on(table.role)]
+)
 
-export const accountsTable = pgTable('accounts', {
-  id: commonFieldDefs.id('account'),
-  accountId: text('account_id').notNull(),
-  providerId: text('provider_id').notNull(),
-  userId: text('user_id')
-    .notNull()
-    .references(() => usersTable.id, { onDelete: 'cascade' }),
-  accessToken: text('access_token'),
-  refreshToken: text('refresh_token'),
-  idToken: text('id_token'),
-  accessTokenExpiresAt: commonFieldDefs.date('access_token_expires_at'),
-  refreshTokenExpiresAt: commonFieldDefs.date('refresh_token_expires_at'),
-  scope: text('scope'),
-  password: text('password'),
-  ...commonFieldDefs.dates
-})
+export const sessionsTable = pgTable(
+  'sessions',
+  {
+    id: commonFieldDefs.id('session'),
+    expiresAt: commonFieldDefs.date('expires_at').notNull(),
+    token: text('token').notNull().unique(),
+    ipAddress: text('ip_address'),
+    userAgent: text('user_agent'),
+    userId: text('user_id')
+      .notNull()
+      .references(() => usersTable.id, { onDelete: 'cascade' }),
+    impersonatedBy: text('impersonated_by'),
+    ...commonFieldDefs.dates
+  },
+  table => [index().on(table.userId)]
+)
+
+export const accountsTable = pgTable(
+  'accounts',
+  {
+    id: commonFieldDefs.id('account'),
+    accountId: text('account_id').notNull(),
+    providerId: text('provider_id').notNull(),
+    userId: text('user_id')
+      .notNull()
+      .references(() => usersTable.id, { onDelete: 'cascade' }),
+    accessToken: text('access_token'),
+    refreshToken: text('refresh_token'),
+    idToken: text('id_token'),
+    accessTokenExpiresAt: commonFieldDefs.date('access_token_expires_at'),
+    refreshTokenExpiresAt: commonFieldDefs.date('refresh_token_expires_at'),
+    scope: text('scope'),
+    password: text('password'),
+    ...commonFieldDefs.dates
+  },
+  table => [index().on(table.userId)]
+)
+
+export const verificationsTable = pgTable(
+  'verifications',
+  {
+    id: commonFieldDefs.id('verification'),
+    identifier: text('identifier').notNull(),
+    value: text('value').notNull(),
+    expiresAt: commonFieldDefs.date('expires_at').notNull(),
+    ...commonFieldDefs.dates
+  },
+  table => [index().on(table.identifier)]
+)
+
+// ─── Seed ───────────────────────────────────────────────────────
+
+/**
+ * Singleton marker for a successful `seedDatabase` run. While
+ * {@link SEED_RUN_MARKER_ID} exists, the seed script does nothing.
+ */
+export const SEED_RUN_MARKER_ID = 'seed_run_default'
 
-export const verificationsTable = pgTable('verifications', {
-  id: commonFieldDefs.id('verification'),
-  identifier: text('identifier').notNull(),
-  value: text('value').notNull(),
-  expiresAt: commonFieldDefs.date('expires_at').notNull(),
+export const seedRunsTable = pgTable('seed_runs', {
+  id: varchar('id').primaryKey(),
   ...commonFieldDefs.dates
 })