Merge branch 'main' into add-account-suspention

This commit is contained in:
Aine
2024-12-09 14:42:38 +02:00
committed by GitHub
3 changed files with 413 additions and 389 deletions

View File

@@ -14,7 +14,7 @@
"@eslint/js": "^9.13.0", "@eslint/js": "^9.13.0",
"@testing-library/dom": "^10.0.0", "@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.6.3", "@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.0", "@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2", "@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.14", "@types/jest": "^29.5.14",
"@types/lodash": "^4.17.13", "@types/lodash": "^4.17.13",
@@ -34,38 +34,38 @@
"jest": "^29.7.0", "jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"jest-fetch-mock": "^3.0.3", "jest-fetch-mock": "^3.0.3",
"prettier": "^3.4.1", "prettier": "^3.4.2",
"react-test-renderer": "^18.3.1", "react-test-renderer": "^18.3.1",
"ts-jest": "^29.2.5", "ts-jest": "^29.2.5",
"ts-node": "^10.9.2", "ts-node": "^10.9.2",
"typescript": "^5.7.2", "typescript": "^5.7.2",
"typescript-eslint": "^8.16.0", "typescript-eslint": "^8.17.0",
"vite": "^5.4.11", "vite": "^6.0.3",
"vite-plugin-version-mark": "^0.1.3" "vite-plugin-version-mark": "^0.1.4"
}, },
"dependencies": { "dependencies": {
"@emotion/react": "^11.13.5", "@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5", "@emotion/styled": "^11.13.5",
"@haleos/ra-language-german": "^1.0.0", "@haleos/ra-language-german": "^1.0.0",
"@haxqer/ra-language-chinese": "^4.16.2", "@haxqer/ra-language-chinese": "^4.16.2",
"@mui/icons-material": "^6.1.8", "@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.9", "@mui/material": "^6.1.10",
"@mui/utils": "^5.16.8", "@mui/utils": "^5.16.8",
"@tanstack/react-query": "^5.62.0", "@tanstack/react-query": "^5.62.3",
"history": "^5.3.0", "history": "^5.3.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"papaparse": "^5.4.1", "papaparse": "^5.4.1",
"ra-core": "^5.3.4", "ra-core": "^5.4.1",
"ra-i18n-polyglot": "^5.3.4", "ra-i18n-polyglot": "^5.3.4",
"ra-language-english": "^5.3.4", "ra-language-english": "^5.3.4",
"ra-language-farsi": "^5.0.0", "ra-language-farsi": "^5.1.0",
"ra-language-french": "^5.4.0", "ra-language-french": "^5.4.1",
"ra-language-italian": "^3.13.1", "ra-language-italian": "^3.13.1",
"ra-language-russian": "^4.14.2", "ra-language-russian": "^4.14.2",
"react": "^18.3.1", "react": "^18.3.1",
"react-admin": "^5.4.0", "react-admin": "^5.4.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-hook-form": "^7.53.2", "react-hook-form": "^7.54.0",
"react-is": "^18.3.1", "react-is": "^18.3.1",
"react-router": "^6.26.2", "react-router": "^6.26.2",
"react-router-dom": "^6.28.0" "react-router-dom": "^6.28.0"

View File

@@ -61,7 +61,7 @@ const AdminMenu = (props) => {
return ( return (
<Menu {...props}> <Menu {...props}>
<Menu.ResourceItems /> <Menu.ResourceItems />
{menu.map((item, index) => { {menu && menu.map((item, index) => {
const { url, icon, label } = item; const { url, icon, label } = item;
const IconComponent = Icons[icon] as React.ComponentType<any> | undefined; const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;

774
yarn.lock

File diff suppressed because it is too large Load Diff