diff --git a/app/Http/Controllers/Fo/ProductsController.php b/app/Http/Controllers/Fo/ProductsController.php index f043744..430d3ef 100644 --- a/app/Http/Controllers/Fo/ProductsController.php +++ b/app/Http/Controllers/Fo/ProductsController.php @@ -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; diff --git a/app/Http/Requests/Bo/Products/StoreProductRequest.php b/app/Http/Requests/Bo/Products/StoreProductRequest.php index 0012096..1727f14 100644 --- a/app/Http/Requests/Bo/Products/StoreProductRequest.php +++ b/app/Http/Requests/Bo/Products/StoreProductRequest.php @@ -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', diff --git a/resources/assets/images/Frise-images-issue-22.jpg b/resources/assets/images/Frise-images-issue-22.jpg new file mode 100644 index 0000000..bd295d7 Binary files /dev/null and b/resources/assets/images/Frise-images-issue-22.jpg differ diff --git a/resources/assets/images/Frise-images.jpg b/resources/assets/images/Frise-images.jpg deleted file mode 100644 index c68eea8..0000000 Binary files a/resources/assets/images/Frise-images.jpg and /dev/null differ diff --git a/resources/assets/images/PACK-issue-22.jpg b/resources/assets/images/PACK-issue-22.jpg new file mode 100644 index 0000000..c3e93c3 Binary files /dev/null and b/resources/assets/images/PACK-issue-22.jpg differ diff --git a/resources/assets/images/PACK.jpg b/resources/assets/images/PACK.jpg deleted file mode 100644 index ef03490..0000000 Binary files a/resources/assets/images/PACK.jpg and /dev/null differ diff --git a/resources/assets/images/Pack-cuillere-issue-22.jpg b/resources/assets/images/Pack-cuillere-issue-22.jpg new file mode 100644 index 0000000..2325b90 Binary files /dev/null and b/resources/assets/images/Pack-cuillere-issue-22.jpg differ diff --git a/resources/assets/images/Pack-cuillere.jpg b/resources/assets/images/Pack-cuillere.jpg deleted file mode 100644 index 804c866..0000000 Binary files a/resources/assets/images/Pack-cuillere.jpg and /dev/null differ diff --git a/resources/sass/fo/partials/_certifications.scss b/resources/sass/fo/partials/_certifications.scss index 6796300..04064fd 100644 --- a/resources/sass/fo/partials/_certifications.scss +++ b/resources/sass/fo/partials/_certifications.scss @@ -5,7 +5,9 @@ } .certification-item img { - width: 75px; - max-width: 75px; + width: 5rem; + max-width: 6rem; + max-height: 6rem; + object-fit: contain; } } diff --git a/resources/sass/fo/utilities/_helpers.scss b/resources/sass/fo/utilities/_helpers.scss index 900997f..d3bc9ad 100644 --- a/resources/sass/fo/utilities/_helpers.scss +++ b/resources/sass/fo/utilities/_helpers.scss @@ -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: ""; diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index 8a5e375..6c990f7 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -73,6 +73,9 @@
  • Logo de la certification Saveurs en Or
  • +
  • + Logo 100% local +
  • diff --git a/resources/views/fo/layouts/header.blade.php b/resources/views/fo/layouts/header.blade.php index 0183a4b..a22fb1b 100644 --- a/resources/views/fo/layouts/header.blade.php +++ b/resources/views/fo/layouts/header.blade.php @@ -40,7 +40,7 @@ Route::current()->getName() == 'ranges.products' || Route::current()->getName() == 'products.show') active @endif">