diff --git a/Client/src/Pages/Uptime/Home/Hooks/useMonitorFetch.jsx b/Client/src/Pages/Uptime/Home/Hooks/useMonitorsFetch.jsx
similarity index 100%
rename from Client/src/Pages/Uptime/Home/Hooks/useMonitorFetch.jsx
rename to Client/src/Pages/Uptime/Home/Hooks/useMonitorsFetch.jsx
diff --git a/Client/src/Pages/Uptime/Home/index.jsx b/Client/src/Pages/Uptime/Home/index.jsx
index c300118e0..2427d7e61 100644
--- a/Client/src/Pages/Uptime/Home/index.jsx
+++ b/Client/src/Pages/Uptime/Home/index.jsx
@@ -13,7 +13,7 @@ import { useState, useCallback } from "react";
import { useIsAdmin } from "../../../Hooks/useIsAdmin";
import { useTheme } from "@emotion/react";
import { useNavigate } from "react-router-dom";
-import useMonitorFetch from "./Hooks/useMonitorFetch";
+import useMonitorsFetch from "./Hooks/useMonitorsFetch";
import { useSelector, useDispatch } from "react-redux";
import { setRowsPerPage } from "../../../Features/UI/uiSlice";
import PropTypes from "prop-types";
@@ -86,7 +86,7 @@ const UptimeMonitors = () => {
const teamId = user.teamId;
const { monitorsAreLoading, monitors, filteredMonitors, monitorsSummary } =
- useMonitorFetch({
+ useMonitorsFetch({
authToken,
teamId,
limit: 25,
diff --git a/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx b/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx
new file mode 100644
index 000000000..33d2d71c5
--- /dev/null
+++ b/Client/src/Pages/Uptime/NewDetails/Hooks/useCertificateFetch.jsx
@@ -0,0 +1,45 @@
+import { logger } from "../../../../Utils/Logger";
+import { useEffect, useState } from "react";
+import { networkService } from "../../../../main";
+import { formatDateWithTz } from "../../../../Utils/DateUtils";
+
+const useCertificateFetch = ({
+ monitor,
+ authToken,
+ monitorId,
+ certificateDateFormat,
+ uiTimezone,
+}) => {
+ const [certificateExpiry, setCertificateExpiry] = useState("N/A");
+ const [certificateIsLoading, setCertificateIsLoading] = useState(false);
+
+ useEffect(() => {
+ const fetchCertificate = async () => {
+ if (monitor?.type !== "http") {
+ return;
+ }
+
+ try {
+ setCertificateIsLoading(true);
+ const res = await networkService.getCertificateExpiry({
+ authToken: authToken,
+ monitorId: monitorId,
+ });
+ if (res?.data?.data?.certificateDate) {
+ const date = res.data.data.certificateDate;
+ setCertificateExpiry(
+ formatDateWithTz(date, certificateDateFormat, uiTimezone) ?? "N/A"
+ );
+ }
+ } catch (error) {
+ setCertificateExpiry("N/A");
+ logger.error(error);
+ } finally {
+ setCertificateIsLoading(false);
+ }
+ };
+ }, [authToken, monitorId]);
+ return { certificateExpiry, certificateIsLoading };
+};
+
+export default useCertificateFetch;
diff --git a/Client/src/Pages/Uptime/NewDetails/Hooks/useMonitorFetch.jsx b/Client/src/Pages/Uptime/NewDetails/Hooks/useMonitorFetch.jsx
new file mode 100644
index 000000000..e7ed825f2
--- /dev/null
+++ b/Client/src/Pages/Uptime/NewDetails/Hooks/useMonitorFetch.jsx
@@ -0,0 +1,34 @@
+import { useEffect, useState } from "react";
+import { networkService } from "../../../../main";
+import { logger } from "../../../../Utils/Logger";
+import { useNavigate } from "react-router-dom";
+
+export const useMonitorFetch = ({ authToken, monitorId, dateRange }) => {
+ const [monitorIsLoading, setMonitorsIsLoading] = useState(false);
+ const [monitor, setMonitor] = useState([]);
+ const navigate = useNavigate();
+
+ useEffect(() => {
+ const fetchMonitors = async () => {
+ try {
+ setMonitorsIsLoading(true);
+ const res = await networkService.getUptimeDetailsById({
+ authToken: authToken,
+ monitorId: monitorId,
+ dateRange: dateRange,
+ normalize: true,
+ });
+ setMonitor(res?.data?.data ?? {});
+ } catch (error) {
+ logger.error(error);
+ navigate("/not-found", { replace: true });
+ } finally {
+ setMonitorsIsLoading(false);
+ }
+ };
+ fetchMonitors();
+ }, [authToken, dateRange, monitorId, navigate]);
+ return { monitor, monitorIsLoading };
+};
+
+export default useMonitorFetch;
diff --git a/Client/src/Pages/Uptime/NewDetails/index.jsx b/Client/src/Pages/Uptime/NewDetails/index.jsx
new file mode 100644
index 000000000..3467f8228
--- /dev/null
+++ b/Client/src/Pages/Uptime/NewDetails/index.jsx
@@ -0,0 +1,48 @@
+// Components
+import Breadcrumbs from "../../../Components/Breadcrumbs";
+
+// MUI Components
+import { Stack } from "@mui/material";
+
+// Utils
+import { useEffect, useState } from "react";
+import { useParams } from "react-router-dom";
+import { useSelector } from "react-redux";
+import { useMonitorFetch } from "./Hooks/useMonitorFetch";
+// Constants
+const BREADCRUMBS = [
+ { name: "uptime", path: "/uptime" },
+ { name: "details", path: "" },
+ // { name: "details", path: `/uptime/${monitorId}` }, Is this needed? We can't click on this anywy
+];
+
+const certificateDateFormat = "MMM D, YYYY h A";
+
+const UptimeDetails = () => {
+ // Redux state
+ const { authToken } = useSelector((state) => state.auth);
+ const uiTimezone = useSelector((state) => state.ui.timezone);
+
+ // Local state
+ const [dateRange, setDateRange] = useState("day");
+
+ // Utils
+ const dateFormat = dateRange === "day" ? "MMM D, h A" : "MMM D";
+ const { monitorId } = useParams();
+
+ const { monitor, monitorIsLoading } = useMonitorFetch({
+ authToken,
+ monitorId,
+ dateRange,
+ });
+
+ console.log(monitor);
+
+ return (
+
+
+
+ );
+};
+
+export default UptimeDetails;
diff --git a/Client/src/Routes/index.jsx b/Client/src/Routes/index.jsx
index b5f4dd376..6ac5624a9 100644
--- a/Client/src/Routes/index.jsx
+++ b/Client/src/Routes/index.jsx
@@ -19,6 +19,8 @@ import SetNewPassword from "../Pages/Auth/SetNewPassword";
import NewPasswordConfirmed from "../Pages/Auth/NewPasswordConfirmed";
import ProtectedRoute from "../Components/ProtectedRoute";
import Details from "../Pages/Uptime/Details";
+
+import UptimeDetails from "../Pages/Uptime/NewDetails";
import Maintenance from "../Pages/Maintenance";
import Configure from "../Pages/Uptime/Configure";
import PageSpeed from "../Pages/PageSpeed";
@@ -55,7 +57,7 @@ const Routes = () => {
/>
}
+ element={}
/>