Merge remote-tracking branch 'upstream/develop' into feat/60-min-chart

This commit is contained in:
Daniel Cojocea committed 2024-08-14 15:28:18 -04:00
commit fec0081ea5
27 files changed
+451 -423

No files matched your search

+9 -15
View File
@@ -18,7 +18,7 @@
"@mui/x-data-grid": "7.3.2", "@mui/x-data-grid": "7.3.2",
"@mui/x-date-pickers": "7.3.2", "@mui/x-date-pickers": "7.3.2",
"@reduxjs/toolkit": "2.2.5", "@reduxjs/toolkit": "2.2.5",
"axios": "1.7.2", "axios": "1.7.4",
"chart.js": "^4.4.3", "chart.js": "^4.4.3",
"dayjs": "1.11.11", "dayjs": "1.11.11",
"joi": "17.13.1", "joi": "17.13.1",
@@ -29,7 +29,7 @@
"react-router": "^6.23.0", "react-router": "^6.23.0",
"react-router-dom": "^6.23.1", "react-router-dom": "^6.23.1",
"react-toastify": "^10.0.5", "react-toastify": "^10.0.5",
"recharts": "2.12.7", "recharts": "2.13.0-alpha.4",
"redux-persist": "6.0.0", "redux-persist": "6.0.0",
"vite-plugin-svgr": "^4.2.0" "vite-plugin-svgr": "^4.2.0"
}, },
@@ -2655,9 +2655,9 @@
} }
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.7.2", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
"integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.6", "follow-redirects": "^1.15.6",
@@ -5509,15 +5509,15 @@
} }
}, },
"node_modules/recharts": { "node_modules/recharts": {
"version": "2.12.7", "version": "2.13.0-alpha.4",
"resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.7.tgz", "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.13.0-alpha.4.tgz",
"integrity": "sha512-hlLJMhPQfv4/3NBSAyq3gzGg4h2v69RJh6KU7b3pXYNNAELs9kEoXOjbkxdXpALqKBoVmVptGfLpxdaVYqjmXQ==", "integrity": "sha512-K9naL6F7pEcDYJE6yFQASSCQecSLPP0JagnvQ9hPtA/aHgsxsnIOjouLP5yrFZehxzfCkV5TEORr7/uNtSr7Qw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"clsx": "^2.0.0", "clsx": "^2.0.0",
"eventemitter3": "^4.0.1", "eventemitter3": "^4.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"react-is": "^16.10.2", "react-is": "^18.3.1",
"react-smooth": "^4.0.0", "react-smooth": "^4.0.0",
"recharts-scale": "^0.4.4", "recharts-scale": "^0.4.4",
"tiny-invariant": "^1.3.1", "tiny-invariant": "^1.3.1",
@@ -5540,12 +5540,6 @@
"decimal.js-light": "^2.4.1" "decimal.js-light": "^2.4.1"
} }
}, },
"node_modules/recharts/node_modules/react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"license": "MIT"
},
"node_modules/redux": { "node_modules/redux": {
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+2 -2
View File
@@ -20,7 +20,7 @@
"@mui/x-data-grid": "7.3.2", "@mui/x-data-grid": "7.3.2",
"@mui/x-date-pickers": "7.3.2", "@mui/x-date-pickers": "7.3.2",
"@reduxjs/toolkit": "2.2.5", "@reduxjs/toolkit": "2.2.5",
"axios": "1.7.2", "axios": "1.7.4",
"chart.js": "^4.4.3", "chart.js": "^4.4.3",
"dayjs": "1.11.11", "dayjs": "1.11.11",
"joi": "17.13.1", "joi": "17.13.1",
@@ -31,7 +31,7 @@
"react-router": "^6.23.0", "react-router": "^6.23.0",
"react-router-dom": "^6.23.1", "react-router-dom": "^6.23.1",
"react-toastify": "^10.0.5", "react-toastify": "^10.0.5",
"recharts": "2.12.7", "recharts": "2.13.0-alpha.4",
"redux-persist": "6.0.0", "redux-persist": "6.0.0",
"vite-plugin-svgr": "^4.2.0" "vite-plugin-svgr": "^4.2.0"
}, },
+26 -3
View File
@@ -3,6 +3,27 @@ import PropTypes from "prop-types";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
/**
* Generates a color based on the input string.
* @param {string} string - The input string to generate the color from.
* @returns {string}
*/
const stringToColor = (string) => {
let hash = 0;
let i;
for (i = 0; i < string.length; i += 1) {
hash = string.charCodeAt(i) + ((hash << 5) - hash);
}
let color = "#";
for (i = 0; i < 3; i += 1) {
const value = (hash >> (i * 8)) & 0xff;
color += `00${value.toString(16)}`.slice(-2);
}
return color;
};
/** /**
* @component * @component
* @param {Object} props * @param {Object} props
@@ -18,7 +39,7 @@ import { useEffect, useState } from "react";
const Avatar = ({ src, small, sx }) => { const Avatar = ({ src, small, sx }) => {
const { user } = useSelector((state) => state.auth); const { user } = useSelector((state) => state.auth);
const style = small ? { width: 25, height: 25 } : { width: 64, height: 64 }; const style = small ? { width: 32, height: 32 } : { width: 64, height: 64 };
const border = small ? 1 : 3; const border = small ? 1 : 3;
const [image, setImage] = useState(); const [image, setImage] = useState();
@@ -35,8 +56,9 @@ const Avatar = ({ src, small, sx }) => {
src ? src : user?.avatarImage ? image : "/static/images/avatar/2.jpg" src ? src : user?.avatarImage ? image : "/static/images/avatar/2.jpg"
} }
sx={{ sx={{
fontSize: small ? "13px" : "22px", fontSize: small ? "16px" : "22px",
fontWeight: 400, fontWeight: 400,
backgroundColor: stringToColor(`${user?.firstName} ${user?.lastName}`),
display: "inline-flex", display: "inline-flex",
"&::before": { "&::before": {
content: `""`, content: `""`,
@@ -52,7 +74,8 @@ const Avatar = ({ src, small, sx }) => {
...sx, ...sx,
}} }}
> >
{user.firstName?.charAt(0)}{user.lastName?.charAt(0)} {user.firstName?.charAt(0)}
{user.lastName?.charAt(0)}
</MuiAvatar> </MuiAvatar>
); );
}; };
@@ -28,15 +28,6 @@ const CustomToolTip = ({ active, payload, label }) => {
}; };
const MonitorDetailsAreaChart = ({ checks }) => { const MonitorDetailsAreaChart = ({ checks }) => {
// SQUASH ERROR, NOT PERMANENT SOLUTION
const error = console.error;
console.error = (...args) => {
if (/defaultProps/.test(args[0])) return;
error(...args);
};
// END SQUASH ERROR, NOT PERMANENT SOLUTION
const formatDate = (timestamp) => { const formatDate = (timestamp) => {
const date = new Date(timestamp); const date = new Date(timestamp);
return date.toLocaleTimeString("en-US", { return date.toLocaleTimeString("en-US", {
-34
View File
@@ -1,34 +0,0 @@
/* NavBar Component Styles*/
.MuiToolbar-root {
min-height: var(--env-var-nav-bar-height) !important;
}
.icon-button-toggle-title {
font-size: var(--env-var-font-size-medium);
color: var(--env-var-color-5);
}
.icon-button-toggle-pic {
width: 10px;
height: 5px;
}
#icon-button {
-webkit-transition: none;
transition: none;
outline: none;
box-shadow: none;
background-color: transparent;
}
#menu-appbar svg {
width: 16px;
height: 16px;
color: var(--env-var-color-25);
}
#bw-uptime-logo-dashboard {
width: fit-content;
height: 16px;
margin-left: 15px;
}
-203
View File
@@ -1,203 +0,0 @@
import "./index.css";
import { cloneElement, useState } from "react";
import AppBar from "@mui/material/AppBar";
import Box from "@mui/material/Box";
import Toolbar from "@mui/material/Toolbar";
import IconButton from "@mui/material/IconButton";
import Typography from "@mui/material/Typography";
import Menu from "@mui/material/Menu";
import Avatar from "../Avatar";
import Tooltip from "@mui/material/Tooltip";
import MenuItem from "@mui/material/MenuItem";
import { useTheme } from "@mui/material/styles";
import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import { clearAuthState } from "../../Features/Auth/authSlice";
import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { useDispatch, useSelector } from "react-redux";
import { useNavigate } from "react-router-dom";
import LockSvg from "../../assets/icons/lock.svg?react";
import UserSvg from "../../assets/icons/user.svg?react";
import TeamSvg from "../../assets/icons/user-two.svg?react";
import LogoutSvg from "../../assets/icons/logout.svg?react";
import { Stack, useScrollTrigger } from "@mui/material";
import axiosIntance from "../../Utils/axiosConfig";
import axios from "axios";
const icons = {
Profile: <UserSvg />,
Team: <TeamSvg />,
Password: <LockSvg />,
Logout: <LogoutSvg />,
};
function AddBorderOnScroll(props) {
const { children, window } = props;
const trigger = useScrollTrigger({
target: window ? window() : undefined,
disableHysteresis: true,
threshold: 0,
});
return (
<AppBar
className={trigger ? "scrolled" : ""}
position="sticky"
sx={{
boxShadow: "none",
transition: "all 0.3s ease",
borderBottom: "1px solid transparent",
"&.scrolled": {
borderBottom: "1px solid #eaecf0",
backgroundColor: "white",
},
}}
>
{children}
</AppBar>
);
}
/**
* NavBar component
*
* A responsive navigation bar component with a user menu.
*
* @component
* @example
* return (
* <NavBar />
* )
*/
function NavBar() {
const theme = useTheme();
const [anchorElUser, setAnchorElUser] = useState(null);
const dispatch = useDispatch();
const navigate = useNavigate();
const authState = useSelector((state) => state.auth);
// Initialize settings and update based on user role
let settings = ["Profile", "Password", "Team", "Logout"];
if (authState.user?.role && !authState.user.role.includes("admin")) {
settings = ["Profile", "Password", "Logout"];
}
/**
* Handles opening the user menu.
*
* @param {React.MouseEvent<HTMLElement>} event - The event triggered by clicking the user menu button.
*/
const handleOpenUserMenu = (event) => {
setAnchorElUser(event.currentTarget);
};
/**
* Handles logging out the user
*
*/
const logout = async () => {
// Clear auth state
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
// Make request to BE to remove JWT from user
await axiosIntance.post(
"/auth/logout",
{ email: authState.user.email },
{
headers: {
Authorization: `Bearer ${authState.authToken}`,
"Content-Type": "application/json",
},
}
);
navigate("/login");
};
/**
* Handles closing the user menu.
*/
const handleCloseUserMenu = (setting) => {
setAnchorElUser(null);
switch (setting) {
case "Profile":
navigate("/account/profile");
break;
case "Team":
navigate("/account/team");
break;
case "Password":
navigate("/account/password");
break;
case "Logout":
logout();
break;
default:
break;
}
};
return (
<AddBorderOnScroll>
<Toolbar disableGutters sx={{ alignSelf: "flex-end", paddingX: "25px" }}>
<Tooltip title="Open settings">
<IconButton
id="icon-button"
onClick={handleOpenUserMenu}
sx={{ p: 0 }}
>
<Stack direction="row" alignItems="center" gap="8px">
<Avatar small={true} />
<Box
className="icon-button-toggle-title"
sx={{ mr: "3px", lineHeight: 2 }}
>
{authState.user?.firstName} {authState.user?.lastName}
</Box>
<KeyboardArrowDownIcon sx={{ mt: "2px" }} />
</Stack>
</IconButton>
</Tooltip>
<Menu
sx={{
mt: theme.spacing(5.5),
borderRadius: "4px",
}}
id="menu-appbar"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: "top",
horizontal: "right",
}}
keepMounted
transformOrigin={{
vertical: "top",
horizontal: "right",
}}
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
>
{settings.map((setting) => (
<MenuItem
id="menu-item"
key={setting}
onClick={() => handleCloseUserMenu(setting)}
sx={{ width: "150px" }}
>
{icons[setting]}
<Typography
fontSize="var(--env-var-font-size-medium)"
textAlign="center"
marginLeft="8px"
sx={{ fontWeight: 400, color: "#344054" }}
>
{setting}
</Typography>
</MenuItem>
))}
</Menu>
</Toolbar>
</AddBorderOnScroll>
);
}
export default NavBar;
+36 -3
View File
@@ -18,11 +18,14 @@ aside span.MuiTypography-root {
color: var(--env-var-color-5); color: var(--env-var-color-5);
line-height: 1; line-height: 1;
} }
aside .MuiStack-root:nth-last-child(2) { aside .MuiStack-root:nth-last-child(3) {
margin-top: auto; margin-top: auto;
}
aside .MuiStack-root:last-child,
aside .MuiStack-root:nth-last-child(3) {
position: relative; position: relative;
} }
aside .MuiStack-root:nth-last-child(2):before { aside .MuiStack-root:last-child:before {
content: ""; content: "";
position: absolute; position: absolute;
top: -10px; top: -10px;
@@ -31,5 +34,35 @@ aside .MuiStack-root:nth-last-child(2):before {
border-top: solid 1px var(--env-var-color-6); border-top: solid 1px var(--env-var-color-6);
} }
aside .MuiStack-root:last-child { aside .MuiStack-root:last-child {
margin-bottom: 10px; margin-top: 15px;
}
.sidebar-menu {
margin-top: -20px;
}
.sidebar-menu .MuiPaper-root {
box-shadow: var(--env-var-shadow-1);
border: solid 1px var(--env-var-color-6);
border-radius: var(--env-var-radius-1);
gap: 1px;
}
.sidebar-menu .MuiList-root {
min-width: 100px;
width: 150px;
padding-bottom: 0;
}
.sidebar-menu li.MuiButtonBase-root:last-child {
border-top: solid 1px var(--env-var-color-6);
padding: 12px 16px;
}
.sidebar-menu li.MuiButtonBase-root {
min-height: fit-content;
}
.sidebar-menu .MuiList-root svg {
width: 16px;
height: 16px;
}
.sidebar-menu span {
font-size: var(--env-var-font-size-medium);
color: var(--env-var-color-2);
} }
+154 -10
View File
@@ -1,7 +1,17 @@
import { Stack, Typography } from "@mui/material"; import { useState } from "react";
import { Menu, MenuItem, Stack, Tooltip, Typography } from "@mui/material";
import { useLocation, useNavigate } from "react-router"; import { useLocation, useNavigate } from "react-router";
import { useTheme } from "@emotion/react"; import { useTheme } from "@emotion/react";
import { useDispatch, useSelector } from "react-redux";
import { clearAuthState } from "../../Features/Auth/authSlice";
import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { createToast } from "../../Utils/toastUtils";
import axiosInstance from "../../Utils/axiosConfig";
import Avatar from "../Avatar";
import LockSvg from "../../assets/icons/lock.svg?react";
import UserSvg from "../../assets/icons/user.svg?react";
import TeamSvg from "../../assets/icons/user-two.svg?react";
import LogoutSvg from "../../assets/icons/logout.svg?react";
import BWULogo from "../../assets/Images/bwl-logo.svg?react"; import BWULogo from "../../assets/Images/bwl-logo.svg?react";
import Support from "../../assets/icons/support.svg?react"; import Support from "../../assets/icons/support.svg?react";
import StatusPages from "../../assets/icons/status-pages.svg?react"; import StatusPages from "../../assets/icons/status-pages.svg?react";
@@ -11,16 +21,10 @@ import Incidents from "../../assets/icons/incidents.svg?react";
import Integrations from "../../assets/icons/integrations.svg?react"; import Integrations from "../../assets/icons/integrations.svg?react";
import PageSpeed from "../../assets/icons/page-speed.svg?react"; import PageSpeed from "../../assets/icons/page-speed.svg?react";
import Settings from "../../assets/icons/settings.svg?react"; import Settings from "../../assets/icons/settings.svg?react";
import Arrow from "../../assets/icons/down-arrow.svg?react";
import "./index.css"; import "./index.css";
/**
* @component
* Sidebar component serves as a sidebar containing a menu.
*
* @returns {JSX.Element} The JSX element representing the Sidebar component.
*/
const menu = [ const menu = [
{ name: "Monitors", path: "monitors", icon: <Monitors /> }, { name: "Monitors", path: "monitors", icon: <Monitors /> },
{ name: "Incidents", path: "incidents", icon: <Incidents /> }, { name: "Incidents", path: "incidents", icon: <Incidents /> },
@@ -32,10 +36,94 @@ const menu = [
{ name: "Settings", path: "settings", icon: <Settings /> }, { name: "Settings", path: "settings", icon: <Settings /> },
]; ];
const icons = {
Profile: <UserSvg />,
Team: <TeamSvg />,
Password: <LockSvg />,
Logout: <LogoutSvg />,
};
/**
* @component
* Sidebar component serves as a sidebar containing a menu.
*
* @returns {JSX.Element} The JSX element representing the Sidebar component.
*/
function Sidebar() { function Sidebar() {
const theme = useTheme(); const theme = useTheme();
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation(); const location = useLocation();
const dispatch = useDispatch();
const [anchorElUser, setAnchorElUser] = useState(null);
const authState = useSelector((state) => state.auth);
// Initialize settings and update based on user role
let settings = ["Profile", "Password", "Team", "Logout"];
if (authState.user?.role && !authState.user.role.includes("admin")) {
settings = ["Profile", "Password", "Logout"];
}
/**
* Handles opening the user menu.
*
* @param {React.MouseEvent<HTMLElement>} event - The event triggered by clicking the user menu button.
*/
const handleOpenUserMenu = (event) => {
setAnchorElUser(event.currentTarget);
};
/**
* Handles logging out the user
*
*/
const logout = async () => {
try {
// Make request to BE to remove JWT from user
await axiosInstance.post(
"/auth/logout",
{ email: authState.user.email },
{
headers: {
Authorization: `Bearer ${authState.authToken}`,
"Content-Type": "application/json",
},
}
);
// Clear auth state
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
navigate("/login");
} catch (error) {
createToast({
body: error.message,
});
}
};
/**
* Handles closing the user menu.
*/
const handleCloseUserMenu = (setting) => {
setAnchorElUser(null);
switch (setting) {
case "Profile":
navigate("/account/profile");
break;
case "Team":
navigate("/account/team");
break;
case "Password":
navigate("/account/password");
break;
case "Logout":
logout();
break;
default:
break;
}
};
return ( return (
<Stack component="aside" gap={theme.gap.xs}> <Stack component="aside" gap={theme.gap.xs}>
@@ -48,6 +136,8 @@ function Sidebar() {
key={item.path} key={item.path}
direction="row" direction="row"
alignItems="center" alignItems="center"
py={theme.gap.small}
px={theme.gap.medium}
gap={theme.gap.small} gap={theme.gap.small}
borderRadius={`${theme.shape.borderRadius}px`} borderRadius={`${theme.shape.borderRadius}px`}
onClick={() => onClick={() =>
@@ -59,12 +149,66 @@ function Sidebar() {
) )
: navigate(`/${item.path}`) : navigate(`/${item.path}`)
} }
sx={{ p: `${theme.gap.small} ${theme.gap.medium}` }}
> >
{item.icon} {item.icon}
<Typography component="span">{item.name}</Typography> <Typography component="span">{item.name}</Typography>
</Stack> </Stack>
))} ))}
<Tooltip
title="Open settings"
slotProps={{
popper: {
modifiers: [
{
name: "offset",
options: {
offset: [0, -14],
},
},
],
},
}}
>
<Stack
direction="row"
alignItems="center"
py={theme.gap.small}
px={theme.gap.medium}
gap={theme.gap.xs}
borderRadius={`${theme.shape.borderRadius}px`}
onClick={handleOpenUserMenu}
>
<Avatar small={true} />
<Typography component="span" ml={theme.gap.xs}>
{authState.user?.firstName} {authState.user?.lastName}
</Typography>
<Arrow style={{ marginTop: "2px", marginLeft: "auto" }} />
</Stack>
</Tooltip>
<Menu
className="sidebar-menu"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: "top",
horizontal: "center",
}}
keepMounted
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
autoFocus={false}
sx={{
ml: theme.gap.xxl,
}}
>
{settings.map((setting) => (
<MenuItem key={setting} onClick={() => handleCloseUserMenu(setting)}>
{icons[setting]}
<Typography component="span" ml={theme.gap.small}>
{setting}
</Typography>
</MenuItem>
))}
</Menu>
</Stack> </Stack>
); );
} }
+30 -6
View File
@@ -20,7 +20,11 @@ export const register = createAsyncThunk(
if (error.response.data) { if (error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -33,7 +37,11 @@ export const login = createAsyncThunk("auth/login", async (form, thunkApi) => {
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
}); });
@@ -72,7 +80,11 @@ export const update = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -91,7 +103,11 @@ export const deleteUser = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -106,7 +122,11 @@ export const forgotPassword = createAsyncThunk(
if (error.response.data) { if (error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -128,7 +148,11 @@ export const setNewPassword = createAsyncThunk(
if (error.response.data) { if (error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -25,7 +25,11 @@ export const createPageSpeed = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -40,7 +44,11 @@ export const getPageSpeedMonitors = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -63,7 +71,11 @@ export const getPageSpeedByUserId = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -94,7 +106,11 @@ export const updatePageSpeed = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -115,7 +131,11 @@ export const deletePageSpeed = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -25,7 +25,11 @@ export const createUptimeMonitor = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -40,7 +44,11 @@ export const getUptimeMonitors = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -63,7 +71,11 @@ export const getUptimeMonitorsByUserId = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -94,7 +106,11 @@ export const updateUptimeMonitor = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
@@ -115,7 +131,11 @@ export const deleteUptimeMonitor = createAsyncThunk(
if (error.response && error.response.data) { if (error.response && error.response.data) {
return thunkApi.rejectWithValue(error.response.data); return thunkApi.rejectWithValue(error.response.data);
} }
return thunkApi.rejectWithValue(error.message); const payload = {
status: false,
msg: error.message ? error.message : "Unknown error",
};
return thunkApi.rejectWithValue(payload);
} }
} }
); );
+24 -45
View File
@@ -1,55 +1,34 @@
.home-layout { #root:has(.home-layout) {
display: grid;
position: relative;
grid-template-areas:
"aside header"
"aside main";
grid-template-columns: var(--env-var-side-bar-width) auto;
grid-template-rows: var(--env-var-nav-bar-height) auto;
background-color: var(--env-var-color-30); background-color: var(--env-var-color-30);
}
.home-layout {
display: flex;
position: relative;
gap: var(--env-var-spacing-2);
min-height: 100vh; min-height: 100vh;
max-width: 1400px;
margin: 0 auto;
padding: var(--env-var-spacing-2);
} }
.home-layout aside { .home-layout aside {
grid-area: aside; position: sticky;
position: fixed; top: var(--env-var-spacing-2);
top: 0; left: 0;
height: 100%;
width: var(--env-var-side-bar-width); height: calc(100vh - var(--env-var-spacing-2) * 2);
max-width: var(--env-var-side-bar-width);
flex: 1;
border: 1px solid var(--color-border-0);
border-radius: var(--env-var-radius-1);
background-color: var(--env-var-color-8); background-color: var(--env-var-color-8);
border-right: 1px solid var(--color-border-0);
padding: var(--env-var-spacing-1) var(--env-var-spacing-1-plus); padding: var(--env-var-spacing-1) var(--env-var-spacing-1-plus);
} }
.home-layout header {
grid-area: header;
background-color: var(--env-var-color-30);
}
.home-layout > div { .home-layout > div {
height: 100%; min-height: calc(100vh - var(--env-var-spacing-2) * 2);
grid-area: main; flex: 1;
padding: var(--env-var-spacing-2) calc(var(--env-var-spacing-4) * 2);
padding-bottom: var(--env-var-spacing-4);
max-width: 100%;
}
.home-layout > div:not(:has([class*="fallback"])) {
max-width: 1500px;
}
@media (max-width: 600px) {
.home-layout {
grid-template-areas:
"header header"
"main main";
grid-template-columns: 1fr;
grid-template-rows: 64px auto;
}
aside {
display: none;
visibility: hidden;
}
.home-layout > div {
padding: var(--env-var-spacing-1);
}
} }
-2
View File
@@ -1,4 +1,3 @@
import NavBar from "../../Components/NavBar";
import Sidebar from "../../Components/Sidebar"; import Sidebar from "../../Components/Sidebar";
import { Outlet } from "react-router"; import { Outlet } from "react-router";
import { Box } from "@mui/material"; import { Box } from "@mui/material";
@@ -9,7 +8,6 @@ const HomeLayout = () => {
return ( return (
<Box className="home-layout"> <Box className="home-layout">
<Sidebar /> <Sidebar />
<NavBar />
<Outlet /> <Outlet />
</Box> </Box>
); );
+1 -1
View File
@@ -29,7 +29,7 @@ const Account = ({ open = "profile" }) => {
if (!user.role.includes("admin")) tabList = ["Profile", "Password"]; if (!user.role.includes("admin")) tabList = ["Profile", "Password"];
return ( return (
<Box className="account"> <Box className="account" pt={theme.gap.xl}>
<TabContext value={tab}> <TabContext value={tab}>
<Box <Box
sx={{ sx={{
+1 -1
View File
@@ -78,7 +78,7 @@ const Incidents = () => {
}; };
return ( return (
<Stack className="incidents" gap={theme.gap.large}> <Stack className="incidents" pt={theme.gap.xl} gap={theme.gap.large}>
{loading ? ( {loading ? (
<SkeletonLayout /> <SkeletonLayout />
) : ( ) : (
+1 -1
View File
@@ -108,7 +108,7 @@ const Integrations = () => {
]; ];
return ( return (
<Stack className="integrations" gap={theme.gap.xs}> <Stack className="integrations" pt={theme.gap.xl} gap={theme.gap.xs}>
<Typography component="h1">Integrations</Typography> <Typography component="h1">Integrations</Typography>
<Typography mb={theme.gap.large}> <Typography mb={theme.gap.large}>
Connect BlueWave Uptime to your favorite service. Connect BlueWave Uptime to your favorite service.
@@ -75,7 +75,7 @@
.configure-monitor-form { .configure-monitor-form {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: var(--env-var-spacing-4); gap: var(--env-var-spacing-2);
} }
body:has(.configure-monitor) .select-dropdown .MuiMenuItem-root, body:has(.configure-monitor) .select-dropdown .MuiMenuItem-root,
@@ -59,7 +59,7 @@
.create-monitor-form { .create-monitor-form {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: var(--env-var-spacing-4); gap: var(--env-var-spacing-2);
} }
.create-monitor .MuiStack-root .MuiButtonGroup-root button { .create-monitor .MuiStack-root .MuiButtonGroup-root button {
+24 -13
View File
@@ -120,12 +120,11 @@ const Monitors = () => {
}; };
const closeMenu = () => { const closeMenu = () => {
setAnchorEl(null); setAnchorEl(null);
setActions({});
}; };
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const openRemove = () => { const openRemove = () => {
setAnchorEl(null); closeMenu();
setIsOpen(true); setIsOpen(true);
}; };
const handleRemove = async (event) => { const handleRemove = async (event) => {
@@ -220,7 +219,11 @@ const Monitors = () => {
aria-label="monitor actions" aria-label="monitor actions"
onClick={(event) => { onClick={(event) => {
event.stopPropagation(); event.stopPropagation();
openMenu(event, monitor._id, monitor.url); openMenu(
event,
monitor._id,
monitor.type === "ping" ? null : monitor.url
);
}} }}
sx={{ sx={{
"&:focus": { "&:focus": {
@@ -240,7 +243,7 @@ const Monitors = () => {
let loading = monitorState.isLoading && monitorState.monitors.length === 0; let loading = monitorState.isLoading && monitorState.monitors.length === 0;
return ( return (
<Stack className="monitors" gap={theme.gap.large}> <Stack className="monitors" pt={theme.gap.xl} gap={theme.gap.large}>
{loading ? ( {loading ? (
<SkeletonLayout /> <SkeletonLayout />
) : ( ) : (
@@ -250,7 +253,10 @@ const Monitors = () => {
justifyContent="space-between" justifyContent="space-between"
alignItems="center" alignItems="center"
> >
<Typography component="h1"> <Typography
component="h1"
sx={{ lineHeight: 1, alignSelf: "flex-end" }}
>
Hello, {authState.user.firstName} Hello, {authState.user.firstName}
</Typography> </Typography>
{monitorState.monitors?.length !== 0 && ( {monitorState.monitors?.length !== 0 && (
@@ -299,7 +305,8 @@ const Monitors = () => {
</Stack> </Stack>
<Stack <Stack
gap={theme.gap.large} gap={theme.gap.large}
p={theme.gap.xl} p={theme.gap.lgplus}
flex={1}
border={1} border={1}
borderColor={theme.palette.otherColors.graishWhite} borderColor={theme.palette.otherColors.graishWhite}
backgroundColor={theme.palette.otherColors.white} backgroundColor={theme.palette.otherColors.white}
@@ -326,13 +333,17 @@ const Monitors = () => {
open={Boolean(anchorEl)} open={Boolean(anchorEl)}
onClose={closeMenu} onClose={closeMenu}
> >
<MenuItem {actions.url !== null ? (
onClick={() => { <MenuItem
window.open(actions.url, "_blank", "noreferrer"); onClick={() => {
}} window.open(actions.url, "_blank", "noreferrer");
> }}
Open site >
</MenuItem> Open site
</MenuItem>
) : (
""
)}
<MenuItem onClick={() => navigate(`/monitors/${actions.id}`)}> <MenuItem onClick={() => navigate(`/monitors/${actions.id}`)}>
Details Details
</MenuItem> </MenuItem>
@@ -106,7 +106,7 @@ const CreatePageSpeed = () => {
onClick={() => navigate("/pagespeed")} onClick={() => navigate("/pagespeed")}
sx={{ sx={{
backgroundColor: theme.palette.otherColors.fillGray, backgroundColor: theme.palette.otherColors.fillGray,
mb: theme.gap.large, mb: theme.gap.medium,
px: theme.gap.ml, px: theme.gap.ml,
"& svg.MuiSvgIcon-root": { "& svg.MuiSvgIcon-root": {
mr: theme.gap.small, mr: theme.gap.small,
@@ -122,8 +122,6 @@ const CreatePageSpeed = () => {
display: "flex", display: "flex",
flexDirection: "column", flexDirection: "column",
gap: theme.gap.large, gap: theme.gap.large,
// TODO
maxWidth: "1000px",
}} }}
> >
<Typography component="h1">Create a page speed monitor</Typography> <Typography component="h1">Create a page speed monitor</Typography>
+4 -4
View File
@@ -299,7 +299,7 @@ const PageSpeedDetails = () => {
const [expand, setExpand] = useState(false); const [expand, setExpand] = useState(false);
let loading = Object.keys(monitor).length === 0; let loading = Object.keys(monitor).length === 0;
const data = monitor?.checks ? [...monitor.checks].reverse() : [];
return ( return (
<Stack className="page-speed-details" gap={theme.gap.large}> <Stack className="page-speed-details" gap={theme.gap.large}>
{loading ? ( {loading ? (
@@ -363,7 +363,7 @@ const PageSpeedDetails = () => {
<Stack <Stack
direction="row" direction="row"
justifyContent="space-between" justifyContent="space-between"
gap={theme.gap.xl} gap={theme.gap.large}
flexWrap="wrap" flexWrap="wrap"
> >
<StatBox <StatBox
@@ -406,10 +406,10 @@ const PageSpeedDetails = () => {
</Stack> </Stack>
<Typography component="h2">Score history</Typography> <Typography component="h2">Score history</Typography>
<Box height="300px"> <Box height="300px">
<PageSpeedLineChart pageSpeedChecks={monitor?.checks?.reverse()} /> <PageSpeedLineChart pageSpeedChecks={data} />
</Box> </Box>
<Typography component="h2">Performance report</Typography> <Typography component="h2">Performance report</Typography>
<Stack direction="row" alignItems="center" overflow="hidden"> <Stack direction="row" alignItems="center" overflow="hidden" flex={1}>
<Stack <Stack
alignItems="center" alignItems="center"
textAlign="center" textAlign="center"
+1 -1
View File
@@ -136,7 +136,7 @@ const PageSpeed = () => {
let isActuallyLoading = isLoading && monitors.length === 0; let isActuallyLoading = isLoading && monitors.length === 0;
return ( return (
<Box className="page-speed"> <Box className="page-speed" pt={theme.gap.xl}>
{isActuallyLoading ? ( {isActuallyLoading ? (
<SkeletonLayout /> <SkeletonLayout />
) : monitors?.length !== 0 ? ( ) : monitors?.length !== 0 ? (
+2 -1
View File
@@ -96,9 +96,10 @@ const theme = createTheme({
ml: "16px", ml: "16px",
mlplus: "20px", mlplus: "20px",
large: "24px", large: "24px",
lgplus: "32px",
xl: "40px", xl: "40px",
xxl: "60px", xxl: "60px",
triplexl: "120px" triplexl: "120px",
}, },
alert: { alert: {
info: { info: {
+3
View File
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 9L12 15L18 9" stroke="#667085" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 212 B

+48 -16
View File
@@ -6,7 +6,6 @@
![](https://img.shields.io/github/issues-pr/bluewave-labs/bluewave-uptime) ![](https://img.shields.io/github/issues-pr/bluewave-labs/bluewave-uptime)
![](https://img.shields.io/github/issues/bluewave-labs/bluewave-uptime) ![](https://img.shields.io/github/issues/bluewave-labs/bluewave-uptime)
<h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">BlueWave Uptime</a></h1> <h1 align="center"><a href="https://bluewavelabs.ca" target="_blank">BlueWave Uptime</a></h1>
<p align="center"><strong>An open source server monitoring application</strong></p> <p align="center"><strong>An open source server monitoring application</strong></p>
@@ -26,29 +25,31 @@ BlueWave Uptime is an open source server monitoring application used to track th
- [ ] Scheduled maintenance (in the works) - [ ] Scheduled maintenance (in the works)
**Roadmap (short term):** **Roadmap (short term):**
- [ ] Memory, disk and CPU monitoring - [ ] Memory, disk and CPU monitoring
- [ ] 3rd party integrations - [ ] 3rd party integrations
- [ ] DNS monitoring - [ ] DNS monitoring
- [ ] SSL monitoring - [ ] SSL monitoring
**Roadmap (long term):** **Roadmap (long term):**
- [ ] Status pages - [ ] Status pages
## Tech stack ## Tech stack
* [ReactJs](https://react.dev/) - [ReactJs](https://react.dev/)
* [MUI (React framework)](https://mui.com/) - [MUI (React framework)](https://mui.com/)
* [Node.js](https://nodejs.org/en) - [Node.js](https://nodejs.org/en)
* [MongoDB](https://mongodb.com) - [MongoDB](https://mongodb.com)
## Contributing ## Contributing
We love contributors. Here's how you can contribute: We love contributors. Here's how you can contribute:
* Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). - Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md).
* Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. - Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only.
* Open an issue if you believe you've encountered a bug - Open an issue if you believe you've encountered a bug
* Make a pull request to add new features/make quality-of-life improvements/fix bugs. - Make a pull request to add new features/make quality-of-life improvements/fix bugs.
<a href="https://github.com/bluewave-labs/bluewave-uptime/graphs/contributors"> <a href="https://github.com/bluewave-labs/bluewave-uptime/graphs/contributors">
<img src="https://contrib.rocks/image?repo=bluewave-labs/bluewave-uptime" /> <img src="https://contrib.rocks/image?repo=bluewave-labs/bluewave-uptime" />
@@ -58,12 +59,12 @@ Made with [contrib.rocks](https://contrib.rocks).
![Alt](https://repobeats.axiom.co/api/embed/c35d999c82dbb31e967427ea4166c14da4172e73.svg "Repobeats analytics image") ![Alt](https://repobeats.axiom.co/api/embed/c35d999c82dbb31e967427ea4166c14da4172e73.svg "Repobeats analytics image")
## Getting Started ## Getting Started
- Clone this repository to your local machine - Clone this repository to your local machine
1. [Docker Quickstart](#docker-quickstart) 1. [Quickstart for Developers](#dev-quickstart)
1. [Docker Compose](#docker-compose)
1. [Installation (Client)](#client) 1. [Installation (Client)](#client)
1. [Configuration(Client)](#config-client) 1. [Configuration(Client)](#config-client)
- [Environment](#env-vars-client) - [Environment](#env-vars-client)
@@ -117,9 +118,41 @@ Made with [contrib.rocks](https://contrib.rocks).
--- ---
### Docker Quick Start #### <u>Quickstart for Developers</u> <a id="dev-quickstart"></a>
#### <u>Docker Quickstart</u> <a id="docker-quickstart"></a> <span style="color: red; font-weight: bold;">MAKE SURE YOU CD TO THE SPECIFIED DIRECTORIES AS PATHS IN COMMANDS ARE RELATIVE</span>
##### Cloning and Initial Setup
1. Clone this repository
2. Checkout the `develop` branch `git checkout develop`
##### Docker Images Setup
3. <span style="color: red; font-weight: bold;">CD</span> to the `Docker` directory
4. Run `docker run -d -p 6379:6379 -v $(pwd)/redis/data:/data --name uptime_redis uptime_redis`
5. Run `docker run -d -p 27017:27017 -v $(pwd)/mongo/data:/data/db --name uptime_database_mongo uptime_database_mongo`
##### Server Setup
6. <span style="color: red; font-weight: bold;">CD</span> to `Server` directory, run `npm install`
7. While in `Server` directory, create a `.env` file with the [required environmental variables](#env-vars-server)
8. While in the `Server` directory, run `npm run dev`
##### Client Setup
9. <span style="color: red; font-weight: bold;">CD</span> to `Client` directory `run npm install`
10. While in the `Client` directory, create a `.env` file with the [required environmental variables](#env-vars-client)
11. While in the `Client` cirectory run `npm run dev`
##### Access Application
12. Client is running at `localhost:5173`
13. Server is running at `localhost:5000`
---
#### <u>Docker Compose</u> <a id="docker-compose"></a>
The fastest way to start the application is to use our Dockerfiles and [Docker Compose](https://docs.docker.com/compose/). The fastest way to start the application is to use our Dockerfiles and [Docker Compose](https://docs.docker.com/compose/).
@@ -143,7 +176,7 @@ SYSTEM_EMAIL_ADDRESS=<system_email>
SYSTEM_EMAIL_PASSWORD=<system_email_password> SYSTEM_EMAIL_PASSWORD=<system_email_password>
``` ```
3. In the `Docker` directory, create a `client.env` file with the [required environtmental variables](#env-vars-client) for the client. Sample file: 3. In the `Client` directory, create a `client.env` file with the [required environtmental variables](#env-vars-client) for the client. Sample file:
``` ```
VITE_APP_API_BASE_URL="http://localhost:5000/api/v1" VITE_APP_API_BASE_URL="http://localhost:5000/api/v1"
@@ -151,7 +184,7 @@ VITE_APP_API_BASE_URL="http://localhost:5000/api/v1"
4. In the `Docker` directory run `docker compose up` to run the `docker-compose.yaml` file and start all four images. 4. In the `Docker` directory run `docker compose up` to run the `docker-compose.yaml` file and start all four images.
That's it, the application is ready to use on port 5173. That's it, the application is ready to use on port 80.
<br/> <br/>
### Client ### Client
@@ -2112,4 +2145,3 @@ const myRoute = async(req, res, next) => {
``` ```
Errors should not be handled at the controller level and should be left to the middleware to handle. Errors should not be handled at the controller level and should be left to the middleware to handle.
+29 -34
View File
@@ -85,43 +85,38 @@ CheckSchema.pre("save", async function (next) {
}); });
// Check if there are any notifications // Check if there are any notifications
if (notifications && notifications.length > 0) {
// Only send email if monitor status has changed
if (monitor.status !== this.status) {
const emailService = new EmailService();
if (monitor.status === true && this.status === false) { // Only send email if monitor status has changed
// Notify users that the monitor is down if (monitor.status !== this.status) {
for (const notification of notifications) { const emailService = new EmailService();
if (notification.type === "email") {
await emailService.buildAndSendEmail(
"serverIsDownTemplate",
{ monitorName: monitor.name, monitorUrl: monitor.url },
notification.address,
`Monitor ${monitor.name} is down`
);
}
}
}
if (monitor.status === false && this.status === true) { let template = "";
// Notify users that the monitor is up let status = "";
for (const notification of notifications) { if (monitor.status === true && this.status === false) {
if (notification.type === "email") { template = "serverIsDownTemplate";
await emailService.buildAndSendEmail( status = "down";
"serverIsUpTemplate",
{ monitorName: monitor.name, monitorUrl: monitor.url },
notification.address,
`Monitor ${monitor.name} is back up`
);
}
}
}
// Update monitor status
monitor.status = this.status;
await monitor.save();
} }
if (monitor.status === false && this.status === true) {
// Notify users that the monitor is up
template = "serverIsUpTemplate";
status = "up";
}
for (const notification of notifications) {
if (notification.type === "email") {
await emailService.buildAndSendEmail(
template,
{ monitorName: monitor.name, monitorUrl: monitor.url },
notification.address,
`Monitor ${monitor.name} is ${status}`
);
}
}
// Update monitor status
monitor.status = this.status;
await monitor.save();
} }
} }
} catch (error) { } catch (error) {
+3 -4
View File
@@ -984,10 +984,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.7.3", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
"integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.6", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",