Skip to content

Commit 4210461

Browse files
ct-vrushtict-vrushtiphoenixcoded
authored
free version (#70)
* free version * free version pr review complete --------- Co-authored-by: ct-vrushti <vrushti.pcoded@gmail.com> Co-authored-by: DIKSHIT MORADIYA <phoenixcoded@gmail.com>
1 parent e73e524 commit 4210461

15 files changed

Lines changed: 671 additions & 683 deletions

File tree

react/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VITE_APP_VERSION = v2.1.0
1+
VITE_APP_VERSION = v2.2.0
22
GENERATE_SOURCEMAP = false
33

44
## Public URL

react/eslint.config.mjs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,7 @@ export default [
7979
}
8080
],
8181

82-
'prettier/prettier': [
83-
'warn',
84-
{
85-
bracketSpacing: true,
86-
printWidth: 140,
87-
singleQuote: true,
88-
trailingComma: 'none',
89-
tabWidth: 2,
90-
useTabs: false,
91-
endOfLine: 'lf'
92-
}
93-
]
82+
'prettier/prettier': 'warn'
9483
}
9584
},
9685
{

react/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"name": "able-pro-react-free-admin-dashboard",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"dependencies": {
55
"@emotion/cache": "11.14.0",
66
"@emotion/react": "11.14.0",
7-
"@emotion/styled": "11.14.0",
8-
"@fontsource/inter": "5.2.5",
9-
"@mui/lab": "7.0.0-beta.12",
10-
"@mui/material": "7.1.0",
11-
"@mui/system": "7.1.0",
12-
"@vitejs/plugin-react": "4.4.1",
13-
"apexcharts": "4.7.0",
7+
"@emotion/styled": "11.14.1",
8+
"@fontsource/inter": "5.2.6",
9+
"@mui/lab": "7.0.0-beta.16",
10+
"@mui/material": "7.3.1",
11+
"@mui/system": "7.3.1",
12+
"@vitejs/plugin-react": "5.0.2",
13+
"apexcharts": "5.3.4",
1414
"formik": "2.4.6",
15-
"framer-motion": "12.12.1",
15+
"framer-motion": "12.23.12",
1616
"iconsax-reactjs": "0.0.8",
1717
"lodash-es": "4.17.21",
1818
"prop-types": "15.8.1",
19-
"react": "19.1.0",
19+
"react": "19.1.1",
2020
"react-apexcharts": "1.7.0",
2121
"react-device-detect": "2.2.3",
22-
"react-dom": "19.1.0",
23-
"react-router": "7.6.0",
24-
"react-router-dom": "7.6.0",
25-
"simplebar-react": "3.3.1",
26-
"swr": "2.3.3",
27-
"vite": "6.3.5",
22+
"react-dom": "19.1.1",
23+
"react-router": "7.8.2",
24+
"react-router-dom": "7.8.2",
25+
"simplebar-react": "3.3.2",
26+
"swr": "2.3.6",
27+
"vite": "7.1.3",
2828
"vite-jsconfig-paths": "2.0.1",
2929
"web-vitals": "5.0.1",
30-
"yup": "1.6.1"
30+
"yup": "1.7.0"
3131
},
3232
"scripts": {
3333
"start": "vite",
@@ -56,17 +56,17 @@
5656
]
5757
},
5858
"devDependencies": {
59-
"@eslint/compat": "1.2.9",
59+
"@eslint/compat": "1.3.2",
6060
"@eslint/eslintrc": "3.3.1",
61-
"@eslint/js": "9.27.0",
62-
"eslint": "9.27.0",
63-
"eslint-config-prettier": "10.1.5",
61+
"@eslint/js": "9.34.0",
62+
"eslint": "9.34.0",
63+
"eslint-config-prettier": "10.1.8",
6464
"eslint-plugin-jsx-a11y": "6.10.2",
65-
"eslint-plugin-prettier": "5.4.0",
65+
"eslint-plugin-prettier": "5.5.4",
6666
"eslint-plugin-react": "7.37.5",
6767
"eslint-plugin-react-hooks": "5.2.0",
68-
"immutable": "5.1.2",
69-
"prettier": "3.5.3"
68+
"immutable": "5.1.3",
69+
"prettier": "3.6.2"
7070
},
71-
"packageManager": "yarn@4.9.1"
71+
"packageManager": "yarn@4.9.4"
7272
}

react/src/components/@extended/Breadcrumbs.jsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ export default function Breadcrumbs({
117117
breadcrumbContent = (
118118
<MainCard
119119
border={card}
120-
sx={card === false ? { mb: 3, bgcolor: 'transparent', borderRadius: 0, overflow: 'visible', ...sx } : { mb: 3, ...sx }}
120+
sx={
121+
card === false
122+
? { mb: 3, bgcolor: 'transparent', borderRadius: 0, overflow: 'visible', boxShadow: 'none', ...sx }
123+
: { mb: 3, ...sx }
124+
}
121125
{...others}
122126
content={card}
123127
boxShadow={false}
@@ -216,7 +220,11 @@ export default function Breadcrumbs({
216220
breadcrumbContent = (
217221
<MainCard
218222
border={card}
219-
sx={card === false ? { mb: 3, bgcolor: 'transparent', borderRadius: 0, overflow: 'visible', ...sx } : { mb: 3, ...sx }}
223+
sx={
224+
card === false
225+
? { mb: 3, bgcolor: 'transparent', borderRadius: 0, overflow: 'visible', boxShadow: 'none', ...sx }
226+
: { mb: 3, ...sx }
227+
}
220228
{...others}
221229
content={card}
222230
boxShadow={false}

react/src/components/MainCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function MainCard({
4444
position: 'relative',
4545
borderRadius: 1.5,
4646
...(border && { border: `1px solid ${theme.palette.divider}` }),
47-
...(((themeContrast && boxShadow) || shadow) && { boxShadow: shadow ? shadow : theme.customShadows.z1 }),
47+
...((themeContrast || boxShadow || shadow) && { boxShadow: shadow ? shadow : theme.customShadows.z1 }),
4848
...(codeHighlight && {
4949
'& pre': {
5050
m: 0,

react/src/components/cards/statistics/EcommerceDataCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default function EcommerceDataCard({ title, count, percentage, color, ico
7272
</Stack>
7373
</Grid>
7474
<Grid size={12}>
75-
<MainCard content={false} border={false} sx={{ bgcolor: 'background.default' }}>
75+
<MainCard content={false} border={false} sx={{ bgcolor: 'secondary.lighter', boxShadow: 'none' }}>
7676
<Box sx={{ p: 3, pb: 1.25 }}>
7777
<Grid container spacing={3}>
7878
<Grid size={7}>{children}</Grid>

react/src/layout/Dashboard/Drawer/index.jsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,17 @@ export default function MainDrawer({ window }) {
4343
open={drawerOpen}
4444
onClose={() => handlerDrawerOpen(!drawerOpen)}
4545
ModalProps={{ keepMounted: true }}
46-
sx={{
47-
display: { xs: drawerOpen ? 'block' : 'none', lg: 'none' },
48-
'& .MuiDrawer-paper': {
49-
boxSizing: 'border-box',
50-
width: DRAWER_WIDTH,
51-
borderRight: '1px solid',
52-
borderColor: 'divider',
53-
backgroundImage: 'none',
54-
boxShadow: 'inherit'
46+
sx={{ display: { xs: drawerOpen ? 'block' : 'none', lg: 'none' } }}
47+
slotProps={{
48+
paper: {
49+
sx: {
50+
boxSizing: 'border-box',
51+
width: DRAWER_WIDTH,
52+
borderRight: '1px solid',
53+
borderColor: 'divider',
54+
backgroundImage: 'none',
55+
boxShadow: 'inherit'
56+
}
5557
}
5658
}}
5759
>

react/src/layout/Dashboard/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Typography from '@mui/material/Typography';
99

1010
export default function Footer() {
1111
return (
12-
<Stack direction="row" sx={{ justifyContent: 'space-between', alignItems: 'center', p: '24px 16px 0px', mt: 'auto' }}>
12+
<Stack direction={{ sm: 'row' }} sx={{ gap: 1, justifyContent: 'space-between', alignItems: 'center', pt: 3, mt: 'auto' }}>
1313
<Typography variant="caption">&copy; Able Pro crafted with ♥ by Team Phoenixcoded</Typography>
1414
<Stack direction="row" sx={{ gap: 1.5, justifyContent: 'space-between', alignItems: 'center' }}>
1515
<Link component={RouterLink} to="https://ableproadmin.com" target="_blank" variant="caption" color="text.primary">

react/src/layout/Dashboard/Header/HeaderContent/Notification.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default function NotificationPage() {
7272
bgcolor: open ? 'secondary.200' : 'secondary.100'
7373
}}
7474
>
75-
<Badge badgeContent={read} color="success" sx={{ '& .MuiBadge-badge': { top: 2, right: 4 } }}>
75+
<Badge badgeContent={read} color="success" slotProps={{ badge: { sx: { top: 2, right: 4 } } }}>
7676
<Notification variant="Bold" />
7777
</Badge>
7878
</IconButton>

react/src/layout/Dashboard/Header/HeaderContent/Search.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ export default function Search() {
2121
</InputAdornment>
2222
}
2323
aria-describedby="header-search-text"
24-
slotProps={{ input: { 'aria-label': 'weight' } }}
24+
slotProps={{ input: { sx: { p: 1.5 }, 'aria-label': 'weight' } }}
2525
placeholder="Ctrl + K"
26-
sx={{ '& .MuiOutlinedInput-input': { p: 1.5 } }}
2726
/>
2827
</FormControl>
2928
</Box>

0 commit comments

Comments
 (0)