Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/v1.1.0 #12

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
package-lock.json

# testing
/coverage
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
legacy-peer-deps=true
auto-install-peers=true
strict-peer-dependencies=false
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [1.1.0] 2023-08-30

- Update dependencies
- Fix warnings

## [1.0.0] 2021-10-05

### Original Release
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Muse Ant Design Dashboard](https://demos.creative-tim.com/muse-ant-design-dashboard/#/dashboard?ref=readme-madd)

![version](https://img.shields.io/badge/version-1.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/muse-ant-design-dashboard.svg)](https://github.com/creativetimofficial/muse-ant-design-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/muse-ant-design-dashboard/issues?q=is%3Aissue+is%3Aclosed)
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/muse-ant-design-dashboard.svg)](https://github.com/creativetimofficial/muse-ant-design-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/muse-ant-design-dashboard/issues?q=is%3Aissue+is%3Aclosed)

![Image](https://s3.amazonaws.com/creativetim_bucket/products/496/original/opt_md_ant_react_thumbnail.jpg?1629182839)

Expand Down Expand Up @@ -117,7 +117,7 @@ If you have questions or need help integrating the product please [contact us](h

## Licensing

- Copyright 2021 [Creative Tim](https://www.creative-tim.com?ref=readme-madd)
- Copyright 2023 [Creative Tim](https://www.creative-tim.com?ref=readme-madd)
- Creative Tim [license](https://www.creative-tim.com/license?ref=readme-madd)

## Useful Links
Expand Down
17,369 changes: 0 additions & 17,369 deletions package-lock.json

This file was deleted.

37 changes: 23 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
{
"name": "muse-ant-design-dashboard",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^4.6.2",
"@ant-design/icons": "4.8.0",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"antd": "^4.16.6",
"apexcharts": "^3.27.1",
"install": "^0.13.0",
"react": "^17.0.2",
"react-apexcharts": "^1.3.9",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"styled-components": "^5.3.0",
"web-vitals": "^1.1.2"
"@testing-library/react": "11.2.7",
"@testing-library/user-event": "12.8.3",
"antd": "4.24.8",
"apexcharts": "3.41.0",
"install": "0.13.0",
"react": "17.0.2",
"react-apexcharts": "1.4.1",
"react-dom": "17.0.2",
"react-router-dom": "5.2.0",
"react-scripts": "5.0.1",
"styled-components": "5.3.10",
"web-vitals": "3.4.0"
},
"devDependencies": {
"@types/sortablejs": "1.15.1",
"better-docs": "2.7.2",
"jsdoc": "4.0.2",
"@babel/plugin-proposal-private-property-in-object": "7.21.11"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -41,5 +47,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"overrides": {
"svgo": "3.0.2"
}
}
50 changes: 27 additions & 23 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand All @@ -13,21 +13,26 @@
-->
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700"
rel="stylesheet"
/>
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -36,13 +41,13 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Muse Dashboard</title>
</head>
<title>Muse Dashboard</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -52,6 +57,5 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>

</html>
</body>
</html>
6 changes: 3 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand All @@ -18,7 +18,7 @@ import Profile from "./pages/Profile";
import SignUp from "./pages/SignUp";
import SignIn from "./pages/SignIn";
import Main from "./components/layout/Main";
import "antd/dist/antd.css";
import "antd/dist/antd.min.css";
import "./assets/styles/main.css";
import "./assets/styles/responsive.css";

Expand Down
4 changes: 2 additions & 2 deletions src/assets/styles/main.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down
4 changes: 2 additions & 2 deletions src/assets/styles/responsive.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down
4 changes: 2 additions & 2 deletions src/components/chart/EChart.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down
4 changes: 2 additions & 2 deletions src/components/chart/LineChart.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/Footer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down
8 changes: 4 additions & 4 deletions src/components/layout/Header.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down Expand Up @@ -294,7 +294,7 @@ function Header({
</Col>
<Col span={24} md={18} className="header-control">
<Badge size="small" count={4}>
<Dropdown overlay={menu} trigger={["click"]}>
<Dropdown menu={menu} trigger={["click"]}>
<a
href="#pablo"
className="ant-dropdown-link"
Expand All @@ -320,7 +320,7 @@ function Header({
width={360}
onClose={hideDrawer}
placement={placement}
visible={visible}
open={visible}
>
<div layout="vertical">
<div className="header-top">
Expand Down
8 changes: 4 additions & 4 deletions src/components/layout/HeaderRtl.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down Expand Up @@ -287,7 +287,7 @@ function Header({
</Col>
<Col span={24} md={18} className="header-control">
<Badge size="small" count={4}>
<Dropdown overlay={menu} trigger={["click"]}>
<Dropdown menu={menu} trigger={["click"]}>
<a
href="#pablo"
className="ant-dropdown-link"
Expand All @@ -313,7 +313,7 @@ function Header({
width={360}
onClose={hideDrawer}
placement={placement}
visible={visible}
open={visible}
>
<div layout="vertical">
<div className="header-top">
Expand Down
8 changes: 5 additions & 3 deletions src/components/layout/Main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*!
=========================================================
* Muse Ant Design Dashboard - v1.0.0
* Muse Ant Design Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/muse-ant-design-dashboard
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/muse-ant-design-dashboard/blob/main/LICENSE.md)
* Coded by Creative Tim
=========================================================
Expand Down Expand Up @@ -40,6 +40,8 @@ function Main({ children }) {
} else {
setPlacement("right");
}

return {};
}, [pathname]);

return (
Expand All @@ -53,7 +55,7 @@ function Main({ children }) {
placement={placement === "right" ? "left" : "right"}
closable={false}
onClose={() => setVisible(false)}
visible={visible}
open={visible}
key={placement === "right" ? "left" : "right"}
width={250}
className={`drawer-sidebar ${
Expand Down
Loading