From ef1cb4102fa238ede8224e93fa3d7e4e574f7f6c Mon Sep 17 00:00:00 2001 From: Sofia Date: Sat, 4 May 2024 21:13:35 -0500 Subject: [PATCH 1/4] MUI updated package installed --- package-lock.json | 328 ++++++++++++++++++++++++++++------------------ package.json | 8 +- 2 files changed, 204 insertions(+), 132 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76cec692c..0ca3e7036 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,13 +10,15 @@ "license": "ISC", "dependencies": { "@chronosmicro/tracker": "^12.0.1", - "@emotion/react": "^11.11.1", - "@emotion/styled": "^11.11.0", + "@emotion/react": "^11.11.4", + "@emotion/styled": "^11.11.5", "@jest/types": "^29.6.1", "@material-ui/core": "^4.12.4", "@material-ui/data-grid": "^4.0.0-alpha.37", "@material-ui/icons": "^4.11.3", - "@mui/material": "^5.14.5", + "@mui/icons-material": "^5.15.16", + "@mui/material": "^5.15.16", + "@mui/styles": "^5.15.16", "@types/node": "^18.17.1", "3d-force-graph": "^1.72.2", "aws-sdk": "^2.1317.0", @@ -2384,9 +2386,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz", - "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==", + "version": "7.24.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", + "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2731,9 +2733,9 @@ "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" }, "node_modules/@emotion/is-prop-valid": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz", - "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", "dependencies": { "@emotion/memoize": "^0.8.1" } @@ -2744,14 +2746,14 @@ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/react": { - "version": "11.11.1", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.1.tgz", - "integrity": "sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", "@emotion/cache": "^11.11.0", - "@emotion/serialize": "^1.1.2", + "@emotion/serialize": "^1.1.3", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", "@emotion/utils": "^1.2.1", "@emotion/weak-memoize": "^0.3.1", @@ -2767,9 +2769,9 @@ } }, "node_modules/@emotion/serialize": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz", - "integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz", + "integrity": "sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==", "dependencies": { "@emotion/hash": "^0.9.1", "@emotion/memoize": "^0.8.1", @@ -2784,14 +2786,14 @@ "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" }, "node_modules/@emotion/styled": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.0.tgz", - "integrity": "sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==", + "version": "11.11.5", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.5.tgz", + "integrity": "sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", - "@emotion/is-prop-valid": "^1.2.1", - "@emotion/serialize": "^1.1.2", + "@emotion/is-prop-valid": "^1.2.2", + "@emotion/serialize": "^1.1.4", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", "@emotion/utils": "^1.2.1" }, @@ -2834,28 +2836,28 @@ "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" }, "node_modules/@floating-ui/core": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", - "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.1.tgz", + "integrity": "sha512-42UH54oPZHPdRHdw6BgoBD6cg/eVTmVrFcgeRDM3jbO7uxSoipVcmcIGFcA5jmOHO5apcyvBhkSKES3fQJnu7A==", "dependencies": { - "@floating-ui/utils": "^0.1.1" + "@floating-ui/utils": "^0.2.0" } }, "node_modules/@floating-ui/dom": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz", - "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.4.tgz", + "integrity": "sha512-0G8R+zOvQsAG1pg2Q99P21jiqxqGBW1iRe/iXHsBRBxnpXKFI8QwbB4x5KmYLggNO5m34IQgOIu9SCRfR/WWiQ==", "dependencies": { - "@floating-ui/core": "^1.4.1", - "@floating-ui/utils": "^0.1.1" + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" } }, "node_modules/@floating-ui/react-dom": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz", - "integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.9.tgz", + "integrity": "sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==", "dependencies": { - "@floating-ui/dom": "^1.3.0" + "@floating-ui/dom": "^1.0.0" }, "peerDependencies": { "react": ">=16.8.0", @@ -2863,9 +2865,9 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", - "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz", + "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==" }, "node_modules/@grpc/grpc-js": { "version": "1.9.1", @@ -3999,26 +4001,24 @@ } }, "node_modules/@mui/base": { - "version": "5.0.0-beta.12", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.12.tgz", - "integrity": "sha512-tZjjXNAyUpwSDT1uRliZMhRQkWYzELJ8Qi61EuOMRpi36HIwnK2T7Nr4RI423Sv8G2EEikDAZj7je33eNd73NQ==", - "dependencies": { - "@babel/runtime": "^7.22.10", - "@emotion/is-prop-valid": "^1.2.1", - "@floating-ui/react-dom": "^2.0.1", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.6", + "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==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@floating-ui/react-dom": "^2.0.8", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", "@popperjs/core": "^2.11.8", - "clsx": "^2.0.0", - "prop-types": "^15.8.1", - "react-is": "^18.2.0" + "clsx": "^2.1.0", + "prop-types": "^15.8.1" }, "engines": { "node": ">=12.0.0" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -4032,36 +4032,61 @@ } }, "node_modules/@mui/base/node_modules/clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", "engines": { "node": ">=6" } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.6.tgz", - "integrity": "sha512-QZEU3pyGWLuaHbxvOlShol7U1FVgzWBR0OH9H8D7L8w4/vto5N5jJVvlqFQS3T0zbR6YGHxFaiL6Ky87jQg7aw==", + "version": "5.15.16", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.16.tgz", + "integrity": "sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==", "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" + } + }, + "node_modules/@mui/icons-material": { + "version": "5.15.16", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.16.tgz", + "integrity": "sha512-s8vYbyACzTNZRKv+20fCfVXJwJqNcVotns2EKnu1wmAga6wv2LAo5kB1d5yqQqZlMFtp34EJvRXf7cy8X0tJVA==", + "dependencies": { + "@babel/runtime": "^7.23.9" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@mui/material": "^5.0.0", + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@mui/material": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.6.tgz", - "integrity": "sha512-C3UgGrmtvcGkQkm0ONBU7bTdapTjQc2Se3b2354xMmU7lgSgW7VM6EP9wIH5XqqoJ60m9l/s9kbTWX0Y+EaWvA==", - "dependencies": { - "@babel/runtime": "^7.22.10", - "@mui/base": "5.0.0-beta.12", - "@mui/core-downloads-tracker": "^5.14.6", - "@mui/system": "^5.14.6", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.6", - "@types/react-transition-group": "^4.4.6", - "clsx": "^2.0.0", - "csstype": "^3.1.2", + "version": "5.15.16", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.16.tgz", + "integrity": "sha512-ery2hFReewko9gpDBqOr2VmXwQG9ifXofPhGzIx09/b9JqCQC/06kZXZDGGrOTpIddK9HlIf4yrS+G70jPAzUQ==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/base": "5.0.0-beta.40", + "@mui/core-downloads-tracker": "^5.15.16", + "@mui/system": "^5.15.15", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "@types/react-transition-group": "^4.4.10", + "clsx": "^2.1.0", + "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^18.2.0", "react-transition-group": "^4.4.5" @@ -4071,7 +4096,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -4093,20 +4118,20 @@ } }, "node_modules/@mui/material/node_modules/clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", "engines": { "node": ">=6" } }, "node_modules/@mui/private-theming": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.14.6.tgz", - "integrity": "sha512-3VBLFGizBXfofyk33bwRg6t9L648aKnLmOKPfY1wFuiXq3AEYwobK65iDci/tHKxm/VKbZ6A7PFjLejvB3EvRQ==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.15.14.tgz", + "integrity": "sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==", "dependencies": { - "@babel/runtime": "^7.22.10", - "@mui/utils": "^5.14.6", + "@babel/runtime": "^7.23.9", + "@mui/utils": "^5.15.14", "prop-types": "^15.8.1" }, "engines": { @@ -4114,7 +4139,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -4127,13 +4152,13 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.14.6.tgz", - "integrity": "sha512-I6zeu/OP1Hk4NsX1Oj85TiYl1dER0JMsLJVn76J1Ihl24A5EbiZQKJp3Mn+ufA79ypkdAvM9aQCAQyiVBFcUHg==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.15.14.tgz", + "integrity": "sha512-RILkuVD8gY6PvjZjqnWhz8fu68dVkqhM5+jYWfB5yhlSQKg+2rHkmEwm75XIeAqI3qwOndK6zELK5H6Zxn4NHw==", "dependencies": { - "@babel/runtime": "^7.22.10", + "@babel/runtime": "^7.23.9", "@emotion/cache": "^11.11.0", - "csstype": "^3.1.2", + "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { @@ -4141,7 +4166,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.4.1", @@ -4157,18 +4182,66 @@ } } }, + "node_modules/@mui/styles": { + "version": "5.15.16", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.16.tgz", + "integrity": "sha512-WDv0M69fdfG8yJ5bmR8K81u+a7N/akSyVswKUavz//09EGS2cjPtInJspskMQNpZl2ReC5x/YEmkL+i5/PnmtA==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@emotion/hash": "^0.9.1", + "@mui/private-theming": "^5.15.14", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.0", + "csstype": "^3.1.3", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.10.0", + "jss-plugin-camel-case": "^10.10.0", + "jss-plugin-default-unit": "^10.10.0", + "jss-plugin-global": "^10.10.0", + "jss-plugin-nested": "^10.10.0", + "jss-plugin-props-sort": "^10.10.0", + "jss-plugin-rule-value-function": "^10.10.0", + "jss-plugin-vendor-prefixer": "^10.10.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/styles/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } + }, "node_modules/@mui/system": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.14.6.tgz", - "integrity": "sha512-/n0ae1MegWjiV1BpRU8jgg4E0zBjeB2VYsT/68ag/xaDuq3/TaDKJeT9REIvyBvwlG3CI3S2O+tRELktxCD1kg==", - "dependencies": { - "@babel/runtime": "^7.22.10", - "@mui/private-theming": "^5.14.6", - "@mui/styled-engine": "^5.14.6", - "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.6", - "clsx": "^2.0.0", - "csstype": "^3.1.2", + "version": "5.15.15", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.15.15.tgz", + "integrity": "sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/private-theming": "^5.15.14", + "@mui/styled-engine": "^5.15.14", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.0", + "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { @@ -4176,7 +4249,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -4197,19 +4270,19 @@ } }, "node_modules/@mui/system/node_modules/clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", "engines": { "node": ">=6" } }, "node_modules/@mui/types": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.4.tgz", - "integrity": "sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA==", + "version": "7.2.14", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.14.tgz", + "integrity": "sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==", "peerDependencies": { - "@types/react": "*" + "@types/react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -4218,13 +4291,12 @@ } }, "node_modules/@mui/utils": { - "version": "5.14.6", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.6.tgz", - "integrity": "sha512-AznpqLu6hrFnpHgcvsSSMCG+cDbkcCYfo+daUwBVReNYv4l+NQ8+wvBAF4aUMi155N7xWbbgh0cyKs6Wdsm3aA==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.15.14.tgz", + "integrity": "sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==", "dependencies": { - "@babel/runtime": "^7.22.10", - "@types/prop-types": "^15.7.5", - "@types/react-is": "^18.2.1", + "@babel/runtime": "^7.23.9", + "@types/prop-types": "^15.7.11", "prop-types": "^15.8.1", "react-is": "^18.2.0" }, @@ -4233,10 +4305,16 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@plotly/d3": { @@ -5548,9 +5626,9 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/qs": { "version": "6.9.7", @@ -5583,18 +5661,10 @@ "@types/react": "^17" } }, - "node_modules/@types/react-is": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.1.tgz", - "integrity": "sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==", - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/react-transition-group": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz", - "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } @@ -8065,9 +8135,9 @@ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/d": { "version": "1.0.1", diff --git a/package.json b/package.json index 982f86b78..08f173924 100644 --- a/package.json +++ b/package.json @@ -9,13 +9,15 @@ }, "dependencies": { "@chronosmicro/tracker": "^12.0.1", - "@emotion/react": "^11.11.1", - "@emotion/styled": "^11.11.0", + "@emotion/react": "^11.11.4", + "@emotion/styled": "^11.11.5", "@jest/types": "^29.6.1", "@material-ui/core": "^4.12.4", "@material-ui/data-grid": "^4.0.0-alpha.37", "@material-ui/icons": "^4.11.3", - "@mui/material": "^5.14.5", + "@mui/icons-material": "^5.15.16", + "@mui/material": "^5.15.16", + "@mui/styles": "^5.15.16", "@types/node": "^18.17.1", "3d-force-graph": "^1.72.2", "aws-sdk": "^2.1317.0", From c8c5ccdd491f69ff44ca51459b43dfed98d9a36d Mon Sep 17 00:00:00 2001 From: Sofia Date: Sat, 4 May 2024 22:37:08 -0500 Subject: [PATCH 2/4] main MUI update, app working --- __backend-tests__/chronosMethods.test.js | 2 +- app/charts/RouteChart.jsx | 2 +- .../ApplicationsCard/ApplicationsCard.tsx | 10 +++---- app/components/AwsEC2Graphs.tsx | 4 +-- app/components/ClusterTable.tsx | 4 +-- app/components/Copyright.tsx | 4 +-- .../DashboardIcons/DashboardIcons.tsx | 10 +++---- app/components/Occupied/Occupied.tsx | 4 +-- app/components/Occupied/helpers/muiHelper.ts | 8 ++--- app/components/TransferColumns.tsx | 2 +- app/components/WindowBar/WindowBar.tsx | 6 ++-- .../AWSGraphsContainer/AWSGraphsContainer.tsx | 2 +- app/containers/DockerHealthContainer.tsx | 2 +- app/containers/EventContainer.tsx | 2 +- .../ModifyMetricsContainer.tsx | 2 +- .../SidebarContainer/SidebarContainer.tsx | 8 ++--- app/index.tsx | 30 ++++++++++++++----- app/modals/EnvModal/EnvModal.tsx | 4 +-- app/modals/UserModal/UserModal.tsx | 4 +-- 19 files changed, 63 insertions(+), 47 deletions(-) diff --git a/__backend-tests__/chronosMethods.test.js b/__backend-tests__/chronosMethods.test.js index fadd2d168..4b91e5dff 100644 --- a/__backend-tests__/chronosMethods.test.js +++ b/__backend-tests__/chronosMethods.test.js @@ -1,4 +1,4 @@ -const { EcoTwoTone } = require('@material-ui/icons'); +const { EcoTwoTone } = require('@mui/icons-material'); const Chronos = require('../chronos_npm_package/chronos.js'); const helpers = require('../chronos_npm_package/controllers/utilities.js'); const hpropagate = require('hpropagate'); diff --git a/app/charts/RouteChart.jsx b/app/charts/RouteChart.jsx index b3e139a90..ca6e2c317 100644 --- a/app/charts/RouteChart.jsx +++ b/app/charts/RouteChart.jsx @@ -1,4 +1,4 @@ -import { makeStyles } from '@material-ui/core/styles'; +import { makeStyles } from '@mui/styles'; import React, { useContext } from 'react'; import Graph from 'react-graph-vis'; import { CommsContext } from '../context/CommsContext'; diff --git a/app/components/ApplicationsCard/ApplicationsCard.tsx b/app/components/ApplicationsCard/ApplicationsCard.tsx index 829c9bb4f..0dc5ed68e 100644 --- a/app/components/ApplicationsCard/ApplicationsCard.tsx +++ b/app/components/ApplicationsCard/ApplicationsCard.tsx @@ -1,11 +1,11 @@ import React, { useContext, useRef } from "react"; import { useNavigate } from 'react-router-dom'; -import { Card,CardHeader,IconButton,CardContent,Typography } from "@material-ui/core"; +import { Card,CardHeader,IconButton,CardContent,Typography } from "@mui/material"; import { DashboardContext } from "../../context/DashboardContext"; import { ApplicationContext } from "../../context/ApplicationContext"; -import HighlightOffIcon from '@material-ui/icons/HighlightOff'; -import UpdateIcon from '@material-ui/icons/Update'; +import HighlightOffIcon from '@mui/icons-material/HighlightOff'; +import UpdateIcon from '@mui/icons-material/Update'; import './styles.scss' type ClickEvent = React.MouseEvent; @@ -84,7 +84,7 @@ const ApplicationsCard = (props) => { className={classes.iconbutton} aria-label="Delete" onClick={event => confirmDelete(event, i)} - > + size="large"> { - ) + ); } export default ApplicationsCard \ No newline at end of file diff --git a/app/components/AwsEC2Graphs.tsx b/app/components/AwsEC2Graphs.tsx index 36b539bf4..6c94eb275 100644 --- a/app/components/AwsEC2Graphs.tsx +++ b/app/components/AwsEC2Graphs.tsx @@ -1,8 +1,8 @@ import React, { useContext, useEffect, useState } from 'react'; import AwsChart from '../charts/AwsChart'; import { AwsContext } from '../context/AwsContext'; -import { CircularProgress } from '@material-ui/core'; -import zIndex from '@material-ui/core/styles/zIndex'; +import { CircularProgress } from '@mui/material'; +// import zIndex from '@mui/styles/zIndex'; const AwsEC2Graphs: React.FC = React.memo(props => { const { awsData, setAwsData, isLoading, setLoadingState } = useContext(AwsContext); diff --git a/app/components/ClusterTable.tsx b/app/components/ClusterTable.tsx index 676eb989c..d1dd88c72 100644 --- a/app/components/ClusterTable.tsx +++ b/app/components/ClusterTable.tsx @@ -7,8 +7,8 @@ import { TableHead, TableRow, Paper, -} from '@material-ui/core'; -import { makeStyles } from '@material-ui/core/styles'; +} from '@mui/material'; +import { makeStyles } from '@mui/styles/'; import { AwsContext } from '../context/AwsContext'; const useStyles = makeStyles({ diff --git a/app/components/Copyright.tsx b/app/components/Copyright.tsx index b941c44bf..9e7b8b951 100644 --- a/app/components/Copyright.tsx +++ b/app/components/Copyright.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { Typography, Link } from '@material-ui/core'; -import { makeStyles } from '@material-ui/core/styles'; +import { Typography, Link } from '@mui/material'; +import { makeStyles } from '@mui/styles'; import '../stylesheets/Applications.scss'; export interface CopyrightProps {} diff --git a/app/components/DashboardIcons/DashboardIcons.tsx b/app/components/DashboardIcons/DashboardIcons.tsx index d9a659e29..9b04d3f04 100644 --- a/app/components/DashboardIcons/DashboardIcons.tsx +++ b/app/components/DashboardIcons/DashboardIcons.tsx @@ -1,10 +1,10 @@ import { CommsContext } from "../../context/CommsContext" import { DashboardContext } from "../../context/DashboardContext" -import DashboardIcon from '@material-ui/icons/Dashboard'; -import NotificationsIcon from '@material-ui/icons/Notifications'; -import Badge from '@material-ui/core/Badge'; -import PersonIcon from '@material-ui/icons/Person'; -import { Button } from '@material-ui/core'; +import DashboardIcon from '@mui/icons-material/Dashboard'; +import NotificationsIcon from '@mui/icons-material/Notifications'; +import Badge from '@mui/material/Badge'; +import PersonIcon from '@mui/icons-material/Person'; +import { Button } from '@mui/material'; import React, { useContext,useState } from "react" import './styles.scss' diff --git a/app/components/Occupied/Occupied.tsx b/app/components/Occupied/Occupied.tsx index 320da8f01..31adaa282 100644 --- a/app/components/Occupied/Occupied.tsx +++ b/app/components/Occupied/Occupied.tsx @@ -7,10 +7,10 @@ import React, { useContext, useEffect, useState } from 'react'; // MATERIAL UI METHODS -import { Modal, Button } from '@material-ui/core'; +import { Modal, Button } from '@mui/material'; // MATERIAL UI ICONS -import AddCircleOutlineTwoToneIcon from '@material-ui/icons/AddCircleOutlineTwoTone'; +import AddCircleOutlineTwoToneIcon from '@mui/icons-material/AddCircleOutlineTwoTone'; // // MODALS // import AddModal from '../modals/AddModal'; diff --git a/app/components/Occupied/helpers/muiHelper.ts b/app/components/Occupied/helpers/muiHelper.ts index 7195b11b3..0f926bd2a 100644 --- a/app/components/Occupied/helpers/muiHelper.ts +++ b/app/components/Occupied/helpers/muiHelper.ts @@ -1,11 +1,11 @@ -import { makeStyles } from '@material-ui/core/styles'; -import { BaseCSSProperties } from '@material-ui/core/styles/withStyles'; +import { makeStyles } from '@mui/styles'; +import { AliasesCSSProperties } from '@mui/system/'; // Conditional Rendering of UI Modals for Light and Dark Mode // Theme, StyleProps -export const useStylesDark = makeStyles(theme => ({ +export const useStylesDark = makeStyles(theme => ({ // ALL CARDS paper: { display: 'flex', @@ -59,7 +59,7 @@ export const useStylesDark = makeStyles(theme => ({ }, })); -export const useStylesLight = makeStyles(theme => ({ +export const useStylesLight = makeStyles(theme => ({ // ALL CARDS paper: { display: 'flex', diff --git a/app/components/TransferColumns.tsx b/app/components/TransferColumns.tsx index dd550f1df..3e9284f35 100644 --- a/app/components/TransferColumns.tsx +++ b/app/components/TransferColumns.tsx @@ -6,7 +6,7 @@ import { EventContext } from '../context/EventContext'; import { DataGrid } from '@material-ui/data-grid'; import * as DashboardContext from '../context/DashboardContext'; import lightAndDark from './Styling'; -import { Button, TextField } from '@material-ui/core'; +import { Button, TextField } from '@mui/material'; import SearchBar from './SearchBar/SearchBar'; diff --git a/app/components/WindowBar/WindowBar.tsx b/app/components/WindowBar/WindowBar.tsx index d5cf95d64..7a6a63190 100644 --- a/app/components/WindowBar/WindowBar.tsx +++ b/app/components/WindowBar/WindowBar.tsx @@ -1,7 +1,7 @@ import React from 'react'; -// import Close from '@material-ui/icons/Close'; -// import Maximize from '@material-ui/icons/CheckBoxOutlineBlankSharp'; -// import Minimize from '@material-ui/icons/RemoveSharp'; +// import Close from '@mui/icons-material/Close'; +// import Maximize from '@mui/icons-material/CheckBoxOutlineBlankSharp'; +// import Minimize from '@mui/icons-material/RemoveSharp'; import './styles.scss'; // const { ipcRenderer } = window.require('electron'); diff --git a/app/containers/AWSGraphsContainer/AWSGraphsContainer.tsx b/app/containers/AWSGraphsContainer/AWSGraphsContainer.tsx index f4a81c585..2a52a67ae 100644 --- a/app/containers/AWSGraphsContainer/AWSGraphsContainer.tsx +++ b/app/containers/AWSGraphsContainer/AWSGraphsContainer.tsx @@ -1,7 +1,7 @@ import React, { useContext, useEffect } from 'react'; import { ApplicationContext } from '../../context/ApplicationContext'; import { DashboardContext } from '../../context/DashboardContext'; -import { Typography } from '@material-ui/core'; +import { Typography } from '@mui/material'; import { AwsContext } from '../../context/AwsContext'; import './styles.scss'; import { useLocation } from 'react-router-dom'; diff --git a/app/containers/DockerHealthContainer.tsx b/app/containers/DockerHealthContainer.tsx index 9f9aeb2e3..fb5a2abbc 100644 --- a/app/containers/DockerHealthContainer.tsx +++ b/app/containers/DockerHealthContainer.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState, useContext } from 'react'; import { HealthContext } from '../context/HealthContext'; import { QueryContext } from '../context/QueryContext'; import GrafanaEventChart from '../charts/GrafanaEventChart/GrafanaEventChart'; -import { Button } from '@material-ui/core'; +import { Button } from '@mui/material'; import { useParams } from 'react-router-dom'; import { stringToColour as colourGenerator } from './GraphsContainer/helpers'; diff --git a/app/containers/EventContainer.tsx b/app/containers/EventContainer.tsx index c62ddc213..33eb2211b 100644 --- a/app/containers/EventContainer.tsx +++ b/app/containers/EventContainer.tsx @@ -4,7 +4,7 @@ import { EventContext } from '../context/EventContext'; import { HealthContext } from '../context/HealthContext'; import { QueryContext } from '../context/QueryContext'; import EventChart from '../charts/EventChart'; -import { Button } from '@material-ui/core'; +import { Button } from '@mui/material'; import GrafanaEventChart from '../charts/GrafanaEventChart/GrafanaEventChart'; import { stringToColour as colourGenerator } from './GraphsContainer/helpers'; diff --git a/app/containers/ModifyMetricsContainer/ModifyMetricsContainer.tsx b/app/containers/ModifyMetricsContainer/ModifyMetricsContainer.tsx index 61dfa18ae..f2535b56c 100644 --- a/app/containers/ModifyMetricsContainer/ModifyMetricsContainer.tsx +++ b/app/containers/ModifyMetricsContainer/ModifyMetricsContainer.tsx @@ -4,7 +4,7 @@ import { ApplicationContext } from '../../context/ApplicationContext'; import * as DashboardContext from '../../context/DashboardContext'; import lightAndDark from '../../components/Styling'; import './styles.scss'; -import { Button } from '@material-ui/core'; +import { Button } from '@mui/material'; const { ipcRenderer } = window.require('electron'); const MetricsContainer: React.FC = React.memo(props => { diff --git a/app/containers/SidebarContainer/SidebarContainer.tsx b/app/containers/SidebarContainer/SidebarContainer.tsx index 14b9c976e..a2449fd5c 100644 --- a/app/containers/SidebarContainer/SidebarContainer.tsx +++ b/app/containers/SidebarContainer/SidebarContainer.tsx @@ -1,10 +1,10 @@ import React, { useContext } from 'react'; import { Link } from 'react-router-dom'; -import ListIcon from '@material-ui/icons/List'; -import InfoIcon from '@material-ui/icons/Info'; -import ContactSupportIcon from '@material-ui/icons/ContactSupport'; -import SettingsIcon from '@material-ui/icons/Settings'; +import ListIcon from '@mui/icons-material/List'; +import InfoIcon from '@mui/icons-material/Info'; +import ContactSupportIcon from '@mui/icons-material/ContactSupport'; +import SettingsIcon from '@mui/icons-material/Settings'; import './styles.scss'; import { ApplicationContext } from '../../context/ApplicationContext'; diff --git a/app/index.tsx b/app/index.tsx index 388162313..ff77f3988 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -1,25 +1,41 @@ import React from 'react'; +// import { adaptV4Theme } from '@mui/styles'; +import { createTheme, adaptV4Theme } from '@mui/material/styles' import ReactDOM from 'react-dom'; // REACT 18 Syntax below // import { createRoot } from 'react-dom/client'; import './index.scss'; -import { createTheme, ThemeProvider } from '@material-ui/core/'; +import { ThemeProvider, Theme, StyledEngineProvider } from '@mui/material'; import App from './App'; import WindowBar from './components/WindowBar/WindowBar'; -const theme = createTheme({ +// declare module '@mui/styles/defaultTheme' { +// // eslint-disable-next-line @typescript-eslint/no-empty-interface +// interface DefaultTheme extends Theme {} +// } + + +const theme = createTheme(adaptV4Theme({ + // v4 theme typography: { fontFamily: ['Roboto', 'sans-serif'].join(','), }, -}); +})); +// const theme = createTheme(adaptV4Theme({ +// typography: { +// fontFamily: ['Roboto', 'sans-serif'].join(','), +// }, +// })); // React 17 Syntax below ReactDOM.render( - - - - , + + + + + + , document.getElementById('app') ); diff --git a/app/modals/EnvModal/EnvModal.tsx b/app/modals/EnvModal/EnvModal.tsx index ac5cfc200..9931b3baa 100644 --- a/app/modals/EnvModal/EnvModal.tsx +++ b/app/modals/EnvModal/EnvModal.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { Button, Typography } from '@material-ui/core'; +import { Button, Typography } from '@mui/material'; import './EnvModal.scss'; -import { CloudQueue, Computer } from '@material-ui/icons'; +import { CloudQueue, Computer } from '@mui/icons-material'; import { TModalSetter } from '../../components/Occupied/types/Occupied'; const EnvModal: React.FC = React.memo( diff --git a/app/modals/UserModal/UserModal.tsx b/app/modals/UserModal/UserModal.tsx index 4fa8696b8..29666275d 100644 --- a/app/modals/UserModal/UserModal.tsx +++ b/app/modals/UserModal/UserModal.tsx @@ -1,11 +1,11 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ import React, { useContext, useState, useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import PersonIcon from '@material-ui/icons/Person'; +import PersonIcon from '@mui/icons-material/Person'; import { DashboardContext } from '../../context/DashboardContext'; import { guestUser } from '../../context/helpers'; import './UserModal.scss'; -import { Button } from '@material-ui/core'; +import { Button } from '@mui/material'; import { TModalSetter } from '../../components/Occupied/types/Occupied'; const { ipcRenderer } = window.require('electron'); From c607f6abb1e4329d03bdbc23c96ef794e7927f50 Mon Sep 17 00:00:00 2001 From: Sofia Date: Sat, 4 May 2024 23:25:15 -0500 Subject: [PATCH 3/4] final MUI update before deleting old version. app not crashed --- app/components/Occupied/helpers/muiHelper.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/Occupied/helpers/muiHelper.ts b/app/components/Occupied/helpers/muiHelper.ts index 0f926bd2a..e06ae8f1d 100644 --- a/app/components/Occupied/helpers/muiHelper.ts +++ b/app/components/Occupied/helpers/muiHelper.ts @@ -1,11 +1,11 @@ import { makeStyles } from '@mui/styles'; -import { AliasesCSSProperties } from '@mui/system/'; +// import { BaseCSSProperties } from '@mui/system'; // Conditional Rendering of UI Modals for Light and Dark Mode // Theme, StyleProps -export const useStylesDark = makeStyles(theme => ({ +export const useStylesDark = makeStyles(theme => ({ // ALL CARDS paper: { display: 'flex', @@ -59,7 +59,7 @@ export const useStylesDark = makeStyles(theme => ({ }, })); -export const useStylesLight = makeStyles(theme => ({ +export const useStylesLight = makeStyles(theme => ({ // ALL CARDS paper: { display: 'flex', From 047a49d154a7bcd058b5f5748d480bc99e2ee4b8 Mon Sep 17 00:00:00 2001 From: Sofia Date: Sat, 4 May 2024 23:29:30 -0500 Subject: [PATCH 4/4] Fully updated MUI --- package-lock.json | 147 ++++++++++++++++++++++++++-------------------- package.json | 2 - 2 files changed, 83 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ca3e7036..c87ec5c34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,7 @@ "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@jest/types": "^29.6.1", - "@material-ui/core": "^4.12.4", "@material-ui/data-grid": "^4.0.0-alpha.37", - "@material-ui/icons": "^4.11.3", "@mui/icons-material": "^5.15.16", "@mui/material": "^5.15.16", "@mui/styles": "^5.15.16", @@ -3762,6 +3760,7 @@ "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz", "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "@material-ui/styles": "^4.11.5", @@ -3797,7 +3796,8 @@ "node_modules/@material-ui/core/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==" + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "peer": true }, "node_modules/@material-ui/data-grid": { "version": "4.0.0-alpha.37", @@ -3850,33 +3850,12 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, - "node_modules/@material-ui/icons": { - "version": "4.11.3", - "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz", - "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==", - "dependencies": { - "@babel/runtime": "^7.4.4" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "@material-ui/core": "^4.0.0", - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@material-ui/styles": { "version": "4.11.5", "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz", "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==", "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "@emotion/hash": "^0.8.0", @@ -3916,17 +3895,20 @@ "node_modules/@material-ui/styles/node_modules/@emotion/hash": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==", + "peer": true }, "node_modules/@material-ui/styles/node_modules/csstype": { "version": "2.6.21", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==", + "peer": true }, "node_modules/@material-ui/system": { "version": "4.12.2", "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz", "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "@material-ui/utils": "^4.11.3", @@ -3954,12 +3936,14 @@ "node_modules/@material-ui/system/node_modules/csstype": { "version": "2.6.21", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==", + "peer": true }, "node_modules/@material-ui/types": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==", + "peer": true, "peerDependencies": { "@types/react": "*" }, @@ -3973,6 +3957,7 @@ "version": "4.11.3", "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz", "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==", + "peer": true, "dependencies": { "@babel/runtime": "^7.4.4", "prop-types": "^15.7.2", @@ -3989,7 +3974,8 @@ "node_modules/@material-ui/utils/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==" + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "peer": true }, "node_modules/@mongodb-js/saslprep": { "version": "1.1.0", @@ -6849,12 +6835,12 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -6862,7 +6848,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -7793,9 +7779,9 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "engines": { "node": ">= 0.6" } @@ -9471,14 +9457,15 @@ "dev": true }, "node_modules/es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "hasInstallScript": true, "peer": true, "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" }, "engines": { @@ -9599,6 +9586,27 @@ "node": ">=4.0" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "peer": true, + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esniff/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", + "peer": true + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -9647,6 +9655,16 @@ "node": ">= 0.6" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "peer": true, + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -9718,16 +9736,16 @@ } }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -10095,9 +10113,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -11580,9 +11598,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==" }, "node_modules/ipaddr.js": { "version": "2.1.0", @@ -15539,9 +15557,9 @@ "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" }, "node_modules/nodemailer": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz", - "integrity": "sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==", + "version": "6.9.13", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz", + "integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==", "engines": { "node": ">=6.0.0" } @@ -16686,7 +16704,8 @@ "node_modules/popper.js": { "version": "1.16.1-lts", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", - "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==" + "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==", + "peer": true }, "node_modules/postcss": { "version": "8.4.33", @@ -17249,9 +17268,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -19159,9 +19178,9 @@ } }, "node_modules/tar": { - "version": "6.1.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", - "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -20557,9 +20576,9 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", - "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, "dependencies": { "colorette": "^2.0.10", diff --git a/package.json b/package.json index 08f173924..9956210e0 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,7 @@ "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@jest/types": "^29.6.1", - "@material-ui/core": "^4.12.4", "@material-ui/data-grid": "^4.0.0-alpha.37", - "@material-ui/icons": "^4.11.3", "@mui/icons-material": "^5.15.16", "@mui/material": "^5.15.16", "@mui/styles": "^5.15.16",