Merge pull request #36 from creativetimofficial/dev-master

Dev master

CHANGELOG.md

@@ -1,23 +1,42 @@
+# CHANGELOG
+
+## [1.2.1] 2022-06-29
+
+- Update dependencies
+- Migrate from node-sass to sass
+
 ## [1.2.0] 2020-12-11
+
 ### Bug fixing
+
 - Added hooks support
 - https://github.com/creativetimofficial/black-dashboard-react/issues/19
 - https://github.com/creativetimofficial/black-dashboard-react/issues/17
+
 ### Major style changes
+
 - All Bootstrap imports from `src/assets/scss/black-dashboard-react/bootstrap` have been changed with imports from `node_modules` from `Bootstrap`
+
 ### Deleted components
+
 ### Added components
+
 ### Deleted dependencies
+
 - history (instead of using `history`, we'll be using `BrowserRouter` from `react-router-dom`)
 - @types/googlemaps
 - @types/react
 - @types/markerclustererplus
 - react-google-maps (Instead of it, we're going to use simple plain JS Google maps)
+
 ### Added dependencies
-+ node-sass-package-importer@5.3.2 (for importing `Bootstrap` from `node_modules`)
-+ bootstrap@4.5.3 (instead of using downloaded zip of `Bootstrap`, we'll use it from `node_modules`)
-+ jquery@3.5.1 (to stop `Bootstrap` warning on a clean install)
+
+- node-sass-package-importer@5.3.2 (for importing `Bootstrap` from `node_modules`)
+- bootstrap@4.5.3 (instead of using downloaded zip of `Bootstrap`, we'll use it from `node_modules`)
+- jquery@3.5.1 (to stop `Bootstrap` warning on a clean install)
+
 ### Updated dependencies
+
 ```
 @fortawesome/fontawesome-free    5.13.0   →   5.15.1
 chart.js                          2.9.3   →    2.9.4
@@ -32,39 +51,56 @@ reactstrap                        8.4.1   →    8.7.1
 eslint-plugin-flowtype           3.13.0   →    5.2.0
 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 - they come from the plugins that we are using, and they haven't yet upgraded to the latest React version):_
+
 ```
 npm WARN react-popper@1.3.7 requires a peer of react@0.14.x || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
 npm WARN create-react-context@0.3.0 requires a peer of react@^0.14.0 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
 ```
+
 Happy Hacking!
 
 ## [1.1.0] 2020-03-13
+
 ### Bug fixing
+
 - Github issues:
   - https://github.com/creativetimofficial/black-dashboard-react/issues/8
   - https://github.com/creativetimofficial/black-dashboard-react/issues/7
   - https://github.com/creativetimofficial/black-dashboard-react/issues/6 (not really an issue, but was old and needed to close it)
   - https://github.com/creativetimofficial/black-dashboard-react/issues/4
+
 ### Major style changes
+
 ### Deleted components
+
 ### Added components
+
 ### Deleted dependencies
+
 - bootstrap (styles are already added inside the scss folder)
+
 ### Added dependencies
+
 - To stop consolde warnings on installation:
-  + eslint-plugin-flowtype@3.13.0
-  + @types/markerclustererplus@2.1.33
-  + @types/googlemaps@3.39.3
-  + typescript@3.8.3
+  - eslint-plugin-flowtype@3.13.0
+  - @types/markerclustererplus@2.1.33
+  - @types/googlemaps@3.39.3
+  - typescript@3.8.3
 - For Creative Tim copyrights
-  + gulp@4.0.2
-  + gulp-append-prepend@1.0.8
+  - gulp@4.0.2
+  - gulp-append-prepend@1.0.8
+
 ### Updated dependencies
+
 ```
 @types/react               16.4.16   →   16.9.23
 chart.js                    ^2.7.2   →     2.9.3
@@ -80,17 +116,22 @@ react-router-dom             4.3.1   →     5.1.2
 react-scripts                2.0.4   →     3.4.0
 reactstrap                   6.5.0   →     8.4.1
 ```
+
 ### Warning
+
 **There are some errors that come from the react-google-maps components, since they are using old React v16 syntax, this, at the moment does not affect the UI or the functionality of the product. If the issue will perssit in React v17, we will drop the usage of these components and replace them with other maps components. The following warnings on installation 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 request@2.88.2: request has been deprecated, see https://github.com/request/request/issues/3142
 npm WARN deprecated core-js@2.6.11: 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 popper.js@1.16.1: Popper changed home, find its new releases at @popperjs/core
 ```
-**Also, the above, are only present in development, and not in production.**
 
+**Also, the above, are only present in development, and not in production.**
 
 ## [1.0.0] 2018-11-29
+
 ### Original Release
+
 - Added Reactstrap as base framework
 - Added design from PRODUCT NAME by Creative Tim

Documentation/documentation.html

@@ -2,11 +2,11 @@
 /*!
 
 =========================================================
-* Black Dashboard React v1.2.0
+* Black Dashboard React v1.2.1
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/black-dashboard-react
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2022 Creative Tim (https://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/black-dashboard-react/blob/master/LICENSE.md)
 
 * Coded by Creative Tim
@@ -130,14 +130,12 @@
     <div class="page-header clear-filter">
       <div
         class="page-header-image"
-        style="background-image: url('../src/assets/img/img_3115.jpg');"
+        style="background-image: url('../src/assets/img/img_3115.jpg')"
       ></div>
       <div class="content-center">
         <div class="col-md-8 ml-auto mr-auto">
           <div class="brand">
-            <h1 class="title">
-              Black Dashboard React
-            </h1>
+            <h1 class="title">Black Dashboard React</h1>
             <h3 class="description">Documentation v1.2.0</h3>
             <br />
             <a
@@ -153,19 +151,13 @@ <h3 class="description">Documentation v1.2.0</h3>
       <div class="container">
         <ul class="nav">
           <li class="nav-item">
-            <a href="javascript:void(0)" class="nav-link">
-              Creative Tim
-            </a>
+            <a href="javascript:void(0)" class="nav-link"> Creative Tim </a>
           </li>
           <li class="nav-item">
-            <a href="javascript:void(0)" class="nav-link">
-              About Us
-            </a>
+            <a href="javascript:void(0)" class="nav-link"> About Us </a>
           </li>
           <li class="nav-item">
-            <a href="javascript:void(0)" class="nav-link">
-              Blog
-            </a>
+            <a href="javascript:void(0)" class="nav-link"> Blog </a>
           </li>
         </ul>
         <div class="copyright">

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Creative Tim
+Copyright (c) 2022 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,19 +1,17 @@
 # [Black Dashboard React](https://demos.creative-tim.com/black-dashboard-react/#/dashboard) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fblack-dashboard-react%2F%23%2Fadmin%2Fdashboard&text=Black%20Dashboard%20React%20by%20Creative%20Tim%20%7C%20Free%20React%20Admin%20Template&original_referer=https%3A%2F%2Fdemos.creative-tim.com%2Fblack-dashboard-react%2F&via=creativetim&hashtags=react%2Ccreativetim%2Cdark%2Cdashboard%2Cbootstrap%2Creactstrap%2Creactjs)
 
-
-
-![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/black-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-dashboard-react.svg?maxAge=2592000)]()  [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
+![version](https://img.shields.io/badge/version-1.2.1-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/black-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-dashboard-react.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
 
 ![Product Gif](./github-assets/black-dashboard-react.gif)
 
-
 Black Dashboard React is a beautiful [Bootstrap 4](http://getbootstrap.com/), [Reacstrap](https://reactstrap.github.io/) and [React](https://reactjs.org/) ([create-react-app](https://github.com/facebook/create-react-app)) Admin Dashboard with a huge number of components built to fit together and look amazing. If you are looking for a tool to manage and visualize data about your business, this dashboard is the thing for you. It combines colors that are easy on the eye, spacious cards, beautiful typography, and graphics.
 Black Dashboard React comes packed with all plugins that you might need inside a project and documentation on how to get started. It is light and easy to use, and also very powerful.
 
 Black Dashboard React features over 16 individual components, giving you the freedom of choosing and combining. This means that there are thousands of possible combinations. All components can take variations in color, that you can easily modify using SASS files. You will save a lot of time going from prototyping to full-functional code because all elements are implemented.
 We thought about everything, so this dashboard comes with 2 versions, Dark Mode and Light Mode.
 
 Special thanks go for the owners of these plugins:
+
 - [Perfect Scrollbar](http://utatti.github.io/perfect-scrollbar/) for the nice scrollbars for windows.
 - [React Chartjs](http://jerairrest.github.io/react-chartjs-2/) for the wonderful wrapper for charts.
 - [Chartjs](https://www.chartjs.org/) for the wonderful charts.
@@ -24,38 +22,35 @@ We are very excited to share this dashboard with you and we look forward to hear
 
 ## Table of Contents
 
-* [Versions](#versions)
-* [Demo](#demo)
-* [Quick Start](#quick-start)
-* [Documentation](#documentation)
-* [File Structure](#file-structure)
-* [Browser Support](#browser-support)
-* [Resources](#resources)
-* [Reporting Issues](#reporting-issues)
-* [Technical Support or Questions](#technical-support-or-questions)
-* [Licensing](#licensing)
-* [Useful Links](#useful-links)
-
+- [Versions](#versions)
+- [Demo](#demo)
+- [Quick Start](#quick-start)
+- [Documentation](#documentation)
+- [File Structure](#file-structure)
+- [Browser Support](#browser-support)
+- [Resources](#resources)
+- [Reporting Issues](#reporting-issues)
+- [Technical Support or Questions](#technical-support-or-questions)
+- [Licensing](#licensing)
+- [Useful Links](#useful-links)
 
 ## Versions
 
 [<img src="./github-assets/html.png" width="60" height="60" />](https://www.creative-tim.com/product/black-dashboard)
 [<img src="./github-assets/react.svg" width="60" height="60" />](https://www.creative-tim.com/product/black-dashboard-react)[<img src="./github-assets/vuejs.png" width="60" height="60" />](https://www.creative-tim.com/product/vue-black-dashboard)
 
-
-| HTML | React | Vue |
-| --- | --- | --- |
+| HTML                                                                                                                                                                | React                                                                                                                                                                   | Vue                                                                                                                                                                        |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | [![Black Dashboard HTML](https://s3.amazonaws.com/creativetim_bucket/products/93/thumb/opt_bd_thumbnail.jpg)](https://www.creative-tim.com/product/black-dashboard) | [![Black Dashboard React](https://s3.amazonaws.com/creativetim_bucket/products/136/thumb/opt_bd_react.jpg)](https://www.creative-tim.com/product/black-dashboard-react) | [![Vue Black Dashboard](https://s3.amazonaws.com/creativetim_bucket/products/99/thumb/opt_bd_vue_thumbnail.jpg)](https://www.creative-tim.com/product/vue-black-dashboard) |
 
 ## Demo
 
-| Dashboard | User Profile | Tables | Maps | Notification |
-| --- | --- | --- | --- | --- |
-| [![Start page](./github-assets/dashboard-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/dashboard) | [![User profile page](./github-assets/user-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/user-page) | [![Tables page ](./github-assets/table-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/table-list) | [![Maps Page](./github-assets/maps-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/maps) | [![Notification page](./github-assets/notifications-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/notifications)
+| Dashboard                                                                                                             | User Profile                                                                                                            | Tables                                                                                                               | Maps                                                                                                       | Notification                                                                                                                         |
+| --------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| [![Start page](./github-assets/dashboard-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/dashboard) | [![User profile page](./github-assets/user-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/user-page) | [![Tables page ](./github-assets/table-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/table-list) | [![Maps Page](./github-assets/maps-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/maps) | [![Notification page](./github-assets/notifications-page.png)](https://demos.creative-tim.com/black-dashboard-react/#/notifications) |
 
 [View More](https://demos.creative-tim.com/black-dashboard-react/#/dashboard).
 
-
 ## Quick start
 
 Quick start options:
@@ -64,10 +59,9 @@ Quick start options:
 - [Download from Github](https://github.com/creativetimofficial/black-dashboard-react/archive/master.zip).
 - [Download from Creative Tim](https://www.creative-tim.com/product/black-dashboard-react).
 
-
 ## Documentation
-The documentation for the Black Dashboard React is hosted at our [website](https://demos.creative-tim.com/black-dashboard-react/#/documentation/tutorial).
 
+The documentation for the Black Dashboard React is hosted at our [website](https://demos.creative-tim.com/black-dashboard-react/#/documentation/tutorial).
 
 ## File Structure
 
@@ -143,8 +137,8 @@ At present, we officially aim to support the last two versions of the following
 
 <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/chrome.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/firefox.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/edge.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/safari.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/opera.png" width="64" height="64">
 
-
 ## Resources
+
 - Demo: https://demos.creative-tim.com/black-dashboard-react/#/dashboard
 - Download Page: https://www.creative-tim.com/product/black-dashboard-react
 - Documentation: https://demos.creative-tim.com/black-dashboard-react/#/documentation/tutorial
@@ -153,6 +147,7 @@ At present, we officially aim to support the last two versions of the following
 - Issues: [Github Issues Page](https://github.com/creativetimofficial/black-dashboard-react/issues)
 
 ## Reporting Issues
+
 We use GitHub Issues as the official bug tracker for the Black Dashboard React. Here are some advices for our users that want to report an issue:
 
 1. Make sure that you are using the latest version of the Black Dashboard React. Check the CHANGELOG from your dashboard on our [website](https://www.creative-tim.com/).
@@ -165,7 +160,7 @@ If you have questions or need help integrating the product please [contact us](h
 
 ## Licensing
 
-- Copyright 2020 Creative Tim (https://www.creative-tim.com)
+- Copyright 2022 Creative Tim (https://www.creative-tim.com)
 - Licensed under MIT (https://github.com/creativetimofficial/black-dashboard-react/blob/master/LICENSE.md)
 
 ## Useful Links