From 228d382cbf1a836ed05c26944ca4c0899249eb4d Mon Sep 17 00:00:00 2001 From: Kevin L'Hereec Date: Fri, 3 Jul 2026 18:42:39 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20login=20page=20standalone=20sans=20layou?= =?UTF-8?q?t=20(null=20layout=20respect=C3=A9=20par=20Inertia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .adonisjs/client/registry/index.ts | 18 ++++++++++++++ .adonisjs/client/registry/schema.d.ts | 36 +++++++++++++++++++++++++++ .adonisjs/client/registry/tree.d.ts | 5 ++++ .adonisjs/server/controllers.ts | 1 + .adonisjs/server/routes.d.ts | 7 ++++++ inertia/app/app.ts | 4 ++- inertia/pages/Login.vue | 16 ------------ 7 files changed, 70 insertions(+), 17 deletions(-) diff --git a/.adonisjs/client/registry/index.ts b/.adonisjs/client/registry/index.ts index 2777798..fdf09bb 100644 --- a/.adonisjs/client/registry/index.ts +++ b/.adonisjs/client/registry/index.ts @@ -288,6 +288,24 @@ const routes = { tokens: [{"old":"/api/v1/firmware-catalog/routes/:id","type":0,"val":"api","end":""},{"old":"/api/v1/firmware-catalog/routes/:id","type":0,"val":"v1","end":""},{"old":"/api/v1/firmware-catalog/routes/:id","type":0,"val":"firmware-catalog","end":""},{"old":"/api/v1/firmware-catalog/routes/:id","type":0,"val":"routes","end":""},{"old":"/api/v1/firmware-catalog/routes/:id","type":1,"val":"id","end":""}], types: placeholder as Registry['firmware_catalog.delete_route']['types'], }, + 'login': { + methods: ["GET","HEAD"], + pattern: '/login', + tokens: [{"old":"/login","type":0,"val":"login","end":""}], + types: placeholder as Registry['login']['types'], + }, + 'auth.login': { + methods: ["POST"], + pattern: '/login', + tokens: [{"old":"/login","type":0,"val":"login","end":""}], + types: placeholder as Registry['auth.login']['types'], + }, + 'logout': { + methods: ["POST"], + pattern: '/logout', + tokens: [{"old":"/logout","type":0,"val":"logout","end":""}], + types: placeholder as Registry['logout']['types'], + }, 'pages.home': { methods: ["GET","HEAD"], pattern: '/', diff --git a/.adonisjs/client/registry/schema.d.ts b/.adonisjs/client/registry/schema.d.ts index b151dc9..ca9e232 100644 --- a/.adonisjs/client/registry/schema.d.ts +++ b/.adonisjs/client/registry/schema.d.ts @@ -571,6 +571,42 @@ export interface Registry { errorResponse: ExtractErrorResponse>> } } + 'login': { + methods: ["GET","HEAD"] + pattern: '/login' + types: { + body: {} + paramsTuple: [] + params: {} + query: {} + response: ExtractResponse>> + errorResponse: ExtractErrorResponse>> + } + } + 'auth.login': { + methods: ["POST"] + pattern: '/login' + types: { + body: {} + paramsTuple: [] + params: {} + query: {} + response: ExtractResponse>> + errorResponse: ExtractErrorResponse>> + } + } + 'logout': { + methods: ["POST"] + pattern: '/logout' + types: { + body: {} + paramsTuple: [] + params: {} + query: {} + response: ExtractResponse>> + errorResponse: ExtractErrorResponse>> + } + } 'pages.home': { methods: ["GET","HEAD"] pattern: '/' diff --git a/.adonisjs/client/registry/tree.d.ts b/.adonisjs/client/registry/tree.d.ts index 9af49f3..5f92aca 100644 --- a/.adonisjs/client/registry/tree.d.ts +++ b/.adonisjs/client/registry/tree.d.ts @@ -66,6 +66,11 @@ export interface ApiDefinition { updateRoute: typeof routes['firmware_catalog.update_route'] deleteRoute: typeof routes['firmware_catalog.delete_route'] } + login: typeof routes['login'] + auth: { + login: typeof routes['auth.login'] + } + logout: typeof routes['logout'] pages: { home: typeof routes['pages.home'] deviceDetail: typeof routes['pages.device_detail'] diff --git a/.adonisjs/server/controllers.ts b/.adonisjs/server/controllers.ts index ed1075f..1ae59a6 100644 --- a/.adonisjs/server/controllers.ts +++ b/.adonisjs/server/controllers.ts @@ -4,6 +4,7 @@ */ export const controllers = { + Auth: () => import('#controllers/auth_controller'), Commands: () => import('#controllers/commands_controller'), ConfigurationsV1: () => import('#controllers/configurations_v1_controller'), Cwmp: () => import('#controllers/cwmp_controller'), diff --git a/.adonisjs/server/routes.d.ts b/.adonisjs/server/routes.d.ts index 9c87d89..cfe76af 100644 --- a/.adonisjs/server/routes.d.ts +++ b/.adonisjs/server/routes.d.ts @@ -51,6 +51,9 @@ export type ScannedRoutes = { 'firmware_catalog.create_route': { paramsTuple?: []; params?: {} } 'firmware_catalog.update_route': { paramsTuple: [ParamValue]; params: {'id': ParamValue} } 'firmware_catalog.delete_route': { paramsTuple: [ParamValue]; params: {'id': ParamValue} } + 'login': { paramsTuple?: []; params?: {} } + 'auth.login': { paramsTuple?: []; params?: {} } + 'logout': { paramsTuple?: []; params?: {} } 'pages.home': { paramsTuple?: []; params?: {} } 'pages.device_detail': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } 'pages.refresh_device': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } @@ -80,6 +83,8 @@ export type ScannedRoutes = { 'configurations_v_1.dry_run': { paramsTuple: [ParamValue]; params: {'id': ParamValue} } 'firmware_catalog.create_entry': { paramsTuple?: []; params?: {} } 'firmware_catalog.create_route': { paramsTuple?: []; params?: {} } + 'auth.login': { paramsTuple?: []; params?: {} } + 'logout': { paramsTuple?: []; params?: {} } 'pages.refresh_device': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } 'pages.get_model': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } 'pages.store_fleet_devices': { paramsTuple?: []; params?: {} } @@ -110,6 +115,7 @@ export type ScannedRoutes = { 'firmware_catalog.list_entries': { paramsTuple?: []; params?: {} } 'firmware_catalog.show_entry': { paramsTuple: [ParamValue]; params: {'id': ParamValue} } 'firmware_catalog.list_routes': { paramsTuple?: []; params?: {} } + 'login': { paramsTuple?: []; params?: {} } 'pages.home': { paramsTuple?: []; params?: {} } 'pages.device_detail': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } 'commands.page': { paramsTuple?: []; params?: {} } @@ -148,6 +154,7 @@ export type ScannedRoutes = { 'firmware_catalog.list_entries': { paramsTuple?: []; params?: {} } 'firmware_catalog.show_entry': { paramsTuple: [ParamValue]; params: {'id': ParamValue} } 'firmware_catalog.list_routes': { paramsTuple?: []; params?: {} } + 'login': { paramsTuple?: []; params?: {} } 'pages.home': { paramsTuple?: []; params?: {} } 'pages.device_detail': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} } 'commands.page': { paramsTuple?: []; params?: {} } diff --git a/inertia/app/app.ts b/inertia/app/app.ts index 8d7dc1a..548e7c3 100644 --- a/inertia/app/app.ts +++ b/inertia/app/app.ts @@ -23,7 +23,9 @@ createInertiaApp({ if (!page) { throw new Error(`Page not found: ${name}`) } - page.default.layout = page.default.layout || DefaultLayout + if (page.default.layout === undefined) { + page.default.layout = DefaultLayout + } return page }, setup({ el, App, props, plugin }) { diff --git a/inertia/pages/Login.vue b/inertia/pages/Login.vue index 718de28..0a90a48 100644 --- a/inertia/pages/Login.vue +++ b/inertia/pages/Login.vue @@ -25,19 +25,7 @@ function submit() {
-
-

ADAM ACS

{{ t('login.subtitle') }}

@@ -98,9 +86,5 @@ function submit() {
- -