Skip to content

Commit d6934a8

Browse files
authored
Merge pull request #18 from creativetimofficial/feature/v3.1.0
Feature/v3.1.0
2 parents a465283 + 47c90b0 commit d6934a8

File tree

210 files changed

+1044
-863
lines changed

Some content is hidden

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

210 files changed

+1044
-863
lines changed

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"endOfLine": "auto"
2020
}
2121
],
22+
"default-param-last": "off",
2223
"react/react-in-jsx-scope": "off",
2324
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
2425
"react/jsx-props-no-spreading": [

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pnpFallbackMode: all

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,49 @@
11
# Change Log
22

3+
## [3.1.0] 2022-03-04
4+
5+
### Bug fixing
6+
7+
- Momoized the context provider values
8+
- Fix the conditionally used of useContext for SuiPagination component
9+
- Fix the import/no-anonymouse-default-export
10+
11+
### Major style changes
12+
13+
### Deleted components
14+
15+
### Added components
16+
17+
### Deleted dependencies
18+
19+
### Added dependencies
20+
21+
### Updated dependencies
22+
23+
```
24+
@emotion/cache 11.4.0 → 11.7.1
25+
@emotion/react 11.4.1 → 11.8.1
26+
@emotion/styled 11.3.0 → 11.8.1
27+
@mui/icons-material 5.1.1 → 5.4.2
28+
@mui/material 5.1.1 → 5.4.3
29+
@mui/styled-engine 5.1.1 → 5.4.2
30+
@testing-library/jest-dom 5.11.4 → 5.16.2
31+
@testing-library/react 11.1.0 → 12.1.3
32+
@testing-library/user-event 12.1.10 → 13.5.0
33+
chroma-js 2.1.2 → 2.4.2
34+
prop-types 15.7.2 → 15.8.1
35+
react-countup 5.2.0 → 6.1.1
36+
react-router-dom 5.2.0 → 6.2.1
37+
react-scripts 4.0.3 → 5.0.0
38+
stylis 4.0.10 → 4.0.13
39+
stylis-plugin-rtl 2.1.0 → 2.1.14
40+
web-vitals 1.0.1 → 2.1.4
41+
```
42+
43+
### Warning
44+
45+
There is a warnings related to the stylis-plugin-rtl dependency that won't affect on the behavior of the product its something with the library itself.
46+
347
## [3.0.0] 2021-11-23
448

549
### Bug fixing

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
IMPORTANT: Please use the following link to create a new issue:
33
4-
https://www.creative-tim.com/new-issue/soft-ui-dashboard-material-ui
4+
https://www.creative-tim.com/new-issue/soft-ui-dashboard-react
55
66
**If your issue was not created using the app above, it will be closed immediately.**
77
-->

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

77
Start your Development with an Innovative Admin Template for MUI and React. If you like the look & feel of the hottest design trend right now, Soft UI, you will fall in love with this dashboard! It features a huge number of components built to fit together and look amazing.
88

package.json

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,54 @@
11
{
22
"name": "soft-ui-dashboard-react",
3-
"version": "3.0.0",
4-
"private": true,
3+
"version": "3.1.0",
54
"author": "Creative Tim",
6-
"license": "See license in https://www.creative-tim.com/license",
7-
"description": "Material UI version of Soft UI Dashboard by Creative Tim",
8-
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard",
5+
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
6+
"description": "ReactJS version of Soft UI Dashboard by Creative Tim",
7+
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/",
98
"bugs": {
109
"url": "https://github.com/creativetimofficial/soft-ui-dashboard-react/issues"
1110
},
1211
"repository": {
1312
"type": "git",
1413
"url": "git+https://github.com/creativetimofficial/soft-ui-dashboard-react.git"
1514
},
15+
"engines": {
16+
"node": "14 || 15 || 16",
17+
"npm": ">=6"
18+
},
1619
"dependencies": {
17-
"@emotion/cache": "11.4.0",
18-
"@emotion/react": "11.4.1",
19-
"@emotion/styled": "11.3.0",
20-
"@mui/icons-material": "5.1.1",
21-
"@mui/material": "5.1.1",
22-
"@mui/styled-engine": "5.1.1",
23-
"@testing-library/jest-dom": "5.11.4",
24-
"@testing-library/react": "11.1.0",
25-
"@testing-library/user-event": "12.1.10",
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",
2629
"chart.js": "3.4.1",
27-
"chroma-js": "2.1.2",
28-
"prop-types": "15.7.2",
30+
"chroma-js": "2.4.2",
31+
"prop-types": "15.8.1",
2932
"react": "17.0.2",
3033
"react-chartjs-2": "3.0.4",
31-
"react-countup": "5.2.0",
34+
"react-countup": "6.1.1",
3235
"react-dom": "17.0.2",
3336
"react-flatpickr": "3.10.7",
3437
"react-github-btn": "1.2.1",
35-
"react-router-dom": "5.2.0",
36-
"react-scripts": "4.0.3",
37-
"stylis": "4.0.10",
38-
"stylis-plugin-rtl": "2.1.0",
38+
"react-router-dom": "6.2.1",
39+
"react-scripts": "5.0.0",
40+
"stylis": "4.0.13",
41+
"stylis-plugin-rtl": "2.1.1",
3942
"uuid": "8.3.2",
40-
"web-vitals": "1.0.1"
43+
"web-vitals": "2.1.4"
4144
},
4245
"scripts": {
4346
"start": "react-scripts start",
4447
"build": "react-scripts build",
4548
"test": "react-scripts test",
4649
"eject": "react-scripts eject",
47-
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start"
50+
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
51+
"install:peer-deps": "npm install --legacy-peer-deps"
4852
},
4953
"eslintConfig": {
5054
"extends": [
@@ -65,14 +69,14 @@
6569
]
6670
},
6771
"devDependencies": {
68-
"eslint": "7.30.0",
69-
"eslint-config-airbnb": "18.2.1",
70-
"eslint-config-prettier": "8.3.0",
71-
"eslint-plugin-import": "2.23.4",
72-
"eslint-plugin-jsx-a11y": "6.4.1",
73-
"eslint-plugin-prettier": "3.4.0",
74-
"eslint-plugin-react": "7.24.0",
75-
"eslint-plugin-react-hooks": "4.2.0",
76-
"prettier": "2.3.2"
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"
7781
}
7882
}

public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
22
=========================================================
3-
* Soft UI Dashboard React - v3.0.0
3+
* Soft UI Dashboard React - v3.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010

src/App.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v3.0.0
3+
* Soft UI Dashboard React - v3.1.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-react
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -16,21 +16,21 @@ Coded by www.creative-tim.com
1616
import { useState, useEffect, useMemo } from "react";
1717

1818
// react-router components
19-
import { Route, Switch, Redirect, useLocation } from "react-router-dom";
19+
import { Routes, Route, Navigate, useLocation } from "react-router-dom";
2020

2121
// @mui material components
2222
import { ThemeProvider } from "@mui/material/styles";
2323
import CssBaseline from "@mui/material/CssBaseline";
2424
import Icon from "@mui/material/Icon";
2525

26-
// Soft UI Dashboard PRO React components
26+
// Soft UI Dashboard React components
2727
import SuiBox from "components/SuiBox";
2828

29-
// Soft UI Dashboard PRO React example components
29+
// Soft UI Dashboard React examples
3030
import Sidenav from "examples/Sidenav";
3131
import Configurator from "examples/Configurator";
3232

33-
// Soft UI Dashboard PRO React themes
33+
// Soft UI Dashboard React themes
3434
import theme from "assets/theme";
3535
import themeRTL from "assets/theme/theme-rtl";
3636

@@ -39,10 +39,10 @@ import rtlPlugin from "stylis-plugin-rtl";
3939
import { CacheProvider } from "@emotion/react";
4040
import createCache from "@emotion/cache";
4141

42-
// Soft UI Dashboard PRO React routes
42+
// Soft UI Dashboard React routes
4343
import routes from "routes";
4444

45-
// Soft UI Dashboard PRO React contexts
45+
// Soft UI Dashboard React contexts
4646
import { useSoftUIController, setMiniSidenav, setOpenConfigurator } from "context";
4747

4848
// Images
@@ -102,7 +102,7 @@ export default function App() {
102102
}
103103

104104
if (route.route) {
105-
return <Route exact path={route.route} component={route.component} key={route.key} />;
105+
return <Route exact path={route.route} element={route.component} key={route.key} />;
106106
}
107107

108108
return null;
@@ -151,10 +151,10 @@ export default function App() {
151151
</>
152152
)}
153153
{layout === "vr" && <Configurator />}
154-
<Switch>
154+
<Routes>
155155
{getRoutes(routes)}
156-
<Redirect from="*" to="/dashboard" />
157-
</Switch>
156+
<Route path="*" element={<Navigate to="/dashboard" />} />
157+
</Routes>
158158
</ThemeProvider>
159159
</CacheProvider>
160160
) : (
@@ -175,10 +175,10 @@ export default function App() {
175175
</>
176176
)}
177177
{layout === "vr" && <Configurator />}
178-
<Switch>
178+
<Routes>
179179
{getRoutes(routes)}
180-
<Redirect from="*" to="/dashboard" />
181-
</Switch>
180+
<Route path="*" element={<Navigate to="/dashboard" />} />
181+
</Routes>
182182
</ThemeProvider>
183183
);
184184
}

