FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #16 from creativetimofficial/dev-main · tskaj/Dashboard@0d893b2 · GitHub

/ Dashboard Public
forked from creativetimofficial/now-ui-dashboard-react

Commit 0d893b2

Browse files
einazare
authored
Merge pull request creativetimofficial#16 from creativetimofficial/dev-main
Feature: v1.5.0
2 parents faae9a1 + 68f3e59 commit 0d893b2

30 files changed

Lines changed: 1865 additions & 1934 deletions

‎CHANGELOG.md‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
# Change Log
22

3-
## [1.4.0] 2019-06-15
3+
## [1.5.0] 2021-05-20
4+
### Bug fixing
5+
### Major style changes
6+
### Deleted components
7+
### Added components
8+
### Deleted dependencies
9+
- `history` (no longer needed due to the `BrowserRouter`)
10+
- `react-google-maps` (no longer maintained, so we'll use simple Google Maps API)
11+
- `@types/googlemaps`
12+
- `@types/markerclustererplus`
13+
- `@types/react`
14+
### Added dependencies
15+
- `@babel/core@7.14.3` (to stop warnings on install)
16+
### Updated dependencies
17+
```
18+
bootstrap 4.5.0 → 4.6.0
19+
chart.js 2.9.3 → 3.2.1
20+
gulp-append-prepend 1.0.8 → 1.0.9
21+
node-sass 4.14.1 → 6.0.0
22+
perfect-scrollbar 1.5.0 → 1.5.1
23+
react 16.13.1 → 17.0.2
24+
react-chartjs-2 2.9.0 → 3.0.3
25+
react-dom 16.13.1 → 17.0.2
26+
react-notification-alert 0.0.12 → 0.0.13
27+
react-scripts 3.4.1 → 4.0.3
28+
reactstrap 8.4.1 → 8.9.0
29+
jquery 3.5.1 → 3.6.0
30+
typescript 3.9.5 → 4.2.4
31+
```
32+
### Warning
33+
_We will update Bootstrap to v5 when we'll release a new design for the Now UI products._
34+
_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
35+
_You will also have the following message: found 80 vulnerabilities (1 low, 79 moderate). This comes from react-scripts, and will be fixed in the next version. NOTE: the product works as expected with these vulnerabilities._
36+
37+
## [1.4.0] 2020-06-15
438
### Bug fixing
539
- Changed all `jsx` files to `js` ones
640
- Run prettier on all files, so there might be changes due to this

‎Documentation/tutorial-components.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/*!
33
44
=========================================================
5-
* Now UI Dashboard React - v1.4.0
5+
* Now UI Dashboard React - v1.5.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
9-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
10-
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/master/LICENSE.md)
9+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
10+
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/main/LICENSE.md)
1111
1212
* Coded by Creative Tim
1313
@@ -54,7 +54,7 @@
5454
crossorigin="anonymous"
5555
/>
5656
<link
57-
href="../src/assets/css/now-ui-dashboard.css?v=1.4.0"
57+
href="../src/assets/css/now-ui-dashboard.css?v=1.5.0"
5858
rel="stylesheet"
5959
/>
6060

@@ -196,7 +196,7 @@
196196
<div class="container">
197197
<div class="content-center">
198198
<h1 class="title text-center">Components Documentation</h1>
199-
<h3 class="category">v1.4.0</h3>
199+
<h3 class="category">v1.5.0</h3>
200200
<h4 class="description text-center">
201201
We are constantly doing updates for you. Please check the online
202202
documentation.
@@ -221,7 +221,7 @@ <h4 class="description text-center">
221221
<li><a href="https://www.creative-tim.com/blog/?ref=nudr-static-docs"> Blog </a></li>
222222
<li>
223223
<a
224-
href="https://github.com/creativetimofficial/now-ui-dashboard-react/blob/master/LICENSE.md"
224+
href="https://github.com/creativetimofficial/now-ui-dashboard-react/blob/main/LICENSE.md"
225225
>
226226
MIT License
227227
</a>

‎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) 2020 Creative Tim
3+
Copyright (c) 2021 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: 4 additions & 4 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.4.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-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-1.5.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/now-ui-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/now-ui-dashboard-react.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
66

77
![Product Gif](./now-ui-dashboard-react.gif)
88

@@ -53,7 +53,7 @@ Quick start options:
5353

5454
- `npm i now-ui-dashboard-react` (you will need to import from the dist folder our components)
5555
- Clone the repo: `git clone https://github.com/creativetimofficial/now-ui-dashboard-react.git`.
56-
- [Download from Github](https://github.com/creativetimofficial/now-ui-dashboard-react/archive/master.zip).
56+
- [Download from Github](https://github.com/creativetimofficial/now-ui-dashboard-react/archive/main.zip).
5757
- [Download from Creative Tim](https://www.creative-tim.com/product/now-ui-dashboard-react).
5858

5959

@@ -178,8 +178,8 @@ If you have questions or need help integrating the product please [contact us](h
178178

179179
## Licensing
180180

181-
- Copyright 2020 Creative Tim (https://www.creative-tim.com)
182-
- Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/master/LICENSE.md)
181+
- Copyright 2021 Creative Tim (https://www.creative-tim.com)
182+
- Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/main/LICENSE.md)
183183

184184
## Useful Links
185185

‎gulpfile.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ gulp.task("licenses", async function () {
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Now UI Dashboard React - v1.4.0
12+
* Now UI Dashboard React - v1.5.0
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
16-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
16+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
1717
1818
* Coded by Creative Tim
1919
@@ -32,11 +32,11 @@ gulp.task("licenses", async function () {
3232
gap.prependText(`/*!
3333
3434
=========================================================
35-
* Now UI Dashboard React - v1.4.0
35+
* Now UI Dashboard React - v1.5.0
3636
=========================================================
3737
3838
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
39-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
39+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
4040
4141
* Coded by Creative Tim
4242
@@ -55,11 +55,11 @@ gulp.task("licenses", async function () {
5555
gap.prependText(`<!--
5656
5757
=========================================================
58-
* Now UI Dashboard React - v1.4.0
58+
* Now UI Dashboard React - v1.5.0
5959
=========================================================
6060
6161
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
62-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
62+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
6363
6464
* Coded by Creative Tim
6565
@@ -78,11 +78,11 @@ gulp.task("licenses", async function () {
7878
gap.prependText(`/*!
7979
8080
=========================================================
81-
* Now UI Dashboard React - v1.4.0
81+
* Now UI Dashboard React - v1.5.0
8282
=========================================================
8383
8484
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
85-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
85+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
8686
8787
* Coded by Creative Tim
8888

‎package.json‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
{
22
"name": "now-ui-dashboard-react",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"main": "dist/index.js",
55
"private": true,
66
"homepage": "https://demos.creative-tim.com/now-ui-dashboard-react/#/",
77
"dependencies": {
8-
"bootstrap": "4.5.0",
9-
"chart.js": "2.9.3",
8+
"bootstrap": "4.6.0",
9+
"chart.js": "3.2.1",
1010
"gulp": "4.0.2",
11-
"gulp-append-prepend": "1.0.8",
12-
"history": "4.10.1",
13-
"node-sass": "4.14.1",
14-
"perfect-scrollbar": "1.5.0",
15-
"react": "16.13.1",
16-
"react-chartjs-2": "2.9.0",
17-
"react-dom": "16.13.1",
18-
"react-google-maps": "9.4.5",
19-
"react-notification-alert": "0.0.12",
11+
"gulp-append-prepend": "1.0.9",
12+
"node-sass": "6.0.0",
13+
"perfect-scrollbar": "1.5.1",
14+
"react": "17.0.2",
15+
"react-chartjs-2": "3.0.3",
16+
"react-dom": "17.0.2",
17+
"react-notification-alert": "0.0.13",
2018
"react-router": "5.2.0",
2119
"react-router-dom": "5.2.0",
22-
"react-scripts": "3.4.1",
23-
"reactstrap": "8.4.1"
20+
"react-scripts": "4.0.3",
21+
"reactstrap": "8.9.0"
2422
},
2523
"scripts": {
2624
"start": "react-scripts start",
@@ -33,11 +31,9 @@
3331
"map-sass": "node-sass src/assets/scss/now-ui-dashboard.scss src/assets/css/now-ui-dashboard.css --source-map true"
3432
},
3533
"optionalDependencies": {
36-
"@types/googlemaps": "3.39.6",
37-
"@types/markerclustererplus": "2.1.33",
38-
"@types/react": "16.9.36",
39-
"jquery": "3.5.1",
40-
"typescript": "3.9.5"
34+
"@babel/core": "7.14.3",
35+
"jquery": "3.6.0",
36+
"typescript": "4.2.4"
4137
},
4238
"browserslist": {
4339
"production": [

‎public/index.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/*!
33
44
=========================================================
5-
* Now UI Dashboard React - v1.4.0
5+
* Now UI Dashboard React - v1.5.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
9-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
10-
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/master/LICENSE.md)
9+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
10+
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/main/LICENSE.md)
1111
1212
* Coded by Creative Tim
1313
@@ -52,6 +52,7 @@
5252
href="https://use.fontawesome.com/releases/v5.0.6/css/all.css"
5353
rel="stylesheet"
5454
/>
55+
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
5556
<title>Now UI Dashboard React by Creative Tim</title>
5657
</head>
5758
<body>

‎src/assets/css/demo.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
22
33
=========================================================
4-
* Now UI Dashboard React - v1.4.0
4+
* Now UI Dashboard React - v1.5.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
8-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
9-
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/master/LICENSE.md)
8+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-react/blob/main/LICENSE.md)
1010
1111
* Coded by Creative Tim
1212

‎src/assets/css/now-ui-dashboard.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Now UI Dashboard React - v1.4.0 based on Now UI Dashboard - v1.3.0
4+
* Now UI Dashboard React - v1.5.0 based on Now UI Dashboard - v1.3.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/now-ui-dashboard-react
8-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
99
1010
* Designed by www.invisionapp.com Coded by www.creative-tim.com
1111

‎src/assets/css/now-ui-dashboard.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL