got new theme system to work without re-rendering
This commit is contained in:
parent
a452cf9444
commit
3454d16f36
12 changed files with 100 additions and 361 deletions
|
|
@ -5,14 +5,13 @@ import HTTPProvider from 'providers/http'
|
|||
import { useState } from 'react'
|
||||
import LoadingScreen from './LoadingScreen'
|
||||
import UserWrapper from './UserWrapper'
|
||||
import { CssBaseline, Theme, ThemeProvider } from '@mui/material'
|
||||
import { CreateTheme } from '../theme/theme'
|
||||
import { getThemeType, setThemeType } from '../theme/themeType'
|
||||
import { CssBaseline } from '@mui/material'
|
||||
import { getWhitelabel } from 'services/whiteLabel'
|
||||
import { AppThemeProvider } from 'theme/AppThemeProvider'
|
||||
|
||||
function App() {
|
||||
const [token, setToken] = useState<string | undefined>(undefined)
|
||||
const [palette, setPalette] = useState<Theme>(CreateTheme(getThemeType()));
|
||||
// const [palette, setPalette] = useState<Theme>(CreateTheme(getThemeType()));
|
||||
|
||||
const whiteLabel = getWhitelabel()
|
||||
const manifestPath = "/" + whiteLabel.name.replace(/\s/g, "") + "/manifest.json"
|
||||
|
|
@ -45,33 +44,23 @@ function App() {
|
|||
|
||||
let client_id = import.meta.env.VITE_AUTH0_DEV_CLIENT_ID;
|
||||
|
||||
const toggleTheme = () => {
|
||||
if (getThemeType() === "light") {
|
||||
setPalette(CreateTheme("dark"));
|
||||
setThemeType("dark");
|
||||
} else {
|
||||
setPalette(CreateTheme("light"));
|
||||
setThemeType("light");
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Auth0Provider
|
||||
domain={or(url, "")}
|
||||
clientId={or(client_id, "")}
|
||||
authorizationParams={{
|
||||
audience: or(audience, ""),
|
||||
redirect_uri: window.location.origin + "/callback"
|
||||
}}
|
||||
useRefreshTokens={true}
|
||||
cacheLocation='localstorage'
|
||||
>
|
||||
<ThemeProvider theme={palette}>
|
||||
<CssBaseline />
|
||||
<AppThemeProvider>
|
||||
<Auth0Provider
|
||||
domain={or(url, "")}
|
||||
clientId={or(client_id, "")}
|
||||
authorizationParams={{
|
||||
audience: or(audience, ""),
|
||||
redirect_uri: window.location.origin + "/callback"
|
||||
}}
|
||||
useRefreshTokens={true}
|
||||
cacheLocation='localstorage'
|
||||
>
|
||||
{/* <CssBaseline /> */}
|
||||
<AuthWrapper setToken={setToken}>
|
||||
{ token ?
|
||||
<HTTPProvider token={token}>
|
||||
<UserWrapper toggleTheme={toggleTheme}/>
|
||||
<UserWrapper />
|
||||
</HTTPProvider>
|
||||
:
|
||||
<LoadingScreen
|
||||
|
|
@ -79,8 +68,8 @@ function App() {
|
|||
/>
|
||||
}
|
||||
</AuthWrapper>
|
||||
</ThemeProvider>
|
||||
</Auth0Provider>
|
||||
</Auth0Provider>
|
||||
</AppThemeProvider>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue