diff --git a/app/Enums/CookingModeEnum.php b/app/Enums/CookingModeEnum.php index f6f5d29..ba02a3f 100644 --- a/app/Enums/CookingModeEnum.php +++ b/app/Enums/CookingModeEnum.php @@ -31,10 +31,10 @@ enum CookingModeEnum: int * @return array */ private const STICKERS = [ - self::withoutCooking->name => 'build/assets/images/cook/logo-stove.svg', - self::oven->name => 'build/assets/images/cook/logo-stove.svg', - self::stove->name => 'build/assets/images/cook/logo-stove.svg', - self::stewpan->name => 'build/assets/images/cook/logo-stove.svg', + self::withoutCooking->name => 'resources/assets/images/cook/logo-stove.svg', + self::oven->name => 'resources/assets/images/cook/logo-stove.svg', + self::stove->name => 'resources/assets/images/cook/logo-stove.svg', + self::stewpan->name => 'resources/assets/images/cook/logo-stove.svg', ]; /** diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index c8ff2ec..402212d 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -80,9 +80,9 @@ class SecureHeaders // phpcs:ignore Generic.Files.LineLength.TooLong "script-src 'self' {$jsDev} " . \implode(' ', [ 'https: blob:', + 'https://unpkg.com', 'https://www.googletagmanager.com', 'https://cdnjs.cloudflare.com', - "$scheme://www.google-analytics.com", ]) . ';' ]; diff --git a/app/Http/Requests/Bo/Certifications/StoreCertificationRequest.php b/app/Http/Requests/Bo/Certifications/StoreCertificationRequest.php index 1c1f912..386b390 100644 --- a/app/Http/Requests/Bo/Certifications/StoreCertificationRequest.php +++ b/app/Http/Requests/Bo/Certifications/StoreCertificationRequest.php @@ -47,7 +47,7 @@ class StoreCertificationRequest extends FormRequest ]; return \array_merge( $rules, - $this->pictureRules('sticker', true, 150, 150, 150, 150), + $this->pictureRules('sticker', 150, 150, 150, 150, true), ); } diff --git a/app/Http/Requests/Bo/Products/StoreProductRequest.php b/app/Http/Requests/Bo/Products/StoreProductRequest.php index b5b1d1f..0012096 100644 --- a/app/Http/Requests/Bo/Products/StoreProductRequest.php +++ b/app/Http/Requests/Bo/Products/StoreProductRequest.php @@ -80,8 +80,8 @@ class StoreProductRequest extends FormRequest ]; return \array_merge( $rules, - $this->pictureRules('picture', true, 650, 610, 650, 610), - $this->pictureRules('sticker', true, 360, 300, 360, 300), + $this->pictureRules('picture', 650, 610, 650, 610, true), + $this->pictureRules('sticker', 360, 300, 360, 300, true), ); } diff --git a/app/Http/Requests/Bo/Ranges/UpdateRangeRequest.php b/app/Http/Requests/Bo/Ranges/UpdateRangeRequest.php index e6011df..909c611 100644 --- a/app/Http/Requests/Bo/Ranges/UpdateRangeRequest.php +++ b/app/Http/Requests/Bo/Ranges/UpdateRangeRequest.php @@ -58,9 +58,9 @@ class UpdateRangeRequest extends FormRequest ]; return \array_merge( $rules, - $this->pictureRules('banner', true, 1600, 312, 1600, 312), - $this->pictureRules('picture', true, 650, 415, 650, 415), - $this->pictureRules('sticker', true, 340, 270, 340, 270), + $this->pictureRules('banner', 1600, 312, 1600, 312, true), + $this->pictureRules('picture', 650, 415, 650, 415, true), + $this->pictureRules('sticker', 340, 270, 340, 270, true), ); } diff --git a/app/Http/Requests/Bo/Recipes/StoreRecipeRequest.php b/app/Http/Requests/Bo/Recipes/StoreRecipeRequest.php index 6841b95..a2fbd86 100644 --- a/app/Http/Requests/Bo/Recipes/StoreRecipeRequest.php +++ b/app/Http/Requests/Bo/Recipes/StoreRecipeRequest.php @@ -122,8 +122,8 @@ class StoreRecipeRequest extends FormRequest return \array_merge( $rules, - $this->pictureRules('picture', true, 650, 488, 650, 488), - $this->pictureRules('sticker', true, 428, 273, 428, 273), + $this->pictureRules('picture', 650, 488, 650, 488, true), + $this->pictureRules('sticker', 428, 273, 428, 273, true), ); } diff --git a/resources/assets/favicon/android-chrome-192x192.png b/resources/assets/favicon/android-chrome-192x192.png new file mode 100644 index 0000000..1b6ef7d Binary files /dev/null and b/resources/assets/favicon/android-chrome-192x192.png differ diff --git a/resources/assets/favicon/android-chrome-512x512.png b/resources/assets/favicon/android-chrome-512x512.png new file mode 100644 index 0000000..3ce4ceb Binary files /dev/null and b/resources/assets/favicon/android-chrome-512x512.png differ diff --git a/resources/assets/favicon/apple-touch-icon-bo.png b/resources/assets/favicon/apple-touch-icon-bo.png new file mode 100644 index 0000000..24bebdc Binary files /dev/null and b/resources/assets/favicon/apple-touch-icon-bo.png differ diff --git a/resources/assets/favicon/apple-touch-icon.png b/resources/assets/favicon/apple-touch-icon.png new file mode 100644 index 0000000..55da1a6 Binary files /dev/null and b/resources/assets/favicon/apple-touch-icon.png differ diff --git a/resources/assets/favicon/browserconfig.xml b/resources/assets/favicon/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/resources/assets/favicon/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/resources/assets/favicon/favicon-16x16-bo.png b/resources/assets/favicon/favicon-16x16-bo.png new file mode 100644 index 0000000..b0f013d Binary files /dev/null and b/resources/assets/favicon/favicon-16x16-bo.png differ diff --git a/resources/assets/favicon/favicon-16x16.png b/resources/assets/favicon/favicon-16x16.png new file mode 100644 index 0000000..5a742c3 Binary files /dev/null and b/resources/assets/favicon/favicon-16x16.png differ diff --git a/resources/assets/favicon/favicon-32x32-bo.png b/resources/assets/favicon/favicon-32x32-bo.png new file mode 100644 index 0000000..57020b8 Binary files /dev/null and b/resources/assets/favicon/favicon-32x32-bo.png differ diff --git a/resources/assets/favicon/favicon-32x32.png b/resources/assets/favicon/favicon-32x32.png new file mode 100644 index 0000000..9ce5d2d Binary files /dev/null and b/resources/assets/favicon/favicon-32x32.png differ diff --git a/resources/assets/favicon/favicon-bo-16x16.png b/resources/assets/favicon/favicon-bo-16x16.png new file mode 100644 index 0000000..db32d9d Binary files /dev/null and b/resources/assets/favicon/favicon-bo-16x16.png differ diff --git a/resources/assets/favicon/favicon-bo-32x32.png b/resources/assets/favicon/favicon-bo-32x32.png new file mode 100644 index 0000000..2d13c00 Binary files /dev/null and b/resources/assets/favicon/favicon-bo-32x32.png differ diff --git a/resources/assets/favicon/favicon-bo.ico b/resources/assets/favicon/favicon-bo.ico new file mode 100644 index 0000000..ec7d5c3 Binary files /dev/null and b/resources/assets/favicon/favicon-bo.ico differ diff --git a/resources/assets/favicon/favicon.ico b/resources/assets/favicon/favicon.ico new file mode 100644 index 0000000..cb9d986 Binary files /dev/null and b/resources/assets/favicon/favicon.ico differ diff --git a/resources/assets/favicon/mstile-150x150.png b/resources/assets/favicon/mstile-150x150.png new file mode 100644 index 0000000..c8c35c2 Binary files /dev/null and b/resources/assets/favicon/mstile-150x150.png differ diff --git a/resources/assets/favicon/safari-pinned-tab.svg b/resources/assets/favicon/safari-pinned-tab.svg new file mode 100644 index 0000000..9de4523 --- /dev/null +++ b/resources/assets/favicon/safari-pinned-tab.svg @@ -0,0 +1,187 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + + + + + + + diff --git a/resources/assets/favicon/site.webmanifest b/resources/assets/favicon/site.webmanifest new file mode 100644 index 0000000..b20abb7 --- /dev/null +++ b/resources/assets/favicon/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/resources/views/bo/layouts/head.blade.php b/resources/views/bo/layouts/head.blade.php index e014808..0fff7d7 100644 --- a/resources/views/bo/layouts/head.blade.php +++ b/resources/views/bo/layouts/head.blade.php @@ -1,7 +1,7 @@ -{{ config('app.name') }} - @yield('title') +@yield('title') - {{ config('app.name') }} @@ -23,11 +23,12 @@ {{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}} - - - - - + + + + + + diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index e810175..8a5e375 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -39,13 +39,13 @@ {{ __('59189 Steenbecque') }}
- {{ __('03 28 43 60 55') }} + {{ __('03 28 43 60 55') }}

{{ __('Suivez-nous sur les réseaux sociaux') }}

diff --git a/resources/views/fo/layouts/head.blade.php b/resources/views/fo/layouts/head.blade.php index 1793e46..fd47125 100644 --- a/resources/views/fo/layouts/head.blade.php +++ b/resources/views/fo/layouts/head.blade.php @@ -7,26 +7,30 @@ - + - +@hasSection('ogPicture') + +@else + +@endif {{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}} - - - - - - + + + + + + -{{ config('app.name') }} - @yield('title') +@yield('title') - {{ config('app.name') }} @if(config('app.debug')) @endif diff --git a/resources/views/fo/layouts/header.blade.php b/resources/views/fo/layouts/header.blade.php index 089894b..6a0d4cb 100644 --- a/resources/views/fo/layouts/header.blade.php +++ b/resources/views/fo/layouts/header.blade.php @@ -2,17 +2,17 @@

{{ __('Besoin d\'une information ?') }} - {{ __('Nous contacter') }} + {{ __('Nous contacter') }} | {{ __('Une remarque, une suggestion ?') }} - {{ __('Service consommateurs') }} + {{ __('Service consommateurs') }} |

@@ -45,7 +45,7 @@

{{ __('Une filière soucieuse de la santé') }}

{{ __('Des hommes, des animaux et de la terre') }}

{{ __('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.') }}

- {{ __('En savoir plus >') }} + {{ __('En savoir plus >') }}
@@ -55,7 +55,7 @@

{{ __('Qui maîtrisent la filière du grain à l\'assiette') }}

{{ __('Grâce à la maitrise totale de notre filière, allant de l\'alimentation aux produits régionaux de qualité, en passant pas nos élevages se situant dans un rayon de 50kms autour de notre entreprise, nous garantissons aux consommateurs finaux, une qualité et une traçabilité irréprochables. Notre crédo : "élever bien pour manger sain en région des Hauts de France.') }}

- {{ __('En savoir plus >') }} + {{ __('En savoir plus >') }} diff --git a/resources/views/fo/pages/map.blade.php b/resources/views/fo/pages/map.blade.php index ac095a3..b3c2ac6 100644 --- a/resources/views/fo/pages/map.blade.php +++ b/resources/views/fo/pages/map.blade.php @@ -60,7 +60,7 @@ 3.92 km - Itinéraire > + Itinéraire >
@@ -96,7 +96,7 @@ @endsection @push('scripts') - @endpush diff --git a/resources/views/fo/pages/products/product.blade.php b/resources/views/fo/pages/products/product.blade.php index e2ee0e4..347cadb 100644 --- a/resources/views/fo/pages/products/product.blade.php +++ b/resources/views/fo/pages/products/product.blade.php @@ -38,7 +38,7 @@
@if (isset($productModel->info_cooking))
- Mode de cuisson + Mode de cuisson

{{ $productModel->info_cooking }}

@endif diff --git a/resources/views/fo/pages/recipes/index.blade.php b/resources/views/fo/pages/recipes/index.blade.php index 6ba4f6e..eea70e2 100644 --- a/resources/views/fo/pages/recipes/index.blade.php +++ b/resources/views/fo/pages/recipes/index.blade.php @@ -36,7 +36,7 @@