From 58a90547fe95c0897b6a288a7c3fa42e450d4250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Wed, 6 Dec 2023 12:11:42 +0100
Subject: [PATCH] Sync 15 FIX prizes with image resizer

---
 sass/pages/_home.scss                         |  6 ++--
 theme.config.php                              | 13 ++++----
 views/pages/home.blade.php                    | 22 +++++++++-----
 .../pages/participation/parts/prize.blade.php | 30 ++++++++++---------
 4 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/sass/pages/_home.scss b/sass/pages/_home.scss
index aec0ac2..b0278e0 100644
--- a/sass/pages/_home.scss
+++ b/sass/pages/_home.scss
@@ -47,14 +47,14 @@
         }
 
         .carousel-item {
-            height: 55rem;
+            min-height: 55rem;
 
             @include media-breakpoint-up(sm) {
-                height: 48rem;
+                min-height: 48rem;
             }
 
             @include media-breakpoint-up(md) {
-                    height: 40rem;
+                min-height: 40rem;
             }
         }
 
diff --git a/theme.config.php b/theme.config.php
index 6e33624..0ade548 100644
--- a/theme.config.php
+++ b/theme.config.php
@@ -49,15 +49,16 @@ return [
      */
     'resizes' => [
         'trimlot1' => [
-            'height' => 700,
-            'width' => 560,
+            'height' => 600,
+            'width' => 400,
             'inCanvas' => true,
-            'trim' => ['transparent', null, 10],
-            'format' => 'png'
+            'fit' => true,
+            'format' => 'webp'
         ],
         'trimlot2' => [
-            'height' => 476,
-            'width' => 355,
+            'height' => 400,
+            'width' => 400,
+            'fit' => true,
             'inCanvas' => true,
             'trim' => ['transparent', null, 10],
             'format' => 'png'
diff --git a/views/pages/home.blade.php b/views/pages/home.blade.php
index 5aed518..5a0383b 100644
--- a/views/pages/home.blade.php
+++ b/views/pages/home.blade.php
@@ -25,7 +25,11 @@
                                             class="bg-tertiary fs-3 rounded-pill fw-bold px-3 py-1 text-white">{{ Arr::get($prizesGlobal, 0)->quantity }}</span>
                                     </div>
                                     <h3 class="text-tertiary fw-bold fs-3 text-uppercase lh-1">
-                                        {{ Arr::get($prizesGlobal, 0)->label }}
+                                        @if (intval(Arr::get($prizesGlobal, 0)->quantity) > 1)
+                                            {{ Str::plural(Arr::get($prizesGlobal, 0)->label) }}
+                                        @else
+                                            {{ Arr::get($prizesGlobal, 0)->label }}
+                                        @endif
                                     </h3>
                                 </div>
                                 <img class="img-fluid anti-rotate" src="{{ asset(Arr::get($prizesGlobal, 0)->picture) }}"
@@ -37,15 +41,19 @@
                                 <div class="d-flex justify-content-center justify-content-xl-start">
                                     <div class="ms-xl-5 me-2">
                                         <span
-                                            class="bg-tertiary fs-3 rounded-pill fw-bold px-3 py-1 text-white">{{ optional(Arr::get($prizesGlobal, 1))->quantity }}</span>
+                                            class="bg-tertiary fs-3 rounded-pill fw-bold px-3 py-1 text-white">{{ Arr::get($prizesGlobal, 1)->quantity }}</span>
                                     </div>
                                     <h3 class="text-tertiary fw-bold fs-3 text-uppercase lh-1">
-                                        {{ Arr::get($prizesGlobal, 1)->label }}
+                                        @if (intval(Arr::get($prizesGlobal, 1)->quantity) > 1)
+                                            {{ Str::plural(Arr::get($prizesGlobal, 1)->label) }}
+                                        @else
+                                            {{ Arr::get($prizesGlobal, 1)->label }}
+                                        @endif
                                     </h3>
                                 </div>
                                 <div>
                                     <img class="img-fluid anti-rotate"
-                                        src="{{ asset(resize(Arr::get($prizesGlobal, 1)->picture), 'trimlot2') }}"
+                                        src="{{ asset(resize(Arr::get($prizesGlobal, 1)->picture, 'trimlot2')) }}"
                                         title="{{ Arr::get($prizesGlobal, 1)->picture_title }}"
                                         alt="{{ Arr::get($prizesGlobal, 1)->picture_alt }}">
                                 </div>
@@ -148,11 +156,11 @@
                                     <div class="col-12 col-md-4 col-lg-6 text-md-end text-center">
                                         @if ($loop->index === 0)
                                             {{-- RESIZE FOR SPECIFIC PRIZE PICTURE --}}
-                                            <img class="img-fluid" src="{{ asset(resize($prizeModel->picture), 'trimlot1') }}"
+                                            <img class="img-fluid" src="{{ asset(resize($prizeModel->picture, 'trimlot1')) }}"
                                                 title="{{ $prizeModel->picture_title }}" alt="{{ $prizeModel->picture_alt }}">
                                         @elseif ($loop->index === 1)
                                             {{-- RESIZE FOR SPECIFIC PRIZE PICTURE --}}
-                                            <img class="img-fluid" src="{{ asset(resize($prizeModel->picture), 'trimlot2') }}"
+                                            <img class="img-fluid" src="{{ asset(resize($prizeModel->picture, 'trimlot2')) }}"
                                                 title="{{ $prizeModel->picture_title }}" alt="{{ $prizeModel->picture_alt }}">
                                         @else
                                             <img class="img-fluid" src="{{ asset($prizeModel->picture) }}"
@@ -161,7 +169,7 @@
                                     </div>
                                     <div class="col d-flex justify-content-start align-items-center overflow-visible">
                                         <div
-                                            class="d-inline-block text-bg-quint main-rotate carousel-text-pannel mx-md-4 p-md-4 mx-lg-5 p-lg-5 overflow-visible">
+                                            class="d-inline-block text-bg-quint main-rotate carousel-text-pannel mx-md-4 p-md-4 mx-lg-5 p-lg-5 mb-5 overflow-visible">
                                             <div class="anti-rotate m-3 p-1">
                                                 <h3 class="fs-3 text-md-start text-center">{{ $prizeModel->arg_title }}</h3>
                                                 <h4>{{ $prizeModel->arg_subtitle }}</h4>
diff --git a/views/pages/participation/parts/prize.blade.php b/views/pages/participation/parts/prize.blade.php
index 8d66da6..c251e4f 100644
--- a/views/pages/participation/parts/prize.blade.php
+++ b/views/pages/participation/parts/prize.blade.php
@@ -1,24 +1,26 @@
-<section class="d-none container pb-5 pt-5 text-center" id="{{ $sectionId }}">
+<section class="container pb-5 pt-5 text-center" id="{{ $sectionId }}">
     <div class="row">
-        <div class="col">
+        <div class="col-12 col-md-6">
             <img class="img-fluid" src="{{ asset($prizeModel->picture) }}" title="{{ $prizeModel->picture_title }}"
                 alt="{{ $prizeModel->picture_alt }}">
         </div>
         <div class="col">
-            <span class="fs-1">{{ __("Félicitations\u{00A0}!") }}</span>
-            <p>{{ __('Vous avez gagné un :model !', [
-                'model' => $prizeModel->label,
-            ]) }}
-                <br>
+            <div class="text-bg-tertiary">
+                <span class="fs-1">{{ __("Félicitations\u{00A0}!") }}</span>
+                <p>{{ __('Vous avez gagné un :model !', [
+                    'model' => $prizeModel->label,
+                ]) }}
+                    <br>
+                    @if ($settingsGlobal->winning_proof)
+                        {{ __('Pour recevoir votre cadeau, vous devez envoyer vos preuves d\'achat. Voir modalités ci dessous.') }}
+                    @else
+                        {{ __('Vous serez prochainement contacté via vos coordonées d\'inscription pour recevoir votre lot.') }}
+                    @endif
+                </p>
                 @if ($settingsGlobal->winning_proof)
-                    {{ __('Pour recevoir votre cadeau, vous devez envoyer vos preuves d\'achat. Voir modalités ci dessous.') }}
-                @else
-                    {{ __('Vous serez prochainement contacté via vos coordonées d\'inscription pour recevoir votre lot.') }}
+                    <a href="#{{ $winProofAnchor }}">&raquo;</a>
                 @endif
-            </p>
-            @if ($settingsGlobal->winning_proof)
-                <a href="#{{ $winProofAnchor }}">&raquo;</a>
-            @endif
+            </div>
         </div>
     </div>
 </section>