revert some changes

This commit is contained in:
dklimpel 2023-02-03 15:39:12 +01:00
parent 18fb8a7f77
commit 0f4677d157
5 changed files with 64 additions and 89 deletions

View File

@ -1,7 +1,5 @@
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";
@ -43,15 +41,7 @@ const i18nProvider = polyglotI18nProvider(
resolveBrowserLocale() resolveBrowserLocale()
); );
const theme = createTheme();
const generateClassName = createGenerateClassName({
disableGlobal: true,
seed: "mui-jss",
});
const App = () => ( const App = () => (
<StylesProvider generateClassName={generateClassName}>
<ThemeProvider theme={theme}>
<Admin <Admin
disableTelemetry disableTelemetry
loginPage={LoginPage} loginPage={LoginPage}
@ -59,11 +49,7 @@ const App = () => (
dataProvider={dataProvider} dataProvider={dataProvider}
i18nProvider={i18nProvider} i18nProvider={i18nProvider}
customRoutes={[ customRoutes={[
<Route <Route key="userImport" path="/import_users" component={ImportFeature} />,
key="userImport"
path="/import_users"
component={ImportFeature}
/>,
]} ]}
> >
<Resource <Resource
@ -73,12 +59,7 @@ const App = () => (
edit={UserEdit} edit={UserEdit}
icon={UserIcon} icon={UserIcon}
/> />
<Resource <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
name="rooms"
list={RoomList}
show={RoomShow}
icon={RoomIcon}
/>
<Resource <Resource
name="user_media_statistics" name="user_media_statistics"
list={UserMediaStatsList} list={UserMediaStatsList}
@ -119,8 +100,6 @@ 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 "@mui/styles"; import { makeStyles } from "@material-ui/core/styles";
import LockIcon from "@mui/icons-material/Lock"; import LockIcon from "@mui/icons-material/Lock";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({

View File

@ -4,16 +4,12 @@ import { TestContext } from "ra-test";
import { createTheme, ThemeProvider } from "@mui/material/styles"; import { createTheme, ThemeProvider } from "@mui/material/styles";
import LoginPage from "./LoginPage"; import LoginPage from "./LoginPage";
const theme = createTheme();
describe("LoginForm", () => { describe("LoginForm", () => {
it("renders", () => { it("renders", () => {
render( render(
<ThemeProvider theme={theme}>
<TestContext> <TestContext>
<LoginPage /> <LoginPage />
</TestContext> </TestContext>
</ThemeProvider>
); );
}); });
}); });

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 "@mui/styles"; import { makeStyles } from "@material-ui/core/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 "@mui/styles"; import { makeStyles } from "@material-ui/core/styles";
import { import {
BooleanInput, BooleanInput,
Button, Button,