Skip to content

Commit 4ae98f6

Browse files
authored
Merge pull request #4 from creativetimofficial/feature/update-to-v1.2.0
Feature: update to v1.2.0
2 parents 7540eb2 + c68dc64 commit 4ae98f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+491
-352
lines changed

CHANGELOG.md

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,58 @@
11
# Change Log
22

3-
## [1.0.0] 2018-06-26
3+
## [1.2.0] 2020-06-12
4+
### Bug fixing
5+
- 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)
6+
- Other Paper React products issues solved here as well
7+
- https://github.com/creativetimofficial/ct-paper-kit-pro-react/issues/2
8+
- https://github.com/creativetimofficial/paper-dashboard-react/issues/15
9+
- https://github.com/creativetimofficial/paper-dashboard-react/issues/8
10+
- https://github.com/creativetimofficial/ct-paper-dashboard-pro-react/issues/8
11+
- 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:
12+
So, instead of:
13+
```
14+
<ModalHeader className="justify-content-center" toggle={this.toggleModalDemo}>
15+
Modal Title
16+
</ModalHeader>
17+
```
18+
You should use
19+
```
20+
<div className="modal-header justify-content-center">
21+
<button type="button" className="close" data-dismiss="modal" aria-label="Close" onClick={this.toggleModalDemo}>
22+
<span aria-hidden="true">×</span>
23+
</button>
24+
<h5 className="modal-title">Modal Title</h5>
25+
</div>
26+
```
27+
### Major style changes
28+
- `src/assets/scss/paper-kit/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
29+
- `src/assets/scss/paper-kit/_nucleo-icons.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
30+
- `src/assets/scss/react/plugins/_plugin-nouislider.scss` (due to new `noUiSlider` API)
31+
### Deleted components
32+
### Added components
33+
### Deleted dependencies
34+
### Added dependencies
35+
+ gulp@4.0.2 (for Creative Tim copyrights)
36+
+ gulp-append-prepend@1.0.8 (for Creative Tim copyrights)
37+
### Updated dependencies
38+
```
39+
moment 2.24.0 → 2.26.0
40+
node-sass 4.12.0 → 4.14.1
41+
nouislider 13.1.5 → 14.5.0
42+
react 16.8.6 → 16.13.1
43+
react-dom 16.8.6 → 16.13.1
44+
react-router 5.0.1 → 5.2.0
45+
react-router-dom 5.0.1 → 5.2.0
46+
react-scripts 3.0.1 → 3.4.1
47+
reactstrap 8.0.0 → 8.4.1
48+
typescript 3.5.2 → 3.9.5
49+
```
50+
### Warning
51+
_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._
52+
_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._
53+
_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._
54+
55+
## [1.0.0] 2019-06-26
456
### Original Release
557
- Added Reactstrap as base framework
658
- Added design from Paper Kit 2 by Creative Tim

