From 523d45244f557980c24c8a6582e5e97afc480715 Mon Sep 17 00:00:00 2001 From: Rabi <134292357+Rabi94@users.noreply.github.com> Date: Tue, 26 May 2026 10:23:34 -0300 Subject: [PATCH 1/3] Upgrade MUI 5 TO MUI 6 --- src/caretogether-pwa/package-lock.json | 488 ++++++------------ src/caretogether-pwa/package.json | 22 +- .../src/Volunteers/VolunteerApplications.tsx | 194 ------- .../src/Volunteers/Volunteers.tsx | 2 - 4 files changed, 168 insertions(+), 538 deletions(-) delete mode 100644 src/caretogether-pwa/src/Volunteers/VolunteerApplications.tsx diff --git a/src/caretogether-pwa/package-lock.json b/src/caretogether-pwa/package-lock.json index 6803f540d..e27147304 100644 --- a/src/caretogether-pwa/package-lock.json +++ b/src/caretogether-pwa/package-lock.json @@ -10,9 +10,9 @@ "dependencies": { "@azure/msal-browser": "^3.19.0", "@azure/storage-blob": "^12.23.0", - "@date-io/date-fns": "^3.0.0", - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.5", + "@date-io/date-fns": "3.2.1", + "@emotion/react": "11.14.0", + "@emotion/styled": "11.14.1", "@fullcalendar/core": "^6.1.15", "@fullcalendar/daygrid": "^6.1.15", "@fullcalendar/list": "^6.1.15", @@ -20,15 +20,15 @@ "@hookform/resolvers": "^5.2.2", "@microsoft/applicationinsights-react-js": "^17.3.0", "@microsoft/applicationinsights-web": "^3.3.0", - "@mui/icons-material": "^5.16.1", - "@mui/lab": "5.0.0-alpha.172", - "@mui/material": "^5.16.1", - "@mui/system": "^5.16.1", - "@mui/x-date-pickers": "^6.20.2", + "@mui/icons-material": "6.5.0", + "@mui/lab": "6.0.1-beta.36", + "@mui/material": "6.5.0", + "@mui/system": "6.5.0", + "@mui/x-date-pickers": "7.29.4", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^14.3.1", "@testing-library/user-event": "^14.5.2", - "date-fns": "^3.6.0", + "date-fns": "3.6.0", "dexie": "^3.2.7", "dexie-react-hooks": "^1.1.7", "posthog-js": "^1.369.2", @@ -36,6 +36,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-hook-form": "^7.58.1", + "react-is": "18.3.1", "react-lazyload": "^3.2.1", "react-router-dom": "^6.24.1", "react-to-print": "^3.0.5", @@ -1164,31 +1165,31 @@ } }, "node_modules/@mui/base": { - "version": "5.0.0-beta.40", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz", - "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==", + "version": "5.0.0-beta.70", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.70.tgz", + "integrity": "sha512-Tb/BIhJzb0pa5zv/wu7OdokY9ZKEDqcu1BDFnohyvGCoHuSXbEr90rPq1qeNW3XvTBIbNWHEF7gqge+xpUo6tQ==", "deprecated": "This package has been replaced by @base-ui/react", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@floating-ui/react-dom": "^2.0.8", - "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.14", + "@babel/runtime": "^7.26.0", + "@floating-ui/react-dom": "^2.1.1", + "@mui/types": "~7.2.24", + "@mui/utils": "^6.4.8", "@popperjs/core": "^2.11.8", - "clsx": "^2.1.0", + "clsx": "^2.1.1", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -1197,9 +1198,9 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.18.0.tgz", - "integrity": "sha512-jbhwoQ1AY200PSSOrNXmrFCaSDSJWP7qk6urkTmIirvRXDROkqe+QwcLlUiw/PrREwsIF/vm3/dAXvjlMHF0RA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.5.0.tgz", + "integrity": "sha512-LGb8t8i6M2ZtS3Drn3GbTI1DVhDY6FJ9crEey2lZ0aN2EMZo8IZBZj9wRf4vqbZHaWjsYgtbOnJw5V8UWbmK2Q==", "license": "MIT", "funding": { "type": "opencollective", @@ -1207,22 +1208,22 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.18.0.tgz", - "integrity": "sha512-1s0vEZj5XFXDMmz3Arl/R7IncFqJ+WQ95LDp1roHWGDE2oCO3IS4/hmiOv1/8SD9r6B7tv9GLiqVZYHo+6PkTg==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.5.0.tgz", + "integrity": "sha512-VPuPqXqbBPlcVSA0BmnoE4knW4/xG6Thazo8vCLWkOKusko6DtwFV6B665MMWJ9j0KFohTIf3yx2zYtYacvG1g==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9" + "@babel/runtime": "^7.26.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^5.0.0", + "@mui/material": "^6.5.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -1233,21 +1234,21 @@ } }, "node_modules/@mui/lab": { - "version": "5.0.0-alpha.172", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.172.tgz", - "integrity": "sha512-stpa3WTsDE1HamFR4eeS6Bhxalm+u9FhzzNph/PrDMdWSRBHlJs2mqvZ6FEoO22O7MOCwNMqbXTkvEwsyEf0ew==", + "version": "6.0.1-beta.36", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.1-beta.36.tgz", + "integrity": "sha512-af9lDmA9SZGEWF1XXk0EVBpfCITk9IKsvh9lLOZGdYaaHfQeCsqxGEDMvNO66j0P8EYoxpyry84LFCJYuLVtVw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/base": "5.0.0-beta.40", - "@mui/system": "^5.16.1", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.1", - "clsx": "^2.1.0", + "@babel/runtime": "^7.26.0", + "@mui/base": "5.0.0-beta.70", + "@mui/system": "^6.5.0", + "@mui/types": "~7.2.24", + "@mui/utils": "^6.4.9", + "clsx": "^2.1.1", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1256,10 +1257,11 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material": ">=5.15.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "@mui/material": "^6.5.0", + "@mui/material-pigment-css": "^6.5.0", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -1268,32 +1270,35 @@ "@emotion/styled": { "optional": true }, + "@mui/material-pigment-css": { + "optional": true + }, "@types/react": { "optional": true } } }, "node_modules/@mui/material": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.18.0.tgz", - "integrity": "sha512-bbH/HaJZpFtXGvWg3TsBWG4eyt3gah3E7nCNU8GLyRjVoWcA91Vm/T+sjHfUcwgJSw9iLtucfHBoq+qW/T30aA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.5.0.tgz", + "integrity": "sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/core-downloads-tracker": "^5.18.0", - "@mui/system": "^5.18.0", - "@mui/types": "~7.2.15", - "@mui/utils": "^5.17.1", + "@babel/runtime": "^7.26.0", + "@mui/core-downloads-tracker": "^6.5.0", + "@mui/system": "^6.5.0", + "@mui/types": "~7.2.24", + "@mui/utils": "^6.4.9", "@popperjs/core": "^2.11.8", - "@types/react-transition-group": "^4.4.10", - "clsx": "^2.1.0", + "@types/react-transition-group": "^4.4.12", + "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^19.0.0", "react-transition-group": "^4.4.5" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1302,6 +1307,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", + "@mui/material-pigment-css": "^6.5.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1313,37 +1319,26 @@ "@emotion/styled": { "optional": true }, - "@types/react": { + "@mui/material-pigment-css": { "optional": true - } - } - }, - "node_modules/@mui/material/node_modules/@mui/types": { - "version": "7.2.24", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.24.tgz", - "integrity": "sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { + }, "@types/react": { "optional": true } } }, "node_modules/@mui/private-theming": { - "version": "5.17.1", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.17.1.tgz", - "integrity": "sha512-XMxU0NTYcKqdsG8LRmSoxERPXwMbp16sIXPcLVgLGII/bVNagX0xaheWAwFv8+zDK7tI3ajllkuD3GZZE++ICQ==", + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.9.tgz", + "integrity": "sha512-LktcVmI5X17/Q5SkwjCcdOLBzt1hXuc14jYa7NPShog0GBDCDvKtcnP0V7a2s6EiVRlv7BzbWEJzH6+l/zaCxw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/utils": "^5.17.1", + "@babel/runtime": "^7.26.0", + "@mui/utils": "^6.4.9", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1360,19 +1355,20 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.18.0.tgz", - "integrity": "sha512-BN/vKV/O6uaQh2z5rXV+MBlVrEkwoS/TK75rFQ2mjxA7+NBo8qtTAOA4UaM0XeJfn7kh2wZ+xQw2HAx0u+TiBg==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.5.0.tgz", + "integrity": "sha512-8woC2zAqF4qUDSPIBZ8v3sakj+WgweolpyM/FXf8jAx6FMls+IE4Y8VDZc+zS805J7PRz31vz73n2SovKGaYgw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", + "@babel/runtime": "^7.26.0", "@emotion/cache": "^11.13.5", "@emotion/serialize": "^1.3.3", + "@emotion/sheet": "^1.4.0", "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1393,22 +1389,22 @@ } }, "node_modules/@mui/system": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.18.0.tgz", - "integrity": "sha512-ojZGVcRWqWhu557cdO3pWHloIGJdzVtxs3rk0F9L+x55LsUjcMUVkEhiF7E4TMxZoF9MmIHGGs0ZX3FDLAf0Xw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.5.0.tgz", + "integrity": "sha512-XcbBYxDS+h/lgsoGe78ExXFZXtuIlSBpn/KsZq8PtZcIkUNJInkuDqcLd2rVBQrDC1u+rvVovdaWPf2FHKJf3w==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/private-theming": "^5.17.1", - "@mui/styled-engine": "^5.18.0", - "@mui/types": "~7.2.15", - "@mui/utils": "^5.17.1", - "clsx": "^2.1.0", + "@babel/runtime": "^7.26.0", + "@mui/private-theming": "^6.4.9", + "@mui/styled-engine": "^6.5.0", + "@mui/types": "~7.2.24", + "@mui/utils": "^6.4.9", + "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1432,7 +1428,7 @@ } } }, - "node_modules/@mui/system/node_modules/@mui/types": { + "node_modules/@mui/types": { "version": "7.2.24", "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.24.tgz", "integrity": "sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==", @@ -1446,38 +1442,21 @@ } } }, - "node_modules/@mui/types": { - "version": "7.4.12", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.12.tgz", - "integrity": "sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.6" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/utils": { - "version": "5.17.1", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.17.1.tgz", - "integrity": "sha512-jEZ8FTqInt2WzxDV8bhImWBqeQRD99c/id/fq83H0ER9tFl+sfZlaAoCdznGvbSQQ9ividMxqSV2c7cC1vBcQg==", + "version": "6.4.9", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.9.tgz", + "integrity": "sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/types": "~7.2.15", - "@types/prop-types": "^15.7.12", + "@babel/runtime": "^7.26.0", + "@mui/types": "~7.2.24", + "@types/prop-types": "^15.7.14", "clsx": "^2.1.1", "prop-types": "^15.8.1", "react-is": "^19.0.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -1493,31 +1472,17 @@ } } }, - "node_modules/@mui/utils/node_modules/@mui/types": { - "version": "7.2.24", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.24.tgz", - "integrity": "sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/x-date-pickers": { - "version": "6.20.2", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.20.2.tgz", - "integrity": "sha512-x1jLg8R+WhvkmUETRfX2wC+xJreMii78EXKLl6r3G+ggcAZlPyt0myID1Amf6hvJb9CtR7CgUo8BwR+1Vx9Ggw==", + "version": "7.29.4", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.29.4.tgz", + "integrity": "sha512-wJ3tsqk/y6dp+mXGtT9czciAMEO5Zr3IIAHg9x6IL0Eqanqy0N3chbmQQZv3iq0m2qUpQDLvZ4utZBUTJdjNzw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.2", - "@mui/base": "^5.0.0-beta.22", - "@mui/utils": "^5.14.16", - "@types/react-transition-group": "^4.4.8", - "clsx": "^2.0.0", + "@babel/runtime": "^7.25.7", + "@mui/utils": "^5.16.6 || ^6.0.0 || ^7.0.0", + "@mui/x-internals": "7.29.0", + "@types/react-transition-group": "^4.4.11", + "clsx": "^2.1.1", "prop-types": "^15.8.1", "react-transition-group": "^4.4.5" }, @@ -1526,22 +1491,22 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.8.6", - "@mui/system": "^5.8.0", - "date-fns": "^2.25.0 || ^3.2.0", - "date-fns-jalali": "^2.13.0-0", + "@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0", + "@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0", + "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0", + "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0", "dayjs": "^1.10.7", "luxon": "^3.0.2", "moment": "^2.29.4", - "moment-hijri": "^2.1.2", + "moment-hijri": "^2.1.2 || ^3.0.0", "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -1573,6 +1538,26 @@ } } }, + "node_modules/@mui/x-internals": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.29.0.tgz", + "integrity": "sha512-+Gk6VTZIFD70XreWvdXBwKd8GZ2FlSCuecQFzm6znwqXg1ZsndavrhG9tkxpxo2fM1Zf7Tk8+HcOO0hCbhTQFA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.25.7", + "@mui/utils": "^5.16.6 || ^6.0.0 || ^7.0.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", @@ -1711,7 +1696,7 @@ "@opentelemetry/api": "^1.3.0" } }, - "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": { + "node_modules/@opentelemetry/resources": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", @@ -1727,37 +1712,6 @@ "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, - "node_modules/@opentelemetry/resources": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.7.1.tgz", - "integrity": "sha512-DeT6KKolmC4e/dRQvMQ/RwlnzhaqeiFOXY5ngoOPJ07GgVVKxZOg9EcrNZb5aTzUn+iCrJldAgOfQm1O/QfPAQ==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.7.1", - "@opentelemetry/semantic-conventions": "^1.29.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - } - }, - "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.7.1.tgz", - "integrity": "sha512-QAqIj32AtK6+pEVNG7EOVxHdE06RP+FM5qpiEJ4RtDcFIqKUZHYhl7/7UY5efhwmwNAg7j8QbJVBLxMerc0+gw==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/semantic-conventions": "^1.29.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.10.0" - } - }, "node_modules/@opentelemetry/sdk-logs": { "version": "0.208.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.208.0.tgz", @@ -1775,22 +1729,6 @@ "@opentelemetry/api": ">=1.4.0 <1.10.0" } }, - "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", - "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.2.0", - "@opentelemetry/semantic-conventions": "^1.29.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - } - }, "node_modules/@opentelemetry/sdk-metrics": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.2.0.tgz", @@ -1807,22 +1745,6 @@ "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, - "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", - "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.2.0", - "@opentelemetry/semantic-conventions": "^1.29.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - } - }, "node_modules/@opentelemetry/sdk-trace-base": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.2.0.tgz", @@ -1840,22 +1762,6 @@ "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, - "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/resources": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz", - "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.2.0", - "@opentelemetry/semantic-conventions": "^1.29.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.10.0" - } - }, "node_modules/@opentelemetry/semantic-conventions": { "version": "1.40.0", "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz", @@ -2513,23 +2419,22 @@ } }, "node_modules/@testing-library/dom": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", - "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", + "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", - "aria-query": "5.3.0", + "aria-query": "5.1.3", + "chalk": "^4.1.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", - "picocolors": "1.1.1", "pretty-format": "^27.0.2" }, "engines": { - "node": ">=18" + "node": ">=14" } }, "node_modules/@testing-library/jest-dom": { @@ -2575,34 +2480,6 @@ "react-dom": "^18.0.0" } }, - "node_modules/@testing-library/react/node_modules/@testing-library/dom": { - "version": "9.3.4", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", - "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.12.5", - "@types/aria-query": "^5.0.1", - "aria-query": "5.1.3", - "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.9", - "lz-string": "^1.5.0", - "pretty-format": "^27.0.2" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@testing-library/react/node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", - "license": "Apache-2.0", - "dependencies": { - "deep-equal": "^2.0.5" - } - }, "node_modules/@testing-library/user-event": { "version": "14.6.1", "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz", @@ -2706,13 +2583,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@types/jest/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -3009,9 +2879,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "dev": true, "license": "MIT", "dependencies": { @@ -3204,12 +3074,12 @@ "license": "Python-2.0" }, "node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", "license": "Apache-2.0", "dependencies": { - "dequal": "^2.0.3" + "deep-equal": "^2.0.5" } }, "node_modules/array-buffer-byte-length": { @@ -3266,9 +3136,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", - "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", "dev": true, "license": "MIT", "dependencies": { @@ -3580,15 +3450,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", @@ -3716,9 +3577,9 @@ } }, "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -4347,12 +4208,6 @@ "react-is": "^16.7.0" } }, - "node_modules/hoist-non-react-statics/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "license": "MIT" - }, "node_modules/http-post-message": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/http-post-message/-/http-post-message-0.3.0.tgz", @@ -4784,13 +4639,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-diff/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, "node_modules/jest-get-type": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", @@ -4845,13 +4693,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-matcher-utils/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, "node_modules/jest-message-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", @@ -4901,13 +4742,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-message-util/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" - }, "node_modules/jest-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", @@ -5684,9 +5518,9 @@ } }, "node_modules/posthog-js/node_modules/preact": { - "version": "10.29.1", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.1.tgz", - "integrity": "sha512-gQCLc/vWroE8lIpleXtdJhTFDogTdZG9AjMUpVkDf2iTCNwYNWA+u16dL41TqUDJO4gm2IgrcMv3uTpjd4Pwmg==", + "version": "10.29.2", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.2.tgz", + "integrity": "sha512-7tNmwg/7mzzAoB/8kSg6Hl37JraAZw3Z3A0JSY7VXlZwo82Xn0G7wKbNNs2qoF4ZEEsQGTwDAroNdqKs1ofJxQ==", "license": "MIT", "funding": { "type": "opencollective", @@ -5802,12 +5636,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/pretty-format/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "license": "MIT" - }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -5819,12 +5647,6 @@ "react-is": "^16.13.1" } }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "license": "MIT" - }, "node_modules/protobufjs": { "version": "7.5.6", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.6.tgz", @@ -5907,9 +5729,9 @@ } }, "node_modules/react-is": { - "version": "19.2.6", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.6.tgz", - "integrity": "sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", "license": "MIT" }, "node_modules/react-lazyload": { diff --git a/src/caretogether-pwa/package.json b/src/caretogether-pwa/package.json index 56a675968..307775d16 100644 --- a/src/caretogether-pwa/package.json +++ b/src/caretogether-pwa/package.json @@ -6,9 +6,9 @@ "dependencies": { "@azure/msal-browser": "^3.19.0", "@azure/storage-blob": "^12.23.0", - "@date-io/date-fns": "^3.0.0", - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.5", + "@date-io/date-fns": "3.2.1", + "@emotion/react": "11.14.0", + "@emotion/styled": "11.14.1", "@fullcalendar/core": "^6.1.15", "@fullcalendar/daygrid": "^6.1.15", "@fullcalendar/list": "^6.1.15", @@ -16,15 +16,15 @@ "@hookform/resolvers": "^5.2.2", "@microsoft/applicationinsights-react-js": "^17.3.0", "@microsoft/applicationinsights-web": "^3.3.0", - "@mui/icons-material": "^5.16.1", - "@mui/lab": "5.0.0-alpha.172", - "@mui/material": "^5.16.1", - "@mui/system": "^5.16.1", - "@mui/x-date-pickers": "^6.20.2", + "@mui/icons-material": "6.5.0", + "@mui/lab": "6.0.1-beta.36", + "@mui/material": "6.5.0", + "@mui/system": "6.5.0", + "@mui/x-date-pickers": "7.29.4", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^14.3.1", "@testing-library/user-event": "^14.5.2", - "date-fns": "^3.6.0", + "date-fns": "3.6.0", "dexie": "^3.2.7", "dexie-react-hooks": "^1.1.7", "posthog-js": "^1.369.2", @@ -32,6 +32,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-hook-form": "^7.58.1", + "react-is": "18.3.1", "react-lazyload": "^3.2.1", "react-router-dom": "^6.24.1", "react-to-print": "^3.0.5", @@ -76,5 +77,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "overrides": { + "react-is": "18.3.1" } } diff --git a/src/caretogether-pwa/src/Volunteers/VolunteerApplications.tsx b/src/caretogether-pwa/src/Volunteers/VolunteerApplications.tsx deleted file mode 100644 index 73d06fd6f..000000000 --- a/src/caretogether-pwa/src/Volunteers/VolunteerApplications.tsx +++ /dev/null @@ -1,194 +0,0 @@ -// import { Grid, Paper, Table, TableContainer, TableBody, TableCell, TableHead, TableRow, Drawer } from '@mui/material'; -// import { VolunteerApprovalRequirement, VolunteerFamilyApprovalRequirement, RequirementStage } from '../GeneratedClient'; -// import { useRecoilValue } from 'recoil'; -// import { volunteerFamiliesData } from '../Model/VolunteerFamiliesModel'; -// import { policyData } from '../Model/ConfigurationModel'; -// import { VolunteerFamilyRequirementScope } from '../GeneratedClient'; -// import React, { useState } from 'react'; - -export {}; - -// const useStyles = makeStyles((theme) => ({ -// paper: { -// padding: theme.spacing(2), -// display: 'flex', -// overflow: 'auto', -// flexDirection: 'column', -// }, -// fixedHeight: { -// height: 240, -// }, -// table: { -// minWidth: 700, -// }, -// familyRow: { -// backgroundColor: '#eef' -// }, -// adultRow: { -// }, -// childRow: { -// color: 'ddd', -// fontStyle: 'italic' -// } -// })); - -// function VolunteerApplications() { -// const classes = useStyles(); -// const appNavigate = useAppNavigate(); -// const volunteerFamilies = useRecoilValue(volunteerFamiliesData); -// const policy = useRecoilValue(policyData); - -// const allFamilyRequirements = -// policy.volunteerPolicy?.volunteerFamilyRoles -// ? Object.entries(policy.volunteerPolicy.volunteerFamilyRoles) -// .reduce((previous, [, value]) => -// previous.concat((value.policyVersions?.map(policyVersion => policyVersion.requirements || []).flat()) || []), -// [] as VolunteerFamilyApprovalRequirement[]) -// : ([] as VolunteerFamilyApprovalRequirement[]); - -// const allFamilyJointRequirements = -// allFamilyRequirements.filter(requirement => -// requirement.scope === VolunteerFamilyRequirementScope.OncePerFamily && -// requirement.stage === RequirementStage.Application); -// const familyJointDocumentRequirements = allFamilyJointRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof FormUploadRequirement -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as FormUploadRequirement[]) -// .reduce((previous, requirement) => -// previous.filter(x => x.formName === requirement.formName).length === 0 -// ? previous.concat(requirement) -// : previous, [] as FormUploadRequirement[]); -// const familyJointActivityRequirements = allFamilyJointRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof ActivityRequirement -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as ActivityRequirement[]) -// .reduce((previous, requirement) => -// previous.filter(x => x.activityName === requirement.activityName).length === 0 -// ? previous.concat(requirement) -// : previous, [] as ActivityRequirement[]); - -// const allFamilyPerAdultRequirements = -// allFamilyRequirements.filter(requirement => -// requirement.scope === VolunteerFamilyRequirementScope.AllAdultsInTheFamily && -// requirement.stage === RequirementStage.Application); -// const allFamilyPerAdultDocumentRequirements = allFamilyPerAdultRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof FormUploadRequirement -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as FormUploadRequirement[]); -// const allFamilyPerAdultActivityRequirements = allFamilyPerAdultRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof ActivityRequirement -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as ActivityRequirement[]); - -// const allIndividualRequirements = -// policy.volunteerPolicy?.volunteerRoles -// ? Object.entries(policy.volunteerPolicy.volunteerRoles) -// .reduce((previous, [, value]) => -// previous.concat((value.policyVersions?.map(policyVersion => policyVersion.requirements || []).flat()) || []), -// [] as VolunteerApprovalRequirement[]) -// : ([] as VolunteerApprovalRequirement[]); -// const allIndividualDocumentRequirements = allIndividualRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof FormUploadRequirement && -// requirement.stage === RequirementStage.Application -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as FormUploadRequirement[]); -// const allIndividualActivityRequirements = allIndividualRequirements -// .reduce((previous, requirement) => -// policy.actionDefinitions![requirement.actionName!] instanceof ActivityRequirement && -// requirement.stage === RequirementStage.Application -// ? previous.concat(policy.actionDefinitions![requirement.actionName!]) -// : previous, [] as ActivityRequirement[]); - -// const individualDocumentRequirements = -// allFamilyPerAdultDocumentRequirements.concat(allIndividualDocumentRequirements) -// .reduce((previous, requirement) => -// previous.filter(x => x.formName === requirement.formName).length === 0 -// ? previous.concat(requirement) -// : previous, [] as FormUploadRequirement[]); -// const individualActivityRequirements = -// allFamilyPerAdultActivityRequirements.concat(allIndividualActivityRequirements) -// .reduce((previous, requirement) => -// previous.filter(x => x.activityName === requirement.activityName).length === 0 -// ? previous.concat(requirement) -// : previous, [] as ActivityRequirement[]); - -// function openVolunteerFamily(volunteerFamilyId: string) { -// appNavigate.family(volunteerFamilyId); -// } - -// const [drawerOpen, setDrawerOpen] = useState(false); - -// return ( -// -// -// -// -// -// -// First Name -// Last Name -// {familyJointDocumentRequirements.map(requirement => -// ({requirement.formName}))} -// {familyJointActivityRequirements.map(requirement => -// ({requirement.activityName}))} -// {individualDocumentRequirements.map(requirement => -// ({requirement.formName}))} -// {individualActivityRequirements.map(requirement => -// ({requirement.activityName}))} -// -// -// -// {volunteerFamilies.map((volunteerFamily) => ( -// -// openVolunteerFamily(volunteerFamily.family!.id!)}> -// { -// volunteerFamily.family?.adults -// ?.filter(adult => adult.item1?.id === volunteerFamily.family?.primaryFamilyContactPersonId) -// [0]?.item1?.lastName + " Family" -// } -// {familyJointDocumentRequirements.map(requirement => -// ({ -// 'TODO' -// /* TODO: Is this met? If not, is it missing for a role this family has? */ -// }))} -// {familyJointActivityRequirements.map(requirement => -// (***))} -// -// -// {volunteerFamily.family?.adults?.map(adult => adult.item1 && ( -// -// {adult.item1.firstName} -// {adult.item1.lastName} -// -// {individualDocumentRequirements.map(requirement => -// (...))} -// {individualActivityRequirements.map(requirement => -// (***))} -// -// ))} -// -// ))} -// -//
-// -// setDrawerOpen(false)}> -// Volunteer Family & Individual Records -// -// -// -// ); -// } - -// export { VolunteerApplications }; diff --git a/src/caretogether-pwa/src/Volunteers/Volunteers.tsx b/src/caretogether-pwa/src/Volunteers/Volunteers.tsx index 372fe4929..814013b10 100644 --- a/src/caretogether-pwa/src/Volunteers/Volunteers.tsx +++ b/src/caretogether-pwa/src/Volunteers/Volunteers.tsx @@ -1,6 +1,5 @@ import { Navigate, Route, Routes, useMatch } from 'react-router-dom'; import { VolunteerApproval } from './VolunteerApprovalTab/VolunteerApproval'; -//import { VolunteerApplications } from './VolunteerApplications'; import { VolunteerProgress } from './VolunteerProgressTab/VolunteerProgress'; import { useSessionStorage } from '../Hooks/useSessionStorage'; @@ -29,7 +28,6 @@ function Volunteers() { /> } /> - {/* } /> */} Date: Tue, 26 May 2026 14:05:16 -0300 Subject: [PATCH 2/3] Upgrade MUI from v6 to v7 --- src/caretogether-pwa/package-lock.json | 199 ++++++------------ src/caretogether-pwa/package.json | 8 +- .../src/Communities/AddEditCommunity.tsx | 11 +- .../src/Communities/AddMemberFamiliesForm.tsx | 2 +- .../src/Communities/AddRoleAssignmentForm.tsx | 2 +- .../src/Communities/CommunitiesList.tsx | 10 +- .../CommunityDocumentUploadForm.tsx | 13 +- .../src/Communities/CommunityDocuments.tsx | 4 +- .../src/Communities/CommunityScreen.tsx | 2 +- .../src/Dashboard/DashboardCalendar.tsx | 3 +- .../src/Families/AddAdultDialog.tsx | 19 +- .../src/Families/AddChildDialog.tsx | 19 +- .../src/Families/AddressEditor.tsx | 2 +- .../src/Families/AdultCard.tsx | 2 +- .../AdultFamilyRelationshipEditor.tsx | 2 +- .../src/Families/AgeEditor.tsx | 2 +- .../src/Families/AssignmentsSection.tsx | 3 +- .../ChildCustodyRelationshipEditor.tsx | 3 +- .../src/Families/ConcernsEditor.tsx | 17 +- .../src/Families/EmailAddressEditor.tsx | 2 +- .../src/Families/EthnicityEditor.tsx | 3 +- .../src/Families/FamilyScreen.tsx | 11 +- .../src/Families/GenderEditor.tsx | 2 +- .../src/Families/ManageUserDrawer.tsx | 2 +- .../src/Families/NameEditor.tsx | 3 +- .../src/Families/NotesEditor.tsx | 3 +- .../src/Families/PhoneNumberEditor.tsx | 2 +- .../CustomFieldsFilterSelect.tsx | 2 +- .../src/Generic/ShellDrawer.tsx | 10 +- .../src/Hooks/useSidePanel.tsx | 10 +- .../src/Notes/AddEditNoteDialog.tsx | 5 +- .../Requirements/MissingRequirementDialog.tsx | 2 +- .../Locations/AddLocationSidePanel.tsx | 3 +- .../Tabs/AccessLevels/AccessLevels.tsx | 14 +- .../Tabs/AccessLevels/AddAccessLevel.tsx | 3 +- .../src/Settings/Roles/AddRole.tsx | 2 +- .../src/Settings/SettingsScreen.tsx | 2 +- .../src/Shell/ShellBottomNavigation.tsx | 6 +- .../src/Shell/ShellSideNavigation.tsx | 22 +- src/caretogether-pwa/src/Support.tsx | 2 +- .../ArrangementCardDetailsSection.tsx | 2 +- .../ArrangementPlannedDuration.tsx | 3 +- .../ArrangementsSection.tsx | 3 +- .../AssignArrangementFunctionDialog.tsx | 5 +- .../Arrangements/CancelArrangementDialog.tsx | 2 +- .../Arrangements/CreateArrangementDialog.tsx | 5 +- .../V1Cases/Arrangements/EditDateDialog.tsx | 2 +- .../Arrangements/EndArrangementDialog.tsx | 2 +- .../Arrangements/ReopenArrangementDialog.tsx | 3 +- .../Arrangements/StartArrangementDialog.tsx | 2 +- .../Arrangements/TrackChildLocationDialog.tsx | 5 +- .../src/V1Cases/CloseV1CaseDialog.tsx | 5 +- .../V1Cases/CreatePartneringFamilyDrawer.tsx | 31 +-- .../src/V1Cases/OpenNewV1CaseDialog.tsx | 2 +- .../src/V1Cases/PartneringFamilies.tsx | 2 +- ...eringFamilyCustomFieldFiltersSidePanel.tsx | 3 +- .../PartneringFamilyTableItem.tsx | 3 +- .../src/V1Referrals/AddNewReferralDrawer.tsx | 15 +- .../src/V1Referrals/CloseV1ReferralDrawer.tsx | 7 +- .../src/V1Referrals/EditReferralDrawer.tsx | 15 +- .../ReferralCustomFieldsSection.tsx | 3 +- .../src/V1Referrals/ReferralDetailsPage.tsx | 6 +- .../SelectReferralFamilyDrawer.tsx | 9 +- .../src/V1Referrals/V1Referrals.tsx | 4 +- .../src/Volunteers/BulkSmsSideSheet.tsx | 12 +- .../CreateVolunteerFamilyDialog.tsx | 19 +- .../src/Volunteers/RemoveFamilyRoleDialog.tsx | 5 +- .../Volunteers/RemoveIndividualRoleDialog.tsx | 5 +- .../src/Volunteers/ResetFamilyRoleDialog.tsx | 2 +- .../Volunteers/ResetIndividualRoleDialog.tsx | 2 +- .../VolunteerApproval.tsx | 2 +- .../VolunteerApprovalTableItem.tsx | 2 +- .../VolunteerCustomFieldFiltersSidePanel.tsx | 3 +- .../VolunteerProgress.tsx | 2 +- 74 files changed, 317 insertions(+), 310 deletions(-) diff --git a/src/caretogether-pwa/package-lock.json b/src/caretogether-pwa/package-lock.json index e27147304..4a1164f67 100644 --- a/src/caretogether-pwa/package-lock.json +++ b/src/caretogether-pwa/package-lock.json @@ -20,10 +20,10 @@ "@hookform/resolvers": "^5.2.2", "@microsoft/applicationinsights-react-js": "^17.3.0", "@microsoft/applicationinsights-web": "^3.3.0", - "@mui/icons-material": "6.5.0", - "@mui/lab": "6.0.1-beta.36", - "@mui/material": "6.5.0", - "@mui/system": "6.5.0", + "@mui/icons-material": "7.3.11", + "@mui/lab": "7.0.1-beta.25", + "@mui/material": "7.3.11", + "@mui/system": "7.3.11", "@mui/x-date-pickers": "7.29.4", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^14.3.1", @@ -766,44 +766,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@floating-ui/core": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz", - "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==", - "license": "MIT", - "dependencies": { - "@floating-ui/utils": "^0.2.11" - } - }, - "node_modules/@floating-ui/dom": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz", - "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==", - "license": "MIT", - "dependencies": { - "@floating-ui/core": "^1.7.5", - "@floating-ui/utils": "^0.2.11" - } - }, - "node_modules/@floating-ui/react-dom": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz", - "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==", - "license": "MIT", - "dependencies": { - "@floating-ui/dom": "^1.7.6" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@floating-ui/utils": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz", - "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==", - "license": "MIT" - }, "node_modules/@fullcalendar/core": { "version": "6.1.20", "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.20.tgz", @@ -1164,43 +1126,10 @@ "@nevware21/ts-utils": ">= 0.10.4 < 2.x" } }, - "node_modules/@mui/base": { - "version": "5.0.0-beta.70", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.70.tgz", - "integrity": "sha512-Tb/BIhJzb0pa5zv/wu7OdokY9ZKEDqcu1BDFnohyvGCoHuSXbEr90rPq1qeNW3XvTBIbNWHEF7gqge+xpUo6tQ==", - "deprecated": "This package has been replaced by @base-ui/react", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@floating-ui/react-dom": "^2.1.1", - "@mui/types": "~7.2.24", - "@mui/utils": "^6.4.8", - "@popperjs/core": "^2.11.8", - "clsx": "^2.1.1", - "prop-types": "^15.8.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui-org" - }, - "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mui/core-downloads-tracker": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.5.0.tgz", - "integrity": "sha512-LGb8t8i6M2ZtS3Drn3GbTI1DVhDY6FJ9crEey2lZ0aN2EMZo8IZBZj9wRf4vqbZHaWjsYgtbOnJw5V8UWbmK2Q==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.11.tgz", + "integrity": "sha512-a7I/b/nBTdXYz2cOSlEmkQ9WWE1x8FHpqMhFPp+Y1VPFxcOw91G5ELOHARQAGSPy5V+UCgJua6K/1x70bAtQPw==", "license": "MIT", "funding": { "type": "opencollective", @@ -1208,12 +1137,12 @@ } }, "node_modules/@mui/icons-material": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.5.0.tgz", - "integrity": "sha512-VPuPqXqbBPlcVSA0BmnoE4knW4/xG6Thazo8vCLWkOKusko6DtwFV6B665MMWJ9j0KFohTIf3yx2zYtYacvG1g==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.3.11.tgz", + "integrity": "sha512-+hz5ilwHZ3djd5es3sCErLioqe/NhZcYTsV/TNXZAMdJdb23F4xzJjqnnZdnurc3S1+ietcssRNqieOhPQLZ7Q==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0" + "@babel/runtime": "^7.28.6" }, "engines": { "node": ">=14.0.0" @@ -1223,7 +1152,7 @@ "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^6.5.0", + "@mui/material": "^7.3.11", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -1234,16 +1163,15 @@ } }, "node_modules/@mui/lab": { - "version": "6.0.1-beta.36", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.1-beta.36.tgz", - "integrity": "sha512-af9lDmA9SZGEWF1XXk0EVBpfCITk9IKsvh9lLOZGdYaaHfQeCsqxGEDMvNO66j0P8EYoxpyry84LFCJYuLVtVw==", + "version": "7.0.1-beta.25", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.1-beta.25.tgz", + "integrity": "sha512-itd2o0dKv8/1ZhAWTOkP+ZxiztC2dJ6rY0ECZFt3l3ylinShOfhgjbuqgS98M4UFIVzVLM5ynn+WhkEIp/5CMg==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/base": "5.0.0-beta.70", - "@mui/system": "^6.5.0", - "@mui/types": "~7.2.24", - "@mui/utils": "^6.4.9", + "@babel/runtime": "^7.28.6", + "@mui/system": "^7.3.11", + "@mui/types": "^7.4.12", + "@mui/utils": "^7.3.11", "clsx": "^2.1.1", "prop-types": "^15.8.1" }, @@ -1257,8 +1185,8 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material": "^6.5.0", - "@mui/material-pigment-css": "^6.5.0", + "@mui/material": "^7.3.11", + "@mui/material-pigment-css": "^7.3.11", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1279,22 +1207,22 @@ } }, "node_modules/@mui/material": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.5.0.tgz", - "integrity": "sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.11.tgz", + "integrity": "sha512-yq8bPc3LxOwKRWpcjRgDkYFmpM6aKlARfESTmOQcvLYFeJwtHte2tw6hJDrb8sk8wcvpDprHEHVaoUU0MslIkw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/core-downloads-tracker": "^6.5.0", - "@mui/system": "^6.5.0", - "@mui/types": "~7.2.24", - "@mui/utils": "^6.4.9", + "@babel/runtime": "^7.28.6", + "@mui/core-downloads-tracker": "^7.3.11", + "@mui/system": "^7.3.11", + "@mui/types": "^7.4.12", + "@mui/utils": "^7.3.11", "@popperjs/core": "^2.11.8", "@types/react-transition-group": "^4.4.12", "clsx": "^2.1.1", - "csstype": "^3.1.3", + "csstype": "^3.2.3", "prop-types": "^15.8.1", - "react-is": "^19.0.0", + "react-is": "^19.2.3", "react-transition-group": "^4.4.5" }, "engines": { @@ -1307,7 +1235,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@mui/material-pigment-css": "^6.5.0", + "@mui/material-pigment-css": "^7.3.11", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" @@ -1328,13 +1256,13 @@ } }, "node_modules/@mui/private-theming": { - "version": "6.4.9", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.9.tgz", - "integrity": "sha512-LktcVmI5X17/Q5SkwjCcdOLBzt1hXuc14jYa7NPShog0GBDCDvKtcnP0V7a2s6EiVRlv7BzbWEJzH6+l/zaCxw==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.11.tgz", + "integrity": "sha512-9B+YKms0fRHbNrqp9tOT/DNbNnU5gyvJ1o3qAGXfq8GmZcbJnE3At9x07Zr/o0pkhzg4aDdwXVqe4+AcgtOCPA==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/utils": "^6.4.9", + "@babel/runtime": "^7.28.6", + "@mui/utils": "^7.3.11", "prop-types": "^15.8.1" }, "engines": { @@ -1355,16 +1283,16 @@ } }, "node_modules/@mui/styled-engine": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.5.0.tgz", - "integrity": "sha512-8woC2zAqF4qUDSPIBZ8v3sakj+WgweolpyM/FXf8jAx6FMls+IE4Y8VDZc+zS805J7PRz31vz73n2SovKGaYgw==", + "version": "7.3.10", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.10.tgz", + "integrity": "sha512-WxE9SiF8xskAQqGjsp0poXCkCqsoXFEsSr0HBXfApmGHR+DBnXRp+z46Vsltg4gpPM4Z96DeAQRpeAOnhNg7Ng==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@emotion/cache": "^11.13.5", + "@babel/runtime": "^7.28.6", + "@emotion/cache": "^11.14.0", "@emotion/serialize": "^1.3.3", "@emotion/sheet": "^1.4.0", - "csstype": "^3.1.3", + "csstype": "^3.2.3", "prop-types": "^15.8.1" }, "engines": { @@ -1389,18 +1317,18 @@ } }, "node_modules/@mui/system": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.5.0.tgz", - "integrity": "sha512-XcbBYxDS+h/lgsoGe78ExXFZXtuIlSBpn/KsZq8PtZcIkUNJInkuDqcLd2rVBQrDC1u+rvVovdaWPf2FHKJf3w==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.11.tgz", + "integrity": "sha512-7izwGWdNawAKpBKcRlx7f2gFnAAjmASBWvMcyX4YYEeLOFsbfGRbUYGInvnAcUeql3rPxI7F9Ft4oY2OLRz44g==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/private-theming": "^6.4.9", - "@mui/styled-engine": "^6.5.0", - "@mui/types": "~7.2.24", - "@mui/utils": "^6.4.9", + "@babel/runtime": "^7.28.6", + "@mui/private-theming": "^7.3.11", + "@mui/styled-engine": "^7.3.10", + "@mui/types": "^7.4.12", + "@mui/utils": "^7.3.11", "clsx": "^2.1.1", - "csstype": "^3.1.3", + "csstype": "^3.2.3", "prop-types": "^15.8.1" }, "engines": { @@ -1429,10 +1357,13 @@ } }, "node_modules/@mui/types": { - "version": "7.2.24", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.24.tgz", - "integrity": "sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==", + "version": "7.4.12", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.12.tgz", + "integrity": "sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==", "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.28.6" + }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, @@ -1443,17 +1374,17 @@ } }, "node_modules/@mui/utils": { - "version": "6.4.9", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.9.tgz", - "integrity": "sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==", + "version": "7.3.11", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.11.tgz", + "integrity": "sha512-XTjGnifwteg71/ij+0e7Y7d+hwyntMYP5wPoA/g2drdGH+Flkvjwy0OfrVpKBbaOvofq4zU/LIyUZyKgmWu18g==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.26.0", - "@mui/types": "~7.2.24", - "@types/prop-types": "^15.7.14", + "@babel/runtime": "^7.28.6", + "@mui/types": "^7.4.12", + "@types/prop-types": "^15.7.15", "clsx": "^2.1.1", "prop-types": "^15.8.1", - "react-is": "^19.0.0" + "react-is": "^19.2.3" }, "engines": { "node": ">=14.0.0" diff --git a/src/caretogether-pwa/package.json b/src/caretogether-pwa/package.json index 307775d16..a06c97ba3 100644 --- a/src/caretogether-pwa/package.json +++ b/src/caretogether-pwa/package.json @@ -16,10 +16,10 @@ "@hookform/resolvers": "^5.2.2", "@microsoft/applicationinsights-react-js": "^17.3.0", "@microsoft/applicationinsights-web": "^3.3.0", - "@mui/icons-material": "6.5.0", - "@mui/lab": "6.0.1-beta.36", - "@mui/material": "6.5.0", - "@mui/system": "6.5.0", + "@mui/icons-material": "7.3.11", + "@mui/lab": "7.0.1-beta.25", + "@mui/material": "7.3.11", + "@mui/system": "7.3.11", "@mui/x-date-pickers": "7.29.4", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^14.3.1", diff --git a/src/caretogether-pwa/src/Communities/AddEditCommunity.tsx b/src/caretogether-pwa/src/Communities/AddEditCommunity.tsx index 5ab0b8608..431878695 100644 --- a/src/caretogether-pwa/src/Communities/AddEditCommunity.tsx +++ b/src/caretogether-pwa/src/Communities/AddEditCommunity.tsx @@ -1,4 +1,5 @@ -import { Button, Grid, TextField } from '@mui/material'; +import { Button, TextField } from '@mui/material'; +import Grid from '@mui/material/Grid'; import { Community, CreateCommunity, @@ -69,10 +70,10 @@ export function AddEditCommunity({ return ( - +

{community ? 'Edit Community' : 'Add New Community'}

 - + setName(e.target.value)} /> - + setDescription(e.target.value)} /> - +