Skip to content

Commit 81a5734

Browse files
authored
Merge pull request #15 from creativetimofficial/feature/update-to-v1.1.0
Feature: update to v1.1.0
2 parents 8796e20 + 535ddf8 commit 81a5734

40 files changed

+853
-178
lines changed

.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,53 @@
11
# Change Log
22

3+
## [1.1.0] 2020-04-10
4+
### Bug fixing
5+
- Github
6+
- https://github.com/creativetimofficial/blk-design-system-react/issues/8
7+
- https://github.com/creativetimofficial/blk-design-system-react/issues/7
8+
- https://github.com/creativetimofficial/blk-design-system-react/issues/5
9+
- https://github.com/creativetimofficial/blk-design-system-react/issues/4
10+
- https://github.com/creativetimofficial/blk-design-system-react/issues/2
11+
- https://github.com/creativetimofficial/blk-design-system-react/issues/1
12+
### Major style changes
13+
- `src/assets/scss/blk-design-system-react/react/plugins/_plugin-nouislider.scss`
14+
### Deleted components
15+
### Added components
16+
### Deleted dependencies
17+
### Added dependencies
18+
+ [email protected] (to stop terminal/cmd warnings)
19+
+ [email protected] (to stop terminal/cmd warnings)
20+
### Updated dependencies
21+
```
22+
chart.js 2.7.3 → 2.9.3
23+
node-sass 4.11.0 → 4.13.1
24+
nouislider 13.1.1 → 14.2.0
25+
perfect-scrollbar 1.4.0 → 1.5.0
26+
react 16.8.3 → 16.13.1
27+
react-chartjs-2 2.7.4 → 2.9.0
28+
react-dom 16.8.3 → 16.13.1
29+
react-router-dom 4.3.1 → 5.1.2
30+
react-scripts 2.1.5 → 3.4.1
31+
reactstrap 7.1.0 → 8.4.1
32+
```
33+
### Warning
34+
**The following warnings may appear when running the installation command, but they do not affect the UI or the functionality of the product:**
35+
```
36+
npm WARN deprecated [email protected]: request has been deprecated, see https://github.com/request/request/issues/3142
37+
npm WARN deprecated [email protected]: Popper changed home, find its new releases at @popperjs/core
38+
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.
39+
```
40+
**The folowing components make react throw errors for using life-cycle methods that will be dropped in React 17.x: react-datetime, react-bootstrap-switch. But the UI or functionality of the product is not affected. When we'll update the product to React 17.x, if the issue will persist, we'll drop support for these components and replace them with other ones that create the same or a similar UI. Also, the warnings are only present in the development, and not in production.**
41+
```
42+
Warning: componentWillReceiveProps has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
43+
44+
* Move data fetching code or side effects to componentDidUpdate.
45+
* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://fb.me/react-derived-state
46+
* Rename componentWillReceiveProps to UNSAFE_componentWillReceiveProps to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run `npx react-codemod rename-unsafe-lifecycles` in your project source folder.
47+
48+
Please update the following components: DateTime, Switch
49+
```
50+
351
## [1.0.0] 2019-03-04
452
### Original Release
553
- Added Reactstrap as base framework