src/assets/theme/base/borders.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v2.0.0
3+
* Soft UI Dashboard React - v3.1.0
44
=========================================================
55
6-
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
6+
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,20 +14,20 @@ Coded by www.creative-tim.com
1414
*/
1515

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

22-
// Soft UI Dashboard PRO React Base Styles
22+
// Soft UI Dashboard React Base Styles
2323
import colors from "assets/theme/base/colors";
2424

25-
// Soft UI Dashboard PRO React Helper Functions
25+
// Soft UI Dashboard React Helper Functions
2626
import pxToRem from "assets/theme/functions/pxToRem";
2727

2828
const { grey } = colors;
2929

30-
export default {
30+
const borders = {
3131
borderColor: grey[300],
3232

3333
borderWidth: {
@@ -49,3 +49,5 @@ export default {
4949
section: pxToRem(160),
5050
},
5151
};
52+
53+
export default borders;

src/assets/theme/base/boxShadows.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
=========================================================
3-
* Soft UI Dashboard React - v2.0.0
3+
* Soft UI Dashboard React - v3.1.0
44
=========================================================
55
6-
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui
7-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
6+
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
7+
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -14,20 +14,20 @@ Coded by www.creative-tim.com
1414
*/
1515

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

22-
// Soft UI Dashboard PRO React Base Styles
22+
// Soft UI Dashboard React Base Styles
2323
import colors from "assets/theme/base/colors";
2424

25-
// Soft UI Dashboard PRO React Helper Functions
25+
// Soft UI Dashboard React Helper Functions
2626
import boxShadow from "assets/theme/functions/boxShadow";
2727

2828
const { black, white, info, inputColors, tabs } = colors;
2929

30-
export default {
30+
const boxShadows = {
3131
xs: boxShadow([0, 2], [9, -5], black.main, 0.15),
3232
sm: boxShadow([0, 5], [10, 0], black.main, 0.12),
3333
md: `${boxShadow([0, 4], [6, -1], black.light, 0.12)}, ${boxShadow(
@@ -78,3 +78,5 @@ export default {
7878
indicator: boxShadow([0, 1], [5, 1], tabs.indicator.boxShadow, 1),
7979
},
8080
};
81+
82+
export default boxShadows;

0 commit comments

Comments
 (0)