diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index 0b55b3d..4a3b63f 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -60,6 +60,7 @@ class SecureHeaders 'https://yl.s-web.fr', ]) . ';', "img-src 'self' data: blob: " . implode(' ', [ + 'https://yl.s-web.fr', // * VITE DEV config('app.debug') ? "https://{$host}:4443" : '' ]) . ';', @@ -97,6 +98,7 @@ class SecureHeaders "$scheme://www.google-analytics.com", 'https://www.google.com/recaptcha/', 'https://www.gstatic.com/recaptcha/', + 'https://yl.s-web.fr', // * VITE DEV config('app.debug') ? "https://{$host}:4443" : '', ]) . ';' @@ -107,8 +109,11 @@ class SecureHeaders implode(' ', $cspPolicies) . $reportUri ); $response->headers->set('Feature-Policy', \implode(',', [ - 'fullscreen', 'accelerometer', 'encrypted-media', - 'gyroscope', 'picture-in-picture' + 'fullscreen', + 'accelerometer', + 'encrypted-media', + 'gyroscope', + 'picture-in-picture' ]) . ';'); return $response; } diff --git a/app/Http/Requests/Fo/ContactRequest.php b/app/Http/Requests/Fo/ContactRequest.php index 15b0005..21388c2 100644 --- a/app/Http/Requests/Fo/ContactRequest.php +++ b/app/Http/Requests/Fo/ContactRequest.php @@ -20,10 +20,6 @@ class ContactRequest extends FormRequest */ protected function prepareForValidation() { - $this->merge([ - 'accept_rules' => $this->boolean('accept_rules'), - 'send_data' => $this->boolean('send_data'), - ]); $this->mergePicture('file'); } @@ -50,13 +46,13 @@ class ContactRequest extends FormRequest 'city' => 'required|string|between:3,255', 'object' => ['required', new Enum(ObjectEnum::class)], 'message' => 'required|string|between:3,500', - 'accept_rules' => 'required|boolean', - 'send_data' => 'required|boolean', ]; if ($this->object === strval(ObjectEnum::customerService->value())) { $rules = \array_merge($rules, [ 'product_name' => [ - 'string', 'between:3,255', 'required', + 'string', + 'between:3,255', + 'required', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -69,7 +65,8 @@ class ContactRequest extends FormRequest } ], 'product_date_limit' => [ - 'required', 'date', + 'required', + 'date', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -82,7 +79,9 @@ class ContactRequest extends FormRequest } ], 'product_barcode' => [ - 'numeric', 'min:0', 'required', + 'numeric', + 'min:0', + 'required', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -95,7 +94,9 @@ class ContactRequest extends FormRequest } ], 'product_lot' => [ - 'numeric', 'min:0', 'required', + 'numeric', + 'min:0', + 'required', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -108,7 +109,8 @@ class ContactRequest extends FormRequest } ], 'product_date_consumption' => [ - 'required', 'date', + 'required', + 'date', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -121,7 +123,9 @@ class ContactRequest extends FormRequest } ], 'product_location' => [ - 'string', 'between:3,255', 'required', + 'string', + 'between:3,255', + 'required', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed function ($attribute, $value, $fail) { if ($this->get("object") != ObjectEnum::customerService->value()) { @@ -198,8 +202,6 @@ class ContactRequest extends FormRequest 'product_date_consumption' => trans('validation.custom.product_date_consumption'), 'product_location' => trans('validation.custom.product_location'), 'message' => trans('validation.attributes.message'), - 'accept_rules' => trans('validation.custom.accept_rules'), - 'send_data' => trans('validation.custom.send_data'), 'file' => trans('validation.custom.file'), ]; } diff --git a/app/Mail/SendContactMail.php b/app/Mail/SendContactMail.php index b6982cb..f76eeef 100644 --- a/app/Mail/SendContactMail.php +++ b/app/Mail/SendContactMail.php @@ -95,8 +95,6 @@ class SendContactMail extends Mailable * @property string $product_lot * @property string $product_date_consumption * @property string $product_location - * @property boolean $accept_rules - * @property boolean $send_data * @property \Illuminate\Http\UploadedFile $file * @phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses */ diff --git a/package-lock.json b/package-lock.json index 30b39c1..e773d69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,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.0", + "@ldc-web/cookie-notice": "^6.0.3", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", @@ -1050,9 +1050,9 @@ "dev": true }, "node_modules/@ldc-web/cookie-notice": { - "version": "4.1.0", - "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.1.0.tgz", - "integrity": "sha1-bhDGIDjM6T0uMaovPpEc2hjTa+4=", + "version": "6.0.3", + "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-6.0.3.tgz", + "integrity": "sha1-mW2DD+8ipWkmvKhZ3m9h5wemAHI=", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -1144,17 +1144,6 @@ "@types/json-schema": "*" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -2013,9 +2002,9 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dev": true, "peer": true, "dependencies": { @@ -2038,9 +2027,9 @@ "peer": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", "dev": true, "peer": true }, @@ -2064,16 +2053,16 @@ "peer": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/wasm-gen": "1.12.1" } }, "node_modules/@webassemblyjs/ieee754": { @@ -2104,30 +2093,30 @@ "peer": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", @@ -2135,26 +2124,26 @@ } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -2163,13 +2152,13 @@ } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dev": true, "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -2199,10 +2188,10 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, "peer": true, "peerDependencies": { @@ -2473,12 +2462,12 @@ } }, "node_modules/axios": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", - "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "dev": true, "dependencies": { - "follow-redirects": "^1.15.4", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -2543,12 +2532,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3035,9 +3024,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -3782,9 +3771,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -5031,12 +5020,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -6985,9 +6974,9 @@ "dev": true }, "node_modules/sweetalert2": { - "version": "11.10.6", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.6.tgz", - "integrity": "sha512-CINZPLZXZRSZqSOE7H7j1F7X8e8O1kLOiXPmtJn1DYxvXsKBr3d16d90+IcwTTs7dJww20h8r8QIxIwsLGX+6A==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.14.0.tgz", + "integrity": "sha512-kF1Q/+GtZZXr+rYVcBNwlEsnxP089CpDbck+MYjvLaQj9x4fzHqN9UhlkHOIR0k09LVu2sx8cU9BnvRlxWIZqg==", "dev": true, "funding": { "type": "individual", @@ -7553,9 +7542,9 @@ } }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -8273,9 +8262,9 @@ "dev": true }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -8286,27 +8275,26 @@ } }, "node_modules/webpack": { - "version": "5.90.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.0.tgz", - "integrity": "sha512-bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w==", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, "peer": true, "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", @@ -8314,7 +8302,7 @@ "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.0", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { diff --git a/package.json b/package.json index 50b1fa2..389462b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,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.0", + "@ldc-web/cookie-notice": "^6.0.3", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index f4ea10c..d86c744 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -225,7 +225,6 @@ return [ 'female' => 'of the ', 'vowel' => 'of the ' ], - 'accept_rules' => 'acceptation of rules', 'activated' => 'activated', 'attribute_alt' => 'alt attribute', 'attribute_title' => 'title attribute', @@ -272,7 +271,6 @@ return [ 'product_name' => 'product name', 'publication' => 'publication', 'publish_at' => 'publication date', - 'send_data' => 'autorization to send data', 'seo_description' => 'SEO description', 'seo_title' => 'SEO title', 'seo' => 'SEO', diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index 8b41b6c..29cdf06 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -1,28 +1,22 @@ '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' => [ @@ -36,22 +30,16 @@ return [ 'labelLink' => 'En apprendre plus', 'warning' => 'Vous devez accepter les cookies pour visionner cette vidéo', ], - 'vimeo' => [ - 'name' => 'Vimeo', - 'description' => 'Les cookies placés via les services de partage de vidéos sont destinés à permettre à l’utilisateur de visionner des contenus multimédias directement sur le site.', - 'labelLink' => 'En apprendre plus', - 'warning' => 'Vous devez accepter les cookies pour visionner cette vidéo', - ], 'matomo' => [ 'title' => 'Matomo', 'description' => 'Les services de mesure d’audience permettent de générer des statistiques de fréquentation utiles à l’amélioration du site.', '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 reCAPTACHA pour envoyer le formulaire', + 'warning' => 'Vous devez accepter les cookies reCAPTCHA pour envoyer le formulaire', ] ] ]; diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index cbdf286..27768f9 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -227,7 +227,6 @@ return [ 'female' => 'de la ', 'vowel' => 'de l\'' ], - 'accept_rules' => 'acceptation des règles', 'activated' => 'activé', 'attribute_alt' => 'attribut alt', 'attribute_title' => 'attribut title', @@ -274,7 +273,6 @@ return [ 'product_name' => 'nom du produit', 'publication' => 'publication', 'publish_at' => 'date de publication', - 'send_data' => 'autorisation d\'enregistrer des données', 'seo_description' => 'description SEO', 'seo_title' => 'titre SEO', 'seo' => 'référencement SEO', diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index 2d37b9d..02a60ba 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -20,8 +20,22 @@

{{ __('T. +33 (0)4 90 80 99 99') }}

+
+ + + {{ __('cookie-notice.custom.recaptcha.warning') }} + +

+ + {{ __('Acceptez ce cookie pour utiliser les formulaires') }} + + + +
-
+ @method('POST') @csrf
@@ -33,7 +47,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
- - -
-
-
-
- - -
-
{!! clean( __( '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 :startA Charte de confidentialité:endA. !', [ - 'startA' => '', + 'startA' => '', 'endA' => '', ], ), ) !!}
- - - {{ __('cookie-notice.custom.recaptcha.warning') }} - - -
@if ($errors->has('g-recaptcha-response')) @@ -262,8 +239,8 @@
+ data-sitekey="{{ config('services.google.recaptcha.public') }}" + type="submit">{{ Str::ucfirst(__('contact.send')) }}
@@ -272,7 +249,14 @@ @push('scripts') @endpush diff --git a/resources/views/vendor/cookie-notice-templates/standard.blade.php b/resources/views/vendor/cookie-notice-templates/standard.blade.php index d5dc341..4b93bfa 100644 --- a/resources/views/vendor/cookie-notice-templates/standard.blade.php +++ b/resources/views/vendor/cookie-notice-templates/standard.blade.php @@ -33,19 +33,14 @@ {!! nl2br(e($strings->banner_title)) !!}
-

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

+

{!! clean($strings->banner_text) !!}

{{-- 2ND PAGE CUSTOMIZE PANEL --}}
-

{{ $strings->panel_title }}

-

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

-

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

-
- {{-- COOKIES LIST --}} - -
+ {{-- COOKIES LIST --}} +
{{-- NAV BAR --}} @@ -54,7 +49,7 @@ title="{{ $strings->button_forbid_all_title }}">{{ $strings->button_forbid_all }} - @@ -67,14 +62,11 @@ #link
-
- - -
-
- - -
+