Skip to content

Commit

Permalink
Merge pull request #181 from creativetimofficial/feature/v2.1.0
Browse files Browse the repository at this point in the history
Feature/v2.1.0
  • Loading branch information
sajadevo authored Feb 14, 2022
2 parents 504c4d2 + d124802 commit a35dc6e
Show file tree
Hide file tree
Showing 256 changed files with 1,419 additions and 1,006 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"endOfLine": "auto"
}
],
"default-param-last": "off",
"react/react-in-jsx-scope": "off",
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/jsx-props-no-spreading": [
Expand Down
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
# Change Log

## [2.1.0] 2022-02-14

### Bug fixing

- Momoized the context provider values
- Fix the conditionally used of useContext for MDPagination component
- Fix the import/no-anonymouse-default-export

### Major style changes

### Deleted components

### Added components

### Deleted dependencies

### Added dependencies

### Updated dependencies

```
"@emotion/cache" 11.4.0 -> 11.7.1
"@emotion/react" 11.4.1 -> 11.7.1
"@emotion/styled" 11.3.0 -> 11.6.0
"@mui/icons-material" 5.2.0 -> 5.4.1
"@mui/material" 5.2.0 -> 5.4.1
"@mui/styled-engine" 5.2.0 -> 5.4.1
"@testing-library/jest-dom" 5.11.4 -> 5.16.2
"@testing-library/react" 12.1.0 -> 12.1.2
"@testing-library/user-event" 12.1.10 -> 13.5.0
"chroma-js" 2.1.2 -> 2.4.2
"prop-types" 15.7.2 -> 15.8.1
"react-router-dom" 6.0.2 -> 6.2.1
"react-scripts" 4.0.3 -> 5.0.0
"stylis" 4.0.10 -> 4.0.13
"stylis-plugin-rtl" 2.1.0 -> 2.1.1
"web-vitals" 1.0.1 -> 2.1.4
"yup" 0.32.9 -> 0.32.11
```

### Warning

## [2.0.0] 2021-12-08

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

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

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

## Versions

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

| React |
| ----- |
Expand Down
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "material-dashboard-2-react",
"version": "2.0.0",
"version": "2.1.0",
"private": true,
"author": "Creative Tim",
"license": "See license in https://www.creative-tim.com/license",
Expand All @@ -17,29 +17,29 @@
"npm": ">=6"
},
"dependencies": {
"@emotion/cache": "11.4.0",
"@emotion/react": "11.4.1",
"@emotion/styled": "11.3.0",
"@mui/icons-material": "5.2.0",
"@mui/material": "5.2.0",
"@mui/styled-engine": "5.2.0",
"@testing-library/jest-dom": "5.11.4",
"@testing-library/react": "11.1.0",
"@testing-library/user-event": "12.1.10",
"@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",
"chroma-js": "2.1.2",
"prop-types": "15.7.2",
"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.0.2",
"react-scripts": "4.0.3",
"react-router-dom": "6.2.1",
"react-scripts": "5.0.0",
"react-table": "7.7.0",
"stylis": "4.0.10",
"stylis-plugin-rtl": "2.1.0",
"web-vitals": "1.0.1",
"yup": "0.32.9"
"stylis": "4.0.13",
"stylis-plugin-rtl": "2.1.1",
"web-vitals": "2.1.4",
"yup": "0.32.11"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -67,14 +67,14 @@
]
},
"devDependencies": {
"eslint": "7.30.0",
"eslint-config-airbnb": "18.2.1",
"eslint": "8.8.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-react": "7.24.0",
"eslint-plugin-react-hooks": "4.2.0",
"prettier": "2.3.2"
"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"
}
}
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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand Down
Binary file added src/assets/images/bg-reset-cover.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 9 additions & 7 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,21 +14,21 @@ Coded by www.creative-tim.com
*/

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

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

// Material Dashboard 2 PRO React Helper Functions
// Material Dashboard 2 React Helper Functions
import pxToRem from "assets/theme-dark/functions/pxToRem";
import rgba from "assets/theme-dark/functions/rgba";

const { white } = colors;

export default {
const borders = {
borderColor: rgba(white.main, 0.4),

borderWidth: {
Expand All @@ -50,3 +50,5 @@ export default {
section: pxToRem(160),
},
};

export default borders;
16 changes: 9 additions & 7 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,20 +14,20 @@ Coded by www.creative-tim.com
*/

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

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

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

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

export default {
const boxShadows = {
xs: boxShadow([0, 2], [9, -5], black.main, 0.15),
sm: boxShadow([0, 5], [10, 0], black.main, 0.12),
md: `${boxShadow([0, 2], [2, 0], black.main, 0.14)}, ${boxShadow(
Expand Down Expand Up @@ -114,3 +114,5 @@ export default {
indicator: boxShadow([0, 1], [5, 1], tabs.indicator.boxShadow, 1),
},
};

export default boxShadows;
12 changes: 7 additions & 5 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,12 +14,12 @@ Coded by www.creative-tim.com
*/

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

export default {
const breakpoints = {
values: {
xs: 0,
sm: 576,
Expand All @@ -29,3 +29,5 @@ export default {
xxl: 1400,
},
};

export default breakpoints;
12 changes: 7 additions & 5 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,12 +14,12 @@ Coded by www.creative-tim.com
*/

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

export default {
const colors = {
background: {
default: "#1a2035",
sidenav: "#1f283e",
Expand Down Expand Up @@ -261,3 +261,5 @@ export default {
indicator: { boxShadow: "#ddd" },
},
};

export default colors;
10 changes: 6 additions & 4 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -13,12 +13,12 @@ Coded by www.creative-tim.com
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/

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

const { info, dark } = colors;

export default {
const globals = {
html: {
scrollBehavior: "smooth",
},
Expand All @@ -37,3 +37,5 @@ export default {
color: `${info.main} !important`,
},
};

export default globals;
12 changes: 6 additions & 6 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.0.0
* Material Dashboard 2 React - v2.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -14,15 +14,15 @@ Coded by www.creative-tim.com
*/

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

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

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

const { white } = colors;
Expand Down
Loading

0 comments on commit a35dc6e

Please sign in to comment.