From 97f9d91066c1608d087105a99db790a3edf46ef4 Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 7 May 2025 18:16:59 -0400 Subject: [PATCH 1/5] add useSelector to get pagespeedApiKey --- client/src/Pages/PageSpeed/Monitors/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx index 9963e429c..bd8f29586 100644 --- a/client/src/Pages/PageSpeed/Monitors/index.jsx +++ b/client/src/Pages/PageSpeed/Monitors/index.jsx @@ -21,6 +21,7 @@ const PageSpeed = () => { const { t } = useTranslation(); const isAdmin = useIsAdmin(); const { user } = useSelector((state) => state.auth); + const { pagespeedApiKey } = useSelector((state) => state.settings); const { isLoading, monitors, summary, networkError } = useMonitorsFetch({ teamId: user.teamId, From 1a1a5c39d2ebd4910c93214da287029180b70530 Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 7 May 2025 18:18:27 -0400 Subject: [PATCH 2/5] update showPageSpeedWarning prop in fallback --- client/src/Pages/PageSpeed/Monitors/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx index bd8f29586..bd40aedff 100644 --- a/client/src/Pages/PageSpeed/Monitors/index.jsx +++ b/client/src/Pages/PageSpeed/Monitors/index.jsx @@ -53,7 +53,7 @@ const PageSpeed = () => { ]} link="/pagespeed/create" isAdmin={isAdmin} - showPageSpeedWarning={true} + showPageSpeedWarning={isAdmin && !pagespeedApiKey} /> ); } From ea10e170f4a6783abfa19997db74c034d5d2827e Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 7 May 2025 18:23:06 -0400 Subject: [PATCH 3/5] update localized strings --- client/src/Pages/PageSpeed/Monitors/index.jsx | 2 +- client/src/locales/gb.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx index bd40aedff..de5ef79a8 100644 --- a/client/src/Pages/PageSpeed/Monitors/index.jsx +++ b/client/src/Pages/PageSpeed/Monitors/index.jsx @@ -53,7 +53,7 @@ const PageSpeed = () => { ]} link="/pagespeed/create" isAdmin={isAdmin} - showPageSpeedWarning={isAdmin && !pagespeedApiKey} + showPageSpeedWarning={isAdmin} /> ); } diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json index a2db25374..1d0612dca 100644 --- a/client/src/locales/gb.json +++ b/client/src/locales/gb.json @@ -394,8 +394,8 @@ "errorInvalidFieldId": "Invalid field ID provided", "inviteNoTokenFound": "No invite token found", "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.", + "pageSpeedLearnMoreLink": "Click here to", + "pageSpeedAddApiKey": "add your API key.", "update": "Update", "invalidFileFormat": "Unsupported file format!", "invalidFileSize": "File size is too large!", From 077faa26dd668c09a9b42551dc4f917e1c1df26b Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 7 May 2025 18:28:23 -0400 Subject: [PATCH 4/5] import and use Link to navigate to settings page --- client/src/Components/Fallback/index.jsx | 6 +++--- client/src/locales/gb.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/Components/Fallback/index.jsx b/client/src/Components/Fallback/index.jsx index 18fecd3dd..5b6da7062 100644 --- a/client/src/Components/Fallback/index.jsx +++ b/client/src/Components/Fallback/index.jsx @@ -1,6 +1,7 @@ import PropTypes from "prop-types"; import { useTheme } from "@emotion/react"; import { Box, Button, Stack, Typography, Link } from "@mui/material"; +import { Link as RouterLink } from "react-router-dom"; import Skeleton from "../../assets/Images/create-placeholder.svg?react"; import SkeletonDark from "../../assets/Images/create-placeholder-dark.svg?react"; import Background from "../../assets/Images/background-grid.svg?react"; @@ -35,9 +36,8 @@ const Fallback = ({ title, checks, link = "/", isAdmin, vowelStart = false, show <> {t("pageSpeedWarning")} {" "} Date: Wed, 7 May 2025 18:30:04 -0400 Subject: [PATCH 5/5] add back pagespeedapikey check to showPageSpeedWarning --- client/src/Pages/PageSpeed/Monitors/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx index de5ef79a8..bd40aedff 100644 --- a/client/src/Pages/PageSpeed/Monitors/index.jsx +++ b/client/src/Pages/PageSpeed/Monitors/index.jsx @@ -53,7 +53,7 @@ const PageSpeed = () => { ]} link="/pagespeed/create" isAdmin={isAdmin} - showPageSpeedWarning={isAdmin} + showPageSpeedWarning={isAdmin && !pagespeedApiKey} /> ); }