diff --git a/package-lock.json b/package-lock.json index f1072e8e19..7d265e3878 100644 --- a/package-lock.json +++ b/package-lock.json @@ -769,6 +769,7 @@ "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-5.0.50.tgz", "integrity": "sha512-L2ZdekSpJreIvSc4DkqGCh2bFmCadDZiR6q9euVtXdLeHPl/YQ4hqTvLIkc7aYO6oE/nC5mPAIOaM6ZiAy7QKA==", "license": "MIT", + "peer": true, "dependencies": { "@antv/algorithm": "^0.1.26", "@antv/component": "^2.1.7", @@ -966,6 +967,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz", "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==", "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -3177,6 +3179,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -3200,6 +3203,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -3349,6 +3353,7 @@ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -3392,6 +3397,7 @@ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz", "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -3741,6 +3747,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz", "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", "license": "MIT", + "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.7.2" }, @@ -3850,13 +3857,13 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@humanwhocodes/config-array": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -3886,7 +3893,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", "dev": true, "license": "BSD-3-Clause" }, @@ -5747,6 +5753,7 @@ "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.1.tgz", "integrity": "sha512-Xf6Shbo03YmcBedZMwSpEFOwpYDtU7tC+rhAHTrA9FHk0FpsDqiQ9jUa1j/9s3HLs7KWb5mDcGnlwdh9Q9KAag==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.2", "@mui/core-downloads-tracker": "^7.3.1", @@ -5857,6 +5864,7 @@ "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.1.tgz", "integrity": "sha512-mIidecvcNVpNJMdPDmCeoSL5zshKBbYPcphjuh6ZMjhybhqhZ4mX6k9zmIWh6XOXcqRQMg5KrcjnO0QstrNj3w==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.28.2", "@mui/private-theming": "^7.3.1", @@ -6201,6 +6209,7 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "license": "MIT", + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -6414,7 +6423,8 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@reduxjs/toolkit/node_modules/redux-thunk": { "version": "3.1.0", @@ -6619,6 +6629,7 @@ "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -7208,8 +7219,6 @@ }, "node_modules/@types/jest/node_modules/ci-info": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", - "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", "dev": true, "funding": [ { @@ -7446,6 +7455,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.12.tgz", "integrity": "sha512-cMoR+FoAf/Jyq6+Df2/Z41jISvGZZ2eTlnsaJRptmZ76Caldwy1odD4xTr/gNV9VLj0AWgg/nmkevIyUfIIq5w==", "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -7896,6 +7906,7 @@ "integrity": "sha512-xHif5tkQOZK4YjA44rrzmvXMI1cb1Qato3P+NL/gwyoK5LdZx0f5Q59Il25JtuhN/htBvrT+Copt3Q4Ma4gJbg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/utils": "3.2.2", "fflate": "^0.8.2", @@ -8108,6 +8119,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" }, @@ -8152,6 +8164,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -8239,9 +8252,7 @@ "license": "ISC" }, "node_modules/antd": { - "version": "5.29.1", - "resolved": "https://registry.npmjs.org/antd/-/antd-5.29.1.tgz", - "integrity": "sha512-TTFVbpKbyL6cPfEoKq6Ya3BIjTUr7uDW9+7Z+1oysRv1gpcN7kQ4luH8r/+rXXwz4n6BIz1iBJ1ezKCdsdNW0w==", + "version": "5.29.3", "license": "MIT", "dependencies": { "@ant-design/colors": "^7.2.1", @@ -8638,6 +8649,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz", "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==", "license": "MIT", + "peer": true, "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", @@ -8727,6 +8739,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.12.5", "cosmiconfig": "^7.0.0", @@ -8881,7 +8894,6 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "license": "MIT", - "peer": true, "engines": { "node": "*" } @@ -9052,6 +9064,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -9335,6 +9348,7 @@ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz", "integrity": "sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==", "license": "MIT", + "peer": true, "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -10461,6 +10475,7 @@ "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", "license": "ISC", + "peer": true, "engines": { "node": ">=12" } @@ -10635,6 +10650,7 @@ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.21.0" }, @@ -10659,7 +10675,8 @@ "version": "1.11.18", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/debug": { "version": "4.4.3", @@ -11073,7 +11090,6 @@ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "license": "MIT", - "peer": true, "engines": { "node": ">= 4" } @@ -11400,9 +11416,9 @@ "version": "8.57.1", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -12888,7 +12904,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -13623,7 +13638,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -17980,7 +17994,8 @@ "version": "3.7.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/js-tokens": { "version": "4.0.0", @@ -18007,6 +18022,7 @@ "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", @@ -18208,7 +18224,8 @@ "version": "1.9.4", "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", - "license": "BSD-2-Clause" + "license": "BSD-2-Clause", + "peer": true }, "node_modules/leaflet.heat": { "version": "0.2.0", @@ -18324,7 +18341,6 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "license": "MIT", - "peer": true, "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -18800,6 +18816,7 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "license": "MIT", + "peer": true, "engines": { "node": "*" } @@ -18839,6 +18856,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "dependencies": { "@bundled-es-modules/cookie": "^2.0.1", "@bundled-es-modules/statuses": "^1.0.1", @@ -19608,8 +19626,8 @@ "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", "license": "MIT", + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -19644,6 +19662,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -19693,6 +19712,7 @@ "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -19723,6 +19743,7 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin-prettier.js" }, @@ -19789,6 +19810,7 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -20583,6 +20605,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -20726,6 +20749,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -20863,6 +20887,7 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.15.4", "@types/react-redux": "^7.1.20", @@ -20924,6 +20949,7 @@ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz", "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", @@ -21410,6 +21436,7 @@ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "license": "MIT", + "peer": true, "dependencies": { "@babel/runtime": "^7.9.2" } @@ -21721,7 +21748,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -21927,6 +21953,7 @@ "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -23494,6 +23521,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -23505,7 +23533,8 @@ "version": "7.9.1", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-7.9.1.tgz", "integrity": "sha512-zaOHwmiP1EqTeLRXAvVriDb00JYnfEjWGPdKEuac7MiZJ5aiDMZ4Unc98Gmajn+PBljOmO1GKV6G0KwWn3+k8A==", - "license": "GPL-2.0-or-later" + "license": "GPL-2.0-or-later", + "peer": true }, "node_modules/tinypool": { "version": "1.1.1", @@ -23830,6 +23859,7 @@ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -24176,6 +24206,7 @@ "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -24292,6 +24323,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -24305,6 +24337,7 @@ "integrity": "sha512-fyNn/Rp016Bt5qvY0OQvIUCwW2vnaEBLxP42PmKbNIoasSYjML+8xyeADOPvBe+Xfl/ubIw4og7Lt9jflRsCNw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/chai": "^5.2.2", "@vitest/expect": "3.2.2", @@ -24444,6 +24477,7 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.103.0.tgz", "integrity": "sha512-HU1JOuV1OavsZ+mfigY0j8d1TgQgbZ6M+J75zDkpEAwYeXjWSqrGJtgnPblJjd/mAyTNQ7ygw0MiKOn6etz8yw==", "license": "MIT", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", diff --git a/public/index.css b/public/index.css index 0476544525..04756f7f6f 100644 --- a/public/index.css +++ b/public/index.css @@ -242,10 +242,6 @@ body.bm-dashboard-dark .nav-link { color: #ffffff !important; } -body.dark-mode .navbar, -body.bm-dashboard-dark .navbar { - background-color: #1b2a41 !important; -} body.dark-mode .navbar-brand, body.bm-dashboard-dark .navbar-brand { diff --git a/src/components/CommunityPortal/CPHeader/CPHeader.css b/src/components/CommunityPortal/CPHeader/CPHeader.css deleted file mode 100644 index 79154fa476..0000000000 --- a/src/components/CommunityPortal/CPHeader/CPHeader.css +++ /dev/null @@ -1,71 +0,0 @@ -.header-wrapper { - width: clamp(100vw, 0.1rem + 1vw, 100%); - height: fit-content; -} - -.header-margin { height: 20px; background: #1B2A41; } -.header-margin-light { height: 20px; background: #fff; } - -.close-button { - width: 99%; - height: 2vh; -} - -.card-content { - padding: 5px 40px; - font-size: medium; - color: #fff; - white-space: pre-line; -} - -.timer-message-section { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - gap: 1rem; -} - -.redBackGroupHeader { - position: relative; - bottom: 0; - right: 0; - height: 30px; - max-width: 39px; - min-width: 29px; - padding: 3px 6px; - text-align: center; - font-size: 1rem; - background: #ff4d4f; - border-radius: 40px; - color: #fff; -} - -.owner-message { - margin-right: 3rem; -} - -.navbar { white-space: nowrap; } -.nav-links { display: flex; align-items: center; } - -.responsive-spacing { margin-right: 15px; } - -.dropdown-item-hover:hover { background: #2f4157 !important; } - -@media (max-width: 1400px) { - .nav-links { flex-direction: column !important; } -} - -@media (max-width: 1500px) { - .dashboard-text-link { font-size: 14px; } - .owner-message { margin-right: 0; } -} - -@media (max-width: 1050px) { - .timer-message-section { width: 0; margin-right: 0; } - .owner-message{ display: none; } -} - -@media (max-width: 769px) { - .responsive-spacing { margin-right: 5px; } -} diff --git a/src/components/CommunityPortal/CPHeader/CPHeader.jsx b/src/components/CommunityPortal/CPHeader/CPHeader.jsx index 2121c4cc6d..ecdf1d742b 100644 --- a/src/components/CommunityPortal/CPHeader/CPHeader.jsx +++ b/src/components/CommunityPortal/CPHeader/CPHeader.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useMemo } from 'react'; +import { useState, useEffect, useMemo, useRef } from 'react'; // import { getUserProfile } from '../../actions/userProfile' import { Link } from 'react-router-dom'; import { connect, useDispatch } from 'react-redux'; @@ -47,7 +47,8 @@ import { SEND_EMAILS, } from '../../../languages/en/ui'; import Logout from '../../Logout/Logout'; -import './CPHeader.css'; +// import './CPHeader.css'; +import styles from '../../Header/Header.module.css'; import hasPermission, { cantUpdateDevAdminDetails } from '../../../utils/permissions'; export function Header(props) { @@ -58,6 +59,8 @@ export function Header(props) { const [profilePic, setProfilePic] = useState(props.auth.profilePic); const [isAuthUser, setIsAuthUser] = useState(true); const [displayUserId, setDisplayUserId] = useState(user.userid); + const collapseRef = useRef(null); + const toggleRef = useRef(null); const ALLOWED_ROLES_TO_INTERACT = useMemo(() => ['Owner', 'Administrator'], []); const canInteractWithViewingUser = useMemo( @@ -163,191 +166,294 @@ export function Header(props) { } }, []); + const openModal = () => { + setLogoutPopup(true); + }; + const toggle = () => { setIsOpen(prevIsOpen => !prevIsOpen); }; - const openModal = () => { - setLogoutPopup(true); - }; + useEffect(() => { + const handleClickOutside = event => { + if ( + collapseRef.current && + !collapseRef.current.contains(event.target) && + !toggleRef.current?.contains(event.target) + ) { + setIsOpen(false); + } + }; + + if (isOpen) { + document.addEventListener('mousedown', handleClickOutside); + } + + return () => { + document.removeEventListener('mousedown', handleClickOutside); + }; + }, [isOpen]); - const fontColor = darkMode ? 'text-white dropdown-item-hover' : ''; + const fontColor = darkMode + ? `${styles.darkDropdownText} ${styles.darkDropdownItem}` + : `${styles.mobileDropdownText} ${styles.mobileDropdownItem}`; return ( -
- +
+ {isAuthenticated && ( +
+ +
+ )} + {logoutPopup && } -
- {isAuthenticated && } - {isAuthenticated && ( -
- -
- )} + {isAuthenticated && } + + {/* ITEM SHOWS OUTSIDE OF THE DROPDOWN IN MOBILE */} +
+
- + {/* --------------------------------------------- */} + +
+ +
+ {isAuthenticated && ( - - )} diff --git a/src/components/Header/BellNotification.jsx b/src/components/Header/BellNotification.jsx index 8616d72390..cfdd49d8c1 100644 --- a/src/components/Header/BellNotification.jsx +++ b/src/components/Header/BellNotification.jsx @@ -56,6 +56,7 @@ export default function BellNotification({ userId }) { const [isDataReady, setIsDataReady] = useState(false); const [showNotification, setShowNotification] = useState(false); const notificationRef = useRef(null); + const bellRef = useRef(null); const [dbNotifications, setDbNotifications] = useState([]); // DB notifications const [messageNotifications, setMessageNotifications] = useState([]); @@ -410,7 +411,7 @@ export default function BellNotification({ userId }) { useEffect(() => { const handleClickOutside = event => { - if (notificationRef.current && !notificationRef.current.contains(event.target)) { + if (notificationRef.current && !notificationRef.current.contains(event.target) && !bellRef.current.contains(event.target)) { //to close notification panel without marking as read setShowNotification(false); } @@ -446,6 +447,7 @@ export default function BellNotification({ userId }) { <> {isDataReady && (
-
{modalContent}
+
{modalContent}
)} @@ -727,7 +795,7 @@ export function Header(props) { {props.auth.isAuthenticated && unreadNotifications?.length > 0 ? ( ) : null} -
+
); } diff --git a/src/components/Header/Header.module.css b/src/components/Header/Header.module.css index 93131b20d5..5a212aac34 100644 --- a/src/components/Header/Header.module.css +++ b/src/components/Header/Header.module.css @@ -1,25 +1,10 @@ /* General Styling */ -.header-wrapper { +.headerWrapper { height: fit-content; width: clamp(100vw, 0.1rem + 1vw, 100%); } -/* - position: absolute; - top: 0; - left: 0; - padding: 12px; -} */ -/* Timer Message Section */ -.timer-message-section { - display: flex; - align-items: center; - justify-content: space-between; - /* flex-wrap: wrap; */ - width: 100%; - gap: 1rem; -} -.card-content { +.cardContent { padding: 15px; padding-left: 40px; padding-right: 40px; /* Match left padding for balance */ @@ -48,7 +33,7 @@ right: 0; } -.card-wrapper { +.cardWrapper { padding-top: 1rem; padding-bottom: 1rem; /* Ensure wrapper uses full width */ @@ -62,14 +47,9 @@ .navbar { z-index: 100; white-space: nowrap; - display: flex; - flex-wrap: nowrap; - justify-content: space-between; - align-items: center; - width: 100%; - overflow: visible; } + .redBackGroupHeader { z-index: 10; bottom: 0; @@ -87,100 +67,113 @@ min-width: 29px; } -.owner-message { - margin-right: 1rem; - +.navbarOwnerMessage { + flex: 1; + text-align: center; + justify-content: center; + padding-left: 20px; + padding-right: 20px; } -.nav-links { +.menuContainer { display: flex; - flex-direction: row; + justify-content: flex-end; align-items: center; - overflow: visible; + flex-wrap: wrap; } -.dashboard-text-link { +.dashboardTextLink { font-size: 16px; flex-wrap: nowrap; gap: 1rem; } -.dropdown-item-hover:hover { - background-color: #2f4157 !important; +.darkMenuDropdown { + background-color: #3a506b !important; } -@media (max-width: 1400px) { - .nav-links { - flex-direction: column !important; - } +.darkDropdownText { + color: white !important; } +.darkDropdownItem:hover { + background-color: #2f4157 !important; +} +.noMaxHeight { + max-height: none !important; + overflow: visible !important; +} -/* Media Queries for Responsiveness */ -@media (max-width: 1400px) { - .nav-links { - flex-direction: column; - align-items: flex-start; - gap: 0.5rem; - width: 100%; - overflow: visible; - flex-wrap: wrap; - } +.showInMobile { + display: none; } -@media (max-width: 1050px) { - .timer-message-section { - width: 100%; - margin-right: 0; - } +.hideInTablet { + display: block; +} +.showInTablet { + display: none; +} - .owner-message { - display: block; - margin-right: 0; - text-align: center; - width: 100%; +@media (max-width: 1700px) { + .hideInTablet { + display: none; } - .nav-links { - flex-direction: column; - align-items: flex-start; - gap: 0.5rem; - overflow: visible; - flex-wrap: wrap; + .showInTablet { + display: block; } } -@media screen and (max-width: 768px) { - .responsive-spacing { - margin-right: 5px; - } - - .nav-links { - flex-direction: column; - width: 100%; - overflow: visible; - flex-wrap: wrap; +@media screen and (max-width: 1151px) and (min-width: 992px) { + .dropdownMenu { + width: auto !important; } } -/*@media screen and (min-width: 1400px) and (max-width: 1700px) { - .owner-message { +@media screen and (max-width: 1199px) { + .menuContainer { + align-items: start; + flex-direction: column !important; + /* width: 100%; */ + padding-left: 50px; + } + .mobileMenuDropdown { + background-color: #343a40 !important; + border: none !important; + } + .mobileDropdownText{ + color: rgba(255, 255, 255, 0.5) !important; + } + .mobileDropdownItem:hover{ + background-color: #343a40 !important; + color: rgba(255, 255, 255, 0.75) !important; + } + .darkMenuDropdown { + background-color: #343a40 !important; + border: none !important; + } + .darkDropdownText { + color: rgba(255, 255, 255, 0.5) !important; + } + .darkDropdownItem:hover { + background-color: #343a40 !important; + color: rgba(255, 255, 255, 0.75) !important; + } + .hideInMobile { display: none; } -}*/ - -@media screen and (max-width: 769px) { - .responsive-spacing { - margin-right: 5px; + .showInMobile { + display: block; } } -.header-margin { +.headerMargin { height: 20px; background-color: #1B2A41; } -.header-margin-light { +.headerMarginLight { height: 20px; background-color: #fff; } @@ -209,15 +202,6 @@ margin: 0 !important; } - /* Ensure navigation links display correctly */ - .nav-links { - gap: 0.5rem !important; - width: auto !important; - font-size: 16px !important; - margin: 0 !important; - padding: 0 !important; - } - /* Ensure all icons have correct size */ .navbar img, .navbar svg { diff --git a/src/components/Header/__tests__/Header.test.jsx b/src/components/Header/__tests__/Header.test.jsx index b70da2e5a4..4beca2fefe 100644 --- a/src/components/Header/__tests__/Header.test.jsx +++ b/src/components/Header/__tests__/Header.test.jsx @@ -122,7 +122,7 @@ describe('Header component', () => { it('renders the owner message & timer children', () => { renderHeader(); - expect(screen.getByTestId('mock-owner-message')).toBeInTheDocument(); + expect(screen.getAllByTestId('mock-owner-message').length).toBeGreaterThan(0); expect(screen.getByTestId('mock-timer')).toBeInTheDocument(); }); }); diff --git a/src/components/LBDashboard/WishList/ItemOverview.jsx b/src/components/LBDashboard/WishList/ItemOverview.jsx index bc5850a91f..0fccd94d7d 100644 --- a/src/components/LBDashboard/WishList/ItemOverview.jsx +++ b/src/components/LBDashboard/WishList/ItemOverview.jsx @@ -1,4 +1,4 @@ -import './ItemOverview.css'; +import styles from './ItemOverview.module.css'; import { useEffect, useState } from 'react'; import { connect } from 'react-redux'; @@ -48,22 +48,24 @@ function WishListItem(props) { }, [wishlistItem]); return ( -
-
+
+
-
-
-
+
+
+

{currWishlistItem.unit}

{currWishlistItem.title}

-
+

Available amenities in this unit:

-
    +
      {currWishlistItem.unitAmenities?.map(amenity => (
    1. {amenity}
      2. ))} @@ -71,22 +73,22 @@ function WishListItem(props) {

Village level amenities:

-
    +
      {currWishlistItem.villageAmenities?.map(amenity => (
    1. {amenity}
      2. ))}
- -
-
-

{currWishlistItem.unit}

-

{currWishlistItem.title}

+
+
+

{currWishlistItem.unit}

+

{currWishlistItem.title}

This unit sells for a basic price of {currWishlistItem.price}. If you wish to book it in advance bid your price and leave your details below and we will get back @@ -95,8 +97,8 @@ function WishListItem(props) { from now.
-
-
+
+
-
+
-
+
The Dates you picked are not available
Click here to see available dates
-
-
+
+
-
+
diff --git a/src/components/LBDashboard/WishList/ItemOverview.css b/src/components/LBDashboard/WishList/ItemOverview.module.css similarity index 98% rename from src/components/LBDashboard/WishList/ItemOverview.css rename to src/components/LBDashboard/WishList/ItemOverview.module.css index f32227fd4b..8e1faca396 100644 --- a/src/components/LBDashboard/WishList/ItemOverview.css +++ b/src/components/LBDashboard/WishList/ItemOverview.module.css @@ -185,11 +185,6 @@ p { padding: 2.5%; } -.item__listing-details h1, -p { - color: #000; -} - .item__rent { display: flex; flex-direction: row; @@ -323,7 +318,8 @@ p { padding-left: 0.2rem; margin: 0 0 0rem; } - .navbar-nav { + + .item_overview_module .navbar-nav { display: flex; flex-direction: row !important; padding-left: 0; @@ -336,6 +332,7 @@ p { .item__navbar-right { padding: 1rem 0 0; + justify-content: space-between; } .item__navbar{ @@ -346,9 +343,7 @@ p { background-color: green; padding: 1rem 2rem !important; } - .item__navbar-right { - justify-content: space-between; - } + .item__navbar-right h2{ font-family: sans-serif; color: #000000; @@ -365,7 +360,8 @@ p { font-size: 16px; margin-bottom: 0; } - .navbar-nav { + + .item_overview_module .navbar-nav { display: flex; flex-direction: row !important; padding-left: 0; @@ -506,6 +502,5 @@ p { } .navbar-toggler-icon{ width: 20px !important; - width: 20px !important; } } diff --git a/src/components/OwnerMessage/OwnerMessage.jsx b/src/components/OwnerMessage/OwnerMessage.jsx index 92fab01ef0..73a1e0ea23 100644 --- a/src/components/OwnerMessage/OwnerMessage.jsx +++ b/src/components/OwnerMessage/OwnerMessage.jsx @@ -132,7 +132,7 @@ function OwnerMessage({ {ownerMessage ? getContent(ownerMessage) : getContent(ownerStandardMessage)} {(user.role === 'Owner' || canEditHeaderMessage) && ( -
+ )} -
+ )} toggle()} className={fontColor}> diff --git a/src/components/OwnerMessage/OwnerMessage.module.css b/src/components/OwnerMessage/OwnerMessage.module.css index 769a982ede..6d11feaf84 100644 --- a/src/components/OwnerMessage/OwnerMessage.module.css +++ b/src/components/OwnerMessage/OwnerMessage.module.css @@ -1,5 +1,5 @@ -.messageContainer { - display: flex; +.message-container { + /* display: flex; */ align-items: center; justify-content: center; width: 100%; @@ -37,7 +37,7 @@ .iconWrapper { flex: 0 0 auto; - display: flex; + /* display: flex; */ align-items: center; justify-content: center; flex-direction: column; diff --git a/yarn.lock b/yarn.lock index 7aa5240b52..7d7a5c00e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3934,9 +3934,7 @@ ant-design@^1.0.0: integrity sha512-EiN9oXroImi01yz1xwpDzExb1U5ddi4MYiCTaTLVl8SA3QHXYClJn0BikAYS2IMPzmpmAYhwOgGA2HE/sL/c9g== antd@^5.27.6: - version "5.29.1" - resolved "https://registry.npmjs.org/antd/-/antd-5.29.1.tgz" - integrity sha512-TTFVbpKbyL6cPfEoKq6Ya3BIjTUr7uDW9+7Z+1oysRv1gpcN7kQ4luH8r/+rXXwz4n6BIz1iBJ1ezKCdsdNW0w== + version "5.29.3" dependencies: "@ant-design/colors" "^7.2.1" "@ant-design/cssinjs" "^1.23.0"