create-ej-app 6.0.0 → 7.0.0

package/template/prisma-advanced/prisma/schema.prisma

@@ -1,154 +0,0 @@
-generator client {
-    provider = "prisma-client-js"
-}
-
-datasource db {
-    provider = "postgresql"
-    url      = env("DATABASE_URL")
-}
-
-model Account {
-    id                String  @id @default(cuid())
-    userId            String
-    type              String
-    provider          String
-    providerAccountId String
-    refresh_token     String? @db.Text
-    access_token      String? @db.Text
-    expires_at        Int?
-    token_type        String?
-    scope             String?
-    id_token          String? @db.Text
-    session_state     String?
-
-    user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now()) @db.Timestamptz()
-    updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
-
-    @@unique([provider, providerAccountId])
-    @@map("Accounts")
-}
-
-model Session {
-    id           String   @id @default(cuid())
-    sessionToken String   @unique
-    userId       String
-    expires      DateTime @db.Timestamptz()
-
-    user User @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now()) @db.Timestamptz()
-    updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
-
-    @@map("Sessions")
-}
-
-model Role {
-    id   String @id @default(cuid())
-    name String @unique
-
-    createdAt DateTime @default(now()) @db.Timestamptz()
-    updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
-
-    permissions RolePermission[] @relation("rolePermissions")
-    users       User[]           @relation("userRole")
-
-    @@map("Roles")
-}
-
-enum Permissions {
-    TaskList
-    TaskView
-    TaskCreate
-    TaskUpdate
-    TaskDelete
-}
-
-model RolePermission {
-    id         String      @id @default(cuid())
-    roleId     String
-    permission Permissions
-
-    role Role @relation("rolePermissions", fields: [roleId], references: [id], onDelete: Cascade)
-
-    @@map("RolePermissions")
-}
-
-enum UserType {
-    Root
-    Normal
-}
-
-model User {
-    id            String    @id @default(cuid())
-    name          String?
-    email         String?   @unique
-    emailVerified DateTime? @db.Timestamptz()
-    image         String?
-    type          UserType  @default(Normal)
-    roleId        String?
-
-    createdAt DateTime @default(now()) @db.Timestamptz()
-    updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
-
-    accounts Account[]
-    sessions Session[]
-    role     Role?     @relation("userRole", fields: [roleId], references: [id])
-
-    createdTasks Task[] @relation("createdTasks")
-    updatedTasks Task[] @relation("updatedTasks")
-
-    @@map("Users")
-}
-
-model VerificationToken {
-    identifier String
-    token      String   @unique
-    expires    DateTime @db.Timestamptz()
-
-    @@unique([identifier, token])
-    @@map("VerificationTokens")
-}
-
-enum TaskStatus {
-    Backlog
-    Todo
-    In_Progress
-    Done
-    Cancelled
-}
-
-model Task {
-    id          String     @id @default(cuid())
-    title       String
-    status      TaskStatus
-    description Json?
-
-    images Resource[] @relation("taskImages")
-
-    createdAt   DateTime @default(now()) @db.Timestamptz()
-    updatedAt   DateTime @default(now()) @updatedAt @db.Timestamptz()
-    createdById String
-    createdBy   User     @relation("createdTasks", fields: [createdById], references: [id], onDelete: Cascade)
-    updatedById String
-    updatedBy   User     @relation("updatedTasks", fields: [updatedById], references: [id], onDelete: Cascade)
-
-    @@map("Tasks")
-}
-
-model Resource {
-    id               String @id @default(cuid())
-    originalFilename String
-    newFilename      String @unique
-    url              String @unique
-
-    taskId String?
-    task   Task?   @relation("taskImages", fields: [taskId], references: [id])
-
-    createdAt DateTime @default(now()) @db.Timestamptz()
-    updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
-
-    @@index([taskId])
-    @@map("Resources")
-}

package/template/prisma-advanced/public/next.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

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

