create-ej-app 6.0.0 → 7.0.0

package/template/prisma/src/app/(auth)/login/user-auth-form.tsx

@@ -1,152 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { signIn } from 'next-auth/react'
-import { useSearchParams } from 'next/navigation'
-import { FC, HTMLAttributes, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { z } from 'zod'
-
-import { Icons } from '@/components/icons'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { toast } from '@/components/ui/use-toast'
-import { cn } from '@/lib/cn'
-
-const userAuthSchema = z.object({
-  email: z.string().email()
-})
-
-type FormData = z.infer<typeof userAuthSchema>
-
-interface UserAuthFormProps extends HTMLAttributes<HTMLDivElement> {}
-
-export const UserAuthForm: FC = ({
-  className,
-  ...props
-}: UserAuthFormProps) => {
-  const {
-    register,
-    handleSubmit,
-    formState: { errors }
-  } = useForm<FormData>({
-    resolver: zodResolver(userAuthSchema)
-  })
-  const [isLoading, setIsLoading] = useState(false)
-  const [isGoogleLoading, setIsGoogleLoading] = useState(false)
-  const [isGithubLoading, setIsGithubLoading] = useState(false)
-
-  const searchParams = useSearchParams()
-
-  async function onSubmit(data: FormData) {
-    setIsLoading(true)
-
-    const signInResult = await signIn('email', {
-      email: data.email.toLowerCase(),
-      redirect: false,
-      callbackUrl: searchParams?.get('from') || '/dashboard'
-    })
-
-    setIsLoading(false)
-
-    if (!signInResult?.ok) {
-      return toast({
-        title: 'Something went wrong.',
-        description: 'Your sign in request failed. Please try again.',
-        variant: 'destructive'
-      })
-    }
-
-    return toast({
-      title: 'Check your email',
-      description: 'We sent you a login link. Be sure to check your spam too.'
-    })
-  }
-
-  return (
-    <div className={cn('grid gap-6', className)} {...props}>
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <div className="grid gap-2">
-          <div className="grid gap-1">
-            <Label className="sr-only" htmlFor="email">
-              Email
-            </Label>
-            <Input
-              id="email"
-              placeholder="name@example.com"
-              type="email"
-              autoCapitalize="none"
-              autoComplete="email"
-              autoCorrect="off"
-              disabled={isLoading}
-              {...register('email')}
-            />
-            {errors?.email && (
-              <p className="px-1 text-xs text-red-600">
-                {errors.email.message}
-              </p>
-            )}
-          </div>
-          <Button
-            disabled={isLoading || isGoogleLoading || isGithubLoading}
-            type="submit"
-          >
-            {isLoading && (
-              <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />
-            )}
-            Sign in with Email
-          </Button>
-        </div>
-      </form>
-      <div className="relative">
-        <div className="absolute inset-0 flex items-center">
-          <span className="w-full border-t" />
-        </div>
-        <div className="relative flex justify-center text-xs uppercase">
-          <span className="bg-background px-2 text-muted-foreground">
-            Or continue with
-          </span>
-        </div>
-      </div>
-      <div className="grid gap-2">
-        <Button
-          variant="outline"
-          onClick={async () => {
-            setIsGoogleLoading(true)
-            await signIn('google', {
-              callbackUrl: searchParams?.get('from') || '/dashboard'
-            })
-            setIsGoogleLoading(false)
-          }}
-          disabled={isLoading || isGoogleLoading || isGithubLoading}
-        >
-          {isGoogleLoading ? (
-            <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />
-          ) : (
-            <Icons.google className="mr-2 h-4 w-4" />
-          )}
-          Google
-        </Button>
-        <Button
-          variant="outline"
-          onClick={async () => {
-            setIsGithubLoading(true)
-            await signIn('github', {
-              callbackUrl: searchParams?.get('from') || '/dashboard'
-            })
-            setIsGithubLoading(false)
-          }}
-          disabled={isLoading || isGoogleLoading || isGithubLoading}
-        >
-          {isGithubLoading ? (
-            <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />
-          ) : (
-            <Icons.github className="mr-2 h-4 w-4" />
-          )}
-          Github
-        </Button>
-      </div>
-    </div>
-  )
-}

package/template/prisma/src/app/api/auth/[...nextauth]/route.ts

@@ -1,7 +0,0 @@
-import NextAuth from 'next-auth'
-
-import { authOptions } from '@/lib/auth'
-
-const handler = NextAuth(authOptions)
-
-export { handler as GET, handler as POST }

package/template/prisma/src/app/api/upload/route.ts

@@ -1,36 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-
-import { getAuthSession } from '@/lib/auth'
-import { prisma } from '@/lib/db'
-import { storageClient } from '@/lib/storageClient'
-
-export async function POST(request: NextRequest) {
-  const session = await getAuthSession()
-  if (!session)
-    return NextResponse.json({
-      success: false
-    })
-
-  const data = await request.formData()
-  const file: File | null = data.get('file') as unknown as File
-
-  if (!file) return NextResponse.json({ success: false })
-
-  const bytes = await file.arrayBuffer()
-  const buffer = Buffer.from(bytes)
-
-  const filename = `${Date.now()}-${Math.random()}-${file.name}`
-  const url = await storageClient.addFile({
-    filename,
-    data: buffer
-  })
-  const { id } = await prisma.resource.create({
-    data: {
-      newFilename: filename,
-      originalFilename: file.name,
-      url
-    }
-  })
-
-  return NextResponse.json({ success: true, id, url })
-}

package/template/prisma/src/app/layout.tsx

@@ -1,34 +0,0 @@
-import { Analytics } from '@vercel/analytics/react'
-import { SpeedInsights } from '@vercel/speed-insights/next'
-import { Metadata } from 'next'
-import { Inter } from 'next/font/google'
-import { ReactNode } from 'react'
-
-import { ThemeProvider } from '@/components/theme-provider'
-import { Toaster } from '@/components/ui/toaster'
-import { siteConfig } from '@/lib/siteConfig'
-import '@/styles/globals.css'
-
-const inter = Inter({ subsets: ['latin'] })
-
-export const metadata: Metadata = {
-  title: siteConfig.name,
-  description: siteConfig.description
-}
-
-const RootLayout = ({ children }: { children: ReactNode }) => {
-  return (
-    <html lang="en" suppressHydrationWarning>
-      <body className={inter.className}>
-        <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-          {children}
-          <Analytics />
-          <SpeedInsights />
-          <Toaster />
-        </ThemeProvider>
-      </body>
-    </html>
-  )
-}
-
-export default RootLayout

package/template/prisma/src/components/app-nav-command.tsx

@@ -1,160 +0,0 @@
-'use client'
-
-// import debounce from 'lodash/debounce'
-import { signOut } from 'next-auth/react'
-import { useTheme } from 'next-themes'
-import { useRouter } from 'next/navigation'
-import { FC, useCallback, useEffect, useState } from 'react'
-
-import { Icons } from '@/components/icons'
-import { Button } from '@/components/ui/button'
-import {
-  Command,
-  CommandDialog,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList,
-  CommandSeparator
-} from '@/components/ui/command'
-// import { doSearch, type SearchResult } from '../app/(app)/actions/doSearch'
-
-export const AppNavCommand: FC<{
-  modules: {
-    task: boolean
-  }
-}> = ({ modules }) => {
-  const [open, setOpen] = useState(false)
-  // const [search, setSearch] = useState('')
-  // const [searchResults, setSearchResults] = useState<SearchResult[]>([])
-  const { setTheme } = useTheme()
-  const router = useRouter()
-
-  useEffect(() => {
-    const down = (e: KeyboardEvent) => {
-      if (e.key === 'k' && (e.metaKey || e.ctrlKey)) {
-        e.preventDefault()
-        setOpen(open => !open)
-      }
-    }
-
-    document.addEventListener('keydown', down)
-    return () => document.removeEventListener('keydown', down)
-  }, [])
-
-  // useEffect(() => {
-  //   if (!search) {
-  //     setSearchResults([])
-  //     return
-  //   }
-  //   doSearch(search).then(results => setSearchResults(results))
-  // }, [search])
-
-  const runCommand = useCallback((command: () => unknown) => {
-    setOpen(false)
-    command()
-  }, [])
-
-  // const debouncedSearch = useMemo(
-  //   () =>
-  //     debounce((search: string) => {
-  //       setSearch(search)
-  //     }, 500),
-  //   []
-  // )
-
-  return (
-    <>
-      <Button
-        variant="outline"
-        className="relative w-36 justify-start text-sm text-muted-foreground lg:w-64"
-        onClick={() => setOpen(true)}
-      >
-        <span className="truncate">Command Menu</span>
-        <kbd className="pointer-events-none absolute right-2 top-2 hidden h-5 select-none items-center gap-1 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium opacity-100 lg:flex">
-          <span className="text-xs">⌘</span>K
-        </kbd>
-      </Button>
-      <CommandDialog open={open} onOpenChange={setOpen}>
-        <Command>
-          <CommandInput
-            placeholder="Search..."
-            // onChangeCapture={e => {
-            //   debouncedSearch((e.target as any)?.value || '')
-            // }}
-          />
-          <CommandList>
-            <CommandEmpty>No search results found.</CommandEmpty>
-            <CommandGroup heading="Suggestions">
-              <CommandItem
-                onSelect={() => runCommand(() => router.push('/dashboard'))}
-              >
-                <Icons.dashboard className="mr-2 h-4 w-4" />
-                Dashboard
-              </CommandItem>
-              {modules.task ? (
-                <CommandItem
-                  onSelect={() => runCommand(() => router.push('/tasks'))}
-                >
-                  <Icons.task className="mr-2 h-4 w-4" />
-                  Tasks
-                </CommandItem>
-              ) : undefined}
-            </CommandGroup>
-            <CommandGroup heading="Account">
-              <CommandItem
-                onSelect={() => runCommand(() => router.push('/settings'))}
-              >
-                <Icons.settings className="mr-2 h-4 w-4" />
-                Settings
-              </CommandItem>
-              <CommandItem
-                onSelect={() =>
-                  runCommand(() =>
-                    signOut({
-                      callbackUrl: `${window.location.origin}/login`
-                    })
-                  )
-                }
-              >
-                <Icons.logout className="mr-2 h-4 w-4" />
-                Sign Out
-              </CommandItem>
-            </CommandGroup>
-            <CommandSeparator />
-            <CommandGroup heading="Theme">
-              <CommandItem onSelect={() => runCommand(() => setTheme('light'))}>
-                <Icons.sun className="mr-2 h-4 w-4" />
-                Light
-              </CommandItem>
-              <CommandItem onSelect={() => runCommand(() => setTheme('dark'))}>
-                <Icons.moon className="mr-2 h-4 w-4" />
-                Dark
-              </CommandItem>
-              <CommandItem
-                onSelect={() => runCommand(() => setTheme('system'))}
-              >
-                <Icons.laptop className="mr-2 h-4 w-4" />
-                System
-              </CommandItem>
-            </CommandGroup>
-            {/* {searchResults.length ? (
-              <CommandGroup heading="Search Results">
-                {searchResults.map((sr, i) => (
-                  <CommandItem
-                    key={i}
-                    onSelect={() => runCommand(() => router.push(sr.link))}
-                    value={sr.id}
-                  >
-                    {sr.title}
-                  </CommandItem>
-                ))}
-              </CommandGroup>
-            ) : undefined} */}
-          </CommandList>
-        </Command>
-      </CommandDialog>
-    </>
-  )
-}

package/template/prisma/src/components/dark-mode-toggle.tsx

@@ -1,43 +0,0 @@
-'use client'
-
-import { useTheme } from 'next-themes'
-import { FC } from 'react'
-
-import { Icons } from '@/components/icons'
-import { Button } from '@/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-
-export const DarkModeToggle: FC = () => {
-  const { setTheme } = useTheme()
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="ghost" size="icon">
-          <Icons.sun className="rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Icons.moon className="absolute rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <DropdownMenuItem onClick={() => setTheme('light')}>
-          <Icons.sun className="mr-2 h-4 w-4" />
-          <span>Light</span>
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme('dark')}>
-          <Icons.moon className="mr-2 h-4 w-4" />
-          <span>Dark</span>
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme('system')}>
-          <Icons.laptop className="mr-2 h-4 w-4" />
-          <span>System</span>
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  )
-}

