Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2023-10-23 12:47:04 +02:00
commit 60deae8b64
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
15 changed files with 20 additions and 14 deletions

View file

@ -35,7 +35,7 @@ class ProductsController extends Controller
$q->where('id', $publishedRange->id);
})
->where('status', true)
->paginate(9);
->paginate(9);
return view('fo.pages.products.range-products', [
'products' => $products,
@ -51,6 +51,7 @@ class ProductsController extends Controller
*/
public function show(Product $publishedProduct)
{
$publishedProduct->load('range');
$certifications = $publishedProduct->certifications()->where('status', true)->get();
$associatedRecipes = $publishedProduct->recipes()->where('status', true)->take(3)->get();
$productModel = $publishedProduct;

View file

@ -7,6 +7,7 @@ use App\Enums\NutriscoreEnum;
use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Enum;
use Illuminate\Support\Str;
class StoreProductRequest extends FormRequest
{
@ -38,6 +39,7 @@ class StoreProductRequest extends FormRequest
'recipe_list' => \collect($this->recipes)->map(function ($value) {
return \is_array($value) ? ($value['value'] ?? null) : null;
})->filter()->all(),
'description' => (string)Str::of($this->post('description'))
]);
$this->mergePicture('picture');
$this->mergePicture('sticker');
@ -60,7 +62,7 @@ class StoreProductRequest extends FormRequest
'sticker_alt' => 'required|min:3|max:255',
'sticker_title' => 'required|min:3|max:255',
'description' => 'required|string|min:15',
'description' => 'required|string',
'preparation' => 'nullable|string|min:15',
'ingredients' => 'required|string|min:15',

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 993 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 560 KiB

View file

@ -5,7 +5,9 @@
}
.certification-item img {
width: 75px;
max-width: 75px;
width: 5rem;
max-width: 6rem;
max-height: 6rem;
object-fit: contain;
}
}

View file

@ -224,7 +224,7 @@ li strong {
display: inline-block;
width: 500px;
height: 500px;
background-image: url("@/images/Pack-cuillere.jpg");
background-image: url("@/images/Pack-cuillere-issue-22.jpg");
background-repeat: no-repeat;
background-size: contain;
content: "";
@ -238,7 +238,7 @@ li strong {
display: inline-block;
width: 550px;
height: 550px;
background-image: url("@/images/PACK.jpg");
background-image: url("@/images/PACK-issue-22.jpg");
background-repeat: no-repeat;
background-size: contain;
content: "";

View file

@ -73,6 +73,9 @@
<li class="certification-item mx-1">
<img src="{{ Vite::asset('resources/assets/images/Saveur-en-or.png') }}" alt="Logo de la certification Saveurs en Or">
</li>
<li class="certification-item mx-1">
<img src="{{ Vite::asset('resources/assets/images/100LOCAL-V2.png') }}" alt="Logo 100% local">
</li>
</ul>
</div>
</div>

View file

@ -40,7 +40,7 @@
Route::current()->getName() == 'ranges.products' ||
Route::current()->getName() == 'products.show') active @endif">
<a class="nav-link dropdown-toggle" href="{{ route('ranges.index') }}" id="navbarDropdown" role="button" aria-expanded="false">
{{ __('Nos volailles') }}
{{ __('Nos produits') }}
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
@if(count($PublishedRangesGlobal))

View file

@ -36,7 +36,6 @@
<h2 class="fw-bold text-uppercase">{{ __('Des produits de qualité bons et accessibles') }}</h2>
<h3 class="text-uppercase">{{ __('Garantis 100% Hauts-De-France') }}</h3>
<p>{{ __('Avec notre label 100% LOCAL, certifié et contrôlé par un cahier des charges précis, nous garantissons l\'origine de nos produits issus de poulets nés, élevés et préparés en région des Hauts de France.') }}</p>
<a href="{{ route('local') }}" title="{{ __('Engagement 100% local') }}" class="btn btn-primary text-uppercase">{{ __('En savoir plus >') }}</a>
</div>
</div>
@ -45,7 +44,6 @@
<h2 class="fw-bold text-uppercase">{{ __('Une filière soucieuse de la santé') }}</h2>
<h3 class="text-uppercase">{{ __('Des hommes, des animaux et de la terre') }}</h3>
<p>{{ __('LIONOR, c\'est une filière qui s\'engage pour élever des volailles dans le respect du vivant et qui favorise l\'économie locale. Fiers de nos 70 éleveurs et de nos 235 salariés, unis par la passion de leur métier, nous participons activement à la vie sociale et économique de notre région.') }}</p>
<a href="{{ route('local') }}" title="{{ __('Engagement 100% local') }}" class="btn btn-primary text-uppercase">{{ __('En savoir plus >') }}</a>
</div>
</div>

View file

@ -32,7 +32,7 @@
<!-- GRID -->
<div class="row mt-4 g-3">
<div class="col-md-6">
<img src="{{ Vite::asset('resources/assets/images/Frise-images.jpg') }}" alt="Une frise d'images avec des poussins, un éleveur, un camion de transport, des cuisses de poulets cuites" class="img-fluid">
<img src="{{ Vite::asset('resources/assets/images/Frise-images-issue-22.jpg') }}" alt="Une frise d'images avec des poussins, un éleveur, un camion de transport, des cuisses de poulets cuites" class="img-fluid">
</div>
<div class="col-md-6">
<ul class="list-group commitments">

View file

@ -13,8 +13,8 @@
<div class="g-0 pb-md-5 position-relative hero">
<div class="position-relative hero-fix-height">
<img class="img-fluid" src="{{ Vite::asset('resources/assets/images/Panoramique3.jpg') }}"
alt="Une assiette de merguez de volailles accompagnées de tomates cerise coupées, d'oigons tranchés et de persil">
<img class="img-fluid w-100" src="{{ asset($productModel->range->banner) }}" title="{{ $productModel->range->banner_title }}"
alt="{{ $productModel->range->banner_alt }}">
</div>
<!-- breadcrumb -->
<div class="breadcrumb-obj small container mt-3">
@ -35,8 +35,8 @@
<div class="container">
<div class="row g-5">
<div class="col-md-6">
<img class="img-fluid img-cut" src="{{ asset($productModel->picture) }}"
title="{{ $productModel->picture_title }}" alt="{{ $productModel->picture_alt }}">
<img class="img-fluid img-cut" src="{{ asset($productModel->picture) }}" title="{{ $productModel->picture_title }}"
alt="{{ $productModel->picture_alt }}">
<div class="container mt-4">
<div class="row img-80">
@if (isset($productModel->info_cooking))