Skip to content

Commit 6fe9d3b

Browse files
authored
Merge pull request #22 from creativetimofficial/feature/v4.0.0
Feature/v4.0.0
2 parents d6934a8 + 6a547a5 commit 6fe9d3b

File tree

153 files changed

+2001
-1965
lines changed

Some content is hidden

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

153 files changed

+2001
-1965
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GENERATE_SOURCEMAP=false

.eslintrc.json

Lines changed: 16 additions & 18 deletions
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

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGELOG.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
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
614

715
- Momoized the context provider values
8-
- Fix the conditionally used of useContext for SuiPagination component
16+
- Fix the conditionally used of useContext for SoftPagination component
917
- Fix the import/no-anonymouse-default-export
1018

1119
### Major style changes
@@ -54,12 +62,12 @@ There is a warnings related to the stylis-plugin-rtl dependency that won't affec
5462
- The `box-shadow`, `border-radius` and `typography` `regular` size renamed to `md` for theme
5563
- The `backgroundColor` prop renamed to `bgColor` for components
5664
- The `boxShadow` prop renamed to `shadow` for components
57-
- SuiBox `backgroundGradient` prop replaced with `variant: ["contained", "gradient"]`
58-
- SuiButton `buttonColor` prop renamed to `color`
59-
- SuiBadge `size` prop updated to ["xs", "sm", "md", "lg"]
60-
- SuiInput `withIcon` prop renamed to `icon`
61-
- SuiProgress `gradient` prop replaced with `variant: ["contained", "gradient"]`
62-
- SuiTypography `textColor` prop renamed to `color`
65+
- SoftBox `backgroundGradient` prop replaced with `variant: ["contained", "gradient"]`
66+
- SoftButton `buttonColor` prop renamed to `color`
67+
- SoftBadge `size` prop updated to ["xs", "sm", "md", "lg"]
68+
- SoftInput `withIcon` prop renamed to `icon`
69+
- SoftProgress `gradient` prop replaced with `variant: ["contained", "gradient"]`
70+
- SoftTypography `textColor` prop renamed to `color`
6371
- Sidenav is more dynamic now, color, brand, brandName props are added
6472

6573
### Deleted components

README.md

Lines changed: 10 additions & 10 deletions
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

@@ -110,15 +110,15 @@ soft-ui-dashboard-react
110110
│ │  ├── index.js
111111
│ │ └── theme-rtl.js
112112
│   ├── components
113-
│ │   ├── SuiAlert
114-
│ │   ├── SuiAvatar
115-
│ │   ├── SuiBadge
116-
│ │   ├── SuiBox
117-
│ │   ├── SuiButton
118-
│ │   ├── SuiInput
119-
│ │   ├── SuiPagination
120-
│ │   ├── SuiProgress
121-
│ │   └── SuiTypography
113+
│ │   ├── SoftAlert
114+
│ │   ├── SoftAvatar
115+
│ │   ├── SoftBadge
116+
│ │   ├── SoftBox
117+
│ │   ├── SoftButton
118+
│ │   ├── SoftInput
119+
│ │   ├── SoftPagination
120+
│ │   ├── SoftProgress
121+
│ │   └── SoftTypography
122122
│   ├── context
123123
│   ├── examples
124124
│ │   ├── Breadcrumbs

package.json

Lines changed: 24 additions & 28 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 4 additions & 4 deletions
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
@@ -24,7 +24,7 @@ import CssBaseline from "@mui/material/CssBaseline";
2424
import Icon from "@mui/material/Icon";
2525

2626
// Soft UI Dashboard React components
27-
import SuiBox from "components/SuiBox";
27+
import SoftBox from "components/SoftBox";
2828

2929
// Soft UI Dashboard React examples
3030
import Sidenav from "examples/Sidenav";
@@ -109,7 +109,7 @@ export default function App() {
109109
});
110110

111111
const configsButton = (
112-
<SuiBox
112+
<SoftBox
113113
display="flex"
114114
justifyContent="center"
115115
alignItems="center"
@@ -129,7 +129,7 @@ export default function App() {
129129
<Icon fontSize="default" color="inherit">
130130
settings
131131
</Icon>
132-
</SuiBox>
132+
</SoftBox>
133133
);
134134

135135
return direction === "rtl" ? (

src/assets/theme/functions/boxShadow.js

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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/SuiAlert/SuiAlertCloseIcon.js renamed to src/components/SoftAlert/SoftAlertCloseIcon.js

Lines changed: 1 addition & 1 deletion
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/SuiAlert/SuiAlertRoot.js renamed to src/components/SoftAlert/SoftAlertRoot.js

Lines changed: 1 addition & 1 deletion
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)