Skip to content

Commit

Permalink
Merge pull request #4 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 7540eb2 + c68dc64 commit 4ae98f6
Show file tree
Hide file tree
Showing 41 changed files with 491 additions and 352 deletions.
54 changes: 53 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,58 @@
# Change Log

## [1.0.0] 2018-06-26
## [1.2.0] 2020-06-12
### Bug fixing
- https://github.com/creativetimofficial/paper-kit-react/issues/2 (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
- 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-dashboard-react/issues/15
- https://github.com/creativetimofficial/paper-dashboard-react/issues/8
- 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
- `src/assets/scss/paper-kit/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
- `src/assets/scss/paper-kit/_nucleo-icons.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
- `src/assets/scss/react/plugins/_plugin-nouislider.scss` (due to new `noUiSlider` API)
### Deleted components
### Added components
### Deleted dependencies
### Added dependencies
+ [email protected] (for Creative Tim copyrights)
+ [email protected] (for Creative Tim copyrights)
### Updated dependencies
```
moment 2.24.0 → 2.26.0
node-sass 4.12.0 → 4.14.1
nouislider 13.1.5 → 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.0 → 8.4.1
typescript 3.5.2 → 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.0.0] 2019-06-26
### Original Release
- Added Reactstrap as base framework
- Added design from Paper Kit 2 by Creative Tim
33 changes: 21 additions & 12 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
/*!
=========================================================
* Paper Kit React - v1.0.0
* Paper Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-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-kit-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -48,15 +48,15 @@
/>
<!-- CSS Files -->
<link href="../src/assets/css/bootstrap.min.css" rel="stylesheet" />
<link href="../src/assets/css/paper-kit.css?v=1.0.0" rel="stylesheet" />
<link href="../src/assets/css/paper-kit.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" />
<link href="../src/assets/demo/demo.css?v=1.2.0" rel="stylesheet" />
</head>

<body class="offline-doc">
<!-- Navbar -->
<nav
class="navbar navbar-expand-lg fixed-top navbar-transparent "
class="navbar navbar-expand-lg fixed-top navbar-transparent"
color-on-scroll="300"
>
<div class="container">
Expand Down Expand Up @@ -105,7 +105,7 @@
<h1 class="title">
Paper Kit React
</h1>
<h3 class="description">Documentation v1.0.0</h3>
<h3 class="description">Documentation v1.2.0</h3>
<br />
<a
href="https://demos.creative-tim.com/paper-kit-react/#/documentation/introduction?ref=pkr-static-docs"
Expand All @@ -116,21 +116,29 @@ <h3 class="description">Documentation v1.0.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?ref=pkr-static-docs" target="_blank"
<a
href="https://www.creative-tim.com?ref=pkr-static-docs"
target="_blank"
>Creative Tim</a
>
</li>
<li>
<a href="http://blog.creative-tim.com/?ref=pkr-static-docs" target="_blank">Blog</a>
<a
href="http://blog.creative-tim.com/?ref=pkr-static-docs"
target="_blank"
>Blog</a
>
</li>
<li>
<a href="https://www.creative-tim.com/license?ref=pkr-static-docs" target="_blank"
<a
href="https://www.creative-tim.com/license?ref=pkr-static-docs"
target="_blank"
>Licenses</a
>
</li>
Expand All @@ -140,8 +148,9 @@ <h3 class="description">Documentation v1.0.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
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) 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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Paper Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/paper-kit-react/#/index?ref=pkr-github-readme) ![version](https://img.shields.io/badge/version-1.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-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)
# [Paper Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/paper-kit-react/#/index?ref=pkr-github-readme) ![version](https://img.shields.io/badge/version-1.2.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-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)

![Paper Kit React](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/paper-kit-react/opt_pk_react_thumbnail.jpg)

Expand Down Expand Up @@ -175,7 +175,7 @@ We use GitHub Issues as the official bug tracker for the Paper Kit 2. Here are s

## Licensing

- Copyright 2019 Creative Tim (https://www.creative-tim.com/?ref=pkr-github-readme)
- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=pkr-github-readme)

[CHANGELOG]: ./CHANGELOG.md
[LICENSE]: ./LICENSE.md
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 Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-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(`<!--
=========================================================
* Paper Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-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(`/*!
=========================================================
* Paper Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-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;
});
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"]
}
}
}
28 changes: 16 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "paper-kit-react",
"version": "1.0.0",
"version": "1.2.0",
"private": true,
"dependencies": {
"classnames": "2.2.6",
"moment": "2.24.0",
"node-sass": "4.12.0",
"nouislider": "13.1.5",
"react": "16.8.6",
"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.0"
"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",
Expand All @@ -42,6 +42,10 @@
]
},
"optionalDependencies": {
"typescript": "3.5.2"
"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,12 +2,12 @@
/*!
=========================================================
* Paper Kit React - v1.0.0
* Paper Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-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-kit-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
8 changes: 4 additions & 4 deletions src/assets/css/paper-kit.css

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

2 changes: 1 addition & 1 deletion src/assets/css/paper-kit.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/assets/css/paper-kit.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/assets/demo/demo.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
=========================================================
* Paper Kit React - v1.0.0
* Paper Kit React - v1.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-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-kit-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/paper-kit.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Paper Kit React - v1.0.0 based on Paper Kit - v2.2.0
* Paper Kit React - v1.2.0 based on Paper Kit - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Designed by www.invisionapp.com Coded by www.creative-tim.com
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/paper-kit/_nucleo-icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ License - nucleoapp.com/license/
-------------------------------- */
@font-face {
font-family: 'nucleo-icons';
src: url('../fonts/nucleo-icons.eot');
src: url('../fonts/nucleo-icons.eot') format('embedded-opentype'), url('../fonts/nucleo-icons.woff2') format('woff2'), url('../fonts/nucleo-icons.woff') format('woff'), url('../fonts/nucleo-icons.ttf') format('truetype');
src: url('~assets/fonts/nucleo-icons.eot');
src: url('~assets/fonts/nucleo-icons.eot') format('embedded-opentype'), url('~assets/fonts/nucleo-icons.woff2') format('woff2'), url('~assets/fonts/nucleo-icons.woff') format('woff'), url('~assets/fonts/nucleo-icons.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/paper-kit/_nucleo-outline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ License - nucleoapp.com/license/
-------------------------------- */
@font-face {
font-family: 'nucleo-icons';
src: url('../fonts/nucleo-icons.eot');
src: url('../fonts/nucleo-icons.eot') format('embedded-opentype'), url('../fonts/nucleo-icons.woff2') format('woff2'), url('../fonts/nucleo-icons.woff') format('woff'), url('../fonts/nucleo-icons.ttf') format('truetype'), url('../fonts/nucleo-icons.svg') format('svg');
src: url('~assets/fonts/nucleo-icons.eot');
src: url('~assets/fonts/nucleo-icons.eot') format('embedded-opentype'), url('~assets/fonts/nucleo-icons.woff2') format('woff2'), url('~assets/fonts/nucleo-icons.woff') format('woff'), url('~assets/fonts/nucleo-icons.ttf') format('truetype'), url('~assets/fonts/nucleo-icons.svg') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
Loading

0 comments on commit 4ae98f6

Please sign in to comment.