Merge pull request #158 from creativetimofficial/dev-main

Feature: v1.10.0

.eslintrc.js

@@ -3,19 +3,19 @@ module.exports = {
   env: {
     es6: true,
     node: true,
-    browser: true
+    browser: true,
   },
   parserOptions: {
     ecmaVersion: 6,
     sourceType: "module",
     ecmaFeatures: {
-      jsx: true
-    }
+      jsx: true,
+    },
   },
   plugins: ["react"],
   extends: [
     "eslint:recommended",
     "plugin:react/recommended",
-    "plugin:prettier/recommended"
-  ]
+    "plugin:prettier/recommended",
+  ],
 };

.gitignore

@@ -24,3 +24,5 @@ yarn-debug.log*
 yarn-error.log*
 
 package-lock.json
+
+commit.sh

.prettierignore

@@ -0,0 +1 @@
+documentation/

CHANGELOG.md

@@ -1,5 +1,48 @@
 # Change Log
 
+## [1.10.0] 2020-05-07
+### Bug fixing
+- https://github.com/creativetimofficial/material-dashboard-react/issues/145 (this was solved since we've changed react-google-maps with simple Google Maps API)
+- https://github.com/creativetimofficial/material-dashboard-react/issues/140 (this was solved since we've changed react-google-maps with simple Google Maps API)
+- https://github.com/creativetimofficial/material-dashboard-react/issues/138 (can be closed since it was help wanted)
+- https://github.com/creativetimofficial/material-dashboard-react/issues/137 (user did not respond)
+- https://github.com/creativetimofficial/material-dashboard-react/issues/133 (fixed it by using `useLocation` from `react-router-dom`)
+- https://github.com/creativetimofficial/material-dashboard-react/issues/16 (please check the following page: https://demos.creative-tim.com/material-dashboard-react/#/rtl/rtl-page)
+### Major style changes
+### Deleted components
+### Added components
+### Deleted dependencies
+- `react-google-maps` (we've replaced this with simple Google Maps API)
+- `@types/googlemaps` (we've replaced this with simple Google Maps API)
+- `@types/markerclustererplus` (we've replaced this with simple Google Maps API)
+- `ajv` (this was only installed to stop some install warnings)
+- `history` (we'll use `BrowserRouter` from `react-router-dom` package instead)
+### Added dependencies
++ `@babel/core@7.14.0` (to stop install warnings)
+### Updated dependencies
+```
+@material-ui/core         4.10.0   →   4.11.4
+@material-ui/icons         4.9.1   →   4.11.2
+classnames                 2.2.6   →    2.3.1
+perfect-scrollbar          1.5.0   →    1.5.1
+react                    16.13.1   →   17.0.2
+react-chartist            0.14.3   →   0.14.4
+react-dom                16.13.1   →   17.0.2
+react-scripts              3.4.1   →    4.0.3
+eslint-config-prettier    6.11.0   →    8.3.0
+eslint-plugin-prettier     3.1.3   →    3.4.0
+gulp-append-prepend        1.0.8   →    1.0.9
+prettier                   2.0.5   →    2.2.1
+typescript                 3.9.3   →    4.2.4
+```
+### Warning
+_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._
+```
+npm WARN react-swipeable-views@0.13.9 requires a peer of react@^15.3.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
+npm WARN react-event-listener@0.6.6 requires a peer of react@^16.3.0 but none is installed. You must install peer dependencies yourself.
+```
+_You will also have the following message: `found 88 vulnerabilities (1 low, 87 moderate) in 2207 scanned packages`. This comes from react-scripts, and will be fixed in the next version. NOTE: the product works as expected with these `vulnerabilities`._
+
 ## [1.9.0] 2020-05-27
 ### Bug fixing
 - https://github.com/creativetimofficial/material-dashboard-react/issues/121

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Creative Tim
+Copyright (c) 2021 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

README.md

@@ -2,7 +2,7 @@
 
 
 
-![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)
+![version](https://img.shields.io/badge/version-1.10.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)
 
@@ -63,7 +63,7 @@ Quick start options:
 
 - `npm i material-dashboard-react`
 - Clone the repo: `git clone https://github.com/creativetimofficial/material-dashboard-react.git`.
-- [Download from Github](https://github.com/creativetimofficial/material-dashboard-react/archive/master.zip).
+- [Download from Github](https://github.com/creativetimofficial/material-dashboard-react/archive/main.zip).
 - [Download from Creative Tim](https://www.creative-tim.com/product/material-dashboard-react).
 
 
@@ -213,8 +213,8 @@ If you have questions or need help integrating the product please [contact us](h
 
 ## Licensing
 
-- Copyright 2020 Creative Tim (https://www.creative-tim.com)
-- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
+- Copyright 2021 Creative Tim (https://www.creative-tim.com)
+- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/main/LICENSE.md)
 
 ## Useful Links
 

documentation/assets/css/demo-documentation.css

@@ -1,11 +1,11 @@
 /*!
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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

documentation/assets/css/material-dashboard.css

@@ -1,11 +1,11 @@
 /*!
 
  =========================================================
- * Material Dashboard  React- v1.9.0
+ * Material Dashboard  React- v1.10.0
  =========================================================
 
  * Product Page: http://www.creative-tim.com/product/material-dashboard-react
- * Copyright 2020 Creative Tim (http://www.creative-tim.com)
+ * Copyright 2021 Creative Tim (http://www.creative-tim.com)
  * Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
 
  =========================================================

documentation/tutorial-components.html

@@ -2,11 +2,11 @@
 /*!
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -48,8 +48,8 @@
     />
     <!-- CSS Files -->
     <link href="assets/css/bootstrap.min.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" />
+    <link href="assets/css/material-dashboard.css?v=1.10.0" rel="stylesheet" />
+    <link href="assets/css/demo-documentation.css?v=1.10.0" rel="stylesheet" />
     <style media="screen">
       .page-header {
         height: 100vh;
@@ -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.9.0</h5>
+            <h5 class="description">v1.10.0</h5>
             <a
               href="https://demos.creative-tim.com/material-dashboard-react/#/documentation/tutorial"
               class="btn btn-rose btn-fill btn-round"

gulpfile.js

@@ -1,19 +1,19 @@
 const gulp = require("gulp");
 const gap = require("gulp-append-prepend");
 
-gulp.task("licenses", async function() {
+gulp.task("licenses", async function () {
   // this is to add Creative Tim licenses in the production mode for the minified js
   gulp
     .src("build/static/js/*chunk.js", { base: "./" })
     .pipe(
       gap.prependText(`/*!
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+* Copyright 2021 Creative Tim (http://www.creative-tim.com)
 
 * Coded by Creative Tim
 
@@ -32,11 +32,11 @@ gulp.task("licenses", async function() {
       gap.prependText(`<!--
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+* Copyright 2021 Creative Tim (http://www.creative-tim.com)
 
 * Coded by Creative Tim
 
@@ -55,11 +55,11 @@ gulp.task("licenses", async function() {
       gap.prependText(`/*!
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+* Copyright 2021 Creative Tim (http://www.creative-tim.com)
 
 * Coded by Creative Tim
 

package.json

@@ -1,23 +1,22 @@
 {
   "name": "material-dashboard-react",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Material Dashboard React. Coded by Creative Tim",
   "private": false,
   "main": "dist/index.js",
   "dependencies": {
-    "@material-ui/core": "4.10.0",
-    "@material-ui/icons": "4.9.1",
+    "@material-ui/core": "4.11.4",
+    "@material-ui/icons": "4.11.2",
     "chartist": "0.10.1",
-    "classnames": "2.2.6",
-    "history": "4.10.1",
-    "perfect-scrollbar": "1.5.0",
+    "classnames": "2.3.1",
+    "history": "5.0.0",
+    "perfect-scrollbar": "1.5.1",
     "prop-types": "15.7.2",
-    "react": "16.13.1",
-    "react-chartist": "0.14.3",
-    "react-dom": "16.13.1",
-    "react-google-maps": "9.4.5",
+    "react": "17.0.2",
+    "react-chartist": "0.14.4",
+    "react-dom": "17.0.2",
     "react-router-dom": "5.2.0",
-    "react-scripts": "3.4.1",
+    "react-scripts": "4.0.3",
     "react-swipeable-views": "0.13.9"
   },
   "scripts": {
@@ -43,17 +42,15 @@
   },
   "homepage": "https://creativetimofficial.github.io/material-dashboard-react/#/dashboard",
   "optionalDependencies": {
-    "@types/googlemaps": "3.39.6",
-    "@types/markerclustererplus": "2.1.33",
-    "ajv": "6.12.2",
-    "typescript": "3.9.3"
+    "@babel/core": "7.14.0",
+    "typescript": "4.2.4"
   },
   "devDependencies": {
-    "eslint-config-prettier": "6.11.0",
-    "eslint-plugin-prettier": "3.1.3",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-prettier": "3.4.0",
     "gulp": "4.0.2",
-    "gulp-append-prepend": "1.0.8",
-    "prettier": "2.0.5"
+    "gulp-append-prepend": "1.0.9",
+    "prettier": "2.2.1"
   },
   "browserslist": {
     "production": [

public/index.html

@@ -2,11 +2,11 @@
 /*!
 
 =========================================================
-* Material Dashboard React - v1.9.0
+* Material Dashboard React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-react
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -56,7 +56,7 @@
       rel="stylesheet"
       href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
     />
-
+    <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
     <!--
           Notice the use of %PUBLIC_URL% in the tags above.
           It will be replaced with the URL of the `public` folder during the build.

src/assets/css/material-dashboard-react.css

@@ -1,11 +1,11 @@
 /*!
 
  =========================================================
- * Material Dashboard React - v1.9.0 based on Material Dashboard - v1.2.0
+ * Material Dashboard React - v1.10.0 based on Material Dashboard - v1.2.0
  =========================================================
 
  * Product Page: http://www.creative-tim.com/product/material-dashboard-react
- * Copyright 2020 Creative Tim (http://www.creative-tim.com)
+ * Copyright 2021 Creative Tim (http://www.creative-tim.com)
  * Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
 
  =========================================================
@@ -246,12 +246,11 @@ footer ul li a:hover {
   top: 180px;
   right: 0;
   width: 64px;
-  background: rgba(0, 0, 0, 0.3);
+  background-color: rgba(0, 0, 0, 0.3);
   z-index: 1031;
   border-radius: 8px 0 0 8px;
   text-align: center;
   top: 120px;
-  .badge-primary-background-color: #9c27b0;
 }
 
 .fixed-plugin .SocialMediaShareButton,