Skip to content

Commit

Permalink
Merge pull request #76 from creativetimofficial/dev-main
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
einazare committed Jan 21, 2021
2 parents 2f7c4f7 + 15154df commit c2bb820
Show file tree
Hide file tree
Showing 108 changed files with 8,070 additions and 5,998 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,2 +1,3 @@
package-lock.json
node_modules/
.eslintcache
102 changes: 102 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,107 @@
# Change Log

## [2.0.0] 2021-01-21
### IMPORTANT
- We have updated this product from Bootstrap 3 to Bootstrap 4, so in essence, this is a new product
- For this, we have followed the guidelines from [here](https://react-bootstrap.github.io/migrating/) and [here](https://getbootstrap.com/docs/4.0/migration/)
- 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)
### Bug fixing
- Renamed all files to `.js`, instead of `.jsx`
- Refactor all files from class components to functional ones, so now, you can use React Hooks
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/62
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/58
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/52
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/50
### Major style changes
- Since the update from Bootstrap 3 to Bootstrap 4, all styles have been changed
### Deleted components
- src/components/Card/Card.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/CustomButton/CustomButton.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/CustomCheckbox/CustomCheckbox.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/CustomRadio/CustomRadio.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/FormInputs/FormInputs.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/StatsCard/StatsCard.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/Tasks/Tasks.jsx (we'll use the simple React Bootstrap tags instead)
- src/components/UserCard/UserCard.jsx (we'll use the simple React Bootstrap tags instead)
### Added components
### Deleted dependencies
- react-notification-system (we'll use react-notification-alert from now on)
- @types/googlemaps
- @types/markerclustererplus
- @types/react
- react-google-maps (we'll use simple Google Maps API with Vanilla JS)
- react-toggle (we'll use the simple React-Bootstrap Form.Check as a switch instead)
### Added dependencies
+ react-notification-alert@0.0.13 (instead of the react-notification-system)
+ reactstrap@8.9.0 (as part of the react-notification-alert)
+ jquery@3.5.1 (since Bootstrap requires it)
+ @fortawesome/fontawesome-free@5.15.2 (For easier update of the package - instead of a link inside public/index.html)
+ gulp-append-prepend@1.0.8 (For Creative Tim licenses)
+ gulp@4.0.2 (For Creative Tim licenses)
### Updated dependencies
```
bootstrap 3.3.7 → 4.6.0
node-sass 4.12.0 → 4.14.1
react 16.8.6 → 17.0.1
react-bootstrap 0.32.4 → 1.4.3
react-chartist 0.13.3 → 0.14.3
react-dom 16.8.6 → 17.0.1
react-router 5.0.0 → 5.2.0
react-router-dom 5.0.0 → 5.2.0
react-scripts 3.0.0 → 4.0.1
typescript 3.4.3 → 4.1.3
```
### Warning
**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!**
_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):_
```
npm WARN react-chartist@0.14.3 requires a peer of react@^0.14.9 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
npm WARN react-popper@1.3.7 requires a peer of react@0.14.x || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
npm WARN create-react-context@0.3.0 requires a peer of react@^0.14.0 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
```
_If they will persist in our 2.4.* version, we will drop their usages and replace them with other plugins._
_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._
### Upgrade details
* Updated all packages from `package.json` using `npm-upgrade`, link here: https://www.npmjs.com/package/npm-upgrade
* Renamed all `ControlLabel` components to `FormLabel` (this refers to the react-bootstrap components)
* Renamed all `Grid` components to `Container` (this refers to the react-bootstrap components)
* Rename all `HelpBlock` components to `FormText`
* Rename all `MenuItem` components to `Dropdown.Item` and `NavDropdown.Item`
* Rename all Panel components to Card
* Deleted variables folder
* Change the usage of `React Big Calendar` to the new API, so instead of
```
import BigCalendar from "react-big-calendar";
```
* And
```
const localizer = BigCalendar.momentLocalizer(moment);
```
* We will have:
```
import { Calendar as BigCalendar, momentLocalizer } from "react-big-calendar";
```
* And
```
const localizer = momentLocalizer(moment);
```
* Change Panels with new react-bootstrap components
* For Col componets, replaced `size={number1} sizeOffest={number2}` with `size={{span: number1, offset: number2}}` where size can be `xs`, `sm`, `md`, `lg`
* Changed `bsStyle` to `variant`
* Changed `bsSize` to `size`
* Replace `<Navbar.Header>` with `<div className=“navbar-header”>`
* Replace `<Navbar.Form>` with `<div className="navbar-search-form navbar-form navbar-left">`
* Replace `<FormGroup>` with `<Form.Group>`
* Replace `<InputGroup.Addon>` with `<InputGroup.Prepend><InputGroup.Text>` and `<InputGroup.Append><InputGroup.Text>`
* 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;`
* Rename all .jsx files to .js
* Added Row and Col inside StatsCard
* Delete eventKey from NavDropdown components
* Deleted noCaret from NavDropdown components
* Replace Navbar fluid with Navbar → Container fluid
* Add fontawesome as dependencie instead of font link insde public/index.html, it is now imported insde src/index.js
* 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

## [1.3.0] 2019-05-03
### Bug fixing
- Renamed `src/layouts/Dashboard/Dashboard.jsx` to `src/layouts/Admin.jsx`
Expand Down
4 changes: 2 additions & 2 deletions Documentation/css/demo.css
@@ -1,11 +1,11 @@
/*!
=========================================================
* Light Bootstrap Dashboard React - v1.3.0
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-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/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions Documentation/css/documentation.css
@@ -1,11 +1,11 @@
/*!
=========================================================
* Light Bootstrap Dashboard React - v1.3.0
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-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/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
5 changes: 2 additions & 3 deletions Documentation/css/light-bootstrap-dashboard.css
@@ -1,12 +1,11 @@
/*!
=========================================================
* Light Bootstrap Dashboard React - v1.3.0
* Based on Light Bootstrap Dashboard - v1.3.0
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: http://www.creative-tim.com/product/light-bootstrap-dashboard-react
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
=========================================================
Expand Down
10 changes: 5 additions & 5 deletions Documentation/tutorial-components.html
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Light Bootstrap Dashboard React - v1.3.0
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-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/light-bootstrap-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -43,7 +43,7 @@
crossorigin="anonymous"
/>

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

<!-- Fonts and icons -->
Expand Down Expand Up @@ -97,11 +97,11 @@
</nav>

<div class="header-wrapper header-full">
<div class="header" style="background-image: url('img/back.jpg')">
<div class="header" style="background-image: url('img/back.jpg');">
<div class="filter"></div>
<div class="title-container text-center">
<h1>Light Bootstrap Dashboard React Free</h1>
<h3 class="category">v1.3.0</h3>
<h3 class="category">v2.0.0</h3>
<h4 class="description text-center">
We are constantly doing updates for you.
</h4>
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Creative Tim
Copyright (c) 2020 Creative Tim

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
70 changes: 30 additions & 40 deletions README.md
Expand Up @@ -2,7 +2,7 @@



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

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

Expand Down Expand Up @@ -70,6 +70,7 @@ light-bootstrap-dashboard-react
├── ISSUE_TEMPLATE.md
├── LICENSE.md
├── README.md
├── gulpfile.js
├── jsconfig.json
├── package.json
├── Documentation
Expand All @@ -93,54 +94,43 @@ light-bootstrap-dashboard-react
│   │   ├── demo.css
│   │   ├── light-bootstrap-dashboard-react.css
│   │   ├── light-bootstrap-dashboard-react.css.map
│   │   ├── light-bootstrap-dashboard-react.min.css
│   │   └── pe-icon-7-stroke.css
│   │   └── light-bootstrap-dashboard-react.min.css
│   ├── fonts
│   │   ├── nucleo-icons.eot
│   │   ├── nucleo-icons.svg
│   │   ├── nucleo-icons.ttf
│   │   ├── nucleo-icons.woff
│   │   └── nucleo-icons.woff2
│   ├── img
│   │   ── faces
│   └── sass
│   │   ── faces
│   └── scss
│   ├── lbd
│   │   └── mixins
│   │   ├── mixins
│   │   └── plugins
│   ├── lbdr
│   │   ├── plugins
│   │   └── react-differences.scss
│   └── light-bootstrap-dashboard-react.scss
├── layouts
│   └── Admin.js
├── components
│   ├── Card
│   │   └── Card.jsx
│   ├── CustomButton
│   │   └── CustomButton.jsx
│   ├── CustomCheckbox
│   │   └── CustomCheckbox.jsx
│   ├── CustomRadio
│   │   └── CustomRadio.jsx
│   ├── FixedPlugin
│   │   └── FixedPlugin.jsx
│   │   └── FixedPlugin.js
│   ├── Footer
│   │   └── Footer.jsx
│   ├── FormInputs
│   │   └── FormInputs.jsx
│   │   └── Footer.js
│   ├── Navbars
│   │   ├── AdminNavbar.jsx
│   │   └── AdminNavbarLinks.jsx
│   ├── Sidebar
│   │   └── Sidebar.jsx
│   ├── StatsCard
│   │   └── StatsCard.jsx
│   ├── Tasks
│   │   └── Tasks.jsx
│   └── UserCard
│   └── UserCard.jsx
├── layouts
│   └── Admin.jsx
├── variables
│   └── Variables.jsx
│   │   └── AdminNavbar.js
│   └── Sidebar
│   └── Sidebar.js
└── views
├── Dashboard.jsx
├── Icons.jsx
├── Maps.jsx
├── Notifications.jsx
├── TableList.jsx
├── Typography.jsx
├── Upgrade.jsx
└── UserProfile.jsx
├── Dashboard.js
├── Icons.js
├── Maps.js
├── Notifications.js
├── TableList.js
├── Typography.js
├── Upgrade.js
└── UserProfile.js
```

## Browser Support
Expand Down
74 changes: 74 additions & 0 deletions gulpfile.js
@@ -0,0 +1,74 @@
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(`/*!
=========================================================
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* 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(`<!--
=========================================================
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* 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(`/*!
=========================================================
* Light Bootstrap Dashboard React - v2.0.0
=========================================================
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* 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;
});

0 comments on commit c2bb820

Please sign in to comment.