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