Skip to content

Commit 6a547a5

Browse files
committed
Update to v4.0.0
1 parent eea859e commit 6a547a5

File tree

148 files changed

+238
-202
lines changed

Some content is hidden

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

148 files changed

+238
-202
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GENERATE_SOURCEMAP=false

.eslintrc.json

+16-18
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
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
1010
},
1111
"ecmaVersion": 12,
1212
"sourceType": "module"
1313
},
14-
"plugins": ["react", "prettier"],
14+
"plugins": ["react", "react-hooks", "import", "prettier"],
1515
"rules": {
16-
"prettier/prettier": [
17-
"error",
18-
{
19-
"endOfLine": "auto"
20-
}
21-
],
22-
"default-param-last": "off",
23-
"react/react-in-jsx-scope": "off",
2416
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
25-
"react/jsx-props-no-spreading": [
26-
1,
27-
{
28-
"custom": "ignore"
29-
}
30-
],
31-
"react/jsx-curly-spacing": [2, "never"]
17+
"react/require-default-props": "off",
18+
"no-param-reassign": "off",
19+
"jsx-a11y/alt-text": "off",
20+
"react/react-in-jsx-scope": "off",
21+
"react/display-name": "off"
22+
},
23+
"settings": {
24+
"react": {
25+
"version": "detect"
26+
},
27+
"import/resolver": { "node": { "moduleDirectory": ["node_modules", "src/"] } }
3228
},
33-
"settings": { "import/resolver": { "node": { "paths": ["src"] } } }
29+
"globals": {
30+
"JSX": true
31+
}
3432
}

.yarnrc.yml

-1
This file was deleted.

CHANGELOG.md

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

3+
## [4.0.0] 2022-07-04
4+
5+
- Rename components prefix from Sui to Soft.
6+
- Update dependencies.
7+
- Fix the peer dependencies issue.
8+
- Fix the eslint issue with react-app.
9+
- Migrate eslint config from airbnb to react-app.
10+
311
## [3.1.0] 2022-03-04
412

513
### Bug fixing

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [Soft UI Dashboard React](http://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard?ref=readme-sudr) [![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/soft-ui-dashboard-react&text=Check%20Soft%20UI%20Dashboard%20react%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#softdesign%20#react%20https://www.creative-tim.com/product/soft-ui-dashboard-react)
22

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

55
![Image](https://s3.amazonaws.com/creativetim_bucket/products/500/original/soft-ui-dashboard-material-ui.jpg)
66

package.json

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"name": "soft-ui-dashboard-react",
3-
"version": "3.1.0",
3+
"version": "4.0.0",
44
"author": "Creative Tim",
55
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
66
"description": "ReactJS version of Soft UI Dashboard by Creative Tim",
7-
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/",
87
"bugs": {
98
"url": "https://github.com/creativetimofficial/soft-ui-dashboard-react/issues"
109
},
@@ -17,27 +16,26 @@
1716
"npm": ">=6"
1817
},
1918
"dependencies": {
20-
"@emotion/cache": "11.7.1",
21-
"@emotion/react": "11.8.1",
22-
"@emotion/styled": "11.8.1",
23-
"@mui/icons-material": "5.4.2",
24-
"@mui/material": "5.4.3",
25-
"@mui/styled-engine": "5.4.2",
26-
"@testing-library/jest-dom": "5.16.2",
27-
"@testing-library/react": "12.1.3",
28-
"@testing-library/user-event": "13.5.0",
19+
"@emotion/cache": "11.9.3",
20+
"@emotion/react": "11.9.3",
21+
"@emotion/styled": "11.9.3",
22+
"@mui/icons-material": "5.8.4",
23+
"@mui/material": "5.8.6",
24+
"@mui/styled-engine": "5.8.0",
25+
"@testing-library/jest-dom": "5.16.4",
26+
"@testing-library/react": "13.3.0",
27+
"@testing-library/user-event": "14.2.1",
2928
"chart.js": "3.4.1",
3029
"chroma-js": "2.4.2",
3130
"prop-types": "15.8.1",
32-
"react": "17.0.2",
31+
"react": "18.2.0",
3332
"react-chartjs-2": "3.0.4",
34-
"react-countup": "6.1.1",
35-
"react-dom": "17.0.2",
36-
"react-flatpickr": "3.10.7",
37-
"react-github-btn": "1.2.1",
38-
"react-router-dom": "6.2.1",
39-
"react-scripts": "5.0.0",
40-
"stylis": "4.0.13",
33+
"react-countup": "6.3.0",
34+
"react-dom": "18.2.0",
35+
"react-flatpickr": "3.10.13",
36+
"react-router-dom": "6.3.0",
37+
"react-scripts": "5.0.1",
38+
"stylis": "4.1.1",
4139
"stylis-plugin-rtl": "2.1.1",
4240
"uuid": "8.3.2",
4341
"web-vitals": "2.1.4"
@@ -69,14 +67,12 @@
6967
]
7068
},
7169
"devDependencies": {
72-
"eslint": "8.10.0",
73-
"eslint-config-airbnb": "19.0.4",
74-
"eslint-config-prettier": "8.4.0",
75-
"eslint-plugin-import": "2.25.4",
76-
"eslint-plugin-jsx-a11y": "6.5.1",
77-
"eslint-plugin-prettier": "4.0.0",
78-
"eslint-plugin-react": "7.28.0",
79-
"eslint-plugin-react-hooks": "4.3.0",
80-
"prettier": "2.5.1"
70+
"eslint": "8.18.0",
71+
"eslint-config-prettier": "8.5.0",
72+
"eslint-plugin-import": "2.26.0",
73+
"eslint-plugin-prettier": "4.2.1",
74+
"eslint-plugin-react": "7.30.1",
75+
"eslint-plugin-react-hooks": "4.6.0",
76+
"prettier": "2.7.1"
8177
}
8278
}

