diff --git a/package-lock.json b/package-lock.json
index 1fe4f37f1..d309bb74a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/icons-material": "^5.11.11",
- "@mui/material": "^5.13.6",
+ "@mui/material": "^5.14.20",
"@mui/styles": "^5.13.2",
"emoji-picker-react": "^4.4.10",
"file-saver": "^2.0.5",
@@ -363,11 +363,11 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
- "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
+ "version": "7.23.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
+ "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
"dependencies": {
- "regenerator-runtime": "^0.13.11"
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1645,9 +1645,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
- "version": "4.6.2",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
- "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+ "version": "4.10.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+ "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
"dev": true,
"peer": true,
"engines": {
@@ -1655,9 +1655,9 @@
}
},
"node_modules/@eslint/eslintrc": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
- "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+ "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
"dev": true,
"peer": true,
"dependencies": {
@@ -1696,9 +1696,9 @@
}
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
- "version": "13.21.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
- "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"peer": true,
"dependencies": {
@@ -1719,9 +1719,9 @@
"peer": true
},
"node_modules/@eslint/js": {
- "version": "8.47.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
- "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+ "version": "8.55.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
+ "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
"dev": true,
"peer": true,
"engines": {
@@ -2216,6 +2216,40 @@
"resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz",
"integrity": "sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw=="
},
+ "node_modules/@floating-ui/core": {
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.2.tgz",
+ "integrity": "sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==",
+ "dependencies": {
+ "@floating-ui/utils": "^0.1.3"
+ }
+ },
+ "node_modules/@floating-ui/dom": {
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz",
+ "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==",
+ "dependencies": {
+ "@floating-ui/core": "^1.4.2",
+ "@floating-ui/utils": "^0.1.3"
+ }
+ },
+ "node_modules/@floating-ui/react-dom": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.4.tgz",
+ "integrity": "sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==",
+ "dependencies": {
+ "@floating-ui/dom": "^1.5.1"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
+ "node_modules/@floating-ui/utils": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
+ "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
+ },
"node_modules/@fortawesome/fontawesome-common-types": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz",
@@ -2377,13 +2411,13 @@
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.11.10",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
- "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+ "version": "0.11.13",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+ "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
"dev": true,
"peer": true,
"dependencies": {
- "@humanwhocodes/object-schema": "^1.2.1",
+ "@humanwhocodes/object-schema": "^2.0.1",
"debug": "^4.1.1",
"minimatch": "^3.0.5"
},
@@ -2406,9 +2440,9 @@
}
},
"node_modules/@humanwhocodes/object-schema": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+ "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
"dev": true,
"peer": true
},
@@ -2468,25 +2502,24 @@
}
},
"node_modules/@mui/base": {
- "version": "5.0.0-beta.5",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.5.tgz",
- "integrity": "sha512-vy3TWLQYdGNecTaufR4wDNQFV2WEg6wRPi6BVbx6q1vP3K1mbxIn1+XOqOzfYBXjFHvMx0gZAo2TgWbaqfgvAA==",
- "dependencies": {
- "@babel/runtime": "^7.22.5",
- "@emotion/is-prop-valid": "^1.2.1",
- "@mui/types": "^7.2.4",
- "@mui/utils": "^5.13.6",
+ "version": "5.0.0-beta.26",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.26.tgz",
+ "integrity": "sha512-gPMRKC84VRw+tjqYoyBzyrBUqHQucMXdlBpYazHa5rCXrb91fYEQk5SqQ2U5kjxx9QxZxTBvWAmZ6DblIgaGhQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.23.4",
+ "@floating-ui/react-dom": "^2.0.4",
+ "@mui/types": "^7.2.10",
+ "@mui/utils": "^5.14.20",
"@popperjs/core": "^2.11.8",
- "clsx": "^1.2.1",
- "prop-types": "^15.8.1",
- "react-is": "^18.2.0"
+ "clsx": "^2.0.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",
@@ -2499,13 +2532,21 @@
}
}
},
+ "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==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/@mui/core-downloads-tracker": {
- "version": "5.13.4",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.13.4.tgz",
- "integrity": "sha512-yFrMWcrlI0TqRN5jpb6Ma9iI7sGTHpytdzzL33oskFHNQ8UgrtPas33Y1K7sWAMwCrr1qbWDrOHLAQG4tAzuSw==",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.20.tgz",
+ "integrity": "sha512-fXoGe8VOrIYajqALysFuyal1q1YmBARqJ3tmnWYDVl0scu8f6h6tZQbS2K8BY28QwkWNGyv4WRfuUkzN5HR3Ow==",
"funding": {
"type": "opencollective",
- "url": "https://opencollective.com/mui"
+ "url": "https://opencollective.com/mui-org"
}
},
"node_modules/@mui/icons-material": {
@@ -2534,18 +2575,18 @@
}
},
"node_modules/@mui/material": {
- "version": "5.13.6",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.13.6.tgz",
- "integrity": "sha512-/c2ZApeQm2sTYdQXjqEnldaBMBcUEiyu2VRS6bS39ZeNaAcCLBQbYocLR46R+f0S5dgpBzB0T4AsOABPOFYZ5Q==",
- "dependencies": {
- "@babel/runtime": "^7.22.5",
- "@mui/base": "5.0.0-beta.5",
- "@mui/core-downloads-tracker": "^5.13.4",
- "@mui/system": "^5.13.6",
- "@mui/types": "^7.2.4",
- "@mui/utils": "^5.13.6",
- "@types/react-transition-group": "^4.4.6",
- "clsx": "^1.2.1",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.20.tgz",
+ "integrity": "sha512-SUcPZnN6e0h1AtrDktEl76Dsyo/7pyEUQ+SAVe9XhHg/iliA0b4Vo+Eg4HbNkELsMbpDsUF4WHp7rgflPG7qYQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.23.4",
+ "@mui/base": "5.0.0-beta.26",
+ "@mui/core-downloads-tracker": "^5.14.20",
+ "@mui/system": "^5.14.20",
+ "@mui/types": "^7.2.10",
+ "@mui/utils": "^5.14.20",
+ "@types/react-transition-group": "^4.4.9",
+ "clsx": "^2.0.0",
"csstype": "^3.1.2",
"prop-types": "^15.8.1",
"react-is": "^18.2.0",
@@ -2556,7 +2597,7 @@
},
"funding": {
"type": "opencollective",
- "url": "https://opencollective.com/mui"
+ "url": "https://opencollective.com/mui-org"
},
"peerDependencies": {
"@emotion/react": "^11.5.0",
@@ -2577,13 +2618,21 @@
}
}
},
+ "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==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/@mui/private-theming": {
- "version": "5.13.1",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.13.1.tgz",
- "integrity": "sha512-HW4npLUD9BAkVppOUZHeO1FOKUJWAwbpy0VQoGe3McUYTlck1HezGHQCfBQ5S/Nszi7EViqiimECVl9xi+/WjQ==",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.14.20.tgz",
+ "integrity": "sha512-WV560e1vhs2IHCh0pgUaWHznrcrVoW9+cDCahU1VTkuwPokWVvb71ccWQ1f8Y3tRBPPcNkU2dChkkRJChLmQlQ==",
"dependencies": {
- "@babel/runtime": "^7.21.0",
- "@mui/utils": "^5.13.1",
+ "@babel/runtime": "^7.23.4",
+ "@mui/utils": "^5.14.20",
"prop-types": "^15.8.1"
},
"engines": {
@@ -2591,7 +2640,7 @@
},
"funding": {
"type": "opencollective",
- "url": "https://opencollective.com/mui"
+ "url": "https://opencollective.com/mui-org"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
@@ -2604,11 +2653,11 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.13.2",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.13.2.tgz",
- "integrity": "sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw==",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.14.20.tgz",
+ "integrity": "sha512-Vs4nGptd9wRslo9zeRkuWcZeIEp+oYbODy+fiZKqqr4CH1Gfi9fdP0Q1tGYk8OiJ2EPB/tZSAyOy62Hyp/iP7g==",
"dependencies": {
- "@babel/runtime": "^7.21.0",
+ "@babel/runtime": "^7.23.4",
"@emotion/cache": "^11.11.0",
"csstype": "^3.1.2",
"prop-types": "^15.8.1"
@@ -2618,7 +2667,7 @@
},
"funding": {
"type": "opencollective",
- "url": "https://opencollective.com/mui"
+ "url": "https://opencollective.com/mui-org"
},
"peerDependencies": {
"@emotion/react": "^11.4.1",
@@ -2675,16 +2724,16 @@
}
},
"node_modules/@mui/system": {
- "version": "5.13.6",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.13.6.tgz",
- "integrity": "sha512-G3Xr28uLqU3DyF6r2LQkHGw/ku4P0AHzlKVe7FGXOPl7X1u+hoe2xxj8Vdiq/69II/mh9OP21i38yBWgWb7WgQ==",
- "dependencies": {
- "@babel/runtime": "^7.22.5",
- "@mui/private-theming": "^5.13.1",
- "@mui/styled-engine": "^5.13.2",
- "@mui/types": "^7.2.4",
- "@mui/utils": "^5.13.6",
- "clsx": "^1.2.1",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.14.20.tgz",
+ "integrity": "sha512-jKOGtK4VfYZG5kdaryUHss4X6hzcfh0AihT8gmnkfqRtWP7xjY+vPaUhhuSeibE5sqA5wCtdY75z6ep9pxFnIg==",
+ "dependencies": {
+ "@babel/runtime": "^7.23.4",
+ "@mui/private-theming": "^5.14.20",
+ "@mui/styled-engine": "^5.14.19",
+ "@mui/types": "^7.2.10",
+ "@mui/utils": "^5.14.20",
+ "clsx": "^2.0.0",
"csstype": "^3.1.2",
"prop-types": "^15.8.1"
},
@@ -2693,7 +2742,7 @@
},
"funding": {
"type": "opencollective",
- "url": "https://opencollective.com/mui"
+ "url": "https://opencollective.com/mui-org"
},
"peerDependencies": {
"@emotion/react": "^11.5.0",
@@ -2713,12 +2762,20 @@
}
}
},
+ "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==",
+ "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.10",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.10.tgz",
+ "integrity": "sha512-wX1vbDC+lzF7FlhT6A3ffRZgEoKWPF8VqRoTu4lZwouFX2t90KyCMsgepMw5DxLak1BSp/KP86CmtZttikb/gQ==",
"peerDependencies": {
- "@types/react": "*"
+ "@types/react": "^17.0.0 || ^18.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
@@ -2727,13 +2784,12 @@
}
},
"node_modules/@mui/utils": {
- "version": "5.13.6",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.13.6.tgz",
- "integrity": "sha512-ggNlxl5NPSbp+kNcQLmSig6WVB0Id+4gOxhx644987v4fsji+CSXc+MFYLocFB/x4oHtzCUlSzbVHlJfP/fXoQ==",
+ "version": "5.14.20",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.20.tgz",
+ "integrity": "sha512-Y6yL5MoFmtQml20DZnaaK1znrCEwG6/vRSzW8PKOTrzhyqKIql0FazZRUR7sA5EPASgiyKZfq0FPwISRXm5NdA==",
"dependencies": {
- "@babel/runtime": "^7.22.5",
- "@types/prop-types": "^15.7.5",
- "@types/react-is": "^18.2.0",
+ "@babel/runtime": "^7.23.4",
+ "@types/prop-types": "^15.7.11",
"prop-types": "^15.8.1",
"react-is": "^18.2.0"
},
@@ -2742,10 +2798,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/@nodelib/fs.scandir": {
@@ -2926,9 +2988,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.11",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
+ "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
},
"node_modules/@types/react": {
"version": "18.0.28",
@@ -2949,18 +3011,10 @@
"@types/react": "*"
}
},
- "node_modules/@types/react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-1vz2yObaQkLL7YFe/pme2cpvDsCwI1WXIfL+5eLz0MI9gFG24Re16RzUsI8t9XZn9ZWvgLNDrJBmrqXJO7GNQQ==",
- "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": "*"
}
@@ -2970,6 +3024,13 @@
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
},
+ "node_modules/@ungap/structured-clone": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+ "dev": true,
+ "peer": true
+ },
"node_modules/@vitejs/plugin-react": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-3.1.0.tgz",
@@ -3250,9 +3311,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001457",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz",
- "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==",
+ "version": "1.0.30001568",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
+ "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
"dev": true,
"funding": [
{
@@ -3262,6 +3323,10 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
]
},
@@ -3733,19 +3798,20 @@
}
},
"node_modules/eslint": {
- "version": "8.47.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
- "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+ "version": "8.55.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
+ "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
"dev": true,
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1",
- "@eslint/eslintrc": "^2.1.2",
- "@eslint/js": "^8.47.0",
- "@humanwhocodes/config-array": "^0.11.10",
+ "@eslint/eslintrc": "^2.1.4",
+ "@eslint/js": "8.55.0",
+ "@humanwhocodes/config-array": "^0.11.13",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
+ "@ungap/structured-clone": "^1.2.0",
"ajv": "^6.12.4",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -3946,9 +4012,9 @@
}
},
"node_modules/eslint/node_modules/globals": {
- "version": "13.21.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
- "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"peer": true,
"dependencies": {
@@ -4403,13 +4469,14 @@
}
},
"node_modules/flat-cache": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
- "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+ "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
"dev": true,
"peer": true,
"dependencies": {
- "flatted": "^3.1.0",
+ "flatted": "^3.2.9",
+ "keyv": "^4.5.3",
"rimraf": "^3.0.2"
},
"engines": {
@@ -4417,9 +4484,9 @@
}
},
"node_modules/flatted": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
- "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+ "version": "3.2.9",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
"dev": true,
"peer": true
},
@@ -4734,9 +4801,9 @@
"integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
},
"node_modules/ignore": {
- "version": "5.2.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
- "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+ "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
"dev": true,
"peer": true,
"engines": {
@@ -5005,6 +5072,13 @@
"node": ">=4"
}
},
+ "node_modules/json-buffer": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+ "dev": true,
+ "peer": true
+ },
"node_modules/json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -5151,6 +5225,16 @@
"jss": "10.10.0"
}
},
+ "node_modules/keyv": {
+ "version": "4.5.4",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "json-buffer": "3.0.1"
+ }
+ },
"node_modules/kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -6244,9 +6328,9 @@
}
},
"node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
},
"node_modules/require-directory": {
"version": "2.1.1",
diff --git a/package.json b/package.json
index 93df1a5f5..902b2c19c 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"predeploy": "npm run build",
"deploy": "gh-pages -d dist",
"preview": "vite preview",
- "pretty": "prettier --write \"./**/*.{js,jsx,ts,tsx,json}\"",
+ "pretty": "prettier --write \"./**/*.{js,jsx,ts,tsx,json,css}\"",
"prepare": "husky install"
},
"dependencies": {
@@ -23,7 +23,7 @@
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/icons-material": "^5.11.11",
- "@mui/material": "^5.13.6",
+ "@mui/material": "^5.14.20",
"@mui/styles": "^5.13.2",
"emoji-picker-react": "^4.4.10",
"file-saver": "^2.0.5",
diff --git a/src/index.css b/src/index.css
index f9ba9640a..aefd83000 100644
--- a/src/index.css
+++ b/src/index.css
@@ -56,7 +56,7 @@
--page-over-color: #26282b;
--slide-color: #041c32;
--label-color: #6a656b;
- --profile-color: #c8c6c6;
+ --profile-color: #a9a9a9;
--text-black-only: black;
--text-light: rgba(255, 255, 255, 0.6);
--text-light-black: rgba(0, 0, 0, 0.6);
diff --git a/src/pages/Signup/index.css b/src/pages/Signup/index.css
index b94417d2d..4b0ceaf14 100644
--- a/src/pages/Signup/index.css
+++ b/src/pages/Signup/index.css
@@ -51,10 +51,19 @@
border: 2px solid green;
}
+.username-rules {
+ color: var(--profile-color);
+ font-size: 15px;
+}
+
.error-border {
border: 2px solid red !important;
}
+.success-border {
+ border: 2px solid green;
+}
+
.password-container {
display: flex;
justify-content: space-between;
@@ -92,6 +101,11 @@
color: red;
}
+.success {
+ font-size: 12px;
+ color: green;
+}
+
.pass-container-both {
display: flex;
flex-direction: column;
diff --git a/src/pages/Signup/index.jsx b/src/pages/Signup/index.jsx
index f9b4d874b..2d1b44339 100644
--- a/src/pages/Signup/index.jsx
+++ b/src/pages/Signup/index.jsx
@@ -64,6 +64,11 @@ const SignupScreen = () => {
setUsernameAvailable(true);
} else {
setUsernameAvailable(false);
+
+ enqueueSnackbar(
+ "Sorry, this username is already in use. Please try another username.",
+ { variant: "error" },
+ );
}
};
@@ -83,8 +88,9 @@ const SignupScreen = () => {
}
});
- if (username === "") submitable = false;
-
+ if (username !== "") {
+ submitable = false;
+ }
if (!usernameAvailable) {
playErrorSound();
enqueueSnackbar("Username not available!", {
@@ -213,10 +219,28 @@ const SignupScreen = () => {
fieldName={"username"}
aria_dsc_by={"username-error"}
isError={!usernameAvailable}
- errorMesssage={"Username not availaible"}
+ errorMesssage={
+ !username.length
+ ? `Username cannot be empty`
+ : `Username is invalid`
+ }
error_border={usernameAvailable}
+ successMessage={"Perfect!"}
/>
+ {!usernameAvailable && (
+
+ A valid username must
+
+ - NOT contain captial letters.
+ - NOT contain special characters.
+ - NOT start with a digit.
+ - be between 4 and 20 letters long.
+ - NOT be registered.
+
+
{/* password input for the form */}
@@ -268,6 +294,7 @@ const SignupScreen = () => {
maxLength={30}
aria_dsc_by={"password-error"}
errorMesssage={error.passwordError}
+ successMessage={"Perfect!"}
isError={error.password && error.passwordError}
/>
@@ -285,6 +312,7 @@ const SignupScreen = () => {
maxLength={30}
aria_dsc_by={"confirm-password-error"}
errorMesssage={error.confirmPasswordError}
+ successMessage={"Perfect!"}
isError={error.confirmPassword && error.confirmPasswordError}
/>
diff --git a/src/pages/index.js b/src/pages/index.js
index 282a4a248..044e8937f 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,10 +1,10 @@
-import ChatPage from "./Chat";
import About from "./FooterPages/About";
+import ChatPage from "./Chat";
import Contributor from "./FooterPages/ContributorPage";
import Feedback from "./FooterPages/Feedback";
+import Friends from "./Friends";
import Guidelines from "./FooterPages/Guidelines";
import HelpCenter from "./FooterPages/HelpCenter";
-import Friends from "./Friends";
import LoginScreen from "./Login";
import PostView from "./PostView";
import Profile from "./Profile";
diff --git a/src/reusableComponents/Auth/Auth__pass__input.jsx b/src/reusableComponents/Auth/Auth__pass__input.jsx
index a5ee37767..f4db1be31 100644
--- a/src/reusableComponents/Auth/Auth__pass__input.jsx
+++ b/src/reusableComponents/Auth/Auth__pass__input.jsx
@@ -1,6 +1,8 @@
import React, { useState } from "react";
import { RiEyeCloseFill, RiEyeFill } from "react-icons/ri";
+import { IoCheckmarkCircle } from "react-icons/io5";
+
const Auth__pass__input = ({
label,
id,
@@ -12,6 +14,7 @@ const Auth__pass__input = ({
errorMesssage,
isError,
maxLength,
+ successMessage,
}) => {
const [showPassword, setShowPassword] = useState(false);
const handleShowPassword = (e) => {
@@ -27,7 +30,9 @@ const Auth__pass__input = ({
className={
errorMesssage
? "error-border pass__input__container password-container"
- : "pass__input__container password-container"
+ : !value
+ ? "pass__input__container password-container"
+ : "success-border pass__input__container password-container"
}
>
: }
- {isError && (
+ {isError ? (
{errorMesssage}
+ ) : (
+ value && (
+
+ {successMessage}
+
+ )
)}
);
diff --git a/src/reusableComponents/Auth/Auth__text__input.jsx b/src/reusableComponents/Auth/Auth__text__input.jsx
index c857ddfbf..3b0f7717e 100644
--- a/src/reusableComponents/Auth/Auth__text__input.jsx
+++ b/src/reusableComponents/Auth/Auth__text__input.jsx
@@ -1,3 +1,5 @@
+import { IoCheckmarkCircle } from "react-icons/io5";
+import { IoIosWarning } from "react-icons/io";
import React from "react";
const Auth__text__input = ({
@@ -10,6 +12,7 @@ const Auth__text__input = ({
isError,
aria_dsc_by,
errorMesssage,
+ successMessage,
fieldName,
maxLength,
type = "text",
@@ -24,7 +27,9 @@ const Auth__text__input = ({
placeholder={placeholder}
value={value}
onChange={(e) => handleChange(e)}
- className={error_border ? null : "error-border"}
+ className={
+ error_border ? (!value ? null : "success-border") : "error-border"
+ }
required
maxLength={maxLength}
aria-required="true"
@@ -33,7 +38,12 @@ const Auth__text__input = ({
/>
{isError && (
- {errorMesssage}
+ {errorMesssage}
+
+ )}
+ {!isError && value && (
+
+ {successMessage}
)}
diff --git a/src/reusableComponents/validation.js b/src/reusableComponents/validation.js
index 59bc91522..e6b2ac25c 100644
--- a/src/reusableComponents/validation.js
+++ b/src/reusableComponents/validation.js
@@ -1,14 +1,14 @@
-const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*[@$%#^&*])(?=.*[0-9]).{8,}$/;
+const passwordRegex = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,}$/;
const emailRegex = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i;
const validate = {
name: (value) => {
if (!value) return { name: true, nameError: "Name field cannot be empty" };
else {
- return value.length < 6
+ return value.length < 4
? {
name: true,
- nameError: "Name must be atleast 6 characters long.",
+ nameError: "Name must be atleast 4 characters long.",
}
: { name: false, nameError: false };
}
@@ -28,23 +28,17 @@ const validate = {
: {
password: true,
passwordError:
- "Minimum 8 characters, 1 uppercase, 1 lowercase, 1 symbol (@$%#^&*), 1 number (0-9).",
+ "Minimum 6 characters, At least one letter (either lowercase or uppercase) ,At least one digit (0-9).",
};
},
confirmPassword: (value, password) => {
- return passwordRegex.test(value)
- ? value !== password
- ? {
- confirmPassword: true,
- confirmPasswordError: "Password does not match",
- }
- : { confirmPassword: false, confirmPasswordError: false }
- : {
+ return value !== password
+ ? {
confirmPassword: true,
- confirmPasswordError:
- "Minimum 8 characters, 1 uppercase, 1 lowercase, 1 symbol (@$%#^&*), 1 number (0-9).",
- };
+ confirmPasswordError: "Password does not match",
+ }
+ : { confirmPassword: false, confirmPasswordError: false };
},
initialValue: {