From de0e3514adbf97fb13c6274c21db0153db4f0969 Mon Sep 17 00:00:00 2001
From: Daniel Cojocea <danielcojocea28@gmail.com>
Date: Fri, 30 Aug 2024 13:20:36 -0400
Subject: [PATCH] refactored greeting

---
 Client/src/Pages/Monitors/Home/index.jsx | 32 +------------
 Client/src/Pages/PageSpeed/index.jsx     | 50 +-------------------
 Client/src/Utils/greeting.jsx            | 58 ++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 78 deletions(-)
 create mode 100644 Client/src/Utils/greeting.jsx

diff --git a/Client/src/Pages/Monitors/Home/index.jsx b/Client/src/Pages/Monitors/Home/index.jsx
index e17b56e37..75632a582 100644
--- a/Client/src/Pages/Monitors/Home/index.jsx
+++ b/Client/src/Pages/Monitors/Home/index.jsx
@@ -13,6 +13,7 @@ import Fallback from "./fallback";
 import StatusBox from "./StatusBox";
 import { buildData } from "./monitorData";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
+import Greeting from "../../../Utils/greeting";
 
 const Monitors = ({ isAdmin }) => {
   const theme = useTheme();
@@ -73,36 +74,7 @@ const Monitors = ({ isAdmin }) => {
               alignItems="center"
               mt={theme.spacing(5)}
             >
-              <Box>
-                <Typography
-                  component="h1"
-                  lineHeight={1}
-                  color={theme.palette.text.primary}
-                >
-                  <Typography
-                    component="span"
-                    fontSize="inherit"
-                    color={theme.palette.text.secondary}
-                  >
-                    Good {greeting},{" "}
-                  </Typography>
-                  <Typography
-                    component="span"
-                    fontSize="inherit"
-                    fontWeight="inherit"
-                  >
-                    {authState.user.firstName} {emoji}
-                  </Typography>
-                </Typography>
-                <Typography
-                  sx={{ opacity: 0.8 }}
-                  lineHeight={1}
-                  fontWeight={300}
-                  color={theme.palette.text.secondary}
-                >
-                  Here’s an overview of your uptime monitors.
-                </Typography>
-              </Box>
+              <Greeting type="uptime" />
               {monitorState.monitors?.length !== 0 && (
                 <Button
                   level="primary"
diff --git a/Client/src/Pages/PageSpeed/index.jsx b/Client/src/Pages/PageSpeed/index.jsx
index 23521d0da..4ce37b250 100644
--- a/Client/src/Pages/PageSpeed/index.jsx
+++ b/Client/src/Pages/PageSpeed/index.jsx
@@ -13,6 +13,7 @@ import { useNavigate } from "react-router";
 import { getLastChecked } from "../../Utils/monitorUtils";
 import PropTypes from "prop-types";
 import Breadcrumbs from "../../Components/Breadcrumbs";
+import Greeting from "../../Utils/greeting";
 
 const Card = ({ data }) => {
   const theme = useTheme();
@@ -160,22 +161,6 @@ const PageSpeed = ({ isAdmin }) => {
   // since monitor state is being added to redux persist, there's no reason to display skeletons on every render
   let isActuallyLoading = isLoading && monitors.length === 0;
 
-  const now = new Date();
-  const hour = now.getHours();
-
-  let greeting = "";
-  let emoji = "";
-  if (hour < 12) {
-    greeting = "morning";
-    emoji = "🌅";
-  } else if (hour < 18) {
-    greeting = "afternoon";
-    emoji = "🌞";
-  } else {
-    greeting = "evening";
-    emoji = "🌙";
-  }
-
   return (
     <Box
       className="page-speed"
@@ -209,38 +194,7 @@ const PageSpeed = ({ isAdmin }) => {
               alignItems="center"
               mt={theme.spacing(5)}
             >
-              <Box>
-                <Typography
-                  component="h1"
-                  lineHeight={1}
-                  fontWeight={500}
-                  color={theme.palette.text.primary}
-                >
-                  <Typography
-                    component="span"
-                    fontSize="inherit"
-                    color={theme.palette.text.secondary}
-                  >
-                    Good {greeting},{" "}
-                  </Typography>
-                  <Typography
-                    component="span"
-                    fontSize="inherit"
-                    fontWeight="inherit"
-                  >
-                    {user.firstName} {emoji}
-                  </Typography>
-                </Typography>
-                <Typography
-                  sx={{ opacity: 0.8 }}
-                  lineHeight={1}
-                  fontSize={14}
-                  fontWeight={300}
-                  color={theme.palette.text.secondary}
-                >
-                  Here’s an overview of your pagespeed monitors.
-                </Typography>
-              </Box>
+              <Greeting type="pagespeed" />
               <Button
                 level="primary"
                 label="Create new"
diff --git a/Client/src/Utils/greeting.jsx b/Client/src/Utils/greeting.jsx
new file mode 100644
index 000000000..e184d1d60
--- /dev/null
+++ b/Client/src/Utils/greeting.jsx
@@ -0,0 +1,58 @@
+import { useTheme } from "@emotion/react";
+import { Box, Typography } from "@mui/material";
+import React from "react";
+import { useSelector } from "react-redux";
+
+const Greeting = ({ type }) => {
+  const theme = useTheme();
+  const { firstName } = useSelector((state) => state.auth.user);
+
+  const now = new Date();
+  const hour = now.getHours();
+
+  let greeting = "";
+  let emoji = "";
+  if (hour < 12) {
+    greeting = "morning";
+    emoji = "🌅";
+  } else if (hour < 18) {
+    greeting = "afternoon";
+    emoji = "🌞";
+  } else {
+    greeting = "evening";
+    emoji = "🌙";
+  }
+
+  return (
+    <Box>
+      <Typography
+        component="h1"
+        lineHeight={1}
+        fontWeight={500}
+        color={theme.palette.text.primary}
+      >
+        <Typography
+          component="span"
+          fontSize="inherit"
+          color={theme.palette.text.secondary}
+        >
+          Good {greeting},{" "}
+        </Typography>
+        <Typography component="span" fontSize="inherit" fontWeight="inherit">
+          {firstName} {emoji}
+        </Typography>
+      </Typography>
+      <Typography
+        sx={{ opacity: 0.8 }}
+        lineHeight={1}
+        fontSize={14}
+        fontWeight={300}
+        color={theme.palette.text.secondary}
+      >
+        Here’s an overview of your {type} monitors.
+      </Typography>
+    </Box>
+  );
+};
+
+export default Greeting;