Merge branch 'commitmentsFix-review' into 'develop'

Fix 🐛 fix review for commitments pages

See merge request ldc-web/projets/le-gaulois!345

app/Http/Controllers/Fo/CommitmentController.php

@@ -20,6 +20,7 @@ class CommitmentController extends Controller
             ->map(fn($page) => [
                 'title' => $page->type->label(),
                 'picto' => $page->data['picto_navigation'] ?? null,
+                'activePicto' => $page->data['picto_banner'] ?? null,
                 'type'  => $page->type->value,
                 'link' => route($page->type->routeForCommitments()),
             ])

resources/sass/fo/base/_common.scss

@@ -201,6 +201,7 @@
     left: 0;
     width: 100%;
     height: 100%;
+    background-color: #fcf8f7;
     background-image: url('@/images/common/wood-bg-white-big.jpg');
     background-position: left;
     background-repeat: no-repeat;

resources/sass/fo/pages/commitments.scss

@@ -98,6 +98,10 @@
     margin-bottom: 0.75rem;
 }
 
+.content-beige p {
+    margin-bottom: 0;
+}
+
 #commitments-arrows-list {
     padding-bottom: 12rem;
 

resources/views/fo/layouts/header-banner.blade.php

@@ -7,7 +7,7 @@
     <div class="row w-100 pb-lg-5 container mx-auto pb-0">
         <div class="col-12 col-xl-6 position-relative z-1">
             @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $staticPageModel])
-            <hgroup>
+            <hgroup class="pe-xl-5 ">
                 @if (isset($badge) && !empty($badge))
                     <div class="f-bourton-base mt-4 w-fit px-2 py-1 text-white" style="background-color:{{ $badge->color }}">
                         {{ $badge->label }}

resources/views/fo/pages/commitments/raise.blade.php

@@ -184,6 +184,7 @@
         ])
     @endif
     {{-- COMPLEX FLEX ITEMS --}}
+    <div class="mt-5"></div>
     @if ($section_7_model->visibility)
         @include('fo.partials.commitments.complex-flex-items', [
             'title' => str($section_7->title->value)->upper(),

resources/views/fo/partials/commitments/complex-flex-items.blade.php

@@ -7,7 +7,9 @@
                 <div class="bg-tertiary line-border-small w-fit p-3 ps-5">
                     <h3 class="m-0 text-center">{{ $title }}</h3>
                     @if (isset($subtitle))
-                        <p class="f-bourton-base m-0 text-center">{{ $subtitle }}</p>
+                        <div class="content-beige f-bourton-base text-center m-0">
+                            {!! clean($subtitle) !!}
+                        </div>
                     @endif
                 </div>
             </div>
@@ -30,7 +32,7 @@
                                     @endif
                                     <h5 class="card-title m-0">{{ $item->title }}</h5>
                                     @if (isset($item->description))
-                                        <p class="card-text">{!! clean($item->description) !!}</p>
+                                        {!! clean($item->description) !!}
                                     @endif
                                 </div>
                             </div>

resources/views/fo/partials/commitments/navigation.blade.php

@@ -4,6 +4,10 @@
     <div class="rounded-pill collapse overflow-hidden" id="commitments-navigation">
         <div class="d-flex flex-column justify-content-start align-items-center">
             @foreach ($commitmentModels as $commitmentModel)
+                @php
+                    $isCurrentPage = url()->current() === $commitmentModel['link'];
+                    $picto = $isCurrentPage ? $commitmentModel['picto']['value'] : $commitmentModel['activePicto']['value'];
+                @endphp
                 <a href="{{ $commitmentModel['link'] }}"
                     title="{{ __('Accéder à la page :pageName', ['pageName' => $commitmentModel['title']]) }}"
                     @class([
@@ -11,8 +15,7 @@
                         'py-1' => !$loop->last,
                         'pt-1 pb-2 pb-md-1' => $loop->last,
                     ])>
-                    <img class="img-fluid" src="{{ asset($commitmentModel['picto']['value']) }}"
-                        alt="{{ $commitmentModel['picto']['alt'] ?? '' }}">
+                    <img class="img-fluid" src="{{ asset($picto) }}" alt="{{ $commitmentModel['picto']['alt'] ?? '' }}">
                 </a>
             @endforeach
         </div>

resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php

@@ -6,7 +6,7 @@
     $articleId = $reduction->article_id->value ?? null;
     $reductionNews = $articleId ? \App\Models\News::find($articleId) : null;
 @endphp
-<section class="position-relative bg-white-wood-big py-5" id="commitments-paragraph-with-visual-complex-flex-items">
+<section class="position-relative bg-white-wood-big py-5 line-border-large" id="commitments-paragraph-with-visual-complex-flex-items">
     <div class="container">
         <div class="row">
             <div @class([

resources/views/fo/partials/commitments/paragraph.blade.php

@@ -13,11 +13,12 @@
             <div class="row g-0">
                 <div class="col ck-content">
                     <h3>{{ $title }}</h3>
-                    <p class="mt-3">{!! clean($text) !!}</p>
+                    {!! clean($text) !!}
                 </div>
             </div>
         </div>
     </div>
+@if (isset($ctaUrl) || isset($articleId))
     <div class="container pb-5">
         @include('fo.partials.block.reduction-card', [
             'news' => $reductionNews,
@@ -27,4 +28,5 @@
             'blockType' => $blockType,
         ])
     </div>
+@endif  
 </section>