Skip to content

Commit

Permalink
Merge pull request #15 from creativetimofficial/feature/update-to-v1.1.0
Browse files Browse the repository at this point in the history
Feature: update to v1.1.0
  • Loading branch information
einazare authored Apr 10, 2020
2 parents 8796e20 + 535ddf8 commit 81a5734
Show file tree
Hide file tree
Showing 40 changed files with 853 additions and 178 deletions.
1 change: 0 additions & 1 deletion .env

This file was deleted.

48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,53 @@
# Change Log

## [1.1.0] 2020-04-10
### Bug fixing
- Github
- https://github.com/creativetimofficial/blk-design-system-react/issues/8
- https://github.com/creativetimofficial/blk-design-system-react/issues/7
- https://github.com/creativetimofficial/blk-design-system-react/issues/5
- https://github.com/creativetimofficial/blk-design-system-react/issues/4
- https://github.com/creativetimofficial/blk-design-system-react/issues/2
- https://github.com/creativetimofficial/blk-design-system-react/issues/1
### Major style changes
- `src/assets/scss/blk-design-system-react/react/plugins/_plugin-nouislider.scss`
### Deleted components
### Added components
### Deleted dependencies
### Added dependencies
+ [email protected] (to stop terminal/cmd warnings)
+ [email protected] (to stop terminal/cmd warnings)
### Updated dependencies
```
chart.js 2.7.3 → 2.9.3
node-sass 4.11.0 → 4.13.1
nouislider 13.1.1 → 14.2.0
perfect-scrollbar 1.4.0 → 1.5.0
react 16.8.3 → 16.13.1
react-chartjs-2 2.7.4 → 2.9.0
react-dom 16.8.3 → 16.13.1
react-router-dom 4.3.1 → 5.1.2
react-scripts 2.1.5 → 3.4.1
reactstrap 7.1.0 → 8.4.1
```
### Warning
**The following warnings may appear when running the installation command, but they do not affect the UI or the functionality 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]: Popper changed home, find its new releases at @popperjs/core
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.
```
**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.**
```
Warning: componentWillReceiveProps has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
* Move data fetching code or side effects to componentDidUpdate.
* 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
* 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.
Please update the following components: DateTime, Switch
```

## [1.0.0] 2019-03-04
### Original Release
- Added Reactstrap as base framework
Expand Down
10 changes: 5 additions & 5 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* BLK Design System React - v1.0.0
* BLK Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/blk-design-system-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/blk-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -47,7 +47,7 @@
<link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
<!-- CSS Files -->
<link
href="../src/assets/css/blk-design-system-react.min.css?v=1.0.0"
href="../src/assets/css/blk-design-system-react.min.css?v=1.1.0"
rel="stylesheet"
/>
<!-- CSS Just for demo purpose, don't include it in your project -->
Expand Down Expand Up @@ -208,10 +208,10 @@
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h1 class="title">BLK Design System 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/blk-design-system-react/#/documentation/tutorial"
href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/tutorial?ref=blkdsr-static-docs"
class="btn btn-primary btn-round btn-lg"
>View documentation</a
>
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 (https://www.creative-tim.com?ref=blkdsr-license-md)
Copyright (c) 2020 Creative Tim (https://www.creative-tim.com?ref=blkdsr-license-md)

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
44 changes: 22 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [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)


![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)
![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)


![Product Presentation Image](https://github.com/creativetimofficial/public-assets/blob/master/blk-design-system-react/blk-design-system-react.jpg?raw=true)
Expand Down Expand Up @@ -89,7 +89,7 @@ Blk• Design System React
└── src
├── index.js
├── variables
│   └── charts.jsx
│   └── charts.js
├── assets
│   ├── css
│   │   ├── blk-design-system-react.css
Expand Down Expand Up @@ -120,30 +120,30 @@ Blk• Design System React
│   └── blk-design-system-react.scss
├── components
│   ├── Footer
│   │   └── Footer.jsx
│   │   └── Footer.js
│   ├── Navbars
│   │   ├── ComponentsNavbar.jsx
│   │   └── ExamplesNavbar.jsx
│   │   ├── ComponentsNavbar.js
│   │   └── ExamplesNavbar.js
│   └── PageHeader
│   └── PageHeader.jsx
│   └── PageHeader.js
└── views
├── Index.jsx
├── Index.js
├── IndexSections
│   ├── Basics.jsx
│   ├── Download.jsx
│   ├── Examples.jsx
│   ├── JavaScript.jsx
│   ├── Navbars.jsx
│   ├── Notifications.jsx
│   ├── NucleoIcons.jsx
│   ├── Pagination.jsx
│   ├── Signup.jsx
│   ├── Tabs.jsx
│   └── Typography.jsx
│   ├── Basics.js
│   ├── Download.js
│   ├── Examples.js
│   ├── JavaScript.js
│   ├── Navbars.js
│   ├── Notifications.js
│   ├── NucleoIcons.js
│   ├── Pagination.js
│   ├── Signup.js
│   ├── Tabs.js
│   └── Typography.js
└── examples
├── LandingPage.jsx
├── ProfilePage.jsx
└── RegisterPage.jsx
├── LandingPage.js
├── ProfilePage.js
└── RegisterPage.js
```


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

## Licensing

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

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

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(`/*!
=========================================================
* BLK Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-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(`<!--
=========================================================
* BLK Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-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(`/*!
=========================================================
* BLK Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-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/*"]
}
}
}
34 changes: 20 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blk-design-system-react",
"version": "1.0.0",
"version": "1.1.0",
"description": "React version of BLK Design System by Creative Tim",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -30,26 +30,28 @@
"bugs": {
"url": "https://github.com/creativetimofficial/blk-design-system-react/issues"
},
"homepage": "https://github.com/creativetimofficial/blk-design-system-react#readme",
"homepage": "https://demos.creative-tim.com/blk-design-system-react/#/",
"dependencies": {
"chart.js": "2.7.3",
"chart.js": "2.9.3",
"classnames": "2.2.6",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8",
"moment": "2.24.0",
"node-sass": "4.11.0",
"nouislider": "13.1.1",
"perfect-scrollbar": "1.4.0",
"react": "16.8.3",
"node-sass": "4.13.1",
"nouislider": "14.2.0",
"perfect-scrollbar": "1.5.0",
"react": "16.13.1",
"react-bootstrap-switch": "15.5.3",
"react-chartjs-2": "2.7.4",
"react-chartjs-2": "2.9.0",
"react-datetime": "2.16.3",
"react-dom": "16.8.3",
"react-router-dom": "4.3.1",
"react-scripts": "2.1.5",
"reactstrap": "7.1.0"
"react-dom": "16.13.1",
"react-router-dom": "5.1.2",
"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 @@ -65,5 +67,9 @@
"not dead",
"not ie <= 11",
"not op_mini all"
]
],
"optionalDependencies": {
"eslint-plugin-flowtype": "3.13.0",
"typescript": "3.8.3"
}
}
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 @@
/*!
=========================================================
* BLK Design System React - v1.0.0
* BLK Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/blk-design-system-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/blk-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
Loading

0 comments on commit 81a5734

Please sign in to comment.