diff --git a/.env b/.env index 2435095f7..9fef1ce51 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_APP_VERSION=v1.3.0 +VITE_APP_VERSION=v1.4.0 GENERATE_SOURCEMAP=false ## Backend API URL diff --git a/package.json b/package.json index 9a3b338b7..5c75f1ddd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mantis-free-react-admin-template", - "version": "1.3.0", + "version": "1.4.0", "private": true, "homepage": "https://mantisdashboard.io/free", "author": { @@ -17,42 +17,42 @@ "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"" }, "dependencies": { - "@ant-design/colors": "^7.0.2", - "@ant-design/icons": "^5.3.1", - "@emotion/cache": "^11.11.0", - "@emotion/react": "^11.11.4", - "@emotion/styled": "^11.11.0", - "@fontsource/inter": "^5.0.17", - "@fontsource/poppins": "^5.0.12", - "@fontsource/public-sans": "^5.0.17", - "@fontsource/roboto": "^5.0.12", - "@mui/base": "^5.0.0-beta.38", - "@mui/lab": "^5.0.0-alpha.167", - "@mui/material": "^5.15.12", - "@mui/system": "^5.15.12", + "@ant-design/colors": "^7.1.0", + "@ant-design/icons": "^5.5.1", + "@emotion/cache": "^11.13.1", + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", + "@fontsource/inter": "^5.1.0", + "@fontsource/poppins": "^5.1.0", + "@fontsource/public-sans": "^5.1.1", + "@fontsource/roboto": "^5.1.0", + "@mui/base": "^5.0.0-beta.58", + "@mui/lab": "^6.0.0-beta.11", + "@mui/material": "^6.1.3", + "@mui/system": "^6.1.3", "@svgr/webpack": "^8.1.0", - "@vitejs/plugin-react": "^4.2.1", - "apexcharts": "^3.49.0", - "formik": "^2.4.5", - "framer-motion": "^11.0.8", + "@vitejs/plugin-react": "^4.3.2", + "apexcharts": "^3.54.0", + "formik": "^2.4.6", + "framer-motion": "^11.11.8", "lodash": "^4.17.21", "process": "^0.11.10", "prop-types": "^15.8.1", - "react": "^18.2.0", + "react": "^18.3.1", "react-apexcharts": "^1.4.1", "react-copy-to-clipboard": "^5.1.0", "react-device-detect": "^2.2.3", - "react-dom": "^18.2.0", - "react-number-format": "^5.3.3", - "react-router": "^6.22.3", - "react-router-dom": "^6.22.3", - "simplebar-react": "^3.2.4", + "react-dom": "^18.3.1", + "react-number-format": "^5.4.2", + "react-router": "^6.27.0", + "react-router-dom": "^6.27.0", + "simplebar-react": "^3.2.6", "slick-carousel": "^1.8.1", "swr": "^2.2.5", "util": "^0.12.5", - "vite": "^5.2.10", + "vite": "^5.4.8", "vite-jsconfig-paths": "^2.0.1", - "web-vitals": "^3.5.2", + "web-vitals": "^4.2.3", "yup": "^1.4.0" }, "eslintConfig": { @@ -79,19 +79,19 @@ ] }, "devDependencies": { - "@babel/core": "^7.24.0", - "@babel/eslint-parser": "^7.23.10", - "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "eslint": "^8.56.0", + "@babel/core": "^7.25.8", + "@babel/eslint-parser": "^7.25.8", + "@babel/preset-react": "^7.25.7", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-config-react-app": "^7.0.1", "eslint-plugin-flowtype": "^8.0.3", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsx-a11y": "^6.8.0", - "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-react": "^7.34.0", + "eslint-plugin-jsx-a11y": "^6.10.0", + "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-react": "^7.37.1", "eslint-plugin-react-hooks": "^4.6.0", - "prettier": "^3.2.5", + "prettier": "^3.3.3", "react-error-overlay": "6.0.11" } } diff --git a/src/components/@extended/Avatar.jsx b/src/components/@extended/Avatar.jsx index 07891572a..a36d7a196 100644 --- a/src/components/@extended/Avatar.jsx +++ b/src/components/@extended/Avatar.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; // material-ui -import { styled, useTheme } from '@mui/material/styles'; +import { styled } from '@mui/material/styles'; import MuiAvatar from '@mui/material/Avatar'; // project import @@ -95,10 +95,8 @@ const AvatarStyle = styled(MuiAvatar, { shouldForwardProp: (prop) => prop !== 'c ); export default function Avatar({ children, color = 'primary', type, size = 'md', ...others }) { - const theme = useTheme(); - return ( - + {children} ); diff --git a/src/components/@extended/Breadcrumbs.jsx b/src/components/@extended/Breadcrumbs.jsx index 24588d947..e98d8f7e1 100644 --- a/src/components/@extended/Breadcrumbs.jsx +++ b/src/components/@extended/Breadcrumbs.jsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'; import { Link, useLocation } from 'react-router-dom'; // material-ui -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Typography from '@mui/material/Typography'; import MuiBreadcrumbs from '@mui/material/Breadcrumbs'; @@ -74,7 +74,7 @@ export default function Breadcrumbs({ navigation, title, ...others }) { breadcrumbContent = ( - + Home @@ -84,7 +84,7 @@ export default function Breadcrumbs({ navigation, title, ...others }) { {title && ( - + {item.title} )} @@ -111,5 +111,6 @@ Breadcrumbs.propTypes = { title: PropTypes.bool, titleBottom: PropTypes.bool, sx: PropTypes.any, - others: PropTypes.any + others: PropTypes.any, + navigation: PropTypes.object }; diff --git a/src/components/MainCard.jsx b/src/components/MainCard.jsx index 274d0781f..46c647aa2 100644 --- a/src/components/MainCard.jsx +++ b/src/components/MainCard.jsx @@ -6,7 +6,6 @@ import { useTheme } from '@mui/material/styles'; import Card from '@mui/material/Card'; import CardContent from '@mui/material/CardContent'; import CardHeader from '@mui/material/CardHeader'; -import Divider from '@mui/material/Divider'; import Typography from '@mui/material/Typography'; // header style diff --git a/src/components/cards/statistics/AnalyticEcommerce.jsx b/src/components/cards/statistics/AnalyticEcommerce.jsx index a129c70d3..f9ccdcb15 100644 --- a/src/components/cards/statistics/AnalyticEcommerce.jsx +++ b/src/components/cards/statistics/AnalyticEcommerce.jsx @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; // material-ui import Chip from '@mui/material/Chip'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; import Box from '@mui/material/Box'; @@ -24,13 +24,13 @@ export default function AnalyticEcommerce({ color = 'primary', title, count, per {title} - + {count} {percentage && ( - + + ); diff --git a/src/layout/Dashboard/Header/HeaderContent/Notification.jsx b/src/layout/Dashboard/Header/HeaderContent/Notification.jsx index e329f3bf2..96a1d4b5f 100644 --- a/src/layout/Dashboard/Header/HeaderContent/Notification.jsx +++ b/src/layout/Dashboard/Header/HeaderContent/Notification.jsx @@ -12,7 +12,6 @@ import List from '@mui/material/List'; import ListItemButton from '@mui/material/ListItemButton'; import ListItemAvatar from '@mui/material/ListItemAvatar'; import ListItemText from '@mui/material/ListItemText'; -import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import Paper from '@mui/material/Paper'; import Popper from '@mui/material/Popper'; import Tooltip from '@mui/material/Tooltip'; @@ -38,12 +37,13 @@ const avatarSX = { }; const actionSX = { - mt: '6px', + mt: 1, ml: 1, top: 'auto', right: 'auto', alignSelf: 'flex-start', - + position: 'relative', + overflow: 'inherit', transform: 'none' }; @@ -122,8 +122,7 @@ export default function Notification() { '& .MuiListItemButton-root': { py: 0.5, '&.Mui-selected': { bgcolor: 'grey.50', color: 'text.primary' }, - '& .MuiAvatar-root': avatarSX, - '& .MuiListItemSecondaryAction-root': { ...actionSX, position: 'relative' } + '& .MuiAvatar-root': avatarSX } }} > @@ -145,11 +144,9 @@ export default function Notification() { } secondary="2 min ago" /> - - - 3:00 AM - - + + 3:00 AM + @@ -169,11 +166,9 @@ export default function Notification() { } secondary="5 August" /> - - - 6:00 PM - - + + 6:00 PM + 0}> @@ -193,11 +188,9 @@ export default function Notification() { } secondary="7 hours ago" /> - - - 2:45 PM - - + + 2:45 PM + @@ -218,11 +211,9 @@ export default function Notification() { } secondary="Daily scrum meeting time" /> - - - 9:10 PM - - + + 9:10 PM + diff --git a/src/layout/Dashboard/Header/HeaderContent/Profile/index.jsx b/src/layout/Dashboard/Header/HeaderContent/Profile/index.jsx index 97e6b2a25..2006b0098 100644 --- a/src/layout/Dashboard/Header/HeaderContent/Profile/index.jsx +++ b/src/layout/Dashboard/Header/HeaderContent/Profile/index.jsx @@ -6,7 +6,7 @@ import { useTheme } from '@mui/material/styles'; import ButtonBase from '@mui/material/ButtonBase'; import CardContent from '@mui/material/CardContent'; import ClickAwayListener from '@mui/material/ClickAwayListener'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Paper from '@mui/material/Paper'; import IconButton from '@mui/material/IconButton'; import Popper from '@mui/material/Popper'; @@ -120,7 +120,7 @@ export default function Profile() { - + @@ -131,7 +131,7 @@ export default function Profile() { - + diff --git a/src/pages/authentication/AuthWrapper.jsx b/src/pages/authentication/AuthWrapper.jsx index 1264a0333..acd048301 100644 --- a/src/pages/authentication/AuthWrapper.jsx +++ b/src/pages/authentication/AuthWrapper.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; // material-ui -import Grid from '@mui/material/Grid'; +import Stack from '@mui/material/Stack'; import Box from '@mui/material/Box'; // project import @@ -18,28 +18,21 @@ export default function AuthWrapper({ children }) { return ( - - + + - - - - - {children} - - - - + + + {children} + + - - + + ); } diff --git a/src/pages/authentication/auth-forms/AuthLogin.jsx b/src/pages/authentication/auth-forms/AuthLogin.jsx index 9c26ebea5..e2d3078fa 100644 --- a/src/pages/authentication/auth-forms/AuthLogin.jsx +++ b/src/pages/authentication/auth-forms/AuthLogin.jsx @@ -8,7 +8,7 @@ import Checkbox from '@mui/material/Checkbox'; import Divider from '@mui/material/Divider'; import FormControlLabel from '@mui/material/FormControlLabel'; import FormHelperText from '@mui/material/FormHelperText'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Link from '@mui/material/Link'; import InputAdornment from '@mui/material/InputAdornment'; import IconButton from '@mui/material/IconButton'; @@ -31,7 +31,7 @@ import FirebaseSocial from './FirebaseSocial'; // ============================|| JWT - LOGIN ||============================ // -export default function AuthLogin({ isDemo = false }) { +export default function AuthLogin() { const [checked, setChecked] = React.useState(false); const [showPassword, setShowPassword] = React.useState(false); @@ -59,7 +59,7 @@ export default function AuthLogin({ isDemo = false }) { {({ errors, handleBlur, handleChange, handleSubmit, isSubmitting, touched, values }) => (
- + Email Address )} - + Password - + {errors.submit && ( - + {errors.submit} )} - + - + Login with - + diff --git a/src/pages/authentication/auth-forms/AuthRegister.jsx b/src/pages/authentication/auth-forms/AuthRegister.jsx index 89efc62af..b3afb5191 100644 --- a/src/pages/authentication/auth-forms/AuthRegister.jsx +++ b/src/pages/authentication/auth-forms/AuthRegister.jsx @@ -5,7 +5,7 @@ import { Link as RouterLink } from 'react-router-dom'; import Button from '@mui/material/Button'; import FormControl from '@mui/material/FormControl'; import FormHelperText from '@mui/material/FormHelperText'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import Link from '@mui/material/Link'; import InputAdornment from '@mui/material/InputAdornment'; import IconButton from '@mui/material/IconButton'; @@ -70,7 +70,7 @@ export default function AuthRegister() { {({ errors, handleBlur, handleChange, handleSubmit, isSubmitting, touched, values }) => ( - + First Name* )} - + Last Name* )} - + Company )} - + Email Address* )} - + Password - + - + {level?.label} @@ -206,7 +206,7 @@ export default function AuthRegister() { - + By Signing up, you agree to our   @@ -219,11 +219,11 @@ export default function AuthRegister() { {errors.submit && ( - + {errors.submit} )} - +