Skip to content

Commit 0ed1833

Browse files
authored
Merge pull request #23 from creativetimofficial/dev-main
Update dependencies
2 parents 5a2a8ec + e49c2fd commit 0ed1833

File tree

118 files changed

+5585
-11362
lines changed

Some content is hidden

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

118 files changed

+5585
-11362
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
npm-debug.log*
2222
yarn-debug.log*
2323
yarn-error.log*
24+
.eslintcache

CHANGELOG.md

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

3+
## [1.2.0] 2020-12-08
4+
### Enhancements
5+
- **Full Hooks Support**: Change `class` components usage with `functional` ones in order to support Hooks
6+
### Bug fixing
7+
### Misc
8+
- Add new branch, named `main`, this will replace the `master` branch
9+
### Major style changes
10+
- Remove `src/assets/scss/blk-design-system-react/bootstrap` folder and start using the `node_modules/bootstrap` one
11+
- Add `src/assets/scss/blk-design-system-react/react/_custom-forms.scss` for usage of Bootstrap Switch / Reactstrap CustomInput of type switch
12+
### Deleted components
13+
### Added components
14+
### Deleted dependencies
15+
- react-bootstrap-switch
16+
- This project was not longer maintained, and it had issues with the new React version. The styles for it are still kept inside the product, but we do not recommended using the plugin anymore. You can use the simple Reactstrap CustomInput of type switch or the basic HTML Bootstrap Switch one.
17+
- eslint-plugin-flowtype
18+
### Added dependencies
19+
```
20+
"@testing-library/jest-dom": "5.11.6",
21+
"@testing-library/react": "11.2.2",
22+
"@testing-library/user-event": "12.2.2",
23+
"bootstrap": "4.5.3",
24+
"jquery": "3.5.1",
25+
"node-sass-package-importer": "5.3.2",
26+
"web-vitals": "1.0.1"
27+
```
28+
### Updated dependencies
29+
```
30+
chart.js 2.9.3 → 2.9.4
31+
moment 2.24.0 → 2.29.1
32+
node-sass 4.13.1 → 4.14.1
33+
nouislider 14.2.0 → 14.6.3
34+
react 16.13.1 → 17.0.1
35+
react-chartjs-2 2.9.0 → 2.11.1
36+
react-datetime 2.16.3 → 3.0.4
37+
react-dom 16.13.1 → 17.0.1
38+
react-router-dom 5.1.2 → 5.2.0
39+
react-scripts 3.4.1 → 4.0.1
40+
reactstrap 8.4.1 → 8.7.1
41+
typescript 3.8.3 → 4.1.2
42+
```
43+
### Important Notes
44+
**The jQuery and TypeScript dependencies are installed only to stop console warnings on install. They are not actually used in our product. So the product is not based on jQuery, and it is not based on TypeScript!**
45+
### Warning
46+
_Some warnings may appear when running the installation command, but they do not affect the UI or the functionality of the product._
47+
_The following warnings will appear when running the installation command, but they do not affect the UI or the functionality of the product (they will be solved in our next update):_
48+
```
49+
npm WARN [email protected] requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
50+
npm WARN [email protected] requires a peer of [email protected] || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
51+
npm WARN [email protected] requires a peer of react@^0.14.0 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
52+
```
53+
354
## [1.1.0] 2020-04-10
455
### Bug fixing
556
- Github

Documentation/documentation.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/*!
33
44
=========================================================
5-
* BLK Design System React - v1.1.0
5+
* BLK Design System React - v1.2.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/blk-design-system-react
99
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
10-
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/master/LICENSE.md)
10+
* Licensed under MIT (https://github.com/creativetimofficial/blk-design-system-react/blob/main/LICENSE.md)
1111
1212
* Coded by Creative Tim
1313
@@ -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.1.0"
50+
href="../src/assets/css/blk-design-system-react.min.css?v=1.2.0"
5151
rel="stylesheet"
5252
/>
5353
<!-- CSS Just for demo purpose, don't include it in your project -->
@@ -138,7 +138,7 @@
138138
<span class="navbar-toggler-bar bar3"></span>
139139
</button>
140140
</div>
141-
<a class="navbar-brand" href="javascript:void(0)"
141+
<a class="navbar-brand" href="https://www.creative-tim.com/product/blk-design-system-react?ref=blkdsr-static-docs"
142142
>BLK Design System React</a
143143
>
144144
</div>
@@ -156,6 +156,11 @@
156156
</button>
157157
<div class="collapse navbar-collapse" id="navigation">
158158
<ul class="navbar-nav ml-auto">
159+
<li class="nav-item">
160+
<a target="_blank" href="https://www.creative-tim.com/product/blk-design-system-pro-react?ref=blkdsr-static-docs" class="nav-link d-none d-lg-block btn btn-primary">
161+
<i class="tim-icons icon-spaceship"></i> Upgrade to PRO
162+
</a>
163+
</li>
159164
<li class="nav-item">
160165
<a
161166
class="nav-link"
@@ -208,10 +213,10 @@
208213
<div class="col-md-8 ml-auto mr-auto">
209214
<div class="brand">
210215
<h1 class="title">BLK Design System React</h1>
211-
<h3 class="description">Documentation v1.1.0</h3>
216+
<h3 class="description">Documentation v1.2.0</h3>
212217
<br />
213218
<a
214-
href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/tutorial?ref=blkdsr-static-docs"
219+
href="https://demos.creative-tim.com/blk-design-system-react/#/documentation/overview?ref=blkdsr-static-docs"
215220
class="btn btn-primary btn-round btn-lg"
216221
>View documentation</a
217222
>

0 commit comments

Comments
 (0)