Documentation/documentation.html

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/*!
33
44
=========================================================
5-
* Paper Kit React - v1.0.0
5+
* Paper Kit React - v1.2.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/paper-kit-react
99
10-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
10+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1111
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
1212
1313
* Coded by Creative Tim
@@ -48,15 +48,15 @@
4848
/>
4949
<!-- CSS Files -->
5050
<link href="../src/assets/css/bootstrap.min.css" rel="stylesheet" />
51-
<link href="../src/assets/css/paper-kit.css?v=1.0.0" rel="stylesheet" />
51+
<link href="../src/assets/css/paper-kit.css?v=1.2.0" rel="stylesheet" />
5252
<!-- CSS Just for demo purpose, don't include it in your project -->
53-
<link href="../src/assets/demo/demo.css" rel="stylesheet" />
53+
<link href="../src/assets/demo/demo.css?v=1.2.0" rel="stylesheet" />
5454
</head>
5555

5656
<body class="offline-doc">
5757
<!-- Navbar -->
5858
<nav
59-
class="navbar navbar-expand-lg fixed-top navbar-transparent "
59+
class="navbar navbar-expand-lg fixed-top navbar-transparent"
6060
color-on-scroll="300"
6161
>
6262
<div class="container">
@@ -105,7 +105,7 @@
105105
<h1 class="title">
106106
Paper Kit React
107107
</h1>
108-
<h3 class="description">Documentation v1.0.0</h3>
108+
<h3 class="description">Documentation v1.2.0</h3>
109109
<br />
110110
<a
111111
href="https://demos.creative-tim.com/paper-kit-react/#/documentation/introduction?ref=pkr-static-docs"
@@ -116,21 +116,29 @@ <h3 class="description">Documentation v1.0.0</h3>
116116
</div>
117117
</div>
118118
</div>
119-
<footer class="footer footer-black footer-white ">
119+
<footer class="footer footer-black footer-white">
120120
<div class="container">
121121
<div class="row">
122122
<nav class="footer-nav">
123123
<ul>
124124
<li>
125-
<a href="https://www.creative-tim.com?ref=pkr-static-docs" target="_blank"
125+
<a
126+
href="https://www.creative-tim.com?ref=pkr-static-docs"
127+
target="_blank"
126128
>Creative Tim</a
127129
>
128130
</li>
129131
<li>
130-
<a href="http://blog.creative-tim.com/?ref=pkr-static-docs" target="_blank">Blog</a>
132+
<a
133+
href="http://blog.creative-tim.com/?ref=pkr-static-docs"
134+
target="_blank"
135+
>Blog</a
136+
>
131137
</li>
132138
<li>
133-
<a href="https://www.creative-tim.com/license?ref=pkr-static-docs" target="_blank"
139+
<a
140+
href="https://www.creative-tim.com/license?ref=pkr-static-docs"
141+
target="_blank"
134142
>Licenses</a
135143
>
136144
</li>
@@ -140,8 +148,9 @@ <h3 class="description">Documentation v1.0.0</h3>
140148
<span class="copyright">
141149
©
142150
<script>
143-
document.write(new Date().getFullYear());</script
144-
>, made with <i class="fa fa-heart heart"></i> by Creative Tim
151+
document.write(new Date().getFullYear());
152+
</script>
153+
, made with <i class="fa fa-heart heart"></i> by Creative Tim
145154
</span>
146155
</div>
147156
</div>

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Creative Tim
3+
Copyright (c) 2020 Creative Tim
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [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)
1+
# [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)
22

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

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

176176
## Licensing
177177

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

180180
[CHANGELOG]: ./CHANGELOG.md
181181
[LICENSE]: ./LICENSE.md

gulpfile.js

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
const gulp = require("gulp");
2+
const gap = require("gulp-append-prepend");
3+
4+
gulp.task("licenses", async function () {
5+
// this is to add Creative Tim licenses in the production mode for the minified js
6+
gulp
7+
.src("build/static/js/*chunk.js", { base: "./" })
8+
.pipe(
9+
gap.prependText(`/*!
10+
11+
=========================================================
12+
* Paper Kit React - v1.2.0
13+
=========================================================
14+
15+
* Product Page: https://www.creative-tim.com/product/paper-kit-react
16+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
17+
18+
* Coded by Creative Tim
19+
20+
=========================================================
21+
22+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
23+
24+
*/`)
25+
)
26+
.pipe(gulp.dest("./", { overwrite: true }));
27+
28+
// this is to add Creative Tim licenses in the production mode for the minified html
29+
gulp
30+
.src("build/index.html", { base: "./" })
31+
.pipe(
32+
gap.prependText(`<!--
33+
34+
=========================================================
35+
* Paper Kit React - v1.2.0
36+
=========================================================
37+
38+
* Product Page: https://www.creative-tim.com/product/paper-kit-react
39+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
40+
41+
* Coded by Creative Tim
42+
43+
=========================================================
44+
45+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
46+
47+
-->`)
48+
)
49+
.pipe(gulp.dest("./", { overwrite: true }));
50+
51+
// this is to add Creative Tim licenses in the production mode for the minified css
52+
gulp
53+
.src("build/static/css/*chunk.css", { base: "./" })
54+
.pipe(
55+
gap.prependText(`/*!
56+
57+
=========================================================
58+
* Paper Kit React - v1.2.0
59+
=========================================================
60+
61+
* Product Page: https://www.creative-tim.com/product/paper-kit-react
62+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
63+
64+
* Coded by Creative Tim
65+
66+
=========================================================
67+
68+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
69+
70+
*/`)
71+
)
72+
.pipe(gulp.dest("./", { overwrite: true }));
73+
return;
74+
});

jsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"compilerOptions": {
33
"baseUrl": "src",
44
"paths": {
5-
"*": ["src/*"]
5+
"*": ["src/*"],
6+
"assets": ["src/assets"]
67
}
78
}
89
}

package.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "paper-kit-react",
3-
"version": "1.0.0",
3+
"version": "1.2.0",
44
"private": true,
55
"dependencies": {
66
"classnames": "2.2.6",
7-
"moment": "2.24.0",
8-
"node-sass": "4.12.0",
9-
"nouislider": "13.1.5",
10-
"react": "16.8.6",
7+
"moment": "2.26.0",
8+
"node-sass": "4.14.1",
9+
"nouislider": "14.5.0",
10+
"react": "16.13.1",
1111
"react-bootstrap-switch": "15.5.3",
1212
"react-datetime": "2.16.3",
13-
"react-dom": "16.8.6",
14-
"react-router": "5.0.1",
15-
"react-router-dom": "5.0.1",
16-
"react-scripts": "3.0.1",
17-
"reactstrap": "8.0.0"
13+
"react-dom": "16.13.1",
14+
"react-router": "5.2.0",
15+
"react-router-dom": "5.2.0",
16+
"react-scripts": "3.4.1",
17+
"reactstrap": "8.4.1"
1818
},
1919
"scripts": {
2020
"start": "react-scripts start",
21-
"build": "react-scripts build",
21+
"build": "react-scripts build && gulp licenses",
2222
"test": "react-scripts test",
2323
"eject": "react-scripts eject",
2424
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
@@ -42,6 +42,10 @@
4242
]
4343
},
4444
"optionalDependencies": {
45-
"typescript": "3.5.2"
45+
"typescript": "3.9.5"
46+
},
47+
"devDependencies": {
48+
"gulp": "4.0.2",
49+
"gulp-append-prepend": "1.0.8"
4650
}
4751
}

public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/*!
33
44
=========================================================
5-
* Paper Kit React - v1.0.0
5+
* Paper Kit React - v1.2.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/paper-kit-react
99
10-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
10+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1111
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
1212
1313
* Coded by Creative Tim

src/assets/css/paper-kit.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/css/paper-kit.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)