From 68354aac063554f8f8afc277c9b1bc045c586da7 Mon Sep 17 00:00:00 2001 From: nbgslv Date: Mon, 14 Apr 2025 21:04:24 +0300 Subject: [PATCH 1/5] Add Breadcrumbs component to status page for improved navigation --- src/Pages/StatusPage/Create/index.jsx | 15 +++++++++++++++ src/Pages/StatusPage/Status/index.jsx | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Pages/StatusPage/Create/index.jsx b/src/Pages/StatusPage/Create/index.jsx index 1fa65d38f..034073174 100644 --- a/src/Pages/StatusPage/Create/index.jsx +++ b/src/Pages/StatusPage/Create/index.jsx @@ -3,6 +3,7 @@ import { Stack, Button, Typography } from "@mui/material"; import Tabs from "./Components/Tabs"; import GenericFallback from "../../../Components/GenericFallback"; import SkeletonLayout from "./Components/Skeleton"; +import Breadcrumbs from "../../../Components/Breadcrumbs/index.jsx"; //Utils import { useTheme } from "@emotion/react"; import { useState, useEffect, useRef, useCallback } from "react"; @@ -58,6 +59,19 @@ const CreateStatusPage = () => { const [statusPage, statusPageMonitors, statusPageIsLoading, statusPageNetworkError] = useStatusPageFetch(isCreate, url); + + // Breadcrumbs + const crumbs = [ + { name: "status pages", path: "/status" }, + ]; + if (isCreate) { + crumbs.push({ name: "create", path: "/status/create" }); + } else { + crumbs.push( + { name: "details", path: `/status/uptime/${statusPage?.url}` }, + { name: "configure", path: "" } + ); + } // Handlers const handleFormChange = (e) => { @@ -218,6 +232,7 @@ const CreateStatusPage = () => { // Load fields return ( + { const { t } = useTranslation(); const location = useLocation(); const navigate = useNavigate(); + const crumbs = [ + { name: "status pages", path: "/status" }, + { name: "details", path: "" }, + ]; const [statusPage, monitors, isLoading, networkError, fetchStatusPage] = useStatusPageFetch(false, url); @@ -123,9 +128,9 @@ const PublicStatus = () => { return ( + {!isPublic && } Date: Mon, 14 Apr 2025 21:17:33 +0300 Subject: [PATCH 2/5] Refactor Breadcrumbs to use translation keys for improved localization --- src/Pages/StatusPage/Create/index.jsx | 8 ++++---- src/Pages/StatusPage/Status/index.jsx | 4 ++-- src/locales/gb.json | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Pages/StatusPage/Create/index.jsx b/src/Pages/StatusPage/Create/index.jsx index 034073174..842bcaffb 100644 --- a/src/Pages/StatusPage/Create/index.jsx +++ b/src/Pages/StatusPage/Create/index.jsx @@ -62,14 +62,14 @@ const CreateStatusPage = () => { // Breadcrumbs const crumbs = [ - { name: "status pages", path: "/status" }, + { name: t("statusPages"), path: "/status" }, ]; if (isCreate) { - crumbs.push({ name: "create", path: "/status/create" }); + crumbs.push({ name: t("create"), path: "/status/create" }); } else { crumbs.push( - { name: "details", path: `/status/uptime/${statusPage?.url}` }, - { name: "configure", path: "" } + { name: t("details"), path: `/status/uptime/${statusPage?.url}` }, + { name: t("configure"), path: "" } ); } diff --git a/src/Pages/StatusPage/Status/index.jsx b/src/Pages/StatusPage/Status/index.jsx index 8f699d3f4..9f9c169ba 100644 --- a/src/Pages/StatusPage/Status/index.jsx +++ b/src/Pages/StatusPage/Status/index.jsx @@ -30,8 +30,8 @@ const PublicStatus = () => { const location = useLocation(); const navigate = useNavigate(); const crumbs = [ - { name: "status pages", path: "/status" }, - { name: "details", path: "" }, + { name: t("statusPages"), path: "/status" }, + { name: t("details"), path: "" }, ]; const [statusPage, monitors, isLoading, networkError, fetchStatusPage] = diff --git a/src/locales/gb.json b/src/locales/gb.json index 5dfe9b4ca..603e3e4ab 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -375,5 +375,8 @@ "infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!", "errorInvalidTypeId": "Invalid notification type provided", "errorInvalidFieldId": "Invalid field ID provided", - "inviteNoTokenFound": "No invite token found" + "inviteNoTokenFound": "No invite token found", + "details": "Details", + "create": "Create", + "statusPages": "Status Pages" } From 9b63016d56c23659ce2324be443767f2462b0bae Mon Sep 17 00:00:00 2001 From: nbgslv Date: Wed, 16 Apr 2025 20:25:31 +0300 Subject: [PATCH 3/5] Update Breadcrumbs to use new translation keys for improved localization --- src/Pages/StatusPage/Create/index.jsx | 6 +++--- src/Pages/StatusPage/Status/index.jsx | 4 ++-- src/locales/gb.json | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Pages/StatusPage/Create/index.jsx b/src/Pages/StatusPage/Create/index.jsx index 842bcaffb..054eba23e 100644 --- a/src/Pages/StatusPage/Create/index.jsx +++ b/src/Pages/StatusPage/Create/index.jsx @@ -62,13 +62,13 @@ const CreateStatusPage = () => { // Breadcrumbs const crumbs = [ - { name: t("statusPages"), path: "/status" }, + { name: t("statusBredCrumbsStatusPages"), path: "/status" }, ]; if (isCreate) { - crumbs.push({ name: t("create"), path: "/status/create" }); + crumbs.push({ name: t("statusBredCrumbsCreate"), path: "/status/uptime/create" }); } else { crumbs.push( - { name: t("details"), path: `/status/uptime/${statusPage?.url}` }, + { name: t("statusBredCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, { name: t("configure"), path: "" } ); } diff --git a/src/Pages/StatusPage/Status/index.jsx b/src/Pages/StatusPage/Status/index.jsx index 9f9c169ba..130e5b617 100644 --- a/src/Pages/StatusPage/Status/index.jsx +++ b/src/Pages/StatusPage/Status/index.jsx @@ -30,8 +30,8 @@ const PublicStatus = () => { const location = useLocation(); const navigate = useNavigate(); const crumbs = [ - { name: t("statusPages"), path: "/status" }, - { name: t("details"), path: "" }, + { name: t("statusBredCrumbsStatusPages"), path: "/status" }, + { name: t("statusBredCrumbsDetails"), path: "" }, ]; const [statusPage, monitors, isLoading, networkError, fetchStatusPage] = diff --git a/src/locales/gb.json b/src/locales/gb.json index 603e3e4ab..e912ef05e 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -376,7 +376,7 @@ "errorInvalidTypeId": "Invalid notification type provided", "errorInvalidFieldId": "Invalid field ID provided", "inviteNoTokenFound": "No invite token found", - "details": "Details", - "create": "Create", - "statusPages": "Status Pages" + "statusBredCrumbsDetails": "Details", + "statusBredCrumbsCreate": "Create", + "statusBredCrumbsStatusPages": "Status Pages" } From a7fa3ccb77b364ef9150de610ebc699ad2417ac0 Mon Sep 17 00:00:00 2001 From: nbgslv Date: Wed, 16 Apr 2025 20:36:18 +0300 Subject: [PATCH 4/5] Update Breadcrumbs to include dynamic path for configuration page --- src/Pages/StatusPage/Create/index.jsx | 2 +- src/Pages/StatusPage/Status/index.jsx | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Pages/StatusPage/Create/index.jsx b/src/Pages/StatusPage/Create/index.jsx index 054eba23e..8c6b49079 100644 --- a/src/Pages/StatusPage/Create/index.jsx +++ b/src/Pages/StatusPage/Create/index.jsx @@ -69,7 +69,7 @@ const CreateStatusPage = () => { } else { crumbs.push( { name: t("statusBredCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, - { name: t("configure"), path: "" } + { name: t("configure"), path: `/status/uptime/configure/${statusPage?.url}` } ); } diff --git a/src/Pages/StatusPage/Status/index.jsx b/src/Pages/StatusPage/Status/index.jsx index 130e5b617..d262a4ebb 100644 --- a/src/Pages/StatusPage/Status/index.jsx +++ b/src/Pages/StatusPage/Status/index.jsx @@ -29,14 +29,16 @@ const PublicStatus = () => { const { t } = useTranslation(); const location = useLocation(); const navigate = useNavigate(); - const crumbs = [ - { name: t("statusBredCrumbsStatusPages"), path: "/status" }, - { name: t("statusBredCrumbsDetails"), path: "" }, - ]; const [statusPage, monitors, isLoading, networkError, fetchStatusPage] = useStatusPageFetch(false, url); const [deleteStatusPage, isDeleting] = useStatusPageDelete(fetchStatusPage, url); + + // Breadcrumbs + const crumbs = [ + { name: t("statusBredCrumbsStatusPages"), path: "/status" }, + { name: t("statusBredCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, + ]; // Setup let sx = { paddingLeft: theme.spacing(20), paddingRight: theme.spacing(20) }; From 6383d60dd2b4951113293f8f6c3296d356c73ea7 Mon Sep 17 00:00:00 2001 From: nbgslv Date: Thu, 17 Apr 2025 18:06:49 +0300 Subject: [PATCH 5/5] Fix breadcrumb translation keys for consistency --- src/Pages/StatusPage/Create/index.jsx | 6 +++--- src/Pages/StatusPage/Status/index.jsx | 4 ++-- src/locales/gb.json | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Pages/StatusPage/Create/index.jsx b/src/Pages/StatusPage/Create/index.jsx index 8c6b49079..4f7083ceb 100644 --- a/src/Pages/StatusPage/Create/index.jsx +++ b/src/Pages/StatusPage/Create/index.jsx @@ -62,13 +62,13 @@ const CreateStatusPage = () => { // Breadcrumbs const crumbs = [ - { name: t("statusBredCrumbsStatusPages"), path: "/status" }, + { name: t("statusBreadCrumbsStatusPages"), path: "/status" }, ]; if (isCreate) { - crumbs.push({ name: t("statusBredCrumbsCreate"), path: "/status/uptime/create" }); + crumbs.push({ name: t("statusBreadCrumbsCreate"), path: "/status/uptime/create" }); } else { crumbs.push( - { name: t("statusBredCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, + { name: t("statusBreadCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, { name: t("configure"), path: `/status/uptime/configure/${statusPage?.url}` } ); } diff --git a/src/Pages/StatusPage/Status/index.jsx b/src/Pages/StatusPage/Status/index.jsx index d262a4ebb..77cbaee11 100644 --- a/src/Pages/StatusPage/Status/index.jsx +++ b/src/Pages/StatusPage/Status/index.jsx @@ -36,8 +36,8 @@ const PublicStatus = () => { // Breadcrumbs const crumbs = [ - { name: t("statusBredCrumbsStatusPages"), path: "/status" }, - { name: t("statusBredCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, + { name: t("statusBreadCrumbsStatusPages"), path: "/status" }, + { name: t("statusBreadCrumbsDetails"), path: `/status/uptime/${statusPage?.url}` }, ]; // Setup diff --git a/src/locales/gb.json b/src/locales/gb.json index 545b55e51..8e5209c5d 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -379,7 +379,7 @@ "pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key. Without it, the PageSpeed monitor won't function.", "pageSpeedLearnMoreLink": "Click here to learn", "pageSpeedAddApiKey": "how to add your API key.", - "statusBredCrumbsDetails": "Details", - "statusBredCrumbsCreate": "Create", - "statusBredCrumbsStatusPages": "Status Pages" + "statusBreadCrumbsDetails": "Details", + "statusBreadCrumbsCreate": "Create", + "statusBreadCrumbsStatusPages": "Status Pages" }