chore: wip

glennmichael123 · glennmichael123 · commit 42ed99f4855b · 2024-05-27T23:05:08.000+08:00
diff --git a/app/Actions/EmailSubscribeAction.ts b/app/Actions/EmailSubscribeAction.ts
@@ -0,0 +1,16 @@
+import { Action } from '@stacksjs/actions'
+import { request } from '@stacksjs/router'
+import SubscriberEmail from '../../storage/framework/orm/src/models/SubscriberEmail'
+
+export default new Action({
+  name: 'EmailSubscribeAction',
+  description: 'Save emails from subscribe oage',
+  method: 'POST',
+  async handle() {
+    const email = request.get('email')
+
+    const model = await SubscriberEmail.create({ email })
+
+    return model
+  },
+})
diff --git a/app/Models/SubscriberEmail.ts b/app/Models/SubscriberEmail.ts
@@ -0,0 +1,36 @@
+// soon, these will be auto-imported
+import { faker } from '@stacksjs/faker'
+import type { Model } from '@stacksjs/types'
+import { schema } from '@stacksjs/validation'
+
+export default {
+  name: 'SubscriberEmail', // defaults to the sanitized file name
+  table: 'subscriber_emails', // defaults to the lowercase, plural name of the model name (or the name of the model file)
+  primaryKey: 'id', // defaults to `id`
+  autoIncrement: true, // defaults to true
+
+  traits: {
+    useAuth: true, // defaults to false, `authenticatable` used as an alias
+    useTimestamps: true, // defaults to true, `timestampable` used as an alias
+    useSoftDeletes: true, // defaults to false, `softDeletable` used as an alias
+
+    useSeeder: {
+      // defaults to a count of 10, `seedable` used as an alias
+      count: 100,
+    },
+    // useUuid: true, // defaults to false
+  },
+
+  attributes: {
+    email: {
+      unique: true,
+      validator: {
+        rule: schema.string().email(),
+        message: 'Email must be a valid email address',
+      },
+
+      factory: () => faker.internet.email(),
+    },
+  },
+  
+} satisfies Model
diff --git a/database/migrations/1716297812598-create-access_tokens-table.ts b/database/migrations/1716297812598-create-access_tokens-table.ts
diff --git a/database/migrations/1716822278688-create-projects-table.ts b/database/migrations/1716822278688-create-projects-table.ts
@@ -4,12 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('projects')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
     .addColumn('description', 'varchar(255)')
     .addColumn('url', 'varchar(255)')
     .addColumn('status', 'varchar(255)')
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1716822278689-create-subscriber_emails-table.ts b/database/migrations/1716822278689-create-subscriber_emails-table.ts
@@ -0,0 +1,13 @@
+import type { Database } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
+
+export async function up(db: Database<any>) {
+  await db.schema
+    .createTable('subscriber_emails')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('email', 'varchar(255)', col => col.unique())
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('updated_at', 'timestamp')
+    .addColumn('deleted_at', 'timestamp')
+    .execute()
+}
diff --git a/database/migrations/1716822278690-create-deployments-table.ts b/database/migrations/1716822278690-create-deployments-table.ts
@@ -4,16 +4,18 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('deployments')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
-    .addColumn('commitSha', 'varchar(512)', (col) => col.unique())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('commitSha', 'varchar(512)', col => col.unique())
     .addColumn('commitMessage', 'varchar(255)')
     .addColumn('branch', 'varchar(255)')
     .addColumn('status', 'varchar(255)')
     .addColumn('executionTime', 'integer')
     .addColumn('deployScript', 'varchar(255)')
     .addColumn('terminalOutput', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1716822278690-create-users-table.ts b/database/migrations/1716822278690-create-users-table.ts
@@ -4,12 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('users')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
-    .addColumn('email', 'varchar(255)', (col) => col.unique())
+    .addColumn('email', 'varchar(255)', col => col.unique())
     .addColumn('jobTitle', 'varchar(255)')
     .addColumn('password', 'varchar(255)')
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .addColumn('deleted_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1716822278691-create-subscribers-table.ts b/database/migrations/1716822278691-create-subscribers-table.ts
@@ -4,10 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('subscribers')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1716822278692-create-access_tokens-table.ts b/database/migrations/1716822278692-create-access_tokens-table.ts
@@ -0,0 +1,18 @@
+import type { Database } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
+
+export async function up(db: Database<any>) {
+  await db.schema
+    .createTable('access_tokens')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('name', 'varchar(255)')
+    .addColumn('token', 'varchar(512)', col => col.unique())
+    .addColumn('plainTextToken', 'varchar(512)')
+    .addColumn('abilities', sql`enum('read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin')`)
+    .addColumn('team_id', 'integer', (col) =>
+        col.references('teams.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('updated_at', 'timestamp')
+    .execute()
+}
diff --git a/database/migrations/1716822278692-create-posts-table.ts b/database/migrations/1716822278692-create-posts-table.ts
@@ -4,11 +4,13 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('posts')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'varchar(255)')
     .addColumn('body', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1716822278694-create-team_access_tokens-table.ts b/database/migrations/1716822278694-create-team_access_tokens-table.ts
@@ -2,8 +2,8 @@ import type { Database } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('team_access_tokens')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('accesstoken_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1716822278694-create-teams-table.ts b/database/migrations/1716822278694-create-teams-table.ts
@@ -4,7 +4,7 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('teams')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
     .addColumn('companyName', 'varchar(255)')
     .addColumn('email', 'varchar(255)')
@@ -13,8 +13,10 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('path', 'varchar(255)')
     .addColumn('isPersonal', 'boolean')
-    .addColumn('accesstoken_id', 'integer', (col) => col.references('access_tokens.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('accesstoken_id', 'integer', (col) =>
+        col.references('access_tokens.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/routes/api.ts b/routes/api.ts
@@ -11,13 +11,8 @@ import { route } from '@stacksjs/router'
 await route.get('/foo/bar/{id}', () => 'hello world, foo bar') // stacksjs.org/api/hello/world
 await route.get('/', () => 'hello world') // $APP_URL/api
 await route.get('/hello/world', () => 'hello world, buddy') // stacksjs.org/api/hello/world
-await route.get('/hello-world', () => {
-  // $APP_URL/api/welcome
-  return {
-    // you may return an object as well
-    data: 'hello world, friend',
-  }
-})
+
+await route.post('/email/subscribe', 'Actions/EmailSubscribeAction')
 
 await route.email('/welcome')
 await route.health() // adds an `/api/health` route
diff --git a/storage/framework/core/actions/src/orm/generate-model.ts b/storage/framework/core/actions/src/orm/generate-model.ts
@@ -1100,8 +1100,8 @@ async function generateModelString(tableName: string, model: Model, attributes:
     }
 
     export async function create(new${modelName}: New${modelName}): Promise<${modelName}Model> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('${tableName}')
+      .values(new${modelName})
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/core/orm/src/generated/types.ts b/storage/framework/core/orm/src/generated/types.ts
@@ -1,4 +1,5 @@
 import type { ProjectsTable } from '../../../../orm/src/models/Project'
+import type { SubscriberEmailsTable } from '../../../../orm/src/models/SubscriberEmail'
 import type { AccessTokensTable } from '../../../../orm/src/models/AccessToken'
 import type { TeamsTable } from '../../../../orm/src/models/Team'
 import type { SubscribersTable } from '../../../../orm/src/models/Subscriber'
@@ -14,6 +15,7 @@ export interface TeamAccessTokensTable {
       }
 export interface Database {
   projects: ProjectsTable
+  subscriber_emails: SubscriberEmailsTable
   access_tokens: AccessTokensTable
   team_access_tokens: TeamAccessTokensTable
   teams: TeamsTable
diff --git a/storage/framework/core/types/src/model-names.ts b/storage/framework/core/types/src/model-names.ts
@@ -1 +1 @@
-export type ModelNames = 'Project' | 'AccessToken' | 'Team' | 'Subscriber' | 'Deployment' | 'User' | 'Post'
+export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Subscriber' | 'Deployment' | 'User' | 'Post'
diff --git a/storage/framework/database/models/Subscriber.ts b/storage/framework/database/models/Subscriber.ts
@@ -14,6 +14,12 @@ export default {
       // defaults to a count of 10
       count: 10,
     },
+
+    useApi: {
+      uri: 'subscribers', // your-url.com/api/users
+      middleware: ['auth'], // defaults to `[]`
+      routes: ['index', 'update', 'store', 'destroy', 'show'],
+    },
   },
 
   attributes: {
diff --git a/storage/framework/database/models/SubscriberEmail.ts b/storage/framework/database/models/SubscriberEmail.ts
@@ -0,0 +1,36 @@
+// soon, these will be auto-imported
+import { faker } from '@stacksjs/faker'
+import type { Model } from '@stacksjs/types'
+import { schema } from '@stacksjs/validation'
+
+export default {
+  name: 'SubscriberEmail', // defaults to the sanitized file name
+  table: 'subscriber_emails', // defaults to the lowercase, plural name of the model name (or the name of the model file)
+  primaryKey: 'id', // defaults to `id`
+  autoIncrement: true, // defaults to true
+
+  traits: {
+    useAuth: true, // defaults to false, `authenticatable` used as an alias
+    useTimestamps: true, // defaults to true, `timestampable` used as an alias
+    useSoftDeletes: true, // defaults to false, `softDeletable` used as an alias
+
+    useSeeder: {
+      // defaults to a count of 10, `seedable` used as an alias
+      count: 100,
+    },
+    // useUuid: true, // defaults to false
+  },
+
+  attributes: {
+    email: {
+      unique: true,
+      validator: {
+        rule: schema.string().email(),
+        message: 'Email must be a valid email address',
+      },
+
+      factory: () => faker.internet.email(),
+    },
+  },
+  
+} satisfies Model
diff --git a/storage/framework/orm/routes.ts b/storage/framework/orm/routes.ts
@@ -21,5 +21,15 @@ await route.delete('users/{id}', 'Actions/UserDestroyOrmAction').middleware(['au
 
 await route.get('users/{id}', 'Actions/UserShowOrmAction').middleware(['auth'])
 
-erShowOrmAction').middleware(['auth'])
+await route.get('subscribers/{id}', 'Actions/SubscriberShowOrmAction').middleware(['auth'])
+
+await route.get('users', 'Actions/UserIndexOrmAction').middleware(['auth'])
+
+await route.patch('users/{id}', 'Actions/UserUpdateOrmAction').middleware(['auth'])
+
+await route.post('users', 'Actions/UserStoreOrmAction').middleware(['auth'])
+
+await route.delete('users/{id}', 'Actions/UserDestroyOrmAction').middleware(['auth'])
+
+await route.get('users/{id}', 'Actions/UserShowOrmAction').middleware(['auth'])
 
diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -482,8 +482,8 @@ import type { ColumnType, Generated, Insertable, Selectable, Updateable } from '
     }
 
     export async function create(newAccessToken: NewAccessToken): Promise<AccessTokenModel> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('access_tokens')
+      .values(newAccessToken)
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -485,8 +485,8 @@ import type { ColumnType, Generated, Insertable, Selectable, Updateable } from '
     }
 
     export async function create(newDeployment: NewDeployment): Promise<DeploymentModel> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('deployments')
+      .values(newDeployment)
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -480,8 +480,8 @@ import type { ColumnType, Generated, Insertable, Selectable, Updateable } from '
     }
 
     export async function create(newPost: NewPost): Promise<PostModel> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('posts')
+      .values(newPost)
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -463,8 +463,8 @@ import type { ColumnType, Generated, Insertable, Selectable, Updateable } from '
     }
 
     export async function create(newProject: NewProject): Promise<ProjectModel> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('projects')
+      .values(newProject)
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -461,8 +461,8 @@ import type { ColumnType, Generated, Insertable, Selectable, Updateable } from '
     }
 
     export async function create(newSubscriber: NewSubscriber): Promise<SubscriberModel> {
-      const result = await db.insertInto('users')
-      .values(newUser)
+      const result = await db.insertInto('subscribers')
+      .values(newSubscriber)
       .executeTakeFirstOrThrow()
 
       return await find(Number(result.insertId))
diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
diff --git a/storage/framework/types/auto-imports.d.ts b/storage/framework/types/auto-imports.d.ts
diff --git a/storage/framework/views/web/.eslintrc-auto-import.json b/storage/framework/views/web/.eslintrc-auto-import.json
