mirror of
https://github.com/rowyio/rowy.git
synced 2026-07-13 05:48:53 +02:00
Merge branch 'develop' of https://github.com/AntlerVC/firetable into develop
This commit is contained in:
@@ -2,7 +2,7 @@ import React, { lazy, Suspense } from "react";
|
||||
import { Route, Switch, Link } from "react-router-dom";
|
||||
import _merge from "lodash/merge";
|
||||
|
||||
import { CssBaseline, Button } from "@material-ui/core";
|
||||
import { Button } from "@material-ui/core";
|
||||
|
||||
import CustomBrowserRouter from "./utils/CustomBrowserRouter";
|
||||
import PrivateRoute from "./utils/PrivateRoute";
|
||||
|
||||
@@ -12,6 +12,8 @@ import {
|
||||
} from "@material-ui/core";
|
||||
import Themes from "Themes";
|
||||
|
||||
import ErrorBoundary from "components/ErrorBoundary";
|
||||
|
||||
const useThemeState = createPersistedState("_FT_THEME");
|
||||
const useThemeOverriddenState = createPersistedState("_FT_THEME_OVERRIDDEN");
|
||||
|
||||
@@ -124,7 +126,7 @@ export const AppProvider: React.FC = ({ children }) => {
|
||||
>
|
||||
<MuiThemeProvider theme={generatedTheme}>
|
||||
<CssBaseline />
|
||||
{children}
|
||||
<ErrorBoundary>{children}</ErrorBoundary>
|
||||
</MuiThemeProvider>
|
||||
</AppContext.Provider>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user