Merge pull request #21 from creativetimofficial/dev-master

Feature: Update dependencies

Author: dragosct

.env

@@ -1,3 +1,54 @@
+## [1.1.0] 2020-02-10
+### Bug fixing
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/18 (Added this in live docs, we need for our product to have a homepage prop inside the package.json. If build is not working, just delete the homepage prop from inside the package.json, or configure it to your own specs.)
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/17
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/15
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/12
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/3
+- Changed `componentWillMount` with `constructor` function inside `src/views/Index.js` (this was for initializing the charts)
+### Major style changes
+- Changed the whole `src/assets/scss/*` folder
+- Changed the whole `src/assets/css/*` folder
+### Deleted components
+### Added components
+### Deleted dependencies
+### Added dependencies
++ [email protected] (To stop following Warning: `npm **WARN** [email protected] requires a peer of [email protected] but none is installed. You must install peer dependencies yourself.`)
++ @fortawesome/fontawesome-free@5.12.1 (Easier to maintain as a dependency, rather than having to download new versions)
++ [email protected] (For licenses copyrights)
++ [email protected] (For licenses copyrights)
+### Updated dependencies
+```
+chart.js                     2.7.3   →     2.9.3
+node-sass                   4.11.0   →    4.13.1
+nouislider                  13.1.1   →    14.1.1
+react                       16.8.4   →   16.12.0
+react-chartjs-2              2.7.4   →     2.9.0
+react-copy-to-clipboard      5.0.1   →     5.0.2
+react-dom                   16.8.4   →   16.12.0
+react-router-dom             4.3.1   →     5.1.2
+react-scripts                2.1.8   →     3.3.1
+reactstrap                   7.1.0   →     8.4.1
+@types/googlemaps          3.30.18   →    3.39.2
+@types/react                16.8.7   →   16.9.19
+typescript                3.3.3333   →     3.7.5
+```
+### Warning
+** The following warnings could not be solved, due to some of our dependencies, however, they do not affect the functionality or the UI of the product: **
+```
+npm WARN deprecated [email protected]: core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.
+npm WARN deprecated [email protected]: Popper changed home, find its new releases at @popperjs/core
+```
+** The following warning could not be solved due to the usage of `react-google-maps` (Note: if the warning will persist after React changes version to 17, we'll drop the support for `react-google-maps` and replace them with other react library for maps):**
+```
+backend.js:6 Warning: componentWillMount has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
+
+* Move code with side effects to componentDidMount, and set initial state in the constructor.
+* Rename componentWillMount to UNSAFE_componentWillMount to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run `npx react-codemod rename-unsafe-lifecycles` in your project source folder.
+
+Please update the following components: withScriptjs(withGoogleMap(Component))
+```
+
 ## [1.0.0] 2019-03-13
 ### Original Release
 - Added Reactstrap as base framework

CHANGELOG.md

@@ -2,7 +2,7 @@
 /*!
 
 =========================================================
-* Argon Dashboard React - v1.0.0
+* Argon Dashboard React - v1.1.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
@@ -47,7 +47,7 @@
     <!-- Argon CSS -->
     <link
       type="text/css"
-      href="../src/assets/css/argon-dashboard-react.css?v=1.0.0"
+      href="../src/assets/css/argon-dashboard-react.css?v=1.1.0"
       rel="stylesheet"
     />
   </head>
@@ -143,7 +143,7 @@ <h6 class="text-overflow m-0">Welcome!</h6>
           <div class="row justify-content-center">
             <div class="col-lg-6 col-md-10 text-center">
               <h1 class="display-2 text-white">
-                Documentation <small>v1.0.0</small>
+                Documentation <small>v1.1.0</small>
               </h1>
               <p class="text-white mt-0 mb-5">
                 We are constatly doing updates on the product and documentation,

Documentation/documentation.html

@@ -1,7 +1,7 @@
 # [Argon Dashboard React](https://demos.creative-tim.com/argon-dashboard-react?ref=adr-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Argon%20Dashboard%20is%20a%20Free%20Bootstrap%204,%20React%20and%20Reactstrap%20Dashboard%20made%20using%20create-react-app%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/argon-dashboard-react%20%23react%20%23reactstrap%20%23createreactapp%20%23argon%20%23argondesign%20%23reactdashboard%20%23argonreact%20%23reactdesign%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23freebie%20%20via%20%40CreativeTim)
 
 
- ![version](https://img.shields.io/badge/version-1.0.0-blue.svg)  ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
+ ![version](https://img.shields.io/badge/version-1.1.0-blue.svg)  ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
 
 
 ![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-dashboard-react/argon-dashboard-react.gif)
@@ -39,7 +39,7 @@ If you want to get inspiration or just show something directly to your clients,
 
 ## Versions
 
-[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/html-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard?ref=adr-github-readme)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/react-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-react?ref=adr-github-readme)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/angular-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-angular)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/nodejs-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-nodejs?ref=adr-github-readme)[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/laravel_logo.png" width="60" height="60" style="background:white"/>](https://www.creative-tim.com/product/argon-dashboard-laravel?ref=adr-github-readme)[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/sketch-logo.jpg" width="60" height="60" />](https://github.com/creativetimofficial/argon-dashboard/tree/sketch?ref=creativetim)
+[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/html-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard?ref=adr-github-readme)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/react-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-react?ref=adr-github-readme)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/angular-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-angular)[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/nodejs-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-nodejs?ref=adr-github-readme)[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/laravel_logo.png" width="60" height="60" style="background:white"/>](https://www.creative-tim.com/product/argon-dashboard-laravel?ref=adr-github-readme)[<img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/sketch-logo.jpg" width="60" height="60" />](https://www.creative-tim.com/product/argon-dashboard-react?ref=adr-github-readme)
 
 
 
@@ -77,7 +77,7 @@ If you want to get inspiration or just show something directly to your clients,
 
 
 ## Documentation
-The documentation for the Material Kit is hosted at our [website](https://demos.creative-tim.com/argon-dashboard-react/documentation/overview).
+The documentation for the Material Kit is hosted at our [website](https://demos.creative-tim.com/argon-dashboard-react/#/documentation/overview).
 
 
 ## File Structure

README.md

@@ -0,0 +1,77 @@
+const gulp = require("gulp");
+const gap = require("gulp-append-prepend");
+
+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(`/*!
+
+=========================================================
+* Argon Dashboard React - v1.1.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
+* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
+
+* Coded by Creative Tim
+
+=========================================================
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+*/`)
+    )
+    .pipe(gulp.dest("./", { overwrite: true }));
+
+  // this is to add Creative Tim licenses in the production mode for the minified html
+  gulp
+    .src("build/index.html", { base: "./" })
+    .pipe(
+      gap.prependText(`<!--
+
+=========================================================
+* Argon Dashboard React - v1.1.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
+* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
+
+* Coded by Creative Tim
+
+=========================================================
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+-->`)
+    )
+    .pipe(gulp.dest("./", { overwrite: true }));
+
+  // this is to add Creative Tim licenses in the production mode for the minified css
+  gulp
+    .src("build/static/css/*chunk.css", { base: "./" })
+    .pipe(
+      gap.prependText(`/*!
+
+=========================================================
+* Argon Dashboard React - v1.1.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
+* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
+
+* Coded by Creative Tim
+
+=========================================================
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+*/`)
+    )
+    .pipe(gulp.dest("./", { overwrite: true }));
+  return;
+});

gulpfile.js

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "*": ["src/*"]
+    }
+  }
+}

jsconfig.json

@@ -1,6 +1,6 @@
 {
   "name": "argon-dashboard-react",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "React version of Argon Dashboard by Creative Tim",
   "main": "index.js",
   "repository": {
@@ -43,25 +43,29 @@
     "not op_mini all"
   ],
   "dependencies": {
-    "chart.js": "2.7.3",
+    "@fortawesome/fontawesome-free": "5.12.1",
+    "chart.js": "2.9.3",
     "classnames": "2.2.6",
     "moment": "2.24.0",
-    "node-sass": "4.11.0",
-    "nouislider": "13.1.1",
-    "react": "16.8.4",
-    "react-chartjs-2": "2.7.4",
-    "react-copy-to-clipboard": "5.0.1",
+    "node-sass": "4.13.1",
+    "nouislider": "14.1.1",
+    "react": "16.12.0",
+    "react-chartjs-2": "2.9.0",
+    "react-copy-to-clipboard": "5.0.2",
     "react-datetime": "2.16.3",
-    "react-dom": "16.8.4",
+    "react-dom": "16.12.0",
     "react-google-maps": "9.4.5",
-    "react-router-dom": "4.3.1",
-    "react-scripts": "2.1.8",
-    "reactstrap": "7.1.0"
+    "react-router-dom": "5.1.2",
+    "react-scripts": "3.3.1",
+    "reactstrap": "8.4.1"
   },
   "devDependencies": {
-    "@types/googlemaps": "3.30.18",
+    "@types/googlemaps": "3.39.2",
     "@types/markerclustererplus": "2.1.33",
-    "@types/react": "16.8.7",
-    "typescript": "3.3.3333"
+    "@types/react": "16.9.19",
+    "eslint-plugin-flowtype": "3.13.0",
+    "gulp": "4.0.2",
+    "gulp-append-prepend": "1.0.8",
+    "typescript": "3.7.5"
   }
 }

package.json

@@ -2,7 +2,7 @@
 /*!
 
 =========================================================
-* Argon Dashboard React - v1.0.0
+* Argon Dashboard React - v1.1.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react