sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more conflicting dependencies

Browse source
This commit is contained in:
Darren Clarke 2023-05-25 14:36:08 +00:00
parent 291395f8d3
commit 3ca903cf4f
11 changed files with 300 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/metamigo-frontend/components/layout/AppBar.tsx
View file

@ -2,7 +2,7 @@ import { forwardRef } from "react";
import { AppBar, UserMenu, MenuItemLink, useTranslate } from "react-admin";
import Typography from "@mui/material/Typography";
import SettingsIcon from "@mui/icons-material/Settings";
import { makeStyles } from "@mui/material/styles";
import { makeStyles } from "@mui/styles";
const useStyles = makeStyles({
title: {
@ -38,7 +38,6 @@ const CustomUserMenu = (props: any) => (
);
const CustomAppBar = (props: any) => {
// @ts-expect-error
const classes = useStyles();
return (
<AppBar {...props} elevation={1} userMenu={<CustomUserMenu />}>

5
apps/metamigo-frontend/components/layout/Menu.tsx
View file

@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
import SecurityIcon from "@mui/icons-material/Security";
import VoiceIcon from "@mui/icons-material/PhoneInTalk";
import { Box } from "@mui/material";
import { useTheme } from "@mui/material/styles";
import { useTheme } from "@mui/styles";
import useMediaQuery from "@mui/material/useMediaQuery";
import { useTranslate, MenuItemLink } from "react-admin";
import users from "../users";
@ -25,12 +25,13 @@ export const Menu: FC = ({ onMenuClick, logout, dense = false }: any) => {
});
const translate = useTranslate();
const theme = useTheme();
// @ts-ignore
const isXSmall = useMediaQuery(theme.breakpoints.down("xs"));
const open = useSelector((state: any) => state.admin.ui.sidebarOpen);
useSelector((state: any) => state.theme); // force rerender on theme change
const handleToggle = (menu: MenuName) => {
setState((state) => ({ ...state, [menu]: !state[menu] }));
setState((state: any) => ({ ...state, [menu]: !state[menu] }));
};
return (

7
apps/metamigo-frontend/components/layout/SubMenu.tsx
View file

@ -6,7 +6,7 @@ import ListItemIcon from "@mui/material/ListItemIcon";
import Typography from "@mui/material/Typography";
import Collapse from "@mui/material/Collapse";
import Tooltip from "@mui/material/Tooltip";
import { makeStyles } from "@mui/material/styles";
import { makeStyles } from "@mui/styles";
import { useTranslate } from "react-admin";
const useStyles = makeStyles((theme: any) => ({
@ -42,13 +42,12 @@ export const SubMenu: FC<SubMenuProps> = ({
icon,
children,
dense,
}) => {
}: any) => {
const translate = useTranslate();
// @ts-expect-error
const classes = useStyles();
const header = (
// @ts-expect-error
// @ts-ignore
<MenuItem dense={dense} button onClick={handleToggle}>
<ListItemIcon className={classes.icon}>
{isOpen ? <ExpandMore /> : icon}