Documentation/documentation.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* BLK Design System React - v1.0.0
5+
* BLK Design System React - v1.1.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -47,7 +47,7 @@
4747
<link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
4848
<!-- CSS Files -->
4949
<link
50-
href="../src/assets/css/blk-design-system-react.min.css?v=1.0.0"
50+
href="../src/assets/css/blk-design-system-react.min.css?v=1.1.0"
5151
rel="stylesheet"
5252
/>
5353
<!-- CSS Just for demo purpose, don't include it in your project -->
@@ -208,10 +208,10 @@
208208
<div class="col-md-8 ml-auto mr-auto">
209209
<div class="brand">
210210
<h1 class="title">BLK Design System React</h1>
211-
<h3 class="description">Documentation v1.0.0</h3>
211+
<h3 class="description">Documentation v1.1.0</h3>
212212
<br />
213213
<a
214-
href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/tutorial"
214+
href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/tutorial?ref=blkdsr-static-docs"
215215
class="btn btn-primary btn-round btn-lg"
216216
>View documentation</a
217217
>

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 (https://www.creative-tim.com?ref=blkdsr-license-md)
3+
Copyright (c) 2020 Creative Tim (https://www.creative-tim.com?ref=blkdsr-license-md)
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: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Blk• Design System React](https://demos.creative-tim.com/blk-design-system-react) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Material%20Kit%20PRO%20is%20a%20Bootstrap%20UI%20Kit%20with%20a%20fresh,%20new%20design%20inspired%20by%20Google's%20Material%20Design%20%E2%9D%A4%EF%B8%8Fhttps%3A//demos.creative-tim.com/material-kit-pro/presentation.html%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23premium%20%20via%20%40CreativeTim)
22

33

4-
![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/blk-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/blk-design-system-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/blk-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/blk-design-system-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)
4+
![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/blk-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/blk-design-system-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/blk-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/blk-design-system-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)
55

66

77
![Product Presentation Image](https://github.com/creativetimofficial/public-assets/blob/master/blk-design-system-react/blk-design-system-react.jpg?raw=true)
@@ -89,7 +89,7 @@ Blk• Design System React
8989
└── src
9090
├── index.js
9191
├── variables
92-
│   └── charts.jsx
92+
│   └── charts.js
9393
├── assets
9494
│   ├── css
9595
│   │   ├── blk-design-system-react.css
@@ -120,30 +120,30 @@ Blk• Design System React
120120
│   └── blk-design-system-react.scss
121121
├── components
122122
│   ├── Footer
123-
│   │   └── Footer.jsx
123+
│   │   └── Footer.js
124124
│   ├── Navbars
125-
│   │   ├── ComponentsNavbar.jsx
126-
│   │   └── ExamplesNavbar.jsx
125+
│   │   ├── ComponentsNavbar.js
126+
│   │   └── ExamplesNavbar.js
127127
│   └── PageHeader
128-
│   └── PageHeader.jsx
128+
│   └── PageHeader.js
129129
└── views
130-
├── Index.jsx
130+
├── Index.js
131131
├── IndexSections
132-
│   ├── Basics.jsx
133-
│   ├── Download.jsx
134-
│   ├── Examples.jsx
135-
│   ├── JavaScript.jsx
136-
│   ├── Navbars.jsx
137-
│   ├── Notifications.jsx
138-
│   ├── NucleoIcons.jsx
139-
│   ├── Pagination.jsx
140-
│   ├── Signup.jsx
141-
│   ├── Tabs.jsx
142-
│   └── Typography.jsx
132+
│   ├── Basics.js
133+
│   ├── Download.js
134+
│   ├── Examples.js
135+
│   ├── JavaScript.js
136+
│   ├── Navbars.js
137+
│   ├── Notifications.js
138+
│   ├── NucleoIcons.js
139+
│   ├── Pagination.js
140+
│   ├── Signup.js
141+
│   ├── Tabs.js
142+
│   └── Typography.js
143143
└── examples
144-
├── LandingPage.jsx
145-
├── ProfilePage.jsx
146-
└── RegisterPage.jsx
144+
├── LandingPage.js
145+
├── ProfilePage.js
146+
└── RegisterPage.js
147147
```
148148

149149

@@ -178,7 +178,7 @@ We use GitHub Issues as the official bug tracker for the BLK Design System. Here
178178

179179
## Licensing
180180

181-
- Copyright 2018 Creative Tim (https://www.creative-tim.com/?ref=blkdsr-readme)
181+
- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=blkdsr-readme)
182182

183183
- Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
184184

gulpfile.js

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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+
* BLK Design System React - v1.1.0
13+
=========================================================
14+
15+
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
16+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
17+
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
18+
19+
* Coded by Creative Tim
20+
21+
=========================================================
22+
23+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
24+
25+
*/`)
26+
)
27+
.pipe(gulp.dest("./", { overwrite: true }));
28+
29+
// this is to add Creative Tim licenses in the production mode for the minified html
30+
gulp
31+
.src("build/index.html", { base: "./" })
32+
.pipe(
33+
gap.prependText(`<!--
34+
35+
=========================================================
36+
* BLK Design System React - v1.1.0
37+
=========================================================
38+
39+
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
40+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
41+
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
42+
43+
* Coded by Creative Tim
44+
45+
=========================================================
46+
47+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
48+
49+
-->`)
50+
)
51+
.pipe(gulp.dest("./", { overwrite: true }));
52+
53+
// this is to add Creative Tim licenses in the production mode for the minified css
54+
gulp
55+
.src("build/static/css/*chunk.css", { base: "./" })
56+
.pipe(
57+
gap.prependText(`/*!
58+
59+
=========================================================
60+
* BLK Design System React - v1.1.0
61+
=========================================================
62+
63+
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
64+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
65+
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
66+
67+
* Coded by Creative Tim
68+
69+
=========================================================
70+
71+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
72+
73+
*/`)
74+
)
75+
.pipe(gulp.dest("./", { overwrite: true }));
76+
return;
77+
});

