Skip to content

Commit 5fe10d6

Browse files
ct-dixitct-vrushtict-vrushtiphoenixcoded
authored
free version (#74) (#75) (#76)
* free version update * free version on change complete * yml file update --------- Co-authored-by: ct-vrushti <vrushti.chopda@codedthemes.com> Co-authored-by: ct-vrushti <vrushti.pcoded@gmail.com> Co-authored-by: Dikshit Moradiya <phoenixcoded@gmail.com>
1 parent 42f7d65 commit 5fe10d6

68 files changed

Lines changed: 6048 additions & 5993 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/prod-angular.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- master
99
paths:
10-
- 'angular/**'
10+
- "angular/**"
1111
#pull_request:
1212
# types:
1313
# - closed
@@ -25,10 +25,10 @@ jobs:
2525
- name: 🚚 Get latest code
2626
uses: actions/checkout@v4
2727

28-
- name: Install Node.js 22
28+
- name: Install Node.js 24
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: "22"
31+
node-version: "24"
3232

3333
- name: 🔨 Build Project
3434
run: |
@@ -46,4 +46,4 @@ jobs:
4646
REMOTE_USER: u965251139
4747
REMOTE_PORT: "65002"
4848
TARGET: domains/ableproadmin.com/public_html/angular/free
49-
EXCLUDE: "/angular/node_modules/"
49+
EXCLUDE: "/angular/node_modules/"

.github/workflows/prod-react.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
- name: 🚚 Get latest code
2626
uses: actions/checkout@v4
2727

28-
- name: Install Node.js 22
28+
- name: Install Node.js 24
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: "22"
31+
node-version: "24"
3232

3333
- name: 🔨 Build Project
3434
run: |
3535
cd react
3636
corepack enable
37-
yarn set version 4.9.1
37+
yarn set version 4.12.0
3838
yarn
3939
yarn run build
4040

.github/workflows/prod-vue.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- master
99
paths:
10-
- 'vue/**'
10+
- "vue/**"
1111

1212
jobs:
1313
#if_merged:
@@ -20,10 +20,10 @@ jobs:
2020
- name: 🚚 Get latest code
2121
uses: actions/checkout@v4
2222

23-
- name: Use Node.js 22
23+
- name: Use Node.js 24
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: "22"
26+
node-version: "24"
2727

2828
- name: 🔨 Build Project
2929
run: |
@@ -41,4 +41,4 @@ jobs:
4141
REMOTE_USER: u965251139
4242
REMOTE_PORT: "65002"
4343
TARGET: domains/ableproadmin.com/public_html/vue/free
44-
EXCLUDE: "/full-version/node_modules/"
44+
EXCLUDE: "/full-version/node_modules/"

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2025 Phoenixcoded
3+
Copyright (c) 2026 Phoenixcoded
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

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.2.0
1+
VITE_APP_VERSION = v3.0.0
22
GENERATE_SOURCEMAP = false
33

44
## Public URL

react/package.json

Lines changed: 27 additions & 27 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.2.0",
3+
"version": "3.0.0",
44
"dependencies": {
55
"@emotion/cache": "11.14.0",
66
"@emotion/react": "11.14.0",
77
"@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",
14-
"formik": "2.4.6",
15-
"framer-motion": "12.23.12",
8+
"@fontsource/inter": "5.2.8",
9+
"@mui/lab": "7.0.1-beta.20",
10+
"@mui/material": "7.3.6",
11+
"@mui/system": "7.3.6",
12+
"@vitejs/plugin-react": "5.1.2",
13+
"apexcharts": "5.3.6",
14+
"formik": "2.4.9",
15+
"framer-motion": "12.23.26",
1616
"iconsax-reactjs": "0.0.8",
17-
"lodash-es": "4.17.21",
17+
"lodash-es": "4.17.22",
1818
"prop-types": "15.8.1",
19-
"react": "19.1.1",
20-
"react-apexcharts": "1.7.0",
19+
"react": "19.2.3",
20+
"react-apexcharts": "1.9.0",
2121
"react-device-detect": "2.2.3",
22-
"react-dom": "19.1.1",
23-
"react-router": "7.8.2",
24-
"react-router-dom": "7.8.2",
22+
"react-dom": "19.2.3",
23+
"react-router": "7.11.0",
24+
"react-router-dom": "7.11.0",
2525
"simplebar-react": "3.3.2",
26-
"swr": "2.3.6",
27-
"vite": "7.1.3",
26+
"swr": "2.3.8",
27+
"vite": "7.3.0",
2828
"vite-jsconfig-paths": "2.0.1",
29-
"web-vitals": "5.0.1",
30-
"yup": "1.7.0"
29+
"web-vitals": "5.1.0",
30+
"yup": "1.7.1"
3131
},
3232
"scripts": {
3333
"start": "vite",
@@ -56,17 +56,17 @@
5656
]
5757
},
5858
"devDependencies": {
59-
"@eslint/compat": "1.3.2",
60-
"@eslint/eslintrc": "3.3.1",
61-
"@eslint/js": "9.34.0",
62-
"eslint": "9.34.0",
59+
"@eslint/compat": "2.0.0",
60+
"@eslint/eslintrc": "3.3.3",
61+
"@eslint/js": "9.39.2",
62+
"eslint": "9.39.2",
6363
"eslint-config-prettier": "10.1.8",
6464
"eslint-plugin-jsx-a11y": "6.10.2",
6565
"eslint-plugin-prettier": "5.5.4",
6666
"eslint-plugin-react": "7.37.5",
67-
"eslint-plugin-react-hooks": "5.2.0",
68-
"immutable": "5.1.3",
69-
"prettier": "3.6.2"
67+
"eslint-plugin-react-hooks": "7.0.1",
68+
"immutable": "5.1.4",
69+
"prettier": "3.7.4"
7070
},
71-
"packageManager": "yarn@4.9.4"
71+
"packageManager": "yarn@4.12.0"
7272
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.apexcharts-legend-series {
2+
gap: 8px;
3+
}
4+
5+
/* @override - margin bottom depends on marker size in tooltip */
6+
.apexcharts-tooltip-marker {
7+
margin-bottom: 2px !important;
8+
}
9+
10+
.apexcharts-tooltip-series-group.apexcharts-active,
11+
.apexcharts-tooltip-series-group:last-child {
12+
padding-bottom: 0 !important;
13+
}
14+
15+
.apexcharts-menu-icon svg,
16+
.apexcharts-reset-icon svg,
17+
.apexcharts-zoom-icon svg,
18+
.apexcharts-zoomin-icon svg,
19+
.apexcharts-zoomout-icon svg {
20+
fill: var(--palette-text-secondary) !important;
21+
}
22+
23+
.apexcharts-pan-icon svg {
24+
stroke: var(--palette-text-secondary) !important;
25+
fill: transparent !important;
26+
}
27+
28+
.apexcharts-zoom-icon.apexcharts-selected svg {
29+
fill: var(--palette-primary-main) !important;
30+
}
31+
32+
.apexcharts-pan-icon.apexcharts-selected svg {
33+
stroke: var(--palette-primary-main) !important;
34+
}
35+
36+
.apexcharts-toolbar .apexcharts-pan-icon:hover:not(.apexcharts-selected) svg {
37+
stroke: var(--palette-grey-600) !important;
38+
}
39+
40+
.apexcharts-toolbar div:hover:not(.apexcharts-selected):not(.apexcharts-pan-icon) svg {
41+
fill: var(--palette-grey-600) !important;
42+
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import PropTypes from 'prop-types';
22

33
// material-ui
4-
import { alpha, styled } from '@mui/material/styles';
4+
import { styled } from '@mui/material/styles';
55
import MuiAvatar from '@mui/material/Avatar';
66

77
// project-imports
88
import getColors from 'utils/getColors';
9+
import { withAlpha } from 'utils/colorUtils';
910

1011
function getColorStyle({ theme, color, type }) {
1112
const colors = getColors(theme, color);
@@ -29,12 +30,12 @@ function getColorStyle({ theme, color, type }) {
2930
color: main,
3031
border: '1px solid',
3132
borderColor: light,
32-
backgroundColor: alpha(lighter, 0.8)
33+
backgroundColor: withAlpha(lighter, 0.8)
3334
};
3435
default:
3536
return {
3637
color: main,
37-
backgroundColor: alpha(lighter, 0.8)
38+
backgroundColor: withAlpha(lighter, 0.8)
3839
};
3940
}
4041
}
@@ -113,7 +114,7 @@ const AvatarStyle = styled(MuiAvatar, { shouldForwardProp: (prop) => prop !== 'c
113114
...getSizeStyle(size),
114115
...getColorStyle({ theme, color, type }),
115116
...(size === 'badge' && {
116-
borderColor: theme.palette.background.default
117+
borderColor: theme.vars.palette.background.default
117118
})
118119
})
119120
);

0 commit comments

Comments
 (0)