From 33e6a4e8283d180909288e8e19b00f5c004b0f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 4 Jan 2024 10:19:12 +0100 Subject: [PATCH] Closes #52 --- app/Http/Controllers/Fo/ProductController.php | 3 +- app/Http/Controllers/Fo/RangeController.php | 2 +- .../views/fo/pages/products/show.blade.php | 35 +------------------ .../views/fo/pages/ranges/show.blade.php | 4 ++- .../views/fo/partials/liked-too.blade.php | 34 ++++++++++++++++++ 5 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 resources/views/fo/partials/liked-too.blade.php diff --git a/app/Http/Controllers/Fo/ProductController.php b/app/Http/Controllers/Fo/ProductController.php index a0ea614..ce9e867 100644 --- a/app/Http/Controllers/Fo/ProductController.php +++ b/app/Http/Controllers/Fo/ProductController.php @@ -28,7 +28,8 @@ class ProductController extends Controller ->where('published', true) ->inRandomOrder()->limit(2)->get(); $klubBloc = KlubBloc::query()->first(); - $rangeModels = Range::query()->whereNot('id', $productModel->range->id)->get()->random(2); + $rangeModels = Range::query()->whereNot('id', $productModel->range->id)->limit(2) + ->inRandomOrder()->get(); return view('fo.pages.products.show', compact( 'productModel', diff --git a/app/Http/Controllers/Fo/RangeController.php b/app/Http/Controllers/Fo/RangeController.php index 8ae5cce..e38e85b 100644 --- a/app/Http/Controllers/Fo/RangeController.php +++ b/app/Http/Controllers/Fo/RangeController.php @@ -33,7 +33,7 @@ class RangeController extends Controller public function show(string $slug): \Illuminate\Contracts\View\View { $rangeModel = Range::query()->where('slug', $slug)->firstOrFail(); - $rangeModels = Range::query()->where('slug', '!=', $slug)->get(); + $rangeModels = Range::query()->where('slug', '!=', $slug)->limit(2)->inRandomOrder()->get(); $productModels = Product::query()->where('range_id', $rangeModel->id) ->where('published', true) ->orderBy('order', 'asc') diff --git a/resources/views/fo/pages/products/show.blade.php b/resources/views/fo/pages/products/show.blade.php index 9ea3c79..5e3da11 100644 --- a/resources/views/fo/pages/products/show.blade.php +++ b/resources/views/fo/pages/products/show.blade.php @@ -233,39 +233,6 @@ {{-- LIKED TOO --}} -
-
-
-
-

{{ __('Vous aimerez aussi...') }}

- {{ __('Trait souligné') }} -
-
-
- @foreach ($rangeModels as $key => $rangeModel) - - @endforeach -
-
-
- {{ __('Phare qui éclaire n\'éclaire pas') }} -
-
+ @include('fo.partials.liked-too', ['rangeModels' => $rangeModels]) @endsection diff --git a/resources/views/fo/pages/ranges/show.blade.php b/resources/views/fo/pages/ranges/show.blade.php index e8e4e63..9a5e9db 100644 --- a/resources/views/fo/pages/ranges/show.blade.php +++ b/resources/views/fo/pages/ranges/show.blade.php @@ -69,7 +69,9 @@ {{-- RANGES --}} - @include('fo.partials.ranges') + {{-- @include('fo.partials.ranges') --}} + {{-- LIKED TOO --}} + @include('fo.partials.liked-too', ['rangeModels' => $rangeModels]) {{-- ENGAGEMENTS --}}
diff --git a/resources/views/fo/partials/liked-too.blade.php b/resources/views/fo/partials/liked-too.blade.php new file mode 100644 index 0000000..677a27e --- /dev/null +++ b/resources/views/fo/partials/liked-too.blade.php @@ -0,0 +1,34 @@ +
+
+
+
+

{{ __('Vous aimerez aussi...') }}

+ {{ __('Trait souligné') }} +
+
+
+ @foreach ($rangeModels as $key => $rangeModel) + + @endforeach +
+
+
+ {{ __('Phare qui éclaire n\'éclaire pas') }} +
+