From df8c1509b95b767eba88d8a9f676347d3926d268 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Mon, 29 Apr 2024 12:44:48 +0200 Subject: [PATCH 01/11] RGPD compliance (april 2024) --- app/Http/Requests/Fo/Contact/ContactRequest.php | 2 -- package-lock.json | 2 +- package.json | 2 +- resources/views/fo/pages/contact.blade.php | 16 ++++++++-------- resources/views/fo/partials/footer.blade.php | 8 ++++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/Http/Requests/Fo/Contact/ContactRequest.php b/app/Http/Requests/Fo/Contact/ContactRequest.php index dd323ea..5661ef9 100644 --- a/app/Http/Requests/Fo/Contact/ContactRequest.php +++ b/app/Http/Requests/Fo/Contact/ContactRequest.php @@ -40,7 +40,6 @@ class ContactRequest extends FormRequest 'city' => 'nullable|string|max:255', 'message' => 'required|string|min:20|max:255', 'callTime' => ['required', new Enum(ContactTimeEnum::class)], - 'rgpd' => 'accepted' ]; } @@ -81,7 +80,6 @@ class ContactRequest extends FormRequest 'city' => trans('ville'), 'message' => trans('message'), 'callTime' => trans('préférence de rappel'), - 'rgpd' => trans('condition d\'utilisation'), ]; } diff --git a/package-lock.json b/package-lock.json index 97b7b25..9a6905d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.0.0", + "@ldc-web/cookie-notice": "^4.1.1", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", diff --git a/package.json b/package.json index ae3162a..6988735 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.0.0", + "@ldc-web/cookie-notice": "^4.1.1", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 1da9ad9..8dbea07 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -106,18 +106,18 @@
- - +

+ {{ __('Les informations recueillies à partir de ce formulaire sont traitées par le Responsable de Traitement pour donner suite à votre demande de contact. Pour connaître vos droits, vous pouvez consulter la') }} + + {{ __('Charte de confidentialité') }} + +

