Skip to content

Commit 05881ef

Browse files
sajadevosajadevo
authored
Merge pull request #213 from creativetimofficial:feature/v2.2.0
update index.html
2 parents 11f6159 + 7eb2c75 commit 05881ef

File tree

258 files changed

+883
-732
lines changed

Some content is hidden

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

258 files changed

+883
-732
lines changed

Diff for: ‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"browser": true,
44
"es2021": true
55
},
6-
"extends": ["plugin:react/recommended", "airbnb", "prettier"],
6+
"extends": ["plugin:react/recommended", "prettier"],
77
"parserOptions": {
88
"ecmaFeatures": {
99
"jsx": true
@@ -19,6 +19,7 @@
1919
"endOfLine": "auto"
2020
}
2121
],
22+
"react/display-name": "off",
2223
"default-param-last": "off",
2324
"react/react-in-jsx-scope": "off",
2425
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],

Diff for: ‎.npmrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
legacy-peer-deps=true
2+
auto-install-peers=true
3+
strict-peer-dependencies=false

Diff for: ‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## [2.2.0] 2023-22-05
4+
5+
- Fix issues
6+
- Update dependencies
7+
- Migrate to React 18
8+
- Fix vulnerabilities issues
9+
- Fix installation issues
10+
311
## [2.1.0] 2022-02-14
412

513
### Bug fixing

Diff for: ‎README.md

+2-2
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.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)
3+
![version](https://img.shields.io/badge/version-2.2.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

@@ -193,7 +193,7 @@ If you have questions or need help integrating the product please [contact us](h
193193

194194
## Licensing
195195

196-
- Copyright 2021 [Creative Tim](https://www.creative-tim.com?ref=readme-mdr)
196+
- Copyright 2023 [Creative Tim](https://www.creative-tim.com?ref=readme-mdr)
197197
- Creative Tim [license](https://www.creative-tim.com/license?ref=readme-mdr)
198198

199199
## Useful Links

Diff for: ‎package.json

+29-36
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-dashboard-2-react",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"private": true,
55
"author": "Creative Tim",
66
"license": "See license in https://www.creative-tim.com/license",
@@ -12,38 +12,29 @@
1212
"type": "git",
1313
"url": "git+https://github.com/creativetimofficial/material-dashboard-react.git"
1414
},
15-
"engines": {
16-
"node": "14 || 15 || 16",
17-
"npm": ">=6"
18-
},
1915
"dependencies": {
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",
29-
"chart.js": "3.4.1",
16+
"@emotion/cache": "11.10.8",
17+
"@emotion/react": "11.10.8",
18+
"@emotion/styled": "11.10.8",
19+
"@mui/icons-material": "5.11.16",
20+
"@mui/material": "5.12.3",
21+
"chart.js": "4.3.0",
3022
"chroma-js": "2.4.2",
3123
"prop-types": "15.8.1",
32-
"react": "17.0.2",
33-
"react-chartjs-2": "3.0.4",
34-
"react-dom": "17.0.2",
35-
"react-github-btn": "1.2.1",
36-
"react-router-dom": "6.2.1",
37-
"react-scripts": "5.0.0",
38-
"react-table": "7.7.0",
39-
"stylis": "4.0.13",
24+
"react": "18.2.0",
25+
"react-chartjs-2": "5.2.0",
26+
"react-dom": "18.2.0",
27+
"react-github-btn": "1.4.0",
28+
"react-router-dom": "6.11.0",
29+
"react-scripts": "5.0.1",
30+
"react-table": "7.8.0",
31+
"stylis": "4.1.4",
4032
"stylis-plugin-rtl": "2.1.1",
41-
"web-vitals": "2.1.4",
42-
"yup": "0.32.11"
33+
"yup": "1.1.1"
4334
},
4435
"scripts": {
45-
"start": "react-scripts start",
46-
"build": "react-scripts build",
36+
"start": "GENERATE_SOURCEMAP=false react-scripts start",
37+
"build": "GENERATE_SOURCEMAP=false react-scripts build",
4738
"test": "react-scripts test",
4839
"eject": "react-scripts eject",
4940
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start"
@@ -67,14 +58,16 @@
6758
]
6859
},
6960
"devDependencies": {
70-
"eslint": "8.8.0",
71-
"eslint-config-airbnb": "19.0.4",
72-
"eslint-config-prettier": "8.3.0",
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"
61+
"eslint": "8.39.0",
62+
"eslint-config-prettier": "8.8.0",
63+
"eslint-plugin-import": "2.27.5",
64+
"eslint-plugin-jsx-a11y": "6.7.1",
65+
"eslint-plugin-prettier": "4.2.1",
66+
"eslint-plugin-react": "7.32.2",
67+
"eslint-plugin-react-hooks": "4.6.0",
68+
"prettier": "2.8.8"
69+
},
70+
"overrides": {
71+
"svgo": "3.0.2"
7972
}
8073
}

Diff for: ‎public/index.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
=========================================================
3-
* Material Dashboard 2 PRO React - v3.0.0
3+
* Material Dashboard 2 React - v2.2.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
@@ -37,11 +37,15 @@
3737
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
3838
rel="stylesheet"
3939
/>
40-
<script defer data-site="YOUR_DOMAIN_HERE" src="https://api.nepcha.com/js/nepcha-analytics.js"></script>
40+
<script
41+
defer
42+
data-site="YOUR_DOMAIN_HERE"
43+
src="https://api.nepcha.com/js/nepcha-analytics.js"
44+
></script>
4145
</head>
4246

4347
<body>
4448
<noscript>You need to enable JavaScript to run this app.</noscript>
45-
<div id="root"></div>
49+
<div id="app"></div>
4650
</body>
4751
</html>

Diff for: ‎src/App.js

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

Diff for: ‎src/assets/theme-dark/base/borders.js

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

1616
/**
17-
* The base border styles for the Material Dashboard 2 PRO React.
17+
* The base border styles for the Material Dashboard 2 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 Material Dashboard 2 PRO React using thie file.
19+
* You can customized the borders value for the entire Material Dashboard 2 React using thie file.
2020
*/
2121

2222
// Material Dashboard 2 React Base Styles

Diff for: ‎src/assets/theme-dark/base/boxShadows.js

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

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

2222
// Material Dashboard 2 React Base Styles

Diff for: ‎src/assets/theme-dark/base/breakpoints.js

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

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

2222
const breakpoints = {

Diff for: ‎src/assets/theme-dark/base/colors.js

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

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

2222
const colors = {

Diff for: ‎src/assets/theme-dark/base/globals.js

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

Diff for: ‎src/assets/theme-dark/base/typography.js

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

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

2222
// Material Dashboard 2 React Base Styles

Diff for: ‎src/assets/theme-dark/components/appBar.js

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

Diff for: ‎src/assets/theme-dark/components/avatar.js

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

Diff for: ‎src/assets/theme-dark/components/breadcrumbs.js

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

Diff for: ‎src/assets/theme-dark/components/button/contained.js

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

Diff for: ‎src/assets/theme-dark/components/button/index.js

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

Diff for: ‎src/assets/theme-dark/components/button/outlined.js

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

0 commit comments

Comments
 (0)