diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index a2e1a006..a2bbecb7 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -47,6 +47,7 @@ class SecureHeaders '\'self\'', 'https://www.youtube.com', 'https://vimeo.com/', + 'https://player.vimeo.com/', 'https://www.google.com/recaptcha/', 'https://recaptcha.google.com/recaptcha/' ]) . ';', @@ -72,7 +73,7 @@ class SecureHeaders ); $response->headers->set('Feature-Policy', \implode(',', [ 'fullscreen', 'accelerometer', 'encrypted-media', - 'gyroscope', 'picture-in-picture', '\'self\'' + 'gyroscope', 'picture-in-picture' ]) . ';'); return $response; } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index a13e106d..f1ece3f5 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -207,7 +207,10 @@ class RouteServiceProvider extends ServiceProvider { Route::middleware('web') ->namespace($this->namespace) - ->group(base_path('routes/web.php')); + ->group(base_path('routes/web-bo.php')); + Route::middleware('web') + ->namespace($this->namespace) + ->group(base_path('routes/web-fo.php')); } /** diff --git a/composer.json b/composer.json index 520edd5f..25fdfdcf 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "guzzlehttp/guzzle": "^7.4", "kwaadpepper/enum": "^2.1", "kwaadpepper/image-resizer": "^0.1.0", - "kwaadpepper/refresh-sitemap": "^1.0", - "kwaadpepper/serial-int-caster": "^1.0", + "kwaadpepper/refresh-sitemap": "1.0.0", + "kwaadpepper/serial-int-caster": "1.0.1", "laravel/framework": "^8.0", "laravel/tinker": "^2.0", "laravel/ui": "^3.0", diff --git a/composer.lock b/composer.lock index 34046f36..de9a3a8e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d4726f38d43585d27af789c4a2b8f7b6", + "content-hash": "6eeaf24f9fa2752d9918c3dcef949575", "packages": [ { "name": "asm89/stack-cors", @@ -2387,16 +2387,16 @@ }, { "name": "kwaadpepper/refresh-sitemap", - "version": "1.1.0", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/Kwaadpepper/refresh-sitemap.git", - "reference": "4fdae6d0e9423f5af9216c74814929744807b6bb" + "reference": "003b116bff9f9531d8ca69cd1fc529878b8b54a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kwaadpepper/refresh-sitemap/zipball/4fdae6d0e9423f5af9216c74814929744807b6bb", - "reference": "4fdae6d0e9423f5af9216c74814929744807b6bb", + "url": "https://api.github.com/repos/Kwaadpepper/refresh-sitemap/zipball/003b116bff9f9531d8ca69cd1fc529878b8b54a6", + "reference": "003b116bff9f9531d8ca69cd1fc529878b8b54a6", "shasum": "" }, "require": { @@ -2440,31 +2440,29 @@ ], "support": { "issues": "https://github.com/Kwaadpepper/refresh-sitemap/issues", - "source": "https://github.com/Kwaadpepper/refresh-sitemap/tree/1.1.0" + "source": "https://github.com/Kwaadpepper/refresh-sitemap/tree/1.0.0" }, - "time": "2023-03-06T08:27:09+00:00" + "time": "2022-06-10T17:46:53+00:00" }, { "name": "kwaadpepper/serial-int-caster", - "version": "1.1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/Kwaadpepper/serial-int-caster.git", - "reference": "26f23d8e98460ebfb3e703053cab75f71b8e3b2f" + "reference": "bbba003ff5379576f05114386b5ebe8b33bc4705" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kwaadpepper/serial-int-caster/zipball/26f23d8e98460ebfb3e703053cab75f71b8e3b2f", - "reference": "26f23d8e98460ebfb3e703053cab75f71b8e3b2f", + "url": "https://api.github.com/repos/Kwaadpepper/serial-int-caster/zipball/bbba003ff5379576f05114386b5ebe8b33bc4705", + "reference": "bbba003ff5379576f05114386b5ebe8b33bc4705", "shasum": "" }, "require": { - "php": ">=7.3.0", - "ruafozy/mersenne-twister": "^1.3" + "php": ">=7.3.0" }, "require-dev": { "phpunit/phpunit": "^9.5", - "slevomat/coding-standard": "^8.6", "squizlabs/php_codesniffer": "^3.6" }, "type": "library", @@ -2486,9 +2484,9 @@ "description": "Convert int To as serial number and reverse", "support": { "issues": "https://github.com/Kwaadpepper/serial-int-caster/issues", - "source": "https://github.com/Kwaadpepper/serial-int-caster/tree/1.1.0" + "source": "https://github.com/Kwaadpepper/serial-int-caster/tree/1.0.1" }, - "time": "2022-12-11T00:45:50+00:00" + "time": "2021-05-16T15:50:37+00:00" }, { "name": "laravel/framework", @@ -5546,49 +5544,6 @@ }, "time": "2017-09-02T08:11:53+00:00" }, - { - "name": "ruafozy/mersenne-twister", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/ruafozy/php-mersenne-twister.git", - "reference": "83ca113aa1e5f924d3b5f03679b1480063cc7d94" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ruafozy/php-mersenne-twister/zipball/83ca113aa1e5f924d3b5f03679b1480063cc7d94", - "reference": "83ca113aa1e5f924d3b5f03679b1480063cc7d94", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.1.4" - }, - "type": "library", - "autoload": { - "files": [ - "src/mersenne_twister.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Pure-PHP Mersenne Twister", - "homepage": "https://github.com/ruafozy/php-mersenne-twister", - "keywords": [ - "PRNG", - "mersenne", - "random" - ], - "support": { - "issues": "https://github.com/ruafozy/php-mersenne-twister/issues", - "source": "https://github.com/ruafozy/php-mersenne-twister/tree/master" - }, - "time": "2015-02-21T10:26:45+00:00" - }, { "name": "sentry/sdk", "version": "3.3.0", diff --git a/resources/assets/images/danslespres/logoDLP.png b/resources/assets/images/danslespres/logoDLP.png index e7e6f784..f992cf74 100644 Binary files a/resources/assets/images/danslespres/logoDLP.png and b/resources/assets/images/danslespres/logoDLP.png differ diff --git a/resources/js/main.js b/resources/js/main.js index cab2ffda..69e7821b 100644 --- a/resources/js/main.js +++ b/resources/js/main.js @@ -41,6 +41,49 @@ pages.keys().map(key => { }); }); +document.addEventListener('DOMContentLoaded', function () { + // * Video frames. + const videoFrameList = document.querySelectorAll(".video-frame"); + for (const videoLink of videoFrameList) { + if (!videoLink.dataset.type) { + throw new Error("Missing dataset type"); + } + if (!videoLink.dataset.frame) { + throw new Error("Missing dataset frame"); + } + // @ts-ignore + window.__CN_VIDEO = window.__CN_VIDEO ?? {}; + + const newIframe = document.createElement("iframe"); + newIframe.frameBorder = "0"; + newIframe.allow = "fullscreen"; + newIframe.width = "1920px"; + newIframe.height = "1080px"; + newIframe.setAttribute("allowfullscreen", "allowfullscreen"); + + // @ts-ignore + const instance = new FsLightbox(); + instance.props.sources = [newIframe]; + + setTimeout(() => { + videoLink.addEventListener("click", (e) => { + e.preventDefault(); + + // * This comes fslightbox lib + // @ts-ignore + instance.open(); + setTimeout(function () { + // @ts-ignore + newIframe.src = window.__CN_VIDEO[videoLink.dataset.type] + ? String(videoLink.href) + : String(videoLink.dataset.frame); + }, 50); + return false; + }); + }, 300); + } +}) + let vueOptions = { el: "#app" }; diff --git a/resources/sass/front/pages/brand/poultry_pages/_engage.scss b/resources/sass/front/pages/brand/poultry_pages/_engage.scss index 8b137891..cdaa7911 100644 --- a/resources/sass/front/pages/brand/poultry_pages/_engage.scss +++ b/resources/sass/front/pages/brand/poultry_pages/_engage.scss @@ -1 +1,32 @@ +.absolute { + position: absolute; +} +.relative { + position: relative; +} + +.vimeo-play-button { + top: 50%; + left: 50%; + font-size: 3rem; + transform: translateX(-50%) translateY(-50%); + color: #fff; +} + +.top-50 { + top: 50% +} + +.left-50 { + left: 50%; +} + +@media screen and (min-width: 1230px) { + .video-frame > img { + height: 14vw; + min-height: 22.13112rem; + width: 24vw; + min-width: 39.12942rem; + } +} diff --git a/resources/sass/front/pages/brand/poultry_pages/blocs/_bloc2.scss b/resources/sass/front/pages/brand/poultry_pages/blocs/_bloc2.scss index 14746577..82ecb651 100644 --- a/resources/sass/front/pages/brand/poultry_pages/blocs/_bloc2.scss +++ b/resources/sass/front/pages/brand/poultry_pages/blocs/_bloc2.scss @@ -8,11 +8,13 @@ top: 8.666rem; left: 0; z-index: 1; + max-width: 100%; & > .video { - height: 14vw; - min-height: 22.13112rem; - width: 24vw; - min-width: 39.12942rem; + max-width: 90vw; + height: auto; + & > img { + max-width: 100%; + } } } & > .content { @@ -99,15 +101,7 @@ top: 0; left: 50%; transform: translateX(-50%); - width: 100%; - max-width: inherit; z-index: 0; - & > .video { - height: 22.13112rem; - width: inherit; - min-height: 22.13112rem; - min-width: inherit; - } } & > .content { position: relative; diff --git a/resources/views/front/club/informations.blade.php b/resources/views/front/club/informations.blade.php index af06920f..bff8ffef 100644 --- a/resources/views/front/club/informations.blade.php +++ b/resources/views/front/club/informations.blade.php @@ -83,8 +83,8 @@
diff --git a/resources/views/front/modules/video-vimeo.blade.php b/resources/views/front/modules/video-vimeo.blade.php index 8034591b..e230a9b2 100644 --- a/resources/views/front/modules/video-vimeo.blade.php +++ b/resources/views/front/modules/video-vimeo.blade.php @@ -1,3 +1,8 @@ -
- -
+ + Alt + + diff --git a/resources/views/front/opinsta/index.blade.php b/resources/views/front/opinsta/index.blade.php index 4ad0b8f3..e3c74492 100644 --- a/resources/views/front/opinsta/index.blade.php +++ b/resources/views/front/opinsta/index.blade.php @@ -37,7 +37,7 @@ - {{-- https://youtube.com/shorts/vQz8xzUfhsg?feature=share --}} @@ -152,4 +152,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/front/products/index.blade.php b/resources/views/front/products/index.blade.php index 3dca9acc..8c3b3679 100644 --- a/resources/views/front/products/index.blade.php +++ b/resources/views/front/products/index.blade.php @@ -159,8 +159,7 @@ $vegetal = ($vegetal || isset($gamme) && $gamme && $gamme->slug === "le-vegetal" @if (isset($gamme)) @if($vegetal)

- Découvrez les produits Le Gaulois Végétal : du végétal sans concession avec des produits SANS VIANDE, 100% GOURMANDS, élaborés EN FRANCE à partir de soja SANS OGM.
- NOUVEAU: Découvrez notre gamme 100% BIO élaborée à partir de FÈVES + Découvrez les produits Le Gaulois Végétal : du végétal sans concession avec des produits SANS VIANDE, 100% GOURMANDS, élaborés EN FRANCE à partir de soja SANS OGM.

Découvrir la démarche Le Gaulois Végétal diff --git a/resources/views/front/webldc-cn.blade.php b/resources/views/front/webldc-cn.blade.php index daaf12fc..f27c7e94 100644 --- a/resources/views/front/webldc-cn.blade.php +++ b/resources/views/front/webldc-cn.blade.php @@ -41,86 +41,46 @@ $cookies = []; // YOUTUBE $cookies['youtube'] = [ - 'name' => 'VIDEOS - Youtube', - 'description' => __('Les cookies déposés via les services de partage de vidéo ont pour finalité de permettre à l’utilisateur de visionner directement sur le site le contenu multimédia.'), + 'name' => __('cookie-notice.custom.youtube.name'), + 'description' => __('cookie-notice.custom.youtube.name'), + 'labelLink' => __('cookie-notice.custom.youtube.labelLink'), 'link' => 'https://policies.google.com/technologies/cookies?hl=fr&utm_source=ucb', - 'labelLink' => __('En savoir +'), 'cookies' => ['NID', 'VISITOR_INFO1_LIVE', 'YSC'] ]; $cookies['youtube']['script'] = << @endpush + diff --git a/resources/views/layouts/app-head.blade.php b/resources/views/layouts/app-head.blade.php index 4cfe4b2b..1719953c 100644 --- a/resources/views/layouts/app-head.blade.php +++ b/resources/views/layouts/app-head.blade.php @@ -51,4 +51,4 @@ -@stack('styles') \ No newline at end of file +@stack('styles') diff --git a/routes/web.php b/routes/web-fo.php similarity index 96% rename from routes/web.php rename to routes/web-fo.php index 47ce5d00..9a221ec6 100644 --- a/routes/web.php +++ b/routes/web-fo.php @@ -49,8 +49,6 @@ use Illuminate\View\Middleware\ShareErrorsFromSession; * pour être exclue du sitemap */ -require_once __DIR__ . '/web-bo.php'; - Route::get('/', [HomeController::class, 'index'])->name('home'); Route::get('/de-smaak-om-te-delen', [OnePageController::class, 'index'])->name('home-nl'); @@ -74,11 +72,11 @@ Route::prefix('/produits') }); Route::prefix('/produit') -->name('product.') -->group(function () { - Route::get('/{publishedProduct:slug}', [ProductsController::class, 'show']) - ->middleware('redirect-slugs')->name('show'); -}); + ->name('product.') + ->group(function () { + Route::get('/{publishedProduct:slug}', [ProductsController::class, 'show']) + ->middleware('redirect-slugs')->name('show'); + }); Route::prefix('/cote-cuisine')->name('kitchen-side.')->group(function () { Route::get('/', [RecipesController::class, 'kitchenside'])->name('index'); @@ -206,14 +204,14 @@ Route::prefix('/on-s-engage') }); Route::prefix(Str::slug(GeneralConfig::where('type', GeneralConfigType::breedingPage()) -->first()->data['breeding_header_title']['value'])) -->name('breeding-page.') -->group(function () { - Route::get('/', [BreedingPageController::class, 'index'])->name('index'); - Route::get('/{breedingPageType}', [BreedingPageController::class, 'list'])->name('list'); - Route::get('/{breedingPageType}/{publishedBreedingPage}', [BreedingPageController::class, 'show']) - ->middleware('redirect-slugs')->name('show'); -}); + ->first()->data['breeding_header_title']['value'])) + ->name('breeding-page.') + ->group(function () { + Route::get('/', [BreedingPageController::class, 'index'])->name('index'); + Route::get('/{breedingPageType}', [BreedingPageController::class, 'list'])->name('list'); + Route::get('/{breedingPageType}/{publishedBreedingPage}', [BreedingPageController::class, 'show']) + ->middleware('redirect-slugs')->name('show'); + }); // * Unsubscribe from newsletter Route::get('/{unsubscribe}', [CustomerController::class, 'unscribeNewsletter'])