@@ -1,19 +0,0 @@
-import { Metadata } from 'next'
-
-import { Heading } from '@/components/heading'
-import { Shell } from '@/components/shell'
-import { siteConfig } from '@/lib/siteConfig'
-
-export const metadata: Metadata = {
-  title: 'Dashboard' + ' | ' + siteConfig.name
-}
-
-const DashboardPage = () => {
-  return (
-    <Shell>
-      <Heading heading="Dashboard" />
-    </Shell>
-  )
-}
-
-export default DashboardPage

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

@@ -1,100 +0,0 @@
-'use server'
-
-import { Permissions } 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 getRole = async (id: string) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  return await prisma.role.findUnique({
-    where: {
-      id
-    },
-    include: {
-      permissions: true
-    }
-  })
-}
-
-export type GetRoleFnDataType = UnwrapPromise<ReturnType<typeof getRole>>
-
-export const createRole = async ({
-  name,
-  permissions
-}: {
-  name: string
-  permissions: Permissions[]
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  const { id } = await prisma.role.create({
-    data: {
-      name,
-      permissions: {
-        createMany: {
-          data: permissions.map(permission => ({
-            permission
-          }))
-        }
-      }
-    }
-  })
-
-  revalidatePath('/roles')
-  revalidatePath(`/roles/${id}`)
-
-  return id
-}
-
-export const updateRole = async ({
-  id,
-  name,
-  permissions
-}: {
-  id: string
-  name: string
-  permissions: Permissions[]
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  await prisma.role.update({
-    where: {
-      id
-    },
-    data: {
-      name
-    }
-  })
-  await prisma.rolePermission.deleteMany({
-    where: {
-      roleId: id
-    }
-  })
-  await prisma.rolePermission.createMany({
-    data: permissions.map(permission => ({ permission, roleId: id }))
-  })
-
-  revalidatePath('/roles')
-  revalidatePath(`/roles/${id}`)
-}
-
-export const deleteRole = async (id: string) => {
-  const session = await authGuard(['Root'])
-  if (!session) throw new Error('Unauthorized')
-
-  await prisma.role.delete({
-    where: {
-      id
-    }
-  })
-
-  revalidatePath('/roles')
-  revalidatePath(`/roles/${id}`)
-}

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

@@ -1,36 +0,0 @@
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { GetRoleFnDataType, getRole } from './actions'
-import { Render } from './render'
-
-export const generateMetadata = async (props: {
-  params: { id: string }
-}): Promise<Metadata> => ({
-  title: 'Role - ' + props.params.id + ' | ' + siteConfig.name
-})
-
-const RolePage = async ({
-  params: { id }
-}: {
-  params: {
-    id: string
-  }
-}) => {
-  const session = await authGuard(['Root'])
-  if (!session) return notFound()
-
-  let role: GetRoleFnDataType | undefined
-
-  if (id !== 'new') {
-    const x = await getRole(id)
-    if (!x) return notFound()
-    role = x
-  }
-
-  return <Render role={role} />
-}
-
-export default RolePage

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

@@ -1,266 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { Permissions } 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 { Checkbox } from '@/components/ui/checkbox'
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage
-} from '@/components/ui/form'
-import { Input } from '@/components/ui/input'
-import { toast } from '@/components/ui/use-toast'
-import { formatDateTime, timesAgo } from '@/lib/formatDate'
-import { generateLabel } from '@/lib/generateLabel'
-import {
-  GetRoleFnDataType,
-  createRole,
-  deleteRole,
-  updateRole
-} from './actions'
-
-const RoleSchema = z.object({
-  name: z.string().nonempty(),
-  permissions: z.array(z.nativeEnum(Permissions))
-})
-
-type FormData = z.infer<typeof RoleSchema>
-
-const permissions = Object.values(Permissions).map(x => ({
-  label: generateLabel(x),
-  value: x
-}))
-
-export const Render: FC<{
-  role: GetRoleFnDataType | undefined
-}> = ({ role }) => {
-  const form = useForm<FormData>({
-    resolver: zodResolver(RoleSchema),
-    defaultValues: {
-      name: role?.name ?? '',
-      permissions: role?.permissions.map(p => p.permission) ?? []
-    }
-  })
-  const router = useRouter()
-  const [isSaving, setIsSaving] = useState(false)
-  const [isDeleting, setIsDeleting] = useState(false)
-
-  async function onSubmit(data: FormData) {
-    setIsSaving(true)
-    try {
-      if (!role) {
-        const newId = await createRole(data)
-        router.replace(`/roles/${newId}`)
-      } else {
-        await updateRole({
-          id: role.id,
-          ...data
-        })
-      }
-      toast({
-        title: 'Role saved'
-      })
-    } catch (err) {
-      toast({
-        title: 'Error saving role',
-        variant: 'destructive'
-      })
-    }
-    setIsSaving(false)
-  }
-
-  return (
-    <Shell>
-      <Heading heading={role ? role.name : 'New Role'} />
-      <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>
-            {role ? (
-              <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 deleteRole(role.id)
-                          toast({
-                            title: 'Role deleted'
-                          })
-                          router.push('/roles')
-                        } catch (err) {
-                          toast({
-                            title: 'Error deleting role',
-                            variant: 'destructive'
-                          })
-                        }
-                        setIsDeleting(false)
-                      }}
-                    >
-                      Continue
-                    </AlertDialogAction>
-                  </AlertDialogFooter>
-                </AlertDialogContent>
-              </AlertDialog>
-            ) : undefined}
-            {role ? (
-              <Link href="/roles/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>
-            )}
-          />
-
-          <div></div>
-
-          <FormField
-            control={form.control}
-            name="permissions"
-            render={() => (
-              <FormItem>
-                <FormLabel className="text-base">Permissions</FormLabel>
-                {permissions.map(item => (
-                  <FormField
-                    key={item.value}
-                    control={form.control}
-                    name="permissions"
-                    render={({ field }) => (
-                      <FormItem
-                        key={item.value}
-                        className="flex flex-row items-start space-x-3 space-y-0"
-                      >
-                        <FormControl>
-                          <Checkbox
-                            checked={field.value?.includes(item.value)}
-                            onCheckedChange={checked => {
-                              return checked
-                                ? field.onChange([...field.value, item.value])
-                                : field.onChange(
-                                    field.value?.filter(
-                                      value => value !== item.value
-                                    )
-                                  )
-                            }}
-                          />
-                        </FormControl>
-                        <FormLabel>{item.label}</FormLabel>
-                      </FormItem>
-                    )}
-                  />
-                ))}
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </form>
-      </Form>
-      {role ? (
-        <SystemInfo
-          items={[
-            {
-              label: 'Id',
-              value: role.id
-            },
-            {
-              label: 'Created At',
-              value: formatDateTime(role.createdAt)
-            },
-            {
-              label: 'Updated At',
-              value: timesAgo(role.updatedAt)
-            }
-          ]}
-        />
-      ) : undefined}
-    </Shell>
-  )
-}

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

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

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

@@ -1,51 +0,0 @@
-import { Role } from '@prisma/client'
-import { Metadata } from 'next'
-import { notFound } from 'next/navigation'
-
-import { authGuard } from '@/lib/auth'
-import { siteConfig } from '@/lib/siteConfig'
-import { getRoles } from './actions'
-import { Render } from './render'
-
-export const metadata: Metadata = {
-  title: 'Roles' + ' | ' + siteConfig.name
-}
-
-const RolesPage = async ({
-  searchParams
-}: {
-  searchParams: {
-    page?: string
-    limit?: string
-    sort?: string
-    name?: 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 Role | undefined,
-          'asc' | 'desc' | undefined
-        ])
-      : []
-
-  const name = searchParams.name
-
-  const data = await getRoles({
-    page,
-    limit,
-    sortBy,
-    sortOrder,
-    name
-  })
-
-  return <Render data={data} />
-}
-
-export default RolesPage