Skip to content

update to mui appjsx #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trillium merged 6 commits into from
Jun 17, 2025
Merged

update to mui appjsx #1742

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da6dd04
update to mui appjsx
angela-lee1 Sep 13, 2024
b39d2ee
Merge branch 'development' into update-to-mui-appjsx
angela-lee1 Sep 27, 2024
5ad0894
Merge branch 'development' into update-to-mui-appjsx
angela-lee1 Mar 7, 2025
f705ad9
Merge branch 'development' into update-to-mui-appjsx
JackHaeg Jun 10, 2025
b9fb4ba
Merge branch 'development' into update-to-mui-appjsx
JackHaeg Jun 17, 2025
bc5b698
Merge branch 'development' into update-to-mui-appjsx
trillium Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import UserWelcome from './pages/UserWelcome';
import UserPermissionSearch from './pages/UserPermissionSearch';
import UserPermission from './pages/UserPermission';

import { ThemeProvider } from '@mui/material';
import { Box, ThemeProvider } from '@mui/material';
import theme from './theme';

import './App.scss';
Expand Down Expand Up @@ -93,20 +93,47 @@ const App = () => {
return (
<ThemeProvider theme={theme}>
<AuthProvider>
<div className="app">
<div className="app-container">
<Box
sx={{
height: '100%',
width: '100vw',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
overflow: 'hidden',
maxHeight: '90vh',
margin: '5vh 0',
}}
>
<Box
sx={{
position: 'relative',
maxWidth: '500px',
width: '100%',
backgroundColor: 'white',
overflow: 'hidden',
borderRadius: '10px',
padding: '15px',
}}
>
<Navbar />
<main role="main" className="main">
<Box
component="main"
sx={{
height: 'calc(90vh - 160px)',
overflowY: 'scroll',
}}
>
<Switch>
{routes.map(({ path, Component }) => (
<Route key={path} exact path={path} component={Component} />
))}
<Redirect to="/" />
</Switch>
</main>
</Box>
<Footer />
</div>
</div>
</Box>
</Box>
</AuthProvider>
</ThemeProvider>
);
Expand Down
Loading