From e90e497fef10c7d7a0061560cad22e69665b1ef2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 14 Mar 2025 12:05:26 -0700 Subject: [PATCH] use new hooks --- .../DistributedUptimeStatus/Create/index.jsx | 25 +++++++++++++------ .../DistributedUptimeStatus/Status/index.jsx | 14 +++++++---- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/Pages/DistributedUptimeStatus/Create/index.jsx b/src/Pages/DistributedUptimeStatus/Create/index.jsx index b1e54df6e..308f9489b 100644 --- a/src/Pages/DistributedUptimeStatus/Create/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Create/index.jsx @@ -19,9 +19,8 @@ import { buildErrors } from "../../../Validation/error"; import { createToast } from "../../../Utils/toastUtils"; import { useNavigate } from "react-router-dom"; import { useMonitorsFetch } from "../../StatusPage/Create/Hooks/useMonitorsFetch"; -import { useDUStatusPageFetchByUrl } from "../Status/Hooks/useDUStatusPageFetchByUrl"; import { useTranslation } from "react-i18next"; - +import { useFetchDepinStatusPage } from "../../../Hooks/useFetchDepinStatusPage"; const CreateStatus = () => { const theme = useTheme(); const { monitorId, url } = useParams(); @@ -32,7 +31,7 @@ const CreateStatus = () => { const [createStatusPage, isLoading, networkError] = useCreateStatusPage(isCreate); const [statusPageIsLoading, statusPageNetworkError, statusPage, _, isPublished] = - useDUStatusPageFetchByUrl({ + useFetchDepinStatusPage({ url, timeFrame: 30, isCreate, @@ -178,7 +177,9 @@ const CreateStatus = () => { component="span" fontSize="inherit" > - {isCreate ? t("distributedUptimeStatusCreateYour") : t("distributedUptimeStatusEditYour")}{" "} + {isCreate + ? t("distributedUptimeStatusCreateYour") + : t("distributedUptimeStatusEditYour")}{" "} { - {t("distributedUptimeStatusCreateStatusPageAccess")} + + {t("distributedUptimeStatusCreateStatusPageAccess")} + {t("distributedUptimeStatusCreateStatusPageReady")} @@ -208,7 +211,9 @@ const CreateStatus = () => { - {t("distributedUptimeStatusBasicInfoHeader")} + + {t("distributedUptimeStatusBasicInfoHeader")} + {t("distributedUptimeStatusBasicInfoDescription")} @@ -241,7 +246,9 @@ const CreateStatus = () => { {t("distributedUptimeStatusLogoHeader")} - {t("distributedUptimeStatusLogoDescription")} + + {t("distributedUptimeStatusLogoDescription")}{" "} + { - {t("distributedUptimeStatusStandardMonitorsHeader")} + + {t("distributedUptimeStatusStandardMonitorsHeader")} + {t("distributedUptimeStatusStandardMonitorsDescription")} diff --git a/src/Pages/DistributedUptimeStatus/Status/index.jsx b/src/Pages/DistributedUptimeStatus/Status/index.jsx index 44ca68ade..117a297e5 100644 --- a/src/Pages/DistributedUptimeStatus/Status/index.jsx +++ b/src/Pages/DistributedUptimeStatus/Status/index.jsx @@ -23,8 +23,8 @@ import { RowContainer } from "../../../Components/StandardContainer"; import { useTheme } from "@mui/material/styles"; import { useState, useEffect, useRef } from "react"; import { useParams } from "react-router-dom"; -import { useSubscribeToDetails } from "../../DistributedUptime/Details/Hooks/useSubscribeToDetails"; -import { useDUStatusPageFetchByUrl } from "./Hooks/useDUStatusPageFetchByUrl"; +import { useFetchDepinStatusPage } from "../../../Hooks/useFetchDepinStatusPage"; +import { useSubscribeToDepinDetails } from "../../../Hooks/useSubscribeToDepinDetails"; import { useStatusPageDelete } from "../../StatusPage/Status/Hooks/useStatusPageDelete"; import TimeFrameHeader from "./Components/TimeframeHeader"; import SubHeader from "../../../Components/Subheader"; @@ -64,13 +64,13 @@ const DistributedUptimeStatus = () => { statusPage, monitorId, isPublished, - ] = useDUStatusPageFetchByUrl({ + ] = useFetchDepinStatusPage({ url, timeFrame, }); const [isLoading, networkError, connectionStatus, monitor, lastUpdateTrigger] = - useSubscribeToDetails({ monitorId, dateRange, isPublic, isPublished }); + useSubscribeToDepinDetails({ monitorId, dateRange, isPublic, isPublished }); const [deleteStatusPage, isDeleting] = useStatusPageDelete(() => { navigate("/distributed-uptime"); @@ -253,7 +253,11 @@ const DistributedUptimeStatus = () => { sx={{ width: "50%" }} />