Skip to content

Commit 01e168e

Browse files
sajadevosajadevo
authoredAug 26, 2022
Merge pull request #72 from creativetimofficial/dev-main
Dev main
·
1.2.41.2.2
2 parents 35f9cb3 + 7cb3e20 commit 01e168e

28 files changed

+32492
-7728
lines changed
 

‎.env

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GENERATE_SOURCEMAP=false

‎Documentation/documentation.html

+4-17
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Argon Dashboard React - v1.2.1
5+
* Argon Dashboard React - v1.2.2
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2022 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
@@ -69,13 +69,7 @@
6969
>
7070
<!-- Form -->
7171
<form
72-
class="
73-
navbar-search navbar-search-dark
74-
form-inline
75-
mr-3
76-
d-none d-md-flex
77-
ml-lg-auto
78-
"
72+
class="navbar-search navbar-search-dark form-inline mr-3 d-none d-md-flex ml-lg-auto"
7973
>
8074
<div class="form-group mb-0">
8175
<div class="input-group input-group-alternative">
@@ -142,14 +136,7 @@ <h6 class="text-overflow m-0">Welcome!</h6>
142136
</nav>
143137
<!-- Header -->
144138
<div
145-
class="
146-
header
147-
bg-gradient-primary
148-
pb-8
149-
pt-5 pt-lg-8
150-
d-flex
151-
align-items-center
152-
"
139+
class="header bg-gradient-primary pb-8 pt-5 pt-lg-8 d-flex align-items-center"
153140
>
154141
<!-- Header container -->
155142
<div class="container-fluid">

‎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.1-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.2-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 2021 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
216+
- Copyright 2022 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