jsconfig.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": "src",
4+
"paths": {
5+
"*": ["src/*"]
6+
}
7+
}
8+
}

package.json

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "blk-design-system-react",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "React version of BLK Design System by Creative Tim",
55
"main": "index.js",
66
"repository": {
@@ -30,26 +30,28 @@
3030
"bugs": {
3131
"url": "https://github.com/creativetimofficial/blk-design-system-react/issues"
3232
},
33-
"homepage": "https://github.com/creativetimofficial/blk-design-system-react#readme",
33+
"homepage": "https://demos.creative-tim.com/blk-design-system-react/#/",
3434
"dependencies": {
35-
"chart.js": "2.7.3",
35+
"chart.js": "2.9.3",
3636
"classnames": "2.2.6",
37+
"gulp": "4.0.2",
38+
"gulp-append-prepend": "1.0.8",
3739
"moment": "2.24.0",
38-
"node-sass": "4.11.0",
39-
"nouislider": "13.1.1",
40-
"perfect-scrollbar": "1.4.0",
41-
"react": "16.8.3",
40+
"node-sass": "4.13.1",
41+
"nouislider": "14.2.0",
42+
"perfect-scrollbar": "1.5.0",
43+
"react": "16.13.1",
4244
"react-bootstrap-switch": "15.5.3",
43-
"react-chartjs-2": "2.7.4",
45+
"react-chartjs-2": "2.9.0",
4446
"react-datetime": "2.16.3",
45-
"react-dom": "16.8.3",
46-
"react-router-dom": "4.3.1",
47-
"react-scripts": "2.1.5",
48-
"reactstrap": "7.1.0"
47+
"react-dom": "16.13.1",
48+
"react-router-dom": "5.1.2",
49+
"react-scripts": "3.4.1",
50+
"reactstrap": "8.4.1"
4951
},
5052
"scripts": {
5153
"start": "react-scripts start",
52-
"build": "react-scripts build",
54+
"build": "react-scripts build && gulp licenses",
5355
"test": "react-scripts test",
5456
"eject": "react-scripts eject",
5557
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
@@ -65,5 +67,9 @@
6567
"not dead",
6668
"not ie <= 11",
6769
"not op_mini all"
68-
]
70+
],
71+
"optionalDependencies": {
72+
"eslint-plugin-flowtype": "3.13.0",
73+
"typescript": "3.8.3"
74+
}
6975
}

public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* BLK Design System React - v1.0.0
5+
* BLK Design System React - v1.1.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim

0 commit comments

Comments
 (0)