Standardized
This commit is contained in:
33
src/App.tsx
33
src/App.tsx
@@ -28,16 +28,12 @@ function App() {
|
||||
endpoint: 'api/themes',
|
||||
});
|
||||
const { theme, setTheme, themeName, handleThemeChange } = useCommonHooks();
|
||||
useEffect(() => {
|
||||
if (allThemes && themeName) {
|
||||
if (themeName !== 'random') {
|
||||
const temp = allThemes.find((t: any) => t.name === themeName);
|
||||
setTheme(temp);
|
||||
} else {
|
||||
handleThemeChange(allThemes, false);
|
||||
}
|
||||
}
|
||||
}, [isAllThemesFetched, themeName]);
|
||||
const overrides = createTheme({
|
||||
white: theme?.backgroundColor,
|
||||
fontFamily: '-apple-system,Jost,BlinkMacSystemFont,Helvetica Neue,Roboto,sans-serif',
|
||||
});
|
||||
const mantineTheme = mergeMantineTheme(DEFAULT_THEME, overrides);
|
||||
|
||||
const router = createBrowserRouter(
|
||||
createRoutesFromElements(
|
||||
<Route>
|
||||
@@ -55,11 +51,18 @@ function App() {
|
||||
</Route>,
|
||||
),
|
||||
);
|
||||
const overrides = createTheme({
|
||||
white: theme?.backgroundColor,
|
||||
fontFamily: '-apple-system,Jost,BlinkMacSystemFont,Helvetica Neue,Roboto,sans-serif',
|
||||
});
|
||||
const mantineTheme = mergeMantineTheme(DEFAULT_THEME, overrides);
|
||||
|
||||
useEffect(() => {
|
||||
if (allThemes && themeName) {
|
||||
if (themeName !== 'random') {
|
||||
const temp = allThemes.find((t: any) => t.name === themeName);
|
||||
setTheme(temp);
|
||||
} else {
|
||||
handleThemeChange(allThemes, false);
|
||||
}
|
||||
}
|
||||
}, [isAllThemesFetched, themeName]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{theme && (
|
||||
|
||||
Reference in New Issue
Block a user