Merge pull request #23 from creativetimofficial/dev-main

Update dependencies

.gitignore

@@ -21,3 +21,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.eslintcache

CHANGELOG.md

@@ -1,5 +1,56 @@
 # Change Log
 
+## [1.2.0] 2020-12-08
+### Enhancements
+- **Full Hooks Support**: Change `class` components usage with `functional` ones in order to support Hooks
+### Bug fixing
+### Misc
+- Add new branch, named `main`, this will replace the `master` branch
+### Major style changes
+- Remove `src/assets/scss/blk-design-system-react/bootstrap` folder and start using the `node_modules/bootstrap` one
+- Add `src/assets/scss/blk-design-system-react/react/_custom-forms.scss` for usage of Bootstrap Switch / Reactstrap CustomInput of type switch
+### Deleted components
+### Added components
+### Deleted dependencies
+- react-bootstrap-switch
+  - This project was not longer maintained, and it had issues with the new React version. The styles for it are still kept inside the product, but we do not recommended using the plugin anymore. You can use the simple Reactstrap CustomInput of type switch or the basic HTML Bootstrap Switch one.
+- eslint-plugin-flowtype
+### Added dependencies
+```
+"@testing-library/jest-dom": "5.11.6",
+"@testing-library/react": "11.2.2",
+"@testing-library/user-event": "12.2.2",
+"bootstrap": "4.5.3",
+"jquery": "3.5.1",
+"node-sass-package-importer": "5.3.2",
+"web-vitals": "1.0.1"
+```
+### Updated dependencies
+```
+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.2.0   →   14.6.3
+react                    16.13.1   →   17.0.1
+react-chartjs-2            2.9.0   →   2.11.1
+react-datetime            2.16.3   →    3.0.4
+react-dom                16.13.1   →   17.0.1
+react-router-dom           5.1.2   →    5.2.0
+react-scripts              3.4.1   →    4.0.1
+reactstrap                 8.4.1   →    8.7.1
+typescript                 3.8.3   →    4.1.2
+```
+### Important Notes
+**The jQuery and TypeScript 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 jQuery, and it is not based on TypeScript!**
+### Warning
+_Some warnings may appear when running the installation command, but they do not affect the UI or the functionality of the product._
+_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.
+```
+
 ## [1.1.0] 2020-04-10
 ### Bug fixing
 - Github

Documentation/documentation.html

@@ -2,12 +2,12 @@
 /*!
 
 =========================================================
-* BLK Design System React - v1.1.0
+* BLK Design System React - v1.2.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/blk-design-system-react
 * Copyright 2020 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
+* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/main/LICENSE.md)
 
 * Coded by Creative Tim
 
@@ -47,7 +47,7 @@
     <link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
     <!-- CSS Files -->
     <link
-      href="../src/assets/css/blk-design-system-react.min.css?v=1.1.0"
+      href="../src/assets/css/blk-design-system-react.min.css?v=1.2.0"
       rel="stylesheet"
     />
     <!-- CSS Just for demo purpose, don't include it in your project -->
@@ -138,7 +138,7 @@
               <span class="navbar-toggler-bar bar3"></span>
             </button>
           </div>
-          <a class="navbar-brand" href="javascript:void(0)"
+          <a class="navbar-brand" href="https://www.creative-tim.com/product/blk-design-system-react?ref=blkdsr-static-docs"
             >BLK Design System React</a
           >
         </div>
@@ -156,6 +156,11 @@
         </button>
         <div class="collapse navbar-collapse" id="navigation">
           <ul class="navbar-nav ml-auto">
+            <li class="nav-item">
+              <a target="_blank" href="https://www.creative-tim.com/product/blk-design-system-pro-react?ref=blkdsr-static-docs" class="nav-link d-none d-lg-block btn btn-primary">
+                <i class="tim-icons icon-spaceship"></i> Upgrade to PRO
+              </a>
+            </li>
             <li class="nav-item">
               <a
                 class="nav-link"
@@ -208,10 +213,10 @@
         <div class="col-md-8 ml-auto mr-auto">
           <div class="brand">
             <h1 class="title">BLK Design System React</h1>
-            <h3 class="description">Documentation v1.1.0</h3>
+            <h3 class="description">Documentation v1.2.0</h3>
             <br />
             <a
-              href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/tutorial?ref=blkdsr-static-docs"
+              href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/overview?ref=blkdsr-static-docs"
               class="btn btn-primary btn-round btn-lg"
               >View documentation</a
             >