Skip to content

Commit

Permalink
Merge pull request #26 from creativetimofficial/dev-main
Browse files Browse the repository at this point in the history 
Feature: v1.2.0
  • Loading branch information
@einazare
einazare authored Dec 11, 2020
2 parents 0aa4b73 + 515d8ed commit c37f385
Show file tree
Hide file tree
Showing 115 changed files with 6,031 additions and 11,817 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/node_modules
package-lock.json
/build
.vscode
.eslintcache
45 changes: 45 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
## [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
+ [email protected] (for importing `Bootstrap` from `node_modules`)
+ [email protected] (instead of using downloaded zip of `Bootstrap`, we'll use it from `node_modules`)
+ [email protected] (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
node-sass 4.13.1 → 4.14.1
react 16.13.1 → 17.0.1
react-chartjs-2 2.9.0 → 2.11.1
react-dom 16.13.1 → 17.0.1
react-notification-alert 0.0.12 → 0.0.13
react-router-dom 5.1.2 → 5.2.0
react-scripts 3.4.1 → 4.0.1
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 [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.
```
Happy Hacking!

## [1.1.0] 2020-03-13
### Bug fixing
- Github issues:
Expand Down
260 changes: 156 additions & 104 deletions Documentation/documentation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
=========================================================
* Black Dashboard React v1.1.0
* Black Dashboard React v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-react
Expand All @@ -19,117 +19,169 @@
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<link
rel="apple-touch-icon"
sizes="76x76"
href="../public/apple-icon.png"
/>
<link rel="icon" type="image/png" href="../public/favicon.png" />
<title>
Components Documentation - Black Dashboard React by Creative Tim
</title>
<!-- Fonts and icons -->
<link
href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800"
rel="stylesheet"
/>
<link
href="https://use.fontawesome.com/releases/v5.0.6/css/all.css"
rel="stylesheet"
/>
<!-- Nucleo Icons -->
<link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
<!-- CSS Files -->
<link
href="../src/assets/css/black-dashboard-react.css?v=1.2.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>

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="apple-touch-icon" sizes="76x76" href="../public/apple-icon.png">
<link rel="icon" type="image/png" href="../public/favicon.png">
<title>
Components Documentation - Black Dashboard React by Creative Tim
</title>
<!-- Fonts and icons -->
<link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet" />
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
<!-- Nucleo Icons -->
<link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
<!-- CSS Files -->
<link href="../src/assets/css/black-dashboard-react.css?v=1.1.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 navbar-absolute navbar-transparent">
<div class="container">
<div class="navbar-wrapper">
<div class="navbar-toggle d-inline">
<button type="button" class="navbar-toggler">
<span class="navbar-toggler-bar bar1"></span>
<span class="navbar-toggler-bar bar2"></span>
<span class="navbar-toggler-bar bar3"></span>
</button>
<body class="offline-doc">
<!-- Navbar -->
<nav class="navbar navbar-expand-lg navbar-absolute navbar-transparent">
<div class="container">
<div class="navbar-wrapper">
<div class="navbar-toggle d-inline">
<button type="button" class="navbar-toggler">
<span class="navbar-toggler-bar bar1"></span>
<span class="navbar-toggler-bar bar2"></span>
<span class="navbar-toggler-bar bar3"></span>
</button>
</div>
<a class="navbar-brand" href="javascript:void(0)"
>Black Dashboard React</a
>
</div>
<button
class="navbar-toggler"
type="button"
data-toggle="collapse"
data-target="#navigation"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-bar navbar-kebab"></span>
<span class="navbar-toggler-bar navbar-kebab"></span>
<span class="navbar-toggler-bar navbar-kebab"></span>
</button>
<div class="collapse navbar-collapse" id="navigation">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a
class="nav-link"
href="https://github.com/creativetimofficial/black-dashboard-react/issues"
target="_blank"
>
Have an issue?
</a>
</li>
</ul>
</div>
<a class="navbar-brand" href="javascript:void(0)">Black Dashboard React</a>
</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-bar navbar-kebab"></span>
<span class="navbar-toggler-bar navbar-kebab"></span>
<span class="navbar-toggler-bar navbar-kebab"></span>
</button>
<div class="collapse navbar-collapse" id="navigation">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="https://github.com/creativetimofficial/black-dashboard-react/issues" target="_blank">
Have an issue?
</a>
</li>
</ul>
</div>
</div>
</nav>
<div class="modal modal-search fade" id="searchModal" tabindex="-1" role="dialog" aria-labelledby="searchModal" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<input type="text" class="form-control" id="inlineFormInputGroup" placeholder="SEARCH">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<i class="tim-icons icon-simple-remove"></i>
</button>
</nav>
<div
class="modal modal-search fade"
id="searchModal"
tabindex="-1"
role="dialog"
aria-labelledby="searchModal"
aria-hidden="true"
>
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<input
type="text"
class="form-control"
id="inlineFormInputGroup"
placeholder="SEARCH"
/>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<i class="tim-icons icon-simple-remove"></i>
</button>
</div>
</div>
</div>
</div>
</div>
<!-- End Navbar -->
<div class="page-header clear-filter">
<div class="page-header-image" 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>
<h3 class="description">Documentation v1.1.0</h3>
<br/>
<a href="https://demos.creative-tim.com/black-dashboard-react/#/documentation/tutorial" class="btn btn-primary btn-round btn-lg">View documentation</a>
<!-- End Navbar -->
<div class="page-header clear-filter">
<div
class="page-header-image"
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>
<h3 class="description">Documentation v1.2.0</h3>
<br />
<a
href="https://demos.creative-tim.com/black-dashboard-react/#/documentation/tutorial"
class="btn btn-primary btn-round btn-lg"
>View documentation</a
>
</div>
</div>
</div>
</div>
</div>
<footer class="footer">
<div class="container">
<ul class="nav">
<li class="nav-item">
<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>
</li>
<li class="nav-item">
<a href="javascript:void(0)" class="nav-link">
Blog
</a>
</li>
</ul>
<div class="copyright">
©
<script>
document.write(new Date().getFullYear())
</script> made with <i class="tim-icons icon-heart-2"></i> by
<a href="javascript:void(0)" target="_blank">Creative Tim</a> for a better web.
<footer class="footer">
<div class="container">
<ul class="nav">
<li class="nav-item">
<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>
</li>
<li class="nav-item">
<a href="javascript:void(0)" class="nav-link">
Blog
</a>
</li>
</ul>
<div class="copyright">
©
<script>
document.write(new Date().getFullYear());
</script>
made with <i class="tim-icons icon-heart-2"></i> by
<a href="javascript:void(0)" target="_blank">Creative Tim</a> for a
better web.
</div>
</div>
</div>
</footer>
<!-- Core JS Files -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>

</body>

</footer>
<!-- Core JS Files -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@



![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/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.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)

![Product Gif](./github-assets/black-dashboard-react.gif)

Expand Down Expand Up @@ -165,7 +165,7 @@ If you have questions or need help integrating the product please [contact us](h

## Licensing

- Copyright 2018 Creative Tim (https://www.creative-tim.com)
- Copyright 2020 Creative Tim (https://www.creative-tim.com)
- Licensed under MIT (https://github.com/creativetimofficial/black-dashboard-react/blob/master/LICENSE.md)

## Useful Links
Expand Down
8 changes: 4 additions & 4 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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(`/*!
=========================================================
* Black Dashboard React - v1.1.0
* Black Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-react
Expand All @@ -33,7 +33,7 @@ gulp.task("licenses", async function() {
gap.prependText(`<!--
=========================================================
* Black Dashboard React - v1.1.0
* Black Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-react
Expand All @@ -57,7 +57,7 @@ gulp.task("licenses", async function() {
gap.prependText(`/*!
=========================================================
* Black Dashboard React - v1.1.0
* Black Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-react
Expand Down
Loading

0 comments on commit c37f385

Please sign in to comment.