Skip to content

Commit 71d99b4

Browse files
authored
Merge pull request #2 from creativetimofficial/feature/v2.0.0
Feature/v2.0.0
2 parents 2014ee6 + 710edd9 commit 71d99b4

File tree

223 files changed

+2541
-1914
lines changed

Some content is hidden

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

223 files changed

+2541
-1914
lines changed

CHANGELOG.md

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

3+
## [2.0.0] 2021-09-21
4+
5+
### Bug fixing
6+
7+
### Major style changes
8+
9+
- Migration from Material-UI v4 to Material-UI v5.
10+
- Customizing Autocomplete component based on the Soft Design.
11+
- Customizing the TextField component based on the Soft Design.
12+
13+
### Deleted components
14+
15+
### Added components
16+
17+
### Deleted dependencies
18+
19+
```
20+
- @material-ui/core
21+
- @material-ui/icons
22+
- @material-ui/styles
23+
```
24+
25+
### Added dependencies
26+
27+
```
28+
- @emotion/cache
29+
- @emotion/react
30+
- @emotion/react
31+
- @emotion/styled
32+
- @mui/icons-material
33+
- @mui/material
34+
- @mui/styled-engine
35+
- @mui/styles
36+
- stylis
37+
- stylis-plugin-rtl
38+
```
39+
40+
### Updated dependencies
41+
42+
### Warning
43+
44+
- The soft-ui-dashboard-pro-react/pages/rtl is chaning the route slowly in development mode its a problem with @emotion/cache `prepend` and we will fix it on our future updates.
45+
- There is some console error related to the key on table component and it will not make any issue for you we will take care of that on our next update for the product.
46+
347
## [1.0.0] 2021-09-08
448

549
### Original Release

