Skip to content

Commit 32f12f3

Browse files
einazareeinazare
authored
Merge pull request #123 from creativetimofficial/dev-master
Feature: update dependencies
2 parents 0772405 + 804b9dd commit 32f12f3

15 files changed

+87
-51
lines changed

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@
2222
npm-debug.log*
2323
yarn-debug.log*
2424
yarn-error.log*
25+
26+
package-lock.json

Diff for: ‎CHANGELOG.md

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

3+
## [1.9.0] 2020-05-27
4+
### Bug fixing
5+
- https://github.com/creativetimofficial/material-dashboard-react/issues/121
6+
- https://github.com/creativetimofficial/material-dashboard-react/issues/98
7+
- https://github.com/creativetimofficial/material-dashboard-react/pull/99
8+
- https://github.com/creativetimofficial/material-dashboard-react/pull/65
9+
### Major style changes
10+
### Deleted components
11+
### Added components
12+
### Deleted dependencies
13+
### Added dependencies
14+
### Updated dependencies
15+
```
16+
@material-ui/core 4.3.2 → 4.10.0
17+
@material-ui/icons 4.2.1 → 4.9.1
18+
history 4.9.0 → 4.10.1
19+
perfect-scrollbar 1.4.0 → 1.5.0
20+
react 16.9.0 → 16.13.1
21+
react-chartist 0.13.3 → 0.14.3
22+
react-dom 16.9.0 → 16.13.1
23+
react-router-dom 5.0.1 → 5.2.0
24+
react-scripts 3.1.0 → 3.4.1
25+
react-swipeable-views 0.13.3 → 0.13.9
26+
eslint-config-prettier 6.0.0 → 6.11.0
27+
eslint-plugin-prettier 3.1.0 → 3.1.3
28+
prettier 1.18.2 → 2.0.5
29+
@types/googlemaps 3.37.3 → 3.39.6
30+
ajv 6.10.2 → 6.12.2
31+
typescript 3.5.3 → 3.9.3
32+
```
33+
### Warning
34+
_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
35+
_Warnings might appear while doing an npm install - they do not affect the UI or the functionality of the product, and they appear because of NodeJS and not from the product itself._
36+
337
## [1.8.0] 2019-08-26
438
### Bug fixing
539
- Rewrote the ISSUE_TEMPLATE

