Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: update dependencies for v1.1.0 #14

Merged
merged 27 commits into from
Mar 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7efa445
docs: add issues to be closed by this commit
einazare Mar 6, 2020
ed526a5
docs: add updated dependencies
einazare Mar 6, 2020
364409e
feature: update packages and add new scripts
einazare Mar 6, 2020
00667d0
feature: replace .env with jsconfig.json file
einazare Mar 6, 2020
be226d8
feature: add upgrade to pro button
einazare Mar 6, 2020
707fd7a
fix: add optional dependencies to stop terminal warnings
einazare Mar 6, 2020
9617b09
docs: add changes
einazare Mar 6, 2020
1374497
fix: fix browser log warnings
einazare Mar 6, 2020
75c62fb
docs: add changes
einazare Mar 6, 2020
c8a852f
fix: fix #8
einazare Mar 6, 2020
6d7540b
fix: fix #7
einazare Mar 6, 2020
77b0cf7
fix: fix #7
einazare Mar 6, 2020
094e9c5
fix: fix #7
einazare Mar 6, 2020
6316868
refactor: change jsx to js
einazare Mar 6, 2020
9c775f5
refactor: change jsx to js
einazare Mar 6, 2020
04cc433
feature: add gulpfile for CT copyrights
einazare Mar 6, 2020
aee11ee
docs: change 2019 to 2020
einazare Mar 6, 2020
b26aff4
docs: change v1.0.0 to v1.1.0
einazare Mar 6, 2020
d45938b
feature: add gulp packages for ct copyrights
einazare Mar 6, 2020
f9f3d17
feature: add script for licenses
einazare Mar 6, 2020
a4df97b
docs: add changes
einazare Mar 6, 2020
d1ee47a
feature: compile scss
einazare Mar 6, 2020
71f4a8f
feature: map scss
einazare Mar 6, 2020
32c85e2
feature: min scss
einazare Mar 6, 2020
e37cfa6
docs: change update release date
einazare Mar 13, 2020
7e68532
docs: change homepage prop
einazare Mar 13, 2020
8f9ea20
Merge pull request #13 from creativetimofficial/feature/update-to-v1.1.0
einazare Mar 13, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env

This file was deleted.

47 changes: 47 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
## [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:
+ [email protected]
+ @types/[email protected]
+ @types/[email protected]
+ [email protected]
- For Creative Tim copyrights
+ [email protected]
+ [email protected]
### Updated dependencies
```
@types/react 16.4.16 → 16.9.23
chart.js ^2.7.2 → 2.9.3
history 4.7.2 → 4.10.1
node-sass 4.9.3 → 4.13.1
perfect-scrollbar 1.4.0 → 1.5.0
prop-types ^15.6.2 → 15.7.2
react 16.5.2 → 16.13.0
react-chartjs-2 ^2.7.4 → 2.9.0
react-dom 16.5.2 → 16.13.0
react-notification-alert 0.0.8 → 0.0.12
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 [email protected]: request has been deprecated, see https://github.com/request/request/issues/3142
npm WARN deprecated [email protected]: 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 [email protected]: Popper changed home, find its new releases at @popperjs/core
```
**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
Expand Down
8 changes: 4 additions & 4 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!

=========================================================
* Black Dashboard React v1.0.0
* Black Dashboard React v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/black-dashboard-react
* Copyright 2019 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)

* Coded by Creative Tim
Expand Down Expand Up @@ -34,7 +34,7 @@
<!-- 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.0.0" rel="stylesheet" />
<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>
Expand Down Expand Up @@ -90,7 +90,7 @@
<h1 class="title">
Black Dashboard React
</h1>
<h3 class="description">Documentation v1.0.0</h3>
<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>
</div>
Expand Down
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@