‎gulpfile.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ gulp.task("licenses", async function () {
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Argon Dashboard React - v1.2.1
12+
* Argon Dashboard React - v1.2.2
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
16-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
16+
* Copyright 2022 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.2.1
36+
* Argon Dashboard React - v1.2.2
3737
=========================================================
3838
3939
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
40-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
40+
* Copyright 2022 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.2.1
60+
* Argon Dashboard React - v1.2.2
6161
=========================================================
6262
6363
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
64-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
64+
* Copyright 2022 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

‎package.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-dashboard-react",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"description": "React version of Argon Dashboard by Creative Tim",
55
"main": "index.js",
66
"repository": {
@@ -29,9 +29,8 @@
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: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",
32+
"compile:scss": "sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.css",
33+
"minify:scss": "sass src/assets/scss/argon-dashboard-react.scss src/assets/css/argon-dashboard-react.min.css --style compressed",
3534
"build:scss": "npm run compile:scss && npm run minify:scss && npm run map:scss"
3635
},
3736
"eslintConfig": {
@@ -48,26 +47,29 @@
4847
"bootstrap": "4.6.0",
4948
"chart.js": "2.9.4",
5049
"classnames": "2.3.1",
51-
"moment": "2.29.1",
52-
"node-sass": "6.0.1",
53-
"node-sass-package-importer": "5.3.2",
50+
"moment": "2.29.4",
5451
"nouislider": "15.2.0",
55-
"react": "17.0.2",
52+
"react": "18.2.0",
5653
"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.2",
54+
"react-copy-to-clipboard": "5.1.0",
55+
"react-datetime": "3.1.1",
56+
"react-dom": "18.2.0",
6057
"react-router-dom": "5.2.0",
61-
"react-scripts": "4.0.3",
62-
"reactstrap": "8.9.0"
58+
"react-scripts": "5.0.1",
59+
"reactstrap": "8.9.0",
60+
"sass": "1.54.5"
6361
},
6462
"devDependencies": {
6563
"gulp": "4.0.2",
6664
"gulp-append-prepend": "1.0.9"
6765
},
66+
"peerDependencies": {
67+
"react": ">=16.0.0",
68+
"react-dom": ">=16.0.0"
69+
},
6870
"optionalDependencies": {
69-
"eslint-plugin-flowtype": "5.8.0",
71+
"eslint-plugin-flowtype": "8.0.3",
7072
"jquery": "3.6.0",
71-
"typescript": "4.3.5"
73+
"typescript": "4.8.2"
7274
}
7375
}

‎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.2.1
5+
* Argon Dashboard React - v1.2.2
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
9-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2022 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
@@ -17,6 +17,7 @@
1717
1818
*/
1919
-->
20+
2021
<!DOCTYPE html>
2122
<html lang="en" class="perfect-scrollbar-off nav-open">
2223
<head>

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

+12,713-7,327
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

+19,554-4
Large diffs are not rendered by default.

‎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.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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/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.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -27,11 +27,9 @@ const UserHeader = () => {
2727
style={{
2828
minHeight: "600px",
2929
backgroundImage:
30-
"url(" +
31-
require("../../assets/img/theme/profile-cover.jpg").default +
32-
")",
30+
"url(" + require("../../assets/img/theme/profile-cover.jpg") + ")",
3331
backgroundSize: "cover",
34-
backgroundPosition: "center top",
32+
backgroundPosition: "center top"
3533
}}
3634
>
3735
{/* Mask */}

‎src/components/Navbars/AdminNavbar.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -31,7 +31,7 @@ import {
3131
Navbar,
3232
Nav,
3333
Container,
34-
Media,
34+
Media
3535
} from "reactstrap";
3636

3737
const AdminNavbar = (props) => {
@@ -64,10 +64,7 @@ const AdminNavbar = (props) => {
6464
<span className="avatar avatar-sm rounded-circle">
6565
<img
6666
alt="..."
67-
src={
68-
require("../../assets/img/theme/team-4-800x800.jpg")
69-
.default
70-
}
67+
src={require("../../assets/img/theme/team-4-800x800.jpg")}
7168
/>
7269
</span>
7370
<Media className="ml-2 d-none d-lg-block">

‎src/components/Navbars/AuthNavbar.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -26,7 +26,7 @@ import {
2626
Nav,
2727
Container,
2828
Row,
29-
Col,
29+
Col
3030
} from "reactstrap";
3131

3232
const AdminNavbar = () => {
@@ -37,9 +37,7 @@ const AdminNavbar = () => {
3737
<NavbarBrand to="/" tag={Link}>
3838
<img
3939
alt="..."
40-
src={
41-
require("../../assets/img/brand/argon-react-white.png").default
42-
}
40+
src={require("../../assets/img/brand/argon-react-white.png")}
4341
/>
4442
</NavbarBrand>
4543
<button className="navbar-toggler" id="navbar-collapse-main">
@@ -52,10 +50,7 @@ const AdminNavbar = () => {
5250
<Link to="/">
5351
<img
5452
alt="..."
55-
src={
56-
require("../../assets/img/brand/argon-react.png")
57-
.default
58-
}
53+
src={require("../../assets/img/brand/argon-react.png")}
5954
/>
6055
</Link>
6156
</Col>

‎src/components/Sidebar/Sidebar.js

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -49,7 +49,7 @@ import {
4949
Table,
5050
Container,
5151
Row,
52-
Col,
52+
Col
5353
} from "reactstrap";
5454

5555
var ps;
@@ -92,12 +92,12 @@ const Sidebar = (props) => {
9292
if (logo && logo.innerLink) {
9393
navbarBrandProps = {
9494
to: logo.innerLink,
95-
tag: Link,
95+
tag: Link
9696
};
9797
} else if (logo && logo.outterLink) {
9898
navbarBrandProps = {
9999
href: logo.outterLink,
100-
target: "_blank",
100+
target: "_blank"
101101
};
102102
}
103103

@@ -149,10 +149,7 @@ const Sidebar = (props) => {
149149
<span className="avatar avatar-sm rounded-circle">
150150
<img
151151
alt="..."
152-
src={
153-
require("../../assets/img/theme/team-1-800x800.jpg")
154-
.default
155-
}
152+
src={require("../../assets/img/theme/team-1-800x800.jpg")}
156153
/>
157154
</span>
158155
</Media>
@@ -273,7 +270,7 @@ const Sidebar = (props) => {
273270
};
274271

275272
Sidebar.defaultProps = {
276-
routes: [{}],
273+
routes: [{}]
277274
};
278275

279276
Sidebar.propTypes = {
@@ -289,8 +286,8 @@ Sidebar.propTypes = {
289286
// the image src of the logo
290287
imgSrc: PropTypes.string.isRequired,
291288
// the alt for the img
292-
imgAlt: PropTypes.string.isRequired,
293-
}),
289+
imgAlt: PropTypes.string.isRequired
290+
})
294291
};
295292

296293
export default Sidebar;

‎src/index.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -16,7 +16,7 @@
1616
1717
*/
1818
import React from "react";
19-
import ReactDOM from "react-dom";
19+
import ReactDOM from "react-dom/client";
2020
import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
2121

2222
import "assets/plugins/nucleo/css/nucleo.css";
@@ -26,13 +26,14 @@ import "assets/scss/argon-dashboard-react.scss";
2626
import AdminLayout from "layouts/Admin.js";
2727
import AuthLayout from "layouts/Auth.js";
2828

29-
ReactDOM.render(
29+
const root = ReactDOM.createRoot(document.getElementById("root"));
30+
31+
root.render(
3032
<BrowserRouter>
3133
<Switch>
3234
<Route path="/admin" render={(props) => <AdminLayout {...props} />} />
3335
<Route path="/auth" render={(props) => <AuthLayout {...props} />} />
3436
<Redirect from="/" to="/admin/index" />
3537
</Switch>
36-
</BrowserRouter>,
37-
document.getElementById("root")
38+
</BrowserRouter>
3839
);

‎src/layouts/Admin.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -71,8 +71,8 @@ const Admin = (props) => {
7171
routes={routes}
7272
logo={{
7373
innerLink: "/admin/index",
74-
imgSrc: require("../assets/img/brand/argon-react.png").default,
75-
imgAlt: "...",
74+
imgSrc: require("../assets/img/brand/argon-react.png"),
75+
imgAlt: "..."
7676
}}
7777
/>
7878
<div className="main-content" ref={mainContent}>

‎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.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -29,49 +29,49 @@ var routes = [
2929
name: "Dashboard",
3030
icon: "ni ni-tv-2 text-primary",
3131
component: Index,
32-
layout: "/admin",
32+
layout: "/admin"
3333
},
3434
{
3535
path: "/icons",
3636
name: "Icons",
3737
icon: "ni ni-planet text-blue",
3838
component: Icons,
39-
layout: "/admin",
39+
layout: "/admin"
4040
},
4141
{
4242
path: "/maps",
4343
name: "Maps",
4444
icon: "ni ni-pin-3 text-orange",
4545
component: Maps,
46-
layout: "/admin",
46+
layout: "/admin"
4747
},
4848
{
4949
path: "/user-profile",
5050
name: "User Profile",
5151
icon: "ni ni-single-02 text-yellow",
5252
component: Profile,
53-
layout: "/admin",
53+
layout: "/admin"
5454
},
5555
{
5656
path: "/tables",
5757
name: "Tables",
5858
icon: "ni ni-bullet-list-67 text-red",
5959
component: Tables,
60-
layout: "/admin",
60+
layout: "/admin"
6161
},
6262
{
6363
path: "/login",
6464
name: "Login",
6565
icon: "ni ni-key-25 text-info",
6666
component: Login,
67-
layout: "/auth",
67+
layout: "/auth"
6868
},
6969
{
7070
path: "/register",
7171
name: "Register",
7272
icon: "ni ni-circle-08 text-pink",
7373
component: Register,
74-
layout: "/auth",
75-
},
74+
layout: "/auth"
75+
}
7676
];
7777
export default routes;

‎src/variables/charts.js

+53-53
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -88,7 +88,7 @@ Chart.elements.Rectangle.prototype.draw = function () {
8888
[left, bottom],
8989
[left, top],
9090
[right, top],
91-
[right, bottom],
91+
[right, bottom]
9292
];
9393

9494
// Find first (starting) corner with fallback to 'bottom'
@@ -149,7 +149,7 @@ Chart.elements.Rectangle.prototype.draw = function () {
149149

150150
var mode = "light"; //(themeMode) ? themeMode : 'light';
151151
var fonts = {
152-
base: "Open Sans",
152+
base: "Open Sans"
153153
};
154154

155155
// Colors
@@ -163,7 +163,7 @@ var colors = {
163163
600: "#8898aa",
164164
700: "#525f7f",
165165
800: "#32325d",
166-
900: "#212529",
166+
900: "#212529"
167167
},
168168
theme: {
169169
default: "#172b4d",
@@ -172,11 +172,11 @@ var colors = {
172172
info: "#11cdef",
173173
success: "#2dce89",
174174
danger: "#f5365c",
175-
warning: "#fb6340",
175+
warning: "#fb6340"
176176
},
177177
black: "#12263F",
178178
white: "#FFFFFF",
179-
transparent: "transparent",
179+
transparent: "transparent"
180180
};
181181

182182
// Methods
@@ -194,42 +194,42 @@ function chartOptions() {
194194
defaultFontFamily: fonts.base,
195195
defaultFontSize: 13,
196196
layout: {
197-
padding: 0,
197+
padding: 0
198198
},
199199
legend: {
200200
display: false,
201201
position: "bottom",
202202
labels: {
203203
usePointStyle: true,
204-
padding: 16,
205-
},
204+
padding: 16
205+
}
206206
},
207207
elements: {
208208
point: {
209209
radius: 0,
210-
backgroundColor: colors.theme["primary"],
210+
backgroundColor: colors.theme["primary"]
211211
},
212212
line: {
213213
tension: 0.4,
214214
borderWidth: 4,
215215
borderColor: colors.theme["primary"],
216216
backgroundColor: colors.transparent,
217-
borderCapStyle: "rounded",
217+
borderCapStyle: "rounded"
218218
},
219219
rectangle: {
220-
backgroundColor: colors.theme["warning"],
220+
backgroundColor: colors.theme["warning"]
221221
},
222222
arc: {
223223
backgroundColor: colors.theme["primary"],
224224
borderColor: mode === "dark" ? colors.gray[800] : colors.white,
225-
borderWidth: 4,
226-
},
225+
borderWidth: 4
226+
}
227227
},
228228
tooltips: {
229229
enabled: true,
230230
mode: "index",
231-
intersect: false,
232-
},
231+
intersect: false
232+
}
233233
},
234234
doughnut: {
235235
cutoutPercentage: 83,
@@ -250,9 +250,9 @@ function chartOptions() {
250250
});
251251

252252
return content;
253-
},
254-
},
255-
},
253+
}
254+
}
255+
}
256256
};
257257

