Skip to content

Commit 96e53dc

Browse files
einazareeinazare
authored
Merge pull request #52 from creativetimofficial/dev-main
Feature: Update dependencies
2 parents c6f80c6 + 55650ec commit 96e53dc

File tree

265 files changed

+8879
-13856
lines changed

Some content is hidden

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

265 files changed

+8879
-13856
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/node_modules
33
package-lock.json
44
/build
5+
.eslintcache

Diff for: ‎CHANGELOG.md

+48
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
## [1.2.0] 2021-01-26
2+
### Bug fixing
3+
- https://github.com/creativetimofficial/argon-dashboard-react/pull/38
4+
- https://github.com/creativetimofficial/argon-dashboard-react/pull/33
5+
- https://github.com/creativetimofficial/argon-dashboard-react/issues/29
6+
- https://github.com/creativetimofficial/argon-dashboard-react/issues/23
7+
### Major style changes
8+
- Moved all `src/scss/argon-dashboard/bootstrap` files to `node_modules/bootstrap`
9+
### Deleted components
10+
### Added components
11+
### Deleted dependencies
12+
- @types/googlemaps (we'll use simple Google Maps API with Vanilla JS instead)
13+
- @types/markerclustererplus (we'll use simple Google Maps API with Vanilla JS instead)
14+
- @types/react (we'll use simple Google Maps API with Vanilla JS instead)
15+
- react-google-maps (we'll use simple Google Maps API with Vanilla JS instead)
16+
### Added dependencies
17+
+ [email protected] (so that we can easily update bootstrap version)
18+
+ [email protected] (since bootstrap requires it - we are not using, we are only using bootstrap scss)
19+
+ [email protected] (so that we can import bootstrap scss from `node_modules`)
20+
### Updated dependencies
21+
```
22+
@fortawesome/fontawesome-free 5.12.1 → 5.15.2
23+
chart.js 2.9.3 → 2.9.4
24+
moment 2.24.0 → 2.29.1
25+
node-sass 4.13.1 → 4.14.1
26+
nouislider 14.1.1 → 14.6.3
27+
react 16.12.0 → 17.0.1
28+
react-chartjs-2 2.9.0 → 2.11.1
29+
react-copy-to-clipboard 5.0.2 → 5.0.3
30+
react-datetime 2.16.3 → 3.0.4
31+
react-dom 16.12.0 → 17.0.1
32+
react-router-dom 5.1.2 → 5.2.0
33+
react-scripts ^3.4.0 → 4.0.1
34+
reactstrap 8.4.1 → 8.9.0
35+
eslint-plugin-flowtype 3.13.0 → 5.2.0
36+
typescript 3.7.5 → 4.1.3
37+
```
38+
### Warning
39+
**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!**
40+
_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):_
41+
```
42+
npm WARN [email protected] requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
43+
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.
44+
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.
45+
```
46+
_If they will persist in our 2.*.* version, we will drop their usages and replace them with other plugins._
47+
_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.*.* version, we will drop their usage and replace them with other plugins._
48+
149
## [1.1.0] 2020-02-10
250
### Bug fixing
351
- https://github.com/creativetimofficial/argon-dashboard-react/issues/18 (Added this in live docs, we need for our product to have a homepage prop inside the package.json. If build is not working, just delete the homepage prop from inside the package.json, or configure it to your own specs.)

Diff for: ‎Documentation/documentation.html

+21-9
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Argon Dashboard React - v1.1.0
5+
* Argon Dashboard React - v1.2.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -47,7 +47,7 @@
4747
<!-- Argon CSS -->
4848
<link
4949
type="text/css"
50-
href="../src/assets/css/argon-dashboard-react.css?v=1.1.0"
50+
href="../src/assets/css/argon-dashboard-react.css?v=1.2.0"
5151
rel="stylesheet"
5252
/>
5353
</head>
@@ -101,7 +101,7 @@
101101
/>
102102
</span>
103103
<div class="media-body ml-2 d-none d-lg-block">
104-
<span class="mb-0 text-sm font-weight-bold"
104+
<span class="mb-0 text-sm font-weight-bold"
105105
>Jessica Jones</span
106106
>
107107
</div>
@@ -110,7 +110,7 @@
110110
<div
111111
class="dropdown-menu dropdown-menu-arrow dropdown-menu-right"
112112
>
113-
<div class=" dropdown-header noti-title">
113+
<div class="dropdown-header noti-title">
114114
<h6 class="text-overflow m-0">Welcome!</h6>
115115
</div>
116116
<a href="#pablo" class="dropdown-item">
@@ -143,7 +143,7 @@ <h6 class="text-overflow m-0">Welcome!</h6>
143143
<div class="row justify-content-center">
144144
<div class="col-lg-6 col-md-10 text-center">
145145
<h1 class="display-2 text-white">
146-
Documentation <small>v1.1.0</small>
146+
Documentation <small>v1.2.0</small>
147147
</h1>
148148
<p class="text-white mt-0 mb-5">
149149
We are constatly doing updates on the product and documentation,
@@ -175,8 +175,20 @@ <h1 class="display-2 text-white">
175175
</div>
176176
<!-- Argon Scripts -->
177177
<!-- Core -->
178-
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
179-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
180-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
178+
<script
179+
src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
180+
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
181+
crossorigin="anonymous"
182+
></script>
183+
<script
184+
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
185+
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
186+
crossorigin="anonymous"
187+
></script>
188+
<script
189+
src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
190+
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
191+
crossorigin="anonymous"
192+
></script>
181193
</body>
182194
</html>

Diff for: ‎LICENSE

+1-1
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) 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

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Argon Dashboard React](https://demos.creative-tim.com/argon-dashboard-react?ref=adr-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Argon%20Dashboard%20is%20a%20Free%20Bootstrap%204,%20React%20and%20Reactstrap%20Dashboard%20made%20using%20create-react-app%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/argon-dashboard-react%20%23react%20%23reactstrap%20%23createreactapp%20%23argon%20%23argondesign%20%23reactdashboard%20%23argonreact%20%23reactdesign%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23freebie%20%20via%20%40CreativeTim)
22

33

4-
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
4+
![version](https://img.shields.io/badge/version-1.2.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
55

66

77
![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-dashboard-react/argon-dashboard-react.gif)
@@ -225,7 +225,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are
225225

226226
## Licensing
227227

228-
- Copyright 2018 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
228+
- Copyright 2021 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
229229

230230
- Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md?ref=creativetim)
231231

Diff for: ‎gulpfile.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const gulp = require("gulp");
22
const gap = require("gulp-append-prepend");
33

4-
gulp.task("licenses", async function() {
4+
gulp.task("licenses", async function () {
55
// this is to add Creative Tim licenses in the production mode for the minified js
66
gulp
77
.src("build/static/js/*chunk.js", { base: "./" })
88
.pipe(
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Argon Dashboard React - v1.1.0
12+
* Argon Dashboard React - v1.2.0
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
16-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
16+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
1717
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1818
1919
* Coded by Creative Tim
@@ -33,11 +33,11 @@ gulp.task("licenses", async function() {
3333
gap.prependText(`<!--
3434
3535
=========================================================
36-
* Argon Dashboard React - v1.1.0
36+
* Argon Dashboard React - v1.2.0
3737
=========================================================
3838
3939
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
40-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
40+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
4141
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
4242
4343
* Coded by Creative Tim
@@ -57,11 +57,11 @@ gulp.task("licenses", async function() {
5757
gap.prependText(`/*!
5858
5959
=========================================================
60-
* Argon Dashboard React - v1.1.0
60+
* Argon Dashboard React - v1.2.0
6161
=========================================================
6262
6363
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
64-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
64+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
6565
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
6666
6767
* Coded by Creative Tim

Diff for: ‎package.json

+26-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-dashboard-react",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "React version of Argon Dashboard by Creative Tim",
55
"main": "index.js",
66
"repository": {
@@ -29,9 +29,10 @@
2929
"test": "react-scripts test",
3030
"eject": "react-scripts eject",
3131
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
32-
"compile-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css",
33-
"minify-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.min.css --output-style compressed",
34-
"map-sass": "node-sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css --source-map true"
32+
"compile:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css",
33+
"minify:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.min.css --output-style compressed",
34+
"map:scss": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css --source-map true",
35+
"build:scss": "npm run compile:scss && npm run minify:scss && npm run map:scss"
3536
},
3637
"eslintConfig": {
3738
"extends": "react-app"
@@ -43,29 +44,30 @@
4344
"not op_mini all"
4445
],
4546
"dependencies": {
46-
"@fortawesome/fontawesome-free": "5.12.1",
47-
"chart.js": "2.9.3",
47+
"@fortawesome/fontawesome-free": "5.15.2",
48+
"bootstrap": "4.6.0",
49+
"chart.js": "2.9.4",
4850
"classnames": "2.2.6",
49-
"moment": "2.24.0",
50-
"node-sass": "4.13.1",
51-
"nouislider": "14.1.1",
52-
"react": "16.12.0",
53-
"react-chartjs-2": "2.9.0",
54-
"react-copy-to-clipboard": "5.0.2",
55-
"react-datetime": "2.16.3",
56-
"react-dom": "16.12.0",
57-
"react-google-maps": "9.4.5",
58-
"react-router-dom": "5.1.2",
59-
"react-scripts": "3.3.1",
60-
"reactstrap": "8.4.1"
51+
"moment": "2.29.1",
52+
"node-sass": "4.14.1",
53+
"node-sass-package-importer": "5.3.2",
54+
"nouislider": "14.6.3",
55+
"react": "17.0.1",
56+
"react-chartjs-2": "2.11.1",
57+
"react-copy-to-clipboard": "5.0.3",
58+
"react-datetime": "3.0.4",
59+
"react-dom": "17.0.1",
60+
"react-router-dom": "5.2.0",
61+
"react-scripts": "4.0.1",
62+
"reactstrap": "8.9.0"
6163
},
6264
"devDependencies": {
63-
"@types/googlemaps": "3.39.2",
64-
"@types/markerclustererplus": "2.1.33",
65-
"@types/react": "16.9.19",
66-
"eslint-plugin-flowtype": "3.13.0",
6765
"gulp": "4.0.2",
68-
"gulp-append-prepend": "1.0.8",
69-
"typescript": "3.7.5"
66+
"gulp-append-prepend": "1.0.8"
67+
},
68+
"optionalDependencies": {
69+
"eslint-plugin-flowtype": "5.2.0",
70+
"jquery": "3.5.1",
71+
"typescript": "4.1.3"
7072
}
7173
}

Diff for: ‎public/index.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Argon Dashboard React - v1.1.0
5+
* Argon Dashboard React - v1.2.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -43,6 +43,7 @@
4343
rel="stylesheet"
4444
/>
4545
<title>Argon Dashboard React by Creative Tim</title>
46+
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY_HERE"></script>
4647
</head>
4748
<body>
4849
<noscript> You need to enable JavaScript to run this app. </noscript>

0 commit comments

Comments
 (0)