Merge branch 'feat/fe/details-empty-views' of github.com:bluewave-labs/bluewave-uptime into feat/fe/details-empty-views

Client/src/Pages/Auth/Login.jsx

@@ -548,23 +548,6 @@ const Login = () => {
 					)
 				)}
 			</Stack>
-			<Box
-				textAlign="center"
-				p={theme.spacing(12)}
-			>
-				<Typography display="inline-block">Don&apos;t have an account? —</Typography>
-				<Typography
-					component="span"
-					color={theme.palette.primary.main}
-					ml={theme.spacing(2)}
-					onClick={() => {
-						navigate("/register");
-					}}
-					sx={{ userSelect: "none" }}
-				>
-					Sign Up
-				</Typography>
-			</Box>
 		</Stack>
 	);
 };

Client/src/Pages/Infrastructure/CreateMonitor/index.jsx

@@ -132,7 +132,7 @@ const CreateInfrastructureMonitor = () => {
 		Object.keys(form)
 			.filter((k) => k.startsWith(THRESHOLD_FIELD_PREFIX))
 			.map((k) => {
-				if (form[k]) thresholds[k] = form[k];
+				if (form[k]) thresholds[k] = form[k] / 100;
 				delete form[k];
 				delete form[k.substring(THRESHOLD_FIELD_PREFIX.length)];
 			});
@@ -158,6 +158,7 @@ const CreateInfrastructureMonitor = () => {
 					: infrastructureMonitor.name,
 			interval: infrastructureMonitor.interval * MS_PER_MINUTE,
 		};
+
 		delete form.notifications;
 		if (hasValidationErrors(form, infrastructureMonitorValidation, setErrors)) {
 			return;
@@ -194,25 +195,6 @@ const CreateInfrastructureMonitor = () => {
 		{ _id: 10, name: "10 minutes" },
 	];
 
-	const NOTIFY_MULTIPLE_EMAIL_LABEL = (
-		<Box>
-			<Typography mb={theme.spacing(4)}>
-				Also notify via email to multiple addresses (coming soon)
-			</Typography>
-			<Field
-				id="notify-email-list"
-				type="text"
-				placeholder="name@gmail.com"
-				value=""
-				onChange={() => logger.warn("disabled")}
-				onBlur={handleBlur}
-			/>
-			<Typography mt={theme.spacing(4)}>
-				You can separate multiple emails with a comma
-			</Typography>
-		</Box>
-	);
-
 	return (
 		<Box className="create-infrastructure-monitor">
 			<Breadcrumbs
@@ -253,7 +235,8 @@ const CreateInfrastructureMonitor = () => {
 					<Box>
 						<Typography component="h2">General settings</Typography>
 						<Typography component="p">
-							Here you can select the URL of the host, together with the type of monitor.
+							Here you can select the URL of the host, together with the friendly name and
+							authorization secret to connect to the server agent.
 						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
@@ -307,15 +290,6 @@ const CreateInfrastructureMonitor = () => {
 							onChange={(e) => handleChange(e)}
 							onBlur={handleBlur}
 						/>
-						<Checkbox
-							id="notify-email"
-							label={NOTIFY_MULTIPLE_EMAIL_LABEL}
-							isChecked={false}
-							value=""
-							onChange={() => logger.warn("disabled")}
-							onBlur={handleBlur}
-							isDisabled={true}
-						/>
 					</Stack>
 				</ConfigBox>
 
@@ -323,8 +297,7 @@ const CreateInfrastructureMonitor = () => {
 					<Box>
 						<Typography component="h2">Customize alerts</Typography>
 						<Typography component="p">
-							Send a notification to user(s) When the thresholds exceed a certain number
-							or percentage.
+							Send a notification to user(s) when thresholds exceed a specified percentage.
 						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(6)}>

Client/src/Pages/Infrastructure/Details/index.jsx

@@ -11,6 +11,7 @@ import PulseDot from "../../../Components/Animated/PulseDot";
 import useUtils from "../../Monitors/utils";
 import { useNavigate } from "react-router-dom";
 import Empty from "./empty";
+import { logger } from "../../../Utils/Logger";
 import { formatDurationRounded, formatDurationSplit } from "../../../Utils/timeUtils";
 import {
 	TzTick,
@@ -190,7 +191,7 @@ const InfrastructureDetails = () => {
 	];
 	const [monitor, setMonitor] = useState(null);
 	const { authToken } = useSelector((state) => state.auth);
-	const [dateRange, setDateRange] = useState("day");
+	const [dateRange, setDateRange] = useState("all");
 	const { statusColor, determineState } = useUtils();
 	// These calculations are needed because ResponsiveContainer
 	// doesn't take padding of parent/siblings into account
@@ -210,23 +211,23 @@ const InfrastructureDetails = () => {
 				const response = await networkService.getStatsByMonitorId({
 					authToken: authToken,
 					monitorId: monitorId,
-					sortOrder: null,
+					sortOrder: "asc",
 					limit: null,
 					dateRange: dateRange,
 					numToDisplay: 50,
-					normalize: true,
+					normalize: false,
 				});
 
 				setMonitor(response.data.data);
 			} catch (error) {
 				navigate("/not-found", { replace: true });
-
-				console.error(error);
+        logger.error(error);
 			}
 		};
 		fetchData();
 	}, [authToken, monitorId, dateRange]);
 
+
 	const statBoxConfigs = [
 		{
 			id: 0,

Client/src/Utils/Logger.js

@@ -44,6 +44,14 @@ class Logger {
 			this.log = NO_OP;
 			return;
 		}
+
+		if (logLevel === "debug") {
+			this.error = console.error.bind(console);
+			this.warn = console.warn.bind(console);
+			this.info = console.info.bind(console);
+			this.log = console.log.bind(console);
+			return;
+		}
 	}
 
 	cleanup() {