258258
// yAxes
@@ -267,7 +267,7 @@ function chartOptions() {
267267
zeroLineWidth: 0,
268268
zeroLineColor: mode === "dark" ? colors.gray[900] : colors.gray[300],
269269
zeroLineBorderDash: [2],
270-
zeroLineBorderDashOffset: [2],
270+
zeroLineBorderDashOffset: [2]
271271
},
272272
ticks: {
273273
beginAtZero: true,
@@ -276,20 +276,20 @@ function chartOptions() {
276276
if (!(value % 10)) {
277277
return value;
278278
}
279-
},
280-
},
279+
}
280+
}
281281
});
282282

283283
// xAxes
284284
Chart.scaleService.updateScaleDefaults("category", {
285285
gridLines: {
286286
drawBorder: false,
287287
drawOnChartArea: false,
288-
drawTicks: false,
288+
drawTicks: false
289289
},
290290
ticks: {
291-
padding: 20,
292-
},
291+
padding: 20
292+
}
293293
});
294294

295295
return options;
@@ -314,17 +314,17 @@ let chartExample1 = {
314314
{
315315
gridLines: {
316316
color: colors.gray[900],
317-
zeroLineColor: colors.gray[900],
317+
zeroLineColor: colors.gray[900]
318318
},
319319
ticks: {
320320
callback: function (value) {
321321
if (!(value % 10)) {
322322
return "$" + value + "k";
323323
}
324-
},
325-
},
326-
},
327-
],
324+
}
325+
}
326+
}
327+
]
328328
},
329329
tooltips: {
330330
callbacks: {
@@ -339,19 +339,19 @@ let chartExample1 = {
339339

340340
content += "$" + yLabel + "k";
341341
return content;
342-
},
343-
},
344-
},
342+
}
343+
}
344+
}
345345
},
346346
data1: (canvas) => {
347347
return {
348348
labels: ["May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
349349
datasets: [
350350
{
351351
label: "Performance",
352-
data: [0, 20, 10, 30, 15, 40, 20, 60, 60],
353-
},
354-
],
352+
data: [0, 20, 10, 30, 15, 40, 20, 60, 60]
353+
}
354+
]
355355
};
356356
},
357357
data2: (canvas) => {
@@ -360,11 +360,11 @@ let chartExample1 = {
360360
datasets: [
361361
{
362362
label: "Performance",
363-
data: [0, 20, 5, 25, 10, 30, 15, 40, 40],
364-
},
365-
],
363+
data: [0, 20, 5, 25, 10, 30, 15, 40, 40]
364+
}
365+
]
366366
};
367-
},
367+
}
368368
};
369369

