Skip to content

Commit a35dc6e

Browse files
sajadevosajadevo
authored
Merge pull request #181 from creativetimofficial/feature/v2.1.0
Feature/v2.1.0
2 parents 504c4d2 + d124802 commit a35dc6e

File tree

256 files changed

+1419
-1006
lines changed

Some content is hidden

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

256 files changed

+1419
-1006
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"endOfLine": "auto"
2020
}
2121
],
22+
"default-param-last": "off",
2223
"react/react-in-jsx-scope": "off",
2324
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
2425
"react/jsx-props-no-spreading": [

‎CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,47 @@
11
# Change Log
22

3+
## [2.1.0] 2022-02-14
4+
5+
### Bug fixing
6+
7+
- Momoized the context provider values
8+
- Fix the conditionally used of useContext for MDPagination component
9+
- Fix the import/no-anonymouse-default-export
10+
11+
### Major style changes
12+
13+
### Deleted components
14+
15+
### Added components
16+
17+
### Deleted dependencies
18+
19+
### Added dependencies
20+
21+
### Updated dependencies
22+
23+
```
24+
"@emotion/cache" 11.4.0 -> 11.7.1
25+
"@emotion/react" 11.4.1 -> 11.7.1
26+
"@emotion/styled" 11.3.0 -> 11.6.0
27+
"@mui/icons-material" 5.2.0 -> 5.4.1
28+
"@mui/material" 5.2.0 -> 5.4.1
29+
"@mui/styled-engine" 5.2.0 -> 5.4.1
30+
"@testing-library/jest-dom" 5.11.4 -> 5.16.2
31+
"@testing-library/react" 12.1.0 -> 12.1.2
32+
"@testing-library/user-event" 12.1.10 -> 13.5.0
33+
"chroma-js" 2.1.2 -> 2.4.2
34+
"prop-types" 15.7.2 -> 15.8.1
35+
"react-router-dom" 6.0.2 -> 6.2.1
36+
"react-scripts" 4.0.3 -> 5.0.0
37+
"stylis" 4.0.10 -> 4.0.13
38+
"stylis-plugin-rtl" 2.1.0 -> 2.1.1
39+
"web-vitals" 1.0.1 -> 2.1.4
40+
"yup" 0.32.9 -> 0.32.11
41+
```
42+
43+
### Warning
44+
345
## [2.0.0] 2021-12-08
446

547
### Bug fixing

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [Material Dashboard 2 React](http://demos.creative-tim.com/material-dashboard-react/#/dashboard?ref=readme-mdr) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?url=https://www.creative-tim.com/product/material-dashboard-react&text=Check%20Material%20Dashboard%202%20react%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#materialdesign%20#react%20https://www.creative-tim.com/product/material-dashboard-react)
22

3-
![version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aissue+is%3Aclosed)
3+
![version](https://img.shields.io/badge/version-2.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg)](https://github.com/creativetimofficial/material-dashboard-react/issues?q=is%3Aissue+is%3Aclosed)
44

55
![Image](https://s3.amazonaws.com/creativetim_bucket/products/71/original/material-dashboard-react.jpg?1638950990)
66

@@ -57,7 +57,7 @@ Let us know your thoughts below. And good luck with development!
5757

5858
## Versions
5959

60-
[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/react-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/material-dashboard-react?ref=readme-mdr)
60+
[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/react-logo.png?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/material-dashboard-react?ref=readme-mdr)
6161

6262
| React |
6363
| ----- |

‎package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-dashboard-2-react",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"private": true,
55
"author": "Creative Tim",
66
"license": "See license in https://www.creative-tim.com/license",
@@ -17,29 +17,29 @@
1717
"npm": ">=6"
1818
},
1919
"dependencies": {
20-
"@emotion/cache": "11.4.0",
21-
"@emotion/react": "11.4.1",
22-
"@emotion/styled": "11.3.0",
23-
"@mui/icons-material": "5.2.0",
24-
"@mui/material": "5.2.0",
25-
"@mui/styled-engine": "5.2.0",
26-
"@testing-library/jest-dom": "5.11.4",
27-
"@testing-library/react": "11.1.0",
28-
"@testing-library/user-event": "12.1.10",
20+
"@emotion/cache": "11.7.1",
21+
"@emotion/react": "11.7.1",
22+
"@emotion/styled": "11.6.0",
23+
"@mui/icons-material": "5.4.1",
24+
"@mui/material": "5.4.1",
25+
"@mui/styled-engine": "5.4.1",
26+
"@testing-library/jest-dom": "5.16.2",
27+
"@testing-library/react": "12.1.2",
28+
"@testing-library/user-event": "13.5.0",
2929
"chart.js": "3.4.1",
30-
"chroma-js": "2.1.2",
31-
"prop-types": "15.7.2",
30+
"chroma-js": "2.4.2",
31+
"prop-types": "15.8.1",
3232
"react": "17.0.2",
3333
"react-chartjs-2": "3.0.4",
3434
"react-dom": "17.0.2",
3535
"react-github-btn": "1.2.1",
36-
"react-router-dom": "6.0.2",
37-
"react-scripts": "4.0.3",
36+
"react-router-dom": "6.2.1",
37+
"react-scripts": "5.0.0",
3838
"react-table": "7.7.0",
39-
"stylis": "4.0.10",
40-
"stylis-plugin-rtl": "2.1.0",
41-
"web-vitals": "1.0.1",
42-
"yup": "0.32.9"
39+
"stylis": "4.0.13",
40+
"stylis-plugin-rtl": "2.1.1",
41+
"web-vitals": "2.1.4",
42+
"yup": "0.32.11"
4343
},
4444
"scripts": {
4545
"start": "react-scripts start",
@@ -67,14 +67,14 @@
6767
]
6868
},
6969
"devDependencies": {
70-
"eslint": "7.30.0",
71-
"eslint-config-airbnb": "18.2.1",
70+
"eslint": "8.8.0",
71+
"eslint-config-airbnb": "19.0.4",
7272
"eslint-config-prettier": "8.3.0",
73-
"eslint-plugin-import": "2.23.4",
74-
"eslint-plugin-jsx-a11y": "6.4.1",
75-
"eslint-plugin-prettier": "3.4.0",
76-
"eslint-plugin-react": "7.24.0",
77-
"eslint-plugin-react-hooks": "4.2.0",
78-
"prettier": "2.3.2"
73+
"eslint-plugin-import": "2.25.4",
74+
"eslint-plugin-jsx-a11y": "6.5.1",
75+
"eslint-plugin-prettier": "4.0.0",
76+
"eslint-plugin-react": "7.28.0",
77+
"eslint-plugin-react-hooks": "4.3.0",
78+
"prettier": "2.5.1"
7979
}
8080
}

‎src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010

‎src/assets/images/bg-reset-cover.jpeg

233 KB
Loading

‎src/assets/theme-dark/base/borders.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,21 +14,21 @@ Coded by www.creative-tim.com
1414
*/
1515

1616
/**
17-
* The base border styles for the Soft UI Dashboard PRO Material.
17+
* The base border styles for the Material Dashboard 2 PRO React.
1818
* You can add new border width, border color or border radius using this file.
19-
* You can customized the borders value for the entire Soft UI Dashboard PRO Material using thie file.
19+
* You can customized the borders value for the entire Material Dashboard 2 PRO React using thie file.
2020
*/
2121

22-
// Material Dashboard 2 PRO React Base Styles
22+
// Material Dashboard 2 React Base Styles
2323
import colors from "assets/theme-dark/base/colors";
2424

25-
// Material Dashboard 2 PRO React Helper Functions
25+
// Material Dashboard 2 React Helper Functions
2626
import pxToRem from "assets/theme-dark/functions/pxToRem";
2727
import rgba from "assets/theme-dark/functions/rgba";
2828

2929
const { white } = colors;
3030

31-
export default {
31+
const borders = {
3232
borderColor: rgba(white.main, 0.4),
3333

3434
borderWidth: {
@@ -50,3 +50,5 @@ export default {
5050
section: pxToRem(160),
5151
},
5252
};
53+
54+
export default borders;

‎src/assets/theme-dark/base/boxShadows.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,20 +14,20 @@ Coded by www.creative-tim.com
1414
*/
1515

1616
/**
17-
* The base box-shadow styles for the Soft UI Dashboard PRO Material.
17+
* The base box-shadow styles for the Material Dashboard 2 PRO React.
1818
* You can add new box-shadow using this file.
19-
* You can customized the box-shadow for the entire Soft UI Dashboard PRO Material using thie file.
19+
* You can customized the box-shadow for the entire Material Dashboard 2 PRO React using thie file.
2020
*/
2121

22-
// Material Dashboard 2 PRO React Base Styles
22+
// Material Dashboard 2 React Base Styles
2323
import colors from "assets/theme-dark/base/colors";
2424

25-
// Material Dashboard 2 PRO React Helper Functions
25+
// Material Dashboard 2 React Helper Functions
2626
import boxShadow from "assets/theme-dark/functions/boxShadow";
2727

2828
const { black, dark, tabs, coloredShadows } = colors;
2929

30-
export default {
30+
const boxShadows = {
3131
xs: boxShadow([0, 2], [9, -5], black.main, 0.15),
3232
sm: boxShadow([0, 5], [10, 0], black.main, 0.12),
3333
md: `${boxShadow([0, 2], [2, 0], black.main, 0.14)}, ${boxShadow(
@@ -114,3 +114,5 @@ export default {
114114
indicator: boxShadow([0, 1], [5, 1], tabs.indicator.boxShadow, 1),
115115
},
116116
};
117+
118+
export default boxShadows;

‎src/assets/theme-dark/base/breakpoints.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,12 +14,12 @@ Coded by www.creative-tim.com
1414
*/
1515

1616
/**
17-
* The base breakpoints for the Soft UI Dashboard PRO Material.
17+
* The base breakpoints for the Material Dashboard 2 PRO React.
1818
* You can add new breakpoints using this file.
19-
* You can customized the breakpoints for the entire Soft UI Dashboard PRO Material using thie file.
19+
* You can customized the breakpoints for the entire Material Dashboard 2 PRO React using thie file.
2020
*/
2121

22-
export default {
22+
const breakpoints = {
2323
values: {
2424
xs: 0,
2525
sm: 576,
@@ -29,3 +29,5 @@ export default {
2929
xxl: 1400,
3030
},
3131
};
32+
33+
export default breakpoints;

‎src/assets/theme-dark/base/colors.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,12 +14,12 @@ Coded by www.creative-tim.com
1414
*/
1515

1616
/**
17-
* The base colors for the Soft UI Dashboard PRO Material.
17+
* The base colors for the Material Dashboard 2 PRO React.
1818
* You can add new color using this file.
19-
* You can customized the colors for the entire Soft UI Dashboard PRO Material using thie file.
19+
* You can customized the colors for the entire Material Dashboard 2 PRO React using thie file.
2020
*/
2121

22-
export default {
22+
const colors = {
2323
background: {
2424
default: "#1a2035",
2525
sidenav: "#1f283e",
@@ -261,3 +261,5 @@ export default {
261261
indicator: { boxShadow: "#ddd" },
262262
},
263263
};
264+
265+
export default colors;

‎src/assets/theme-dark/base/globals.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -13,12 +13,12 @@ Coded by www.creative-tim.com
1313
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1414
*/
1515

16-
// Material Dashboard 2 PRO React Base Styles
16+
// Material Dashboard 2 React Base Styles
1717
import colors from "assets/theme-dark/base/colors";
1818

1919
const { info, dark } = colors;
2020

21-
export default {
21+
const globals = {
2222
html: {
2323
scrollBehavior: "smooth",
2424
},
@@ -37,3 +37,5 @@ export default {
3737
color: `${info.main} !important`,
3838
},
3939
};
40+
41+
export default globals;

‎src/assets/theme-dark/base/typography.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Material Dashboard 2 React - v2.0.0
3+
* Material Dashboard 2 React - v2.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,15 +14,15 @@ Coded by www.creative-tim.com
1414
*/
1515

1616
/**
17-
* The base typography styles for the Soft UI Dashboard PRO Material.
17+
* The base typography styles for the Material Dashboard 2 PRO React.
1818
* You can add new typography style using this file.
19-
* You can customized the typography styles for the entire Soft UI Dashboard PRO Material using thie file.
19+
* You can customized the typography styles for the entire Material Dashboard 2 PRO React using thie file.
2020
*/
2121

22-
// Material Dashboard 2 PRO React Base Styles
22+
// Material Dashboard 2 React Base Styles
2323
import colors from "assets/theme-dark/base/colors";
2424

25-
// Material Dashboard 2 PRO React Helper Functions
25+
// Material Dashboard 2 React Helper Functions
2626
import pxToRem from "assets/theme-dark/functions/pxToRem";
2727

2828
const { white } = colors;

0 commit comments

Comments
 (0)