- @include('fo.modules.input-error', ['inputName' => 'rgpd'])
- + {{ __('cookie-notice.custom.recaptcha.warning') }} diff --git a/resources/views/fo/partials/footer.blade.php b/resources/views/fo/partials/footer.blade.php index bab47cb..a19c61b 100644 --- a/resources/views/fo/partials/footer.blade.php +++ b/resources/views/fo/partials/footer.blade.php @@ -68,10 +68,10 @@
- © Copyright Le Gaulois Professionnel - - Mentions légales - - Politique des données personnelles - - Cookies + © {{ __('Copyright Le Gaulois Professionnel') }} - + {{ __('Mentions légales et CGU') }} - + {{ __('Politique des données personnelles') }} - + {{ __('Gestion des Cookies') }}
From 5f58c2576eb9729fbeb662cabd8910ccecadae14 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Thu, 6 Jun 2024 15:53:46 +0200 Subject: [PATCH 02/11] update cookie notice 5.0.7 --- package-lock.json | 8 ++-- package.json | 2 +- resources/lang/en/cookie-notice.php | 16 +++---- resources/lang/fr/cookie-notice.php | 14 +++--- resources/sass/fo/vendor/_ldcweb-cookies.scss | 23 ---------- .../views/fo/vendor/cn-cookies.blade.php | 5 +-- .../standard.blade.php | 45 +++++++------------ 7 files changed, 35 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a6905d..269fa88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.1.1", + "@ldc-web/cookie-notice": "^5.0.7", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", @@ -1076,9 +1076,9 @@ } }, "node_modules/@ldc-web/cookie-notice": { - "version": "4.1.1", - "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.1.1.tgz", - "integrity": "sha1-LGhW/fsWJ0RforZqjUPvudhLWgk=", + "version": "5.0.7", + "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-5.0.7.tgz", + "integrity": "sha1-oKA7WKy2idz0btEKn3vSWpoj8aw=", "dev": true }, "node_modules/@nodelib/fs.scandir": { diff --git a/package.json b/package.json index 6988735..f9ea623 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.1.1", + "@ldc-web/cookie-notice": "^5.0.7", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php index d57c65b..c67ffcd 100644 --- a/resources/lang/en/cookie-notice.php +++ b/resources/lang/en/cookie-notice.php @@ -1,28 +1,24 @@ 'Customize cookies', 'button_close_cookies' => 'Close cookie window', - 'button_forbid' => 'Prohibit', - 'button_allow' => 'Allow', - 'button_forbid_all' => 'Reject all', + 'button_toggle_cookie' => 'Accept or refuse', + 'button_forbid_all' => 'Refuse all', 'button_allow_all' => 'Accept all', 'button_forbid_all_title' => 'Refuse all cookies and close the cookies panel', 'button_allow_all_title' => 'Accept all cookies and close the cookies panel', 'button_customize' => 'Customize', - 'button_back' => 'Back', + 'button_validate_and_close' => 'Confirm and close', 'button_title_open_new_tab' => 'Open link in new tab', 'banner_title' => 'The :site_name website uses cookies!', 'banner_text' => 'We use cookies to ensure the proper functioning of our site and for analytical purposes. You can change your mind at any time by clicking on the icon on any page of our site. By authorizing these third-party services, you agree to the deposit and reading of cookies and the use of tracking technologies necessary for their proper operation.', 'modal_title' => 'Cookie management window', - 'panel_title' => 'Cookie management panel', 'panel_content' => 'Cookie management panel content', - 'panel_subtitle' => 'Your privacy is our priority', - 'panel_details' => 'The functionalities of this site are based on services provided by third parties. If you accept, these third parties will deposit cookies that will enable you to view content on the site hosted by these third parties. Through these cookies, these third parties will collect and use your browsing data for their own purposes, in accordance with their privacy policy (link below). This page allows you to give or withdraw your consent, either globally or service by service.', 'picture_cookie_title' => 'Image of a nice big cookie', 'navigation_title' => 'Cookies panel navigation', 'custom' => [ @@ -42,10 +38,10 @@ return [ 'labelLink' => 'Learn more', ], 'recaptcha' => [ - 'title' => 'reCAPTACHA', + 'title' => 'reCAPTCHA', 'description' => 'The purpose of the cookies placed on forms via the recaptcha is to prevent them from being submitted by robots.', 'labelLink' => 'Learn more', - 'warning' => 'You must accept cookies to send the form', + 'warning' => 'You must accept reCAPTCHA cookies to send the form', ] ] ]; diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index 8d9a655..a4394da 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -1,28 +1,24 @@ 'Personnaliser les cookies', 'button_close_cookies' => 'Fermer la fenêtre des cookies', - 'button_forbid' => 'Interdire', - 'button_allow' => 'Autoriser', + 'button_toggle_cookie' => 'Autoriser ou refuser', 'button_forbid_all' => 'Tout refuser', 'button_allow_all' => 'Tout accepter', 'button_forbid_all_title' => 'Refuser tous les cookies et fermer le panneau des cookies', 'button_allow_all_title' => 'Accepter tous les cookies et fermer le panneau des cookies', 'button_customize' => 'Personnaliser', - 'button_back' => 'Retour', + 'button_validate_and_close' => 'Valider et fermer', 'button_title_open_new_tab' => 'Ouvrir le lien dans un nouvel onglet', 'banner_title' => 'Le site internet :site_name utilise des cookies !', 'banner_text' => 'Nous utilisons des cookies pour nous assurer du bon fonctionnement de notre site et à des fins analytiques. Vous pouvez changer d’avis à tout moment en cliquant sur l’icône présente sur chaque page de notre site. En autorisant ces services tiers, vous acceptez le dépôt et la lecture de cookies et l’utilisation de technologies de suivi nécessaires à leur bon fonctionnement.', 'modal_title' => 'Fenêtre de gestion de cookies', - 'panel_title' => 'Panneau de gestion des cookies', 'panel_content' => 'Contenu du panneau des cookies', - 'panel_subtitle' => 'Le respect de votre vie privée est notre priorité', - 'panel_details' => 'Les fonctionnalités de ce site s’appuient sur des services proposés par des tiers. Si vous acceptez, ces tiers déposeront des cookies qui vous permettront de visualiser sur le site du contenu hébergé par ces tiers. Via ces cookies, ces tiers collecteront et utiliseront vos données de navigation pour des finalités qui leur sont propres, conformément à leur politique de confidentialité (lien ci-dessous). Cette page vous permet de donner ou de retirer votre consentement, soit globalement soit service par service.', 'picture_cookie_title' => 'Image d’un bon gros cookie', 'navigation_title' => 'Navigation du panneau des cookies', 'custom' => [ @@ -42,10 +38,10 @@ return [ 'labelLink' => 'En apprendre plus', ], 'recaptcha' => [ - 'title' => 'reCAPTACHA', + 'title' => 'reCAPTCHA', 'description' => 'Les cookies qui sont déposés via le recaptcha sur les formulaires ont pour finalité d’empêcher que ceux-ci ne soient soumis par des robots.', 'labelLink' => 'En apprendre plus', - 'warning' => 'Vous devez accepter les cookies pour envoyer le formulaire', + 'warning' => 'Vous devez accepter les cookies reCAPTCHA pour envoyer le formulaire', ] ] ]; diff --git a/resources/sass/fo/vendor/_ldcweb-cookies.scss b/resources/sass/fo/vendor/_ldcweb-cookies.scss index 779c0c9..331b737 100644 --- a/resources/sass/fo/vendor/_ldcweb-cookies.scss +++ b/resources/sass/fo/vendor/_ldcweb-cookies.scss @@ -12,29 +12,6 @@ $cn-cookie-modal-width: 36rem; @import "@ldc-web/cookie-notice"; -#cn-wrapper { - width: 0; - height: 0; - font-size: $ck-text-size !important; - - #cn-cookie-btn { - width: 3.75rem !important; - height: 3.75rem !important; - } - - .cn-content { - padding: 1rem; - } - - .cn-banner-title { - padding-top: 1rem; - - @media (min-width: $breakpoint-mobile) { - padding-top: 0; - } - } -} - // * Fix because there is a html/body font-size update (16px -> 12px) at 768px in the project !! @media (min-width: 768px) { #cn-wrapper { diff --git a/resources/views/fo/vendor/cn-cookies.blade.php b/resources/views/fo/vendor/cn-cookies.blade.php index 246a0ef..8b36c80 100644 --- a/resources/views/fo/vendor/cn-cookies.blade.php +++ b/resources/views/fo/vendor/cn-cookies.blade.php @@ -11,14 +11,13 @@ $strings = (object)[ 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), 'button_close_cookies' => __('cookie-notice.button_close_cookies'), 'button_title_open_new_tab' => __('cookie-notice.button_title_open_new_tab'), - 'button_forbid' => __('cookie-notice.button_forbid'), - 'button_allow' => __('cookie-notice.button_allow'), + 'button_toggle_cookie' => __('cookie-notice.button_toggle_cookie'), 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), 'button_customize' => Str::upper(__('cookie-notice.button_customize')), 'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), - 'button_back' => Str::upper(__('cookie-notice.button_back')), + 'button_validate_and_close' => Str::upper(__('cookie-notice.button_validate_and_close')), 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), 'banner_text' => __('cookie-notice.banner_text'), 'panel_title' => __('cookie-notice.panel_title'), diff --git a/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php b/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php index 705745e..8684768 100644 --- a/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php +++ b/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php @@ -3,17 +3,15 @@ {{-- COOKIE SVG --}} {{ $strings->picture_cookie_title }} - - - - - - - - - + + + + + + + + + {{-- BANNER --}} @@ -39,9 +37,6 @@
{{-- 2ND PAGE CUSTOMIZE PANEL --}}
-

{{ $strings->panel_title }}

-

{!! nl2br(e($strings->panel_subtitle)) !!}

-

{!! nl2br(e($strings->panel_details)) !!}

{{-- COOKIES LIST --}}
    @@ -50,12 +45,9 @@
    {{-- NAV BAR --}} {{-- COOKIE LIST LI TEMPLATE --}} @@ -67,14 +59,11 @@ #link
    -
    - - -
    -
    - - -
    +
    From a1d30e0ff3bd896eee938f177e00cc1db3fb3a08 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 7 Jun 2024 09:20:42 +0200 Subject: [PATCH 03/11] add recaptacha popup in contact form --- resources/views/fo/pages/contact.blade.php | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 8dbea07..254e023 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -13,8 +13,19 @@ @section('content')
    -
    -
    +
    +
    +
    + + + {{ __('cookie-notice.custom.recaptcha.warning') }} + + + +
    +
    + @csrf
    @@ -116,11 +127,6 @@
    - - - {{ __('cookie-notice.custom.recaptcha.warning') }} - -
    @if ($errors->has('g-recaptcha-response'))
    @@ -161,6 +167,11 @@ document.getElementById('recaptcha-warning').remove(); document.getElementById('contact-form').inert = false; }; + document.getElementById("recaptcha-accept").addEventListener('click', function(e) { + console.log('ta race'); + e.preventDefault(); + window.WebCookieNotice.acceptCookie('recaptcha'); + }); }); @endpush From 9f4b0d79845e1cdee9df5de43548d6f24e5a1448 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 7 Jun 2024 09:41:05 +0200 Subject: [PATCH 04/11] delet a forgeten console.log --- resources/views/fo/pages/contact.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 254e023..41165ff 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -168,7 +168,6 @@ document.getElementById('contact-form').inert = false; }; document.getElementById("recaptcha-accept").addEventListener('click', function(e) { - console.log('ta race'); e.preventDefault(); window.WebCookieNotice.acceptCookie('recaptcha'); }); From 74e39c4d8a5639d13e82983890e105658a3b1d21 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 7 Jun 2024 10:53:46 +0200 Subject: [PATCH 05/11] fix good version in comment and fix phpcs --- app/Console/Commands/UserCreate.php | 1 - app/Http/Controllers/Controller.php | 1 - resources/lang/en/cookie-notice.php | 2 +- resources/lang/fr/cookie-notice.php | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/UserCreate.php b/app/Console/Commands/UserCreate.php index 02f812f..3ebb711 100644 --- a/app/Console/Commands/UserCreate.php +++ b/app/Console/Commands/UserCreate.php @@ -3,7 +3,6 @@ namespace App\Console\Commands; use App\Models\User; -use Carbon\Carbon; use Illuminate\Console\Command; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 5e490e0..a2eccb0 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -257,7 +257,6 @@ class Controller extends BaseController // Par espèce. if (\strlen($search)) { /** @var \App\Enums\Products\ProductSpeciesEnum|null $specie */ - // dd(\collect(ProductSpeciesEnum::cases())); $specie = \collect(ProductSpeciesEnum::cases()) ->filter(function (ProductSpeciesEnum $specie) use ($search) { return \strpos(Str::lower($specie->label()), Str::lower($search)) !== false; diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php index c67ffcd..995861a 100644 --- a/resources/lang/en/cookie-notice.php +++ b/resources/lang/en/cookie-notice.php @@ -1,6 +1,6 @@ 'Customize cookies', diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index a4394da..436e023 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -1,6 +1,6 @@ 'Personnaliser les cookies', From bc97ca6eefc82d6aa7ab86adc12ecbf882d42c11 Mon Sep 17 00:00:00 2001 From: "nicolas.demangeat" Date: Fri, 7 Jun 2024 08:57:59 +0000 Subject: [PATCH 06/11] update cookie notice 5.0.7 --- app/Console/Commands/UserCreate.php | 1 - app/Http/Controllers/Controller.php | 1 - package-lock.json | 8 ++-- package.json | 2 +- resources/lang/en/cookie-notice.php | 16 +++---- resources/lang/fr/cookie-notice.php | 14 +++--- resources/sass/fo/vendor/_ldcweb-cookies.scss | 23 ---------- resources/views/fo/pages/contact.blade.php | 24 +++++++--- .../views/fo/vendor/cn-cookies.blade.php | 5 +-- .../standard.blade.php | 45 +++++++------------ 10 files changed, 52 insertions(+), 87 deletions(-) diff --git a/app/Console/Commands/UserCreate.php b/app/Console/Commands/UserCreate.php index 02f812f..3ebb711 100644 --- a/app/Console/Commands/UserCreate.php +++ b/app/Console/Commands/UserCreate.php @@ -3,7 +3,6 @@ namespace App\Console\Commands; use App\Models\User; -use Carbon\Carbon; use Illuminate\Console\Command; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 5e490e0..a2eccb0 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -257,7 +257,6 @@ class Controller extends BaseController // Par espèce. if (\strlen($search)) { /** @var \App\Enums\Products\ProductSpeciesEnum|null $specie */ - // dd(\collect(ProductSpeciesEnum::cases())); $specie = \collect(ProductSpeciesEnum::cases()) ->filter(function (ProductSpeciesEnum $specie) use ($search) { return \strpos(Str::lower($specie->label()), Str::lower($search)) !== false; diff --git a/package-lock.json b/package-lock.json index 9a6905d..269fa88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.1.1", + "@ldc-web/cookie-notice": "^5.0.7", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", @@ -1076,9 +1076,9 @@ } }, "node_modules/@ldc-web/cookie-notice": { - "version": "4.1.1", - "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.1.1.tgz", - "integrity": "sha1-LGhW/fsWJ0RforZqjUPvudhLWgk=", + "version": "5.0.7", + "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-5.0.7.tgz", + "integrity": "sha1-oKA7WKy2idz0btEKn3vSWpoj8aw=", "dev": true }, "node_modules/@nodelib/fs.scandir": { diff --git a/package.json b/package.json index 6988735..f9ea623 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.5", - "@ldc-web/cookie-notice": "^4.1.1", + "@ldc-web/cookie-notice": "^5.0.7", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php index d57c65b..995861a 100644 --- a/resources/lang/en/cookie-notice.php +++ b/resources/lang/en/cookie-notice.php @@ -1,28 +1,24 @@ 'Customize cookies', 'button_close_cookies' => 'Close cookie window', - 'button_forbid' => 'Prohibit', - 'button_allow' => 'Allow', - 'button_forbid_all' => 'Reject all', + 'button_toggle_cookie' => 'Accept or refuse', + 'button_forbid_all' => 'Refuse all', 'button_allow_all' => 'Accept all', 'button_forbid_all_title' => 'Refuse all cookies and close the cookies panel', 'button_allow_all_title' => 'Accept all cookies and close the cookies panel', 'button_customize' => 'Customize', - 'button_back' => 'Back', + 'button_validate_and_close' => 'Confirm and close', 'button_title_open_new_tab' => 'Open link in new tab', 'banner_title' => 'The :site_name website uses cookies!', 'banner_text' => 'We use cookies to ensure the proper functioning of our site and for analytical purposes. You can change your mind at any time by clicking on the icon on any page of our site. By authorizing these third-party services, you agree to the deposit and reading of cookies and the use of tracking technologies necessary for their proper operation.', 'modal_title' => 'Cookie management window', - 'panel_title' => 'Cookie management panel', 'panel_content' => 'Cookie management panel content', - 'panel_subtitle' => 'Your privacy is our priority', - 'panel_details' => 'The functionalities of this site are based on services provided by third parties. If you accept, these third parties will deposit cookies that will enable you to view content on the site hosted by these third parties. Through these cookies, these third parties will collect and use your browsing data for their own purposes, in accordance with their privacy policy (link below). This page allows you to give or withdraw your consent, either globally or service by service.', 'picture_cookie_title' => 'Image of a nice big cookie', 'navigation_title' => 'Cookies panel navigation', 'custom' => [ @@ -42,10 +38,10 @@ return [ 'labelLink' => 'Learn more', ], 'recaptcha' => [ - 'title' => 'reCAPTACHA', + 'title' => 'reCAPTCHA', 'description' => 'The purpose of the cookies placed on forms via the recaptcha is to prevent them from being submitted by robots.', 'labelLink' => 'Learn more', - 'warning' => 'You must accept cookies to send the form', + 'warning' => 'You must accept reCAPTCHA cookies to send the form', ] ] ]; diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index 8d9a655..436e023 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -1,28 +1,24 @@ 'Personnaliser les cookies', 'button_close_cookies' => 'Fermer la fenêtre des cookies', - 'button_forbid' => 'Interdire', - 'button_allow' => 'Autoriser', + 'button_toggle_cookie' => 'Autoriser ou refuser', 'button_forbid_all' => 'Tout refuser', 'button_allow_all' => 'Tout accepter', 'button_forbid_all_title' => 'Refuser tous les cookies et fermer le panneau des cookies', 'button_allow_all_title' => 'Accepter tous les cookies et fermer le panneau des cookies', 'button_customize' => 'Personnaliser', - 'button_back' => 'Retour', + 'button_validate_and_close' => 'Valider et fermer', 'button_title_open_new_tab' => 'Ouvrir le lien dans un nouvel onglet', 'banner_title' => 'Le site internet :site_name utilise des cookies !', 'banner_text' => 'Nous utilisons des cookies pour nous assurer du bon fonctionnement de notre site et à des fins analytiques. Vous pouvez changer d’avis à tout moment en cliquant sur l’icône présente sur chaque page de notre site. En autorisant ces services tiers, vous acceptez le dépôt et la lecture de cookies et l’utilisation de technologies de suivi nécessaires à leur bon fonctionnement.', 'modal_title' => 'Fenêtre de gestion de cookies', - 'panel_title' => 'Panneau de gestion des cookies', 'panel_content' => 'Contenu du panneau des cookies', - 'panel_subtitle' => 'Le respect de votre vie privée est notre priorité', - 'panel_details' => 'Les fonctionnalités de ce site s’appuient sur des services proposés par des tiers. Si vous acceptez, ces tiers déposeront des cookies qui vous permettront de visualiser sur le site du contenu hébergé par ces tiers. Via ces cookies, ces tiers collecteront et utiliseront vos données de navigation pour des finalités qui leur sont propres, conformément à leur politique de confidentialité (lien ci-dessous). Cette page vous permet de donner ou de retirer votre consentement, soit globalement soit service par service.', 'picture_cookie_title' => 'Image d’un bon gros cookie', 'navigation_title' => 'Navigation du panneau des cookies', 'custom' => [ @@ -42,10 +38,10 @@ return [ 'labelLink' => 'En apprendre plus', ], 'recaptcha' => [ - 'title' => 'reCAPTACHA', + 'title' => 'reCAPTCHA', 'description' => 'Les cookies qui sont déposés via le recaptcha sur les formulaires ont pour finalité d’empêcher que ceux-ci ne soient soumis par des robots.', 'labelLink' => 'En apprendre plus', - 'warning' => 'Vous devez accepter les cookies pour envoyer le formulaire', + 'warning' => 'Vous devez accepter les cookies reCAPTCHA pour envoyer le formulaire', ] ] ]; diff --git a/resources/sass/fo/vendor/_ldcweb-cookies.scss b/resources/sass/fo/vendor/_ldcweb-cookies.scss index 779c0c9..331b737 100644 --- a/resources/sass/fo/vendor/_ldcweb-cookies.scss +++ b/resources/sass/fo/vendor/_ldcweb-cookies.scss @@ -12,29 +12,6 @@ $cn-cookie-modal-width: 36rem; @import "@ldc-web/cookie-notice"; -#cn-wrapper { - width: 0; - height: 0; - font-size: $ck-text-size !important; - - #cn-cookie-btn { - width: 3.75rem !important; - height: 3.75rem !important; - } - - .cn-content { - padding: 1rem; - } - - .cn-banner-title { - padding-top: 1rem; - - @media (min-width: $breakpoint-mobile) { - padding-top: 0; - } - } -} - // * Fix because there is a html/body font-size update (16px -> 12px) at 768px in the project !! @media (min-width: 768px) { #cn-wrapper { diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 8dbea07..41165ff 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -13,8 +13,19 @@ @section('content')
    -
    - +
    +
    +
    + + + {{ __('cookie-notice.custom.recaptcha.warning') }} + + + +
    +
    + @csrf
    @@ -116,11 +127,6 @@
    - - - {{ __('cookie-notice.custom.recaptcha.warning') }} - -
    @if ($errors->has('g-recaptcha-response'))
    @@ -161,6 +167,10 @@ document.getElementById('recaptcha-warning').remove(); document.getElementById('contact-form').inert = false; }; + document.getElementById("recaptcha-accept").addEventListener('click', function(e) { + e.preventDefault(); + window.WebCookieNotice.acceptCookie('recaptcha'); + }); }); @endpush diff --git a/resources/views/fo/vendor/cn-cookies.blade.php b/resources/views/fo/vendor/cn-cookies.blade.php index 246a0ef..8b36c80 100644 --- a/resources/views/fo/vendor/cn-cookies.blade.php +++ b/resources/views/fo/vendor/cn-cookies.blade.php @@ -11,14 +11,13 @@ $strings = (object)[ 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), 'button_close_cookies' => __('cookie-notice.button_close_cookies'), 'button_title_open_new_tab' => __('cookie-notice.button_title_open_new_tab'), - 'button_forbid' => __('cookie-notice.button_forbid'), - 'button_allow' => __('cookie-notice.button_allow'), + 'button_toggle_cookie' => __('cookie-notice.button_toggle_cookie'), 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), 'button_customize' => Str::upper(__('cookie-notice.button_customize')), 'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), - 'button_back' => Str::upper(__('cookie-notice.button_back')), + 'button_validate_and_close' => Str::upper(__('cookie-notice.button_validate_and_close')), 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), 'banner_text' => __('cookie-notice.banner_text'), 'panel_title' => __('cookie-notice.panel_title'), diff --git a/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php b/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php index 705745e..8684768 100644 --- a/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php +++ b/resources/views/fo/vendor/cookie-notice-templates/standard.blade.php @@ -3,17 +3,15 @@ {{-- COOKIE SVG --}} {{ $strings->picture_cookie_title }} - - - - - - - - - + + + + + + + + + {{-- BANNER --}} @@ -39,9 +37,6 @@
    {{-- 2ND PAGE CUSTOMIZE PANEL --}}
    -

    {{ $strings->panel_title }}

    -

    {!! nl2br(e($strings->panel_subtitle)) !!}

    -

    {!! nl2br(e($strings->panel_details)) !!}

    {{-- COOKIES LIST --}}
      @@ -50,12 +45,9 @@
      {{-- NAV BAR --}} {{-- COOKIE LIST LI TEMPLATE --}} @@ -67,14 +59,11 @@ #link
      -
      - - -
      -
      - - -
      +
      From 211cfcb9654d31f8d3e2f796d625002177050123 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 7 Jun 2024 11:28:29 +0200 Subject: [PATCH 07/11] fix lazy loading on recipe --- app/Http/Controllers/Fo/RecipesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Fo/RecipesController.php b/app/Http/Controllers/Fo/RecipesController.php index 758cc31..aaefd33 100644 --- a/app/Http/Controllers/Fo/RecipesController.php +++ b/app/Http/Controllers/Fo/RecipesController.php @@ -43,7 +43,7 @@ class RecipesController extends Controller /** @var \App\Enums\Advices\AdviceTimeEnum|null $cooking_time */ /** @var \App\Enums\Advices\AdviceTimeEnum|null $preparation_time */ - $query = Advice::query()->where('type', 1)->where('status', true)->when( + $query = Advice::query()->with('tags')->where('type', 1)->where('status', true)->when( is_numeric($search_range), fn (Builder $q) => $q->whereHas( From e77435bea344dc314894753a177e80e5ebb90b70 Mon Sep 17 00:00:00 2001 From: "nicolas.demangeat" Date: Fri, 7 Jun 2024 09:31:01 +0000 Subject: [PATCH 08/11] fix-recipescontroller --- app/Http/Controllers/Fo/RecipesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Fo/RecipesController.php b/app/Http/Controllers/Fo/RecipesController.php index 758cc31..aaefd33 100644 --- a/app/Http/Controllers/Fo/RecipesController.php +++ b/app/Http/Controllers/Fo/RecipesController.php @@ -43,7 +43,7 @@ class RecipesController extends Controller /** @var \App\Enums\Advices\AdviceTimeEnum|null $cooking_time */ /** @var \App\Enums\Advices\AdviceTimeEnum|null $preparation_time */ - $query = Advice::query()->where('type', 1)->where('status', true)->when( + $query = Advice::query()->with('tags')->where('type', 1)->where('status', true)->when( is_numeric($search_range), fn (Builder $q) => $q->whereHas( From aa6c9b50864fba5f46ded75a8ec7020c4ae154b7 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 7 Jun 2024 16:07:12 +0200 Subject: [PATCH 09/11] fix cookie warning in form + phpcs + phpstan --- app/Models/ExpertiseProduct.php | 2 +- app/Models/Product.php | 2 +- app/Models/Range.php | 2 +- app/Models/Slide.php | 2 +- app/Models/Subrange.php | 2 +- app/Models/Tag.php | 2 +- resources/sass/fo/vendor/_ldcweb-cookies.scss | 3 ++ resources/views/fo/pages/contact.blade.php | 26 +++++------ .../views/fo/vendor/cn-cookies.blade.php | 43 +++++++++++++++++++ .../standard.blade.php | 3 ++ 10 files changed, 68 insertions(+), 19 deletions(-) diff --git a/app/Models/ExpertiseProduct.php b/app/Models/ExpertiseProduct.php index 74cdc52..7497447 100644 --- a/app/Models/ExpertiseProduct.php +++ b/app/Models/ExpertiseProduct.php @@ -30,7 +30,7 @@ class ExpertiseProduct extends Model /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'page', diff --git a/app/Models/Product.php b/app/Models/Product.php index a8ae9ac..930eebf 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -54,7 +54,7 @@ class Product extends Model implements SeoInterface /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'label', diff --git a/app/Models/Range.php b/app/Models/Range.php index 765f840..bb41d4c 100644 --- a/app/Models/Range.php +++ b/app/Models/Range.php @@ -40,7 +40,7 @@ class Range extends Model implements SeoInterface /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'label', diff --git a/app/Models/Slide.php b/app/Models/Slide.php index d71a9d1..42c7930 100644 --- a/app/Models/Slide.php +++ b/app/Models/Slide.php @@ -33,7 +33,7 @@ class Slide extends Model /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'title', diff --git a/app/Models/Subrange.php b/app/Models/Subrange.php index e8e76dc..8b734c5 100644 --- a/app/Models/Subrange.php +++ b/app/Models/Subrange.php @@ -26,7 +26,7 @@ class Subrange extends Model /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'label', diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 75590bc..9a494fd 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -24,7 +24,7 @@ class Tag extends Model /** * The attributes that are mass assignable. * - * @var array + * @var array */ protected $fillable = [ 'label' diff --git a/resources/sass/fo/vendor/_ldcweb-cookies.scss b/resources/sass/fo/vendor/_ldcweb-cookies.scss index 331b737..6eca103 100644 --- a/resources/sass/fo/vendor/_ldcweb-cookies.scss +++ b/resources/sass/fo/vendor/_ldcweb-cookies.scss @@ -12,6 +12,9 @@ $cn-cookie-modal-width: 36rem; @import "@ldc-web/cookie-notice"; +.cn-banner-para-p { + color: #eee; +} // * Fix because there is a html/body font-size update (16px -> 12px) at 768px in the project !! @media (min-width: 768px) { #cn-wrapper { diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 41165ff..9ce98f1 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -13,18 +13,19 @@ @section('content')
      -
      -
      -
      - - - {{ __('cookie-notice.custom.recaptcha.warning') }} - - - -
      -
      +
      + + + {{ __('cookie-notice.custom.recaptcha.warning') }} + +
      + + {{ __('Acceptez ce cookie pour utiliser les formulaires') }} + +       + +
      +
      @csrf
      @@ -164,7 +165,6 @@ grecaptcha.render('r_captcha', { 'sitekey': '{{ config('services.google.recaptcha.public') }}' }); - document.getElementById('recaptcha-warning').remove(); document.getElementById('contact-form').inert = false; }; document.getElementById("recaptcha-accept").addEventListener('click', function(e) { diff --git a/resources/views/fo/vendor/cn-cookies.blade.php b/resources/views/fo/vendor/cn-cookies.blade.php index 8b36c80..31f60df 100644 --- a/resources/views/fo/vendor/cn-cookies.blade.php +++ b/resources/views/fo/vendor/cn-cookies.blade.php @@ -28,6 +28,32 @@ $strings = (object)[ 'navigation_title' => __('cookie-notice.navigation_title'), ]; +$cookieInline = function ($cookieName, $text, $subtext = '') { + return <<