+
{decodeHtml(programLog.generatedCode)}
@@ -440,14 +433,14 @@ const RequestModal = (props) => {
) : (
''
)}
-
+
))}
)
}
- return
{revealModal}
+ return
{revealModal}
}
export default RequestModal
diff --git a/src/components/user-name.component.tsx b/src/components/user-name.component.tsx
index 5139373..dd90c9c 100644
--- a/src/components/user-name.component.tsx
+++ b/src/components/user-name.component.tsx
@@ -1,7 +1,7 @@
import React from 'react'
-import IconButton from '@material-ui/core/IconButton'
-import AccountCircle from '@material-ui/icons/AccountCircle'
-import Typography from '@material-ui/core/Typography'
+import { IconButton } from '@mui/material'
+import { Typography } from '@mui/material'
+import { AccountCircle } from '@mui/icons-material'
const UserName = (props: any) => {
return (
diff --git a/src/layouts/Main.jsx b/src/layouts/Main.jsx
index cd79269..79b7fcc 100644
--- a/src/layouts/Main.jsx
+++ b/src/layouts/Main.jsx
@@ -1,52 +1,53 @@
import React, { useContext, useState, useEffect } from 'react'
-import { makeStyles } from '@material-ui/styles'
-import AppBar from '@material-ui/core/AppBar'
-import Toolbar from '@material-ui/core/Toolbar'
-import MenuItem from '@material-ui/core/MenuItem'
-import Switch from '@material-ui/core/Switch'
-import Divider from '@material-ui/core/Divider'
-import FormControlLabel from '@material-ui/core/FormControlLabel'
-import Button from '@material-ui/core/Button'
-import Menu from '@material-ui/core/Menu'
-import Tabs from '@material-ui/core/Tabs'
-import Tab from '@material-ui/core/Tab'
+import { AppBar, useTheme } from '@mui/material'
+import { Toolbar } from '@mui/material'
+import { MenuItem } from '@mui/material'
+import { Switch } from '@mui/material'
+import { Divider } from '@mui/material'
+import { FormControlLabel } from '@mui/material'
+import { Button } from '@mui/material'
+import { Menu } from '@mui/material'
+import { Tabs } from '@mui/material'
+import { Tab } from '@mui/material'
import { Link, useNavigate, useLocation, Outlet } from 'react-router-dom'
import RequestModal from '../components/request-modal.component'
import UserName from '../components/user-name.component'
import { SASContext } from '../context/sasContext'
import LoginComponent from '../components/login.component'
-const useStyles = makeStyles((theme) => ({
- root: {
- flexGrow: 1
- },
- menuButton: {
- marginRight: theme.spacing(2)
- },
- title: {
- color: 'white',
- padding: '0 8px'
- },
- tabs: {
- '& .MuiTab-root': {
- fontSize: '21px'
+const Main = (props) => {
+ const theme = useTheme()
+
+ const styles = {
+ root: {
+ flexGrow: 1
},
- '& .Mui-selected': {
- color: theme.palette.secondary.main
- }
- },
- popOverMenu: {
- '& .MuiList-padding': {
- padding: 0
+ menuButton: {
+ marginRight: theme.spacing(2)
+ },
+ title: {
+ color: 'white',
+ padding: '0 8px'
+ },
+ tabs: {
+ '& .MuiTab-root': {
+ fontSize: '21px'
+ },
+ '& .Mui-selected': {
+ color: theme.palette.secondary.main
+ }
+ },
+ popOverMenu: {
+ '& .MuiList-padding': {
+ padding: 0
+ }
+ },
+ logoutButton: {
+ justifyContent: 'center'
}
- },
- logoutButton: {
- justifyContent: 'center'
}
-}))
-const Main = (props) => {
const navigate = useNavigate()
const sasContext = useContext(SASContext)
const [isModalOpen, setIsModalOpen] = useState(false)
@@ -61,8 +62,7 @@ const Main = (props) => {
useEffect(() => {
setTabValue(pathname)
}, [pathname])
-
- const classes = useStyles()
+
const open = Boolean(anchorEl)
useEffect(() => {
@@ -89,7 +89,7 @@ const Main = (props) => {
return (
<>
-
+
{
@@ -127,10 +127,10 @@ const Main = (props) => {
userName={sasContext.fullName || sasContext.userName}
avatarContent={sasContext.avatarContent}
onClickHandler={handleMenu}
- className={classes.title}
+ style={styles.title}
/>