Skip to content

Commit d1116ed

Browse files
authored
Merge pull request #84 from creativetimofficial/dev-main
Dev main
2 parents c2bb820 + 55c6b7c commit d1116ed

File tree

18 files changed

+751
-690
lines changed

18 files changed

+751
-690
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GENERATE_SOURCEMAP=false

CHANGELOG.md

Lines changed: 98 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# Change Log
22

3+
## [2.0.1] 2022-07-04
4+
5+
- Update dependencies
6+
- Migration to React 18
7+
- Migration to sass from node-sass
8+
39
## [2.0.0] 2021-01-21
10+
411
### IMPORTANT
12+
513
- We have updated this product from Bootstrap 3 to Bootstrap 4, so in essence, this is a new product
614
- For this, we have followed the guidelines from [here](https://react-bootstrap.github.io/migrating/) and [here](https://getbootstrap.com/docs/4.0/migration/)
715
- 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)
16+
817
### Bug fixing
18+
919
- Renamed all files to `.js`, instead of `.jsx`
1020
- Refactor all files from class components to functional ones, so now, you can use React Hooks
1121
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/62
1222
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/58
1323
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/52
1424
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/50
25+
1526
### Major style changes
27+
1628
- Since the update from Bootstrap 3 to Bootstrap 4, all styles have been changed
29+
1730
### Deleted components
31+
1832
- src/components/Card/Card.jsx (we'll use the simple React Bootstrap tags instead)
1933
- src/components/CustomButton/CustomButton.jsx (we'll use the simple React Bootstrap tags instead)
2034
- src/components/CustomCheckbox/CustomCheckbox.jsx (we'll use the simple React Bootstrap tags instead)
@@ -23,22 +37,29 @@
2337
- src/components/StatsCard/StatsCard.jsx (we'll use the simple React Bootstrap tags instead)
2438
- src/components/Tasks/Tasks.jsx (we'll use the simple React Bootstrap tags instead)
2539
- src/components/UserCard/UserCard.jsx (we'll use the simple React Bootstrap tags instead)
40+
2641
### Added components
42+
2743
### Deleted dependencies
44+
2845
- react-notification-system (we'll use react-notification-alert from now on)
2946
- @types/googlemaps
3047
- @types/markerclustererplus
3148
- @types/react
3249
- react-google-maps (we'll use simple Google Maps API with Vanilla JS)
3350
- react-toggle (we'll use the simple React-Bootstrap Form.Check as a switch instead)
51+
3452
### 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)
53+
54+
- [email protected] (instead of the react-notification-system)
55+
- [email protected] (as part of the react-notification-alert)
56+
- [email protected] (since Bootstrap requires it)
57+
- @fortawesome/fontawesome-free@5.15.2 (For easier update of the package - instead of a link inside public/index.html)
58+
- [email protected] (For Creative Tim licenses)
59+
- [email protected] (For Creative Tim licenses)
60+
4161
### Updated dependencies
62+
4263
```
4364
bootstrap 3.3.7 → 4.6.0
4465
node-sass 4.12.0 → 4.14.1
@@ -51,59 +72,75 @@ react-router-dom 5.0.0 → 5.2.0
5172
react-scripts 3.0.0 → 4.0.1
5273
typescript 3.4.3 → 4.1.3
5374
```
75+
5476
### Warning
77+
5578
**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!**
5679
_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):_
80+
5781
```
5882
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.
5983
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.
6084
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.
6185
```
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._
86+
87+
_If they will persist in our 2.4.\* version, we will drop their usages and replace them with other plugins._
88+
_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._
89+
6490
### 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
91+
92+
- Updated all packages from `package.json` using `npm-upgrade`, link here: https://www.npmjs.com/package/npm-upgrade
93+
- Renamed all `ControlLabel` components to `FormLabel` (this refers to the react-bootstrap components)
94+
- Renamed all `Grid` components to `Container` (this refers to the react-bootstrap components)
95+
- Rename all `HelpBlock` components to `FormText`
96+
- Rename all `MenuItem` components to `Dropdown.Item` and `NavDropdown.Item`
97+
- Rename all Panel components to Card
98+
- Deleted variables folder
99+
- Change the usage of `React Big Calendar` to the new API, so instead of
100+
73101
```
74102
import BigCalendar from "react-big-calendar";
75103
```
76-
* And
104+
105+
- And
106+
77107
```
78108
const localizer = BigCalendar.momentLocalizer(moment);
79109
```
80-
* We will have:
110+
111+
- We will have:
112+
81113
```
82114
import { Calendar as BigCalendar, momentLocalizer } from "react-big-calendar";
83115
```
84-
* And
116+
117+
- And
118+
85119
```
86120
const localizer = momentLocalizer(moment);
87121
```
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
122+
123+
- Change Panels with new react-bootstrap components
124+
- For Col componets, replaced `size={number1} sizeOffest={number2}` with `size={{span: number1, offset: number2}}` where size can be `xs`, `sm`, `md`, `lg`
125+
- Changed `bsStyle` to `variant`
126+
- Changed `bsSize` to `size`
127+
- Replace `<Navbar.Header>` with `<div className=“navbar-header”>`
128+
- Replace `<Navbar.Form>` with `<div className="navbar-search-form navbar-form navbar-left">`
129+
- Replace `<FormGroup>` with `<Form.Group>`
130+
- Replace `<InputGroup.Addon>` with `<InputGroup.Prepend><InputGroup.Text>` and `<InputGroup.Append><InputGroup.Text>`
131+
- 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");`
132+
- Rename all .jsx files to .js
133+
- Added Row and Col inside StatsCard
134+
- Delete eventKey from NavDropdown components
135+
- Deleted noCaret from NavDropdown components
136+
- Replace Navbar fluid with Navbar → Container fluid
137+
- Add fontawesome as dependencie instead of font link insde public/index.html, it is now imported insde src/index.js
138+
- 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
104139

105140
## [1.3.0] 2019-05-03
141+
106142
### Bug fixing
143+
107144
- Renamed `src/layouts/Dashboard/Dashboard.jsx` to `src/layouts/Admin.jsx`
108145
- Renamed `src/views/Dashboard/Dashboard.jsx` to `src/views/Dashboard.jsx`
109146
- Renamed `src/views/Dashboard/Dashboard.jsx` to `src/views/Icons.jsx`
@@ -116,7 +153,7 @@ const localizer = momentLocalizer(moment);
116153
- Renamed `src/components/Header` to `src/components/Navbars`
117154
- Renamed `src/components/Navbars/Header.jsx` to `src/components/Navbars/AdminNavbar.jsx`
118155
- Renamed `src/components/Navbars/HeaderLinks.jsx` to `src/components/Navbars/AdminNavbarLinks.jsx`
119-
- Changes caused by running [the prettier command](https://prettier.io/docs/en/install.html) for *.jsx*, *.js*, *.html* and *.css* files
156+
- Changes caused by running [the prettier command](https://prettier.io/docs/en/install.html) for _.jsx_, _.js_, _.html_ and _.css_ files
120157
- Changed our buggy routing system, now it should work flawlessly, for more info, please refer to our [live docs here](https://demos.creative-tim.com/light-bootstrap-dashboard-react/#/documentation/routing-system)
121158
- Solved
122159
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/48
@@ -128,44 +165,58 @@ const localizer = momentLocalizer(moment);
128165
- https://github.com/creativetimofficial/light-bootstrap-dashboard-react/issues/15
129166
- Removed `.env` file and replaced it with `jsconfig.json`
130167
- Small bug fixes
168+
131169
### Removed dependencies/components
170+
132171
- Deleted `src/routes/*` folder
133172
- node-sass-chokidar
134173
- npm-run-all
174+
135175
### Added dependencies/components
176+
136177
- Added `src/routes.js` file (instead of the three files from `src/routes/*`)
137178
- @types/markerclustererplus@2.1.33 (to stop install warnings)
138179
- @types/googlemaps@3.30.19 (to stop install warnings)
139180
- @types/react@16.8.13 (to stop install warnings)
140181
- [email protected] (to stop install warnings)
141182
- [email protected] (react-router-dom auto-installs this package, but it is better to have them both inside package.json)
142183
184+
143185
### Update dependencies
144-
- node-sass 4.6.1 → 4.12.0
145-
- react 16.2.0 → 16.8.6
146-
- react-bootstrap 0.32.1 → 0.32.4
147-
- react-chartist 0.13.1 → 0.13.3
148-
- react-dom 16.2.0 → 16.8.6
149-
- react-router-dom 4.2.2 → 5.0.0
150-
- react-scripts 1.1.1 → 3.0.0
186+
187+
- node-sass 4.6.1 → 4.12.0
188+
- react 16.2.0 → 16.8.6
189+
- react-bootstrap 0.32.1 → 0.32.4
190+
- react-chartist 0.13.1 → 0.13.3
191+
- react-dom 16.2.0 → 16.8.6
192+
- react-router-dom 4.2.2 → 5.0.0
193+
- react-scripts 1.1.1 → 3.0.0
151194

152195
## [1.2.0] 2018-04-12
196+
153197
### Bug fixing
198+
154199
- Added `fluid` prop on `Grid` component in `Footer`
155200
- Moved all the contents of `elements` folder to `components` folder and delete it
156201
- Renamed `containers` folder to `layouts`
157202
- Renamed `App/App.jsx` to `Dashboard/Dashboard.jsx`
158203
- Renamed `src/routes/app.jsx` to `src/routes/dashboard.jsx`
159204
- Renamed `appRoutes` to `dashboardRoutes`
160205
- Added `src/routes/index.jsx` and made the routes in `src/index.js` dynamically based on `indexRoutes` from `src/routes/index.jsx` (users can now make new layouts and routes for them easier)
206+
161207
### Removed dependencies/components
208+
162209
163210
211+
164212
### Added dependencies/components
213+
165214
166215
167216
- `[email protected]` (and deleted `src/assets/bootstrap.min.css?v=3.3.5`)
217+
168218
### Update dependencies
219+
169220
170221
171222
@@ -176,7 +227,9 @@ const localizer = momentLocalizer(moment);
176227
177228

178229
## [1.1.0] 2017-10-30
230+
179231
### Bug fixing
232+
180233
- Changed property of `isChecked` in `CustomCheckbox`
181234
- Removed hover state for checkboxes and radios
182235
- Moved `NotificationSystem` outside of `.main-panel` (for responsive issues)
@@ -185,8 +238,9 @@ const localizer = momentLocalizer(moment);
185238
- Added property `round` in `CustomButton` (for the button class `.btn-round`)
186239
- Added dynamic routes
187240

188-
189241
## [1.0.0] 2017-09-20
242+
190243
### Original Release
244+
191245
- Added React-Bootstrap as base framework
192246
- Added design from Light Bootstrap Dashboard by Creative Tim

0 commit comments

Comments
 (0)