create-ej-app 2.2.0 → 2.3.0

package/cli.js

@@ -6,83 +6,84 @@ const path = require('path')
 const { prompt } = require('enquirer')
 const copydir = require('copy-dir')
 
-program
-  .version('2.1.0')
-  .description('CLI tool to bootstrap a Next.js App')
-  .action(async () => {
-    const response = await prompt([
-      {
-        type: 'input',
-        name: 'projectName',
-        message: 'Enter the project name:',
-        initial: 'ej-app'
-      },
-      {
-        type: 'input',
-        name: 'description',
-        message: 'Enter a description for the project:',
-        initial: 'A Legendary Next.js App'
-      },
-      {
-        type: 'select',
-        name: 'template',
-        message: 'Select a template:',
-        choices: [
-          { name: 'base', message: 'Base' },
-          {
-            name: 'advanced',
-            message:
-              'Advanced setup with User Types and ACLs (roles & permissions)'
-          }
-        ],
-        initial: 0
-      }
-    ])
-
-    const { projectName, description, template } = response
-
-    // Create a directory with the project name
-    const projectDir = path.join(process.cwd(), projectName)
-
-    if (fs.existsSync(projectDir)) {
-      console.error(`Error: Directory '${projectName}' already exists.`)
-      process.exit(1)
+program.action(async () => {
+  const response = await prompt([
+    {
+      type: 'input',
+      name: 'projectName',
+      message: 'Enter the project name:',
+      initial: 'ej-app'
+    },
+    {
+      type: 'input',
+      name: 'description',
+      message: 'Enter a description for the project:',
+      initial: 'A Legendary App'
+    },
+    {
+      type: 'select',
+      name: 'template',
+      message: 'Select a template:',
+      choices: [
+        {
+          name: 'base',
+          message: 'Base setup with ts, shadcn, prisma, auth, editor.js'
+        },
+        {
+          name: 'advanced',
+          message:
+            'Advanced setup with User Types and ACLs (roles & permissions)'
+        }
+      ]
     }
+  ])
 
-    fs.mkdirSync(projectDir)
+  const { projectName, description, template } = response
 
-    // Copy all files and subdirectories from your template folder to the new project directory
-    const templateDir = path.join(__dirname, 'template', template)
-    copydir.sync(templateDir, projectDir)
+  // Create a directory with the project name
+  const projectDir = path.join(process.cwd(), projectName)
 
-    // Modify package.json in the new project directory to set the project name and description
-    const packageJsonFile = path.join(projectDir, 'package.json')
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf-8'))
-    packageJson.name = projectName
-    packageJson.description = description
-    fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2))
+  if (fs.existsSync(projectDir)) {
+    console.error(`Error: Directory '${projectName}' already exists.`)
+    process.exit(1)
+  }
 
-    // Modify src/lib/siteConfig.ts in the new project directory to set the project name and description
-    const siteConfigFile = path.join(projectDir, 'src', 'lib', 'siteConfig.ts')
-    let siteConfig = fs.readFileSync(siteConfigFile, 'utf-8')
-    siteConfig = siteConfig.replace('Project Name', projectName)
-    siteConfig = siteConfig.replace('Project Description', description)
-    fs.writeFileSync(siteConfigFile, siteConfig)
+  fs.mkdirSync(projectDir)
 
-    // Copy .env.example to .env
-    const envExampleFile = path.join(projectDir, '.env.example')
-    const envExample = fs.readFileSync(envExampleFile, 'utf-8')
-    fs.writeFileSync(path.join(projectDir, '.env'), envExample)
+  // Copy all files and subdirectories from your template folder to the new project directory
+  const templateDir = path.join(__dirname, 'template', template)
+  copydir.sync(templateDir, projectDir)
 
-    console.log(`Created a new Next.js app called '${projectName}'
+  // Modify package.json in the new project directory to set the project name and description
+  const packageJsonFile = path.join(projectDir, 'package.json')
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf-8'))
+  packageJson.name = projectName
+  packageJson.description = description
+  fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2))
+
+  // Modify src/lib/siteConfig.ts in the new project directory to set the project name and description
+  const siteConfigFile = path.join(projectDir, 'src', 'lib', 'siteConfig.ts')
+  let siteConfig = fs.readFileSync(siteConfigFile, 'utf-8')
+  siteConfig = siteConfig.replace('Project Name', projectName)
+  siteConfig = siteConfig.replace('Project Description', description)
+  fs.writeFileSync(siteConfigFile, siteConfig)
+
+  // Copy .env.example to .env
+  const envExampleFile = path.join(projectDir, '.env.example')
+  const envExample = fs.readFileSync(envExampleFile, 'utf-8')
+  fs.writeFileSync(path.join(projectDir, '.env'), envExample)
+
+  console.log(`Created a new app called '${projectName}' 🎉
 
 
 To get started, run the following commands:
 
 cd ${projectName}
+
 npm install
+
 npm run dev
 `)
-  })
+})
 
 program.parse(process.argv)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "scripts": {

package/template/advanced/prisma/schema.prisma

@@ -149,5 +149,6 @@ model Resource {
     createdAt DateTime @default(now()) @db.Timestamptz()
     updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
 
+    @@index([taskId])
     @@map("Resources")
 }

package/template/advanced/src/app/(app)/tasks/[id]/actions.ts

@@ -5,8 +5,41 @@ import { revalidatePath } from 'next/cache'
 
 import { authGuard } from '@/lib/auth'
 import { prisma } from '@/lib/db'
+import { storageClient } from '@/lib/storageClient'
 import { UnwrapPromise } from '@/types/UnwrapPromise'
 
+const handleImages = async (imageIds: string[], taskId: string) => {
+  const prevImages = await prisma.resource.findMany({
+    where: {
+      taskId
+    }
+  })
+
+  for (const p of prevImages) {
+    if (imageIds.includes(p.id)) continue
+    await Promise.all([
+      storageClient.deleteFile(p.newFilename),
+      prisma.resource.delete({
+        where: {
+          id: p.id
+        }
+      })
+    ])
+  }
+
+  if (imageIds.length)
+    await prisma.resource.updateMany({
+      where: {
+        id: {
+          in: imageIds
+        }
+      },
+      data: {
+        taskId
+      }
+    })
+}
+
 export const getTask = async (id: string) => {
   const session = await authGuard(['Root', 'Normal'], 'TaskView')
   if (!session) throw new Error('Unauthorized')
@@ -57,25 +90,7 @@ export const createTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -110,25 +125,7 @@ export const updateTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -138,6 +135,7 @@ export const deleteTask = async (id: string) => {
   const session = await authGuard(['Root', 'Normal'], 'TaskDelete')
   if (!session) throw new Error('Unauthorized')
 
+  await handleImages([], id)
   await prisma.task.delete({
     where: {
       id

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

@@ -1,17 +1,8 @@
-import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
 import { NextRequest, NextResponse } from 'next/server'
 
-import { env } from '@/env.mjs'
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
-
-const storageClient = GCPStorageClient({
-  projectId: env.FIREBASE_PROJECT_ID!,
-  privateKey: env.FIREBASE_PRIVATE_KEY!,
-  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
-  bucket: env.FIREBASE_STORAGE_BUCKET!,
-  defaultMediaPublic: true
-})
+import { storageClient } from '@/lib/storageClient'
 
 export async function POST(request: NextRequest) {
   const session = await getAuthSession()

package/template/advanced/src/lib/storageClient.ts

@@ -0,0 +1,11 @@
+import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
+
+import { env } from '@/env.mjs'
+
+export const storageClient = GCPStorageClient({
+  projectId: env.FIREBASE_PROJECT_ID!,
+  privateKey: env.FIREBASE_PRIVATE_KEY!,
+  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
+  bucket: env.FIREBASE_STORAGE_BUCKET!,
+  defaultMediaPublic: true
+})

package/template/base/prisma/schema.prisma

@@ -111,5 +111,6 @@ model Resource {
     createdAt DateTime @default(now()) @db.Timestamptz()
     updatedAt DateTime @default(now()) @updatedAt @db.Timestamptz()
 
+    @@index([taskId])
     @@map("Resources")
 }

package/template/base/src/app/(app)/tasks/[id]/actions.ts

@@ -5,8 +5,41 @@ import { revalidatePath } from 'next/cache'
 
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
+import { storageClient } from '@/lib/storageClient'
 import { UnwrapPromise } from '@/types/UnwrapPromise'
 
+const handleImages = async (imageIds: string[], taskId: string) => {
+  const prevImages = await prisma.resource.findMany({
+    where: {
+      taskId
+    }
+  })
+
+  for (const p of prevImages) {
+    if (imageIds.includes(p.id)) continue
+    await Promise.all([
+      storageClient.deleteFile(p.newFilename),
+      prisma.resource.delete({
+        where: {
+          id: p.id
+        }
+      })
+    ])
+  }
+
+  if (imageIds.length)
+    await prisma.resource.updateMany({
+      where: {
+        id: {
+          in: imageIds
+        }
+      },
+      data: {
+        taskId
+      }
+    })
+}
+
 export const getTask = async (id: string) => {
   const session = await getAuthSession()
   if (!session) throw new Error('Unauthorized')
@@ -57,25 +90,7 @@ export const createTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -110,25 +125,7 @@ export const updateTask = async ({
       updatedById: session.user.id
     }
   })
-  await prisma.resource.updateMany({
-    where: {
-      taskId: id
-    },
-    data: {
-      taskId: null
-    }
-  })
-  if (imageIds.length)
-    await prisma.resource.updateMany({
-      where: {
-        id: {
-          in: imageIds
-        }
-      },
-      data: {
-        taskId: id
-      }
-    })
+  await handleImages(imageIds, id)
 
   revalidatePath('/tasks')
   revalidatePath(`/tasks/${id}`)
@@ -138,6 +135,7 @@ export const deleteTask = async (id: string) => {
   const session = await getAuthSession()
   if (!session) throw new Error('Unauthorized')
 
+  await handleImages([], id)
   await prisma.task.delete({
     where: {
       id

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

@@ -1,17 +1,8 @@
-import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
 import { NextRequest, NextResponse } from 'next/server'
 
-import { env } from '@/env.mjs'
 import { getAuthSession } from '@/lib/auth'
 import { prisma } from '@/lib/db'
-
-const storageClient = GCPStorageClient({
-  projectId: env.FIREBASE_PROJECT_ID!,
-  privateKey: env.FIREBASE_PRIVATE_KEY!,
-  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
-  bucket: env.FIREBASE_STORAGE_BUCKET!,
-  defaultMediaPublic: true
-})
+import { storageClient } from '@/lib/storageClient'
 
 export async function POST(request: NextRequest) {
   const session = await getAuthSession()

package/template/base/src/lib/storageClient.ts

@@ -0,0 +1,11 @@
+import { GCPStorageClient } from '@ejekanshjain/cloud-storage'
+
+import { env } from '@/env.mjs'
+
+export const storageClient = GCPStorageClient({
+  projectId: env.FIREBASE_PROJECT_ID!,
+  privateKey: env.FIREBASE_PRIVATE_KEY!,
+  clientEmail: env.FIREBASE_CLIENT_EMAIL!,
+  bucket: env.FIREBASE_STORAGE_BUCKET!,
+  defaultMediaPublic: true
+})