Skip to content

Commit

Permalink
Merge pull request #16 from creativetimofficial/feature/update-to-v1.2.0
Browse files Browse the repository at this point in the history
Feature: update to v1.2.0
  • Loading branch information
einazare authored Jun 12, 2020
2 parents 9cc6724 + ebbc442 commit 2d0e480
Show file tree
Hide file tree
Showing 35 changed files with 567 additions and 347 deletions.
65 changes: 65 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,69 @@
# Change Log

## [1.2.0] 2020-06-12
### Bug fixing
- https://github.com/creativetimofficial/paper-dashboard-react/issues/15
- https://github.com/creativetimofficial/paper-dashboard-react/issues/13
- https://github.com/creativetimofficial/paper-dashboard-react/issues/12
- https://github.com/creativetimofficial/paper-dashboard-react/issues/9 (could not reproduce the issue, so we've left the perfect-scrollbar initialization as is, if there are layout problems, please delete the bits of code specified here: https://github.com/creativetimofficial/paper-dashboard-react/issues/9#issuecomment-593385860)
- https://github.com/creativetimofficial/paper-dashboard-react/issues/8
- Other Paper React products issues solved here as well
- https://github.com/creativetimofficial/ct-paper-kit-pro-react/issues/2
- https://github.com/creativetimofficial/paper-kit-react/issues/2
- https://github.com/creativetimofficial/ct-paper-dashboard-pro-react/issues/8
- https://github.com/creativetimofficial/ct-paper-dashboard-pro-react/issues/6 - solution to this is to change the usage of the ModalHeader from Reactstrap to simple Bootstrap ones:
So, instead of:
```
<ModalHeader className="justify-content-center" toggle={this.toggleModalDemo}>
Modal Title
</ModalHeader>
```
You should use
```
<div className="modal-header justify-content-center">
<button type="button" className="close" data-dismiss="modal" aria-label="Close" onClick={this.toggleModalDemo}>
<span aria-hidden="true">×</span>
</button>
<h5 className="modal-title">Modal Title</h5>
</div>
```
### Major style changes
- - There will be additional changes in each `.js` and `.html` files since we've used `prettier` to prettify them
- `src/assets/scss/paper-dashboard/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
- `src/assets/scss/paper-dashboard/react/custom/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
- `src/assets/scss/paper-dashboard/react/custom/_responsive.scss`
- `src/assets/scss/paper-dashboard/react/custom/_inputs.scss`
### Deleted components
### Added components
### Deleted dependencies
### Added dependencies
+ [email protected] (for Creative Tim copyrights)
+ [email protected] (for Creative Tim copyrights)
### Updated dependencies
```
bootstrap 4.3.1 → 4.5.0
chart.js 2.8.0 → 2.9.3
history 4.9.0 → 4.10.1
node-sass 4.12.0 → 4.14.1
perfect-scrollbar 1.4.0 → 1.5.0
react 16.8.6 → 16.13.1
react-chartjs-2 2.7.6 → 2.9.0
react-dom 16.8.6 → 16.13.1
react-router 5.0.0 → 5.2.0
react-router-dom 5.0.0 → 5.2.0
react-scripts 3.0.1 → 3.4.1
reactstrap 8.0.0 → 8.4.1
@types/googlemaps 3.36.2 → 3.39.6
@types/react 16.8.19 → 16.9.35
ajv 6.10.0 → 6.12.2
jquery 3.4.1 → 3.5.1
typescript 3.4.5 → 3.9.5
```
### Warning
_All the following products: Paper Kit React, Paper Dashboard React, Paper Kit PRO React and Paper Dashboard PRO React have been updated together, and thus, we've added to all of them the same version of 1.2.0 - we may have skipped some versions for some of the above products, we've done so, since we want all Paper & 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.1.0] 2019-05-31
### Major changes
- Almost all of the styles inside `src/scss` have been changed
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
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
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/paper-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-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/paper-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-dashboard-react.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)

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

Expand Down Expand Up @@ -159,7 +159,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/paper-dashboard-react/blob/master/LICENSE.md)

