Merge branch 'staging_environment' into dev_environment

This commit is contained in:
Carter 2025-04-25 14:41:04 -06:00
commit ea2ba42024
8 changed files with 54 additions and 36 deletions

View file

@ -60,7 +60,7 @@ function App() {
<AuthWrapper setToken={setToken}>
{ token ?
<HTTPProvider token={token}>
<UserWrapper />
<UserWrapper token={token} />
</HTTPProvider>
:
<LoadingScreen

View file

@ -11,6 +11,7 @@ import { Team } from '../models/team'
import { makeStyles } from '@mui/styles'
import { CssBaseline, Theme } from '@mui/material'
import { AppThemeProvider } from 'theme/AppThemeProvider'
import HTTPProvider from 'providers/http'
// import FirmwareLoader from './FirmwareLoader'
const reducer = (state: GlobalState, action: GlobalStateAction): GlobalState => {
@ -48,10 +49,15 @@ const globalDefault = {
showErrors: false,
userTeamPermissions: [],
backgroundTasksComplete: false,
firmware: new Map()
firmware: new Map(),
}
export default function UserWrapper() {
interface Props {
token: string;
}
export default function UserWrapper(props: Props) {
const { token } = props;
const [loading, setLoading] = useState(false)
const userAPI = useUserAPI();
const classes = useStyles();
@ -98,7 +104,9 @@ export default function UserWrapper() {
<AppThemeProvider >
<CssBaseline/>
<main className={classes.appContent}>
<NavigationContainer />
<HTTPProvider token={token}>
<NavigationContainer />
</HTTPProvider>
</main>
</AppThemeProvider>
</StateProvider>