Skip to content

Commit 1a9e473

Browse files
sajadevosajadevo
authored
Merge pull request #78 from maisamaf/feature/v1.2.4
update dependencies
2 parents 97aa096 + 2786ea9 commit 1a9e473

31 files changed

+69
-65
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## [1.2.4] 2024-01-01
4+
5+
- Update dependencies
6+
37
## [1.2.3] 2023-05-23
48

59
- Update dependencies

‎Documentation/documentation.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Argon Dashboard React - v1.2.3
5+
* Argon Dashboard React - v1.2.4
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2024 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

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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

3-
![version](https://img.shields.io/badge/version-1.2.3-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)
3+
![version](https://img.shields.io/badge/version-1.2.4-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)
44

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

@@ -213,7 +213,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are
213213

214214
## Licensing
215215

216-
- Copyright 2023 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
216+
- Copyright 2024 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
217217

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

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-dashboard-react",
3-
"version": "1.2.3",
3+
"version": "1.2.4",
44
"description": "React version of Argon Dashboard by Creative Tim",
55
"main": "index.js",
66
"repository": {
@@ -43,7 +43,7 @@
4343
"not op_mini all"
4444
],
4545
"dependencies": {
46-
"@fortawesome/fontawesome-free": "6.4.0",
46+
"@fortawesome/fontawesome-free": "6.5.1",
4747
"bootstrap": "4.6.2",
4848
"chart.js": "2.9.4",
4949
"classnames": "2.3.2",
@@ -54,18 +54,18 @@
5454
"react-copy-to-clipboard": "5.1.0",
5555
"react-datetime": "3.2.0",
5656
"react-dom": "18.2.0",
57-
"react-router-dom": "6.11.1",
57+
"react-router-dom": "6.21.1",
5858
"react-scripts": "5.0.1",
5959
"reactstrap": "8.10.0",
60-
"sass": "1.62.1"
60+
"sass": "1.69.5"
6161
},
62-
"peerDependencies": {
63-
"react": ">=16.0.0",
64-
"react-dom": ">=16.0.0"
62+
"devDependencies": {
63+
"gulp": "4.0.2",
64+
"gulp-append-prepend": "1.0.9"
6565
},
6666
"optionalDependencies": {
6767
"eslint-plugin-flowtype": "8.0.3",
68-
"typescript": "5.0.4"
68+
"typescript": "5.3.3"
6969
},
7070
"overrides": {
7171
"svgo": "3.0.2",

‎public/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Argon Dashboard React - v1.2.3
5+
* Argon Dashboard React - v1.2.4
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2024 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

‎src/assets/css/argon-dashboard-react.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/css/argon-dashboard-react.min.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/assets/scss/argon-dashboard-react.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/assets/scss/argon-dashboard/custom/_content.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// Container
1717
.container-fluid {
1818
@include media-breakpoint-up(md) {
19-
padding-left: ($main-content-padding-x + $grid-gutter-width / 2) !important;
20-
padding-right: ($main-content-padding-x + $grid-gutter-width / 2) !important;
19+
padding-left: ($main-content-padding-x + calc($grid-gutter-width / 2)) !important;
20+
padding-right: ($main-content-padding-x + calc($grid-gutter-width / 2)) !important;
2121
}
2222
}
2323
}

‎src/assets/scss/argon-dashboard/custom/_variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ $h5-font-size: $font-size-base * .8125 !default;
374374
$h6-font-size: $font-size-base * .625 !default;
375375

376376

377-
$headings-margin-bottom: ($spacer / 2);
377+
$headings-margin-bottom: calc($spacer / 2);
378378
$headings-font-family: inherit !default;
379379
$headings-font-weight: $font-weight-bold !default;
380380
$headings-line-height: 1.5 !default;

‎src/assets/scss/argon-dashboard/custom/navbars/_navbar-vertical.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
border: none;
9999

100100
.dropdown-menu {
101-
margin-left: $dropdown-item-padding-x / 2;
101+
margin-left: calc($dropdown-item-padding-x / 2);
102102
}
103103
}
104104
}

‎src/assets/scss/argon-dashboard/docs/_component-examples.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131

132132
.ct-example {
133133
position: relative;
134-
margin: 1rem (-$grid-gutter-width / 2) 0;
134+
margin: 1rem -calc($grid-gutter-width / 2) 0;
135135
@include clearfix();
136136

137137
@include media-breakpoint-up(sm) {
@@ -420,8 +420,8 @@
420420
}
421421

422422
.ct-content .highlight {
423-
margin-right: (-$grid-gutter-width / 2);
424-
margin-left: (-$grid-gutter-width / 2);
423+
margin-right: -calc($grid-gutter-width / 2);
424+
margin-left: -calc($grid-gutter-width / 2);
425425

426426
@include media-breakpoint-up(sm) {
427427
margin-right: 0;

‎src/components/Footers/AdminFooter.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Footers/AuthFooter.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Headers/Header.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Headers/UserHeader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Navbars/AdminNavbar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Navbars/AuthNavbar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/components/Sidebar/Sidebar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/layouts/Admin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/layouts/Auth.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/routes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/variables/charts.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/views/Index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/views/examples/Icons.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎src/views/examples/Login.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.3
4+
* Argon Dashboard React - v1.2.4
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

0 commit comments

Comments
 (0)