diff --git a/package-lock.json b/package-lock.json index f62aaca19..becda5c2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -91,7 +91,7 @@ "eslint-plugin-no-function-declare-after-return": "^1.1.0", "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-react": "^7.37.2", - "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-react-hooks": "^7.0.1", "eslint-webpack-plugin": "^5.0.0", "html-loader": "^5.1.0", "html-webpack-plugin": "^5.6.0", @@ -304,6 +304,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.0", @@ -1872,6 +1873,7 @@ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", "license": "MIT", + "peer": true, "engines": { "node": ">=6.9.0" } @@ -1948,6 +1950,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz", "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==", + "peer": true, "dependencies": { "@dnd-kit/accessibility": "^3.1.1", "@dnd-kit/utilities": "^3.2.2", @@ -3169,6 +3172,7 @@ "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz", "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==", "dev": true, + "peer": true, "dependencies": { "@babel/core": "^7.21.3", "@svgr/babel-preset": "8.1.0", @@ -3327,6 +3331,7 @@ "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -3709,6 +3714,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.1.tgz", "integrity": "sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.8.1", "@typescript-eslint/types": "8.8.1", @@ -4722,6 +4728,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4797,6 +4804,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -5557,6 +5565,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -5732,6 +5741,7 @@ "version": "4.4.4", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.4.tgz", "integrity": "sha512-emICKGBABnxhMjUjlYRR12PmOXhJ2eJjEHL2/dZlWjxRAZT1D8xplLFq5M0tMQK8ja+wBS/tuVEJB5C6r7VxJA==", + "peer": true, "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -7180,6 +7190,7 @@ "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", @@ -7241,6 +7252,7 @@ "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==", "dev": true, "license": "MIT", + "peer": true, "bin": { "eslint-config-prettier": "build/bin/cli.js" }, @@ -7345,12 +7357,20 @@ } }, "node_modules/eslint-plugin-react-hooks": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz", - "integrity": "sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz", + "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==", "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.24.4", + "@babel/parser": "^7.24.4", + "hermes-parser": "^0.25.1", + "zod": "^3.25.0 || ^4.0.0", + "zod-validation-error": "^3.5.0 || ^4.0.0" + }, "engines": { - "node": ">=10" + "node": ">=18" }, "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" @@ -8332,6 +8352,23 @@ "he": "bin/he" } }, + "node_modules/hermes-estree": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz", + "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==", + "dev": true, + "license": "MIT" + }, + "node_modules/hermes-parser": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz", + "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "hermes-estree": "0.25.1" + } + }, "node_modules/hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -8615,6 +8652,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.27.6" }, @@ -9559,10 +9597,11 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -10156,10 +10195,11 @@ } }, "node_modules/node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz", + "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==", "dev": true, + "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" } @@ -10739,6 +10779,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.0", @@ -10841,6 +10882,7 @@ "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -11070,6 +11112,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -11105,6 +11148,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -11673,6 +11717,7 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz", "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==", "dev": true, + "peer": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -12705,6 +12750,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -12870,6 +12916,7 @@ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -13055,7 +13102,8 @@ "node_modules/tslib": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "peer": true }, "node_modules/tty-browserify": { "version": "0.0.1", @@ -13187,6 +13235,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "devOptional": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -13404,6 +13453,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -13568,6 +13618,7 @@ "version": "5.94.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "peer": true, "dependencies": { "@types/estree": "^1.0.5", "@webassemblyjs/ast": "^1.12.1", @@ -13614,6 +13665,7 @@ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz", "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==", "dev": true, + "peer": true, "dependencies": { "@discoveryjs/json-ext": "^0.6.1", "@webpack-cli/configtest": "^3.0.1", @@ -13773,6 +13825,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -14003,6 +14056,29 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/zod": { + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz", + "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zod-validation-error": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz", + "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "zod": "^3.25.0 || ^4.0.0" + } } } } diff --git a/package.json b/package.json index dc03e0e0f..ef12779bd 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "eslint-plugin-no-function-declare-after-return": "^1.1.0", "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-react": "^7.37.2", - "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-react-hooks": "^7.0.1", "eslint-webpack-plugin": "^5.0.0", "html-loader": "^5.1.0", "html-webpack-plugin": "^5.6.0", diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png index ca1cb7ad0..069f6e25f 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png index 5183608f8..18edafb43 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/fund-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png index 96d4cec05..e77cbbf0c 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png index 90658fed2..cf9611c3a 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/office-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png index bdad0634c..8a9bdafc5 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png index 7cc9b47aa..a24659b91 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/organization-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png index 8bfeeda26..8830d21a6 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png index 525fff135..5beca7e94 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-small.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png index 82600b487..a1d89d52e 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/placeholders/product-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png index 7cbff6b24..01ca393a9 100644 Binary files a/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png and b/react/assets/forus-webshop/resources/webshop-fijnder/assets/img/sprite-map.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-large.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-large.png index e28223c8b..a2ab23dd9 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-large.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-thumbnail.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-thumbnail.png index 1792f733a..67efb47c0 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/fund-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-large.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-large.png index 85bc8d000..6a5dae199 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-large.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-thumbnail.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-thumbnail.png index d92f087fb..532f13f09 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/office-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-large.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-large.png index 0d3bb893f..a4c6fd0b2 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-large.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-thumbnail.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-thumbnail.png index 1d083453d..2a66fba8e 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/organization-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-large.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-large.png index d7e9d4026..4d1389255 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-large.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-large.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-small.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-small.png index e6660bed2..b72a7c3f7 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-small.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-small.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-thumbnail.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-thumbnail.png index a89a81c81..f663887b5 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-thumbnail.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/placeholders/product-thumbnail.png differ diff --git a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/sprite-map.png b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/sprite-map.png index 2a7d176fd..8274ac5fd 100644 Binary files a/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/sprite-map.png and b/react/assets/forus-webshop/resources/webshop-schouwen_duiveland/assets/img/sprite-map.png differ diff --git a/react/src/dashboard/components/pages/implementation-notifications/ImplementationNotificationSend.tsx b/react/src/dashboard/components/pages/implementation-notifications/ImplementationNotificationSend.tsx index c1145a4c7..fa91eae77 100644 --- a/react/src/dashboard/components/pages/implementation-notifications/ImplementationNotificationSend.tsx +++ b/react/src/dashboard/components/pages/implementation-notifications/ImplementationNotificationSend.tsx @@ -33,6 +33,7 @@ import ImplementationsRootBreadcrumbs from '../implementations/elements/Implemen import { DashboardRoutes } from '../../../modules/state_router/RouterBuilder'; import useFilterNext from '../../../modules/filter_next/useFilterNext'; import { createEnumParam, NumberParam, StringParam } from 'use-query-params'; +import { useMarkdownService } from '../../../services/MarkdownService'; export default function ImplementationNotificationSend() { const { id } = useParams(); @@ -50,6 +51,7 @@ export default function ImplementationNotificationSend() { const paginatorService = usePaginatorService(); const implementationService = useImplementationService(); const fundService = useFundService(); + const markdownService = useMarkdownService(); const implementationNotificationsService = useImplementationNotificationService(); const [fund, setFund] = useState(null); @@ -87,6 +89,7 @@ export default function ImplementationNotificationSend() { '
', ':webshop_button', ].join('\n'), + markdownService, ), ); @@ -279,7 +282,7 @@ export default function ImplementationNotificationSend() { .then(() => { navigateState(DashboardRoutes.IMPLEMENTATION_NOTIFICATIONS, { organizationId: activeOrganization.id, - implementationId: implementation.id, + id: implementation.id, }); pushSuccess('Gelukt!', 'De e-mail zal zo spoedig mogelijk verstuurd worden naar alle gebruikers.', { @@ -366,7 +369,7 @@ export default function ImplementationNotificationSend() { if (!activeOrganization.allow_custom_fund_notifications) { navigateState(DashboardRoutes.IMPLEMENTATION_NOTIFICATIONS, { organizationId: activeOrganization.id, - implementationId: res.data.data.id, + id: res.data.data.id, }); } diff --git a/react/src/dashboard/components/pages/products-edit/elements/ProductsForm.tsx b/react/src/dashboard/components/pages/products-edit/elements/ProductsForm.tsx index 4f261ddd2..18465da32 100644 --- a/react/src/dashboard/components/pages/products-edit/elements/ProductsForm.tsx +++ b/react/src/dashboard/components/pages/products-edit/elements/ProductsForm.tsx @@ -1128,6 +1128,13 @@ export default function ProductsForm({ + Stuur een bericht naar de klant als u de reservering accepteert. In dit + bericht kun je meer informatie kwijt over het aanbod. Bijv. Stuur ons + een e-mail of bel ons om een afspraak in te plannen. + + } input={(id) => ( ( { q: '', source: 'provider', page: 1, per_page: paginatorService.getPerPage(paginatorKey), + order_by: 'id', + order_dir: 'desc', }, { queryParams: { @@ -73,6 +77,8 @@ export default function Products() { source: createEnumParam(['provider', 'sponsor', 'archive']), per_page: NumberParam, page: NumberParam, + order_by: StringParam, + order_dir: StringParam, }, }, ); @@ -109,7 +115,10 @@ export default function Products() { setLoading(true); productService - .list(activeOrganization.id, filterValuesActive) + .list(activeOrganization.id, { + ...filterValuesActive, + order_by: filterValuesActive.order_by === 'expired_at' ? 'expire_at' : filterValuesActive.order_by, + }) .then((res) => setProducts(res.data)) .finally(() => { setLoading(false); diff --git a/react/src/dashboard/services/ImplementationNotificationService.tsx b/react/src/dashboard/services/ImplementationNotificationService.tsx index 17b107fde..c1fd6fa05 100644 --- a/react/src/dashboard/services/ImplementationNotificationService.tsx +++ b/react/src/dashboard/services/ImplementationNotificationService.tsx @@ -6,7 +6,7 @@ import NotificationTemplate from '../props/models/NotificationTemplate'; import { QRCodeSVG } from 'qrcode.react'; import variables from './constants/notification_templates/variables.json'; import React from 'react'; -import { useMarkdownService } from './MarkdownService'; +import { MarkdownService } from './MarkdownService'; import { renderToString } from 'react-dom/server'; import Implementation from '../props/models/Implementation'; import { ConfigurableTableColumn } from '../components/pages/vouchers/hooks/useConfigurableTable'; @@ -88,8 +88,7 @@ export class ImplementationNotificationService { ); } - public makeCustomNotification = (title: string, template_html: string) => { - const markdownService = useMarkdownService(); + public makeCustomNotification = (title: string, template_html: string, markdownService: MarkdownService) => { template_html = this.varsToLabels(template_html); return {