Skip to content

Commit

Permalink
Merge pull request #18 from creativetimofficial/feature/v3.1.0
Browse files Browse the repository at this point in the history
Feature/v3.1.0
  • Loading branch information
sajadevo authored Mar 4, 2022
2 parents a465283 + 47c90b0 commit d6934a8
Show file tree
Hide file tree
Showing 210 changed files with 1,044 additions and 863 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
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpFallbackMode: all
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,49 @@
# Change Log

## [3.1.0] 2022-03-04

### Bug fixing

- Momoized the context provider values
- Fix the conditionally used of useContext for SuiPagination 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.8.1
@emotion/styled 11.3.0 → 11.8.1
@mui/icons-material 5.1.1 → 5.4.2
@mui/material 5.1.1 → 5.4.3
@mui/styled-engine 5.1.1 → 5.4.2
@testing-library/jest-dom 5.11.4 → 5.16.2
@testing-library/react 11.1.0 → 12.1.3
@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-countup 5.2.0 → 6.1.1
react-router-dom 5.2.0 → 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.14
web-vitals 1.0.1 → 2.1.4
```

### Warning

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.

## [3.0.0] 2021-11-23

### Bug fixing
Expand Down
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
IMPORTANT: Please use the following link to create a new issue:
https://www.creative-tim.com/new-issue/soft-ui-dashboard-material-ui
https://www.creative-tim.com/new-issue/soft-ui-dashboard-react
**If your issue was not created using the app above, it will be closed immediately.**
-->
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

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.

Expand Down
68 changes: 36 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,50 +1,54 @@
{
"name": "soft-ui-dashboard-react",
"version": "3.0.0",
"private": true,
"version": "3.1.0",
"author": "Creative Tim",
"license": "See license in https://www.creative-tim.com/license",
"description": "Material UI version of Soft UI Dashboard by Creative Tim",
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard",
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
"description": "ReactJS version of Soft UI Dashboard by Creative Tim",
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/",
"bugs": {
"url": "https://github.com/creativetimofficial/soft-ui-dashboard-react/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/creativetimofficial/soft-ui-dashboard-react.git"
},
"engines": {
"node": "14 || 15 || 16",
"npm": ">=6"
},
"dependencies": {
"@emotion/cache": "11.4.0",
"@emotion/react": "11.4.1",
"@emotion/styled": "11.3.0",
"@mui/icons-material": "5.1.1",
"@mui/material": "5.1.1",
"@mui/styled-engine": "5.1.1",
"@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.8.1",
"@emotion/styled": "11.8.1",
"@mui/icons-material": "5.4.2",
"@mui/material": "5.4.3",
"@mui/styled-engine": "5.4.2",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/react": "12.1.3",
"@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-countup": "5.2.0",
"react-countup": "6.1.1",
"react-dom": "17.0.2",
"react-flatpickr": "3.10.7",
"react-github-btn": "1.2.1",
"react-router-dom": "5.2.0",
"react-scripts": "4.0.3",
"stylis": "4.0.10",
"stylis-plugin-rtl": "2.1.0",
"react-router-dom": "6.2.1",
"react-scripts": "5.0.0",
"stylis": "4.0.13",
"stylis-plugin-rtl": "2.1.1",
"uuid": "8.3.2",
"web-vitals": "1.0.1"
"web-vitals": "2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "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"
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
"install:peer-deps": "npm install --legacy-peer-deps"
},
"eslintConfig": {
"extends": [
Expand All @@ -65,14 +69,14 @@
]
},
"devDependencies": {
"eslint": "7.30.0",
"eslint-config-airbnb": "18.2.1",
"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": "8.10.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.4.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"
}
}
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
=========================================================
* Soft UI Dashboard React - v3.0.0
* Soft UI Dashboard React - v3.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/soft-ui-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
30 changes: 15 additions & 15 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Soft UI Dashboard React - v3.0.0
* Soft UI Dashboard React - v3.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/soft-ui-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 @@ -16,21 +16,21 @@ Coded by www.creative-tim.com
import { useState, useEffect, useMemo } from "react";

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

// @mui material components
import { ThemeProvider } from "@mui/material/styles";
import CssBaseline from "@mui/material/CssBaseline";
import Icon from "@mui/material/Icon";

// Soft UI Dashboard PRO React components
// Soft UI Dashboard React components
import SuiBox from "components/SuiBox";

// Soft UI Dashboard PRO React example components
// Soft UI Dashboard React examples
import Sidenav from "examples/Sidenav";
import Configurator from "examples/Configurator";

// Soft UI Dashboard PRO React themes
// Soft UI Dashboard React themes
import theme from "assets/theme";
import themeRTL from "assets/theme/theme-rtl";

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

// Soft UI Dashboard PRO React routes
// Soft UI Dashboard React routes
import routes from "routes";

// Soft UI Dashboard PRO React contexts
// Soft UI Dashboard React contexts
import { useSoftUIController, setMiniSidenav, setOpenConfigurator } from "context";

// Images
Expand Down Expand Up @@ -102,7 +102,7 @@ export default function App() {
}

if (route.route) {
return <Route exact path={route.route} component={route.component} key={route.key} />;
return <Route exact path={route.route} element={route.component} key={route.key} />;
}

return null;
Expand Down Expand Up @@ -151,10 +151,10 @@ export default function App() {
</>
)}
{layout === "vr" && <Configurator />}
<Switch>
<Routes>
{getRoutes(routes)}
<Redirect from="*" to="/dashboard" />
</Switch>
<Route path="*" element={<Navigate to="/dashboard" />} />
</Routes>
</ThemeProvider>
</CacheProvider>
) : (
Expand All @@ -175,10 +175,10 @@ export default function App() {
</>
)}
{layout === "vr" && <Configurator />}
<Switch>
<Routes>
{getRoutes(routes)}
<Redirect from="*" to="/dashboard" />
</Switch>
<Route path="*" element={<Navigate to="/dashboard" />} />
</Routes>
</ThemeProvider>
);
}
18 changes: 10 additions & 8 deletions src/assets/theme/base/borders.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Soft UI Dashboard React - v2.0.0
* Soft UI Dashboard React - v3.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
* 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 border styles for the Soft UI Dashboard PRO Material.
* The base border styles for the Soft UI Dashboard 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 Soft UI Dashboard React using thie file.
*/

// Soft UI Dashboard PRO React Base Styles
// Soft UI Dashboard React Base Styles
import colors from "assets/theme/base/colors";

// Soft UI Dashboard PRO React Helper Functions
// Soft UI Dashboard React Helper Functions
import pxToRem from "assets/theme/functions/pxToRem";

const { grey } = colors;

export default {
const borders = {
borderColor: grey[300],

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

export default borders;
18 changes: 10 additions & 8 deletions src/assets/theme/base/boxShadows.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
=========================================================
* Soft UI Dashboard React - v2.0.0
* Soft UI Dashboard React - v3.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-react
* 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 Soft UI Dashboard 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 Soft UI Dashboard React using thie file.
*/

// Soft UI Dashboard PRO React Base Styles
// Soft UI Dashboard React Base Styles
import colors from "assets/theme/base/colors";

// Soft UI Dashboard PRO React Helper Functions
// Soft UI Dashboard React Helper Functions
import boxShadow from "assets/theme/functions/boxShadow";

const { black, white, info, inputColors, tabs } = 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, 4], [6, -1], black.light, 0.12)}, ${boxShadow(
Expand Down Expand Up @@ -78,3 +78,5 @@ export default {
indicator: boxShadow([0, 1], [5, 1], tabs.indicator.boxShadow, 1),
},
};

export default boxShadows;
Loading

0 comments on commit d6934a8

Please sign in to comment.