package/template/prisma/src/components/data-table/data-table-column-header.tsx

@@ -1,91 +0,0 @@
-import { type Column } from '@tanstack/react-table'
-
-import { Icons } from '@/components/icons'
-import { Button } from '@/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { cn } from '@/lib/cn'
-
-interface DataTableColumnHeaderProps<TData, TValue>
-  extends React.HTMLAttributes<HTMLDivElement> {
-  column: Column<TData, TValue>
-  title: string
-}
-
-export function DataTableColumnHeader<TData, TValue>({
-  column,
-  title,
-  className
-}: DataTableColumnHeaderProps<TData, TValue>) {
-  if (!column.getCanSort()) {
-    return <div className={cn(className)}>{title}</div>
-  }
-
-  return (
-    <div className={cn('flex items-center space-x-2', className)}>
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button
-            aria-label={
-              column.getIsSorted() === 'desc'
-                ? `Sorted descending. Click to sort ascending.`
-                : column.getIsSorted() === 'asc'
-                ? `Sorted ascending. Click to sort descending.`
-                : `Not sorted. Click to sort ascending.`
-            }
-            variant="ghost"
-            size="sm"
-            className="-ml-3 h-8 data-[state=open]:bg-accent"
-          >
-            <span>{title}</span>
-            {column.getIsSorted() === 'desc' ? (
-              <Icons.arrowDown className="ml-2 h-4 w-4" aria-hidden="true" />
-            ) : column.getIsSorted() === 'asc' ? (
-              <Icons.arrowUp className="ml-2 h-4 w-4" aria-hidden="true" />
-            ) : (
-              <Icons.arrowUpDown className="ml-2 h-4 w-4" aria-hidden="true" />
-            )}
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="start">
-          <DropdownMenuItem
-            aria-label="Sort ascending"
-            onClick={() => column.toggleSorting(false)}
-          >
-            <Icons.arrowUp
-              className="mr-2 h-3.5 w-3.5 text-muted-foreground/70"
-              aria-hidden="true"
-            />
-            Asc
-          </DropdownMenuItem>
-          <DropdownMenuItem
-            aria-label="Sort descending"
-            onClick={() => column.toggleSorting(true)}
-          >
-            <Icons.arrowDown
-              className="mr-2 h-3.5 w-3.5 text-muted-foreground/70"
-              aria-hidden="true"
-            />
-            Desc
-          </DropdownMenuItem>
-          <DropdownMenuSeparator />
-          <DropdownMenuItem
-            aria-label="Hide column"
-            onClick={() => column.toggleVisibility(false)}
-          >
-            <Icons.eyeOff
-              className="mr-2 h-3.5 w-3.5 text-muted-foreground/70"
-              aria-hidden="true"
-            />
-            Hide
-          </DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  )
-}

