create-ej-app 11.0.0 → 14.0.0

package/template/old/src/app/(app)/tasks/page.tsx

@@ -1,59 +0,0 @@
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard, getAuthSession } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { getTasksAction } from './actions'
-import { Render } from './render'
-
-export const metadata: Metadata = {
-  title: 'Tasks' + ' | ' + siteConfig.name
-}
-
-const TasksPage = async ({
-  searchParams
-}: {
-  searchParams: {
-    page?: string
-    limit?: string
-    sort?: string
-    title?: string
-    status?: string
-  }
-}) => {
-  const session = await getAuthSession()
-  if (!session) return notFound()
-
-  const g = await authGuard(session, 'TaskList')
-  if (!g) 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 [any, 'asc' | 'desc' | undefined])
-      : []
-
-  const title = searchParams.title
-
-  const status =
-    typeof searchParams.status === 'string'
-      ? (searchParams.status.split('.') as any[])
-      : undefined
-
-  const tasks = await getTasksAction({
-    page,
-    limit,
-    sortBy,
-    sortOrder,
-    title,
-    status
-  })
-
-  if (!tasks?.data) throw new Error('Tasks data not found')
-
-  return <Render data={tasks.data} />
-}
-
-export default TasksPage

package/template/old/src/app/(app)/tasks/render.tsx

@@ -1,129 +0,0 @@
-'use client'
-
-import { InferSelectModel } from 'drizzle-orm'
-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 { Task } from '@/db/schema'
-import { formatDateTime, timesAgo } from '@/lib/formatDate'
-import { generateLabel } from '@/lib/generateLabel'
-import { TaskStatusEnumArr } from './statusEnum'
-
-const statuses = TaskStatusEnumArr.map(x => ({
-  label: generateLabel(x),
-  value: x
-}))
-
-export const Render: FC<{
-  data: {
-    tasks: {
-      id: string
-      title: string
-      status: InferSelectModel<typeof Task>['status']
-      createdBy: {
-        id: string
-        name?: string | null
-      }
-      updatedBy?: {
-        id: string
-        name?: string | null
-      } | null
-      createdAt: Date
-      updatedAt?: Date | null
-    }[]
-    total: number
-  }
-}> = ({ data }) => {
-  return (
-    <Shell>
-      <Heading heading="Tasks" text="List of all the tasks">
-        <Link href="/tasks/new">
-          <Button>
-            <Icons.add className="mr-2 h-4 w-4" />
-            New
-          </Button>
-        </Link>
-      </Heading>
-      <DataTable
-        columns={[
-          {
-            accessorKey: 'title',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Title" />
-            ),
-            cell: ({ row }) => (
-              <Link
-                className="underline underline-offset-4"
-                href={`/tasks/${row.original.id}`}
-              >
-                {row.original.title}
-              </Link>
-            )
-          },
-          {
-            accessorKey: 'status',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Status" />
-            ),
-            cell: ({ row }) => row.original.status.replace('_', ' ')
-          },
-          {
-            accessorKey: 'createdBy',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Created By" />
-            ),
-            cell: ({ row }) => row.original.createdBy.name,
-            enableSorting: false
-          },
-          {
-            accessorKey: 'updatedBy',
-            header: ({ column }) => (
-              <DataTableColumnHeader column={column} title="Updated By" />
-            ),
-            cell: ({ row }) =>
-              row.original.updatedBy ? row.original.updatedBy.name : undefined,
-            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 }) =>
-              row.original.updatedAt
-                ? timesAgo(row.original.updatedAt)
-                : undefined
-          }
-        ]}
-        data={data.tasks}
-        total={data.total}
-        searchableColumns={[
-          {
-            id: 'title',
-            title: 'Title'
-          }
-        ]}
-        filterableColumns={[
-          {
-            id: 'status',
-            title: 'Status',
-            options: statuses
-          }
-        ]}
-      />
-    </Shell>
-  )
-}

package/template/old/src/app/(app)/tasks/statusEnum.ts

@@ -1,3 +0,0 @@
-import { Task } from '@/db/schema'
-
-export const TaskStatusEnumArr = Task.status.enumValues

package/template/old/src/app/(app)/users/[id]/actions.ts

@@ -1,68 +0,0 @@
-'use server'
-
-import { revalidatePath } from 'next/cache'
-import { z } from 'zod'
-
-import { authActionClient } from '@/lib/safe-action'
-import { getRolesMiniUseCase } from '@/use-case/role'
-import {
-  createUserUseCase,
-  deleteUserUseCase,
-  getUserByIdUseCase,
-  updateUserUseCase
-} from '@/use-case/user'
-import { UserCreateUpdateSchema, UserUpdateServerSchema } from './validation'
-
-export const getUserAction = authActionClient
-  .schema(z.string())
-  .action(async ({ parsedInput: id, ctx }) => {
-    return await getUserByIdUseCase(ctx.user.type, id)
-  })
-
-export const createUserAction = authActionClient
-  .schema(UserCreateUpdateSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const id = await createUserUseCase(ctx.user.type, parsedInput)
-
-    revalidatePath('/users')
-    revalidatePath(`/users/${id}`)
-
-    return {
-      success: true,
-      id
-    }
-  })
-
-export const updateUserAction = authActionClient
-  .schema(UserUpdateServerSchema)
-  .action(async ({ parsedInput: { id, name, type, roleId }, ctx }) => {
-    await updateUserUseCase(ctx.user.type, id, {
-      name,
-      type,
-      roleId
-    })
-
-    revalidatePath('/users')
-    revalidatePath(`/users/${id}`)
-
-    return {
-      success: true
-    }
-  })
-
-export const deleteUserAction = authActionClient
-  .schema(z.string())
-  .action(async ({ parsedInput: id, ctx }) => {
-    await deleteUserUseCase(ctx.user.type, id)
-
-    revalidatePath('/users')
-    revalidatePath(`/users/${id}`)
-
-    return { success: true }
-  })
-
-export const getRolesMiniAction = authActionClient
-  .schema(z.undefined())
-  .action(async ({ ctx }) => {
-    return await getRolesMiniUseCase(ctx.user.type)
-  })

