diff --git a/interface/package.json b/interface/package.json index 8a85c05fa..f50f1f448 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,8 +24,8 @@ "@alova/adapter-xhr": "2.1.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", - "@mui/icons-material": "^6.4.8", - "@mui/material": "^6.4.8", + "@mui/icons-material": "^7.0.0", + "@mui/material": "^7.0.0", "@table-library/react-table-library": "4.1.12", "alova": "3.2.10", "async-validator": "^4.2.5", diff --git a/interface/src/app/main/CustomEntitiesDialog.tsx b/interface/src/app/main/CustomEntitiesDialog.tsx index 898ecc557..32550cf6c 100644 --- a/interface/src/app/main/CustomEntitiesDialog.tsx +++ b/interface/src/app/main/CustomEntitiesDialog.tsx @@ -12,7 +12,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField diff --git a/interface/src/app/main/Customizations.tsx b/interface/src/app/main/Customizations.tsx index da901c14b..06d25b478 100644 --- a/interface/src/app/main/Customizations.tsx +++ b/interface/src/app/main/Customizations.tsx @@ -16,7 +16,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, Link, MenuItem, diff --git a/interface/src/app/main/CustomizationsDialog.tsx b/interface/src/app/main/CustomizationsDialog.tsx index 60488cbde..d738594b1 100644 --- a/interface/src/app/main/CustomizationsDialog.tsx +++ b/interface/src/app/main/CustomizationsDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField, Typography } from '@mui/material'; diff --git a/interface/src/app/main/Devices.tsx b/interface/src/app/main/Devices.tsx index 991f3ee3f..5f5de5fb1 100644 --- a/interface/src/app/main/Devices.tsx +++ b/interface/src/app/main/Devices.tsx @@ -31,7 +31,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, IconButton, InputAdornment, List, diff --git a/interface/src/app/main/DevicesDialog.tsx b/interface/src/app/main/DevicesDialog.tsx index 21789a33d..35054b31e 100644 --- a/interface/src/app/main/DevicesDialog.tsx +++ b/interface/src/app/main/DevicesDialog.tsx @@ -11,7 +11,7 @@ import { DialogContent, DialogTitle, FormHelperText, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/main/ModulesDialog.tsx b/interface/src/app/main/ModulesDialog.tsx index 9ba069c89..570c9ab14 100644 --- a/interface/src/app/main/ModulesDialog.tsx +++ b/interface/src/app/main/ModulesDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField } from '@mui/material'; diff --git a/interface/src/app/main/SchedulerDialog.tsx b/interface/src/app/main/SchedulerDialog.tsx index c647ffc6e..89838c246 100644 --- a/interface/src/app/main/SchedulerDialog.tsx +++ b/interface/src/app/main/SchedulerDialog.tsx @@ -13,7 +13,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField, ToggleButton, ToggleButtonGroup, diff --git a/interface/src/app/main/SensorsAnalogDialog.tsx b/interface/src/app/main/SensorsAnalogDialog.tsx index d82601d5e..6ee9e17e3 100644 --- a/interface/src/app/main/SensorsAnalogDialog.tsx +++ b/interface/src/app/main/SensorsAnalogDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/main/SensorsTemperatureDialog.tsx b/interface/src/app/main/SensorsTemperatureDialog.tsx index 63733113a..c564b7eda 100644 --- a/interface/src/app/main/SensorsTemperatureDialog.tsx +++ b/interface/src/app/main/SensorsTemperatureDialog.tsx @@ -9,7 +9,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, TextField, Typography diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx index 3359ae477..11d02eb37 100644 --- a/interface/src/app/settings/ApplicationSettings.tsx +++ b/interface/src/app/settings/ApplicationSettings.tsx @@ -9,7 +9,7 @@ import { Button, Checkbox, Divider, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/settings/DownloadUpload.tsx b/interface/src/app/settings/DownloadUpload.tsx index a4a4daafe..dcbb63e6d 100644 --- a/interface/src/app/settings/DownloadUpload.tsx +++ b/interface/src/app/settings/DownloadUpload.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { toast } from 'react-toastify'; import DownloadIcon from '@mui/icons-material/GetApp'; -import { Box, Button, Grid2 as Grid, Typography } from '@mui/material'; +import { Box, Button, Grid, Typography } from '@mui/material'; import * as SystemApi from 'api/system'; import { API, callAction } from 'api/app'; diff --git a/interface/src/app/settings/MqttSettings.tsx b/interface/src/app/settings/MqttSettings.tsx index a03f139b9..8cbac5d9e 100644 --- a/interface/src/app/settings/MqttSettings.tsx +++ b/interface/src/app/settings/MqttSettings.tsx @@ -5,7 +5,7 @@ import WarningIcon from '@mui/icons-material/Warning'; import { Button, Checkbox, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/status/SystemLog.tsx b/interface/src/app/status/SystemLog.tsx index ee0207713..730881ff2 100644 --- a/interface/src/app/status/SystemLog.tsx +++ b/interface/src/app/status/SystemLog.tsx @@ -8,7 +8,7 @@ import { Box, Button, Checkbox, - Grid2 as Grid, + Grid, IconButton, MenuItem, TextField, diff --git a/interface/src/app/status/Version.tsx b/interface/src/app/status/Version.tsx index b8fc7881b..607906365 100644 --- a/interface/src/app/status/Version.tsx +++ b/interface/src/app/status/Version.tsx @@ -15,7 +15,7 @@ import { DialogContent, DialogTitle, FormControlLabel, - Grid2 as Grid, + Grid, Link, Typography } from '@mui/material';