Merge pull request #5 from creativetimofficial/dev-master

Update to latest version

Author: einazare

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Change Log
 
+## [1.4.0] 2019-06-15
+### Bug fixing
+- Other Now UI React products
+  - https://github.com/creativetimofficial/ct-now-ui-dashboard-pro-react/issues/10 (added `window.scrollTo(0, 0)` and `document.body.scrollTop = 0` to all pages so when you navigate to new page you are sent to the first line of the page)
+  - https://github.com/creativetimofficial/ct-now-ui-dashboard-pro-react/issues/31 (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
+  - https://github.com/creativetimofficial/ct-now-ui-kit-pro-react/issues/2 (added warnings on the documentation about this issue - unfortunately, we need to keep our own homepage prop inside the package.json for copyright issues)
+  - https://github.com/creativetimofficial/now-ui-dashboard-react/issues/10
+### Major style changes
+- `src/assets/scss/now-ui-kit/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
+- `src/assets/scss/now-ui-kit/_variables.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
+- `src/assets/scss/react/now-ui-kit/_popovers.scss` (because of new bootstrap and reactstrap versions)
+- `src/assets/scss/react/now-ui-kit/_tooltips.scss` (because of new bootstrap and reactstrap versions)
+- `src/assets/scss/react/react-differences.scss` (to add the new tootlips styles)
+### Deleted components
+### Added components
+### Deleted dependencies
+### Added dependencies
++ gulp@4.0.2 (for Creative Tim copyrights)
++ gulp-append-prepend@1.0.8 (for Creative Tim copyrights)
+### Updated dependencies
+```
+moment             2.24.0   →    2.26.0
+node-sass          4.12.0   →    4.14.1
+nouislider         14.0.2   →    14.5.0
+react              16.8.6   →   16.13.1
+react-dom          16.8.6   →   16.13.1
+react-router        5.0.1   →     5.2.0
+react-router-dom    5.0.1   →     5.2.0
+react-scripts       3.0.1   →     3.4.1
+reactstrap          8.0.1   →     8.4.1
+typescript          3.5.3   →     3.9.5
+```
+### Warning
+_All the following products: Now UI Kit React, Now UI Dashboard React, Now UI Kit PRO React and Now UI Dashboard PRO React have been updated together, and thus, we've added to all of them the same version of 1.4.0 - we may have skipped some versions for some of the above products, we've done so, since we want all Now UI & React products to share the same versions._
+_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
+_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._
+
 ## [1.0.0] 2019-07-23
 ### Original Release
 - Started project with create-react-app

Documentation/documentation.html

@@ -1,11 +1,11 @@
 <!--
 
 =========================================================