README.md

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
# [Soft UI Dashboard Material-UI](http://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/dashboard?ref=readme-sudmui) [![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-material-ui&text=Check%20Soft%20UI%20Dashboard%20material-ui%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#softdesign%20#react%20https://www.creative-tim.com/product/soft-ui-dashboard-material-ui)
1+
# [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-1.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/soft-ui-dashboard-material-ui.svg)](https://github.com/creativetimofficial/soft-ui-dashboard-material-ui/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/soft-ui-dashboard-material-ui.svg)](https://github.com/creativetimofficial/soft-ui-dashboard-material-ui/issues?q=is%3Aissue+is%3Aclosed)
3+
![version](https://img.shields.io/badge/version-2.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)
5+
![Image](https://s3.amazonaws.com/creativetim_bucket/products/500/original/soft-ui-dashboard-material-ui.jpg?1632195046)
66

77
Start your Development with an Innovative Admin Template for Material-UI 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

99
**Fully Coded Elements**
10-
Soft UI Dashboard Material-UI is built with over 70 frontend individual elements, like buttons, inputs, navbars, nav tabs, cards, or alerts, giving you the freedom of choosing and combining. All components can take variations in color, which you can easily modify using JSS files and classes. You will save a lot of time going from prototyping to full-functional code because all elements are implemented. This Premium Material-UI Dashboard is coming with prebuilt design blocks, so the development process is seamless, switching from our pages to the real website is very easy to be done.
10+
Soft UI Dashboard React is built with over 70 frontend individual elements, like buttons, inputs, navbars, nav tabs, cards, or alerts, giving you the freedom of choosing and combining. All components can take variations in color, which you can easily modify using JSS files and classes. You will save a lot of time going from prototyping to full-functional code because all elements are implemented. This Premium Material-UI Dashboard is coming with prebuilt design blocks, so the development process is seamless, switching from our pages to the real website is very easy to be done.
1111

12-
View [all components here](https://www.creative-tim.com/learning-lab/material-ui/alerts/soft-ui-dashboard).
12+
View [all components here](https://www.creative-tim.com/learning-lab/react/alerts/soft-ui-dashboard).
1313

1414
**Documentation built by Developers**
1515

1616
Each element is well presented in very complex documentation.
1717

18-
You can read more about the [documentation here](https://www.creative-tim.com/learning-lab/material-ui/overview/soft-ui-dashboard).
18+
You can read more about the [documentation here](https://www.creative-tim.com/learning-lab/react/overview/soft-ui-dashboard).
1919

2020
**Example Pages**
2121

22-
If you want to get inspiration or just show something directly to your clients, you can jump-start your development with our pre-built example pages. Every page is spaced well, with attractive layouts and pleasing shapes. Soft UI Dashboard Material-UI has everything you need to quickly set up an amazing project.
22+
If you want to get inspiration or just show something directly to your clients, you can jump-start your development with our pre-built example pages. Every page is spaced well, with attractive layouts and pleasing shapes. Soft UI Dashboard React has everything you need to quickly set up an amazing project.
2323

24-
View [example pages here](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/dashboard).
24+
View [example pages here](https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard).
2525

2626
**HELPFUL LINKS**
2727

28-
- View [Github Repository](https://github.com/creativetimofficial/soft-ui-dashboard-material-ui)
28+
- View [Github Repository](https://github.com/creativetimofficial/soft-ui-dashboard-react)
2929
- Check [FAQ Page](https://www.creative-tim.com/faq)
3030

3131
#### Special thanks
3232

3333
During the development of this dashboard, we have used many existing resources from awesome developers. We want to thank them for providing their tools open source:
3434

35-
- [Material-UI](https://material-ui.com/) - React components for faster and easier web development.
35+
- [Material-UI](https://mui.com/) - React components for faster and easier web development.
3636
- [React Countup](https://github.com/glennreyes/react-countup) - A lightweight React component that can be used to quickly create animations that display numerical data in a more interesting way.
3737
- [React ChartJS 2](http://reactchartjs.github.io/react-chartjs-2/#/) - Simple yet flexible React charting for designers & developers
3838
- [ChromaJS](https://gka.github.io/chroma.js/) - A small-ish zero-dependency JavaScript library for all kinds of color conversions and color scales.
@@ -55,28 +55,28 @@ Let us know your thoughts below. And good luck with development!
5555

5656
## Versions
5757

58-
[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/icon-material-ui.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui?ref=readme-sudmui)
58+
[<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/soft-ui-dashboard-pro-react?ref=readme-sudr)
5959

60-
| Material-UI |
61-
| ----------- |
60+
| React |
61+
| ----- |
6262

63-
| [![Soft UI Dashboard Material-UI](https://s3.amazonaws.com/creativetim_bucket/products/500/thumb/soft-ui-dashboard-material-ui.jpg)](http://demos.creative-tim.com/soft-ui-dashboard-pro-material-ui/#/dashboard?ref=readme-sudmui)
63+
| [![Soft UI Dashboard React](https://s3.amazonaws.com/creativetim_bucket/products/500/thumb/soft-ui-dashboard-material-ui.jpg?1632195046)](http://demos.creative-tim.com/soft-ui-dashboard-pro-react/#/dashboard?ref=readme-sudr)
6464

6565
## Demo
6666

67-
- [Dashboard](http://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/dashboard?ref=readme-sudmui)
68-
- [Profile](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/profile?ref=readme-sudmui)
69-
- [RTL](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/rtl?ref=readme-sudmui)
70-
- [Sign In](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/authentication/sign-in?ref=readme-sudmui)
71-
- [Sign Up](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/authentication/sign-up?ref=readme-sudmui)
67+
- [Dashboard](http://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard?ref=readme-sudr)
68+
- [Profile](https://demos.creative-tim.com/soft-ui-dashboard-react/#/profile?ref=readme-sudr)
69+
- [RTL](https://demos.creative-tim.com/soft-ui-dashboard-react/#/rtl?ref=readme-sudr)
70+
- [Sign In](https://demos.creative-tim.com/soft-ui-dashboard-react/#/authentication/sign-in?ref=readme-sudr)
71+
- [Sign Up](https://demos.creative-tim.com/soft-ui-dashboard-react/#/authentication/sign-up?ref=readme-sudr)
7272

73-
[View More](https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/dashboard?ref=readme-sudmui).
73+
[View More](https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard?ref=readme-sudr).
7474

7575
## Quick start
7676

7777
Quick start options:
7878

79-
- Buy from [Creative Tim](https://www.creative-tim.com/product/soft-ui-dashboard-material-ui?ref=readme-sudmui).
79+
- Buy from [Creative Tim](https://www.creative-tim.com/product/soft-ui-dashboard-react?ref=readme-sudr).
8080

8181
## Terminal Commands
8282

@@ -85,14 +85,14 @@ Quick start options:
8585

8686
## Documentation
8787

88-
The documentation for the Soft UI Dashboard is hosted at our [website](https://www.creative-tim.com/learning-lab/material-ui/overview/soft-ui-dashboard?ref=readme-sudmui).
88+
The documentation for the Soft UI Dashboard is hosted at our [website](https://www.creative-tim.com/learning-lab/react/overview/soft-ui-dashboard?ref=readme-sudr).
8989

9090
### What's included
9191

9292
Within the download you'll find the following directories and files:
9393

9494
```
95-
soft-ui-dashboard-material-ui
95+
soft-ui-dashboard-react
9696
├── public
9797
│   ├── apple-icon.png
9898
│   ├── favicon.png
@@ -165,39 +165,39 @@ At present, we officially aim to support the last two versions of the following
165165

166166
## Resources
167167

168-
- [Live Preview](https://demos.creative-tim.com/soft-ui-dashboard-pro-material-ui/#/dashboard?ref=readme-sudmui)
169-
- [Buy Page](https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui?ref=readme-sudmui)
170-
- Documentation is [here](https://www.creative-tim.com/learning-lab/material-ui/overview/soft-ui-dashboard?ref=readme-sudmui)
171-
- [License Agreement](https://www.creative-tim.com/license?ref=readme-sudmui)
172-
- [Support](https://www.creative-tim.com/contact-us?ref=readme-sudmui)
173-
- Issues: [Github Issues Page](https://github.com/creativetimofficial/ct-soft-ui-dashboard-pro-material-ui/issues)
168+
- [Live Preview](https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard?ref=readme-sudr)
169+
- [Buy Page](https://www.creative-tim.com/product/soft-ui-dashboard-react?ref=readme-sudr)
170+
- Documentation is [here](https://www.creative-tim.com/learning-lab/react/overview/soft-ui-dashboard?ref=readme-sudr)
171+
- [License Agreement](https://www.creative-tim.com/license?ref=readme-sudr)
172+
- [Support](https://www.creative-tim.com/contact-us?ref=readme-sudr)
173+
- Issues: [Github Issues Page](https://github.com/creativetimofficial/soft-ui-dashboard-react/issues)
174174

175175
## Reporting Issues
176176

177-
We use GitHub Issues as the official bug tracker for the Soft UI Dashboard Material-UI. Here are some advices for our users that want to report an issue:
177+
We use GitHub Issues as the official bug tracker for the Soft UI Dashboard React. Here are some advices for our users that want to report an issue:
178178

179-
1. Make sure that you are using the latest version of the Soft UI Dashboard Material-UI. Check the CHANGELOG from your dashboard on our [website](https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui?ref=readme-sudmui).
179+
1. Make sure that you are using the latest version of the Soft UI Dashboard React. Check the CHANGELOG from your dashboard on our [website](https://www.creative-tim.com/product/soft-ui-dashboard-react?ref=readme-sudr).
180180
2. Providing us reproducible steps for the issue will shorten the time it takes for it to be fixed.
181181
3. Some issues may be browser specific, so specifying in what browser you encountered the issue might help.
182182

183183
## Technical Support or Questions
184184

185-
If you have questions or need help integrating the product please [contact us](https://www.creative-tim.com/contact-us?ref=readme-sudmui) instead of opening an issue.
185+
If you have questions or need help integrating the product please [contact us](https://www.creative-tim.com/contact-us?ref=readme-sudr) instead of opening an issue.
186186

187187
## Licensing
188188

189-
- Copyright 2021 [Creative Tim](https://www.creative-tim.com?ref=readme-sudmui)
190-
- Creative Tim [license](https://www.creative-tim.com/license?ref=readme-sudmui)
189+
- Copyright 2021 [Creative Tim](https://www.creative-tim.com?ref=readme-sudr)
190+
- Creative Tim [license](https://www.creative-tim.com/license?ref=readme-sudr)
191191

192192
## Useful Links
193193

194-
- [More products](https://www.creative-tim.com/templates?ref=readme-sudmui) from Creative Tim
194+
- [More products](https://www.creative-tim.com/templates?ref=readme-sudr) from Creative Tim
195195

196196
- [Tutorials](https://www.youtube.com/channel/UCVyTG4sCw-rOvB9oHkzZD1w)
197197

198-
- [Freebies](https://www.creative-tim.com/bootstrap-themes/free?ref=readme-sudmui) from Creative Tim
198+
- [Freebies](https://www.creative-tim.com/bootstrap-themes/free?ref=readme-sudr) from Creative Tim
199199

200-
- [Affiliate Program](https://www.creative-tim.com/affiliates/new?ref=readme-sudmui) (earn money)
200+
- [Affiliate Program](https://www.creative-tim.com/affiliates/new?ref=readme-sudr) (earn money)
201201

202202
##### Social Media
203203

package.json

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
{
2-
"name": "soft-ui-dashboard-material-ui",
3-
"version": "1.0.0",
2+
"name": "soft-ui-dashboard-react",
3+
"version": "2.0.0",
44
"private": true,
55
"author": "Creative Tim",
66
"license": "See license in https://www.creative-tim.com/license",
77
"description": "Material UI version of Soft UI Dashboard by Creative Tim",
8-
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-material-ui/#/dashboard",
8+
"homepage": "https://demos.creative-tim.com/soft-ui-dashboard-react/#/dashboard",
99
"bugs": {
10-
"url": "https://github.com/creativetimofficial/soft-ui-dashboard-material-ui/issues"
10+
"url": "https://github.com/creativetimofficial/soft-ui-dashboard-react/issues"
1111
},
1212
"repository": {
1313
"type": "git",
14-
"url": "git+https://github.com/creativetimofficial/soft-ui-dashboard-material-ui.git"
14+
"url": "git+https://github.com/creativetimofficial/soft-ui-dashboard-react.git"
1515
},
1616
"dependencies": {
17-
"@material-ui/core": "^4.11.4",
18-
"@material-ui/icons": "^4.11.2",
19-
"@material-ui/styles": "^4.11.4",
17+
"@emotion/cache": "^11.4.0",
18+
"@emotion/react": "^11.4.1",
19+
"@emotion/styled": "^11.3.0",
20+
"@mui/icons-material": "^5.0.0",
21+
"@mui/material": "^5.0.0",
22+
"@mui/styled-engine": "^5.0.0",
23+
"@mui/styles": "^5.0.0",
2024
"@testing-library/jest-dom": "^5.11.4",
2125
"@testing-library/react": "^11.1.0",
2226
"@testing-library/user-event": "^12.1.10",
@@ -34,6 +38,8 @@
3438
"react-github-btn": "^1.2.1",
3539
"react-router-dom": "^5.2.0",
3640
"react-scripts": "4.0.3",
41+
"stylis": "^4.0.10",
42+
"stylis-plugin-rtl": "^2.1.0",
3743
"web-vitals": "^1.0.1"
3844
},
3945
"scripts": {

public/index.html

+29-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
=========================================================
3-
* Soft UI Dashboard Material-UI - v1.0.0
3+
* Soft UI Dashboard React - v2.0.0
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/soft-ui-dashboard-pro-material-ui
@@ -15,27 +15,32 @@
1515
-->
1616
<!DOCTYPE html>
1717
<html lang="en">
18+
<head>
19+
<meta charset="utf-8" />
20+
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png" />
21+
<meta name="viewport" content="width=device-width, initial-scale=1" />
22+
<meta name="theme-color" content="#000000" />
23+
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon.png" />
24+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
25+
<title>Soft UI Dashboard React</title>
26+
<link
27+
rel="stylesheet"
28+
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
29+
/>
30+
<link
31+
rel="stylesheet"
32+
href="https://unpkg.com/[email protected]/dist/leaflet.css"
33+
integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
34+
crossorigin=""
35+
/>
36+
<link
37+
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
38+
rel="stylesheet"
39+
/>
40+
</head>
1841

19-
<head>
20-
<meta charset="utf-8" />
21-
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png" />
22-
<meta name="viewport" content="width=device-width, initial-scale=1" />
23-
<meta name="theme-color" content="#000000" />
24-
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon.png" />
25-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
26-
<title>Soft UI Dashboard Material-UI</title>
27-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
28-
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
29-
integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
30-
crossorigin="" />
31-
<link
32-
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
33-
rel="stylesheet" />
34-
</head>
35-
36-
<body>
37-
<noscript>You need to enable JavaScript to run this app.</noscript>
38-
<div id="root"></div>
39-
</body>
40-
41-
</html>
42+
<body>
43+
<noscript>You need to enable JavaScript to run this app.</noscript>
44+
<div id="root"></div>
45+
</body>
46+
</html>

public/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"short_name": "Soft UI Dashboard",
3-
"name": "Soft UI Dashboard Material-UI",
3+
"name": "Soft UI Dashboard React",
44
"icons": [
55
{
66
"src": "favicon.png",

0 commit comments

Comments
 (0)