diff --git a/Client/.env.production b/Client/.env.production
index a5bce84e1..2ae6d13cd 100644
--- a/Client/.env.production
+++ b/Client/.env.production
@@ -1 +1,2 @@
VITE_APP_API_BASE_URL=UPTIME_APP_API_BASE_URL
+VITE_STATUS_PAGE_SUBDOMAIN_PREFIX=UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX
diff --git a/Client/package-lock.json b/Client/package-lock.json
index f92a90496..4cc59f162 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -11,7 +11,8 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/roboto": "^5.0.13",
- "@mui/icons-material": "6.4.3",
+ "@hello-pangea/dnd": "^17.0.0",
+ "@mui/icons-material": "6.4.3",
"@mui/lab": "6.0.0-beta.26",
"@mui/material": "6.4.3",
"@mui/x-charts": "^7.5.1",
@@ -20,9 +21,13 @@
"@reduxjs/toolkit": "2.5.1",
"axios": "^1.7.4",
"dayjs": "1.11.13",
+ "immutability-helper": "^3.1.1",
"joi": "17.13.3",
"jwt-decode": "^4.0.0",
+ "mui-color-input": "^5.0.1",
"react": "^18.2.0",
+ "react-dnd": "^16.0.1",
+ "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-redux": "9.2.0",
"react-router": "^6.23.0",
@@ -332,6 +337,14 @@
"node": ">=6.9.0"
}
},
+ "node_modules/@ctrl/tinycolor": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.1.0.tgz",
+ "integrity": "sha512-WyOx8cJQ+FQus4Mm4uPIZA64gbk3Wxh0so5Lcii0aJifqwoVOlfFtorjLE0Hen4OYyHZMXDWqMmaQemBhgxFRQ==",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@emotion/babel-plugin": {
"version": "11.13.5",
"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
@@ -984,6 +997,24 @@
"@hapi/hoek": "^9.0.0"
}
},
+ "node_modules/@hello-pangea/dnd": {
+ "version": "17.0.0",
+ "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-17.0.0.tgz",
+ "integrity": "sha512-LDDPOix/5N0j5QZxubiW9T0M0+1PR0rTDWeZF5pu1Tz91UQnuVK4qQ/EjY83Qm2QeX0eM8qDXANfDh3VVqtR4Q==",
+ "dependencies": {
+ "@babel/runtime": "^7.25.6",
+ "css-box-model": "^1.2.1",
+ "memoize-one": "^6.0.0",
+ "raf-schd": "^4.0.3",
+ "react-redux": "^9.1.2",
+ "redux": "^5.0.1",
+ "use-memo-one": "^1.1.3"
+ },
+ "peerDependencies": {
+ "react": "^18.0.0",
+ "react-dom": "^18.0.0"
+ }
+ },
"node_modules/@humanwhocodes/config-array": {
"version": "0.13.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
@@ -1618,6 +1649,21 @@
"url": "https://opencollective.com/popperjs"
}
},
+ "node_modules/@react-dnd/asap": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz",
+ "integrity": "sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A=="
+ },
+ "node_modules/@react-dnd/invariant": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz",
+ "integrity": "sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw=="
+ },
+ "node_modules/@react-dnd/shallowequal": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz",
+ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA=="
+ },
"node_modules/@react-spring/animated": {
"version": "9.7.5",
"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.5.tgz",
@@ -2932,6 +2978,14 @@
"node": ">= 8"
}
},
+ "node_modules/css-box-model": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
+ "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==",
+ "dependencies": {
+ "tiny-invariant": "^1.0.6"
+ }
+ },
"node_modules/csstype": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -3215,6 +3269,24 @@
"node": ">=0.4.0"
}
},
+ "node_modules/dnd-core": {
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz",
+ "integrity": "sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==",
+ "dependencies": {
+ "@react-dnd/asap": "^5.0.1",
+ "@react-dnd/invariant": "^4.0.1",
+ "redux": "^4.2.0"
+ }
+ },
+ "node_modules/dnd-core/node_modules/redux": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+ "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+ "dependencies": {
+ "@babel/runtime": "^7.9.2"
+ }
+ },
"node_modules/doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -3785,7 +3857,6 @@
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "dev": true,
"license": "MIT"
},
"node_modules/fast-equals": {
@@ -4242,6 +4313,11 @@
"url": "https://opencollective.com/immer"
}
},
+ "node_modules/immutability-helper": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.1.1.tgz",
+ "integrity": "sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="
+ },
"node_modules/import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -4925,6 +5001,11 @@
"node": ">= 0.4"
}
},
+ "node_modules/memoize-one": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+ "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+ },
"node_modules/mime-db": {
"version": "1.52.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -4965,6 +5046,27 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
+ "node_modules/mui-color-input": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/mui-color-input/-/mui-color-input-5.0.1.tgz",
+ "integrity": "sha512-50Ws4vhg4UPQSZEZDCNc7vyUBSb9x1bK+bO1o0wxJvQYgeSyg2r7mYDlavpCh+ZvisgBL/98y0GVN6M9901JWg==",
+ "dependencies": {
+ "@ctrl/tinycolor": "^4.1.0"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.5.0",
+ "@emotion/styled": "^11.3.0",
+ "@mui/material": "^6.0.0",
+ "@types/react": "^18.0.0",
+ "react": "^18.0.0",
+ "react-dom": "^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/nanoid": {
"version": "3.3.8",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
@@ -5382,6 +5484,11 @@
],
"license": "MIT"
},
+ "node_modules/raf-schd": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
+ "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
+ },
"node_modules/react": {
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
@@ -5394,6 +5501,43 @@
"node": ">=0.10.0"
}
},
+ "node_modules/react-dnd": {
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz",
+ "integrity": "sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==",
+ "dependencies": {
+ "@react-dnd/invariant": "^4.0.1",
+ "@react-dnd/shallowequal": "^4.0.1",
+ "dnd-core": "^16.0.1",
+ "fast-deep-equal": "^3.1.3",
+ "hoist-non-react-statics": "^3.3.2"
+ },
+ "peerDependencies": {
+ "@types/hoist-non-react-statics": ">= 3.3.1",
+ "@types/node": ">= 12",
+ "@types/react": ">= 16",
+ "react": ">= 16.14"
+ },
+ "peerDependenciesMeta": {
+ "@types/hoist-non-react-statics": {
+ "optional": true
+ },
+ "@types/node": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/react-dnd-html5-backend": {
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz",
+ "integrity": "sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==",
+ "dependencies": {
+ "dnd-core": "^16.0.1"
+ }
+ },
"node_modules/react-dom": {
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -6313,6 +6457,14 @@
"punycode": "^2.1.0"
}
},
+ "node_modules/use-memo-one": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
+ "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==",
+ "peerDependencies": {
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+ }
+ },
"node_modules/use-sync-external-store": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
diff --git a/Client/package.json b/Client/package.json
index 1b1ded008..b37c1a723 100644
--- a/Client/package.json
+++ b/Client/package.json
@@ -14,18 +14,24 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/roboto": "^5.0.13",
+ "@hello-pangea/dnd": "^17.0.0",
"@mui/icons-material": "6.4.3",
"@mui/lab": "6.0.0-beta.26",
"@mui/material": "6.4.3",
+
"@mui/x-charts": "^7.5.1",
"@mui/x-data-grid": "7.25.0",
"@mui/x-date-pickers": "7.25.0",
"@reduxjs/toolkit": "2.5.1",
"axios": "^1.7.4",
"dayjs": "1.11.13",
+ "immutability-helper": "^3.1.1",
"joi": "17.13.3",
"jwt-decode": "^4.0.0",
+ "mui-color-input": "^5.0.1",
"react": "^18.2.0",
+ "react-dnd": "^16.0.1",
+ "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-redux": "9.2.0",
"react-router": "^6.23.0",
diff --git a/Client/src/Components/Charts/StatusPageBarChart/index.jsx b/Client/src/Components/Charts/StatusPageBarChart/index.jsx
new file mode 100644
index 000000000..5acf4c3d6
--- /dev/null
+++ b/Client/src/Components/Charts/StatusPageBarChart/index.jsx
@@ -0,0 +1,175 @@
+import { useTheme } from "@emotion/react";
+import { Box, Stack, Tooltip, Typography } from "@mui/material";
+import { formatDateWithTz } from "../../../Utils/timeUtils";
+import { useEffect, useState } from "react";
+import { useSelector } from "react-redux";
+
+/* TODO add prop validation and jsdocs */
+const StatusPageBarChart = ({ checks = [] }) => {
+ const theme = useTheme();
+ const [animate, setAnimate] = useState(false);
+ const uiTimezone = useSelector((state) => state.ui.timezone);
+
+ useEffect(() => {
+ setAnimate(true);
+ }, []);
+
+ // set responseTime to average if there's only one check
+ if (checks.length === 1) {
+ checks[0] = { ...checks[0], responseTime: 50 };
+ }
+
+ if (checks.length !== 25) {
+ const placeholders = Array(25 - checks.length).fill("placeholder");
+ checks = [...checks, ...placeholders];
+ }
+
+ return (
+ event.stopPropagation()}
+ sx={{
+ cursor: "default",
+ }}
+ >
+ {checks.map((check, index) =>
+ check === "placeholder" ? (
+ /* TODO what is the purpose of this box? */
+ // CAIO_REVIEW the purpose of this box is to make sure there are always at least 25 bars
+ // even if there are less than 25 checks
+
+ ) : (
+
+
+ {formatDateWithTz(
+ check.createdAt,
+ "ddd, MMMM D, YYYY, HH:mm A",
+ uiTimezone
+ )}
+
+
+
+
+
+ Response Time
+
+
+ {check.originalResponseTime}
+
+ {" "}
+ ms
+
+
+
+
+ >
+ }
+ placement="top"
+ key={`check-${check?._id}`}
+ slotProps={{
+ popper: {
+ className: "bar-tooltip",
+ modifiers: [
+ {
+ name: "offset",
+ options: {
+ offset: [0, -10],
+ },
+ },
+ ],
+ sx: {
+ "& .MuiTooltip-tooltip": {
+ backgroundColor: theme.palette.secondary.main,
+ border: 1,
+ borderColor: theme.palette.primary.lowContrast,
+ borderRadius: theme.shape.borderRadius,
+ boxShadow: theme.shape.boxShadow,
+ px: theme.spacing(4),
+ py: theme.spacing(3),
+ },
+ "& .MuiTooltip-tooltip p": {
+ /* TODO Font size should point to theme */
+ fontSize: 12,
+ color: theme.palette.secondary.contrastText,
+ fontWeight: 500,
+ },
+ "& .MuiTooltip-tooltip span": {
+ /* TODO Font size should point to theme */
+ fontSize: 11,
+ color: theme.palette.secondary.contrastText,
+ fontWeight: 600,
+ },
+ },
+ },
+ }}
+ >
+
+
+
+
+ )
+ )}
+
+ );
+};
+
+export default StatusPageBarChart;
diff --git a/Client/src/Components/ConfigBox/index.jsx b/Client/src/Components/ConfigBox/index.jsx
index 8f7eb7b24..9b64712fc 100644
--- a/Client/src/Components/ConfigBox/index.jsx
+++ b/Client/src/Components/ConfigBox/index.jsx
@@ -29,10 +29,7 @@ const ConfigBox = styled(Stack)(({ theme }) => ({
},
"& h1, & h2": {
color: theme.palette.primary.contrastTextSecondary,
- },
- "& p": {
- color: theme.palette.primary.contrastTextTertiary,
- },
+ }
}));
export default ConfigBox;
diff --git a/Client/src/Components/Image/index.jsx b/Client/src/Components/Image/index.jsx
new file mode 100644
index 000000000..778675f92
--- /dev/null
+++ b/Client/src/Components/Image/index.jsx
@@ -0,0 +1,54 @@
+import { Box } from "@mui/material";
+import PropTypes from "prop-types";
+
+const isValidBase64Image = (data) => {
+ return /^[A-Za-z0-9+/=]+$/.test(data);
+};
+
+const Image = ({
+ shouldRender = true,
+ src,
+ alt,
+ width = "auto",
+ height = "auto",
+ maxWidth = "auto",
+ maxHeight = "auto",
+ base64,
+}) => {
+ if (shouldRender === false) {
+ return null;
+ }
+
+ if (typeof src !== "undefined" && typeof base64 !== "undefined") {
+ console.warn("base64 takes precedence over src and overwrites it");
+ }
+
+ if (typeof base64 !== "undefined" && isValidBase64Image(base64)) {
+ src = `data:image/png;base64,${base64}`;
+ }
+
+ return (
+
+ );
+};
+
+Image.propTypes = {
+ shouldRender: PropTypes.bool,
+ src: PropTypes.string,
+ alt: PropTypes.string.isRequired,
+ width: PropTypes.string,
+ height: PropTypes.string,
+ maxWidth: PropTypes.string,
+ maxHeight: PropTypes.string,
+ base64: PropTypes.string,
+};
+
+export default Image;
diff --git a/Client/src/Components/Inputs/Checkbox/index.jsx b/Client/src/Components/Inputs/Checkbox/index.jsx
index b3a036d57..58b83c7c7 100644
--- a/Client/src/Components/Inputs/Checkbox/index.jsx
+++ b/Client/src/Components/Inputs/Checkbox/index.jsx
@@ -75,7 +75,6 @@ const Checkbox = ({
sx={{
"&:hover": { backgroundColor: "transparent" },
"& svg": { width: sizes[size], height: sizes[size] },
- alignSelf: "flex-start",
}}
/>
}
@@ -111,7 +110,7 @@ Checkbox.propTypes = {
label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
size: PropTypes.oneOf(["small", "medium", "large"]),
isChecked: PropTypes.bool.isRequired,
- value: PropTypes.string,
+ value: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
onChange: PropTypes.func,
isDisabled: PropTypes.bool,
};
diff --git a/Client/src/Components/Inputs/ColorPicker/index.jsx b/Client/src/Components/Inputs/ColorPicker/index.jsx
new file mode 100644
index 000000000..e64c936fc
--- /dev/null
+++ b/Client/src/Components/Inputs/ColorPicker/index.jsx
@@ -0,0 +1,63 @@
+import PropTypes from "prop-types";
+import { Stack, Typography } from "@mui/material";
+import { useTheme } from "@emotion/react";
+import { MuiColorInput } from "mui-color-input";
+
+/**
+ *
+ * @param {*} id The ID of the component
+ * @param {*} value The color value of the component
+ * @param {*} error The error of the component
+ * @param {*} onChange The Change handler function
+ * @param {*} onBlur The Blur handler function
+ * @returns The ColorPicker component
+ * Example usage:
+ *
+ *
+ */
+const ColorPicker = ({ id, name, value, error, onChange, onBlur }) => {
+ const theme = useTheme();
+ return (
+
+ onChange({ target: { name, value: color } })}
+ onBlur={onBlur}
+ />
+ {error && (
+
+ {error}
+
+ )}
+
+ );
+};
+
+ColorPicker.propTypes = {
+ id: PropTypes.string.isRequired,
+ value: PropTypes.string,
+ error: PropTypes.string,
+ onChange: PropTypes.func.isRequired,
+ onBlur: PropTypes.func,
+ name: PropTypes.string,
+};
+
+export default ColorPicker;
diff --git a/Client/src/Components/Inputs/Image/index.jsx b/Client/src/Components/Inputs/Image/index.jsx
index a955a8ad6..0a2a2ef91 100644
--- a/Client/src/Components/Inputs/Image/index.jsx
+++ b/Client/src/Components/Inputs/Image/index.jsx
@@ -11,11 +11,16 @@ import { checkImage } from "../../../Utils/fileUtils";
* @param {string} props.id - The unique identifier for the input field.
* @param {string} props.src - The URL of the image to display.
* @param {function} props.onChange - The function to handle file input change.
+ * @param {boolean} props.isRound - Whether the shape of the image to display is round.
+ * @param {string} props.maxSize - Custom message for the max uploaded file size
* @returns {JSX.Element} The rendered component.
*/
-const ImageField = ({ id, src, loading, onChange }) => {
+const ImageField = ({ id, src, loading, onChange, error, isRound = true, maxSize }) => {
const theme = useTheme();
+ const error_border_style = error ? { borderColor: theme.palette.error.main } : {};
+
+ const roundShape = isRound ? { borderRadius: "50%" } : {};
const [isDragging, setIsDragging] = useState(false);
const handleDragEnter = () => {
@@ -46,6 +51,7 @@ const ImageField = ({ id, src, loading, onChange }) => {
borderColor: theme.palette.primary.main,
backgroundColor: "hsl(215, 87%, 51%, 0.05)",
},
+ ...error_border_style,
}}
onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave}
@@ -62,6 +68,7 @@ const ImageField = ({ id, src, loading, onChange }) => {
cursor: "pointer",
maxWidth: "500px",
minHeight: "175px",
+ zIndex: 1,
},
"& fieldset": {
padding: 0,
@@ -78,7 +85,7 @@ const ImageField = ({ id, src, loading, onChange }) => {
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
- zIndex: "-1",
+ zIndex: 0,
width: "100%",
}}
>
@@ -111,7 +118,7 @@ const ImageField = ({ id, src, loading, onChange }) => {
color={theme.palette.primary.contrastTextTertiary}
sx={{ opacity: 0.6 }}
>
- (maximum size: 3MB)
+ (maximum size: {maxSize ?? "3MB"})
@@ -122,6 +129,19 @@ const ImageField = ({ id, src, loading, onChange }) => {
>
Supported formats: JPG, PNG
+ {error && (
+
+ {error}
+
+ )}
>
) : (
{
sx={{
width: "250px",
height: "250px",
- borderRadius: "50%",
overflow: "hidden",
backgroundImage: `url(${src})`,
backgroundSize: "cover",
+ ...roundShape,
}}
>
@@ -148,6 +168,8 @@ ImageField.propTypes = {
id: PropTypes.string.isRequired,
src: PropTypes.string,
onChange: PropTypes.func.isRequired,
+ isRound: PropTypes.bool,
+ maxSize: PropTypes.string,
};
export default ImageField;
diff --git a/Client/src/Components/Inputs/Search/index.jsx b/Client/src/Components/Inputs/Search/index.jsx
index 95930b0ec..56b329500 100644
--- a/Client/src/Components/Inputs/Search/index.jsx
+++ b/Client/src/Components/Inputs/Search/index.jsx
@@ -12,6 +12,7 @@ import SearchIcon from "../../../assets/icons/search.svg?react";
* @param {string} props.filteredBy - Key to access the option label from the options
* @param {string} props.value - Current input value for the Autocomplete
* @param {Function} props.handleChange - Function to call when the input changes
+ * @param {Function} Prop.onBlur - Function to call when the input is blured
* @param {Object} props.sx - Additional styles to apply to the component
* @returns {JSX.Element} The rendered Search component
*/
@@ -54,10 +55,14 @@ const Search = ({
isAdorned = true,
error,
disabled,
+ startAdornment,
+ endAdornment,
+ onBlur,
}) => {
const theme = useTheme();
return (
{
- handleChange && handleChange(newValue);
+ handleChange(newValue);
}}
fullWidth
freeSolo
@@ -88,9 +93,13 @@ const Search = ({
{...params}
error={Boolean(error)}
placeholder="Type to search"
- InputProps={{
- ...params.InputProps,
- ...(isAdorned && { startAdornment: }),
+ slotProps={{
+ input: {
+ ...params.InputProps,
+ ...(isAdorned && { startAdornment: }),
+ ...(startAdornment && { startAdornment: startAdornment }),
+ ...(endAdornment && { endAdornment: endAdornment }),
+ },
}}
sx={{
"& fieldset": {
@@ -212,6 +221,9 @@ Search.propTypes = {
sx: PropTypes.object,
error: PropTypes.string,
disabled: PropTypes.bool,
+ startAdornment: PropTypes.object,
+ endAdornment: PropTypes.object,
+ onBlur: PropTypes.func,
};
export default Search;
diff --git a/Client/src/Components/Inputs/TextInput/Adornments/index.jsx b/Client/src/Components/Inputs/TextInput/Adornments/index.jsx
index 2b3717085..d6af2a89e 100644
--- a/Client/src/Components/Inputs/TextInput/Adornments/index.jsx
+++ b/Client/src/Components/Inputs/TextInput/Adornments/index.jsx
@@ -1,9 +1,11 @@
import { Stack, Typography, InputAdornment, IconButton } from "@mui/material";
import { useTheme } from "@mui/material/styles";
-import { useState } from "react";
import PropTypes from "prop-types";
import VisibilityOff from "@mui/icons-material/VisibilityOff";
import Visibility from "@mui/icons-material/Visibility";
+import ReorderRoundedIcon from "@mui/icons-material/ReorderRounded";
+import DeleteIcon from "../../../../assets/icons/trash-bin.svg?react";
+
export const HttpAdornment = ({ https }) => {
const theme = useTheme();
return (
@@ -23,7 +25,7 @@ export const HttpAdornment = ({ https }) => {
color={theme.palette.primary.contrastTextSecondary}
sx={{ lineHeight: 1, opacity: 0.8 }}
>
- {https ? "https" : "http"}://
+ {https ? "https" : "http"}
);
@@ -31,6 +33,7 @@ export const HttpAdornment = ({ https }) => {
HttpAdornment.propTypes = {
https: PropTypes.bool.isRequired,
+ prefix: PropTypes.string,
};
export const PasswordEndAdornment = ({ fieldType, setFieldType }) => {
diff --git a/Client/src/Components/ProgressBars/index.jsx b/Client/src/Components/ProgressBars/index.jsx
index abb896844..42ae652c7 100644
--- a/Client/src/Components/ProgressBars/index.jsx
+++ b/Client/src/Components/ProgressBars/index.jsx
@@ -168,7 +168,7 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick, error }) =>
ProgressUpload.propTypes = {
icon: PropTypes.element, // JSX element for the icon (optional)
- label: PropTypes.string.isRequired, // Label text for the progress item
+ label: PropTypes.string, // Label text for the progress item
size: PropTypes.string.isRequired, // Size information for the progress item
progress: PropTypes.number.isRequired, // Current progress value (0-100)
onClick: PropTypes.func.isRequired, // Function to handle click events on the remove button
diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx
index 3821306ad..c4c574c8f 100644
--- a/Client/src/Components/Sidebar/index.jsx
+++ b/Client/src/Components/Sidebar/index.jsx
@@ -43,6 +43,7 @@ import DotsVertical from "../../assets/icons/dots-vertical.svg?react";
import ChangeLog from "../../assets/icons/changeLog.svg?react";
import Docs from "../../assets/icons/docs.svg?react";
import Folder from "../../assets/icons/folder.svg?react";
+import StatusPages from "../../assets/icons/status-pages.svg?react";
import ChatBubbleOutlineRoundedIcon from "@mui/icons-material/ChatBubbleOutlineRounded";
import "./index.css";
@@ -52,7 +53,8 @@ const menu = [
{ name: "Pagespeed", path: "pagespeed", icon: },
{ name: "Infrastructure", path: "infrastructure", icon: },
{ name: "Incidents", path: "incidents", icon: },
- // { name: "Status pages", path: "status", icon: },
+
+ { name: "Status pages", path: "status", icon: },
{ name: "Maintenance", path: "maintenance", icon: },
// { name: "Integrations", path: "integrations", icon: },
{
diff --git a/Client/src/Pages/Account/index.jsx b/Client/src/Pages/Account/index.jsx
index 9fd38b5ef..0a1d2c104 100644
--- a/Client/src/Pages/Account/index.jsx
+++ b/Client/src/Pages/Account/index.jsx
@@ -87,33 +87,6 @@ const Account = ({ open = "profile" }) => {
onKeyDown={handleKeyDown}
onFocus={() => handleFocus(label.toLowerCase())}
tabIndex={index}
- sx={{
- fontSize: 13,
- color: theme.palette.tertiary.contrastText,
- backgroundColor: theme.palette.tertiary.main,
- textTransform: "none",
- minWidth: "fit-content",
- paddingY: theme.spacing(6),
- fontWeight: 400,
- borderBottom: "2px solid transparent",
- borderRight: `1px solid ${theme.palette.primary.lowContrast}`,
- "&:first-child": { borderTopLeftRadius: "8px" },
- "&:last-child": { borderTopRightRadius: "8px", borderRight: 0 },
- "&:focus-visible": {
- color: theme.palette.primary.contrastText,
- borderColor: theme.palette.tertiary.contrastText,
- borderRightColor: theme.palette.primary.lowContrast,
- },
- "&.Mui-selected": {
- backgroundColor: theme.palette.secondary.main,
- color: theme.palette.secondary.contrastText,
- borderColor: theme.palette.secondary.contrastText,
- borderRightColor: theme.palette.primary.lowContrast,
- },
- "&:hover": {
- borderColor: theme.palette.primary.lowContrast,
- },
- }}
/>
))}
diff --git a/Client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/Client/src/Pages/Maintenance/CreateMaintenance/index.jsx
index cacc0e8d5..444c0fa4b 100644
--- a/Client/src/Pages/Maintenance/CreateMaintenance/index.jsx
+++ b/Client/src/Pages/Maintenance/CreateMaintenance/index.jsx
@@ -181,7 +181,7 @@ const CreateMaintenance = () => {
setSearch(value);
};
- const handleSelectMonitors = (monitors) => {
+ const handleSelectMonitors = (_, monitors) => {
setForm({ ...form, monitors });
const { error } = maintenanceWindowValidation.validate(
{ monitors },
diff --git a/Client/src/Pages/Status/index.css b/Client/src/Pages/Status/index.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Client/src/Pages/Status/index.jsx b/Client/src/Pages/Status/index.jsx
deleted file mode 100644
index 7ba2c0a8d..000000000
--- a/Client/src/Pages/Status/index.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Box } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import Fallback from "../../Components/Fallback";
-
-const Status = () => {
- const theme = useTheme();
-
- return (
- [class*="fallback__"])': {
- position: "relative",
- border: 1,
- borderColor: theme.palette.primary.lowContrast,
- borderRadius: theme.shape.borderRadius,
- borderStyle: "dashed",
- backgroundColor: theme.palette.primary.main,
- overflow: "hidden",
- },
- }}
- >
-
-
- );
-};
-
-export default Status;
diff --git a/Client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx b/Client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
new file mode 100644
index 000000000..5484202d5
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
@@ -0,0 +1,106 @@
+// Components
+import { Stack, Typography } from "@mui/material";
+import ReorderRoundedIcon from "@mui/icons-material/ReorderRounded";
+import DeleteIcon from "@mui/icons-material/Delete";
+
+// Utils
+import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
+import { useTheme } from "@emotion/react";
+const MonitorListItem = ({
+ monitor,
+ innerRef,
+ draggableProps,
+ dragHandleProps,
+ onDelete,
+}) => {
+ const theme = useTheme();
+ return (
+
+
+ {monitor.name}
+ {
+ onDelete(monitor);
+ }}
+ />
+
+ );
+};
+
+const MonitorList = ({ selectedMonitors, setSelectedMonitors }) => {
+ const onDelete = (monitorToDelete) => {
+ const newMonitors = selectedMonitors.filter(
+ (monitor) => monitor._id !== monitorToDelete._id
+ );
+ setSelectedMonitors(newMonitors);
+ };
+ const reorder = (list, startIndex, endIndex) => {
+ const result = Array.from(list);
+ const [removed] = result.splice(startIndex, 1);
+ result.splice(endIndex, 0, removed);
+
+ return result;
+ };
+
+ const onDragEnd = (result) => {
+ // dropped outside the list
+ if (!result.destination) {
+ return;
+ }
+
+ const reorderedMonitors = reorder(
+ selectedMonitors,
+ result.source.index,
+ result.destination.index
+ );
+
+ setSelectedMonitors(reorderedMonitors);
+ };
+
+ return (
+
+
+ {(provided, snapshot) => (
+
+ {selectedMonitors?.map((monitor, index) => (
+
+ {(provided, snapshot) => (
+
+ )}
+
+ ))}
+ {provided.placeholder}
+
+ )}
+
+
+ );
+};
+
+export default MonitorList;
diff --git a/Client/src/Pages/StatusPage/Create/Components/Progress/index.jsx b/Client/src/Pages/StatusPage/Create/Components/Progress/index.jsx
new file mode 100644
index 000000000..d85225551
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/Progress/index.jsx
@@ -0,0 +1,37 @@
+import { Button, Box } from "@mui/material";
+import ProgressUpload from "../../../../../Components/ProgressBars";
+import ImageIcon from "@mui/icons-material/Image";
+
+import { formatBytes } from "../../../../../Utils/fileUtils";
+const Progress = ({ isLoading, progressValue, logo, logoType, removeLogo, errors }) => {
+ if (isLoading) {
+ return (
+ }
+ label={logo?.name}
+ size={formatBytes(logo?.size)}
+ progress={progressValue}
+ onClick={removeLogo}
+ />
+ );
+ }
+
+ if (logo && logoType) {
+ return (
+
+
+
+ );
+ }
+};
+
+export default Progress;
diff --git a/Client/src/Pages/StatusPage/Create/Components/Skeleton/index.jsx b/Client/src/Pages/StatusPage/Create/Components/Skeleton/index.jsx
new file mode 100644
index 000000000..482c490fb
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/Skeleton/index.jsx
@@ -0,0 +1,14 @@
+import { Stack, Skeleton } from "@mui/material";
+
+const SkeletonLayout = () => {
+ return (
+
+
+
+ );
+};
+
+export default SkeletonLayout;
diff --git a/Client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx b/Client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
new file mode 100644
index 000000000..8eda4fe0a
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
@@ -0,0 +1,104 @@
+// Components
+import { Stack, Typography, Button } from "@mui/material";
+import { TabPanel } from "@mui/lab";
+import ConfigBox from "../../../../../Components/ConfigBox";
+import MonitorList from "../MonitorList";
+import Search from "../../../../../Components/Inputs/Search";
+import Checkbox from "../../../../../Components/Inputs/Checkbox";
+// Utils
+import { useState } from "react";
+import { useTheme } from "@emotion/react";
+const Content = ({
+ tabValue,
+ form,
+ monitors,
+ handleFormChange,
+ errors,
+ selectedMonitors,
+ setSelectedMonitors,
+}) => {
+ // Local state
+ const [search, setSearch] = useState("");
+
+ // Handlers
+ const handleMonitorsChange = (selectedMonitors) => {
+ handleFormChange({
+ target: { name: "monitors", value: selectedMonitors.map((monitor) => monitor._id) },
+ });
+ setSelectedMonitors(selectedMonitors);
+ };
+
+ // Utils
+ const theme = useTheme();
+
+ return (
+
+
+
+
+ Status page servers
+
+ You can add any number of servers that you monitor to your status page. You
+ can also reorder them for the best viewing experience.
+
+
+
+
+
+
+
+ {errors["monitors"]}
+
+
+
+ {" "}
+
+
+ Features
+ Show more details on the status page
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default Content;
diff --git a/Client/src/Pages/StatusPage/Create/Components/Tabs/Settings.jsx b/Client/src/Pages/StatusPage/Create/Components/Tabs/Settings.jsx
new file mode 100644
index 000000000..e4fd56ebb
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/Tabs/Settings.jsx
@@ -0,0 +1,140 @@
+// Components
+import { Stack, Typography } from "@mui/material";
+import { TabPanel } from "@mui/lab";
+import ConfigBox from "../../../../../Components/ConfigBox";
+import Checkbox from "../../../../../Components/Inputs/Checkbox";
+import TextInput from "../../../../../Components/Inputs/TextInput";
+import Select from "../../../../../Components/Inputs/Select";
+import ImageField from "../../../../../Components/Inputs/Image";
+import ColorPicker from "../../../../../Components/Inputs/ColorPicker";
+import Progress from "../Progress";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import timezones from "../../../../../Utils/timezones.json";
+import PropTypes from "prop-types";
+
+const TabSettings = ({
+ tabValue,
+ form,
+ handleFormChange,
+ handleImageChange,
+ progress,
+ removeLogo,
+ errors,
+}) => {
+ // Utils
+ const theme = useTheme();
+
+ return (
+
+
+
+
+ Access
+
+ If your status page is ready, you can mark it as published.
+
+
+
+
+
+
+
+
+ Basic Information
+
+ Define company name and the subdomain that your status page points to.
+
+
+
+
+
+
+
+
+
+ Timezone
+
+ Select the timezone that your status page will be displayed in.
+
+
+
+
+
+
+
+
+ Appearance
+
+ Define the default look and feel of your public status page.
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+TabSettings.propTypes = {
+ tabValue: PropTypes.string,
+ form: PropTypes.object,
+ handleFormChange: PropTypes.func,
+ handleImageChange: PropTypes.func,
+ progress: PropTypes.object,
+ removeLogo: PropTypes.func,
+ errors: PropTypes.object,
+};
+
+export default TabSettings;
diff --git a/Client/src/Pages/StatusPage/Create/Components/Tabs/index.jsx b/Client/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
new file mode 100644
index 000000000..87e18ed4d
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Components/Tabs/index.jsx
@@ -0,0 +1,81 @@
+// Components
+import { TabContext, TabList } from "@mui/lab";
+import { Tab } from "@mui/material";
+import Settings from "./Settings";
+import Content from "./Content";
+
+// Utils
+import PropTypes from "prop-types";
+
+const Tabs = ({
+ form,
+ errors,
+ monitors,
+ selectedMonitors,
+ setSelectedMonitors,
+ handleFormChange,
+ handleImageChange,
+ progress,
+ removeLogo,
+ tab,
+ setTab,
+ TAB_LIST,
+}) => {
+ return (
+
+ {
+ setTab(TAB_LIST.indexOf(tab));
+ }}
+ >
+ {TAB_LIST.map((tab, idx) => {
+ return (
+
+ );
+ })}
+
+ {tab === 0 ? (
+
+ ) : (
+
+ )}
+
+ );
+};
+
+Tabs.propTypes = {
+ form: PropTypes.object,
+ errors: PropTypes.object,
+ monitors: PropTypes.array,
+ selectedMonitors: PropTypes.array,
+ setSelectedMonitors: PropTypes.func,
+ handleFormChange: PropTypes.func,
+ handleImageChange: PropTypes.func,
+ progress: PropTypes.object,
+ removeLogo: PropTypes.func,
+ tab: PropTypes.number,
+ setTab: PropTypes.func,
+ TAB_LIST: PropTypes.array,
+};
+
+export default Tabs;
diff --git a/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx b/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
new file mode 100644
index 000000000..24d841cc9
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
@@ -0,0 +1,28 @@
+import { useState } from "react";
+import { networkService } from "../../../../main";
+import { useSelector } from "react-redux";
+import { createToast } from "../../../../Utils/toastUtils";
+
+const useCreateStatusPage = () => {
+ const { authToken, user } = useSelector((state) => state.auth);
+
+ const [isLoading, setIsLoading] = useState(false);
+ const [networkError, setNetworkError] = useState(false);
+ const createStatusPage = async ({ form }) => {
+ setIsLoading(true);
+ try {
+ await networkService.createStatusPage({ authToken, user, form });
+ return true;
+ } catch (error) {
+ setNetworkError(true);
+ createToast({ body: error?.response?.data?.msg ?? error.message });
+ return false;
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ return [createStatusPage, isLoading, networkError];
+};
+
+export { useCreateStatusPage };
diff --git a/Client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx b/Client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
new file mode 100644
index 000000000..4813157d1
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
@@ -0,0 +1,35 @@
+import { useEffect, useState } from "react";
+import { networkService } from "../../../../main";
+import { useSelector } from "react-redux";
+import { createToast } from "../../../../Utils/toastUtils";
+
+const useMonitorsFetch = () => {
+ const { user, authToken } = useSelector((state) => state.auth);
+
+ const [monitors, setMonitors] = useState(undefined);
+ const [isLoading, setIsLoading] = useState(true);
+ const [networkError, setNetworkError] = useState(false);
+ useEffect(() => {
+ const fetchMonitors = async () => {
+ try {
+ const response = await networkService.getMonitorsByTeamId({
+ authToken: authToken,
+ teamId: user.teamId,
+ limit: null, // donot return any checks for the monitors
+ types: ["http"], // status page is available only for the uptime type
+ });
+ setMonitors(response.data.data.monitors);
+ } catch (error) {
+ setNetworkError(true);
+ createToast({ body: error.message });
+ } finally {
+ setIsLoading(false);
+ }
+ };
+ fetchMonitors();
+ }, [authToken, user]);
+
+ return [monitors, isLoading, networkError];
+};
+
+export { useMonitorsFetch };
diff --git a/Client/src/Pages/StatusPage/Create/index.jsx b/Client/src/Pages/StatusPage/Create/index.jsx
new file mode 100644
index 000000000..f3b30069b
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Create/index.jsx
@@ -0,0 +1,197 @@
+// Components
+import { Stack, Button, Typography } from "@mui/material";
+import Tabs from "./Components/Tabs";
+import GenericFallback from "../../../Components/GenericFallback";
+import SkeletonLayout from "./Components/Skeleton";
+//Utils
+import { useTheme } from "@emotion/react";
+import { useState, useRef, useCallback } from "react";
+import { statusPageValidation } from "../../../Validation/validation";
+import { buildErrors } from "../../../Validation/error";
+import { useMonitorsFetch } from "./Hooks/useMonitorsFetch";
+import { useCreateStatusPage } from "./Hooks/useCreateStatusPage";
+import { createToast } from "../../../Utils/toastUtils";
+import { useNavigate } from "react-router-dom";
+//Constants
+const TAB_LIST = ["General settings", "Contents"];
+
+const ERROR_TAB_MAPPING = [
+ ["companyName", "url", "timezone", "color", "isPublished", "logo"],
+ ["monitors", "showUptimePercentage", "showCharts"],
+];
+
+const CreateStatusPage = () => {
+ //Local state
+ const [tab, setTab] = useState(0);
+ const [progress, setProgress] = useState({ value: 0, isLoading: false });
+ const [form, setForm] = useState({
+ isPublished: false,
+ companyName: "",
+ url: "/status/public",
+ logo: undefined,
+ timezone: "America/Toronto",
+ color: "#4169E1",
+ monitors: [],
+ showCharts: true,
+ showUptimePercentage: true,
+ });
+ const [errors, setErrors] = useState({});
+ const [selectedMonitors, setSelectedMonitors] = useState([]);
+ // Refs
+ const intervalRef = useRef(null);
+
+ //Utils
+ const theme = useTheme();
+ const [monitors, isLoading, networkError] = useMonitorsFetch();
+ const [createStatusPage, createSatusIsLoading, createStatusPageNetworkError] =
+ useCreateStatusPage();
+ const navigate = useNavigate();
+
+ // Handlers
+ const handleFormChange = (e) => {
+ let { type, name, value, checked } = e.target;
+ // Handle errors
+ const { error } = statusPageValidation.validate(
+ { [name]: value },
+ { abortEarly: false }
+ );
+ setErrors((prev) => {
+ return buildErrors(prev, name, error);
+ });
+
+ //Handle checkbox
+ if (type === "checkbox") {
+ setForm((prev) => ({
+ ...prev,
+ [name]: checked,
+ }));
+ return;
+ }
+
+ // Handle other inputs
+ setForm((prev) => ({
+ ...prev,
+ [name]: value,
+ }));
+ };
+
+ const handleImageChange = useCallback((event) => {
+ const img = event.target?.files?.[0];
+ const newLogo = {
+ src: URL.createObjectURL(img),
+ name: img.name,
+ type: img.type,
+ size: img.size,
+ };
+ setForm((prev) => ({
+ ...prev,
+ logo: newLogo,
+ }));
+ intervalRef.current = setInterval(() => {
+ const buffer = 12;
+ setProgress((prev) => {
+ if (prev.value + buffer >= 100) {
+ clearInterval(intervalRef.current);
+ return { value: 100, isLoading: false };
+ }
+ return { ...prev, value: prev.value + buffer };
+ });
+ }, 120);
+ }, []);
+
+ const removeLogo = () => {
+ setForm((prev) => ({
+ ...prev,
+ logo: undefined,
+ }));
+ // interrupt interval if image upload is canceled prior to completing the process
+ clearInterval(intervalRef.current);
+ setProgress({ value: 0, isLoading: false });
+ };
+
+ const handleSubmit = async () => {
+ let toSubmit = {
+ ...form,
+ logo: { type: form.logo?.type ?? null, size: form.logo?.size ?? null },
+ };
+ const { error } = statusPageValidation.validate(toSubmit, {
+ abortEarly: false,
+ });
+
+ if (typeof error === "undefined") {
+ const success = await createStatusPage({ form });
+ if (success) {
+ createToast({ body: "Status page created successfully" });
+ navigate("/status");
+ }
+ return;
+ }
+
+ const newErrors = {};
+ error?.details?.forEach((err) => {
+ newErrors[err.path[0]] = err.message;
+ });
+ setErrors((prev) => ({ ...prev, ...newErrors }));
+
+ const errorTabs = Object.keys(newErrors).map((err) => {
+ return ERROR_TAB_MAPPING.findIndex((tab) => tab.includes(err));
+ });
+
+ // If there's an error in the current tab, don't change the tab
+ if (errorTabs.some((errorTab) => errorTab === tab)) {
+ return;
+ }
+ // Otherwise go to tab with error
+ setTab(errorTabs[0]);
+ };
+
+ if (networkError === true) {
+ return (
+
+
+ Network error
+
+ Please check your connection
+
+ );
+ }
+
+ if (isLoading) return ;
+
+ return (
+
+
+
+
+
+
+ );
+};
+
+export default CreateStatusPage;
diff --git a/Client/src/Pages/StatusPage/Status/Components/AdminLink/index.jsx b/Client/src/Pages/StatusPage/Status/Components/AdminLink/index.jsx
new file mode 100644
index 000000000..5f5941fe7
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Components/AdminLink/index.jsx
@@ -0,0 +1,34 @@
+// Components
+import { Box, Typography } from "@mui/material";
+
+// Utils
+import { useTheme } from "@mui/material/styles";
+import { useNavigate } from "react-router-dom";
+
+const AdminLink = () => {
+ const theme = useTheme();
+ const navigate = useNavigate();
+
+ return (
+
+
+ Administrator?
+
+ navigate("/login")}
+ >
+ Login here
+
+
+ );
+};
+
+export default AdminLink;
diff --git a/Client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx b/Client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
new file mode 100644
index 000000000..f142392ad
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
@@ -0,0 +1,73 @@
+// Components
+import { Box, Stack, Typography, Button } from "@mui/material";
+import Image from "../../../../../Components/Image";
+import SettingsIcon from "../../../../../assets/icons/settings-bold.svg?react";
+
+//Utils
+import { useTheme } from "@mui/material/styles";
+import { useNavigate } from "react-router-dom";
+
+const ControlsHeader = ({ statusPage, deleteStatusPage, isDeleting }) => {
+ const theme = useTheme();
+ const navigate = useNavigate();
+
+ return (
+
+
+
+ {statusPage?.companyName}
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default ControlsHeader;
diff --git a/Client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx b/Client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx
new file mode 100644
index 000000000..65a4a182a
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx
@@ -0,0 +1,58 @@
+// Components
+import { Stack, Box } from "@mui/material";
+import Host from "../../../../Uptime/Monitors/Components/Host";
+import StatusPageBarChart from "../../../../../Components/Charts/StatusPageBarChart";
+import { StatusLabel } from "../../../../../Components/Label";
+
+//Utils
+import { useTheme } from "@mui/material/styles";
+import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
+import PropTypes from "prop-types";
+const MonitorsList = ({ monitors = [] }) => {
+ const theme = useTheme();
+ const { determineState } = useUtils();
+ return (
+ <>
+ {monitors?.map((monitor) => {
+ const status = determineState(monitor);
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+ })}
+ >
+ );
+};
+
+MonitorsList.propTypes = {
+ monitors: PropTypes.array.isRequired,
+};
+
+export default MonitorsList;
diff --git a/Client/src/Pages/StatusPage/Status/Components/Skeleton/index.jsx b/Client/src/Pages/StatusPage/Status/Components/Skeleton/index.jsx
new file mode 100644
index 000000000..482c490fb
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Components/Skeleton/index.jsx
@@ -0,0 +1,14 @@
+import { Stack, Skeleton } from "@mui/material";
+
+const SkeletonLayout = () => {
+ return (
+
+
+
+ );
+};
+
+export default SkeletonLayout;
diff --git a/Client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx b/Client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx
new file mode 100644
index 000000000..ec457ddb1
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx
@@ -0,0 +1,74 @@
+// Components
+import { Stack, Typography } from "@mui/material";
+import CheckCircleIcon from "@mui/icons-material/CheckCircle";
+import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
+
+// Utils
+import { useTheme } from "@mui/material/styles";
+import PropTypes from "prop-types";
+
+const getMonitorStatus = (monitors, theme) => {
+ const monitorsStatus = {
+ icon: (
+
+ ),
+ };
+ if (monitors.every((monitor) => monitor.status === true)) {
+ monitorsStatus.msg = "All systems operational";
+ monitorsStatus.color = theme.palette.success.lowContrast;
+ monitorsStatus.icon = (
+
+ );
+ }
+
+ if (monitors.every((monitor) => monitor.status === false)) {
+ monitorsStatus.msg = "All systems down";
+ monitorsStatus.color = theme.palette.error.lowContrast;
+ }
+
+ if (monitors.some((monitor) => monitor.status === false)) {
+ monitorsStatus.msg = "Degraded performance";
+ monitorsStatus.color = theme.palette.warning.lowContrast;
+ }
+
+ // Paused or unknown
+ if (monitors.some((monitor) => typeof monitor.status === "undefined")) {
+ monitorsStatus.msg = "Unknown status";
+ monitorsStatus.color = theme.palette.warning.lowContrast;
+ }
+ return monitorsStatus;
+};
+
+const StatusBar = ({ monitors }) => {
+ const theme = useTheme();
+
+ if (typeof monitors === "undefined") return;
+
+ const monitorsStatus = getMonitorStatus(monitors, theme);
+ return (
+
+ {monitorsStatus.icon}
+ {/* CAIO_REVIEW */}
+ {monitorsStatus.msg}
+
+ );
+};
+
+export default StatusBar;
+
+StatusBar.propTypes = {
+ status: PropTypes.object.isRequired,
+};
diff --git a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx
new file mode 100644
index 000000000..42138d373
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx
@@ -0,0 +1,31 @@
+import { useSelector } from "react-redux";
+import { useState } from "react";
+import { networkService } from "../../../../main";
+import { createToast } from "../../../../Utils/toastUtils";
+import { useNavigate } from "react-router-dom";
+
+const useStatusPageDelete = (fetchStatusPage) => {
+ const [isLoading, setIsLoading] = useState(false);
+ const navigate = useNavigate();
+ const { authToken } = useSelector((state) => state.auth);
+
+ const deleteStatusPage = async () => {
+ try {
+ setIsLoading(true);
+ await networkService.deleteStatusPage({ authToken });
+ fetchStatusPage?.();
+ return true;
+ } catch (error) {
+ createToast({
+ body: error.message,
+ });
+ return false;
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ return [deleteStatusPage, isLoading];
+};
+
+export { useStatusPageDelete };
diff --git a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx
new file mode 100644
index 000000000..f9691e69a
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx
@@ -0,0 +1,69 @@
+import { useEffect, useState, useCallback } from "react";
+import { networkService } from "../../../../main";
+import { useSelector } from "react-redux";
+import { createToast } from "../../../../Utils/toastUtils";
+import { useTheme } from "@emotion/react";
+const getMonitorWithPercentage = (monitor, theme) => {
+ let uptimePercentage = "";
+ let percentageColor = "";
+
+ if (monitor.uptimePercentage !== undefined) {
+ uptimePercentage =
+ monitor.uptimePercentage === 0 ? "0" : (monitor.uptimePercentage * 100).toFixed(2);
+
+ percentageColor =
+ monitor.uptimePercentage < 0.25
+ ? theme.palette.error.main
+ : monitor.uptimePercentage < 0.5
+ ? theme.palette.warning.main
+ : monitor.uptimePercentage < 0.75
+ ? theme.palette.success.main
+ : theme.palette.success.main;
+ }
+
+ return {
+ ...monitor,
+ percentage: uptimePercentage,
+ percentageColor,
+ };
+};
+
+const useStatusPageFetch = () => {
+ const [isLoading, setIsLoading] = useState(true);
+ const [networkError, setNetworkError] = useState(false);
+ const [statusPage, setStatusPage] = useState(undefined);
+ const [monitors, setMonitors] = useState(undefined);
+ const { authToken } = useSelector((state) => state.auth);
+ const theme = useTheme();
+
+ const fetchStatusPage = useCallback(async () => {
+ try {
+ const response = await networkService.getStatusPage({ authToken });
+ if (!response?.data?.data) return;
+ const { statusPage, monitors } = response.data.data;
+ setStatusPage(statusPage);
+
+ const monitorsWithPercentage = monitors.map((monitor) =>
+ getMonitorWithPercentage(monitor, theme)
+ );
+ setMonitors(monitorsWithPercentage);
+ } catch (error) {
+ // If there is a 404, status page is not found
+ if (error?.response?.status === 404) {
+ setStatusPage(undefined);
+ return;
+ }
+ createToast({ body: error.message });
+ setNetworkError(true);
+ } finally {
+ setIsLoading(false);
+ }
+ }, [authToken, theme]);
+ useEffect(() => {
+ fetchStatusPage();
+ }, [fetchStatusPage]);
+
+ return [statusPage, monitors, isLoading, networkError, fetchStatusPage];
+};
+
+export { useStatusPageFetch };
diff --git a/Client/src/Pages/StatusPage/Status/index.jsx b/Client/src/Pages/StatusPage/Status/index.jsx
new file mode 100644
index 000000000..4ea3aa4a8
--- /dev/null
+++ b/Client/src/Pages/StatusPage/Status/index.jsx
@@ -0,0 +1,143 @@
+// Components
+import { Typography, Stack, Box } from "@mui/material";
+import GenericFallback from "../../../Components/GenericFallback";
+import Fallback from "../../../Components/Fallback";
+import AdminLink from "./Components/AdminLink";
+import ControlsHeader from "./Components/ControlsHeader";
+import SkeletonLayout from "./Components/Skeleton";
+import StatusBar from "./Components/StatusBar";
+import MonitorsList from "./Components/MonitorsList";
+// Utils
+import { useState, useEffect } from "react";
+import { useStatusPageFetch } from "./Hooks/useStatusPageFetch";
+import { useTheme } from "@emotion/react";
+import { useIsAdmin } from "../../../Hooks/useIsAdmin";
+import { useLocation } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
+import { useStatusPageDelete } from "./Hooks/useStatusPageDelete";
+
+const PublicStatus = () => {
+ // Local state
+
+ // Utils
+ const theme = useTheme();
+ const isAdmin = useIsAdmin();
+ const [statusPage, monitors, isLoading, networkError, fetchStatusPage] =
+ useStatusPageFetch();
+ const [deleteStatusPage, isDeleting] = useStatusPageDelete(fetchStatusPage);
+ const location = useLocation();
+
+ // Setup
+ const currentPath = location.pathname;
+ let sx = { paddingLeft: theme.spacing(20), paddingRight: theme.spacing(20) };
+ let link = undefined;
+ // Public status page
+ if (currentPath === "/status/public") {
+ sx = {
+ paddingTop: theme.spacing(20),
+ paddingLeft: "20vw",
+ paddingRight: "20vw",
+ };
+ link = ;
+ }
+
+ // Loading
+ if (isLoading) {
+ return ;
+ }
+
+ // Error fetching data
+ if (networkError === true) {
+ return (
+
+
+ Network error
+
+ Please check your connection
+
+ );
+ }
+
+ // Public status page fallback
+ if (
+ !isLoading &&
+ typeof statusPage === "undefined" &&
+ currentPath === "/status/public"
+ ) {
+ return (
+
+
+
+ A public status page is not set up.
+
+ Please contact to your administrator
+
+
+ );
+ }
+
+ // Finished loading, but status page is not public
+ if (
+ !isLoading &&
+ currentPath === "/status/public" &&
+ statusPage.isPublished === false
+ ) {
+ return (
+
+
+
+ This status page is not public.
+
+ Please contact to your administrator
+
+
+ );
+ }
+
+ // Status page doesn't exist
+ if (!isLoading && typeof statusPage === "undefined") {
+ return (
+
+ );
+ }
+
+ return (
+
+
+ Service status
+
+
+ {link}
+
+ );
+};
+
+export default PublicStatus;
diff --git a/Client/src/Routes/index.jsx b/Client/src/Routes/index.jsx
index 555c335f7..570691726 100644
--- a/Client/src/Routes/index.jsx
+++ b/Client/src/Routes/index.jsx
@@ -29,7 +29,10 @@ import InfrastructureDetails from "../Pages/Infrastructure/Details";
import Incidents from "../Pages/Incidents";
-import Status from "../Pages/Status";
+//Status pages
+import CreateStatus from "../Pages/StatusPage/Create";
+import Status from "../Pages/StatusPage/Status";
+
import Integrations from "../Pages/Integrations";
// Settings
@@ -112,6 +115,12 @@ const Routes = () => {
path="status"
element={}
/>
+
+ }
+ />
+
}
@@ -174,6 +183,10 @@ const Routes = () => {
path="/new-password-confirmed"
element={}
/>
+ }
+ />
{
+ fd.append("monitors[]", monitorId);
+ });
+ if (form?.logo?.src && form?.logo?.src !== "") {
+ const imageResult = await axios.get(form.logo.src, {
+ responseType: "blob",
+ });
+ fd.append("logo", imageResult.data);
+ // Cleanup blob
+ if (form.logo.src.startsWith("blob:")) {
+ URL.revokeObjectURL(form.logo.src);
+ }
+ }
+
+ return this.axiosInstance.post(`/status-page`, fd, {
+ headers: {
+ Authorization: `Bearer ${authToken}`,
+ },
+ });
+ }
+
+ async deleteStatusPage(config) {
+ const { authToken } = config;
+ return this.axiosInstance.delete(`/status-page`, {
+ headers: {
+ Authorization: `Bearer ${authToken}`,
+ },
+ });
+ }
}
export default NetworkService;
diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js
index 11357e06d..a7072df81 100644
--- a/Client/src/Utils/Theme/constants.js
+++ b/Client/src/Utils/Theme/constants.js
@@ -152,6 +152,11 @@ const newSemanticColors = {
light: newColors.blueGray600,
dark: newColors.gray200,
},
+ // CAIO_REVIEW, need a brighter color for dark bg
+ contrastTextSecondaryDarkBg: {
+ light: newColors.gray200,
+ dark: newColors.gray200,
+ },
contrastTextTertiary: {
light: newColors.blueGray500,
dark: newColors.gray500,
diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js
index 12c377b3e..4d4c2dd40 100644
--- a/Client/src/Utils/Theme/globalTheme.js
+++ b/Client/src/Utils/Theme/globalTheme.js
@@ -21,6 +21,12 @@ const baseTheme = (palette) => ({
color: palette.primary.contrastTextSecondary,
fontWeight: 400,
},
+ // CAIO_REVIEW, need a brighter color for dark bg
+ h2DarkBg: {
+ fontSize: typographyLevels.l,
+ color: palette.primary.contrastTextSecondaryDarkBg,
+ fontWeight: 400,
+ },
body1: {
fontSize: typographyLevels.m,
color: palette.primary.contrastTextTertiary,
@@ -53,6 +59,18 @@ const baseTheme = (palette) => ({
},
},
},
+ {
+ props: (props) => props.color === "error",
+ style: {
+ "&.Mui-disabled": {
+ backgroundColor: theme.palette.error.lowContrast,
+ },
+ "& .MuiButton-loadingIndicator": {
+ // styles for error variant loading indicator
+ color: theme.palette.error.contrastText,
+ },
+ },
+ },
{
props: (props) => props.variant === "group",
style: {
@@ -302,6 +320,44 @@ const baseTheme = (palette) => ({
},
},
},
+ MuiTab: {
+ styleOverrides: {
+ root: ({ theme }) => ({
+ fontSize: 13,
+ color: theme.palette.tertiary.contrastText,
+ backgroundColor: theme.palette.tertiary.main,
+ textTransform: "none",
+ minWidth: "fit-content",
+ paddingY: theme.spacing(6),
+ fontWeight: 400,
+ borderBottom: "2px solid transparent",
+ borderRight: `1px solid ${theme.palette.primary.lowContrast}`,
+ "&:first-of-type": { borderTopLeftRadius: "8px" },
+ "&:last-child": { borderTopRightRadius: "8px", borderRight: 0 },
+ "&:focus-visible": {
+ color: theme.palette.primary.contrastText,
+ borderColor: theme.palette.tertiary.contrastText,
+ borderRightColor: theme.palette.primary.lowContrast,
+ },
+ "&.Mui-selected": {
+ backgroundColor: theme.palette.secondary.main,
+ color: theme.palette.secondary.contrastText,
+ borderColor: theme.palette.secondary.contrastText,
+ borderRightColor: theme.palette.primary.lowContrast,
+ },
+ "&:hover": {
+ borderColor: theme.palette.primary.lowContrast,
+ },
+ }),
+ },
+ },
+ MuiSvgIcon: {
+ styleOverrides: {
+ root: ({ theme }) => ({
+ color: theme.palette.primary.contrastTextTertiary,
+ }),
+ },
+ },
},
shape: {
borderRadius: 2,
diff --git a/Client/src/Utils/stringUtils.js b/Client/src/Utils/stringUtils.js
index 43ae5ed54..0bf7aaf11 100644
--- a/Client/src/Utils/stringUtils.js
+++ b/Client/src/Utils/stringUtils.js
@@ -15,3 +15,22 @@ export const capitalizeFirstLetter = (str) => {
}
return str.charAt(0).toUpperCase() + str.slice(1);
};
+
+/**
+ * Helper function to get first letter as a lower case string
+ * @param {string} str String whose first letter is to be lower cased
+ * @returns A string with first letter lower cased
+ */
+
+export const toLowerCaseFirstLetter = (str) => {
+ if (str === null || str === undefined) {
+ return "";
+ }
+ if (typeof str !== "string") {
+ throw new TypeError("Input must be a string");
+ }
+ if (str.length === 0) {
+ return "";
+ }
+ return str.charAt(0).toLowerCase() + str.slice(1);
+ };
\ No newline at end of file
diff --git a/Client/src/Validation/error.js b/Client/src/Validation/error.js
index 017fa9a46..8f043f997 100644
--- a/Client/src/Validation/error.js
+++ b/Client/src/Validation/error.js
@@ -1,6 +1,16 @@
+/**
+ * Update errors if passed id matches the error.details[0].path, otherwise remove
+ * the error for the id
+ * @param {*} prev Previous errors *
+ * @param {*} id ID of the field whose error is to be either updated or removed
+ * @param {*} error the error object
+ * @returns the Update Errors with the specific field with id being either removed or updated
+ */
+
+
const buildErrors = (prev, id, error) => {
const updatedErrors = { ...prev };
- if (error) {
+ if (error && id == error.details[0].path) {
updatedErrors[id] = error.details[0].message ?? "Validation error";
} else {
delete updatedErrors[id];
@@ -32,7 +42,15 @@ const getTouchedFieldErrors = (validation, touchedErrors) => {
return newErrors;
};
-
+/**
+ *
+ * @param {*} form The form object of the submitted form data
+ * @param {*} validation The Joi validation rules
+ * @param {*} setErrors The function used to set the local errors
+ * @returns true if there is no error or false if there is error after validating the form
+ * the error will be reset to {} if returns false; otherwise the errors object will be set with
+ * the new value
+ */
const hasValidationErrors = (form, validation, setErrors) => {
const { error } = validation.validate(form, {
abortEarly: false,
@@ -48,6 +66,10 @@ const hasValidationErrors = (form, validation, setErrors) => {
"refreshTokenTTL",
"jwtTTL",
"notify-email-list",
+ "_id",
+ "__v",
+ "createdAt",
+ "updatedAt"
].includes(err.path[0])
) {
newErrors[err.path[0]] = err.message ?? "Validation error";
@@ -66,8 +88,6 @@ const hasValidationErrors = (form, validation, setErrors) => {
newErrors["usage_temperature"] = null;
}
});
-
- console.log("newErrors", newErrors);
if (Object.values(newErrors).some((v) => v)) {
setErrors(newErrors);
return true;
@@ -76,6 +96,7 @@ const hasValidationErrors = (form, validation, setErrors) => {
return false;
}
}
+ setErrors({});
return false;
};
export { buildErrors, hasValidationErrors, getTouchedFieldErrors };
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index ec9245cdb..988035cbe 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -91,58 +91,61 @@ const credentials = joi.object({
});
const monitorValidation = joi.object({
- url: joi.when('type', {
- is: 'docker',
- then: joi.string()
- .trim().regex(/^[a-z0-9]{64}$/),
- otherwise: joi
- .string()
- .trim()
- .custom((value, helpers) => {
- // Regex from https://gist.github.com/dperini/729294
- var urlRegex = new RegExp(
- "^" +
- // protocol identifier (optional)
- // short syntax // still required
- "(?:(?:https?|ftp):\\/\\/)?" +
- // user:pass BasicAuth (optional)
- "(?:" +
- // IP address dotted notation octets
- // excludes loopback network 0.0.0.0
- // excludes reserved space >= 224.0.0.0
- // excludes network & broadcast addresses
- // (first & last IP address of each class)
- "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
- "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
- "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
- "|" +
- // host & domain names, may end with dot
- // can be replaced by a shortest alternative
- // (?![-_])(?:[-\\w\\u00a1-\\uffff]{0,63}[^-_]\\.)+
- "(?:" +
- "(?:" +
- "[a-z0-9\\u00a1-\\uffff]" +
- "[a-z0-9\\u00a1-\\uffff_-]{0,62}" +
- ")?" +
- "[a-z0-9\\u00a1-\\uffff]\\." +
- ")+" +
- // TLD identifier name, may end with dot
- "(?:[a-z\\u00a1-\\uffff]{2,}\\.?)" +
- ")" +
- // port number (optional)
- "(?::\\d{2,5})?" +
- // resource path (optional)
- "(?:[/?#]\\S*)?" +
- "$",
- "i"
- );
- if (!urlRegex.test(value)) {
- return helpers.error("string.invalidUrl");
- }
+ url: joi
+ .when("type", {
+ is: "docker",
+ then: joi
+ .string()
+ .trim()
+ .regex(/^[a-z0-9]{64}$/),
+ otherwise: joi
+ .string()
+ .trim()
+ .custom((value, helpers) => {
+ // Regex from https://gist.github.com/dperini/729294
+ var urlRegex = new RegExp(
+ "^" +
+ // protocol identifier (optional)
+ // short syntax // still required
+ "(?:(?:https?|ftp):\\/\\/)?" +
+ // user:pass BasicAuth (optional)
+ "(?:" +
+ // IP address dotted notation octets
+ // excludes loopback network 0.0.0.0
+ // excludes reserved space >= 224.0.0.0
+ // excludes network & broadcast addresses
+ // (first & last IP address of each class)
+ "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
+ "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
+ "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
+ "|" +
+ // host & domain names, may end with dot
+ // can be replaced by a shortest alternative
+ // (?![-_])(?:[-\\w\\u00a1-\\uffff]{0,63}[^-_]\\.)+
+ "(?:" +
+ "(?:" +
+ "[a-z0-9\\u00a1-\\uffff]" +
+ "[a-z0-9\\u00a1-\\uffff_-]{0,62}" +
+ ")?" +
+ "[a-z0-9\\u00a1-\\uffff]\\." +
+ ")+" +
+ // TLD identifier name, may end with dot
+ "(?:[a-z\\u00a1-\\uffff]{2,}\\.?)" +
+ ")" +
+ // port number (optional)
+ "(?::\\d{2,5})?" +
+ // resource path (optional)
+ "(?:[/?#]\\S*)?" +
+ "$",
+ "i"
+ );
+ if (!urlRegex.test(value)) {
+ return helpers.error("string.invalidUrl");
+ }
- return value;
- })
- })
+ return value;
+ }),
+ })
.messages({
"string.empty": "This field is required.",
"string.uri": "The URL you provided is not valid.",
@@ -175,6 +178,52 @@ const imageValidation = joi.object({
}),
});
+const logoImageValidation = joi
+ .object({
+ type: joi
+ .string()
+ .valid("image/jpeg", "image/png")
+ .allow(null) // Allow null and empty string
+ .messages({
+ "any.only": "Invalid file format.",
+ "string.empty": "File type required.",
+ })
+ .optional(),
+ size: joi
+ .number()
+ .max(3000000)
+ .allow(null) // Allow null and empty string
+ .messages({
+ "number.base": "File size must be a number.",
+ "number.max": "File size must be less than 3MB.",
+ "number.empty": "File size required.",
+ })
+ .optional(),
+ })
+ .allow(null)
+ .optional(); // Make entire object optional
+
+const statusPageValidation = joi.object({
+ isPublished: joi.bool(),
+ companyName: joi
+ .string()
+ .trim()
+ .messages({ "string.empty": "Company name is required." }),
+ url: joi.string().trim().messages({ "string.empty": "URL is required." }),
+ timezone: joi.string().trim().messages({ "string.empty": "Timezone is required." }),
+ color: joi.string().trim().messages({ "string.empty": "Color is required." }),
+ theme: joi.string(),
+ monitors: joi.array().min(1).required().messages({
+ "string.pattern.base": "Must be a valid monitor ID",
+ "array.base": "Monitors must be an array",
+ "array.min": "At least one monitor is required",
+ "array.empty": "At least one monitor is required",
+ "any.required": "At least one monitor is required",
+ }),
+ logo: logoImageValidation,
+ showUptimePercentage: joi.boolean(),
+ showCharts: joi.boolean(),
+});
const settingsValidation = joi.object({
ttl: joi.number().required().messages({
"string.empty": "TTL is required",
@@ -289,4 +338,6 @@ export {
maintenanceWindowValidation,
advancedSettingsValidation,
infrastructureMonitorValidation,
+ statusPageValidation,
+ logoImageValidation,
};
diff --git a/Client/src/main.jsx b/Client/src/main.jsx
index c07cad40b..7ee52132e 100644
--- a/Client/src/main.jsx
+++ b/Client/src/main.jsx
@@ -17,7 +17,7 @@ ReactDOM.createRoot(document.getElementById("root")).render(
>
-
+
diff --git a/Docker/dist/docker-compose.yaml b/Docker/dist/docker-compose.yaml
index a73b75dc6..420941e7e 100644
--- a/Docker/dist/docker-compose.yaml
+++ b/Docker/dist/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
restart: always
environment:
UPTIME_APP_API_BASE_URL: "http://localhost:5000/api/v1"
+ UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX: "http://uptimegenie.com/"
ports:
- "80:80"
- "443:443"
diff --git a/Docker/prod/docker-compose.yaml b/Docker/prod/docker-compose.yaml
index 2f8907089..0da2da996 100644
--- a/Docker/prod/docker-compose.yaml
+++ b/Docker/prod/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
restart: always
environment:
UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
+ UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX: "http://uptimegenie.com/"
ports:
- "80:80"
- "443:443"
diff --git a/Docker/test/docker-compose.yaml b/Docker/test/docker-compose.yaml
index 40890e1d9..09ea94449 100644
--- a/Docker/test/docker-compose.yaml
+++ b/Docker/test/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
restart: always
environment:
UPTIME_APP_API_BASE_URL: "https://checkmate-test.bluewavelabs.ca/api/v1"
+ UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX: "http://uptimegenie.com/"
ports:
- "80:80"
- "443:443"
diff --git a/Docker/test/prod/docker-compose.yaml b/Docker/test/prod/docker-compose.yaml
index e262ef1a2..ba88f3b67 100644
--- a/Docker/test/prod/docker-compose.yaml
+++ b/Docker/test/prod/docker-compose.yaml
@@ -3,6 +3,7 @@ services:
image: uptime_client:latest
environment:
UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
+ UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX: "http://uptimegenie.com/"
ports:
- "80:80"
- "443:443"
diff --git a/Server/controllers/statusPageController.js b/Server/controllers/statusPageController.js
index a4ceb8039..5f927f118 100644
--- a/Server/controllers/statusPageController.js
+++ b/Server/controllers/statusPageController.js
@@ -2,6 +2,7 @@ import { handleError, handleValidationError } from "./controllerUtils.js";
import {
createStatusPageBodyValidation,
getStatusPageParamValidation,
+ imageValidation,
} from "../validation/joi.js";
import { successMessages } from "../utils/messages.js";
@@ -15,13 +16,14 @@ class StatusPageController {
createStatusPage = async (req, res, next) => {
try {
await createStatusPageBodyValidation.validateAsync(req.body);
+ await imageValidation.validateAsync(req.file);
} catch (error) {
next(handleValidationError(error, SERVICE_NAME));
return;
}
try {
- const statusPage = await this.db.createStatusPage(req.body);
+ const statusPage = await this.db.createStatusPage(req.body, req.file);
return res.success({
msg: successMessages.STATUS_PAGE_CREATE,
data: statusPage,
@@ -30,17 +32,10 @@ class StatusPageController {
next(handleError(error, SERVICE_NAME, "createStatusPage"));
}
};
- getStatusPageByUrl = async (req, res, next) => {
- try {
- await getStatusPageParamValidation.validateAsync(req.params);
- } catch (error) {
- next(handleValidationError(error, SERVICE_NAME));
- return;
- }
+ getStatusPage = async (req, res, next) => {
try {
- const { url } = req.params;
- const statusPage = await this.db.getStatusPageByUrl(url);
+ const statusPage = await this.db.getStatusPage();
return res.success({
msg: successMessages.STATUS_PAGE_BY_URL,
data: statusPage,
@@ -49,6 +44,17 @@ class StatusPageController {
next(handleError(error, SERVICE_NAME, "getStatusPage"));
}
};
+
+ deleteStatusPage = async (req, res, next) => {
+ try {
+ await this.db.deleteStatusPage();
+ return res.success({
+ msg: successMessages.STATUS_PAGE_DELETE,
+ });
+ } catch (error) {
+ next(handleError(error, SERVICE_NAME, "deleteStatusPage"));
+ }
+ };
}
export default StatusPageController;
diff --git a/Server/db/models/StatusPage.js b/Server/db/models/StatusPage.js
index 1169d4661..e720327ed 100644
--- a/Server/db/models/StatusPage.js
+++ b/Server/db/models/StatusPage.js
@@ -23,11 +23,6 @@ const StatusPageSchema = mongoose.Schema(
required: true,
default: "#4169E1",
},
- theme: {
- type: String,
- required: true,
- default: "light",
- },
monitors: [
{
type: mongoose.Schema.Types.ObjectId,
@@ -35,6 +30,22 @@ const StatusPageSchema = mongoose.Schema(
required: true,
},
],
+ logo: {
+ data: Buffer,
+ contentType: String,
+ },
+ isPublished: {
+ type: Boolean,
+ default: false,
+ },
+ showCharts: {
+ type: Boolean,
+ default: true,
+ },
+ showUptimePercentage: {
+ type: Boolean,
+ default: true,
+ },
},
{ timestamps: true }
);
diff --git a/Server/db/mongo/modules/statusPageModule.js b/Server/db/mongo/modules/statusPageModule.js
index 194287448..61a1877d7 100644
--- a/Server/db/mongo/modules/statusPageModule.js
+++ b/Server/db/mongo/modules/statusPageModule.js
@@ -1,11 +1,18 @@
import StatusPage from "../../models/StatusPage.js";
import { errorMessages } from "../../../utils/messages.js";
+import { NormalizeData } from "../../../utils/dataUtils.js";
const SERVICE_NAME = "statusPageModule";
-const createStatusPage = async (statusPageData) => {
+const createStatusPage = async (statusPageData, image) => {
try {
const statusPage = new StatusPage({ ...statusPageData });
+ if (image) {
+ statusPage.logo = {
+ data: image.buffer,
+ contentType: image.mimetype,
+ };
+ }
await statusPage.save();
return statusPage;
} catch (error) {
@@ -20,16 +27,84 @@ const createStatusPage = async (statusPageData) => {
}
};
-const getStatusPageByUrl = async (url) => {
+const getStatusPage = async () => {
try {
- const statusPage = await StatusPage.findOne({ url });
- if (statusPage === null || statusPage === undefined) {
+ const statusPageQuery = await StatusPage.aggregate([
+ { $limit: 1 },
+ {
+ $set: {
+ originalMonitors: "$monitors",
+ },
+ },
+ {
+ $lookup: {
+ from: "monitors",
+ localField: "monitors",
+ foreignField: "_id",
+ as: "monitors",
+ },
+ },
+ {
+ $unwind: "$monitors",
+ },
+ {
+ $lookup: {
+ from: "checks",
+ let: { monitorId: "$monitors._id" },
+ pipeline: [
+ {
+ $match: {
+ $expr: { $eq: ["$monitorId", "$$monitorId"] },
+ },
+ },
+ { $sort: { createdAt: -1 } },
+ { $limit: 25 },
+ ],
+ as: "monitors.checks",
+ },
+ },
+ {
+ $addFields: {
+ "monitors.orderIndex": {
+ $indexOfArray: ["$originalMonitors", "$monitors._id"],
+ },
+ },
+ },
+ {
+ $group: {
+ _id: "$_id",
+ statusPage: { $first: "$$ROOT" },
+ monitors: { $push: "$monitors" },
+ },
+ },
+ {
+ $project: {
+ statusPage: 1,
+ monitors: {
+ $sortArray: {
+ input: "$monitors",
+ sortBy: { orderIndex: 1 },
+ },
+ },
+ },
+ },
+ ]);
+ if (!statusPageQuery.length) {
const error = new Error(errorMessages.STATUS_PAGE_NOT_FOUND);
error.status = 404;
-
throw error;
}
- return statusPage;
+
+ const { statusPage, monitors } = statusPageQuery[0];
+
+ const normalizedMonitors = monitors.map((monitor) => {
+ return {
+ ...monitor,
+ checks: NormalizeData(monitor.checks, 10, 100),
+ };
+ });
+
+ return { statusPage, monitors: normalizedMonitors };
} catch (error) {
error.service = SERVICE_NAME;
error.method = "getStatusPageByUrl";
@@ -37,4 +112,14 @@ const getStatusPageByUrl = async (url) => {
}
};
-export { createStatusPage, getStatusPageByUrl };
+const deleteStatusPage = async () => {
+ try {
+ await StatusPage.deleteOne({});
+ } catch (error) {
+ error.service = SERVICE_NAME;
+ error.method = "createStatusPage";
+ throw error;
+ }
+};
+
+export { createStatusPage, getStatusPage, deleteStatusPage };
diff --git a/Server/routes/statusPageRoute.js b/Server/routes/statusPageRoute.js
index ff2a2018a..2217bc9f6 100644
--- a/Server/routes/statusPageRoute.js
+++ b/Server/routes/statusPageRoute.js
@@ -1,6 +1,7 @@
import { Router } from "express";
-
import { verifyJWT } from "../middleware/verifyJWT.js";
+import multer from "multer";
+const upload = multer();
class StatusPageRoutes {
constructor(statusPageController) {
@@ -10,8 +11,14 @@ class StatusPageRoutes {
}
initRoutes() {
- this.router.get("/:url", this.statusPageController.getStatusPageByUrl);
- this.router.post("/:url", verifyJWT, this.statusPageController.createStatusPage);
+ this.router.get("/", this.statusPageController.getStatusPage);
+ this.router.post(
+ "/",
+ upload.single("logo"),
+ verifyJWT,
+ this.statusPageController.createStatusPage
+ );
+ this.router.delete("/", verifyJWT, this.statusPageController.deleteStatusPage);
}
getRouter() {
diff --git a/Server/utils/messages.js b/Server/utils/messages.js
index 5fc3c70bc..932585bc7 100644
--- a/Server/utils/messages.js
+++ b/Server/utils/messages.js
@@ -136,7 +136,7 @@ const successMessages = {
// Status Page
STATUS_PAGE_BY_URL: "Got status page by url successfully",
STATUS_PAGE_CREATE: "Status page created successfully",
-
+ STATUS_PAGE_DELETE: "Status page deleted successfully",
// Docker
DOCKER_SUCCESS: "Docker container status fetched successfully",
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index 9f20eb0d1..d595f00fd 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -423,7 +423,6 @@ const createStatusPageBodyValidation = joi.object({
url: joi.string().required(),
timezone: joi.string().required(),
color: joi.string().required(),
- theme: joi.string().required(),
monitors: joi
.array()
.items(joi.string().pattern(/^[0-9a-fA-F]{24}$/))
@@ -434,8 +433,35 @@ const createStatusPageBodyValidation = joi.object({
"array.empty": "At least one monitor is required",
"any.required": "Monitors are required",
}),
+ isPublished: joi.boolean(),
+ showCharts: joi.boolean(),
+ showUptimePercentage: joi.boolean(),
});
+const imageValidation = joi
+ .object({
+ fieldname: joi.string().required(),
+ originalname: joi.string().required(),
+ encoding: joi.string().required(),
+ mimetype: joi
+ .string()
+ .valid("image/jpeg", "image/png", "image/jpg")
+ .required()
+ .messages({
+ "string.valid": "File must be a valid image (jpeg, jpg, or png)",
+ }),
+ size: joi.number().max(3145728).required().messages({
+ "number.max": "File size must be less than 3MB",
+ }),
+ buffer: joi.binary().required(),
+ destination: joi.string(),
+ filename: joi.string(),
+ path: joi.string(),
+ })
+ .messages({
+ "any.required": "Image file is required",
+ });
+
export {
roleValidatior,
loginValidation,
@@ -493,4 +519,5 @@ export {
updateAppSettingsBodyValidation,
createStatusPageBodyValidation,
getStatusPageParamValidation,
+ imageValidation,
};