package/template/old/src/app/(app)/users/[id]/page.tsx

@@ -1,39 +0,0 @@
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard, getAuthSession } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { getRolesMiniAction, getUserAction } 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 getAuthSession()
-  if (!session) return notFound()
-
-  const g = await authGuard(session)
-  if (!g) return notFound()
-
-  const roles = await getRolesMiniAction(undefined)
-  if (!roles?.data) return notFound()
-
-  if (id === 'new') return <Render roles={roles.data} />
-
-  const user = await getUserAction(id)
-  if (!user?.data) return notFound()
-
-  return <Render user={user.data} roles={roles.data} />
-}
-
-export default UserPage

package/template/old/src/app/(app)/users/[id]/render.tsx

@@ -1,325 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import Link from 'next/link'
-import { useRouter } from 'next/navigation'
-import { FC, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { toast } from 'sonner'
-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 { User } from '@/db/schema'
-import { formatDateTime, timesAgo } from '@/lib/formatDate'
-import { generateLabel } from '@/lib/generateLabel'
-import { InferSelectModel } from 'drizzle-orm'
-import { createUserAction, deleteUserAction, updateUserAction } from './actions'
-import { UserCreateUpdateSchema, UserTypeEnumArr } from './validation'
-
-type FormData = z.infer<typeof UserCreateUpdateSchema>
-
-const types = UserTypeEnumArr.map(x => ({
-  label: generateLabel(x),
-  value: x
-}))
-
-export const Render: FC<{
-  user?: {
-    id: string
-    name?: string | null
-    email: string
-    type: InferSelectModel<typeof User>['type']
-    roleId?: string | null
-    createdAt: Date
-    updatedAt?: Date | null
-  } | null
-  roles: {
-    id: string
-    name: string
-  }[]
-}> = ({ user, roles }) => {
-  const form = useForm<FormData>({
-    resolver: zodResolver(UserCreateUpdateSchema),
-    defaultValues: {
-      name: user?.name ?? '',
-      email: user?.email ?? '',
-      type: user?.type ?? '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 res = await createUserAction(data)
-        if (!res?.data?.success)
-          throw new Error(res?.serverError || 'No success returned from server')
-        if (!res?.data?.id) throw new Error('No id returned from server')
-        router.replace(`/users/${res.data.id}`)
-      } else {
-        const res = await updateUserAction({
-          id: user.id,
-          ...data
-        })
-        if (!res?.data?.success)
-          throw new Error(res?.serverError || 'No success returned from server')
-      }
-      toast('User saved')
-    } catch (err) {
-      toast('Error saving user', {
-        description: (err as any).message || undefined
-      })
-    }
-    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 {
-                          const res = await deleteUserAction(user.id)
-                          if (!res?.data?.success)
-                            throw new Error(
-                              res?.serverError ||
-                                'No success returned from server'
-                            )
-                          toast('User deleted')
-                          router.replace('/users')
-                        } catch (err) {
-                          toast('Error deleting user', {
-                            description:
-                              (err as any).message || 'Something went wrong'
-                          })
-                        }
-                        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') === '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: user.updatedAt ? timesAgo(user.updatedAt) : '-'
-            }
-          ]}
-        />
-      ) : undefined}
-    </Shell>
-  )
-}

package/template/old/src/app/(app)/users/[id]/validation.ts

@@ -1,18 +0,0 @@
-import { z } from 'zod'
-
-import { User } from '@/db/schema'
-
-export const UserTypeEnumArr = User.type.enumValues
-
-export const UserCreateUpdateSchema = z.object({
-  name: z.string().min(1).trim(),
-  email: z.string().email().toLowerCase().trim(),
-  type: z.enum(UserTypeEnumArr),
-  roleId: z.string().optional().nullable()
-})
-
-export const UserUpdateServerSchema = UserCreateUpdateSchema.merge(
-  z.object({
-    id: z.string().min(1)
-  })
-)

package/template/old/src/app/(app)/users/actions.ts

@@ -1,34 +0,0 @@
-'use server'
-
-import { z } from 'zod'
-
-import { User } from '@/db/schema'
-import { authActionClient } from '@/lib/safe-action'
-import { SortOrderEnum } from '@/lib/sortOrderEnum'
-import { getUsersWithRoleUseCase } from '@/use-case/user'
-
-export const getUsersAction = authActionClient
-  .schema(
-    z.object({
-      page: z.number().gte(1),
-      limit: z.number().gte(1).lte(1000),
-      sortBy: z.enum(['name']).optional(),
-      sortOrder: z.enum(SortOrderEnum).optional(),
-      name: z.string().optional(),
-      email: z.string().optional(),
-      type: z.array(z.enum(User.type.enumValues)).optional()
-    })
-  )
-  .action(async ({ ctx, parsedInput }) => {
-    return await getUsersWithRoleUseCase(ctx.user.type, {
-      page: parsedInput.page,
-      limit: parsedInput.limit,
-      sortBy: parsedInput.sortBy,
-      sortOrder: parsedInput.sortOrder,
-      filters: {
-        name: parsedInput.name,
-        email: parsedInput.email,
-        type: parsedInput.type
-      }
-    })
-  })