From a2d8c2e97d6697bacd9ff50ac110f52b7cac0f41 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 12 Jun 2025 16:01:22 +0200 Subject: [PATCH] fix: prevent 500 when there's no + remove fo.commitments.index route --- config/sitemap-generator.php | 3 ++- resources/views/modules/breadcrumbs/breadcrumb-head.blade.php | 2 +- resources/views/modules/script-routes.blade.php | 1 - routes/breadcrumbs-fo.php | 4 ++-- routes/web-fo.php | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/sitemap-generator.php b/config/sitemap-generator.php index e81de3de..20f8b1e7 100644 --- a/config/sitemap-generator.php +++ b/config/sitemap-generator.php @@ -23,7 +23,8 @@ return [ 'fo.news.index', 'fo.products.index', 'fo.recipes.index', - 'fo.commitments.index', + // FIXME: En attente d'une évolution. Le blade est actuellement vide. A décommenter quand ça sera décidé. + // 'fo.commitments.index', 'fo.commitments.brand', 'fo.commitments.raise', 'fo.commitments.eat', diff --git a/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php b/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php index 3a6317da..a698cd9f 100644 --- a/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php +++ b/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php @@ -1,5 +1,5 @@ @hasSection('breadcrumb') - @if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) + @if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb']) && isset($brParam)) {{ call_user_func_array( 'Breadcrumbs::view', array_merge(['breadcrumbs::json-ld', app()->view->getSections()['breadcrumb']], Arr::wrap($brParam)), diff --git a/resources/views/modules/script-routes.blade.php b/resources/views/modules/script-routes.blade.php index ad0a7b57..8ba19f33 100644 --- a/resources/views/modules/script-routes.blade.php +++ b/resources/views/modules/script-routes.blade.php @@ -22,7 +22,6 @@ window.__SYSTEM._routes['bo.submeats.json-paginate'] = '{{ route('bo.submeats.json-paginate') }}'; window.__SYSTEM._routes['bo.claims.json-paginate'] = '{{ route('bo.claims.json-paginate') }}'; window.__SYSTEM._routes['fo.recipes.index'] = '{{ route('fo.recipes.index') }}'; - window.__SYSTEM._routes['fo.commitments.index'] = '{{ route('fo.commitments.index') }}'; window.__SYSTEM._routes['fo.brand.story'] = '{{ route('fo.brand.story') }}'; window.__SYSTEM._routes['fo.breeding.index'] = '{{ route('fo.breeding.index') }}'; window.__SYSTEM._routes['fo.recruitment.show'] = '{{ route('fo.recruitment.show') }}'; diff --git a/routes/breadcrumbs-fo.php b/routes/breadcrumbs-fo.php index aa386cc3..6512764c 100644 --- a/routes/breadcrumbs-fo.php +++ b/routes/breadcrumbs-fo.php @@ -76,8 +76,8 @@ Breadcrumbs::for('fo.recipes.search.submeat', function (Generator $trail) { // * COMMITMENTS Breadcrumbs::for('fo.commitments.index', function (Generator $trail) { $trail->parent('fo.home.show'); - // FIXME: Le lien ci-dessous doit etre .index après la MEP. - $trail->push(Str::of(trans('nos engagements'))->ucfirst(), route('fo.commitments.brand')); + // FIXME: Le lien ci-dessous doit etre fo.commitments.index après la MEP. + $trail->push(Str::of(trans('nos engagements'))->ucfirst()); }); Breadcrumbs::for('fo.commitments.brand', function (Generator $trail) { $trail->parent('fo.commitments.index'); diff --git a/routes/web-fo.php b/routes/web-fo.php index 447ef8b5..b7455a98 100644 --- a/routes/web-fo.php +++ b/routes/web-fo.php @@ -120,7 +120,8 @@ Route::middleware(['throttle:web'])->name('fo.')->group(function () { Route::prefix('engagements') ->name('commitments.') ->group(function () { - Route::view('/', 'fo.pages.commitments.index')->name('index'); + // FIXME: En attente d'une évolution. Le blade est actuellement vide. A décommenter quand ça sera décidé. + // Route::view('/', 'fo.pages.commitments.index')->name('index'); Route::view('/la-marque-100-francaise', 'fo.pages.commitments.brand')->name('brand'); Route::view('/elever-durablement', 'fo.pages.commitments.raise')->name('raise'); Route::view('/bien-nourrir-les-francais', 'fo.pages.commitments.eat')->name('eat');