Diff for: ‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Creative Tim
3+
Copyright (c) 2020 Creative Tim
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
![version](https://img.shields.io/badge/version-1.8.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
5+
![version](https://img.shields.io/badge/version-1.9.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
66

77
![Product Gif](src/assets/github/md-react.gif)
88

@@ -213,7 +213,7 @@ If you have questions or need help integrating the product please [contact us](h
213213

214214
## Licensing
215215

216-
- Copyright 2018 Creative Tim (https://www.creative-tim.com)
216+
- Copyright 2020 Creative Tim (https://www.creative-tim.com)
217217
- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
218218

219219
## Useful Links

Diff for: ‎documentation/assets/css/demo-documentation.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0
4+
* Material Dashboard React - v1.9.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

Diff for: ‎documentation/assets/css/material-dashboard.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React- v1.8.0
4+
* Material Dashboard React- v1.9.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
=========================================================

Diff for: ‎documentation/tutorial-components.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Material Dashboard React - v1.8.0
5+
* Material Dashboard React - v1.9.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -48,8 +48,8 @@
4848
/>
4949
<!-- CSS Files -->
5050
<link href="assets/css/bootstrap.min.css" rel="stylesheet" />
51-
<link href="assets/css/material-dashboard.css" rel="stylesheet" />
52-
<link href="assets/css/demo-documentation.css" rel="stylesheet" />
51+
<link href="assets/css/material-dashboard.css?v=1.9.0" rel="stylesheet" />
52+
<link href="assets/css/demo-documentation.css?v=1.9.0" rel="stylesheet" />
5353
<style media="screen">
5454
.page-header {
5555
height: 100vh;
@@ -117,7 +117,7 @@
117117
<div class="col-md-8 col-md-offset-2 text-center">
118118
<h1 class="title ">Material Dashboard React</h1>
119119
<h4 class="title">Tutorial and Components</h4>
120-
<h5 class="description">v1.8.0</h5>
120+
<h5 class="description">v1.9.0</h5>
121121
<a
122122
href="https://demos.creative-tim.com/material-dashboard-react/#/documentation/tutorial"
123123
class="btn btn-rose btn-fill btn-round"

Diff for: ‎gulpfile.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ gulp.task("licenses", async function() {
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Material Dashboard React - v1.8.0
12+
* Material Dashboard React - v1.9.0
1313
=========================================================
1414
15-
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
16-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
15+
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
16+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
1717
1818
* Coded by Creative Tim
1919
@@ -32,11 +32,11 @@ gulp.task("licenses", async function() {
3232
gap.prependText(`<!--
3333
3434
=========================================================
35-
* Material Dashboard React - v1.8.0
35+
* Material Dashboard React - v1.9.0
3636
=========================================================
3737
38-
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
39-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
38+
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
39+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
4040
4141
* Coded by Creative Tim
4242
@@ -55,11 +55,11 @@ gulp.task("licenses", async function() {
5555
gap.prependText(`/*!
5656
5757
=========================================================
58-
* Material Dashboard React - v1.8.0
58+
* Material Dashboard React - v1.9.0
5959
=========================================================
6060
61-
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
62-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
61+
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
62+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
6363
6464
* Coded by Creative Tim
6565

Diff for: ‎package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "material-dashboard-react",
3-
"version": "1.8.0",
3+
"version": "1.9.0",
44
"description": "Material Dashboard React. Coded by Creative Tim",
55
"private": false,
66
"main": "dist/index.js",
77
"dependencies": {
8-
"@material-ui/core": "4.3.2",
9-
"@material-ui/icons": "4.2.1",
8+
"@material-ui/core": "4.10.0",
9+
"@material-ui/icons": "4.9.1",
1010
"chartist": "0.10.1",
1111
"classnames": "2.2.6",
12-
"history": "4.9.0",
13-
"perfect-scrollbar": "1.4.0",
12+
"history": "4.10.1",
13+
"perfect-scrollbar": "1.5.0",
1414
"prop-types": "15.7.2",
15-
"react": "16.9.0",
16-
"react-chartist": "0.13.3",
17-
"react-dom": "16.9.0",
15+
"react": "16.13.1",
16+
"react-chartist": "0.14.3",
17+
"react-dom": "16.13.1",
1818
"react-google-maps": "9.4.5",
19-
"react-router-dom": "5.0.1",
20-
"react-scripts": "3.1.0",
21-
"react-swipeable-views": "0.13.3"
19+
"react-router-dom": "5.2.0",
20+
"react-scripts": "3.4.1",
21+
"react-swipeable-views": "0.13.9"
2222
},
2323
"scripts": {
2424
"start": "react-scripts start",
@@ -43,17 +43,17 @@
4343
},
4444
"homepage": "https://creativetimofficial.github.io/material-dashboard-react/#/dashboard",
4545
"optionalDependencies": {
46-
"@types/googlemaps": "3.37.3",
46+
"@types/googlemaps": "3.39.6",
4747
"@types/markerclustererplus": "2.1.33",
48-
"ajv": "6.10.2",
49-
"typescript": "3.5.3"
48+
"ajv": "6.12.2",
49+
"typescript": "3.9.3"
5050
},
5151
"devDependencies": {
52-
"eslint-config-prettier": "6.0.0",
53-
"eslint-plugin-prettier": "3.1.0",
52+
"eslint-config-prettier": "6.11.0",
53+
"eslint-plugin-prettier": "3.1.3",
5454
"gulp": "4.0.2",
5555
"gulp-append-prepend": "1.0.8",
56-
"prettier": "1.18.2"
56+
"prettier": "2.0.5"
5757
},
5858
"browserslist": {
5959
"production": [

Diff for: ‎public/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Material Dashboard React - v1.8.0
5+
* Material Dashboard React - v1.9.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim

Diff for: ‎src/assets/css/material-dashboard-react.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0 based on Material Dashboard - v1.2.0
4+
* Material Dashboard React - v1.9.0 based on Material Dashboard - v1.2.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
=========================================================

Diff for: ‎src/assets/jss/material-dashboard-react.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0 based on Material Dashboard - v1.2.0
4+
* Material Dashboard React - v1.9.0 based on Material Dashboard - v1.2.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
=========================================================
@@ -34,7 +34,7 @@ const hexToRgb = input => {
3434
let last = input[2];
3535
input = first + first + second + second + last + last;
3636
}
37-
input = input.toUpperCase(input);
37+
input = input.toUpperCase();
3838
let first = input[0] + input[1];
3939
let second = input[2] + input[3];
4040
let last = input[4] + input[5];

Diff for: ‎src/assets/jss/material-dashboard-react/dropdownStyle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const dropdownStyle = theme => ({
3636
popperClose: {
3737
pointerEvents: "none"
3838
},
39-
pooperResponsive: {
39+
popperResponsive: {
4040
[theme.breakpoints.down("md")]: {
4141
zIndex: "1640",
4242
position: "static",

Diff for: ‎src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0
4+
* Material Dashboard React - v1.9.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim
@@ -24,7 +24,7 @@ import { Router, Route, Switch, Redirect } from "react-router-dom";
2424
import Admin from "layouts/Admin.js";
2525
import RTL from "layouts/RTL.js";
2626

27-
import "assets/css/material-dashboard-react.css?v=1.8.0";
27+
import "assets/css/material-dashboard-react.css?v=1.9.0";
2828

2929
const hist = createBrowserHistory();
3030

Diff for: ‎src/routes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0
4+
* Material Dashboard React - v1.9.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

0 commit comments

Comments
 (0)