![version](https://img.shields.io/badge/version-1.0.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.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)

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

Expand Down Expand Up @@ -111,30 +111,30 @@ black-dashboard-react
│   └── black-dashboard.scss
├── components
│   ├── FixedPlugin
│   │   └── FixedPlugin.jsx
│   │   └── FixedPlugin.js
│   ├── Footer
│   │   └── Footer.jsx
│   │   └── Footer.js
│   ├── Navbars
│   │   ├── AdminNavbar.jsx
│   │   └── RTLNavbar.jsx
│   │   ├── AdminNavbar.js
│   │   └── RTLNavbar.js
│   └── Sidebar
│   └── Sidebar.jsx
│   └── Sidebar.js
├── layouts
│   ├── Admin
│   │   └── Admin.jsx
│   │   └── Admin.js
│   └── RTL
│   └── RTL.jsx
│   └── RTL.js
├── variables
│   └── charts.jsx
│   └── charts.js
└── views
├── Dashboard.jsx
├── Icons.jsx
├── Map.jsx
├── Notifications.jsx
├── Rtl.jsx
├── TableList.jsx
├── Typography.jsx
└── UserProfile.jsx
├── Dashboard.js
├── Icons.js
├── Map.js
├── Notifications.js
├── Rtl.js
├── TableList.js
├── Typography.js
└── UserProfile.js
```

## Browser Support
Expand Down
77 changes: 77 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
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(`/*!

=========================================================
* Black Dashboard React - v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/black-dashboard-react
* Copyright 2020 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

=========================================================

* 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(`<!--

=========================================================
* Black Dashboard React - v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/black-dashboard-react
* Copyright 2020 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

=========================================================

* 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(`/*!

=========================================================
* Black Dashboard React - v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/black-dashboard-react
* Copyright 2020 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

=========================================================

* 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;
});
8 changes: 8 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"compilerOptions": {
"baseUrl": "src",
"paths": {
"*": ["src/*"]
}
}
}
49 changes: 30 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
{
"name": "black-dashboard-react",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"homepage": "https://creativetimofficial.github.io/black-dashboard-react/#/dashboard",
"homepage": "https://demos.creative-tim.com/black-dashboard-react/#/admin/dashboard",
"dependencies": {
"@types/react": "16.4.16",
"bootstrap": "4.1.3",
"chart.js": "^2.7.2",
"@types/react": "16.9.23",
"chart.js": "2.9.3",
"classnames": "2.2.6",
"history": "4.7.2",
"node-sass": "4.9.3",
"perfect-scrollbar": "1.4.0",
"prop-types": "^15.6.2",
"react": "16.5.2",
"react-chartjs-2": "^2.7.4",
"react-dom": "16.5.2",
"history": "4.10.1",
"node-sass": "4.13.1",
"perfect-scrollbar": "1.5.0",
"prop-types": "15.7.2",
"react": "16.13.0",
"react-chartjs-2": "2.9.0",
"react-dom": "16.13.0",
"react-google-maps": "9.4.5",
"react-notification-alert": "0.0.8",
"react-router-dom": "4.3.1",
"react-scripts": "2.0.4",
"reactstrap": "6.5.0"
"react-notification-alert": "0.0.12",
"react-router-dom": "5.1.2",
"react-scripts": "3.4.0",
"reactstrap": "8.4.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build": "react-scripts build && gulp licenses",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
"compile-scss": "node-sass src/assets/scss/black-dashboard-react.scss src/assets/css/black-dashboard-react.css"
"compile-scss": "node-sass src/assets/scss/black-dashboard-react.scss src/assets/css/black-dashboard-react.css",
"minify-sass": "node-sass src/assets/scss/black-dashboard-react.scss src/assets/css/black-dashboard-react.min.css --output-style compressed",
"map-sass": "node-sass src/assets/scss/black-dashboard-react.scss src/assets/css/black-dashboard-react.css --source-map true"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -37,5 +38,15 @@
"not dead",
"not ie <= 11",
"not op_mini all"
]
],
"optionalDependencies": {
"@types/googlemaps": "3.39.3",
"@types/markerclustererplus": "2.1.33",
"eslint-plugin-flowtype": "3.13.0",
"typescript": "3.8.3"
},
"devDependencies": {
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8"
}
}
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!

=========================================================
* Black Dashboard React v1.0.0
* Black Dashboard React v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/black-dashboard-react
* Copyright 2019 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)

* Coded by Creative Tim
Expand Down
9 changes: 7 additions & 2 deletions src/assets/css/black-dashboard-react.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading