From c4cad4f875ce0161fc78e7bdf355845f7fb62ea0 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 7 Jul 2026 20:49:52 +0200 Subject: [PATCH] fix: TS errors, serialize calls, unused imports, pre-commit hook --- app/controllers/components_controller.ts | 6 +++--- app/controllers/computers_controller.ts | 8 ++++---- config/app.ts | 1 - config/session.ts | 1 - database/schema.ts | 4 ++-- inertia/pages/auth/login.vue | 21 --------------------- inertia/pages/auth/signup.vue | 2 +- inertia/pages/components/create.vue | 17 ++--------------- inertia/pages/components/edit.vue | 15 +-------------- inertia/pages/computers/create.vue | 5 ----- inertia/pages/computers/edit.vue | 13 ++----------- inertia/pages/computers/show.vue | 2 +- inertia/pages/layout/header.vue | 2 -- inertia/pages/types/UITypes.ts | 18 ++---------------- inertia/pages/widgets/AuthErrorAlert.vue | 6 ++++++ inertia/pages/widgets/SimpleGallery.vue | 7 +++---- 16 files changed, 27 insertions(+), 101 deletions(-) diff --git a/app/controllers/components_controller.ts b/app/controllers/components_controller.ts index dfef7cb..a240ec2 100644 --- a/app/controllers/components_controller.ts +++ b/app/controllers/components_controller.ts @@ -9,7 +9,7 @@ export default class ComponentsController { async index({ inertia, auth }: HttpContext) { const user = await auth.authenticate() const components = await Component.query().preload('type').where('userId', user.id) - return inertia.render('components/index', { components: components.map((c) => c.serialize({ relations: true })) }) + return inertia.render('components/index', { components: components.map((c) => c.serialize()) }) } async create({ inertia }: HttpContext) { @@ -40,7 +40,7 @@ export default class ComponentsController { .where('userId', user.id) .andWhere('id', componentId) .firstOrFail() - return inertia.render('components/show', { component: component.serialize({ relations: true }) }) + return inertia.render('components/show', { component: component.serialize() }) } async edit({ params, auth, inertia }: HttpContext) { @@ -53,7 +53,7 @@ export default class ComponentsController { .andWhere('id', componentId) .firstOrFail() return inertia.render('components/edit', { - component: component.serialize({ relations: true }), + component: component.serialize(), types: types.map((t) => t.serialize()), }) } diff --git a/app/controllers/computers_controller.ts b/app/controllers/computers_controller.ts index ebf41a0..bafc73c 100644 --- a/app/controllers/computers_controller.ts +++ b/app/controllers/computers_controller.ts @@ -19,7 +19,7 @@ export default class ComputersController { picturesQuery.where('order', 1) }) - return inertia.render('computers/index', { computers: computers.map((c) => c.serialize({ relations: true })) }) + return inertia.render('computers/index', { computers: computers.map((c) => c.serialize()) }) } async create({ auth, inertia }: HttpContext) { @@ -29,7 +29,7 @@ export default class ComputersController { .where('userId', user.id) .whereNull('computerId') .preload('type') - return inertia.render('computers/create', { components: components.map((c) => c.serialize({ relations: true })), states: states.map((s) => s.serialize()) }) + return inertia.render('computers/create', { components: components.map((c) => c.serialize()), states: states.map((s) => s.serialize()) }) } async store({ auth, request, response }: HttpContext) { @@ -60,7 +60,7 @@ export default class ComputersController { .where('user_id', user.id) .andWhere('id', computerId) .firstOrFail() - return inertia.render('computers/show', { computer: computer.serialize({ relations: true }) }) + return inertia.render('computers/show', { computer: computer.serialize() }) } async edit({ params, inertia, auth }: HttpContext) { @@ -86,7 +86,7 @@ export default class ComputersController { 'id', computer.components.map((c) => c.id) ) - return inertia.render('computers/edit', { computer: computer.serialize({ relations: true }), availableComponents: availableComponents.map((c) => c.serialize({ relations: true })), states: states.map((s) => s.serialize()) }) + return inertia.render('computers/edit', { computer: computer.serialize(), availableComponents: availableComponents.map((c) => c.serialize()), states: states.map((s) => s.serialize()) }) } async update({ params, request, response }: HttpContext) { diff --git a/config/app.ts b/config/app.ts index 46a1811..13c6c13 100644 --- a/config/app.ts +++ b/config/app.ts @@ -1,4 +1,3 @@ -import app from '@adonisjs/core/services/app' import { defineConfig } from '@adonisjs/core/http' /** diff --git a/config/session.ts b/config/session.ts index 8a290e0..f887717 100644 --- a/config/session.ts +++ b/config/session.ts @@ -1,5 +1,4 @@ import env from '#start/env' -import app from '@adonisjs/core/services/app' import { defineConfig, stores } from '@adonisjs/session' const sessionConfig = defineConfig({ diff --git a/database/schema.ts b/database/schema.ts index 0961591..720eb1f 100644 --- a/database/schema.ts +++ b/database/schema.ts @@ -415,9 +415,9 @@ export class StreamSchema extends BaseModel { declare udpForwarding: number } -export class UserSchema extends BaseModel { +export class NpmUserSchema extends BaseModel { static $columns = ['avatar', 'createdOn', 'email', 'id', 'isDeleted', 'isDisabled', 'modifiedOn', 'name', 'nickname', 'roles'] as const - $columns = UserSchema.$columns + $columns = NpmUserSchema.$columns @column() declare avatar: string @column.dateTime() diff --git a/inertia/pages/auth/login.vue b/inertia/pages/auth/login.vue index d43b4ab..ababb2c 100644 --- a/inertia/pages/auth/login.vue +++ b/inertia/pages/auth/login.vue @@ -1,35 +1,14 @@