-* Now UI Kit React - v1.0.0
+* Now UI Kit React - v1.4.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-kit-react
-* Copyright 2019 Creative Tim (http://www.creative-tim.com)
+* Copyright 2020 Creative Tim (http://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/now-ui-kit-react/blob/master/LICENSE.md)
 
 * Designed by www.invisionapp.com Coded by www.creative-tim.com
@@ -46,15 +46,15 @@
     />
     <!-- CSS Files -->
     <link href="../src/assets/css/bootstrap.min.css" rel="stylesheet" />
-    <link href="../src/assets/css/now-ui-kit.css?v=1.3.0" rel="stylesheet" />
+    <link href="../src/assets/css/now-ui-kit.css?v=1.4.0" rel="stylesheet" />
     <!-- CSS Just for demo purpose, don't include it in your project -->
     <link href="../src/assets/demo/demo.css" rel="stylesheet" />
   </head>
 
   <body class="offline-doc">
     <!-- Navbar -->
     <nav
-      class="navbar navbar-expand-lg bg-primary fixed-top navbar-transparent "
+      class="navbar navbar-expand-lg bg-primary fixed-top navbar-transparent"
       color-on-scroll="400"
     >
       <div class="container">
@@ -144,7 +144,7 @@
             <h1 class="title">
               Now UI Kit React
             </h1>
-            <h3 class="description">Documentation v1.0.0</h3>
+            <h3 class="description">Documentation v1.4.0</h3>
             <br />
             <a
               href="https://demos.creative-tim.com/now-ui-kit-react/#/documentation/introduction?ref=nukr-static-docs"
@@ -156,7 +156,7 @@ <h3 class="description">Documentation v1.0.0</h3>
       </div>
     </div>
     <footer class="footer">
-      <div class=" container-fluid ">
+      <div class="container-fluid">
         <nav>
           <ul>
             <li>
@@ -190,10 +190,9 @@ <h3 class="description">Documentation v1.0.0</h3>
           <script>
             document
               .getElementById("copyright")
-              .appendChild(
-                document.createTextNode(new Date().getFullYear())
-              );</script
-          >, Designed by
+              .appendChild(document.createTextNode(new Date().getFullYear()));
+          </script>
+          , Designed by
           <a href="https://www.invisionapp.com" target="_blank">Invision</a>.
           Coded by
           <a href="https://www.creative-tim.com" target="_blank">Creative Tim</a

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Creative Tim
+Copyright (c) 2020 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,4 +1,4 @@
-# [Now UI Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/now-ui-kit-react/#/index?ref=nukr-github-readme) ![version](https://img.shields.io/badge/version-1.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-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)
+# [Now UI Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/now-ui-kit-react/#/index?ref=nukr-github-readme) ![version](https://img.shields.io/badge/version-1.4.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/now-ui-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)
 
 ![Now UI Kit React](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/now-ui-kit-react/opt_nuk_react_thumbnail.jpg)
 
@@ -172,7 +172,7 @@ We use GitHub Issues as the official bug tracker for the Now UI Kit React. Here
 
 ## Licensing
 
-- Copyright 2019 Creative Tim (https://www.creative-tim.com/?ref=nukr-github-readme)
+- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=nukr-github-readme)
 
 [CHANGELOG]: ./CHANGELOG.md
 [LICENSE]: ./LICENSE.md

gulpfile.js

@@ -0,0 +1,97 @@
+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(`/*!
+
+=========================================================
+* Now UI Kit React - v1.4.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/now-ui-kit-react
+* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+
+* 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 js
+  gulp
+    .src("build/static/js/runtime*.js", { base: "./" })
+    .pipe(
+      gap.prependText(`/*!
+
+  =========================================================
+  * Now UI Kit React - v1.4.0
+  =========================================================
+
+  * Product Page: https://www.creative-tim.com/product/now-ui-kit-react
+  * Copyright 2020 Creative Tim (http://www.creative-tim.com)
+
+  * 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(`<!--
+
+=========================================================
+* Now UI Kit React - v1.4.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/now-ui-kit-react
+* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+
+* 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(`/*!
+
+=========================================================
+* Now UI Kit React - v1.4.0
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/now-ui-kit-react
+* Copyright 2020 Creative Tim (http://www.creative-tim.com)
+
+* 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;
+});

jsconfig.json

@@ -2,7 +2,8 @@
   "compilerOptions": {
     "baseUrl": "src",
     "paths": {
-      "*": ["src/*"]
+      "*": ["src/*"],
+      "assets": ["src/assets"]
     }
   }
 }

package.json

@@ -1,23 +1,25 @@
 {
   "name": "now-ui-kit-react",
-  "version": "1.0.0",
+  "version": "1.4.0",
   "private": true,
   "dependencies": {
-    "moment": "2.24.0",
-    "node-sass": "4.12.0",
-    "nouislider": "14.0.2",
-    "react": "16.8.6",
+    "gulp": "4.0.2",
+    "gulp-append-prepend": "1.0.8",
+    "moment": "2.26.0",
+    "node-sass": "4.14.1",
+    "nouislider": "14.5.0",
+    "react": "16.13.1",
     "react-bootstrap-switch": "15.5.3",
     "react-datetime": "2.16.3",
-    "react-dom": "16.8.6",
-    "react-router": "5.0.1",
-    "react-router-dom": "5.0.1",
-    "react-scripts": "3.0.1",
-    "reactstrap": "8.0.1"
+    "react-dom": "16.13.1",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
+    "react-scripts": "3.4.1",
+    "reactstrap": "8.4.1"
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "react-scripts build && gulp licenses",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
@@ -41,6 +43,6 @@
     ]
   },
   "optionalDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.9.5"
   }
 }

public/index.html

@@ -1,11 +1,11 @@
 <!--
 
 =========================================================
-* Now UI Kit React - v1.0.0
+* Now UI Kit React - v1.4.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-kit-react
-* Copyright 2019 Creative Tim (http://www.creative-tim.com)
+* Copyright 2020 Creative Tim (http://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/now-ui-kit-react/blob/master/LICENSE.md)
 
 * Designed by www.invisionapp.com Coded by www.creative-tim.com

src/assets/css/now-ui-kit.css

@@ -1,11 +1,11 @@
 /*!
 
  =========================================================
- * Now UI Kit React - v1.0.0 based on Now UI Kit - v1.3.0
+ * Now UI Kit React - v1.4.0 based on Now UI Kit - v1.3.0
  =========================================================
 
  * Product Page: https://www.creative-tim.com/product/now-ui-kit-react
- * Copyright 2019 Creative Tim (http://www.creative-tim.com)
+ * Copyright 2020 Creative Tim (http://www.creative-tim.com)
  * Licensed under MIT (https://github.com/creativetimofficial/now-ui-kit-react/blob/master/LICENSE.md)
 
  * Designed by www.invisionapp.com Coded by www.creative-tim.com