Merge pull request #52 from creativetimofficial/dev-main

Feature: Update dependencies

Author: einazare

.gitignore

@@ -2,3 +2,4 @@
 /node_modules
 package-lock.json
 /build
+.eslintcache

CHANGELOG.md

@@ -1,3 +1,51 @@
+## [1.2.0] 2021-01-26
+### Bug fixing
+- https://github.com/creativetimofficial/argon-dashboard-react/pull/38
+- https://github.com/creativetimofficial/argon-dashboard-react/pull/33
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/29
+- https://github.com/creativetimofficial/argon-dashboard-react/issues/23
+### Major style changes
+- Moved all `src/scss/argon-dashboard/bootstrap` files to `node_modules/bootstrap`
+### Deleted components
+### Added components
+### Deleted dependencies
+- @types/googlemaps (we'll use simple Google Maps API with Vanilla JS instead)
+- @types/markerclustererplus (we'll use simple Google Maps API with Vanilla JS instead)
+- @types/react (we'll use simple Google Maps API with Vanilla JS instead)
+- react-google-maps (we'll use simple Google Maps API with Vanilla JS instead)
+### Added dependencies
++ [email protected] (so that we can easily update bootstrap version)
++ [email protected] (since bootstrap requires it - we are not using, we are only using bootstrap scss)
++ [email protected] (so that we can import bootstrap scss from `node_modules`)
+### Updated dependencies
+```
+@fortawesome/fontawesome-free    5.12.1   →   5.15.2
+chart.js                          2.9.3   →    2.9.4
+moment                           2.24.0   →   2.29.1
+node-sass                        4.13.1   →   4.14.1
+nouislider                       14.1.1   →   14.6.3
+react                           16.12.0   →   17.0.1
+react-chartjs-2                   2.9.0   →   2.11.1
+react-copy-to-clipboard           5.0.2   →    5.0.3
+react-datetime                   2.16.3   →    3.0.4
+react-dom                       16.12.0   →   17.0.1
+react-router-dom                  5.1.2   →    5.2.0
+react-scripts                    ^3.4.0   →    4.0.1
+reactstrap                        8.4.1   →    8.9.0
+eslint-plugin-flowtype           3.13.0   →    5.2.0
+typescript                        3.7.5   →    4.1.3
+```
+### Warning
+**The TypeScript and jQuery dependencies are installed only to stop console warnings on install. They are not actually used in our product. So the product is not based on TypeScript or jQuery!**
+_The following warnings will appear when running the installation command, but they do not affect the UI or the functionality of the product (they will be solved in our next update):_
+```
+npm WARN [email protected] requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
+npm WARN [email protected] requires a peer of [email protected] || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
+npm WARN [email protected] requires a peer of react@^0.14.0 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
+```
+_If they will persist in our 2.*.* version, we will drop their usages and replace them with other plugins._
+_In development mode, some of the above plugins will throw a warning because they still use React v16 syntax. If the error will persist in our 2.*.* version, we will drop their usage and replace them with other plugins._
+
 ## [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.)

Documentation/documentation.html

@@ -2,11 +2,11 @@
 /*!
 
 =========================================================
-* Argon Dashboard React - v1.1.0
+* Argon Dashboard React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -47,7 +47,7 @@
     <!-- Argon CSS -->
     <link
       type="text/css"
-      href="../src/assets/css/argon-dashboard-react.css?v=1.1.0"
+      href="../src/assets/css/argon-dashboard-react.css?v=1.2.0"
       rel="stylesheet"
     />
   </head>
@@ -101,7 +101,7 @@
                     />
                   </span>
                   <div class="media-body ml-2 d-none d-lg-block">
-                    <span class="mb-0 text-sm  font-weight-bold"
+                    <span class="mb-0 text-sm font-weight-bold"
                       >Jessica Jones</span
                     >
                   </div>
@@ -110,7 +110,7 @@
               <div
                 class="dropdown-menu dropdown-menu-arrow dropdown-menu-right"
               >
-                <div class=" dropdown-header noti-title">
+                <div class="dropdown-header noti-title">
                   <h6 class="text-overflow m-0">Welcome!</h6>
                 </div>
                 <a href="#pablo" class="dropdown-item">
@@ -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.1.0</small>
+                Documentation <small>v1.2.0</small>
               </h1>
               <p class="text-white mt-0 mb-5">
                 We are constatly doing updates on the product and documentation,
@@ -175,8 +175,20 @@ <h1 class="display-2 text-white">
     </div>
     <!-- Argon Scripts -->
     <!-- Core -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+    <script
+      src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+      integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+      integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+      integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+      crossorigin="anonymous"
+    ></script>
   </body>
 </html>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 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

@@ -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.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)
+ ![version](https://img.shields.io/badge/version-1.2.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)
@@ -225,7 +225,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are
 
 ## Licensing
 
-- Copyright 2018 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
+- Copyright 2021 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
 
 - Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md?ref=creativetim)
 

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(`/*!
 
 =========================================================
-* Argon Dashboard React - v1.1.0
+* Argon Dashboard React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -33,11 +33,11 @@ gulp.task("licenses", async function() {
       gap.prependText(`<!--
 
 =========================================================
-* Argon Dashboard React - v1.1.0
+* Argon Dashboard React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -57,11 +57,11 @@ gulp.task("licenses", async function() {
       gap.prependText(`/*!
 
 =========================================================
-* Argon Dashboard React - v1.1.0
+* Argon Dashboard React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "argon-dashboard-react",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "React version of Argon Dashboard by Creative Tim",
   "main": "index.js",
   "repository": {
@@ -29,9 +29,10 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
-    "compile-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css",
-    "minify-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.min.css --output-style compressed",
-    "map-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css --source-map true"
+    "compile:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css",
+    "minify:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.min.css --output-style compressed",
+    "map:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css --source-map true",
+    "build:scss": "npm run compile:scss && npm run minify:scss && npm run map:scss"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -43,29 +44,30 @@
     "not op_mini all"
   ],
   "dependencies": {
-    "@fortawesome/fontawesome-free": "5.12.1",
-    "chart.js": "2.9.3",
+    "@fortawesome/fontawesome-free": "5.15.2",
+    "bootstrap": "4.6.0",
+    "chart.js": "2.9.4",
     "classnames": "2.2.6",
-    "moment": "2.24.0",
-    "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.12.0",
-    "react-google-maps": "9.4.5",
-    "react-router-dom": "5.1.2",
-    "react-scripts": "3.3.1",
-    "reactstrap": "8.4.1"
+    "moment": "2.29.1",
+    "node-sass": "4.14.1",
+    "node-sass-package-importer": "5.3.2",
+    "nouislider": "14.6.3",
+    "react": "17.0.1",
+    "react-chartjs-2": "2.11.1",
+    "react-copy-to-clipboard": "5.0.3",
+    "react-datetime": "3.0.4",
+    "react-dom": "17.0.1",
+    "react-router-dom": "5.2.0",
+    "react-scripts": "4.0.1",
+    "reactstrap": "8.9.0"
   },
   "devDependencies": {
-    "@types/googlemaps": "3.39.2",
-    "@types/markerclustererplus": "2.1.33",
-    "@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"
+    "gulp-append-prepend": "1.0.8"
+  },
+  "optionalDependencies": {
+    "eslint-plugin-flowtype": "5.2.0",
+    "jquery": "3.5.1",
+    "typescript": "4.1.3"
   }
 }

public/index.html

@@ -2,11 +2,11 @@
 /*!
 
 =========================================================
-* Argon Dashboard React - v1.1.0
+* Argon Dashboard React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/argon-dashboard-react
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 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
@@ -43,6 +43,7 @@
       rel="stylesheet"
     />
     <title>Argon Dashboard React by Creative Tim</title>
+    <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY_HERE"></script>
   </head>
   <body>
     <noscript> You need to enable JavaScript to run this app. </noscript>