Skip to content

Commit

Permalink
Merge pull request #213 from creativetimofficial:feature/v2.2.0
Browse files Browse the repository at this point in the history
update index.html
  • Loading branch information
sajadevo authored May 22, 2023
2 parents 11f6159 + 7eb2c75 commit 05881ef
Show file tree
Hide file tree
Showing 258 changed files with 883 additions and 732 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"browser": true,
"es2021": true
},
"extends": ["plugin:react/recommended", "airbnb", "prettier"],
"extends": ["plugin:react/recommended", "prettier"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
Expand All @@ -19,6 +19,7 @@
"endOfLine": "auto"
}
],
"react/display-name": "off",
"default-param-last": "off",
"react/react-in-jsx-scope": "off",
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
legacy-peer-deps=true
auto-install-peers=true
strict-peer-dependencies=false
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## [2.2.0] 2023-22-05

- Fix issues
- Update dependencies
- Migrate to React 18
- Fix vulnerabilities issues
- Fix installation issues

## [2.1.0] 2022-02-14

### Bug fixing
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [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)

![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)
![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)

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

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

## Licensing

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

## Useful Links
Expand Down
65 changes: 29 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "material-dashboard-2-react",
"version": "2.1.0",
"version": "2.2.0",
"private": true,
"author": "Creative Tim",
"license": "See license in https://www.creative-tim.com/license",
Expand All @@ -12,38 +12,29 @@
"type": "git",
"url": "git+https://github.com/creativetimofficial/material-dashboard-react.git"
},
"engines": {
"node": "14 || 15 || 16",
"npm": ">=6"
},
"dependencies": {
"@emotion/cache": "11.7.1",
"@emotion/react": "11.7.1",
"@emotion/styled": "11.6.0",
"@mui/icons-material": "5.4.1",
"@mui/material": "5.4.1",
"@mui/styled-engine": "5.4.1",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/react": "12.1.2",
"@testing-library/user-event": "13.5.0",
"chart.js": "3.4.1",
"@emotion/cache": "11.10.8",
"@emotion/react": "11.10.8",
"@emotion/styled": "11.10.8",
"@mui/icons-material": "5.11.16",
"@mui/material": "5.12.3",
"chart.js": "4.3.0",
"chroma-js": "2.4.2",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-chartjs-2": "3.0.4",
"react-dom": "17.0.2",
"react-github-btn": "1.2.1",
"react-router-dom": "6.2.1",
"react-scripts": "5.0.0",
"react-table": "7.7.0",
"stylis": "4.0.13",
"react": "18.2.0",
"react-chartjs-2": "5.2.0",
"react-dom": "18.2.0",
"react-github-btn": "1.4.0",
"react-router-dom": "6.11.0",
"react-scripts": "5.0.1",
"react-table": "7.8.0",
"stylis": "4.1.4",
"stylis-plugin-rtl": "2.1.1",
"web-vitals": "2.1.4",
"yup": "0.32.11"
"yup": "1.1.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"start": "GENERATE_SOURCEMAP=false react-scripts start",
"build": "GENERATE_SOURCEMAP=false react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start"
Expand All @@ -67,14 +58,16 @@
]
},
"devDependencies": {
"eslint": "8.8.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-react": "7.28.0",
"eslint-plugin-react-hooks": "4.3.0",
"prettier": "2.5.1"
"eslint": "8.39.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"prettier": "2.8.8"
},
"overrides": {
"svgo": "3.0.2"
}
}
10 changes: 7 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
=========================================================
* Material Dashboard 2 PRO React - v3.0.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
Expand Down Expand Up @@ -37,11 +37,15 @@
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
rel="stylesheet"
/>
<script defer data-site="YOUR_DOMAIN_HERE" src="https://api.nepcha.com/js/nepcha-analytics.js"></script>
<script
defer
data-site="YOUR_DOMAIN_HERE"
src="https://api.nepcha.com/js/nepcha-analytics.js"
></script>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<div id="app"></div>
</body>
</html>
4 changes: 2 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
8 changes: 4 additions & 4 deletions src/assets/theme-dark/base/borders.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,9 +14,9 @@ Coded by www.creative-tim.com
*/

/**
* The base border styles for the Material Dashboard 2 PRO React.
* The base border styles for the Material Dashboard 2 React.
* You can add new border width, border color or border radius using this file.
* You can customized the borders value for the entire Material Dashboard 2 PRO React using thie file.
* You can customized the borders value for the entire Material Dashboard 2 React using thie file.
*/

// Material Dashboard 2 React Base Styles
Expand Down
8 changes: 4 additions & 4 deletions src/assets/theme-dark/base/boxShadows.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,9 +14,9 @@ Coded by www.creative-tim.com
*/

/**
* The base box-shadow styles for the Material Dashboard 2 PRO React.
* The base box-shadow styles for the Material Dashboard 2 React.
* You can add new box-shadow using this file.
* You can customized the box-shadow for the entire Material Dashboard 2 PRO React using thie file.
* You can customized the box-shadow for the entire Material Dashboard 2 React using thie file.
*/

// Material Dashboard 2 React Base Styles
Expand Down
8 changes: 4 additions & 4 deletions src/assets/theme-dark/base/breakpoints.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,9 +14,9 @@ Coded by www.creative-tim.com
*/

/**
* The base breakpoints for the Material Dashboard 2 PRO React.
* The base breakpoints for the Material Dashboard 2 React.
* You can add new breakpoints using this file.
* You can customized the breakpoints for the entire Material Dashboard 2 PRO React using thie file.
* You can customized the breakpoints for the entire Material Dashboard 2 React using thie file.
*/

const breakpoints = {
Expand Down
8 changes: 4 additions & 4 deletions src/assets/theme-dark/base/colors.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,9 +14,9 @@ Coded by www.creative-tim.com
*/

/**
* The base colors for the Material Dashboard 2 PRO React.
* The base colors for the Material Dashboard 2 React.
* You can add new color using this file.
* You can customized the colors for the entire Material Dashboard 2 PRO React using thie file.
* You can customized the colors for the entire Material Dashboard 2 React using thie file.
*/

const colors = {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/base/globals.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
8 changes: 4 additions & 4 deletions src/assets/theme-dark/base/typography.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,9 +14,9 @@ Coded by www.creative-tim.com
*/

/**
* The base typography styles for the Material Dashboard 2 PRO React.
* The base typography styles for the Material Dashboard 2 React.
* You can add new typography style using this file.
* You can customized the typography styles for the entire Material Dashboard 2 PRO React using thie file.
* You can customized the typography styles for the entire Material Dashboard 2 React using thie file.
*/

// Material Dashboard 2 React Base Styles
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/appBar.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/avatar.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/breadcrumbs.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/button/contained.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/button/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/theme-dark/components/button/outlined.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
* Material Dashboard 2 React - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
Loading

0 comments on commit 05881ef

Please sign in to comment.