Skip to content

Commit

Permalink
Merge branch 'main' into add-account-suspention
Browse files Browse the repository at this point in the history
  • Loading branch information
aine-etke authored Dec 9, 2024
2 parents 880270b + 2fa5600 commit c3dd0fa
Show file tree
Hide file tree
Showing 3 changed files with 450 additions and 426 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@eslint/js": "^9.13.0",
"@testing-library/dom": "^10.0.0",
"@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",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.13",
Expand All @@ -34,38 +34,38 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-fetch-mock": "^3.0.3",
"prettier": "^3.4.1",
"prettier": "^3.4.2",
"react-test-renderer": "^18.3.1",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.16.0",
"vite": "^5.4.11",
"vite-plugin-version-mark": "^0.1.3"
"typescript-eslint": "^8.17.0",
"vite": "^6.0.3",
"vite-plugin-version-mark": "^0.1.4"
},
"dependencies": {
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@haleos/ra-language-german": "^1.0.0",
"@haxqer/ra-language-chinese": "^4.16.2",
"@mui/icons-material": "^6.1.8",
"@mui/material": "^6.1.9",
"@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.10",
"@mui/utils": "^5.16.8",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query": "^5.62.3",
"history": "^5.3.0",
"lodash": "^4.17.21",
"papaparse": "^5.4.1",
"ra-core": "^5.3.4",
"ra-core": "^5.4.1",
"ra-i18n-polyglot": "^5.3.4",
"ra-language-english": "^5.3.4",
"ra-language-farsi": "^5.0.0",
"ra-language-french": "^5.4.0",
"ra-language-farsi": "^5.1.0",
"ra-language-french": "^5.4.1",
"ra-language-italian": "^3.13.1",
"ra-language-russian": "^4.14.2",
"react": "^18.3.1",
"react-admin": "^5.4.0",
"react-admin": "^5.4.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.2",
"react-hook-form": "^7.54.0",
"react-is": "^18.3.1",
"react-router": "^6.26.2",
"react-router-dom": "^6.28.0"
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdminLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const AdminMenu = (props) => {
return (
<Menu {...props}>
<Menu.ResourceItems />
{menu.map((item, index) => {
{menu && menu.map((item, index) => {
const { url, icon, label } = item;
const IconComponent = Icons[icon] as React.ComponentType<any> | undefined;

Expand Down
Loading

0 comments on commit c3dd0fa

Please sign in to comment.