Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2023-11-08 11:17:31 +01:00
commit 3e0198f112
No known key found for this signature in database
GPG key ID: 8571BFA20420D512

View file

@ -5,9 +5,9 @@
@section('bannerHeader')
@include('fo.partials.banner-header', [
'breadcrumbs' => "Accueil / Résultats de recherche",
'title' => __('Les résultats de recherche pour `:search`', ['search' => $search]),
'description' => ''
'breadcrumbs' => "Accueil / Résultats de recherche",
'title' => __('Les résultats de recherche pour `:search`', ['search' => $search]),
'description' => ''
])
@endsection
@ -17,9 +17,10 @@
<div class="wrapper-xl recipe-wrapper">
@if (
$products->count() == 0
&& $news->count() == 0
&& $recipes->count() == 0
is_array($products) or
($products->count() == 0
&& $news->count() == 0
&& $recipes->count() == 0)
)
<div class="row">
<div class="col text-center">
@ -53,10 +54,10 @@
@foreach ($products as $product)
<div class="col mb-4">
<div class="col mb-4">
@include('fo.pages.products.smallCard', [
@include('fo.pages.products.smallCard', [
'product' => $product,
'forcedColor' => $product->subrange->range->color
])
])
</div>
</div>
@endforeach
@ -656,9 +657,9 @@
<p class="card-title ff-poppins-medium fs-card-big m-0">{{ $news_item->title }}</p>
<div>
@foreach ($news_item->categories as $category)
<div class="category-wrapper d-inline-block rounded-3 px-4 py-1 my-3 my-lg-4">
<span class="ff-poppins-regular fs-xsm">{{ $category->label }}</span>
</div>
<div class="category-wrapper d-inline-block rounded-3 px-4 py-1 my-3 my-lg-4">
<span class="ff-poppins-regular fs-xsm">{{ $category->label }}</span>
</div>
@endforeach
</div>
<div class="card-txt d-flex flex-column justify-content-between align-items-center flex-grow-1">
@ -695,17 +696,17 @@
<div class="col pb-5 p-md-3">
<div class="row justify-content-center">
@include('fo.pages.ideas.modelCard', [
'type' => 'recipe',
'color' => 'blue',
'title' => $recipe->title,
'text' => $recipe->preparation,
'picture' => $recipe->picture,
'picture_alt' => $recipe->picture_alt,
'picture_title' => $recipe->picture_title,
'time' => $recipe->preparation_time,
'difficulty' => $recipe->difficulty,
'tags' => $recipe->tags ?? [],
'route' => route('fo.recipes.show', ['publishedAdvice' => $recipe])
'type' => 'recipe',
'color' => 'blue',
'title' => $recipe->title,
'text' => $recipe->preparation,
'picture' => $recipe->picture,
'picture_alt' => $recipe->picture_alt,
'picture_title' => $recipe->picture_title,
'time' => $recipe->preparation_time,
'difficulty' => $recipe->difficulty,
'tags' => $recipe->tags ?? [],
'route' => route('fo.recipes.show', ['publishedAdvice' => $recipe])
])
</div>
</div>
@ -721,4 +722,4 @@
</div>
</div>
</div>
@endsection
@endsection