Merge branch 'master' of ssh://git.thisfro.ch:222/thisfro/plant-exchange

Uncommitted changes before pull

assets/app.js

@@ -26,4 +26,7 @@ document.querySelector('.custom-file-input').addEventListener('change',function(
     var fileName = document.getElementById("offering_form_photo").files[0].name;
     var nextSibling = e.target.nextElementSibling
     nextSibling.innerText = fileName
-})
+})
+
+// Cookie-consent
+import 'cookie-notice/dist/cookie.notice.min.js'

package-lock.json

@@ -6,6 +6,7 @@
         "": {
             "license": "UNLICENSED",
             "dependencies": {
+                "cookie-notice": "^1.3.6",
                 "friendly-challenge": "^0.8.5"
             },
             "devDependencies": {
@@ -14,6 +15,8 @@
                 "@symfony/webpack-encore": "^1.0.0",
                 "bootstrap": "^4.6.0",
                 "core-js": "^3.0.0",
+                "jquery": "^3.6.0",
+                "popper.js": "^1.16.1",
                 "regenerator-runtime": "^0.13.2",
                 "sass": "^1.32.11",
                 "sass-loader": "^11.0.0",
@@ -3018,6 +3021,14 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/cookie-notice": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/cookie-notice/-/cookie-notice-1.3.6.tgz",
+            "integrity": "sha512-CE8CF9sezAJmRWzHi3S2gP+eggSKgGbVYF1NJtOqT2sOfbX9zktxri23lDV8Lkaq75GgxC3L1uaeselln4EKdg==",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
         "node_modules/cookie-signature": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -5522,6 +5533,12 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jquery": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
+            "dev": true
+        },
         "node_modules/js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6676,6 +6693,17 @@
                 "node": ">=8"
             }
         },
+        "node_modules/popper.js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+            "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+            "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+            "dev": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/popperjs"
+            }
+        },
         "node_modules/portfinder": {
             "version": "1.0.28",
             "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -11621,6 +11649,11 @@
             "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
             "dev": true
         },
+        "cookie-notice": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/cookie-notice/-/cookie-notice-1.3.6.tgz",
+            "integrity": "sha512-CE8CF9sezAJmRWzHi3S2gP+eggSKgGbVYF1NJtOqT2sOfbX9zktxri23lDV8Lkaq75GgxC3L1uaeselln4EKdg=="
+        },
         "cookie-signature": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -13391,6 +13424,12 @@
                 }
             }
         },
+        "jquery": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
+            "dev": true
+        },
         "js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -14167,6 +14206,12 @@
                 "find-up": "^3.0.0"
             }
         },
+        "popper.js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+            "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+            "dev": true
+        },
         "portfinder": {
             "version": "1.0.28",
             "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",

package.json

@@ -22,6 +22,7 @@
         "build": "encore production --progress"
     },
     "dependencies": {
+        "cookie-notice": "^1.3.6",
         "friendly-challenge": "^0.8.5"
     }
 }