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,84 +41,65 @@ const i18nProvider = polyglotI18nProvider(
resolveBrowserLocale() resolveBrowserLocale()
); );
const theme = createTheme();
const generateClassName = createGenerateClassName({
disableGlobal: true,
seed: "mui-jss",
});
const App = () => ( const App = () => (
<StylesProvider generateClassName={generateClassName}> <Admin
<ThemeProvider theme={theme}> disableTelemetry
<Admin loginPage={LoginPage}
disableTelemetry authProvider={authProvider}
loginPage={LoginPage} dataProvider={dataProvider}
authProvider={authProvider} i18nProvider={i18nProvider}
dataProvider={dataProvider} customRoutes={[
i18nProvider={i18nProvider} <Route key="userImport" path="/import_users" component={ImportFeature} />,
customRoutes={[ ]}
<Route >
key="userImport" <Resource
path="/import_users" name="users"
component={ImportFeature} list={UserList}
/>, create={UserCreate}
]} edit={UserEdit}
> icon={UserIcon}
<Resource />
name="users" <Resource name="rooms" list={RoomList} show={RoomShow} icon={RoomIcon} />
list={UserList} <Resource
create={UserCreate} name="user_media_statistics"
edit={UserEdit} list={UserMediaStatsList}
icon={UserIcon} icon={EqualizerIcon}
/> />
<Resource <Resource
name="rooms" name="reports"
list={RoomList} list={ReportList}
show={RoomShow} show={ReportShow}
icon={RoomIcon} icon={ReportIcon}
/> />
<Resource <Resource
name="user_media_statistics" name="room_directory"
list={UserMediaStatsList} list={RoomDirectoryList}
icon={EqualizerIcon} icon={FolderSharedIcon}
/> />
<Resource <Resource
name="reports" name="destinations"
list={ReportList} list={DestinationList}
show={ReportShow} show={DestinationShow}
icon={ReportIcon} icon={CloudQueueIcon}
/> />
<Resource <Resource
name="room_directory" name="registration_tokens"
list={RoomDirectoryList} list={RegistrationTokenList}
icon={FolderSharedIcon} create={RegistrationTokenCreate}
/> edit={RegistrationTokenEdit}
<Resource icon={ConfirmationNumberIcon}
name="destinations" />
list={DestinationList} <Resource name="connections" />
show={DestinationShow} <Resource name="devices" />
icon={CloudQueueIcon} <Resource name="room_members" />
/> <Resource name="users_media" />
<Resource <Resource name="joined_rooms" />
name="registration_tokens" <Resource name="pushers" />
list={RegistrationTokenList} <Resource name="servernotices" />
create={RegistrationTokenCreate} <Resource name="forward_extremities" />
edit={RegistrationTokenEdit} <Resource name="room_state" />
icon={ConfirmationNumberIcon} <Resource name="destination_rooms" />
/> </Admin>
<Resource name="connections" />
<Resource name="devices" />
<Resource name="room_members" />
<Resource name="users_media" />
<Resource name="joined_rooms" />
<Resource name="pushers" />
<Resource name="servernotices" />
<Resource name="forward_extremities" />
<Resource name="room_state" />
<Resource name="destination_rooms" />
</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,