Skip to content

Commit

Permalink
Merge pull request #123 from creativetimofficial/dev-master
Browse files Browse the repository at this point in the history
Feature: update dependencies
  • Loading branch information
einazare authored May 27, 2020
2 parents 0772405 + 804b9dd commit 32f12f3
Show file tree
Hide file tree
Showing 15 changed files with 87 additions and 51 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

package-lock.json
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# Change Log

## [1.9.0] 2020-05-27
### Bug fixing
- https://github.com/creativetimofficial/material-dashboard-react/issues/121
- https://github.com/creativetimofficial/material-dashboard-react/issues/98
- https://github.com/creativetimofficial/material-dashboard-react/pull/99
- https://github.com/creativetimofficial/material-dashboard-react/pull/65
### Major style changes
### Deleted components
### Added components
### Deleted dependencies
### Added dependencies
### Updated dependencies
```
@material-ui/core 4.3.2 → 4.10.0
@material-ui/icons 4.2.1 → 4.9.1
history 4.9.0 → 4.10.1
perfect-scrollbar 1.4.0 → 1.5.0
react 16.9.0 → 16.13.1
react-chartist 0.13.3 → 0.14.3
react-dom 16.9.0 → 16.13.1
react-router-dom 5.0.1 → 5.2.0
react-scripts 3.1.0 → 3.4.1
react-swipeable-views 0.13.3 → 0.13.9
eslint-config-prettier 6.0.0 → 6.11.0
eslint-plugin-prettier 3.1.0 → 3.1.3
prettier 1.18.2 → 2.0.5
@types/googlemaps 3.37.3 → 3.39.6
ajv 6.10.2 → 6.12.2
typescript 3.5.3 → 3.9.3
```
### Warning
_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._
_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._

## [1.8.0] 2019-08-26
### Bug fixing
- Rewrote the ISSUE_TEMPLATE
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Creative Tim
Copyright (c) 2020 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions 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-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)
![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)

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

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

## Licensing

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

## Useful Links
Expand Down
4 changes: 2 additions & 2 deletions documentation/assets/css/demo-documentation.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions documentation/assets/css/material-dashboard.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React- v1.8.0
* Material Dashboard React- v1.9.0
=========================================================
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
=========================================================
Expand Down
10 changes: 5 additions & 5 deletions documentation/tutorial-components.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -48,8 +48,8 @@
/>
<!-- CSS Files -->
<link href="assets/css/bootstrap.min.css" rel="stylesheet" />
<link href="assets/css/material-dashboard.css" rel="stylesheet" />
<link href="assets/css/demo-documentation.css" rel="stylesheet" />
<link href="assets/css/material-dashboard.css?v=1.9.0" rel="stylesheet" />
<link href="assets/css/demo-documentation.css?v=1.9.0" rel="stylesheet" />
<style media="screen">
.page-header {
height: 100vh;
Expand Down Expand Up @@ -117,7 +117,7 @@
<div class="col-md-8 col-md-offset-2 text-center">
<h1 class="title ">Material Dashboard React</h1>
<h4 class="title">Tutorial and Components</h4>
<h5 class="description">v1.8.0</h5>
<h5 class="description">v1.9.0</h5>
<a
href="https://demos.creative-tim.com/material-dashboard-react/#/documentation/tutorial"
class="btn btn-rose btn-fill btn-round"
Expand Down
18 changes: 9 additions & 9 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ gulp.task("licenses", async function() {
gap.prependText(`/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand All @@ -32,11 +32,11 @@ gulp.task("licenses", async function() {
gap.prependText(`<!--
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand All @@ -55,11 +55,11 @@ gulp.task("licenses", async function() {
gap.prependText(`/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "material-dashboard-react",
"version": "1.8.0",
"version": "1.9.0",
"description": "Material Dashboard React. Coded by Creative Tim",
"private": false,
"main": "dist/index.js",
"dependencies": {
"@material-ui/core": "4.3.2",
"@material-ui/icons": "4.2.1",
"@material-ui/core": "4.10.0",
"@material-ui/icons": "4.9.1",
"chartist": "0.10.1",
"classnames": "2.2.6",
"history": "4.9.0",
"perfect-scrollbar": "1.4.0",
"history": "4.10.1",
"perfect-scrollbar": "1.5.0",
"prop-types": "15.7.2",
"react": "16.9.0",
"react-chartist": "0.13.3",
"react-dom": "16.9.0",
"react": "16.13.1",
"react-chartist": "0.14.3",
"react-dom": "16.13.1",
"react-google-maps": "9.4.5",
"react-router-dom": "5.0.1",
"react-scripts": "3.1.0",
"react-swipeable-views": "0.13.3"
"react-router-dom": "5.2.0",
"react-scripts": "3.4.1",
"react-swipeable-views": "0.13.9"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -43,17 +43,17 @@
},
"homepage": "https://creativetimofficial.github.io/material-dashboard-react/#/dashboard",
"optionalDependencies": {
"@types/googlemaps": "3.37.3",
"@types/googlemaps": "3.39.6",
"@types/markerclustererplus": "2.1.33",
"ajv": "6.10.2",
"typescript": "3.5.3"
"ajv": "6.12.2",
"typescript": "3.9.3"
},
"devDependencies": {
"eslint-config-prettier": "6.0.0",
"eslint-plugin-prettier": "3.1.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-prettier": "3.1.3",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8",
"prettier": "1.18.2"
"prettier": "2.0.5"
},
"browserslist": {
"production": [
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/material-dashboard-react.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0 based on Material Dashboard - v1.2.0
* Material Dashboard React - v1.9.0 based on Material Dashboard - v1.2.0
=========================================================
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
=========================================================
Expand Down
6 changes: 3 additions & 3 deletions src/assets/jss/material-dashboard-react.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0 based on Material Dashboard - v1.2.0
* Material Dashboard React - v1.9.0 based on Material Dashboard - v1.2.0
=========================================================
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
=========================================================
Expand Down Expand Up @@ -34,7 +34,7 @@ const hexToRgb = input => {
let last = input[2];
input = first + first + second + second + last + last;
}
input = input.toUpperCase(input);
input = input.toUpperCase();
let first = input[0] + input[1];
let second = input[2] + input[3];
let last = input[4] + input[5];
Expand Down
2 changes: 1 addition & 1 deletion src/assets/jss/material-dashboard-react/dropdownStyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const dropdownStyle = theme => ({
popperClose: {
pointerEvents: "none"
},
pooperResponsive: {
popperResponsive: {
[theme.breakpoints.down("md")]: {
zIndex: "1640",
position: "static",
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand All @@ -24,7 +24,7 @@ import { Router, Route, Switch, Redirect } from "react-router-dom";
import Admin from "layouts/Admin.js";
import RTL from "layouts/RTL.js";

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

const hist = createBrowserHistory();

Expand Down
4 changes: 2 additions & 2 deletions src/routes.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Material Dashboard React - v1.8.0
* Material Dashboard React - v1.9.0
=========================================================
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down

0 comments on commit 32f12f3

Please sign in to comment.