370370
// Example 2 of Chart inside src/views/Index.js (Total orders - Card)
@@ -379,10 +379,10 @@ let chartExample2 = {
379379
//return '$' + value + 'k'
380380
return value;
381381
}
382-
},
383-
},
384-
},
385-
],
382+
}
383+
}
384+
}
385+
]
386386
},
387387
tooltips: {
388388
callbacks: {
@@ -395,25 +395,25 @@ let chartExample2 = {
395395
}
396396
content += yLabel;
397397
return content;
398-
},
399-
},
400-
},
398+
}
399+
}
400+
}
401401
},
402402
data: {
403403
labels: ["Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
404404
datasets: [
405405
{
406406
label: "Sales",
407407
data: [25, 20, 30, 22, 17, 29],
408-
maxBarThickness: 10,
409-
},
410-
],
411-
},
408+
maxBarThickness: 10
409+
}
410+
]
411+
}
412412
};
413413

414414
module.exports = {
415415
chartOptions, // used inside src/views/Index.js
416416
parseOptions, // used inside src/views/Index.js
417417
chartExample1, // used inside src/views/Index.js
418-
chartExample2, // used inside src/views/Index.js
418+
chartExample2 // used inside src/views/Index.js
419419
};

‎src/views/Index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -35,15 +35,15 @@ import {
3535
Table,
3636
Container,
3737
Row,
38-
Col,
38+
Col
3939
} from "reactstrap";
4040

