From 918d5a3dc806e5e173d0b59f3bff3488434860a3 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Wed, 24 Jul 2024 09:35:27 +0200 Subject: [PATCH 1/3] fix: wip for produce page --- .../2024_06_21_145915_qa_section.php | 2 - .../views/fo/pages/produce/show.blade.php | 46 +++++++++---------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/database/migrations/2024_06_21_145915_qa_section.php b/database/migrations/2024_06_21_145915_qa_section.php index 626dfba..ad70038 100644 --- a/database/migrations/2024_06_21_145915_qa_section.php +++ b/database/migrations/2024_06_21_145915_qa_section.php @@ -4,9 +4,7 @@ use App\Enums\Sections\PageSectionEnum; use App\Lib\Helpers\FileStorageHelper; use App\Models\Section; use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Schema; return new class extends Migration { diff --git a/resources/views/fo/pages/produce/show.blade.php b/resources/views/fo/pages/produce/show.blade.php index 377e2d8..790def8 100644 --- a/resources/views/fo/pages/produce/show.blade.php +++ b/resources/views/fo/pages/produce/show.blade.php @@ -41,7 +41,7 @@ {{-- GMS --}} -
+ {{--

{{ $gmsSection->h2_title }}

@@ -50,21 +50,21 @@
{!! clean($gmsSection->text) !!}
-
+
--}} {{-- PART 1 --}} - @include('fo.pages.produce.banner-elements', [ + {{-- @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie1', 'data' => $gmsSection->data, 'itemMax' => 3, - ]) + ]) --}} {{-- PART 2 --}} - @include('fo.pages.produce.banner-elements', [ + {{-- @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie2', 'data' => $gmsSection->data, 'itemMax' => 3, - ]) + ]) --}} {{-- PART 3 --}} - @include('fo.pages.produce.banner-elements', [ + {{-- @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie3', 'data' => $gmsSection->data, 'itemMax' => 1, @@ -72,15 +72,15 @@ -
+
--}} {{-- RHD --}} -
+ {{--

{{ $rhdSection->h2_title }}

-
+
--}} {{-- PART 1 --}} - @include('fo.pages.produce.banner-elements', [ + {{-- @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie1', 'data' => $rhdSection->data, 'itemMax' => 10, @@ -92,9 +92,9 @@
-
+
--}} {{-- PART 2 --}} -
+ {{--

{{ __('le saviez-vous ?') }}

@@ -116,9 +116,9 @@
-
+
--}} {{-- EXPORT --}} -
+ {{--

{{ $exportSection->h2_title }}

@@ -131,25 +131,25 @@
-
+
--}} {{-- QUALITY --}} -
+ {{--
--}}

{{ $qualitySection->h2_title }}

+ @include('fo.pages.produce.banner-elements', [ + 'partName' => 'de_la_partie1', + 'data' => $qualitySection->data, + 'itemMax' => 1, + ])
{!! clean($qualitySection->text) !!}
@if ($qualitySection->data['bloc_button__on_vous_explique_comment_lire_cetteetiquette']['value']) {{ __('On vous explique comment lire cette étiquette') }} @endif
- @include('fo.pages.produce.banner-elements', [ - 'partName' => 'de_la_partie1', - 'data' => $qualitySection->data, - 'itemMax' => 1, - ])
{!! clean($qualitySection->data['bloc_text_de_la_partie2_content']['value']) !!}
@@ -193,5 +193,5 @@
-
+ {{--
--}} @endsection From c1d04e49e81e6ca6a80de9b544a90e9f554a8f32 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Wed, 24 Jul 2024 17:49:30 +0200 Subject: [PATCH 2/3] fix: comment produce show.blade --- app/Http/Requests/Bo/Sections/UpdateSectionRequest.php | 4 +++- resources/views/fo/pages/produce/show.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/Bo/Sections/UpdateSectionRequest.php b/app/Http/Requests/Bo/Sections/UpdateSectionRequest.php index bbbfbc0..fdee142 100644 --- a/app/Http/Requests/Bo/Sections/UpdateSectionRequest.php +++ b/app/Http/Requests/Bo/Sections/UpdateSectionRequest.php @@ -36,7 +36,9 @@ class UpdateSectionRequest extends UpdateMiniCrudRequest /** @var \App\Models\Section|null $section */ $section = $this->route('section'); if ($section) { - if ($section->section !== \App\Enums\Sections\PageSectionEnum::hire_grow) { + if ( + $section->section !== \App\Enums\Sections\PageSectionEnum::hire_grow + ) { $rules = \array_merge($rules, [ 'text' => 'present', ]); diff --git a/resources/views/fo/pages/produce/show.blade.php b/resources/views/fo/pages/produce/show.blade.php index 790def8..d0781fb 100644 --- a/resources/views/fo/pages/produce/show.blade.php +++ b/resources/views/fo/pages/produce/show.blade.php @@ -139,7 +139,7 @@

{{ $qualitySection->h2_title }}

- @include('fo.pages.produce.banner-elements', [ + {{-- @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie1', 'data' => $qualitySection->data, 'itemMax' => 1, @@ -148,7 +148,7 @@ @if ($qualitySection->data['bloc_button__on_vous_explique_comment_lire_cetteetiquette']['value']) {{ __('On vous explique comment lire cette étiquette') }} - @endif + @endif --}}
From 25f4e0a344c61fc0143fbe889e2bed072a2a4d20 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Thu, 25 Jul 2024 09:25:58 +0200 Subject: [PATCH 3/3] fix: add matomo in .env.example --- .env.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 749786e..8ff8760 100644 --- a/.env.example +++ b/.env.example @@ -61,6 +61,9 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" # Sentry SENTRY_LARAVEL_DSN= +# Matomo +MATOMO_SITE_ID=id + # MAILS MAIL_CONTACT_REMARK="equipe.web@ldc.fr" MAIL_CONTACT_SPONSORING="equipe.web@ldc.fr"