diff --git a/app/Console/Commands/SyncDolibarrMembers.php b/app/Console/Commands/SyncDolibarrMembers.php index aa7863d..33e5385 100644 --- a/app/Console/Commands/SyncDolibarrMembers.php +++ b/app/Console/Commands/SyncDolibarrMembers.php @@ -63,7 +63,6 @@ class SyncDolibarrMembers extends Command [ 'status' => $memberStatuses[$member['status']] ?? 'draft', 'nature' => 'physical', - 'member_type' => $member['type'], 'group_id' => null, 'lastname' => $member['lastname'], 'firstname' => $member['firstname'], diff --git a/app/Support/CacheLineOutput.php b/app/Support/CacheLineOutput.php new file mode 100644 index 0000000..29cd38a --- /dev/null +++ b/app/Support/CacheLineOutput.php @@ -0,0 +1,22 @@ +cacheKey, []); + $clean = preg_replace('/\x1b\[[0-9;]*m/', '', $message); + $current['output'] = ($current['output'] ?? '').$clean.($newline ? "\n" : ''); + Cache::put($this->cacheKey, $current, now()->addHour()); + } +} diff --git a/resources/js/routes/index.ts b/resources/js/routes/index.ts index 6db2c91..6bca92d 100644 --- a/resources/js/routes/index.ts +++ b/resources/js/routes/index.ts @@ -138,7 +138,7 @@ logout.form = logoutForm /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ export const home = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ url: home.url(options), @@ -147,12 +147,12 @@ export const home = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ home.definition = { methods: ["get","head"], - url: '/welcome', + url: '/', } satisfies RouteDefinition<["get","head"]> /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ home.url = (options?: RouteQueryOptions) => { return home.definition.url + queryParams(options) @@ -160,7 +160,7 @@ home.url = (options?: RouteQueryOptions) => { /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ home.get = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ url: home.url(options), @@ -169,7 +169,7 @@ home.get = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ home.head = (options?: RouteQueryOptions): RouteDefinition<'head'> => ({ url: home.url(options), @@ -178,7 +178,7 @@ home.head = (options?: RouteQueryOptions): RouteDefinition<'head'> => ({ /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ const homeForm = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: home.url(options), @@ -187,7 +187,7 @@ const homeForm = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ homeForm.get = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: home.url(options), @@ -196,7 +196,7 @@ homeForm.get = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ /** * @see routes/web.php:7 -* @route '/welcome' +* @route '/' */ homeForm.head = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: home.url({ @@ -212,7 +212,7 @@ home.form = homeForm /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ export const maintenance = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ url: maintenance.url(options), @@ -221,12 +221,12 @@ export const maintenance = (options?: RouteQueryOptions): RouteDefinition<'get'> maintenance.definition = { methods: ["get","head"], - url: '/', + url: '/maintenance', } satisfies RouteDefinition<["get","head"]> /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ maintenance.url = (options?: RouteQueryOptions) => { return maintenance.definition.url + queryParams(options) @@ -234,7 +234,7 @@ maintenance.url = (options?: RouteQueryOptions) => { /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ maintenance.get = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ url: maintenance.url(options), @@ -243,7 +243,7 @@ maintenance.get = (options?: RouteQueryOptions): RouteDefinition<'get'> => ({ /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ maintenance.head = (options?: RouteQueryOptions): RouteDefinition<'head'> => ({ url: maintenance.url(options), @@ -252,7 +252,7 @@ maintenance.head = (options?: RouteQueryOptions): RouteDefinition<'head'> => ({ /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ const maintenanceForm = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: maintenance.url(options), @@ -261,7 +261,7 @@ const maintenanceForm = (options?: RouteQueryOptions): RouteFormDefinition<'get' /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ maintenanceForm.get = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: maintenance.url(options), @@ -270,7 +270,7 @@ maintenanceForm.get = (options?: RouteQueryOptions): RouteFormDefinition<'get'> /** * @see routes/web.php:11 -* @route '/' +* @route '/maintenance' */ maintenanceForm.head = (options?: RouteQueryOptions): RouteFormDefinition<'get'> => ({ action: maintenance.url({ diff --git a/routes/web.php b/routes/web.php index cfb8422..9f09752 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,11 +4,11 @@ use App\Http\Controllers\DashboardController; use Illuminate\Support\Facades\Route; use Inertia\Inertia; -Route::get('/welcome', function () { +Route::get('/', function () { return Inertia::render('welcome'); })->name('home'); -Route::get('/', function () { +Route::get('/maintenance', function () { return Inertia::render('maintenance'); })->name('maintenance');