package/template/prisma/src/components/data-table/data-table-faceted-filter.tsx

@@ -1,149 +0,0 @@
-import { type Column } from '@tanstack/react-table'
-import { ComponentType } from 'react'
-
-import { Icons } from '@/components/icons'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList,
-  CommandSeparator
-} from '@/components/ui/command'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger
-} from '@/components/ui/popover'
-import { Separator } from '@/components/ui/separator'
-import { cn } from '@/lib/cn'
-
-export type FilterOption = {
-  label: string
-  value: string
-  icon?: ComponentType<{ className?: string }>
-}
-
-interface DataTableFacetedFilter<TData, TValue> {
-  column?: Column<TData, TValue>
-  title?: string
-  options: FilterOption[]
-}
-
-export function DataTableFacetedFilter<TData, TValue>({
-  column,
-  title,
-  options
-}: DataTableFacetedFilter<TData, TValue>) {
-  const selectedValues = new Set(column?.getFilterValue() as string[])
-
-  return (
-    <Popover>
-      <PopoverTrigger asChild>
-        <Button variant="outline" size="sm" className="h-8 border-dashed">
-          <Icons.plusCircle className="mr-2 h-4 w-4" />
-          {title}
-          {selectedValues?.size > 0 && (
-            <>
-              <Separator orientation="vertical" className="mx-2 h-4" />
-              <Badge
-                variant="secondary"
-                className="rounded-sm px-1 font-normal lg:hidden"
-              >
-                {selectedValues.size}
-              </Badge>
-              <div className="hidden space-x-1 lg:flex">
-                {selectedValues.size > 2 ? (
-                  <Badge
-                    variant="secondary"
-                    className="rounded-sm px-1 font-normal"
-                  >
-                    {selectedValues.size} selected
-                  </Badge>
-                ) : (
-                  options
-                    .filter(option => selectedValues.has(option.value))
-                    .map(option => (
-                      <Badge
-                        variant="secondary"
-                        key={option.value}
-                        className="rounded-sm px-1 font-normal"
-                      >
-                        {option.label}
-                      </Badge>
-                    ))
-                )}
-              </div>
-            </>
-          )}
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className="w-[200px] p-0" align="start">
-        <Command>
-          <CommandInput placeholder={title} />
-          <CommandList>
-            <CommandEmpty>No results found.</CommandEmpty>
-            <CommandGroup>
-              {options.map(option => {
-                const isSelected = selectedValues.has(option.value)
-                return (
-                  <CommandItem
-                    key={option.value}
-                    onSelect={() => {
-                      if (isSelected) {
-                        selectedValues.delete(option.value)
-                      } else {
-                        selectedValues.add(option.value)
-                      }
-                      const filterValues = Array.from(selectedValues)
-                      column?.setFilterValue(
-                        filterValues.length ? filterValues : undefined
-                      )
-                    }}
-                  >
-                    <div
-                      className={cn(
-                        'mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary',
-                        isSelected
-                          ? 'bg-primary text-primary-foreground'
-                          : 'opacity-50 [&_svg]:invisible'
-                      )}
-                    >
-                      <Icons.check
-                        className={cn('h-4 w-4')}
-                        aria-hidden="true"
-                      />
-                    </div>
-                    {option.icon && (
-                      <option.icon
-                        className="mr-2 h-4 w-4 text-muted-foreground"
-                        aria-hidden="true"
-                      />
-                    )}
-                    <span>{option.label}</span>
-                  </CommandItem>
-                )
-              })}
-            </CommandGroup>
-            {selectedValues.size > 0 && (
-              <>
-                <CommandSeparator />
-                <CommandGroup>
-                  <CommandItem
-                    onSelect={() => column?.setFilterValue(undefined)}
-                    className="justify-center text-center"
-                  >
-                    Clear filters
-                  </CommandItem>
-                </CommandGroup>
-              </>
-            )}
-          </CommandList>
-        </Command>
-      </PopoverContent>
-    </Popover>
-  )
-}