create-ej-app 6.0.0 → 7.0.0

package/template/prisma-advanced/src/app/(app)/users/[id]/actions.ts

@@ -1,104 +0,0 @@
-'use server'
-
-import { UserType } from '@prisma/client'
-import { revalidatePath } from 'next/cache'
-
-import { authGuard } from '@/lib/auth'
-import { prisma } from '@/lib/db'
-import { UnwrapPromise } from '@/types/UnwrapPromise'
-
-export const getUser = async (id: string) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  return await prisma.user.findUnique({
-    where: {
-      id
-    },
-    include: {
-      role: {
-        select: {
-          id: true,
-          name: true
-        }
-      }
-    }
-  })
-}
-
-export type GetUserFnDataType = UnwrapPromise<ReturnType<typeof getUser>>
-
-export const createUser = async ({
-  name,
-  email,
-  type,
-  roleId
-}: {
-  name: string
-  email: string
-  type: UserType
-  roleId?: string | null
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  const { id } = await prisma.user.create({
-    data: {
-      name,
-      email,
-      type,
-      roleId
-    }
-  })
-
-  revalidatePath('/users')
-  revalidatePath(`/users/${id}`)
-
-  return id
-}
-
-export const updateUser = async ({
-  id,
-  name,
-  email,
-  type,
-  roleId
-}: {
-  id: string
-  name: string
-  email: string
-  type: UserType
-  roleId?: string | null
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  await prisma.user.update({
-    where: {
-      id
-    },
-    data: {
-      name,
-      email,
-      type,
-      roleId
-    }
-  })
-
-  revalidatePath('/users')
-  revalidatePath(`/users/${id}`)
-}
-
-export const deleteUser = async (id: string) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  await prisma.user.delete({
-    where: {
-      id
-    }
-  })
-
-  revalidatePath('/users')
-  revalidatePath(`/users/${id}`)
-}

package/template/prisma-advanced/src/app/(app)/users/[id]/page.tsx

@@ -1,39 +0,0 @@
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { getRolesMini } from '../../roles/actions'
-import { GetUserFnDataType, getUser } from './actions'
-import { Render } from './render'
-
-export const generateMetadata = async (props: {
-  params: { id: string }
-}): Promise<Metadata> => ({
-  title: 'User - ' + props.params.id + ' | ' + siteConfig.name
-})
-
-const UserPage = async ({
-  params: { id }
-}: {
-  params: {
-    id: string
-  }
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) return notFound()
-
-  let user: GetUserFnDataType | undefined
-
-  if (id !== 'new') {
-    const x = await getUser(id)
-    if (!x) return notFound()
-    user = x
-  }
-
-  const roles = await getRolesMini()
-
-  return <Render user={user} roles={roles} />
-}
-
-export default UserPage

package/template/prisma-advanced/src/app/(app)/users/[id]/render.tsx

@@ -1,320 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { UserType } from '@prisma/client'
-import Link from 'next/link'
-import { useRouter } from 'next/navigation'
-import { FC, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { z } from 'zod'
-
-import { Heading } from '@/components/heading'
-import { Icons } from '@/components/icons'
-import { Shell } from '@/components/shell'
-import { SystemInfo } from '@/components/system-info'
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger
-} from '@/components/ui/alert-dialog'
-import { Button } from '@/components/ui/button'
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage
-} from '@/components/ui/form'
-import { Input } from '@/components/ui/input'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select'
-import { toast } from '@/components/ui/use-toast'
-import { formatDateTime, timesAgo } from '@/lib/formatDate'
-import { generateLabel } from '@/lib/generateLabel'
-import { GetRolesMiniFnDataType } from '../../roles/actions'
-import {
-  GetUserFnDataType,
-  createUser,
-  deleteUser,
-  updateUser
-} from './actions'
-
-const UserSchema = z.object({
-  name: z.string().nonempty(),
-  email: z.string().email(),
-  type: z.nativeEnum(UserType),
-  roleId: z.string().optional().nullable()
-})
-
-type FormData = z.infer<typeof UserSchema>
-
-const types = Object.values(UserType).map(x => ({
-  label: generateLabel(x),
-  value: x
-}))
-
-export const Render: FC<{
-  user: GetUserFnDataType | undefined
-  roles: GetRolesMiniFnDataType
-}> = ({ user, roles }) => {
-  const form = useForm<FormData>({
-    resolver: zodResolver(UserSchema),
-    defaultValues: {
-      name: user?.name ?? '',
-      email: user?.email ?? '',
-      type: user?.type ?? UserType.Normal,
-      roleId: user?.roleId
-    }
-  })
-  const router = useRouter()
-  const [isSaving, setIsSaving] = useState(false)
-  const [isDeleting, setIsDeleting] = useState(false)
-
-  async function onSubmit(data: FormData) {
-    setIsSaving(true)
-    try {
-      if (!user) {
-        const newId = await createUser(data)
-        router.replace(`/users/${newId}`)
-      } else {
-        await updateUser({
-          id: user.id,
-          ...data
-        })
-      }
-      toast({
-        title: 'User saved'
-      })
-    } catch (err) {
-      toast({
-        title: 'Error saving user',
-        variant: 'destructive'
-      })
-    }
-    setIsSaving(false)
-  }
-
-  return (
-    <Shell>
-      <Heading
-        heading={user ? user.name || user.email || user.id : 'New User'}
-      />
-      <Form {...form}>
-        <form
-          className="grid grid-cols-1 gap-3 md:grid-cols-2"
-          onSubmit={form.handleSubmit(onSubmit)}
-        >
-          <div className="col-span-1 mb-1 grid grid-cols-2 gap-2 sm:flex md:col-span-2">
-            <Button type="button" onClick={() => router.back()} variant="ghost">
-              <Icons.chevronLeft className="mr-2 h-4 w-4" />
-              Back
-            </Button>
-            <Button type="submit" disabled={isSaving || isDeleting}>
-              {isSaving ? (
-                <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />
-              ) : (
-                <Icons.save className="mr-2 h-4 w-4" />
-              )}
-              <span>Save</span>
-            </Button>
-            {user ? (
-              <AlertDialog>
-                <AlertDialogTrigger asChild>
-                  <Button
-                    type="button"
-                    variant="destructive"
-                    disabled={isSaving || isDeleting}
-                  >
-                    {isDeleting ? (
-                      <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />
-                    ) : (
-                      <Icons.delete className="mr-2 h-4 w-4" />
-                    )}
-                    Delete
-                  </Button>
-                </AlertDialogTrigger>
-                <AlertDialogContent>
-                  <AlertDialogHeader>
-                    <AlertDialogTitle>
-                      Are you absolutely sure?
-                    </AlertDialogTitle>
-                    <AlertDialogDescription>
-                      This action cannot be undone.
-                    </AlertDialogDescription>
-                  </AlertDialogHeader>
-                  <AlertDialogFooter>
-                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-                    <AlertDialogAction
-                      onClick={async () => {
-                        setIsDeleting(true)
-                        try {
-                          await deleteUser(user.id)
-                          toast({
-                            title: 'User deleted'
-                          })
-                          router.push('/users')
-                        } catch (err) {
-                          toast({
-                            title: 'Error deleting user',
-                            variant: 'destructive'
-                          })
-                        }
-                        setIsDeleting(false)
-                      }}
-                    >
-                      Continue
-                    </AlertDialogAction>
-                  </AlertDialogFooter>
-                </AlertDialogContent>
-              </AlertDialog>
-            ) : undefined}
-            {user ? (
-              <Link href="/users/new">
-                <Button
-                  type="button"
-                  disabled={isSaving || isDeleting}
-                  variant="secondary"
-                  className="w-full"
-                >
-                  <Icons.add className="mr-2 h-4 w-4" />
-                  New
-                </Button>
-              </Link>
-            ) : undefined}
-          </div>
-
-          <FormField
-            control={form.control}
-            name="name"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Name</FormLabel>
-                <FormControl>
-                  <Input
-                    type="text"
-                    placeholder="Enter a name"
-                    disabled={isSaving}
-                    {...field}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="email"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Email</FormLabel>
-                <FormControl>
-                  <Input
-                    type="email"
-                    placeholder="Enter an email"
-                    autoCapitalize="none"
-                    autoComplete="email"
-                    autoCorrect="off"
-                    disabled={isSaving}
-                    {...field}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="type"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Type</FormLabel>
-                <Select
-                  onValueChange={field.onChange}
-                  defaultValue={field.value}
-                  disabled={isSaving}
-                >
-                  <FormControl>
-                    <SelectTrigger>
-                      <SelectValue placeholder="Select type" />
-                    </SelectTrigger>
-                  </FormControl>
-                  <SelectContent>
-                    {types.map(({ label, value }) => (
-                      <SelectItem key={value} value={value}>
-                        {label}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          {form.getValues('type') === UserType.Normal ? (
-            <FormField
-              control={form.control}
-              name="roleId"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Role</FormLabel>
-                  <Select
-                    onValueChange={field.onChange}
-                    defaultValue={field.value || undefined}
-                    disabled={isSaving}
-                  >
-                    <FormControl>
-                      <SelectTrigger>
-                        <SelectValue placeholder="Select role" />
-                      </SelectTrigger>
-                    </FormControl>
-                    <SelectContent>
-                      {roles.map(({ id, name }) => (
-                        <SelectItem key={id} value={id}>
-                          {name}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          ) : undefined}
-        </form>
-      </Form>
-      {user ? (
-        <SystemInfo
-          items={[
-            {
-              label: 'Id',
-              value: user.id
-            },
-            {
-              label: 'Created At',
-              value: formatDateTime(user.createdAt)
-            },
-            {
-              label: 'Updated At',
-              value: timesAgo(user.updatedAt)
-            }
-          ]}
-        />
-      ) : undefined}
-    </Shell>
-  )
-}

package/template/prisma-advanced/src/app/(app)/users/actions.ts

@@ -1,67 +0,0 @@
-'use server'
-
-import { User, UserType } from '@prisma/client'
-
-import { authGuard } from '@/lib/auth'
-import { prisma } from '@/lib/db'
-import { UnwrapPromise } from '@/types/UnwrapPromise'
-
-export const getUsers = async ({
-  page,
-  limit,
-  sortBy,
-  sortOrder,
-  name,
-  email,
-  type
-}: {
-  page: number
-  limit: number
-  sortBy?: keyof User
-  sortOrder?: 'asc' | 'desc'
-  name?: string
-  email?: string
-  type?: UserType[]
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  const where = {
-    name: name ? { contains: name, mode: 'insensitive' as const } : undefined,
-    email: email
-      ? { contains: email, mode: 'insensitive' as const }
-      : undefined,
-    type: type?.length ? { in: type } : undefined
-  }
-  const [users, total] = await Promise.all([
-    prisma.user.findMany({
-      where,
-      select: {
-        id: true,
-        name: true,
-        email: true,
-        type: true,
-        role: {
-          select: {
-            id: true,
-            name: true
-          }
-        },
-        createdAt: true,
-        updatedAt: true
-      },
-      skip: (page - 1) * limit,
-      take: limit,
-      orderBy: {
-        [sortBy || 'createdAt']: sortOrder || 'desc'
-      }
-    }),
-    prisma.user.count({
-      where
-    })
-  ])
-
-  return { users, total }
-}
-
-export type GetUsersFnDataType = UnwrapPromise<ReturnType<typeof getUsers>>

package/template/prisma-advanced/src/app/(app)/users/page.tsx

@@ -1,61 +0,0 @@
-import { User, UserType } from '@prisma/client'
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { getUsers } from './actions'
-import { Render } from './render'
-
-export const metadata: Metadata = {
-  title: 'Users' + ' | ' + siteConfig.name
-}
-
-const Users = async ({
-  searchParams
-}: {
-  searchParams: {
-    page?: string
-    limit?: string
-    sort?: string
-    name?: string
-    email?: string
-    type?: string
-  }
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) return notFound()
-
-  const page = searchParams.page ? parseInt(searchParams.page) : 1
-  const limit = searchParams.limit ? parseInt(searchParams.limit) : 10
-
-  const [sortBy, sortOrder] =
-    typeof searchParams.sort === 'string'
-      ? (searchParams.sort.split('.') as [
-          keyof User | undefined,
-          'asc' | 'desc' | undefined
-        ])
-      : []
-
-  const name = searchParams.name
-  const email = searchParams.email
-
-  const type =
-    typeof searchParams.type === 'string'
-      ? (searchParams.type.split('.') as UserType[])
-      : undefined
-
-  const data = await getUsers({
-    page,
-    limit,
-    sortBy,
-    sortOrder,
-    name,
-    email,
-    type
-  })
-
-  return <Render data={data} />
-}
-
-export default Users

package/template/prisma-advanced/src/app/(app)/users/render.tsx

@@ -1,108 +0,0 @@
-'use client'
-
-import { UserType } from '@prisma/client'
-import Link from 'next/link'
-import { FC } from 'react'
-
-import { DataTable } from '@/components/data-table/data-table'
-import { DataTableColumnHeader } from '@/components/data-table/data-table-column-header'
-import { Heading } from '@/components/heading'
-import { Icons } from '@/components/icons'
-import { Shell } from '@/components/shell'
-import { Button } from '@/components/ui/button'
-import { formatDateTime, timesAgo } from '@/lib/formatDate'
-import { generateLabel } from '@/lib/generateLabel'
-import { GetUsersFnDataType } from './actions'
-
-const types = Object.values(UserType).map(x => ({
-  label: generateLabel(x),
-  value: x
-}))
-
-export const Render: FC<{
-  data: GetUsersFnDataType
-}> = ({ data }) => {
-  return (
-    <Shell>
-      <Heading heading="Users" text="List of all the users">
-        <Link href="/users/new">
-          <Button>
-            <Icons.add className="mr-2 h-4 w-4" />
-            New
-          </Button>
-        </Link>
-      </Heading>
-      <DataTable
-        columns={[
-          {
-            accessorKey: 'name',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Name" />
-            ),
-            cell: ({ row }) => (
-              <Link
-                className="underline underline-offset-4"
-                href={`/users/${row.original.id}`}
-              >
-                {row.original.name}
-              </Link>
-            )
-          },
-          {
-            accessorKey: 'email',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Email" />
-            )
-          },
-          {
-            accessorKey: 'type',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Type" />
-            )
-          },
-          {
-            accessorKey: 'role',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Role" />
-            ),
-            cell: ({ row }) => row.original.role?.name,
-            enableSorting: false
-          },
-          {
-            accessorKey: 'createdAt',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Created At" />
-            ),
-            cell: ({ row }) => formatDateTime(row.original.createdAt)
-          },
-          {
-            accessorKey: 'updatedAt',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Updated At" />
-            ),
-            cell: ({ row }) => timesAgo(row.original.updatedAt)
-          }
-        ]}
-        data={data.users}
-        total={data.total}
-        searchableColumns={[
-          {
-            id: 'name',
-            title: 'Name'
-          },
-          {
-            id: 'email',
-            title: 'Email'
-          }
-        ]}
-        filterableColumns={[
-          {
-            id: 'type',
-            title: 'Type',
-            options: types
-          }
-        ]}
-      />
-    </Shell>
-  )
-}