4141
// core components
4242
import {
4343
chartOptions,
4444
parseOptions,
4545
chartExample1,
46-
chartExample2,
46+
chartExample2
4747
} from "variables/charts.js";
4848

4949
import Header from "components/Headers/Header.js";
@@ -82,7 +82,7 @@ const Index = (props) => {
8282
<NavItem>
8383
<NavLink
8484
className={classnames("py-2 px-3", {
85-
active: activeNav === 1,
85+
active: activeNav === 1
8686
})}
8787
href="#pablo"
8888
onClick={(e) => toggleNavs(e, 1)}
@@ -94,7 +94,7 @@ const Index = (props) => {
9494
<NavItem>
9595
<NavLink
9696
className={classnames("py-2 px-3", {
97-
active: activeNav === 2,
97+
active: activeNav === 2
9898
})}
9999
data-toggle="tab"
100100
href="#pablo"

‎src/views/examples/Icons.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -26,7 +26,7 @@ import {
2626
Container,
2727
Row,
2828
Col,
29-
UncontrolledTooltip,
29+
UncontrolledTooltip
3030
} from "reactstrap";
3131
// core components
3232
import Header from "components/Headers/Header.js";

‎src/views/examples/Login.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -29,7 +29,7 @@ import {
2929
InputGroupText,
3030
InputGroup,
3131
Row,
32-
Col,
32+
Col
3333
} from "reactstrap";
3434

3535
const Login = () => {

‎src/views/examples/Maps.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -40,44 +40,44 @@ const MapWrapper = () => {
4040
{
4141
featureType: "administrative",
4242
elementType: "labels.text.fill",
43-
stylers: [{ color: "#444444" }],
43+
stylers: [{ color: "#444444" }]
4444
},
4545
{
4646
featureType: "landscape",
4747
elementType: "all",
48-
stylers: [{ color: "#f2f2f2" }],
48+
stylers: [{ color: "#f2f2f2" }]
4949
},
5050
{
5151
featureType: "poi",
5252
elementType: "all",
53-
stylers: [{ visibility: "off" }],
53+
stylers: [{ visibility: "off" }]
5454
},
5555
{
5656
featureType: "road",
5757
elementType: "all",
58-
stylers: [{ saturation: -100 }, { lightness: 45 }],
58+
stylers: [{ saturation: -100 }, { lightness: 45 }]
5959
},
6060
{
6161
featureType: "road.highway",
6262
elementType: "all",
63-
stylers: [{ visibility: "simplified" }],
63+
stylers: [{ visibility: "simplified" }]
6464
},
6565
{
6666
featureType: "road.arterial",
6767
elementType: "labels.icon",
68-
stylers: [{ visibility: "off" }],
68+
stylers: [{ visibility: "off" }]
6969
},
7070
{
7171
featureType: "transit",
7272
elementType: "all",
73-
stylers: [{ visibility: "off" }],
73+
stylers: [{ visibility: "off" }]
7474
},
7575
{
7676
featureType: "water",
7777
elementType: "all",
78-
stylers: [{ color: "#5e72e4" }, { visibility: "on" }],
79-
},
80-
],
78+
stylers: [{ color: "#5e72e4" }, { visibility: "on" }]
79+
}
80+
]
8181
};
8282

8383
map = new google.maps.Map(map, mapOptions);
@@ -86,15 +86,15 @@ const MapWrapper = () => {
8686
position: myLatlng,
8787
map: map,
8888
animation: google.maps.Animation.DROP,
89-
title: "Light Bootstrap Dashboard PRO React!",
89+
title: "Light Bootstrap Dashboard PRO React!"
9090
});
9191

9292
const contentString =
9393
'<div class="info-window-content"><h2>Light Bootstrap Dashboard PRO React</h2>' +
9494
"<p>A premium Admin for React-Bootstrap, Bootstrap, React, and React Hooks.</p></div>";
9595

9696
const infowindow = new google.maps.InfoWindow({
97-
content: contentString,
97+
content: contentString
9898
});
9999

100100
google.maps.event.addListener(marker, "click", function () {

‎src/views/examples/Profile.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -27,7 +27,7 @@ import {
2727
Input,
2828
Container,
2929
Row,
30-
Col,
30+
Col
3131
} from "reactstrap";
3232
// core components
3333
import UserHeader from "components/Headers/UserHeader.js";
@@ -48,10 +48,7 @@ const Profile = () => {
4848
<img
4949
alt="..."
5050
className="rounded-circle"
51-
src={
52-
require("../../assets/img/theme/team-4-800x800.jpg")
53-
.default
54-
}
51+
src={require("../../assets/img/theme/team-4-800x800.jpg")}
5552
/>
5653
</a>
5754
</div>

‎src/views/examples/Register.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Argon Dashboard React - v1.2.1
4+
* Argon Dashboard React - v1.2.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
8-
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2022 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
@@ -29,7 +29,7 @@ import {
2929
InputGroupText,
3030
InputGroup,
3131
Row,
32-
Col,
32+
Col
3333
} from "reactstrap";
3434

3535
const Register = () => {

‎src/views/examples/Tables.js

+53-201
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.