Merge pull request #94 from creativetimofficial/dev-main

Feature: v1.10.0
creativetimofficial · May 11, 2021 · c1c4842 · c1c4842
2 parents ec3c7de + 988f436
commit c1c4842
Show file tree

Hide file tree

Showing 96 changed files with 884 additions and 1,050 deletions.
diff --git a/.eslintrc.js b/.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",
+  ],
 };
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+Documentation/assets/js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # Change Log
 
+## [1.10.0] 2021-05-11
+### Bug fixing
+- https://github.com/creativetimofficial/material-kit-react/issues/86
+  - This issue cannot be solved, it comes from the `react-swipeable-views` plugin, this plugins is no longer maintained, even `Material-UI` has dropped its usage and stopped animating the `Nav Pills`, so, we’ve dropped their usage as well
+- https://github.com/creativetimofficial/material-kit-react/issues/85
+  - Tested this inside a Linux environment, and evrything worked as expected, maybe the issue was solved by the new Material-UI version
+- https://github.com/creativetimofficial/material-kit-react/issues/75
+  - This issue will be closed, as people might want to change the brand component from `Button` to something else, for example a `Link` from `react-router-dom`
+
+### Major style changes
+### Deleted components
+### Added components
++ `@babel/core@7.14.0` (to stop warnings)
+### Deleted dependencies
+- `history` (no more need for this one, we'll use `BrowserRouter` instead of `Router` with `history`)
+- `react-swipeable-views` (no longer maintained)
+### Added dependencies
+### 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
+moment                                     2.26.0   →    2.29.1
+node-sass                                  4.14.1   →     6.0.0
+nouislider                                 14.5.0   →    15.1.0
+react                                     16.13.1   →    17.0.2
+react-datetime                             2.16.3   →     3.0.4
+react-dom                                 16.13.1   →    17.0.2
+react-scripts                               3.4.1   →     4.0.3
+react-slick                                0.26.1   →    0.28.1
+@babel/cli                                 7.10.1   →   7.13.16
+@babel/plugin-proposal-class-properties    7.10.1   →    7.13.0
+@babel/preset-env                          7.10.1   →    7.14.1
+@babel/preset-react                        7.10.1   →   7.13.13
+eslint-config-prettier                     6.11.0   →     8.3.0
+eslint-plugin-prettier                      3.1.3   →     3.4.0
+eslint-plugin-react                        7.20.0   →    7.23.2
+gulp-append-prepend                         1.0.8   →     1.0.9
+prettier                                    2.0.5   →     2.3.0
+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-datetime@3.0.4 requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
+```
+_You will also have the following message: found 80 vulnerabilities (1 low, 79 moderate). 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-28
 ### Bug fixing
 - https://github.com/creativetimofficial/material-kit-react/issues/67

diff --git a/Documentation/tutorial-components.html b/Documentation/tutorial-components.html
@@ -26,8 +26,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;
@@ -97,7 +97,7 @@
           <div class="col-md-8 col-md-offset-2 text-center">
             <h1 class="title ">Material Kit 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://creativetimofficial.github.io/material-kit-react/#/documentation/tutorial"
               class="btn btn-rose btn-fill btn-round"

diff --git a/LICENSE.md b/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

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # [Material Kit React](https://demos.creative-tim.com/material-kit-react) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Material%20Kit%20PRO%20is%20a%20Bootstrap%20UI%20Kit%20with%20a%20fresh,%20new%20design%20inspired%20by%20Google's%20Material%20Design%20%E2%9D%A4%EF%B8%8Fhttps%3A//demos.creative-tim.com/material-kit-pro/presentation.html%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23premium%20%20via%20%40CreativeTim)
 
 
- ![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-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-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.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-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-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 Presentation Image](https://s3.amazonaws.com/creativetim_bucket/products/83/original/opt_mk_react_thumbnail.jpg)
@@ -230,9 +230,9 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are
 
 ## Licensing
 
-- 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-kit/blob/master/LICENSE.md)
+- Licensed under MIT (https://github.com/creativetimofficial/material-kit-react/blob/main/LICENSE.md)
 
 ## Useful Links
 

diff --git a/gulpfile.js b/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(`/*!
 
 =========================================================
-* Now UI Kit PRO React - v1.0.0
+* Material Kit React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-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(`<!--
 
 =========================================================
-* Now UI Kit PRO React - v1.0.0
+* Material Kit React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-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(`/*!
 
 =========================================================
-* Now UI Kit PRO React - v1.0.0
+* Material Kit React - v1.10.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
-* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+* Copyright 2021 Creative Tim (http://www.creative-tim.com)
 
 * Coded by Creative Tim
 

diff --git a/package.json b/package.json
@@ -1,40 +1,39 @@
 {
   "name": "material-kit-react",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Material Kit React. Coded by Creative Tim",
   "private": true,
   "main": "src/index.js",
   "dependencies": {
-    "@material-ui/core": "4.10.0",
-    "@material-ui/icons": "4.9.1",
-    "classnames": "2.2.6",
-    "history": "4.10.1",
-    "moment": "2.26.0",
-    "node-sass": "4.14.1",
-    "nouislider": "14.5.0",
+    "@babel/core": "7.14.0",
+    "@material-ui/core": "4.11.4",
+    "@material-ui/icons": "4.11.2",
+    "classnames": "2.3.1",
+    "moment": "2.29.1",
+    "node-sass": "6.0.0",
+    "nouislider": "15.1.0",
     "prop-types": "15.7.2",
-    "react": "16.13.1",
-    "react-datetime": "2.16.3",
-    "react-dom": "16.13.1",
+    "react": "17.0.2",
+    "react-datetime": "3.0.4",
+    "react-dom": "17.0.2",
     "react-router-dom": "5.2.0",
-    "react-scripts": "3.4.1",
-    "react-slick": "0.26.1",
-    "react-swipeable-views": "0.13.9"
+    "react-scripts": "4.0.3",
+    "react-slick": "0.28.1"
   },
   "devDependencies": {
-    "@babel/cli": "7.10.1",
-    "@babel/plugin-proposal-class-properties": "7.10.1",
-    "@babel/preset-env": "7.10.1",
-    "@babel/preset-react": "7.10.1",
-    "eslint-config-prettier": "6.11.0",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react": "7.20.0",
+    "@babel/cli": "7.13.16",
+    "@babel/plugin-proposal-class-properties": "7.13.0",
+    "@babel/preset-env": "7.14.1",
+    "@babel/preset-react": "7.13.13",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-prettier": "3.4.0",
+    "eslint-plugin-react": "7.23.2",
     "gulp": "4.0.2",
-    "gulp-append-prepend": "1.0.8",
-    "prettier": "2.0.5"
+    "gulp-append-prepend": "1.0.9",
+    "prettier": "2.3.0"
   },
   "optionalDependencies": {
-    "typescript": "3.9.3"
+    "typescript": "4.2.4"
   },
   "scripts": {
     "start": "react-scripts start",