mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-01-31 22:28:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat/fe/statuspage-3

Browse Source
This commit is contained in:
Shemy Gan
2024-12-13 11:10:47 -05:00
parent 9d212c9616 1cf7df1ac6
commit fdca92e543
6 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Client/package-lock.json generated
View File

@@ -15,8 +15,8 @@
"@mui/lab": "6.0.0-beta.19",
"@mui/material": "6.2.0",
"@mui/x-charts": "^7.5.1",
"@mui/x-data-grid": "7.23.1",
"@mui/x-date-pickers": "7.23.1",
"@mui/x-data-grid": "7.23.2",
"@mui/x-date-pickers": "7.23.2",
"@reduxjs/toolkit": "2.5.0",
"axios": "^1.7.4",
"dayjs": "1.11.13",
@@ -31,7 +31,7 @@
"react-router": "^6.23.0",
"react-router-dom": "^6.23.1",
"react-toastify": "^10.0.5",
"recharts": "2.14.1",
"recharts": "2.15.0",
"redux-persist": "6.0.0",
"vite-plugin-svgr": "^4.2.0"
},
@@ -1393,9 +1393,9 @@
"license": "MIT"
},
"node_modules/@mui/x-charts": {
"version": "7.23.1",
"resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.23.1.tgz",
"integrity": "sha512-hIVRitRSFxf60BHDr+T7Tarj4lLwOV8flebeIsyEPJJHvSlaFNFwr6rqYFb8SGULYU7ppKMhiESD1+YqgJSU1Q==",
"version": "7.23.2",
"resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.23.2.tgz",
"integrity": "sha512-wLeogvQZZtyrAOdG06mDzIQSHBSAB09Uy16AYRUcMxVObi7Fs0i3TJUMpQHMYz1/1DvE1u8zstDgVpVfk8/iCA==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.7",
@@ -1451,9 +1451,9 @@
}
},
"node_modules/@mui/x-data-grid": {
"version": "7.23.1",
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.23.1.tgz",
"integrity": "sha512-1CumfhjGA+WgNtnN3ZD3gCOw6RVf/cEy2X2gS0iyXtVsFNaE+qtyMz9KesQsIzi9u13Wj3RNuhBdH0C5qXtAhQ==",
"version": "7.23.2",
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.23.2.tgz",
"integrity": "sha512-Xhm4Bh+WiU5MSLFIZ8mE1egHoS0xPEVlwvjYvairPIkxNPubB7f+gtLkuAJ2+m+BYbgO7yDte+Pp7dfjkU+vOA==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.7",
@@ -1488,9 +1488,9 @@
}
},
"node_modules/@mui/x-date-pickers": {
"version": "7.23.1",
"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.23.1.tgz",
"integrity": "sha512-Jr4beZ7r2lvWBaFnkIAg9BgiNFcfeJy4AUe3MbG10BBSZyB++odGqhOUAIGqkP7MpUzEGlTv4NUaaD7gYTAQPg==",
"version": "7.23.2",
"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.23.2.tgz",
"integrity": "sha512-Kt9VsEnShaBKiaastTYku66UIWptgc9UMA16d0G/0TkfIsvZrAD3iacQR6HHAXWspaFshdfsRmW2JAoFhzKZsg==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.7",
@@ -5531,9 +5531,9 @@
}
},
"node_modules/recharts": {
"version": "2.14.1",
"resolved": "https://registry.npmjs.org/recharts/-/recharts-2.14.1.tgz",
"integrity": "sha512-xtWulflkA+/xu4/QClBdtZYN30dbvTHjxjkh5XTMrH/CQ3WGDDPHHa/LLKCbgoqz0z3UaSH2/blV1i6VNMeh1g==",
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz",
"integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==",
"license": "MIT",
"dependencies": {
"clsx": "^2.0.0",
@@ -5549,8 +5549,8 @@
"node": ">=14"
},
"peerDependencies": {
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
"react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
}
},
"node_modules/recharts-scale": {

6
Client/package.json
View File

@@ -18,8 +18,8 @@
"@mui/lab": "6.0.0-beta.19",
"@mui/material": "6.2.0",
"@mui/x-charts": "^7.5.1",
"@mui/x-data-grid": "7.23.1",
"@mui/x-date-pickers": "7.23.1",
"@mui/x-data-grid": "7.23.2",
"@mui/x-date-pickers": "7.23.2",
"@reduxjs/toolkit": "2.5.0",
"axios": "^1.7.4",
"dayjs": "1.11.13",
@@ -34,7 +34,7 @@
"react-router": "^6.23.0",
"react-router-dom": "^6.23.1",
"react-toastify": "^10.0.5",
"recharts": "2.14.1",
"recharts": "2.15.0",
"redux-persist": "6.0.0",
"vite-plugin-svgr": "^4.2.0"
},

2
Client/src/Components/TabPanels/Account/ProfilePanel.jsx
View File

@@ -363,7 +363,7 @@ const ProfilePanel = () => {
component="p"
sx={{ opacity: 0.6 }}
>
Note that deleting your account will remove all data from our system. This
Note that deleting your account will remove all data from the server. This
is permanent and non-recoverable.
</Typography>
</Box>

2
Client/src/Pages/Uptime/Details/Charts/index.jsx
View File

@@ -262,7 +262,7 @@ const ResponseGaugeChart = ({ data }) => {
}
: {
category: "Poor",
main: theme.palette.error.contrastText,
main: theme.palette.error.light,
bg: theme.palette.error.dark,
};

2
Client/src/Pages/Uptime/Home/fallback.jsx
View File

@@ -41,7 +41,7 @@ const Fallback = ({ isAdmin }) => {
variant="contained"
color="primary"
onClick={() => {
navigate("/monitors/create");
navigate("/uptime/create");
}}
sx={{ mt: theme.spacing(12) }}
>

6
README.md
View File

@@ -1,3 +1,5 @@
**Need support or have a suggestion? Check our [Discord channel](https://discord.gg/NAb6H3UTjK)**
![](https://img.shields.io/github/license/bluewave-labs/bluewave-uptime)
![](https://img.shields.io/github/repo-size/bluewave-labs/bluewave-uptime)
![](https://img.shields.io/github/commit-activity/w/bluewave-labs/bluewave-uptime)
@@ -32,7 +34,7 @@ See installation instructions in [Checkmate documentation portal](https://bluewa
## 💚 Questions & ideas
We've just launched our [Discussions](https://github.com/bluewave-labs/bluewave-uptime/discussions) page! Feel free to ask questions or share your ideas—we'd love to hear from you!
If you have any questions, suggestions or comments, please use our [Discord channel](https://discord.gg/NAb6H3UTjK). We've also launched our [Discussions](https://github.com/bluewave-labs/bluewave-uptime/discussions) page! Feel free to ask questions or share your ideas—we'd love to hear from you!
## 🧩 Features
@@ -72,7 +74,7 @@ We've just launched our [Discussions](https://github.com/bluewave-labs/bluewave-
## 🤝 Contributing
We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 1300+ stars and attracted 30+ contributors from around the globe. So, don’t hold back — jump in, contribute and learn with us!
We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 1500 stars and attracted 35+ contributors from around the globe. So, don’t hold back — jump in, contribute and learn with us!
Here's how you can contribute: