Skip to content

Commit c2bb820

Browse files
authored
Merge pull request #76 from creativetimofficial/dev-main
Update Dependencies
2 parents 2f7c4f7 + 15154df commit c2bb820

File tree

108 files changed

+8070
-5998
lines changed

Some content is hidden

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

108 files changed

+8070
-5998
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
package-lock.json
22
node_modules/
3+
.eslintcache

CHANGELOG.md

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

3+
## [2.0.0] 2021-01-21
4+
### IMPORTANT
5+
- We have updated this product from Bootstrap 3 to Bootstrap 4, so in essence, this is a new product
6+
- For this, we have followed the guidelines from [here](https://react-bootstrap.github.io/migrating/) and [here](https://getbootstrap.com/docs/4.0/migration/)
7+
- We also did not add Bootstrap variables as part of our styles (we will do so in one of our next updates, probably in version 3.0.0 when we'll add Bootstrap 5)
8+
### Bug fixing
9+
- Renamed all files to `.js`, instead of `.jsx`
10+
- Refactor all files from class components to functional ones, so now, you can use React Hooks
11+
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/62
12+
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/58
13+
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/52
14+
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/50
15+
### Major style changes
16+
- Since the update from Bootstrap 3 to Bootstrap 4, all styles have been changed
17+
### Deleted components
18+
- src/components/Card/Card.jsx (we'll use the simple React Bootstrap tags instead)
19+
- src/components/CustomButton/CustomButton.jsx (we'll use the simple React Bootstrap tags instead)
20+
- src/components/CustomCheckbox/CustomCheckbox.jsx (we'll use the simple React Bootstrap tags instead)
21+
- src/components/CustomRadio/CustomRadio.jsx (we'll use the simple React Bootstrap tags instead)
22+
- src/components/FormInputs/FormInputs.jsx (we'll use the simple React Bootstrap tags instead)
23+
- src/components/StatsCard/StatsCard.jsx (we'll use the simple React Bootstrap tags instead)
24+
- src/components/Tasks/Tasks.jsx (we'll use the simple React Bootstrap tags instead)
25+
- src/components/UserCard/UserCard.jsx (we'll use the simple React Bootstrap tags instead)
26+
### Added components
27+
### Deleted dependencies
28+
- react-notification-system (we'll use react-notification-alert from now on)
29+
- @types/googlemaps
30+
- @types/markerclustererplus
31+
- @types/react
32+
- react-google-maps (we'll use simple Google Maps API with Vanilla JS)
33+
- react-toggle (we'll use the simple React-Bootstrap Form.Check as a switch instead)
34+
### Added dependencies
35+
+ [email protected] (instead of the react-notification-system)
36+
+ [email protected] (as part of the react-notification-alert)
37+
+ [email protected] (since Bootstrap requires it)
38+
+ @fortawesome/fontawesome-free@5.15.2 (For easier update of the package - instead of a link inside public/index.html)
39+
+ [email protected] (For Creative Tim licenses)
40+
+ [email protected] (For Creative Tim licenses)
41+
### Updated dependencies
42+
```
43+
bootstrap 3.3.7 → 4.6.0
44+
node-sass 4.12.0 → 4.14.1
45+
react 16.8.6 → 17.0.1
46+
react-bootstrap 0.32.4 → 1.4.3
47+
react-chartist 0.13.3 → 0.14.3
48+
react-dom 16.8.6 → 17.0.1
49+
react-router 5.0.0 → 5.2.0
50+
react-router-dom 5.0.0 → 5.2.0
51+
react-scripts 3.0.0 → 4.0.1
52+
typescript 3.4.3 → 4.1.3
53+
```
54+
### Warning
55+
**The TypeScript and jQuery 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 TypeScript or jQuery!**
56+
_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):_
57+
```
58+
npm WARN [email protected] requires a peer of react@^0.14.9 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
59+
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.
60+
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.
61+
```
62+
_If they will persist in our 2.4.* version, we will drop their usages and replace them with other plugins._
63+
_In development mode, some of the above plugins will throw a warning because they still use React v16 syntax. If the error will persist in our 2.4.* version, we will drop their usage and replace them with other plugins._
64+
### Upgrade details
65+
* Updated all packages from `package.json` using `npm-upgrade`, link here: https://www.npmjs.com/package/npm-upgrade
66+
* Renamed all `ControlLabel` components to `FormLabel` (this refers to the react-bootstrap components)
67+
* Renamed all `Grid` components to `Container` (this refers to the react-bootstrap components)
68+
* Rename all `HelpBlock` components to `FormText`
69+
* Rename all `MenuItem` components to `Dropdown.Item` and `NavDropdown.Item`
70+
* Rename all Panel components to Card
71+
* Deleted variables folder
72+
* Change the usage of `React Big Calendar` to the new API, so instead of
73+
```
74+
import BigCalendar from "react-big-calendar";
75+
```
76+
* And
77+
```
78+
const localizer = BigCalendar.momentLocalizer(moment);
79+
```
80+
* We will have:
81+
```
82+
import { Calendar as BigCalendar, momentLocalizer } from "react-big-calendar";
83+
```
84+
* And
85+
```
86+
const localizer = momentLocalizer(moment);
87+
```
88+
* Change Panels with new react-bootstrap components
89+
* For Col componets, replaced `size={number1} sizeOffest={number2}` with `size={{span: number1, offset: number2}}` where size can be `xs`, `sm`, `md`, `lg`
90+
* Changed `bsStyle` to `variant`
91+
* Changed `bsSize` to `size`
92+
* Replace `<Navbar.Header>` with `<div className=“navbar-header”>`
93+
* Replace `<Navbar.Form>` with `<div className="navbar-search-form navbar-form navbar-left">`
94+
* Replace `<FormGroup>` with `<Form.Group>`
95+
* Replace `<InputGroup.Addon>` with `<InputGroup.Prepend><InputGroup.Text>` and `<InputGroup.Append><InputGroup.Text>`
96+
* All required images have a default prop at the end now, example: `const us_flag = require("../assets/img/flags/US.png");` was changed to `const us_flag = require("../assets/img/flags/US.png").default;`
97+
* Rename all .jsx files to .js
98+
* Added Row and Col inside StatsCard
99+
* Delete eventKey from NavDropdown components
100+
* Deleted noCaret from NavDropdown components
101+
* Replace Navbar fluid with Navbar → Container fluid
102+
* Add fontawesome as dependencie instead of font link insde public/index.html, it is now imported insde src/index.js
103+
* In addition to these changes, we’ve chaned the structure of the pages and components as well to match those from the HTML version of the product: https://www.creative-tim.com/product/light-bootstrap-dashboard
104+
3105
## [1.3.0] 2019-05-03
4106
### Bug fixing
5107
- Renamed `src/layouts/Dashboard/Dashboard.jsx` to `src/layouts/Admin.jsx`

Documentation/css/demo.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Light Bootstrap Dashboard React - v1.3.0
4+
* Light Bootstrap Dashboard React - v2.0.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

Documentation/css/documentation.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Light Bootstrap Dashboard React - v1.3.0
4+
* Light Bootstrap Dashboard React - v2.0.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

Documentation/css/light-bootstrap-dashboard.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Light Bootstrap Dashboard React - v1.3.0
5-
* Based on Light Bootstrap Dashboard - v1.3.0
4+
* Light Bootstrap Dashboard React - v2.0.0
65
=========================================================
76
87
* Product Page: http://www.creative-tim.com/product/light-bootstrap-dashboard-react
9-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
109
* Licensed under MIT (https://github.com/creativetimofficial/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
1110
1211
=========================================================

Documentation/tutorial-components.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Light Bootstrap Dashboard React - v1.3.0
5+
* Light Bootstrap Dashboard React - v2.0.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-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/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -43,7 +43,7 @@
4343
crossorigin="anonymous"
4444
/>
4545

46-
<link href="css/light-bootstrap-dashboard.css?v=1.3.0" rel="stylesheet" />
46+
<link href="css/light-bootstrap-dashboard.css?v=2.0.0" rel="stylesheet" />
4747
<link href="css/documentation.css" rel="stylesheet" />
4848

4949
<!-- Fonts and icons -->
@@ -97,11 +97,11 @@
9797
</nav>
9898

9999
<div class="header-wrapper header-full">
100-
<div class="header" style="background-image: url('img/back.jpg')">
100+
<div class="header" style="background-image: url('img/back.jpg');">
101101
<div class="filter"></div>
102102
<div class="title-container text-center">
103103
<h1>Light Bootstrap Dashboard React Free</h1>
104-
<h3 class="category">v1.3.0</h3>
104+
<h3 class="category">v2.0.0</h3>
105105
<h4 class="description text-center">
106106
We are constantly doing updates for you.
107107
</h4>

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: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
![version](https://img.shields.io/badge/version-1.3.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/light-bootstrap-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/light-bootstrap-dashboard-react.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
5+
![version](https://img.shields.io/badge/version-2.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/light-bootstrap-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/light-bootstrap-dashboard-react.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
66

77
![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/light-bootstrap-dashboard-react/light-bootstrap-dashboard-react.gif)
88

@@ -70,6 +70,7 @@ light-bootstrap-dashboard-react
7070
├── ISSUE_TEMPLATE.md
7171
├── LICENSE.md
7272
├── README.md
73+
├── gulpfile.js
7374
├── jsconfig.json
7475
├── package.json
7576
├── Documentation
@@ -93,54 +94,43 @@ light-bootstrap-dashboard-react
9394
│   │   ├── demo.css
9495
│   │   ├── light-bootstrap-dashboard-react.css
9596
│   │   ├── light-bootstrap-dashboard-react.css.map
96-
│   │   ├── light-bootstrap-dashboard-react.min.css
97-
│   │   └── pe-icon-7-stroke.css
97+
│   │   └── light-bootstrap-dashboard-react.min.css
9898
│   ├── fonts
99+
│   │   ├── nucleo-icons.eot
100+
│   │   ├── nucleo-icons.svg
101+
│   │   ├── nucleo-icons.ttf
102+
│   │   ├── nucleo-icons.woff
103+
│   │   └── nucleo-icons.woff2
99104
│   ├── img
100-
│   │   ── faces
101-
│   └── sass
105+
│   │   ── faces
106+
│   └── scss
102107
│   ├── lbd
103-
│   │   └── mixins
108+
│   │   ├── mixins
109+
│   │   └── plugins
110+
│   ├── lbdr
111+
│   │   ├── plugins
112+
│   │   └── react-differences.scss
104113
│   └── light-bootstrap-dashboard-react.scss
114+
├── layouts
115+
│   └── Admin.js
105116
├── components
106-
│   ├── Card
107-
│   │   └── Card.jsx
108-
│   ├── CustomButton
109-
│   │   └── CustomButton.jsx
110-
│   ├── CustomCheckbox
111-
│   │   └── CustomCheckbox.jsx
112-
│   ├── CustomRadio
113-
│   │   └── CustomRadio.jsx
114117
│   ├── FixedPlugin
115-
│   │   └── FixedPlugin.jsx
118+
│   │   └── FixedPlugin.js
116119
│   ├── Footer
117-
│   │   └── Footer.jsx
118-
│   ├── FormInputs
119-
│   │   └── FormInputs.jsx
120+
│   │   └── Footer.js
120121
│   ├── Navbars
121-
│   │   ├── AdminNavbar.jsx
122-
│   │   └── AdminNavbarLinks.jsx
123-
│   ├── Sidebar
124-
│   │   └── Sidebar.jsx
125-
│   ├── StatsCard
126-
│   │   └── StatsCard.jsx
127-
│   ├── Tasks
128-
│   │   └── Tasks.jsx
129-
│   └── UserCard
130-
│   └── UserCard.jsx
131-
├── layouts
132-
│   └── Admin.jsx
133-
├── variables
134-
│   └── Variables.jsx
122+
│   │   └── AdminNavbar.js
123+
│   └── Sidebar
124+
│   └── Sidebar.js
135125
└── views
136-
├── Dashboard.jsx
137-
├── Icons.jsx
138-
├── Maps.jsx
139-
├── Notifications.jsx
140-
├── TableList.jsx
141-
├── Typography.jsx
142-
├── Upgrade.jsx
143-
└── UserProfile.jsx
126+
├── Dashboard.js
127+
├── Icons.js
128+
├── Maps.js
129+
├── Notifications.js
130+
├── TableList.js
131+
├── Typography.js
132+
├── Upgrade.js
133+
└── UserProfile.js
144134
```
145135

146136
## Browser Support

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+
* Light Bootstrap Dashboard React - v2.0.0
13+
=========================================================
14+
15+
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
16+
* Copyright 2020 Creative Tim (https://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+
* Light Bootstrap Dashboard React - v2.0.0
36+
=========================================================
37+
38+
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
39+
* Copyright 2020 Creative Tim (https://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+
* Light Bootstrap Dashboard React - v2.0.0
59+
=========================================================
60+
61+
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
62+
* Copyright 2020 Creative Tim (https://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+
});

0 commit comments

Comments
 (0)