diff --git a/jams-react-client/src/components/CaSetup/CaSetup.tsx b/jams-react-client/src/components/CaSetup/CaSetup.tsx index 0ceabdd2a5d269f46916075b8545726a889f8ae2..e9d35137ecfdf7ec583fca389f0e7dfd412c8faf 100644 --- a/jams-react-client/src/components/CaSetup/CaSetup.tsx +++ b/jams-react-client/src/components/CaSetup/CaSetup.tsx @@ -18,8 +18,9 @@ import Input from "@mui/material/Input"; import Typography from "@mui/material/Typography"; import i18next from "i18next"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/components/Card/Card.tsx b/jams-react-client/src/components/Card/Card.tsx index abe1c095680ed8baa085b0d387de22e0e9828c5b..61ad324eb75ac81aa96814594fe94215a2665af6 100644 --- a/jams-react-client/src/components/Card/Card.tsx +++ b/jams-react-client/src/components/Card/Card.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; // core components import styles from "assets/jss/material-dashboard-react/components/cardStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Card(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Card/CardAvatar.tsx b/jams-react-client/src/components/Card/CardAvatar.tsx index 3d81e39ee18547f370e216ab7d64e103a0271b4a..fb07798692684ebe18d6c3bd22ea6d95536b1e39 100644 --- a/jams-react-client/src/components/Card/CardAvatar.tsx +++ b/jams-react-client/src/components/Card/CardAvatar.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; import styles from "assets/jss/material-dashboard-react/components/cardAvatarStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CardAvatar(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Card/CardBody.tsx b/jams-react-client/src/components/Card/CardBody.tsx index f51557ed8f820487d379b8dfb1ba09157946662a..00dd24b57f44b847bf5289ccaaaea4746854938f 100644 --- a/jams-react-client/src/components/Card/CardBody.tsx +++ b/jams-react-client/src/components/Card/CardBody.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; // core components import styles from "assets/jss/material-dashboard-react/components/cardBodyStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CardBody(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Card/CardFooter.tsx b/jams-react-client/src/components/Card/CardFooter.tsx index 9ac88ea16c5ed8ad363ca91e14b84e2a725a483e..d0b0ae84949ba59cac1172117487a4a7837f375b 100644 --- a/jams-react-client/src/components/Card/CardFooter.tsx +++ b/jams-react-client/src/components/Card/CardFooter.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; // core components import styles from "assets/jss/material-dashboard-react/components/cardFooterStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CardFooter(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Card/CardHeader.tsx b/jams-react-client/src/components/Card/CardHeader.tsx index 6c53e9057986d6b5da9934343d05b8d25e9a3454..fd97002912d1fbc87f121b5b67e1fbbd82b25e24 100644 --- a/jams-react-client/src/components/Card/CardHeader.tsx +++ b/jams-react-client/src/components/Card/CardHeader.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; // core components import styles from "assets/jss/material-dashboard-react/components/cardHeaderStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CardHeader(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Card/CardIcon.tsx b/jams-react-client/src/components/Card/CardIcon.tsx index 7d3a1c68ab3a1c68d83f50ca06437213b2fe732f..f5802e06923565fc6a92a40998fd5eab13734348 100644 --- a/jams-react-client/src/components/Card/CardIcon.tsx +++ b/jams-react-client/src/components/Card/CardIcon.tsx @@ -8,7 +8,7 @@ import { makeStyles } from "@mui/styles"; // core components import styles from "assets/jss/material-dashboard-react/components/cardIconStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CardIcon(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/CreateAdmin/CreateAdmin.tsx b/jams-react-client/src/components/CreateAdmin/CreateAdmin.tsx index 683cb6682e148dd6cae930aae9aa7f55880103bd..cea558366db3d0eabb73fe0ee898323b410fa154 100644 --- a/jams-react-client/src/components/CreateAdmin/CreateAdmin.tsx +++ b/jams-react-client/src/components/CreateAdmin/CreateAdmin.tsx @@ -14,8 +14,9 @@ import { api_path_post_install_admin } from "../../globalUrls"; import auth from "../../auth"; import i18next from "i18next"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/components/CustomButtons/Button.tsx b/jams-react-client/src/components/CustomButtons/Button.tsx index f75d2d2e6fda99c3f1691b476b7a469d4a511d03..3b4aeaf555b291a1b633097928f930c7866b05b2 100644 --- a/jams-react-client/src/components/CustomButtons/Button.tsx +++ b/jams-react-client/src/components/CustomButtons/Button.tsx @@ -8,7 +8,7 @@ import Button from "@mui/material/Button"; import styles from "assets/jss/material-dashboard-react/components/buttonStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function RegularButton(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/CustomInput/CustomInput.tsx b/jams-react-client/src/components/CustomInput/CustomInput.tsx index 8dc52139f4865092cd1ec993a8cf9ccf5a0e89b2..48035f822712e8853cf519a167b1991e396d5ae1 100644 --- a/jams-react-client/src/components/CustomInput/CustomInput.tsx +++ b/jams-react-client/src/components/CustomInput/CustomInput.tsx @@ -11,7 +11,7 @@ import Check from "@mui/icons-material/Check"; // core components import styles from "assets/jss/material-dashboard-react/components/customInputStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function CustomInput(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.tsx b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.tsx index 6673681ba7ce7956aba202e2aa6e37f2b382e757..65a0caccb9ad331e3b85a160c4f1b322f0144bf2 100644 --- a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.tsx +++ b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.tsx @@ -100,7 +100,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface CustomUiPreviewProps { isOldPreview: boolean; diff --git a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.tsx b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.tsx index 4ec6453d0583316e0d343c792db3becc9a5bb904..d020bb24adaa8ed59017e5c74f5949876f021dbf 100644 --- a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.tsx +++ b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.tsx @@ -56,7 +56,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface JamiIdCardProps { color: string; diff --git a/jams-react-client/src/components/CustomUiPreview/TipBox.tsx b/jams-react-client/src/components/CustomUiPreview/TipBox.tsx index cb6748b17d6bd2ea32bd37200a43f66e075a38de..d01a91245ae123e5767d02a8e3d0f56a20a37f3f 100644 --- a/jams-react-client/src/components/CustomUiPreview/TipBox.tsx +++ b/jams-react-client/src/components/CustomUiPreview/TipBox.tsx @@ -28,7 +28,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface TipBoxProps { color: string; diff --git a/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.tsx b/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.tsx index 401f588cc01841c1faecb2f2e1b66ace393cb663..d1b4bb105073de604a17e69dc9946102b8b5a260 100644 --- a/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.tsx +++ b/jams-react-client/src/components/CustomizedSteppers/CustomizedSteppers.tsx @@ -10,6 +10,7 @@ import GroupAddIcon from "@mui/icons-material/GroupAdd"; import VideoLabelIcon from "@mui/icons-material/VideoLabel"; import i18next from "i18next"; +import { Theme } from "@mui/material"; const useQontoStepIconStyles = makeStyles({ root: { @@ -124,7 +125,7 @@ ColorlibStepIcon.propTypes = { icon: PropTypes.node, }; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ root: { width: "100%", }, diff --git a/jams-react-client/src/components/Devices/Devices.tsx b/jams-react-client/src/components/Devices/Devices.tsx index 45721ea0971d035dcfdc88ea075d46cea7702d42..06c36eaf79ef296f709f6e67c97eb377154ed8bd 100755 --- a/jams-react-client/src/components/Devices/Devices.tsx +++ b/jams-react-client/src/components/Devices/Devices.tsx @@ -32,7 +32,7 @@ import i18next from "i18next"; import EditDeviceDialog from "./EditDeviceDialog"; import RevokeDeviceDialog from "./RevokeDeviceDialog"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface DevicesProps { username: string; diff --git a/jams-react-client/src/components/Drawer/Drawer.tsx b/jams-react-client/src/components/Drawer/Drawer.tsx index fdd421d75f806d6b4dfd978a7948aba47ecdebe5..4cfb0beaefffad4d231768b42685f34e9baa0778 100644 --- a/jams-react-client/src/components/Drawer/Drawer.tsx +++ b/jams-react-client/src/components/Drawer/Drawer.tsx @@ -10,12 +10,13 @@ import { ListItem, ListItemText, Avatar, + Theme, } from "@mui/material"; import CustomInput from "components/CustomInput/CustomInput"; import noProfilePicture from "assets/img/faces/no-profile-picture.png"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ list: { width: "100%", [theme.breakpoints.up("xl")]: { diff --git a/jams-react-client/src/components/Footer/Footer.tsx b/jams-react-client/src/components/Footer/Footer.tsx index 0a6b262df981fc5e9bec5e3121e6cddc89ce903d..a8bddce55a3cf60ec0979aaf1b959ea1810c52d2 100755 --- a/jams-react-client/src/components/Footer/Footer.tsx +++ b/jams-react-client/src/components/Footer/Footer.tsx @@ -4,7 +4,7 @@ import styles from "assets/jss/material-dashboard-react/components/footerStyle"; import pjson from "../../../package.json"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Footer() { const classes = useStyles(); diff --git a/jams-react-client/src/components/Grid/GridContainer.tsx b/jams-react-client/src/components/Grid/GridContainer.tsx index 4676454922ca47adae0017dcaa13d0d130fcd2bb..8c3e97189b0663d04fd2d41684bc1e639a1c195c 100644 --- a/jams-react-client/src/components/Grid/GridContainer.tsx +++ b/jams-react-client/src/components/Grid/GridContainer.tsx @@ -10,7 +10,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function GridContainer(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/Grid/GridItem.tsx b/jams-react-client/src/components/Grid/GridItem.tsx index 589f93e14b451e5bf3793ef10e88f61632cdc06f..1dc6ffb40cf7c0649101c79e27093711714ee51b 100644 --- a/jams-react-client/src/components/Grid/GridItem.tsx +++ b/jams-react-client/src/components/Grid/GridItem.tsx @@ -10,7 +10,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface GridItemProps extends OverridableComponent<GridTypeMap> { children: React.ReactNode; diff --git a/jams-react-client/src/components/IdentityManagement/IdentityManagement.tsx b/jams-react-client/src/components/IdentityManagement/IdentityManagement.tsx index 13df64f194aa013ce7b7e6aa6ac18f0b27bd4750..0e0127d898239ccb4f9021909ae49aa063168cda 100644 --- a/jams-react-client/src/components/IdentityManagement/IdentityManagement.tsx +++ b/jams-react-client/src/components/IdentityManagement/IdentityManagement.tsx @@ -21,8 +21,9 @@ import auth from "../../auth"; import * as Yup from "yup"; import i18next from "i18next"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/components/Navbars/Navbar.tsx b/jams-react-client/src/components/Navbars/Navbar.tsx index 056a5061edb84654809dc37c0b009114beccad76..b41457fff7c8e20bdfdb010dbacf81144b6f2478 100755 --- a/jams-react-client/src/components/Navbars/Navbar.tsx +++ b/jams-react-client/src/components/Navbars/Navbar.tsx @@ -13,7 +13,7 @@ import Button from "components/CustomButtons/Button"; import styles from "assets/jss/material-dashboard-react/components/headerStyle"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Header(props) { const classes = useStyles(); diff --git a/jams-react-client/src/components/PasswordDialog/PasswordDialog.tsx b/jams-react-client/src/components/PasswordDialog/PasswordDialog.tsx index fdf23d67c49839f87e986fc43fa3232929f7ddb7..2b4e4fdaa576f93179bb351b3c10169e4f43e1b9 100644 --- a/jams-react-client/src/components/PasswordDialog/PasswordDialog.tsx +++ b/jams-react-client/src/components/PasswordDialog/PasswordDialog.tsx @@ -49,7 +49,7 @@ const styles = (theme) => ({ }, }); -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface PasswordDialogProps { username: string; diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.tsx b/jams-react-client/src/components/ServerParameters/ServerParameters.tsx index 9b6a4a3eaa86c32e28449cad0487de8535266f63..acd27d02c70eaed350e8c322959be5972dbc7bc3 100644 --- a/jams-react-client/src/components/ServerParameters/ServerParameters.tsx +++ b/jams-react-client/src/components/ServerParameters/ServerParameters.tsx @@ -22,8 +22,9 @@ import auth from "auth"; import * as Yup from "yup"; import i18next from "i18next"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/components/Sidebar/Sidebar.tsx b/jams-react-client/src/components/Sidebar/Sidebar.tsx index d66b25073492021c5110713cfc42b800b8591990..3a9fbc1d3cb68196e7f1b7c76ec0d43cfe2e8dd2 100755 --- a/jams-react-client/src/components/Sidebar/Sidebar.tsx +++ b/jams-react-client/src/components/Sidebar/Sidebar.tsx @@ -22,7 +22,7 @@ import auth from "auth"; import i18next from "i18next"; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Sidebar(props) { const classes = useStyles(); diff --git a/jams-react-client/src/layouts/BaseLayout.tsx b/jams-react-client/src/layouts/BaseLayout.tsx index c59c5703010b410e2c76861f3b02dac3a42c7880..816200152a2a797140794f77ae7e5e0d48e74edd 100644 --- a/jams-react-client/src/layouts/BaseLayout.tsx +++ b/jams-react-client/src/layouts/BaseLayout.tsx @@ -44,7 +44,7 @@ import { AccountCircle as AccountCircleIcon } from "@mui/icons-material"; let ps; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Admin(props) { // styles diff --git a/jams-react-client/src/layouts/ListLayout.tsx b/jams-react-client/src/layouts/ListLayout.tsx index c95207ee0aa2d2f04e297256852b143efec00b13..3ecd4c97cf9e298f6bccb08da286c7031fcc6ca0 100644 --- a/jams-react-client/src/layouts/ListLayout.tsx +++ b/jams-react-client/src/layouts/ListLayout.tsx @@ -44,7 +44,7 @@ import i18next from "i18next"; let ps; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Admin(props) { // styles diff --git a/jams-react-client/src/layouts/SignIn.tsx b/jams-react-client/src/layouts/SignIn.tsx index 691bda615a9c0258675653d8b237e5474f67e2bd..c08118b3fc1ea82d62c4e7a24a9bef03b555af99 100644 --- a/jams-react-client/src/layouts/SignIn.tsx +++ b/jams-react-client/src/layouts/SignIn.tsx @@ -18,6 +18,7 @@ import i18next from "i18next"; import logo from "assets/img/jams_logo_no_gnu_package.svg"; import * as Yup from "yup"; +import { Theme } from "@mui/material"; function Alert(props) { return <MuiAlert elevation={6} variant="filled" {...props} />; } @@ -35,7 +36,7 @@ function Copyright() { ); } -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/layouts/SignUp.tsx b/jams-react-client/src/layouts/SignUp.tsx index 6b7a93054d5484284cd090e7848006f869102d2d..fdbd27e4db48305bd1cfc2a7e21f99ef0a3c203b 100644 --- a/jams-react-client/src/layouts/SignUp.tsx +++ b/jams-react-client/src/layouts/SignUp.tsx @@ -17,6 +17,7 @@ import IdentityManagement from "components/IdentityManagement/IdentityManagement import ServerParameters from "components/ServerParameters/ServerParameters"; import LanguagePicker from "../components/LanguagePicker/LanguagePicker"; +import { Theme } from "@mui/material"; function Alert(props) { return <MuiAlert elevation={6} variant="filled" {...props} />; @@ -34,7 +35,7 @@ function Copyright() { ); } -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ avatar: { margin: theme.spacing(1), backgroundColor: theme.palette.secondary.main, diff --git a/jams-react-client/src/views/Blueprint/ColorPickerPopup.tsx b/jams-react-client/src/views/Blueprint/ColorPickerPopup.tsx index 62a775fa73599864aac0876b54b887901122b241..c37b7063afa7dc2ed2b7870b0de8e9b11a681a2e 100644 --- a/jams-react-client/src/views/Blueprint/ColorPickerPopup.tsx +++ b/jams-react-client/src/views/Blueprint/ColorPickerPopup.tsx @@ -31,7 +31,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function ColorPickerPopup({ hasAlphaChannel, color, onChange }) { const classes = useStyles(); diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.tsx b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.tsx index 76a14576ed7c9d02c9f201ea73da2677a9e9b50b..f2a921e70f599ec72d993ecc3fbf65ddf13f89c5 100644 --- a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.tsx +++ b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.tsx @@ -139,7 +139,7 @@ const styles = () => ({ }, }); -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); // Inspired by blueprintjs const StyledRadio = (props) => { diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.tsx b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.tsx index 9bd45d98af222a9618f73b0c012255712fc6f64a..d1511c11084857f3910c4f776fe9105f5286936e 100644 --- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.tsx +++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.tsx @@ -98,7 +98,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function EditBlueprintPermissions(props) { const classes = useStyles(); diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintUi.tsx b/jams-react-client/src/views/Blueprint/EditBlueprintUi.tsx index ddea4eee709db4c2ee34df277c2c5614167cc4ea..c8368b229660f92da0ba30b6983e944310a9ac08 100644 --- a/jams-react-client/src/views/Blueprint/EditBlueprintUi.tsx +++ b/jams-react-client/src/views/Blueprint/EditBlueprintUi.tsx @@ -88,7 +88,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function EditBlueprintUi({ blueprintName }) { const classes = useStyles(); diff --git a/jams-react-client/src/views/Blueprints/Blueprints.tsx b/jams-react-client/src/views/Blueprints/Blueprints.tsx index 63013b91bd2ec9289b9675162bdf26d0232f0f0c..1ea665af9942bf351d2a77b7e8b0fd28dd982da6 100644 --- a/jams-react-client/src/views/Blueprints/Blueprints.tsx +++ b/jams-react-client/src/views/Blueprints/Blueprints.tsx @@ -72,7 +72,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Blueprints() { const classes = useStyles(); diff --git a/jams-react-client/src/views/Contacts/Contacts.tsx b/jams-react-client/src/views/Contacts/Contacts.tsx index d51149c6dbb0f9dc58d390227f6026d8177025a9..cfcaed830637feb4886f96f2d94371658374f603 100644 --- a/jams-react-client/src/views/Contacts/Contacts.tsx +++ b/jams-react-client/src/views/Contacts/Contacts.tsx @@ -81,7 +81,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Users(props) { const classes = useStyles(); diff --git a/jams-react-client/src/views/Groups/Groups.tsx b/jams-react-client/src/views/Groups/Groups.tsx index 0a2efa756c16eb480f5f74ca2a2b2264035e7396..f20f73b868754e62ceabb109a3a3b5fe38087a15 100644 --- a/jams-react-client/src/views/Groups/Groups.tsx +++ b/jams-react-client/src/views/Groups/Groups.tsx @@ -80,7 +80,7 @@ const styles = { }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Groups() { const classes = useStyles(); diff --git a/jams-react-client/src/views/Settings/General.tsx b/jams-react-client/src/views/Settings/General.tsx index 5b77b9121159f44e458268b6160295060f5a0ea2..095619942906aa5d080c06830a67e4076ab768d2 100644 --- a/jams-react-client/src/views/Settings/General.tsx +++ b/jams-react-client/src/views/Settings/General.tsx @@ -32,8 +32,9 @@ import LanguagePicker from "../../components/LanguagePicker/LanguagePicker"; import pjson from "../../../package.json"; import generator from "generate-password-browser"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/views/Settings/Subscription.tsx b/jams-react-client/src/views/Settings/Subscription.tsx index 0533c56b4fc78059fe81cc592a8f5020dba3b99c..697eec9a20de592b05d4d4da9938245d9ead39fc 100644 --- a/jams-react-client/src/views/Settings/Subscription.tsx +++ b/jams-react-client/src/views/Settings/Subscription.tsx @@ -17,8 +17,9 @@ import configApiCall from "../../api"; import { api_path_post_configuration_register_license } from "../../globalUrls"; import i18next from "i18next"; +import { Theme } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles((theme: Theme) => ({ paper: { marginTop: theme.spacing(8), display: "flex", diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx index 2c85ca411c1b3dda9575048b1dd9edad894b793e..972d59e5ac3fdef99cd0f16d3a9a05703e66d9dc 100644 --- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx +++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.tsx @@ -166,7 +166,7 @@ const styles = (theme) => ({ }, }); -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); interface DisplayUserProfileProps { setDisplayUser: (displayUser: boolean) => void; diff --git a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.tsx b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.tsx index 2b1fbefd785b9287856fc84d8d5aa73346414843..6de3cb0f8e6d652a7535ff9a17dfa1a8f3f59c92 100644 --- a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.tsx +++ b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.tsx @@ -216,7 +216,7 @@ const styles = (theme) => ({ }, }); -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); const toBase64 = (file: File): Promise<string | undefined> => new Promise((resolve, reject) => { diff --git a/jams-react-client/src/views/Users/Users.tsx b/jams-react-client/src/views/Users/Users.tsx index 5757f1d0f95ce670d21aadc7e4404673ed35d5c8..301e58ee6633df295208c1bf57c95fd79c2dd5c2 100644 --- a/jams-react-client/src/views/Users/Users.tsx +++ b/jams-react-client/src/views/Users/Users.tsx @@ -68,7 +68,7 @@ const styles = { wordWrap: "break-word", }, }; -const useStyles = makeStyles(styles); +const useStyles = makeStyles(styles as any); export default function Users() { const classes = useStyles(); const history = useHistory();