## Useful Links
Expand Down
29 changes: 19 additions & 10 deletions docs/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Paper Dashboard React - v1.1.0
* Paper Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-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/paper-dashboard-react/blob/master/LICENSE.md)
Expand Down Expand Up @@ -51,7 +51,7 @@
rel="stylesheet"
/>
<link
href="../src/assets/css/paper-dashboard.css?v=1.1.0"
href="../src/assets/css/paper-dashboard.css?v=1.2.0"
rel="stylesheet"
/>
<!-- CSS Just for demo purpose, don't include it in your project -->
Expand Down Expand Up @@ -115,7 +115,7 @@
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h1 class="title">Paper Dashboard 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/paper-dashboard-react/#/documentation/tutorial"
Expand All @@ -126,21 +126,29 @@ <h3 class="description">Documentation v1.1.0</h3>
</div>
</div>
</div>
<footer class="footer footer-black footer-white ">
<footer class="footer footer-black footer-white">
<div class="container">
<div class="row">
<nav class="footer-nav">
<ul>
<li>
<a href="https://www.creative-tim.com" target="_blank"
<a
href="https://www.creative-tim.com?ref=pdr-static-docs"
target="_blank"
>Creative Tim</a
>
</li>
<li>
<a href="http://blog.creative-tim.com/" target="_blank">Blog</a>
<a
href="https://www.creative-tim.com/blog/?ref=pdr-static-docs"
target="_blank"
>Blog</a
>
</li>
<li>
<a href="https://www.creative-tim.com/license" target="_blank"
<a
href="https://www.creative-tim.com/license?ref=pdr-static-docs"
target="_blank"
>Licenses</a
>
</li>
Expand All @@ -150,8 +158,9 @@ <h3 class="description">Documentation v1.1.0</h3>
<span class="copyright">
©
<script>
document.write(new Date().getFullYear());</script
>, made with <i class="fa fa-heart heart"></i> by Creative Tim
document.write(new Date().getFullYear());
</script>
, made with <i class="fa fa-heart heart"></i> by Creative Tim
</span>
</div>
</div>
Expand Down
74 changes: 74 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
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(`/*!
=========================================================
* Paper Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-dashboard-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(`<!--
=========================================================
* Paper Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-dashboard-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(`/*!
=========================================================
* Paper Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-dashboard-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;
});
3 changes: 2 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"compilerOptions": {
"baseUrl": "src",
"paths": {
"*": ["src/*"]
"*": ["src/*"],
"assets": ["src/assets"]
}
}
}
42 changes: 23 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"name": "paper-dashboard-react",
"version": "1.1.0",
"version": "1.2.0",
"private": true,
"homepage": "https://demos.creative-tim.com/paper-dashboard-react/#/dashboard",
"dependencies": {
"bootstrap": "4.3.1",
"chart.js": "2.8.0",
"history": "4.9.0",
"node-sass": "4.12.0",
"perfect-scrollbar": "1.4.0",
"react": "16.8.6",
"react-chartjs-2": "2.7.6",
"react-dom": "16.8.6",
"bootstrap": "4.5.0",
"chart.js": "2.9.3",
"history": "4.10.1",
"node-sass": "4.14.1",
"perfect-scrollbar": "1.5.0",
"react": "16.13.1",
"react-chartjs-2": "2.9.0",
"react-dom": "16.13.1",
"react-google-maps": "9.4.5",
"react-notification-alert": "0.0.12",
"react-router": "5.0.0",
"react-router-dom": "5.0.0",
"react-scripts": "3.0.1",
"reactstrap": "8.0.0"
"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",
Expand All @@ -39,11 +39,15 @@
"not op_mini all"
],
"optionalDependencies": {
"@types/googlemaps": "3.36.2",
"@types/googlemaps": "3.39.6",
"@types/markerclustererplus": "2.1.33",
"@types/react": "16.8.19",
"ajv": "6.10.0",
"jquery": "3.4.1",
"typescript": "3.4.5"
"@types/react": "16.9.35",
"ajv": "6.12.2",
"jquery": "3.5.1",
"typescript": "3.9.5"
},
"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 @@
/*!
=========================================================
* Paper Dashboard React - v1.1.0
* Paper Dashboard React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-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/paper-dashboard-react/blob/master/LICENSE.md)
Expand Down
Loading

0 comments on commit 2d0e480

Please sign in to comment.