Skip to content

Commit 6868bf2

Browse files
version v 5.0.0 (#147)
* version v 5.0.0 * fix lock file --------- Co-authored-by: Dikshit Moradiya <phoenixcoded20@outlook.com>
1 parent d751c40 commit 6868bf2

98 files changed

Lines changed: 4160 additions & 3021 deletions

File tree

Some content is hidden

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

vite/.env

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

44
## PUBLIC URL

vite/package.json

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"name": "berry-material-react-js",
3-
"version": "4.1.0",
3+
"version": "5.0.0",
44
"private": true,
55
"dependencies": {
6-
"@emotion/react": "^11.14.0",
7-
"@emotion/styled": "^11.14.0",
8-
"@fontsource/inter": "5.2.5",
9-
"@fontsource/poppins": "5.2.6",
10-
"@fontsource/roboto": "5.2.5",
11-
"@mui/icons-material": "7.1.0",
12-
"@mui/material": "7.1.0",
13-
"@tabler/icons-react": "3.31.0",
14-
"@vitejs/plugin-react": "4.4.1",
15-
"apexcharts": "4.7.0",
16-
"framer-motion": "12.10.1",
6+
"@emotion/react": "11.14.0",
7+
"@emotion/styled": "11.14.1",
8+
"@fontsource/inter": "5.2.8",
9+
"@fontsource/poppins": "5.2.7",
10+
"@fontsource/roboto": "5.2.8",
11+
"@mui/icons-material": "7.3.4",
12+
"@mui/material": "7.3.4",
13+
"@tabler/icons-react": "3.35.0",
14+
"@vitejs/plugin-react": "5.0.4",
15+
"framer-motion": "12.23.22",
1716
"lodash-es": "4.17.21",
18-
"material-ui-popup-state": "5.3.5",
19-
"react": "19.1.0",
20-
"react-apexcharts": "1.7.0",
21-
"react-dom": "19.1.0",
22-
"react-perfect-scrollbar": "1.5.8",
23-
"react-router": "7.5.3",
24-
"react-router-dom": "7.5.3",
17+
"material-ui-popup-state": "5.3.6",
18+
"react": "19.2.0",
19+
"react-apexcharts": "^1.7.0",
20+
"react-device-detect": "^2.2.3",
21+
"react-dom": "19.2.0",
22+
"react-router": "7.9.3",
23+
"react-router-dom": "7.9.3",
24+
"simplebar-react": "3.3.2",
2525
"slick-carousel": "1.8.1",
26-
"swr": "2.3.3",
27-
"vite": "6.3.5",
26+
"swr": "2.3.6",
27+
"vite": "7.1.9",
2828
"vite-jsconfig-paths": "2.0.1",
29-
"web-vitals": "5.0.0",
30-
"yup": "1.6.1"
29+
"web-vitals": "5.1.0",
30+
"yup": "1.7.1"
3131
},
3232
"scripts": {
3333
"start": "vite",
@@ -56,17 +56,18 @@
5656
]
5757
},
5858
"devDependencies": {
59-
"@eslint/compat": "1.2.9",
59+
"@eslint/compat": "1.4.0",
6060
"@eslint/eslintrc": "3.3.1",
61-
"@eslint/js": "9.26.0",
62-
"eslint": "9.25.1",
63-
"eslint-config-prettier": "10.1.2",
61+
"@eslint/js": "9.37.0",
62+
"eslint": "9.37.0",
63+
"eslint-config-prettier": "10.1.8",
6464
"eslint-plugin-jsx-a11y": "6.10.2",
65-
"eslint-plugin-prettier": "5.2.6",
65+
"eslint-plugin-prettier": "5.5.4",
6666
"eslint-plugin-react": "7.37.5",
67-
"eslint-plugin-react-hooks": "5.2.0",
68-
"prettier": "3.5.3",
69-
"sass": "1.87.0"
67+
"eslint-plugin-react-hooks": "6.1.1",
68+
"prettier": "3.6.2",
69+
"prettier-eslint-cli": "8.0.1",
70+
"sass": "1.93.2"
7071
},
71-
"packageManager": "yarn@4.9.1"
72+
"packageManager": "yarn@4.10.3"
7273
}

vite/src/api/menu.js

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@ import useSWR, { mutate } from 'swr';
22
import { useMemo } from 'react';
33

44
const initialState = {
5-
openedItem: 'dashboard',
6-
openedComponent: 'buttons',
7-
openedHorizontalItem: null,
8-
isDashboardDrawerOpened: false,
9-
isComponentDrawerOpened: true
5+
isDashboardDrawerOpened: false
106
};
117

12-
export const endpoints = {
8+
const endpoints = {
139
key: 'api/menu',
14-
master: 'master',
15-
dashboard: '/dashboard' // server URL
10+
master: 'master'
1611
};
1712

1813
export function useGetMenuMaster() {
@@ -44,15 +39,3 @@ export function handlerDrawerOpen(isDashboardDrawerOpened) {
4439
false
4540
);
4641
}
47-
48-
export function handlerActiveItem(openedItem) {
49-
// to update local state based on key
50-
51-
mutate(
52-
endpoints.key + endpoints.master,
53-
(currentMenuMaster) => {
54-
return { ...currentMenuMaster, openedItem };
55-
},
56-
false
57-
);
58-
}

vite/src/assets/scss/_themes-vars.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ $darkTextSecondary: #8492c4;
154154
darkSecondaryDark: $darkSecondaryDark;
155155
darkSecondary200: $darkSecondary200;
156156
darkSecondary800: $darkSecondary800;
157-
}
157+
}

vite/src/assets/scss/style.scss

Lines changed: 80 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@use 'themes-vars.module.scss' as *;
33

44
// third party
5-
@use 'react-perfect-scrollbar/dist/css/styles.css';
5+
@use 'simplebar-react/dist/simplebar.min.css';
66

77
// ==============================|| TAP HIGHLIGHT ||============================== //
88

@@ -12,40 +12,68 @@
1212

1313
// ==============================|| APEXCHART ||============================== //
1414

15-
.apexcharts-legend-series .apexcharts-legend-marker {
16-
left: -4px !important;
17-
right: -4px !important;
18-
}
19-
20-
.apexcharts-legend.apx-legend-position-bottom .apexcharts-legend-series,
21-
.apexcharts-legend.apx-legend-position-top .apexcharts-legend-series {
15+
.apexcharts-legend-series {
2216
gap: 8px;
2317
}
2418

2519
.apexcharts-canvas {
20+
2621
.apexcharts-tooltip-series-group.apexcharts-active,
2722
.apexcharts-tooltip-series-group:last-child {
2823
padding-bottom: 0;
2924
}
3025
}
3126

32-
.apexcharts-legend-series {
33-
align-items: center;
34-
display: flex;
35-
gap: 8px;
27+
.apexcharts-menu-icon svg,
28+
.apexcharts-reset-icon svg,
29+
.apexcharts-zoom-icon svg,
30+
.apexcharts-zoomin-icon svg,
31+
.apexcharts-zoomout-icon svg {
32+
fill: var(--palette-text-secondary) !important;
33+
}
34+
35+
.apexcharts-pan-icon svg {
36+
stroke: var(--palette-text-secondary) !important;
37+
fill: transparent !important;
38+
}
39+
40+
.apexcharts-zoom-icon.apexcharts-selected svg {
41+
fill: var(--palette-primary-main) !important;
42+
}
43+
44+
.apexcharts-pan-icon.apexcharts-selected svg {
45+
stroke: var(--palette-primary-main) !important;
46+
}
47+
48+
.apexcharts-toolbar .apexcharts-pan-icon:hover:not(.apexcharts-selected) svg {
49+
stroke: var(--palette-grey-600) !important;
50+
}
51+
52+
.apexcharts-toolbar div:hover:not(.apexcharts-selected):not(.apexcharts-pan-icon) svg {
53+
fill: var(--palette-grey-600) !important;
54+
}
55+
56+
.apexcharts-menu {
57+
background-color: var(--palette-background-paper);
58+
}
59+
60+
.apexcharts-menu-item:hover {
61+
background-color: var(--palette-grey-200);
3662
}
3763

3864
// ==============================|| PERFECT SCROLLBAR ||============================== //
3965

4066
.scrollbar-container {
4167
.ps__rail-y {
42-
&:hover > .ps__thumb-y,
43-
&:focus > .ps__thumb-y,
68+
69+
&:hover>.ps__thumb-y,
70+
&:focus>.ps__thumb-y,
4471
&.ps--clicking .ps__thumb-y {
4572
background-color: $grey500;
4673
width: 5px;
4774
}
4875
}
76+
4977
.ps__thumb-y {
5078
background-color: $grey500;
5179
border-radius: 6px;
@@ -55,94 +83,127 @@
5583
}
5684

5785
.scrollbar-container.ps,
58-
.scrollbar-container > .ps {
59-
&.ps--active-y > .ps__rail-y {
86+
.scrollbar-container>.ps {
87+
&.ps--active-y>.ps__rail-y {
6088
width: 5px;
6189
background-color: transparent !important;
6290
z-index: 999;
91+
6392
&:hover,
6493
&.ps--clicking {
6594
width: 5px;
6695
background-color: transparent;
6796
}
6897
}
69-
&.ps--scrolling-y > .ps__rail-y,
70-
&.ps--scrolling-x > .ps__rail-x {
98+
99+
&.ps--scrolling-y>.ps__rail-y,
100+
&.ps--scrolling-x>.ps__rail-x {
71101
opacity: 0.4;
72102
background-color: transparent;
73103
}
74104
}
75105

106+
.blog-slider .slick-slide {
107+
padding: 0 5px;
108+
}
109+
110+
.blog-slider .slick-track {
111+
padding: 0 -5px;
112+
}
113+
76114
// ==============================|| ANIMATION KEYFRAMES ||============================== //
77115

78116
@keyframes wings {
79117
50% {
80118
transform: translateY(-40px);
81119
}
120+
82121
100% {
83122
transform: translateY(0px);
84123
}
85124
}
86125

126+
@keyframes wingsReverse {
127+
50% {
128+
transform: translateY(40px) scaleX(-1);
129+
}
130+
131+
100% {
132+
transform: translateY(0px) scaleX(-1);
133+
}
134+
}
135+
87136
@keyframes blink {
88137
50% {
89138
opacity: 0;
90139
}
140+
91141
100% {
92142
opacity: 1;
93143
}
94144
}
95145

96146
@keyframes bounce {
147+
97148
0%,
98149
20%,
99150
53%,
100151
to {
101152
animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
102153
transform: translateZ(0);
103154
}
155+
104156
40%,
105157
43% {
106158
animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
107159
transform: translate3d(0, -5px, 0);
108160
}
161+
109162
70% {
110163
animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
111164
transform: translate3d(0, -7px, 0);
112165
}
166+
113167
80% {
114168
transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
115169
transform: translateZ(0);
116170
}
171+
117172
90% {
118173
transform: translate3d(0, -2px, 0);
119174
}
120175
}
121176

122177
@keyframes slideY {
178+
123179
0%,
124180
50%,
125181
100% {
126182
transform: translateY(0px);
127183
}
184+
128185
25% {
129186
transform: translateY(-10px);
130187
}
188+
131189
75% {
132190
transform: translateY(10px);
133191
}
134192
}
135193

136194
@keyframes slideX {
195+
137196
0%,
138197
50%,
139198
100% {
140199
transform: translateX(0px);
141200
}
201+
142202
25% {
143203
transform: translateX(-10px);
144204
}
205+
145206
75% {
146207
transform: translateX(10px);
147208
}
148-
}
209+
}

vite/src/config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
export const DASHBOARD_PATH = '/sample-page';
2+
export const DEFAULT_THEME_MODE = 'system';
3+
4+
export const CSS_VAR_PREFIX = '';
25

36
const config = {
47
fontFamily: `'Roboto', sans-serif`,

0 commit comments

Comments
 (0)