public/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
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 async defer src="https://buttons.github.io/buttons.js"></script>
4041
</head>
4142

4243
<body>

src/App.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/boxShadow.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/gradientChartLine.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/hexToRgb.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/linearGradient.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/pxToRem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/functions/rgba.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/assets/theme/theme-rtl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftAlert/SoftAlertCloseIcon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftAlert/SoftAlertRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftAlert/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react
@@ -41,7 +41,9 @@ function SoftAlert({ color, dismissible, children, ...rest }) {
4141
{children}
4242
</SoftBox>
4343
{dismissible ? (
44-
<SoftAlertCloseIcon onClick={mount ? handleAlertStatus : null}>&times;</SoftAlertCloseIcon>
44+
<SoftAlertCloseIcon onClick={mount ? handleAlertStatus : null}>
45+
&times;
46+
</SoftAlertCloseIcon>
4547
) : null}
4648
</SoftAlertRoot>
4749
</Fade>

src/components/SoftAvatar/SoftAvatarRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftAvatar/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftBadge/SoftBadgeRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftBadge/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftBox/SoftBoxRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftBox/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftButton/SoftButtonRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftInput/SoftInputIconBoxRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftInput/SoftInputIconRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftInput/SoftInputRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftInput/SoftInputWithIconRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftInput/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react
@@ -62,7 +62,9 @@ const SoftInput = forwardRef(({ size, icon, error, success, disabled, ...rest },
6262
</SoftInputWithIconRoot>
6363
);
6464
} else {
65-
template = <SoftInputRoot {...rest} ref={ref} ownerState={{ size, error, success, disabled }} />;
65+
template = (
66+
<SoftInputRoot {...rest} ref={ref} ownerState={{ size, error, success, disabled }} />
67+
);
6668
}
6769

6870
return template;

src/components/SoftPagination/SoftPaginationItemRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftPagination/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

src/components/SoftProgress/SoftProgressRoot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.1.0
3+
* Soft UI Dashboard React - v4.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react

0 commit comments

Comments
 (0)