diff --git a/app/Enums/StaticPageType.php b/app/Enums/StaticPageType.php index 3b96818..79273ed 100644 --- a/app/Enums/StaticPageType.php +++ b/app/Enums/StaticPageType.php @@ -26,7 +26,7 @@ enum StaticPageType: int */ private const LABELS = [ self::contact->name => 'Contact', - self::legals->name => 'Mentions légales', + self::legals->name => 'Mentions légales et CGU', self::confidentiality->name => 'Confidentialité', self::home->name => 'Accueil', self::conviction->name => 'Nos Convictions', diff --git a/database/seeders/StaticPageSeeder.php b/database/seeders/StaticPageSeeder.php index 3055edf..68da8e5 100644 --- a/database/seeders/StaticPageSeeder.php +++ b/database/seeders/StaticPageSeeder.php @@ -36,10 +36,10 @@ class StaticPageSeeder extends Seeder 'type' => StaticPageType::legals, ], [ - 'seo_title' => 'Seo title pour la page mentions légales', - 'seo_description' => 'Seo description pour la page mentions légales', - 'title' => 'Mentions légales', - 'slug' => Str::slug('Mentions légales'), + 'seo_title' => 'Seo title pour la page mentions légales et CGU', + 'seo_description' => 'Seo description pour la page mentions légales et CGU', + 'title' => 'Mentions légales et CGU', + 'slug' => Str::slug('Mentions légales et CGU'), 'type' => StaticPageType::legals, 'content' => \clean(\fake()->randomHtml(6, 7)), ] diff --git a/package-lock.json b/package-lock.json index a2aebce..30b39c1 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.0.0", + "@ldc-web/cookie-notice": "^4.1.0", "@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.0.1", - "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.0.1.tgz", - "integrity": "sha1-NvTFoKF7Ki/+3PDr9hmqjjTFuZE=", + "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=", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -3830,9 +3830,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { @@ -4911,24 +4911,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", - "dev": true - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==", - "dev": true - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -6997,9 +6985,9 @@ "dev": true }, "node_modules/sweetalert2": { - "version": "11.10.4", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.4.tgz", - "integrity": "sha512-MOVRuEW/yQsyzgkaiHqAJcYKxW3vhtE5o3Skp6vZdyJejCOWo4FOicbjRfvqHAXTyTMuwDHA+0lYbO6BiHl1Gw==", + "version": "11.10.6", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.6.tgz", + "integrity": "sha512-CINZPLZXZRSZqSOE7H7j1F7X8e8O1kLOiXPmtJn1DYxvXsKBr3d16d90+IcwTTs7dJww20h8r8QIxIwsLGX+6A==", "dev": true, "funding": { "type": "individual", @@ -7630,9 +7618,9 @@ } }, "node_modules/vite-plugin-checker": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.2.tgz", - "integrity": "sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz", + "integrity": "sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", @@ -7642,8 +7630,6 @@ "commander": "^8.0.0", "fast-glob": "^3.2.7", "fs-extra": "^11.1.0", - "lodash.debounce": "^4.0.8", - "lodash.pick": "^4.4.0", "npm-run-path": "^4.0.1", "semver": "^7.5.0", "strip-ansi": "^6.0.0", diff --git a/package.json b/package.json index e81e79a..50b1fa2 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.0.1", + "@ldc-web/cookie-notice": "^4.1.0", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.2.7", "@types/node": "^20.8.2", @@ -69,4 +69,4 @@ "vue-loader": "^17.3.1", "vue-tsc": "1.8.11" } -} \ No newline at end of file +} diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php index 80bcf65..4199677 100644 --- a/resources/lang/en/cookie-notice.php +++ b/resources/lang/en/cookie-notice.php @@ -51,7 +51,7 @@ return [ 'title' => 'reCAPTACHA', '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 reCAPTACHA cookies to send the form', ] ] ]; diff --git a/resources/lang/fr/contact.php b/resources/lang/fr/contact.php index e1ae656..46df2b5 100644 --- a/resources/lang/fr/contact.php +++ b/resources/lang/fr/contact.php @@ -7,6 +7,6 @@ return [ 'acceptcgu' => "J’autorise AGIS à traiter mes données personnelles " . "conformément à la :startACharte de confidentialité:endA.", 'senddata' => "J'ai lu et j'accepte la politique de confidentialité " . - "de ce site: :startA Voir nos mentions légales:endA.", + "de ce site: :startA Voir nos mentions légales et CGU:endA.", 'send' => 'Envoyer' ]; diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index 05161ec..8b41b6c 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -51,7 +51,7 @@ return [ 'title' => 'reCAPTACHA', '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 reCAPTACHA pour envoyer le formulaire', ] ] ]; diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index d9542c1..76c9412 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -109,8 +109,8 @@