Migrate makeStyles to MUI v5

This commit is contained in:
dklimpel 2023-02-02 17:35:37 +01:00
parent 3276a9b6ed
commit c9796b155c
9 changed files with 2418 additions and 3473 deletions

View File

@ -25,7 +25,8 @@
"@emotion/react": "^11.7.1", "@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0", "@emotion/styled": "^11.6.0",
"@mui/icons-material": "^5.3.1", "@mui/icons-material": "^5.3.1",
"@mui/material": "^5.4.0", "@mui/material": "^5.11.7",
"@mui/styles": "^5.11.7",
"papaparse": "^5.2.0", "papaparse": "^5.2.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"ra-language-chinese": "^2.0.10", "ra-language-chinese": "^2.0.10",

View File

@ -1,5 +1,7 @@
import React from "react"; import React from "react";
import { Admin, Resource, resolveBrowserLocale } from "react-admin"; import { Admin, Resource, resolveBrowserLocale } from "react-admin";
import { StylesProvider, createGenerateClassName } from "@mui/styles";
import { createTheme, ThemeProvider } from "@mui/material/styles";
import polyglotI18nProvider from "ra-i18n-polyglot"; import polyglotI18nProvider from "ra-i18n-polyglot";
import authProvider from "./synapse/authProvider"; import authProvider from "./synapse/authProvider";
import dataProvider from "./synapse/dataProvider"; import dataProvider from "./synapse/dataProvider";
@ -41,7 +43,15 @@ const i18nProvider = polyglotI18nProvider(
resolveBrowserLocale() resolveBrowserLocale()
); );
const defaultTheme = createTheme();
const generateClassName = createGenerateClassName({
disableGlobal: true,
seed: "mui-jss",
});
const App = () => ( const App = () => (
<StylesProvider generateClassName={generateClassName}>
<ThemeProvider theme={defaultTheme}>
<Admin <Admin
disableTelemetry disableTelemetry
loginPage={LoginPage} loginPage={LoginPage}
@ -49,7 +59,11 @@ const App = () => (
dataProvider={dataProvider} dataProvider={dataProvider}
i18nProvider={i18nProvider} i18nProvider={i18nProvider}
customRoutes={[ customRoutes={[
<Route key="userImport" path="/import_users" component={ImportFeature} />, <Route
key="userImport"
path="/import_users"
component={ImportFeature}
/>,
]} ]}
> >
<Resource <Resource
@ -59,7 +73,12 @@ const App = () => (
edit={UserEdit} edit={UserEdit}
icon={UserIcon} icon={UserIcon}
/> />
<Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} /> <Resource
name="rooms"
list={RoomList}
show={RoomShow}
icon={RoomIcon}
/>
<Resource <Resource
name="user_media_statistics" name="user_media_statistics"
list={UserMediaStatsList} list={UserMediaStatsList}
@ -100,6 +119,8 @@ const App = () => (
<Resource name="room_state" /> <Resource name="room_state" />
<Resource name="destination_rooms" /> <Resource name="destination_rooms" />
</Admin> </Admin>
</ThemeProvider>
</StylesProvider>
); );
export default App; export default App;

View File

@ -22,7 +22,7 @@ import {
Select, Select,
TextField, TextField,
} from "@mui/material"; } from "@mui/material";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
import LockIcon from "@mui/icons-material/Lock"; import LockIcon from "@mui/icons-material/Lock";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
@ -345,7 +345,6 @@ const LoginPage = ({ theme }) => {
type="submit" type="submit"
color="primary" color="primary"
disabled={loading || !supportPassAuth} disabled={loading || !supportPassAuth}
className={classes.button}
fullWidth fullWidth
> >
{loading && <CircularProgress size={25} thickness={2} />} {loading && <CircularProgress size={25} thickness={2} />}
@ -356,7 +355,6 @@ const LoginPage = ({ theme }) => {
color="secondary" color="secondary"
onClick={handleSSO} onClick={handleSSO}
disabled={loading || ssoBaseUrl === ""} disabled={loading || ssoBaseUrl === ""}
className={classes.button}
fullWidth fullWidth
> >
{loading && <CircularProgress size={25} thickness={2} />} {loading && <CircularProgress size={25} thickness={2} />}

View File

@ -2,7 +2,7 @@ import React, { Fragment } from "react";
import { Avatar, Chip } from "@mui/material"; import { Avatar, Chip } from "@mui/material";
import { connect } from "react-redux"; import { connect } from "react-redux";
import FolderSharedIcon from "@mui/icons-material/FolderShared"; import FolderSharedIcon from "@mui/icons-material/FolderShared";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
import { import {
BooleanField, BooleanField,
BulkDeleteButton, BulkDeleteButton,

View File

@ -8,7 +8,7 @@ import {
useRefresh, useRefresh,
} from "react-admin"; } from "react-admin";
import ActionDelete from "@mui/icons-material/Delete"; import ActionDelete from "@mui/icons-material/Delete";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
import { alpha } from "@mui/material/styles"; import { alpha } from "@mui/material/styles";
import classnames from "classnames"; import classnames from "classnames";

View File

@ -1,7 +1,7 @@
import React, { Fragment, useState } from "react"; import React, { Fragment, useState } from "react";
import classnames from "classnames"; import classnames from "classnames";
import { alpha } from "@mui/material/styles"; import { alpha } from "@mui/material/styles";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
import { import {
BooleanInput, BooleanInput,
Button, Button,

View File

@ -24,7 +24,7 @@ import {
} from "react-admin"; } from "react-admin";
import get from "lodash/get"; import get from "lodash/get";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
import { Tooltip, Typography, Chip } from "@mui/material"; import { Tooltip, Typography, Chip } from "@mui/material";
import FastForwardIcon from "@mui/icons-material/FastForward"; import FastForwardIcon from "@mui/icons-material/FastForward";
import HttpsIcon from "@mui/icons-material/Https"; import HttpsIcon from "@mui/icons-material/Https";

View File

@ -52,7 +52,7 @@ import { Link } from "react-router-dom";
import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices"; import { ServerNoticeButton, ServerNoticeBulkButton } from "./ServerNotices";
import { DeviceRemoveButton } from "./devices"; import { DeviceRemoveButton } from "./devices";
import { ProtectMediaButton, QuarantineMediaButton } from "./media"; import { ProtectMediaButton, QuarantineMediaButton } from "./media";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@mui/styles";
const redirect = () => { const redirect = () => {
return { return {

5735
yarn.lock

File diff suppressed because it is too large Load Diff