From d538d98bd32dfbf7a1f657a248825ca4b8ee559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 29 Sep 2022 13:33:04 +0200 Subject: [PATCH] Added https://www.googletagmanager.com to Secure Middleware Fixed CSP --- app/Http/Middleware/SecureHeaders.php | 2 +- package-lock.json | 19 +++++++++---------- package.json | 4 +--- resources/js/alert.js | 2 +- resources/sass/back.scss | 5 +++++ resources/sass/front/_alert.scss | 4 +++- .../views/back/modules/flashMessage.blade.php | 12 ------------ resources/views/front/egg/notFound.blade.php | 2 +- resources/views/front/frame.blade.php | 14 +++++++++++++- .../front/modules/flashMessage.blade.php | 12 ------------ 10 files changed, 34 insertions(+), 42 deletions(-) diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index 2d2f157..91c5300 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -44,7 +44,7 @@ class SecureHeaders // phpcs:ignore Generic.Files.LineLength.TooLong "style-src 'self' $cssDev https://fonts.googleapis.com;", // phpcs:ignore Generic.Files.LineLength.TooLong - "script-src 'self' $jsDev https://fonts.googleapis.com;" + "script-src 'self' $jsDev https://fonts.googleapis.com https://www.googletagmanager.com;" ]; $response->headers->set( 'Content-Security-Policy', diff --git a/package-lock.json b/package-lock.json index 169011d..61c547f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,10 +4,6 @@ "requires": true, "packages": { "": { - "name": "bogt", - "dependencies": { - "sweetalert2": "^11.4.20" - }, "devDependencies": { "@lighting-beetle/glider-js": "^1.8.2", "@popperjs/core": "^2.11.5", @@ -24,6 +20,7 @@ "resolve-url-loader": "^5.0.0", "sass": "1.32.13", "sass-loader": "^8.0.2", + "sweetalert2": "^11.4.35", "vue": "^2.6.14", "vue-template-compiler": "^2.6.14" } @@ -8454,9 +8451,10 @@ } }, "node_modules/sweetalert2": { - "version": "11.4.20", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz", - "integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew==", + "version": "11.4.35", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.35.tgz", + "integrity": "sha512-nifH7Hd8oSIO8qf6GHhob6xZK2KoX7+EalTFm3nHshdQ38TY/r0m/QiuJCDL0cTGbRhzMWL7WYBSA3fjnh+F1g==", + "dev": true, "funding": { "type": "individual", "url": "https://sweetalert2.github.io/#donations" @@ -15709,9 +15707,10 @@ } }, "sweetalert2": { - "version": "11.4.20", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz", - "integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew==" + "version": "11.4.35", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.35.tgz", + "integrity": "sha512-nifH7Hd8oSIO8qf6GHhob6xZK2KoX7+EalTFm3nHshdQ38TY/r0m/QiuJCDL0cTGbRhzMWL7WYBSA3fjnh+F1g==", + "dev": true }, "tapable": { "version": "2.2.1", diff --git a/package.json b/package.json index 7eb8855..58324ba 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,8 @@ "resolve-url-loader": "^5.0.0", "sass": "1.32.13", "sass-loader": "^8.0.2", + "sweetalert2": "^11.4.35", "vue": "^2.6.14", "vue-template-compiler": "^2.6.14" - }, - "dependencies": { - "sweetalert2": "^11.4.20" } } diff --git a/resources/js/alert.js b/resources/js/alert.js index d10751b..b4a9baf 100644 --- a/resources/js/alert.js +++ b/resources/js/alert.js @@ -1,5 +1,5 @@ // ES6 Modules or TypeScript -import Swal from 'sweetalert2' +import Swal from 'sweetalert2/dist/sweetalert2.js' document.addEventListener('DOMContentLoaded', () => { if (document.getElementsByClassName('oldEgg').length) { diff --git a/resources/sass/back.scss b/resources/sass/back.scss index 59e4806..e7b80e0 100644 --- a/resources/sass/back.scss +++ b/resources/sass/back.scss @@ -45,3 +45,8 @@ body { } } + +.egg-alert { + margin-top:10px; + margin-bottom:10px; +} diff --git a/resources/sass/front/_alert.scss b/resources/sass/front/_alert.scss index 663b01b..8f30129 100644 --- a/resources/sass/front/_alert.scss +++ b/resources/sass/front/_alert.scss @@ -1,3 +1,5 @@ +@import 'sweetalert2/dist/sweetalert2.css'; + .swal2-confirm { border-radius: 0 !important; box-shadow: 0px 5px 5px #00000069 !important; @@ -8,4 +10,4 @@ text-decoration: none; font-family: MyriadProBold; } -} \ No newline at end of file +} diff --git a/resources/views/back/modules/flashMessage.blade.php b/resources/views/back/modules/flashMessage.blade.php index 4aca5db..3570bbc 100644 --- a/resources/views/back/modules/flashMessage.blade.php +++ b/resources/views/back/modules/flashMessage.blade.php @@ -1,15 +1,3 @@ - - - - - - - - - - - - @if ($message = Session::get('success')) -
+
Élevage

Nous n'avons pu retrouver l'éleveur concerné par votre boite.

diff --git a/resources/views/front/frame.blade.php b/resources/views/front/frame.blade.php index 90bf67a..3bbf7ef 100644 --- a/resources/views/front/frame.blade.php +++ b/resources/views/front/frame.blade.php @@ -5,9 +5,21 @@ {{ __('Autorisation nécessaire') }} + -

+

{{__("Vous devez autoriser les cookies '".request()->type."' pour visualiser cet élément") }}

diff --git a/resources/views/front/modules/flashMessage.blade.php b/resources/views/front/modules/flashMessage.blade.php index b3cfdb3..2d439ad 100644 --- a/resources/views/front/modules/flashMessage.blade.php +++ b/resources/views/front/modules/flashMessage.blade.php @@ -1,15 +1,3 @@ - - - - - - - - - - - - @if ($message = Session::get('success'))