From 76d69005aadd332fb9daca99b2e8c269b3cf4e29 Mon Sep 17 00:00:00 2001
From: Thirukumaran-T <ThirukumaranT.dev@gmail.com>
Date: Sat, 24 May 2025 18:33:05 +0530
Subject: [PATCH 001/319] REFACTOR: added sticky behaviour to the save button
 at the end

---
 client/src/Pages/Settings/index.jsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 66662dc58..5c58ce223 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -189,6 +189,20 @@ const Settings = () => {
 			<Stack
 				direction="row"
 				justifyContent="flex-end"
+				sx={{
+					position: "sticky",
+					bottom: 0,
+					boxShadow: theme.shape.boxShadow,
+					zIndex: 1000,
+					mt : 3,
+					backgroundColor: theme.palette.primary.main,
+					display: "flex",
+					justifyContent: "flex-end",
+					pb: theme.spacing(5),
+					pr: theme.spacing(15),
+					pl: theme.spacing(5),
+					pt: theme.spacing(5),
+				}}
 			>
 				<Button
 					loading={isSaving || isDeletingMonitorStats || isSettingsLoading}

From 9ce1bf9bfb0bfd0b184771b153f783c6389b85eb Mon Sep 17 00:00:00 2001
From: Thirukumaran-T <ThirukumaranT.dev@gmail.com>
Date: Tue, 27 May 2025 10:15:05 +0530
Subject: [PATCH 002/319] CHORE: reduced padding to make the whole stack
 thinner

---
 client/src/Pages/Settings/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 5c58ce223..6c3048c48 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -198,10 +198,10 @@ const Settings = () => {
 					backgroundColor: theme.palette.primary.main,
 					display: "flex",
 					justifyContent: "flex-end",
-					pb: theme.spacing(5),
+					pb: theme.spacing(4),
 					pr: theme.spacing(15),
 					pl: theme.spacing(5),
-					pt: theme.spacing(5),
+					pt: theme.spacing(4),
 				}}
 			>
 				<Button
@@ -209,7 +209,7 @@ const Settings = () => {
 					disabled={Object.keys(errors).length > 0}
 					variant="contained"
 					color="accent"
-					sx={{ px: theme.spacing(12), mt: theme.spacing(20) }}
+					sx={{ px: theme.spacing(12), py: theme.spacing(8) }}
 					onClick={handleSave}
 				>
 					{t("settingsSave")}

From aa91c9ff86ea274ebc9dda4c2760450b621b9411 Mon Sep 17 00:00:00 2001
From: mohadeseh safari <mohadeseh.safari1992@gmail.com>
Date: Thu, 29 May 2025 21:01:09 -0400
Subject: [PATCH 003/319] Resolve Settings page Select component errors

- Enhanced Select component to accept boolean values in PropTypes
- Updated component documentation to reflect new type support
- Added default value for showURL prop to prevent undefined value errors

- Fixed two related issues:
  1. Type mismatch error when passing boolean values
  2. Required prop error during initial rendering
---
 client/src/Components/Inputs/Select/index.jsx | 8 ++++----
 client/src/Pages/Settings/SettingsURL.jsx     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/Components/Inputs/Select/index.jsx b/client/src/Components/Inputs/Select/index.jsx
index 927247d77..4eae2b057 100644
--- a/client/src/Components/Inputs/Select/index.jsx
+++ b/client/src/Components/Inputs/Select/index.jsx
@@ -12,9 +12,9 @@ import "./index.css";
  * @param {string} props.placeholder - The label of the select element.
  * @param {string} props.placeholder - The placeholder text when no option is selected.
  * @param {boolean} props.isHidden - Whether the placeholder should be hidden.
- * @param {string} props.value - The currently selected value.
+ * @param {(string | number | boolean)} props.value - The currently selected value.
  * @param {object[]} props.items - The array of items to populate in the select dropdown.
- *    @param {(string | number)} props.items._id - The unique identifier of each item.
+ *    @param {(string | number | boolean)} props.items._id - The unique identifier of each item.
  *    @param {string} props.items.name - The display name of each item.
  * @param {function} props.onChange - The function to handle onChange event.
  * @param {object} props.sx - The custom styles object for MUI Select component.
@@ -161,10 +161,10 @@ Select.propTypes = {
 	label: PropTypes.string,
 	placeholder: PropTypes.string,
 	isHidden: PropTypes.bool,
-	value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+	value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]).isRequired,
 	items: PropTypes.arrayOf(
 		PropTypes.shape({
-			_id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+			_id: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]).isRequired,
 			name: PropTypes.string.isRequired,
 		})
 	).isRequired,
diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index 64804c903..168f223fe 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -9,7 +9,7 @@ import { useTheme } from "@emotion/react";
 import { PropTypes } from "prop-types";
 import { useTranslation } from "react-i18next";
 
-const SettingsURL = ({ HEADING_SX, handleChange, showURL }) => {
+const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 	const { t } = useTranslation();
 	const theme = useTheme();
 	return (

From bc06db03a2c289ad408861c3da37f3fef6f884a6 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 1 Jun 2025 13:55:19 -0400
Subject: [PATCH 004/319] group general instructions and update translation
 files

---
 client/src/locales/en.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 08e3511a7..15a04b7fd 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -532,7 +532,12 @@
 		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
 		"saving": "Saving..."
 	},
-	"uptimeCreateSelectURL": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+	"uptimeGeneralInstructions": {
+		"http": "Enter the URL (e.g., https://example.com) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the URL or IP to ping (e.g., https://example.com or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"docker": "Enter the Docker ID of your container (must be full 64-char ID). You can run `docker inspect <short_id>` to get it.",
+		"port": "Enter the URL or IP of the server, the port number, and a clear display name that appears on the dashboard."
+	},
 	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
 	"sendTestEmail": "Send test email",
 	"emailSent": "Email sent successfully",

From 50e6767259ca69ee7e258c9b4af722700d7e800c Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 1 Jun 2025 13:56:13 -0400
Subject: [PATCH 005/319] dynamically update string based on selected
 monitor.type

---
 client/src/Pages/Uptime/Create/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 65a025b83..cd81d1cad 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,7 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t("uptimeCreateSelectURL")}</Typography>
+						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From 6b539b009be8163d9eba5f334041a4309ebd810e Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 1 Jun 2025 14:03:56 -0400
Subject: [PATCH 006/319] update the en translation values

---
 client/src/locales/en.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 15a04b7fd..f74e9ac92 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -533,10 +533,10 @@
 		"saving": "Saving..."
 	},
 	"uptimeGeneralInstructions": {
-		"http": "Enter the URL (e.g., https://example.com) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the URL or IP to ping (e.g., https://example.com or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container (must be full 64-char ID). You can run `docker inspect <short_id>` to get it.",
-		"port": "Enter the URL or IP of the server, the port number, and a clear display name that appears on the dashboard."
+		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
+		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
 	},
 	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
 	"sendTestEmail": "Send test email",

From d6658d16f9297ab9eb744408db60bf733276d358 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 1 Jun 2025 14:14:35 -0400
Subject: [PATCH 007/319] update translation values for pt-BR

---
 client/src/locales/pt-BR.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 5e7810cde..c1b4815e6 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -532,7 +532,12 @@
 		"passwordRequirements": "A nova senha deve conter pelo menos 8 caracteres e deve ter pelo menos uma letra maiúscula, uma letra minúscula, um número e um caractere especial.",
 		"saving": "Salvando..."
 	},
-	"uptimeCreateSelectURL": "Insira a URL ou IP a ser monitorado (por exemplo, https://example.com/ ou 192.168.1.100) e adicione um nome de exibição que irá aparecer no painel.",
+	"uptimeGeneralInstructions": {
+		"http": "Insira a URL ou o IP a ser monitorado (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.",
+		"ping": "Insira a URL ou o IP para executar o ping (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.",
+		"docker": "Insira o ID do seu contêiner Docker. Os IDs do Docker devem conter todos os 64 caracteres. Você pode executar o comando docker inspect <short_id> para obter o ID completo do contêiner.",
+		"port": "Insira a URL ou o IP do servidor, o número da porta e um nome de exibição claro que será exibido no painel."
+	},
 	"settingsEmailConnectionHost": "Host de conexão de e-mail - Nome do host a ser usado na saudação HELO/EHLO",
 	"sendTestEmail": "Enviar e-mail de teste",
 	"emailSent": "E-mail enviado com sucesso",

From 4e414e289dc088301361584fe07b5ad00ee24e6d Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sun, 1 Jun 2025 14:23:00 -0400
Subject: [PATCH 008/319] update translation values for ru

---
 client/src/locales/ru.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 60627c23f..039743be7 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -532,7 +532,12 @@
 		"passwordRequirements": "Новый пароль должен содержать не менее 8 символов и содержать как минимум одну заглавную букву, одну строчную букву, одну цифру и один специальный символ.",
 		"saving": "Сохранение..."
 	},
-	"uptimeCreateSelectURL": "Введите URL-адрес или IP-адрес для отслеживания (например, https://example.com/ или 192.168.1.100) и добавьте понятное отображаемое имя, которое будет отображаться на панели мониторинга.",
+	"uptimeGeneralInstructions": {
+		"http": "Введите URL или IP-адрес для мониторинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.",
+		"ping": "Введите URL или IP-адрес для пинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.",
+		"docker": "Введите идентификатор контейнера Docker. Идентификатор должен содержать все 64 символа. Вы можете выполнить команду docker inspect <short_id>, чтобы получить полный идентификатор контейнера.",
+		"port": "Введите URL или IP-адрес сервера, номер порта и понятное имя, которое будет отображаться на панели."
+	},
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",

From 1b97a2d48878a11ffef8df293488a0e3bf0ffa25 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:28:15 -0700
Subject: [PATCH 009/319] add formatting check action

---
 .github/workflows/check-format.yml | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/check-format.yml

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
new file mode 100644
index 000000000..d3f34635c
--- /dev/null
+++ b/.github/workflows/check-format.yml
@@ -0,0 +1,41 @@
+name: Format Check (Client & Server)
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  format-client:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install client dependencies
+        working-directory: client
+        run: npm ci
+
+      - name: Check client formatting
+        working-directory: client
+        run: npm run format-check
+
+  format-server:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install server dependencies
+        working-directory: server
+        run: npm ci
+
+      - name: Check server formatting
+        working-directory: server
+        run: npm run format-check

From 62a79aaf4ba7596720ee86d1b962efd3f148099a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:31:18 -0700
Subject: [PATCH 010/319] fix formatting

---
 client/src/Components/Inputs/Select/index.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/Components/Inputs/Select/index.jsx b/client/src/Components/Inputs/Select/index.jsx
index 119898fa3..679a5b3b5 100644
--- a/client/src/Components/Inputs/Select/index.jsx
+++ b/client/src/Components/Inputs/Select/index.jsx
@@ -161,7 +161,8 @@ Select.propTypes = {
 	label: PropTypes.string,
 	placeholder: PropTypes.string,
 	isHidden: PropTypes.bool,
-	value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]).isRequired,
+	value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool])
+		.isRequired,
 	items: PropTypes.arrayOf(
 		PropTypes.shape({
 			_id: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool])

From 2e7b67d9912345f6998180cdc227012f852927b2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:39:17 -0700
Subject: [PATCH 011/319] auto-close

---
 .github/workflows/check-format.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index d3f34635c..56a9dabff 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -39,3 +39,16 @@ jobs:
       - name: Check server formatting
         working-directory: server
         run: npm run format-check
+  close-pr-if-needed:
+    needs: [format-client, format-server]
+    runs-on: ubuntu-latest
+    if: |
+      needs.format-client.result == 'failure' || 
+      needs.format-server.result == 'failure'
+    steps:
+      - name: Close PR
+        uses: peter-evans/close-pull@v3
+        with:
+          comment: |
+            ❌ PR closed automatically because formatting failed in one or more modules.
+            Please run `npm run format` in both `client/` and `server/` before pushing again.

From 59f1ce7d317efc9082b3f8625de7f30693d14411 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:42:04 -0700
Subject: [PATCH 012/319] add dependencies

---
 .github/workflows/check-format.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 56a9dabff..1433d7409 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -40,15 +40,17 @@ jobs:
         working-directory: server
         run: npm run format-check
   close-pr-if-needed:
-    needs: [format-client, format-server]
     runs-on: ubuntu-latest
+    needs: [format-client, format-server]
     if: |
-      needs.format-client.result == 'failure' || 
-      needs.format-server.result == 'failure'
+      always() && (
+        needs.format-client.result == 'failure' || 
+        needs.format-server.result == 'failure'
+      )
     steps:
       - name: Close PR
         uses: peter-evans/close-pull@v3
         with:
           comment: |
-            ❌ PR closed automatically because formatting failed in one or more modules.
-            Please run `npm run format` in both `client/` and `server/` before pushing again.
+            ❌ Formatting check failed — PR auto-closed.
+            Please run `npm run format` and push again.

From 424175835470ffa3a7b70fd0f447771a7b951d7c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:47:13 -0700
Subject: [PATCH 013/319] use github cli

---
 .github/workflows/check-format.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 1433d7409..9ba814085 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -40,17 +40,20 @@ jobs:
         working-directory: server
         run: npm run format-check
   close-pr-if-needed:
+    if: always()
     runs-on: ubuntu-latest
     needs: [format-client, format-server]
-    if: |
-      always() && (
-        needs.format-client.result == 'failure' || 
-        needs.format-server.result == 'failure'
-      )
     steps:
-      - name: Close PR
-        uses: peter-evans/close-pull@v3
-        with:
-          comment: |
-            ❌ Formatting check failed — PR auto-closed.
-            Please run `npm run format` and push again.
+      - name: Get PR URL
+        id: pr
+        run: echo "PR_URL=$(jq -r .pull_request.url "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
+
+      - name: Close PR using GitHub CLI
+        if: |
+          needs.format-client.result == 'failure' || 
+          needs.format-server.result == 'failure'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr close "$PR_URL" --delete-branch --comment "❌ Formatting check failed — PR auto-closed.
+          Please run \`npm run format\` and push again."

From fabbc659adf70539b4121935bd987a372627983f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:49:33 -0700
Subject: [PATCH 014/319] checkout repo

---
 .github/workflows/check-format.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 9ba814085..ad90d57b3 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -44,6 +44,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [format-client, format-server]
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
       - name: Get PR URL
         id: pr
         run: echo "PR_URL=$(jq -r .pull_request.url "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV

From c02ba848641e4cf555a7ff2a3f26597b3265e245 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:51:49 -0700
Subject: [PATCH 015/319] user pr number

---
 .github/workflows/check-format.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index ad90d57b3..d3d4c0d6b 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -47,9 +47,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Get PR URL
+      - name: Get PR number
         id: pr
-        run: echo "PR_URL=$(jq -r .pull_request.url "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
+        run: echo "PR_NUMBER=$(jq -r .pull_request.number "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
 
       - name: Close PR using GitHub CLI
         if: |
@@ -58,5 +58,5 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr close "$PR_URL" --delete-branch --comment "❌ Formatting check failed — PR auto-closed.
+          gh pr close "$PR_NUMBER" --delete-branch --comment "❌ Formatting check failed — PR auto-closed.
           Please run \`npm run format\` and push again."

From c119df1553da26fed841b40033f386cb0177ef7e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 1 Jun 2025 11:55:16 -0700
Subject: [PATCH 016/319] format

---
 server/.github/pull_request_template.md      |  10 +-
 server/README.md                             |   2 +-
 server/controllers/notificationController.js | 296 +++++++++----------
 server/db/models/Notification.js             |   4 +-
 server/db/mongo/modules/statusPageModule.js  |   2 +-
 server/routes/notificationRoute.js           |  38 +--
 server/templates/testEmailTemplate.mjml      |  39 ++-
 7 files changed, 198 insertions(+), 193 deletions(-)

diff --git a/server/.github/pull_request_template.md b/server/.github/pull_request_template.md
index ed81cc04b..4f4da5d80 100755
--- a/server/.github/pull_request_template.md
+++ b/server/.github/pull_request_template.md
@@ -1,23 +1,25 @@
-**(Please remove this line only before submitting your PR. Ensure that all relevant items are checked before submission.)** 
+**(Please remove this line only before submitting your PR. Ensure that all relevant items are checked before submission.)**
 
 ## Describe your changes
 
-Briefly describe the changes you made and their purpose. 
+Briefly describe the changes you made and their purpose.
 
 ## Write your issue number after "Fixes "
 
-Fixes #123 
+Fixes #123
 
 ## Please ensure all items are checked off before requesting a review. "Checked off" means you need to add an "x" character between brackets so they turn into checkmarks.
 
 - [ ] (Do not skip this or your PR will be closed) I deployed the application locally.
 - [ ] (Do not skip this or your PR will be closed) I have performed a self-review and testing of my code.
 - [ ] I have included the issue # in the PR.
-- [ ] I have added i18n support to visible strings (instead of `<div>Add</div>`, use): 
+- [ ] I have added i18n support to visible strings (instead of `<div>Add</div>`, use):
+
 ```Javascript
 const { t } = useTranslation();
 <div>{t('add')}</div>
 ```
+
 - [ ] The issue I am working on is assigned to me.
 - [ ] I didn't use any hardcoded values (otherwise it will not scale, and will make it difficult to maintain consistency across the application).
 - [ ] My PR is granular and targeted to one specific feature.
diff --git a/server/README.md b/server/README.md
index 03f1b1629..db609cb02 100755
--- a/server/README.md
+++ b/server/README.md
@@ -2,7 +2,7 @@
 
 <p align="center"><strong>The backend service for Checkmate, an open source uptime and infrastructure monitoring application</strong></p>
 
-This directory contains the **backend** of Checkmate, which handles data processing, storage, and API services for the Checkmate monitoring tool. The backend is responsible for managing uptime checks, handling real-time alerts, and storing historical monitoring data. 
+This directory contains the **backend** of Checkmate, which handles data processing, storage, and API services for the Checkmate monitoring tool. The backend is responsible for managing uptime checks, handling real-time alerts, and storing historical monitoring data.
 
 Checkmate's backend is designed to be lightweight and scalable, ensuring reliable performance even with a high number of active monitors.
 
diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 3682821eb..3164a111b 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -4,171 +4,171 @@ import { handleError, handleValidationError } from "./controllerUtils.js";
 const SERVICE_NAME = "NotificationController";
 
 const NOTIFICATION_TYPES = {
-  WEBHOOK: 'webhook',
-  TELEGRAM: 'telegram'
+	WEBHOOK: "webhook",
+	TELEGRAM: "telegram",
 };
 
 const PLATFORMS = {
-  SLACK: 'slack',
-  DISCORD: 'discord',
-  TELEGRAM: 'telegram'
+	SLACK: "slack",
+	DISCORD: "discord",
+	TELEGRAM: "telegram",
 };
 
 class NotificationController {
-    constructor(notificationService, stringService, statusService) {
-        this.notificationService = notificationService;
-        this.stringService = stringService;
-        this.statusService = statusService;
-        this.triggerNotification = this.triggerNotification.bind(this);
-        this.testWebhook = this.testWebhook.bind(this); 
-    }
+	constructor(notificationService, stringService, statusService) {
+		this.notificationService = notificationService;
+		this.stringService = stringService;
+		this.statusService = statusService;
+		this.triggerNotification = this.triggerNotification.bind(this);
+		this.testWebhook = this.testWebhook.bind(this);
+	}
 
-    async triggerNotification(req, res, next) {
-        try {
-            await triggerNotificationBodyValidation.validateAsync(req.body, {
-                abortEarly: false,
-                stripUnknown: true,
-            });
-        } catch (error) {
-            next(handleValidationError(error, SERVICE_NAME));
-            return;
-        }
+	async triggerNotification(req, res, next) {
+		try {
+			await triggerNotificationBodyValidation.validateAsync(req.body, {
+				abortEarly: false,
+				stripUnknown: true,
+			});
+		} catch (error) {
+			next(handleValidationError(error, SERVICE_NAME));
+			return;
+		}
 
-        try {
-            const { monitorId, type, platform, config, status = false } = req.body;
+		try {
+			const { monitorId, type, platform, config, status = false } = req.body;
 
-            // Create a simplified networkResponse similar to what would come from monitoring
-            const networkResponse = {
-                monitorId,
-                status
-            };
-            
-            // Use the statusService to get monitor details and handle status change logic
-            // This returns { monitor, statusChanged, prevStatus } exactly like your job queue uses
-            const statusResult = await this.statusService.updateStatus(networkResponse);
-            
-            if (type === NOTIFICATION_TYPES.WEBHOOK) {
-                const notification = {
-                    type,
-                    platform,
-                    config,
-                };
+			// Create a simplified networkResponse similar to what would come from monitoring
+			const networkResponse = {
+				monitorId,
+				status,
+			};
 
-                await this.notificationService.sendWebhookNotification(
-                    statusResult, // Contains monitor, statusChanged, and prevStatus
-                    notification
-                );
-            }
+			// Use the statusService to get monitor details and handle status change logic
+			// This returns { monitor, statusChanged, prevStatus } exactly like your job queue uses
+			const statusResult = await this.statusService.updateStatus(networkResponse);
 
-            return res.success({
-                msg: this.stringService.webhookSendSuccess,
-            });
-        } catch (error) {
-            next(handleError(error, SERVICE_NAME, "triggerNotification"));
-        }
-    }
+			if (type === NOTIFICATION_TYPES.WEBHOOK) {
+				const notification = {
+					type,
+					platform,
+					config,
+				};
 
-    createTestNetworkResponse() {
-        return {
-            monitor: { 
-                _id: "test-monitor-id", 
-                name: "Test Monitor", 
-                url: "https://example.com"
-            },
-            status: true,
-            statusChanged: true,
-            prevStatus: false,
-        };
-    }
+				await this.notificationService.sendWebhookNotification(
+					statusResult, // Contains monitor, statusChanged, and prevStatus
+					notification
+				);
+			}
 
-    handleTelegramTest(botToken, chatId) {
-        if (!botToken || !chatId) {
-            return {
-                isValid: false,
-                error: {
-                    msg: this.stringService.telegramRequiresBotTokenAndChatId,
-                    status: 400
-                }
-            };
-        }
+			return res.success({
+				msg: this.stringService.webhookSendSuccess,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "triggerNotification"));
+		}
+	}
 
-        return {
-            isValid: true,
-            notification: {
-                type: NOTIFICATION_TYPES.WEBHOOK,
-                platform: PLATFORMS.TELEGRAM,
-                config: { botToken, chatId }
-            }
-        };
-    }
+	createTestNetworkResponse() {
+		return {
+			monitor: {
+				_id: "test-monitor-id",
+				name: "Test Monitor",
+				url: "https://example.com",
+			},
+			status: true,
+			statusChanged: true,
+			prevStatus: false,
+		};
+	}
 
-    handleWebhookTest(webhookUrl, platform) {
-        if (webhookUrl === null) {
-            return {
-                isValid: false,
-                error: {
-                    msg: this.stringService.webhookUrlRequired,
-                    status: 400
-                }
-            };
-        }
+	handleTelegramTest(botToken, chatId) {
+		if (!botToken || !chatId) {
+			return {
+				isValid: false,
+				error: {
+					msg: this.stringService.telegramRequiresBotTokenAndChatId,
+					status: 400,
+				},
+			};
+		}
 
-        return {
-            isValid: true,
-            notification: {
-                type: NOTIFICATION_TYPES.WEBHOOK,
-                platform: platform,
-                config: { webhookUrl }
-            }
-        };
-    }
+		return {
+			isValid: true,
+			notification: {
+				type: NOTIFICATION_TYPES.WEBHOOK,
+				platform: PLATFORMS.TELEGRAM,
+				config: { botToken, chatId },
+			},
+		};
+	}
 
-    async testWebhook(req, res, next) {
-        try {
-            const { webhookUrl, platform, botToken, chatId } = req.body;
+	handleWebhookTest(webhookUrl, platform) {
+		if (webhookUrl === null) {
+			return {
+				isValid: false,
+				error: {
+					msg: this.stringService.webhookUrlRequired,
+					status: 400,
+				},
+			};
+		}
 
-            if (platform === null) {
-                return res.error({
-                    msg: this.stringService.platformRequired,
-                    status: 400
-                });
-            }
-            
-            // Platform-specific handling
-            const platformHandlers = {
-                [PLATFORMS.TELEGRAM]: () => this.handleTelegramTest(botToken, chatId),
-                // Default handler for webhook-based platforms (Slack, Discord, etc.)
-                default: () => this.handleWebhookTest(webhookUrl, platform)
-            };
-            
-            const handler = platformHandlers[platform] || platformHandlers.default;
-            const handlerResult = handler();
-            
-            if (!handlerResult.isValid) {
-                return res.error(handlerResult.error);
-            }
-            
-            const networkResponse = this.createTestNetworkResponse();
-            
-            const result = await this.notificationService.sendWebhookNotification(
-                networkResponse,
-                handlerResult.notification
-            );
-        
-            if (result && result !== false) {
-                return res.success({
-                    msg: this.stringService.webhookSendSuccess,
-                });
-            } else {
-                return res.error({
-                    msg: this.stringService.testNotificationFailed,
-                    status: 400
-                });
-            }
-        } catch (error) {
-            next(handleError(error, SERVICE_NAME, "testWebhook"));
-        }
-    }
+		return {
+			isValid: true,
+			notification: {
+				type: NOTIFICATION_TYPES.WEBHOOK,
+				platform: platform,
+				config: { webhookUrl },
+			},
+		};
+	}
+
+	async testWebhook(req, res, next) {
+		try {
+			const { webhookUrl, platform, botToken, chatId } = req.body;
+
+			if (platform === null) {
+				return res.error({
+					msg: this.stringService.platformRequired,
+					status: 400,
+				});
+			}
+
+			// Platform-specific handling
+			const platformHandlers = {
+				[PLATFORMS.TELEGRAM]: () => this.handleTelegramTest(botToken, chatId),
+				// Default handler for webhook-based platforms (Slack, Discord, etc.)
+				default: () => this.handleWebhookTest(webhookUrl, platform),
+			};
+
+			const handler = platformHandlers[platform] || platformHandlers.default;
+			const handlerResult = handler();
+
+			if (!handlerResult.isValid) {
+				return res.error(handlerResult.error);
+			}
+
+			const networkResponse = this.createTestNetworkResponse();
+
+			const result = await this.notificationService.sendWebhookNotification(
+				networkResponse,
+				handlerResult.notification
+			);
+
+			if (result && result !== false) {
+				return res.success({
+					msg: this.stringService.webhookSendSuccess,
+				});
+			} else {
+				return res.error({
+					msg: this.stringService.testNotificationFailed,
+					status: 400,
+				});
+			}
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "testWebhook"));
+		}
+	}
 }
 
-export default NotificationController;
\ No newline at end of file
+export default NotificationController;
diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index 43eb73c93..ab51e0617 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -20,9 +20,9 @@ const NotificationSchema = mongoose.Schema(
 			type: String,
 			enum: ["email", "sms", "webhook"],
 		},
-		platform: {  
+		platform: {
 			type: String,
-		  },
+		},
 		config: {
 			type: configSchema,
 			default: () => ({}),
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index e5c88eecb..e06e50a5d 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -38,7 +38,7 @@ const updateStatusPage = async (statusPageData, image) => {
 				data: image.buffer,
 				contentType: image.mimetype,
 			};
-		}else{
+		} else {
 			statusPageData.logo = null;
 		}
 
diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index 7ea94843e..2c0bbf5b7 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -2,29 +2,23 @@ import { Router } from "express";
 import { verifyJWT } from "../middleware/verifyJWT.js";
 
 class NotificationRoutes {
-    constructor(notificationController) {
-        this.router = Router();
-        this.notificationController = notificationController;
-        this.initializeRoutes();
-    }
+	constructor(notificationController) {
+		this.router = Router();
+		this.notificationController = notificationController;
+		this.initializeRoutes();
+	}
 
-    initializeRoutes() {
-        this.router.use(verifyJWT);
-        
-        this.router.post(
-            "/trigger",
-            this.notificationController.triggerNotification
-        );
-        
-        this.router.post(
-            "/test-webhook",
-            this.notificationController.testWebhook
-        );
-    }
+	initializeRoutes() {
+		this.router.use(verifyJWT);
 
-    getRouter() {
-        return this.router;
-    }
+		this.router.post("/trigger", this.notificationController.triggerNotification);
+
+		this.router.post("/test-webhook", this.notificationController.testWebhook);
+	}
+
+	getRouter() {
+		return this.router;
+	}
 }
 
-export default NotificationRoutes;
\ No newline at end of file
+export default NotificationRoutes;
diff --git a/server/templates/testEmailTemplate.mjml b/server/templates/testEmailTemplate.mjml
index e9fd3221e..4f8fd7644 100644
--- a/server/templates/testEmailTemplate.mjml
+++ b/server/templates/testEmailTemplate.mjml
@@ -1,17 +1,26 @@
 <mjml>
-  <mj-body>
-    <mj-section>
-      <mj-column>
-        <mj-text font-size="20px" font-family="Helvetica Neue">
-          Hello!
-        </mj-text>
-        <mj-text font-size="16px" font-family="Helvetica Neue">
-          This is a test email from the Monitoring System.
-        </mj-text>
-        <mj-text font-size="14px" font-family="Helvetica Neue">
-          If you're receiving this, your email configuration is working correctly.
-        </mj-text>
-      </mj-column>
-    </mj-section>
-  </mj-body>
+	<mj-body>
+		<mj-section>
+			<mj-column>
+				<mj-text
+					font-size="20px"
+					font-family="Helvetica Neue"
+				>
+					Hello!
+				</mj-text>
+				<mj-text
+					font-size="16px"
+					font-family="Helvetica Neue"
+				>
+					This is a test email from the Monitoring System.
+				</mj-text>
+				<mj-text
+					font-size="14px"
+					font-family="Helvetica Neue"
+				>
+					If you're receiving this, your email configuration is working correctly.
+				</mj-text>
+			</mj-column>
+		</mj-section>
+	</mj-body>
 </mjml>

From 1286dd30b3123057f70fed514dc7f3de9268fc10 Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Mon, 2 Jun 2025 22:43:56 -0400
Subject: [PATCH 017/319] Update README.md

---
 README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d276af81f..4361711ec 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 <p align="center"><strong>An open source uptime and infrastructure monitoring application</strong></p>
 
-![dashboard](https://github.com/user-attachments/assets/252d6047-522b-4576-8f14-233510e464b8)
+<img width="1660" alt="image" src="https://github.com/user-attachments/assets/b748f36d-a271-4965-ad0a-18bf153bbee7" />
 
 This repository contains both the frontend and the backend of Checkmate, an open-source, self-hosted monitoring tool for tracking server hardware, uptime, response times, and incidents in real-time with beautiful visualizations. Checkmate regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
 
@@ -80,14 +80,19 @@ If you have any questions, suggestions or comments, please use our [Discord chan
 ## 🏗️ Screenshots
 
 <p>
-<img width="2714" alt="server" src="https://github.com/user-attachments/assets/f7cb272a-69a6-48c5-93b0-249ecf20ecc6" />
+<img width="1628" alt="image" src="https://github.com/user-attachments/assets/25f32197-1473-415d-9dd7-963bb07a71af" />
 </p>
 <p>
-<img width="2714" alt="uptime" src="https://github.com/user-attachments/assets/98ddc6c0-3384-47fd-96ce-7e53e6b688ac" />
+  <img width="1656" alt="image" src="https://github.com/user-attachments/assets/616c3563-c2a7-4ee4-af6c-7e6068955d1a" />
 </p>
 <p>
-<img width="2714" alt="page speed" src="https://github.com/user-attachments/assets/b5589f79-da30-4239-9846-1f8bb2637ff9" />
+</p><img width="1652" alt="image" src="https://github.com/user-attachments/assets/7912d7cf-0d0e-4f26-aa5c-2ad7170b5c99" />
 </p>
+<p>
+<img width="1652" alt="image" src="https://github.com/user-attachments/assets/08c2c6ac-3a2f-44d1-a229-d1746a3f9d16" />
+</p>
+
+
 
 ## 🏗️ Tech stack
 

From 1f9fbf71155f2d22a481d20fa23eaa0b0ed83b7c Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:09:54 -0400
Subject: [PATCH 018/319] Update PULLREQUESTS.md

---
 PULLREQUESTS.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/PULLREQUESTS.md b/PULLREQUESTS.md
index 725a175b7..d1ee8eea9 100644
--- a/PULLREQUESTS.md
+++ b/PULLREQUESTS.md
@@ -27,6 +27,10 @@ Process.  If more revisions are required after the second review we’re looking
 
 If PRs are small and manageable it is far more likely that a dev will catch bugs during the review process.  If our eyes glaze over at line 400 of a 700 line PR since we’ve reached our cognitive limit we’re not going to likely miss bugs in the last 300 lines of code.
 
-### Bonus Topic:  Keep PRs focused
+### Format your PRs for better readability
+
+Ensure you execute `npm run format` before submitting your pull requests in both the client and server directories. This command automatically applies our formatting structure, making the code easier to follow and review.
+
+### Keep PRs focused
 
 It may be tempting to address a bug you suddenly remembered or make some tiny adjustments in some component that bothers you, but don’t!  Keep all commits in your pull request fully focused on the specific feature you are working on.  Open up another PR if you want to fix a big or work on another feature.

From 9591ba3dc4c2f84138cacb0ff54cef9bc728a0b7 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 5 Jun 2025 10:44:27 +0800
Subject: [PATCH 019/319] version tagging images

---
 .../workflows/deploy-images-on-release.yml    | 149 ++++++++++++++++++
 .github/workflows/deploy-images.yml           | 133 ++++++++++++++++
 .github/workflows/distribution-deploy.yml     |  80 ----------
 .../distribution-mono-deploy-arm.yml          |  44 ------
 .../workflows/distribution-mono-deploy.yml    |  30 ----
 docker/dist-mono/docker-compose.yaml          |   6 +-
 docker/dist/docker-compose.yaml               |   8 +-
 7 files changed, 289 insertions(+), 161 deletions(-)
 create mode 100644 .github/workflows/deploy-images-on-release.yml
 create mode 100644 .github/workflows/deploy-images.yml
 delete mode 100644 .github/workflows/distribution-deploy.yml
 delete mode 100644 .github/workflows/distribution-mono-deploy-arm.yml
 delete mode 100644 .github/workflows/distribution-mono-deploy.yml

diff --git a/.github/workflows/deploy-images-on-release.yml b/.github/workflows/deploy-images-on-release.yml
new file mode 100644
index 000000000..521acab61
--- /dev/null
+++ b/.github/workflows/deploy-images-on-release.yml
@@ -0,0 +1,149 @@
+name: Distribution deploy
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Extract version from tag
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:${{ steps.extract_tag.outputs.version }}
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:${{ steps.extract_tag.outputs.version }}
+
+      - name: Build Redis Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-redis:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist/redis.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Redis Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-redis:${{ steps.extract_tag.outputs.version }}
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ steps.extract_tag.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        id: extract_tag
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }} \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }}
diff --git a/.github/workflows/deploy-images.yml b/.github/workflows/deploy-images.yml
new file mode 100644
index 000000000..bab2199a2
--- /dev/null
+++ b/.github/workflows/deploy-images.yml
@@ -0,0 +1,133 @@
+name: Distribution deploy
+
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+jobs:
+  docker-build-and-push-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Client Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-client:latest \
+            -f ./docker/dist/client.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Client Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-client:latest
+
+  docker-build-and-push-server:
+    needs: docker-build-and-push-client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend:latest \
+            -f ./docker/dist/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-backend:latest
+
+      - name: Build Mongo Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-mongo:latest \
+            -f ./docker/dist/mongoDB.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push MongoDB Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-mongo:latest
+
+      - name: Build Redis Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-redis:latest \
+            -f ./docker/dist/redis.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Redis Docker image
+        run: |
+          docker push ghcr.io/bluewave-labs/checkmate-redis:latest
+
+  docker-build-and-push-server-mono-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push multi-arch Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/dist-arm/server.Dockerfile
+          push: true
+          tags: |
+            ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+
+  docker-build-and-push-server-mono:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Server Docker image
+        run: |
+          docker build \
+            -t ghcr.io/bluewave-labs/checkmate-backend-mono:latest \
+            -f ./docker/dist-mono/server.Dockerfile \
+            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            .
+
+      - name: Push Server Docker image
+        run: docker push ghcr.io/bluewave-labs/checkmate-backend-mono:latest
diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml
deleted file mode 100644
index d4bcfc8b7..000000000
--- a/.github/workflows/distribution-deploy.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-name: Distribution deploy
-
-on:
-  push:
-    branches: ["master"]
-  workflow_dispatch:
-jobs:
-  docker-build-and-push-client:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Client Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate:frontend-dist \
-            -f ./docker/dist/client.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
-
-      - name: Push Client Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate:frontend-dist
-
-  docker-build-and-push-server:
-    needs: docker-build-and-push-client
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Server Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate:backend-dist \
-            -f ./docker/dist/server.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
-
-      - name: Push Server Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate:backend-dist
-
-      - name: Build Mongo Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate:mongo-dist \
-            -f ./docker/dist/mongoDB.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
-
-      - name: Push MongoDB Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate:mongo-dist
-
-      - name: Build Redis Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate:redis-dist \
-            -f ./docker/dist/redis.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
-
-      - name: Push Redis Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate:redis-dist
diff --git a/.github/workflows/distribution-mono-deploy-arm.yml b/.github/workflows/distribution-mono-deploy-arm.yml
deleted file mode 100644
index 345cab560..000000000
--- a/.github/workflows/distribution-mono-deploy-arm.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Distribution deploy - Monolithic Multiarch
-
-on:
-  push:
-    branches: ["master"]
-  workflow_dispatch:
-jobs:
-  docker-build-and-push-server:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push multi-arch Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./docker/dist-arm/server.Dockerfile
-          push: true
-          tags: ghcr.io/bluewave-labs/checkmate:backend-dist-mono-multiarch
-          platforms: linux/amd64,linux/arm64
-          labels: |
-            org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
-
-      # - name: Build Server Docker image
-      #   run: |
-      #     docker build \
-      #       -t ghcr.io/bluewave-labs/checkmate:backend-dist-mono-multiarch \
-      #       -f ./docker/dist-arm/server.Dockerfile \
-      #       --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-      #       .
-
-      # - name: Push Server Docker image
-      #   run: docker push ghcr.io/bluewave-labs/checkmate:backend-dist-mono-multiarch
diff --git a/.github/workflows/distribution-mono-deploy.yml b/.github/workflows/distribution-mono-deploy.yml
deleted file mode 100644
index 7dafbfc21..000000000
--- a/.github/workflows/distribution-mono-deploy.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Distribution deploy - Monolithic
-
-on:
-  push:
-    branches: ["master"]
-  workflow_dispatch:
-jobs:
-  docker-build-and-push-server:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Server Docker image
-        run: |
-          docker build \
-            -t ghcr.io/bluewave-labs/checkmate:backend-dist-mono \
-            -f ./docker/dist-mono/server.Dockerfile \
-            --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
-            .
-
-      - name: Push Server Docker image
-        run: docker push ghcr.io/bluewave-labs/checkmate:backend-dist-mono
diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml
index 9b3364975..fd5d54ddc 100755
--- a/docker/dist-mono/docker-compose.yaml
+++ b/docker/dist-mono/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/bluewave-labs/checkmate:backend-dist-mono
+    image: ghcr.io/bluewave-labs/checkmate-backend-mono:latest
     restart: always
     ports:
       - "52345:52345"
@@ -15,7 +15,7 @@ services:
       - redis
       - mongodb
   redis:
-    image: ghcr.io/bluewave-labs/checkmate:redis-dist
+    image: ghcr.io/bluewave-labs/checkmate-redis:latest
     restart: always
     volumes:
       - ./redis/data:/data
@@ -26,7 +26,7 @@ services:
       retries: 5
       start_period: 5s
   mongodb:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-dist
+    image: ghcr.io/bluewave-labs/checkmate-mongo:latest
     restart: always
     command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
     volumes:
diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml
index a5da9d021..a0d13d061 100755
--- a/docker/dist/docker-compose.yaml
+++ b/docker/dist/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   client:
-    image: ghcr.io/bluewave-labs/checkmate:frontend-dist
+    image: ghcr.io/bluewave-labs/checkmate-frontend:latest
     restart: always
     environment:
       UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1"
@@ -11,7 +11,7 @@ services:
     depends_on:
       - server
   server:
-    image: ghcr.io/bluewave-labs/checkmate:backend-dist
+    image: ghcr.io/bluewave-labs/checkmate-backend:latest
     restart: always
     ports:
       - "52345:52345"
@@ -26,7 +26,7 @@ services:
     # volumes:
     # - /var/run/docker.sock:/var/run/docker.sock:ro
   redis:
-    image: ghcr.io/bluewave-labs/checkmate:redis-dist
+    image: ghcr.io/bluewave-labs/checkmate-redis:latest
     restart: always
     volumes:
       - ./redis/data:/data
@@ -37,7 +37,7 @@ services:
       retries: 5
       start_period: 5s
   mongodb:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-dist
+    image: ghcr.io/bluewave-labs/checkmate-mongo:latest
     restart: always
     volumes:
       - ./mongo/data:/data/db

From a101bd479a95376a65af122334112c5d775f8112 Mon Sep 17 00:00:00 2001
From: Thirukumaran-T <ThirukumaranT.dev@gmail.com>
Date: Thu, 5 Jun 2025 12:00:16 +0530
Subject: [PATCH 020/319] CHORE: added border styles to the save button
 container

---
 client/src/Pages/Settings/index.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 6c3048c48..67f82afbe 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -202,6 +202,10 @@ const Settings = () => {
 					pr: theme.spacing(15),
 					pl: theme.spacing(5),
 					pt: theme.spacing(4),
+					border: 1,
+					borderStyle: "solid",
+					borderColor: theme.palette.primary.lowContrast,
+					borderRadius: theme.spacing(2)
 				}}
 			>
 				<Button

From 9e42fd6ffdf2683f8f25f9e682f06ed7bed6ed06 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 6 Jun 2025 07:44:19 +0800
Subject: [PATCH 021/319] change workflow names

---
 .github/workflows/deploy-images-on-release.yml | 2 +-
 .github/workflows/deploy-images.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-images-on-release.yml b/.github/workflows/deploy-images-on-release.yml
index 521acab61..f1d0dd7ce 100644
--- a/.github/workflows/deploy-images-on-release.yml
+++ b/.github/workflows/deploy-images-on-release.yml
@@ -1,4 +1,4 @@
-name: Distribution deploy
+name: Deploy images on release
 
 on:
   push:
diff --git a/.github/workflows/deploy-images.yml b/.github/workflows/deploy-images.yml
index bab2199a2..d3d70b90b 100644
--- a/.github/workflows/deploy-images.yml
+++ b/.github/workflows/deploy-images.yml
@@ -1,4 +1,4 @@
-name: Distribution deploy
+name: Deploy images
 
 on:
   push:

From 9a22d4a971876d8d2ff7a3fe8297ef7b83ecb4f3 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 6 Jun 2025 14:05:59 +0800
Subject: [PATCH 022/319] initial Pulse implementation

---
 server/controllers/monitorController.js       |   4 +-
 server/controllers/queueController.js         |  12 --
 server/index.js                               |  37 ++--
 server/package-lock.json                      |  98 +++++++++-
 server/package.json                           |   1 +
 server/routes/queueRoute.js                   |   6 -
 server/service/JobQueue/JobQueue.js           |   9 +-
 server/service/JobQueue/JobQueueHelper.js     |  12 +-
 server/service/PulseQueue/PulseQueue.js       | 171 ++++++++++++++++++
 server/service/PulseQueue/PulseQueueHelper.js | 106 +++++++++++
 server/service/networkService.js              |  57 +++---
 server/service/statusService.js               |  14 +-
 12 files changed, 455 insertions(+), 72 deletions(-)
 create mode 100644 server/service/PulseQueue/PulseQueue.js
 create mode 100644 server/service/PulseQueue/PulseQueueHelper.js

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index e8eaeb106..5f0e22ecf 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -595,8 +595,8 @@ class MonitorController {
 				{ new: true }
 			);
 			monitor.isActive === true
-				? await this.jobQueue.addJob(monitor._id, monitor)
-				: await this.jobQueue.deleteJob(monitor);
+				? await this.jobQueue.resumeJob(monitor._id, monitor)
+				: await this.jobQueue.pauseJob(monitor);
 
 			return res.success({
 				msg: monitor.isActive
diff --git a/server/controllers/queueController.js b/server/controllers/queueController.js
index be3d764e7..b1a7badee 100755
--- a/server/controllers/queueController.js
+++ b/server/controllers/queueController.js
@@ -46,18 +46,6 @@ class JobQueueController {
 		}
 	};
 
-	obliterateQueue = async (req, res, next) => {
-		try {
-			await this.jobQueue.obliterate();
-			return res.success({
-				msg: this.stringService.queueObliterate,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "obliterateQueue"));
-			return;
-		}
-	};
-
 	flushQueue = async (req, res, next) => {
 		try {
 			const result = await this.jobQueue.flushQueues();
diff --git a/server/index.js b/server/index.js
index eea5b015a..81970ae7a 100755
--- a/server/index.js
+++ b/server/index.js
@@ -50,6 +50,9 @@ import JobQueue from "./service/JobQueue/JobQueue.js";
 import JobQueueHelper from "./service/JobQueue/JobQueueHelper.js";
 import { Queue, Worker } from "bullmq";
 
+import PulseQueue from "./service/PulseQueue/PulseQueue.js";
+import PulseQueueHelper from "./service/PulseQueue/PulseQueueHelper.js";
+
 //Network service and dependencies
 import NetworkService from "./service/networkService.js";
 import axios from "axios";
@@ -183,25 +186,35 @@ const startApp = async () => {
 
 	const redisService = new RedisService({ Redis: IORedis, logger });
 
-	const jobQueueHelper = new JobQueueHelper({
-		redisService,
-		Queue,
-		Worker,
-		logger,
+	// const jobQueueHelper = new JobQueueHelper({
+	// 	redisService,
+	// 	Queue,
+	// 	Worker,
+	// 	logger,
+	// 	db,
+	// 	networkService,
+	// 	statusService,
+	// 	notificationService,
+	// });
+	// const jobQueue = await JobQueue.create({
+	// 	db,
+	// 	jobQueueHelper,
+	// 	logger,
+	// 	stringService,
+	// });
+
+	const pulseQueueHelper = new PulseQueueHelper({
 		db,
+		logger,
 		networkService,
 		statusService,
 		notificationService,
 	});
-	const jobQueue = await JobQueue.create({
-		db,
-		jobQueueHelper,
-		logger,
-		stringService,
-	});
+	const pulseQueue = new PulseQueue({ appSettings, db, pulseQueueHelper, logger });
 
 	// Register services
-	ServiceRegistry.register(JobQueue.SERVICE_NAME, jobQueue);
+	// ServiceRegistry.register(JobQueue.SERVICE_NAME, jobQueue);
+	ServiceRegistry.register(JobQueue.SERVICE_NAME, pulseQueue);
 	ServiceRegistry.register(MongoDB.SERVICE_NAME, db);
 	ServiceRegistry.register(SettingsService.SERVICE_NAME, settingsService);
 	ServiceRegistry.register(EmailService.SERVICE_NAME, emailService);
diff --git a/server/package-lock.json b/server/package-lock.json
index 7bf4bfc78..3fd675af3 100755
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
+				"@pulsecron/pulse": "1.6.8",
 				"axios": "^1.7.2",
 				"bcryptjs": "3.0.2",
 				"bullmq": "5.41.2",
@@ -1012,6 +1013,37 @@
 			"integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
 			"license": "BSD-3-Clause"
 		},
+		"node_modules/@pulsecron/pulse": {
+			"version": "1.6.8",
+			"resolved": "https://registry.npmjs.org/@pulsecron/pulse/-/pulse-1.6.8.tgz",
+			"integrity": "sha512-fg9sT/pfpZTlUYr/ktDu6om6XEm2zmulcZ8TP4JZa+Dmol7/35mMKzDwT1H5a0AUcxiFIRfB4KOpkJ+BI2fgmg==",
+			"license": "MIT",
+			"dependencies": {
+				"cron-parser": "^4.9.0",
+				"date.js": "~0.3.3",
+				"debug": "~4.3.4",
+				"human-interval": "~2.0.1",
+				"moment-timezone": "^0.5.45",
+				"mongodb": "^6.5.0"
+			}
+		},
+		"node_modules/@pulsecron/pulse/node_modules/debug": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.3"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@scarf/scarf": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.4.0.tgz",
@@ -2394,6 +2426,30 @@
 			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
 			"license": "CC0-1.0"
 		},
+		"node_modules/date.js": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/date.js/-/date.js-0.3.3.tgz",
+			"integrity": "sha512-HgigOS3h3k6HnW011nAb43c5xx5rBXk8P2v/WIT9Zv4koIaVXiH2BURguI78VVp+5Qc076T7OR378JViCnZtBw==",
+			"license": "MIT",
+			"dependencies": {
+				"debug": "~3.1.0"
+			}
+		},
+		"node_modules/date.js/node_modules/debug": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+			"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/date.js/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
+		},
 		"node_modules/debug": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -3664,6 +3720,15 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/human-interval": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/human-interval/-/human-interval-2.0.1.tgz",
+			"integrity": "sha512-r4Aotzf+OtKIGQCB3odUowy4GfUDTy3aTWTfLd7ZF2gBCy3XW3v/dJLRefZnOFFnjqs5B1TypvS8WarpBkYUNQ==",
+			"license": "MIT",
+			"dependencies": {
+				"numbered": "^1.1.0"
+			}
+		},
 		"node_modules/iconv-lite": {
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4986,6 +5051,27 @@
 				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
+		"node_modules/moment": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+			"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/moment-timezone": {
+			"version": "0.5.48",
+			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz",
+			"integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==",
+			"license": "MIT",
+			"dependencies": {
+				"moment": "^2.29.4"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/mongodb": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.0.tgz",
@@ -5385,6 +5471,12 @@
 				"url": "https://github.com/fb55/nth-check?sponsor=1"
 			}
 		},
+		"node_modules/numbered": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/numbered/-/numbered-1.1.0.tgz",
+			"integrity": "sha512-pv/ue2Odr7IfYOO0byC1KgBI10wo5YDauLhxY6/saNzAdAs0r1SotGCPzzCLNPL0xtrAwWRialLu23AAu9xO1g==",
+			"license": "MIT"
+		},
 		"node_modules/object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -7099,9 +7191,9 @@
 			}
 		},
 		"node_modules/tar-fs": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
-			"integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+			"integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
 			"license": "MIT",
 			"dependencies": {
 				"chownr": "^1.1.1",
diff --git a/server/package.json b/server/package.json
index 097cf4443..51e7cd218 100755
--- a/server/package.json
+++ b/server/package.json
@@ -16,6 +16,7 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
+		"@pulsecron/pulse": "1.6.8",
 		"axios": "^1.7.2",
 		"bcryptjs": "3.0.2",
 		"bullmq": "5.41.2",
diff --git a/server/routes/queueRoute.js b/server/routes/queueRoute.js
index 38ac32a26..dc9b40917 100755
--- a/server/routes/queueRoute.js
+++ b/server/routes/queueRoute.js
@@ -25,12 +25,6 @@ class QueueRoutes {
 			this.queueController.addJob
 		);
 
-		this.router.post(
-			"/obliterate",
-			isAllowed(["admin", "superadmin"]),
-			this.queueController.obliterateQueue
-		);
-
 		this.router.post(
 			"/flush",
 			isAllowed(["admin", "superadmin"]),
diff --git a/server/service/JobQueue/JobQueue.js b/server/service/JobQueue/JobQueue.js
index 32d531809..9349eba7e 100644
--- a/server/service/JobQueue/JobQueue.js
+++ b/server/service/JobQueue/JobQueue.js
@@ -51,7 +51,6 @@ class JobQueue {
 						}
 					})
 			);
-
 			this.healthCheckInterval = setInterval(async () => {
 				try {
 					const queueHealthChecks = await this.checkQueueHealth();
@@ -116,6 +115,14 @@ class JobQueue {
 		});
 	}
 
+	pauseJob = async (monitor) => {
+		this.deleteJob(monitor);
+	};
+
+	resumeJob = async (monitor) => {
+		this.addJob(monitor._id, monitor);
+	};
+
 	async addJob(jobName, monitor) {
 		this.logger.info({
 			message: `Adding job ${monitor?.url ?? "No URL"}`,
diff --git a/server/service/JobQueue/JobQueueHelper.js b/server/service/JobQueue/JobQueueHelper.js
index de1e00fb8..9e08e2cf1 100644
--- a/server/service/JobQueue/JobQueueHelper.js
+++ b/server/service/JobQueue/JobQueueHelper.js
@@ -254,7 +254,8 @@ class JobQueueHelper {
 
 				// Get the current status
 				await job.updateProgress(30);
-				const networkResponse = await this.networkService.getStatus(job);
+				const monitor = job.data;
+				const networkResponse = await this.networkService.getStatus(monitor);
 				if (
 					job.data.type === "distributed_http" ||
 					job.data.type === "distributed_test"
@@ -271,14 +272,17 @@ class JobQueueHelper {
 
 				// Handle status change
 				await job.updateProgress(60);
-				const { monitor, statusChanged, prevStatus } =
-					await this.statusService.updateStatus(networkResponse);
+				const {
+					monitor: updatedMonitor,
+					statusChanged,
+					prevStatus,
+				} = await this.statusService.updateStatus(networkResponse);
 				// Handle notifications
 				await job.updateProgress(80);
 				this.notificationService
 					.handleNotifications({
 						...networkResponse,
-						monitor,
+						monitor: updatedMonitor,
 						prevStatus,
 						statusChanged,
 					})
diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
new file mode 100644
index 000000000..63e363b71
--- /dev/null
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -0,0 +1,171 @@
+import { Pulse } from "@pulsecron/pulse";
+import { ObjectId } from "mongodb";
+
+const SERVICE_NAME = "PulseQueue";
+class PulseQueue {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	constructor({ appSettings, db, pulseQueueHelper, logger }) {
+		this.db = db;
+		this.appSettings = appSettings;
+		this.pulseQueueHelper = pulseQueueHelper;
+		this.logger = logger;
+		this.init();
+	}
+
+	// ****************************************
+	// Core methods
+	// ****************************************
+	init = async () => {
+		try {
+			const mongoConnectionString =
+				this.appSettings.dbConnectionString || "mongodb://localhost:27017/uptime_db";
+			this.pulse = new Pulse({ db: { address: mongoConnectionString } });
+			await this.pulse.start();
+			this.pulse.define("monitor-job", this.pulseQueueHelper.getMonitorJob(), {});
+
+			const monitors = await this.db.getAllMonitors();
+			for (const monitor of monitors) {
+				await this.addJob(monitor._id, monitor);
+			}
+			return true;
+		} catch (error) {
+			this.logger.error({
+				message: "Failed to initialize PulseQueue",
+				service: SERVICE_NAME,
+				method: "init",
+				details: error,
+			});
+			return false;
+		}
+	};
+
+	addJob = async (monitorId, monitor) => {
+		this.logger.debug({
+			message: `Adding job ${monitor?.url ?? "No URL"}`,
+			service: SERVICE_NAME,
+			method: "addJob",
+		});
+		const intervalInSeconds = monitor.interval / 1000;
+		const job = this.pulse.create("monitor-job", {
+			monitor,
+		});
+		job.unique({ "data.monitor._id": monitor._id });
+		job.attrs.jobId = monitorId.toString();
+		job.repeatEvery(`${intervalInSeconds} seconds`);
+		await job.save();
+	};
+
+	deleteJob = async (monitor) => {
+		this.logger.debug({
+			message: `Deleting job ${monitor?.url ?? "No URL"}`,
+			service: SERVICE_NAME,
+			method: "deleteJob",
+		});
+		const result = await this.pulse.cancel({
+			"data.monitor._id": monitor._id,
+		});
+		console.log(result);
+	};
+
+	pauseJob = async (monitor) => {
+		const result = await this.pulse.disable({
+			"data.monitor._id": monitor._id,
+		});
+
+		if (result.length < 1) {
+			throw new Error("Failed to pause monitor");
+		}
+
+		this.logger.debug({
+			message: `Paused monitor ${monitor._id}`,
+			service: SERVICE_NAME,
+			method: "pauseJob",
+		});
+	};
+
+	resumeJob = async (monitor) => {
+		const result = await this.pulse.enable({
+			"data.monitor._id": monitor._id,
+		});
+
+		if (result.length < 1) {
+			throw new Error("Failed to resume monitor");
+		}
+
+		this.logger.debug({
+			message: `Resumed monitor ${monitor._id}`,
+			service: SERVICE_NAME,
+			method: "resumeJob",
+		});
+	};
+
+	shutdown = async () => {
+		this.logger.info({
+			message: "Shutting down JobQueue",
+			service: SERVICE_NAME,
+			method: "shutdown",
+		});
+		await this.pulse.stop();
+	};
+
+	// ****************************************
+	// Diagnostic methods
+	// ****************************************
+
+	getMetrics = async () => {
+		const jobs = await this.pulse.jobs();
+		const metrics = jobs.reduce(
+			(acc, job) => {
+				acc.jobs++;
+				if (job.attrs.failCount > 0 && job.attrs.failedAt >= job.attrs.lastFinishedAt) {
+					acc.failingJobs++;
+				}
+				if (job.attrs.lockedAt) {
+					acc.activeJobs++;
+				}
+				if (job.attrs.failCount > 0) {
+					acc.jobsWithFailures.push({
+						monitorId: job.attrs.data.monitor._id,
+						monitorUrl: job.attrs.data.monitor.url,
+						failCount: job.attrs.failCount,
+						failReason: job.attrs.failReason,
+					});
+				}
+				return acc;
+			},
+			{ jobs: 0, activeJobs: 0, failingJobs: 0, jobsWithFailures: [] }
+		);
+		return metrics;
+	};
+
+	getJobs = async () => {
+		const jobs = await this.pulse.jobs();
+		return jobs.map((job) => {
+			return {
+				monitorId: job.attrs.data.monitor._id,
+				monitorUrl: job.attrs.data.monitor.url,
+				lockedAt: job.attrs.lockedAt,
+				runCount: job.attrs.runCount || 0,
+				failCount: job.attrs.failCount || 0,
+				failReason: job.attrs.failReason,
+			};
+		});
+	};
+
+	flushQueues = async () => {
+		const cancelRes = await this.pulse.cancel();
+		await this.pulse.stop();
+		const initRes = await this.init();
+		return {
+			flushedJobs: cancelRes,
+			initSuccess: initRes,
+		};
+	};
+
+	obliterate = async () => {
+		await this.flushQueues();
+	};
+}
+
+export default PulseQueue;
diff --git a/server/service/PulseQueue/PulseQueueHelper.js b/server/service/PulseQueue/PulseQueueHelper.js
new file mode 100644
index 000000000..b1454ce26
--- /dev/null
+++ b/server/service/PulseQueue/PulseQueueHelper.js
@@ -0,0 +1,106 @@
+const SERVICE_NAME = "PulseQueueHelper";
+
+class PulseQueueHelper {
+	constructor({ db, logger, networkService, statusService, notificationService }) {
+		this.db = db;
+		this.logger = logger;
+		this.networkService = networkService;
+		this.statusService = statusService;
+		this.notificationService = notificationService;
+	}
+
+	getMonitorJob = () => {
+		return async (job) => {
+			try {
+				const monitor = job.attrs.data.monitor;
+				const monitorId = job.attrs.data.monitor._id;
+				if (!monitorId) {
+					throw new Error("No monitor id");
+				}
+
+				const maintenanceWindowActive = await this.isInMaintenanceWindow(monitorId);
+				if (maintenanceWindowActive) {
+					this.logger.info({
+						message: `Monitor ${monitorId} is in maintenance window`,
+						service: SERVICE_NAME,
+						method: "getMonitorJob",
+					});
+					return;
+				}
+
+				const networkResponse = await this.networkService.getStatus(monitor);
+				if (monitor.type === "distributed_http" || monitor.type === "distributed_test") {
+					await job.updateProgress(100);
+					return true;
+				}
+
+				if (!networkResponse) {
+					throw new Error("No network response");
+				}
+
+				const {
+					monitor: updatedMonitor,
+					statusChanged,
+					prevStatus,
+				} = await this.statusService.updateStatus(networkResponse);
+
+				this.notificationService
+					.handleNotifications({
+						...networkResponse,
+						monitor: updatedMonitor,
+						prevStatus,
+						statusChanged,
+					})
+					.catch((error) => {
+						this.logger.error({
+							message: error.message,
+							service: SERVICE_NAME,
+							method: "createJobHandler",
+							details: `Error sending notifications for job ${job.id}: ${error.message}`,
+							stack: error.stack,
+						});
+					});
+			} catch (error) {
+				this.logger.warn({
+					message: error.message,
+					service: error.service || SERVICE_NAME,
+					method: error.method || "getMonitorJob",
+					stack: error.stack,
+				});
+				throw error;
+			}
+		};
+	};
+
+	async isInMaintenanceWindow(monitorId) {
+		const maintenanceWindows = await this.db.getMaintenanceWindowsByMonitorId(monitorId);
+		// Check for active maintenance window:
+		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc, window) => {
+			if (window.active) {
+				const start = new Date(window.start);
+				const end = new Date(window.end);
+				const now = new Date();
+				const repeatInterval = window.repeat || 0;
+
+				// If start is < now and end > now, we're in maintenance
+				if (start <= now && end >= now) return true;
+
+				// If maintenance window was set in the past with a repeat,
+				// we need to advance start and end to see if we are in range
+
+				while (start < now && repeatInterval !== 0) {
+					start.setTime(start.getTime() + repeatInterval);
+					end.setTime(end.getTime() + repeatInterval);
+					if (start <= now && end >= now) {
+						return true;
+					}
+				}
+				return false;
+			}
+			return acc;
+		}, false);
+		return maintenanceWindowIsActive;
+	}
+}
+
+export default PulseQueueHelper;
diff --git a/server/service/networkService.js b/server/service/networkService.js
index a023ffadd..9e5e83d24 100755
--- a/server/service/networkService.js
+++ b/server/service/networkService.js
@@ -125,7 +125,7 @@ class NetworkService {
 	 * @property {number} code - The response code (200 if successful, error code otherwise).
 	 * @property {string} message - The message indicating the result of the HTTP request.
 	 */
-	async requestHttp(job) {
+	async requestHttp(monitor) {
 		try {
 			const {
 				url,
@@ -138,7 +138,7 @@ class NetworkService {
 				jsonPath,
 				matchMethod,
 				expectedValue,
-			} = job.data;
+			} = monitor;
 			const config = {};
 
 			secret !== undefined && (config.headers = { Authorization: `Bearer ${secret}` });
@@ -248,10 +248,10 @@ class NetworkService {
 	 * @property {number} code - The response code (200 if successful, error code otherwise).
 	 * @property {string} message - The message indicating the result of the PageSpeed request.
 	 */
-	async requestPagespeed(job) {
+	async requestPagespeed(monitor) {
 		try {
-			const url = job.data.url;
-			const updatedJob = { ...job };
+			const url = monitor.url;
+			const updatedMonitor = { ...monitor };
 			let pagespeedUrl = `https://pagespeedonline.googleapis.com/pagespeedonline/v5/runPagespeed?url=${url}&category=seo&category=accessibility&category=best-practices&category=performance`;
 
 			const dbSettings = await this.settingsService.getDBSettings();
@@ -266,8 +266,8 @@ class NetworkService {
 				});
 				return;
 			}
-			updatedJob.data.url = pagespeedUrl;
-			return await this.requestHttp(updatedJob);
+			updatedMonitor.url = pagespeedUrl;
+			return await this.requestHttp(updatedMonitor);
 		} catch (error) {
 			error.service = this.SERVICE_NAME;
 			error.method = "requestPagespeed";
@@ -292,9 +292,9 @@ class NetworkService {
 	 * @property {number} code - The response code (200 if successful, error code otherwise).
 	 * @property {string} message - The message indicating the result of the hardware status request.
 	 */
-	async requestHardware(job) {
+	async requestHardware(monitor) {
 		try {
-			return await this.requestHttp(job);
+			return await this.requestHttp(monitor);
 		} catch (error) {
 			error.service = this.SERVICE_NAME;
 			error.method = "requestHardware";
@@ -318,7 +318,7 @@ class NetworkService {
 	 * @property {number} code - The response code (200 if successful, error code otherwise).
 	 * @property {string} message - The message indicating the result of the Docker inspection.
 	 */
-	async requestDocker(job) {
+	async requestDocker(monitor) {
 		try {
 			const docker = new this.Docker({
 				socketPath: "/var/run/docker.sock",
@@ -326,19 +326,19 @@ class NetworkService {
 			});
 
 			const containers = await docker.listContainers({ all: true });
-			const containerExists = containers.some((c) => c.Id.startsWith(job.data.url));
+			const containerExists = containers.some((c) => c.Id.startsWith(monitor.url));
 			if (!containerExists) {
 				throw new Error(this.stringService.dockerNotFound);
 			}
-			const container = docker.getContainer(job.data.url);
+			const container = docker.getContainer(monitor.url);
 
 			const { response, responseTime, error } = await this.timeRequest(() =>
 				container.inspect()
 			);
 
 			const dockerResponse = {
-				monitorId: job.data._id,
-				type: job.data.type,
+				monitorId: monitor._id,
+				type: monitor.type,
 				responseTime,
 			};
 
@@ -360,9 +360,9 @@ class NetworkService {
 		}
 	}
 
-	async requestPort(job) {
+	async requestPort(monitor) {
 		try {
-			const { url, port } = job.data;
+			const { url, port } = monitor;
 			const { response, responseTime, error } = await this.timeRequest(async () => {
 				return new Promise((resolve, reject) => {
 					const socket = this.net.createConnection(
@@ -391,8 +391,8 @@ class NetworkService {
 			});
 
 			const portResponse = {
-				monitorId: job.data._id,
-				type: job.data.type,
+				monitorId: monitor._id,
+				type: monitor.type,
 				responseTime,
 			};
 
@@ -414,9 +414,8 @@ class NetworkService {
 		}
 	}
 
-	async requestDistributedHttp(job) {
+	async requestDistributedHttp(monitor) {
 		try {
-			const monitor = job.data;
 			const CALLBACK_URL = process.env.CALLBACK_URL;
 
 			const response = await this.axios.post(
@@ -503,23 +502,23 @@ class NetworkService {
 	 * @returns {Promise<Object>} The response object from the appropriate request method.
 	 * @throws {Error} Throws an error if the job type is unsupported.
 	 */
-	async getStatus(job) {
-		const type = job?.data?.type ?? "unknown";
+	async getStatus(monitor) {
+		const type = monitor.type ?? "unknown";
 		switch (type) {
 			case this.TYPE_PING:
-				return await this.requestPing(job);
+				return await this.requestPing(monitor);
 			case this.TYPE_HTTP:
-				return await this.requestHttp(job);
+				return await this.requestHttp(monitor);
 			case this.TYPE_PAGESPEED:
-				return await this.requestPagespeed(job);
+				return await this.requestPagespeed(monitor);
 			case this.TYPE_HARDWARE:
-				return await this.requestHardware(job);
+				return await this.requestHardware(monitor);
 			case this.TYPE_DOCKER:
-				return await this.requestDocker(job);
+				return await this.requestDocker(monitor);
 			case this.TYPE_PORT:
-				return await this.requestPort(job);
+				return await this.requestPort(monitor);
 			case this.TYPE_DISTRIBUTED_HTTP:
-				return await this.requestDistributedHttp(job);
+				return await this.requestDistributedHttp(monitor);
 			case this.TYPE_DISTRIBUTED_TEST:
 				return;
 			default:
diff --git a/server/service/statusService.js b/server/service/statusService.js
index a53552717..ebd3e2b41 100755
--- a/server/service/statusService.js
+++ b/server/service/statusService.js
@@ -228,6 +228,12 @@ class StatusService {
 
 		if (type === "pagespeed") {
 			if (typeof payload === "undefined") {
+				this.logger.warn({
+					message: "Failed to build check",
+					service: this.SERVICE_NAME,
+					method: "buildCheck",
+					details: "empty payload",
+				});
 				return undefined;
 			}
 			const categories = payload?.lighthouseResult?.categories ?? {};
@@ -287,9 +293,11 @@ class StatusService {
 		} catch (error) {
 			this.logger.error({
 				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "insertCheck",
-				details: `Error inserting check for monitor: ${networkResponse?.monitorId}`,
+				service: error.service || this.SERVICE_NAME,
+				method: error.method || "insertCheck",
+				details:
+					error.details ||
+					`Error inserting check for monitor: ${networkResponse?.monitorId}`,
 				stack: error.stack,
 			});
 		}

From ded137a197e3df8509c4164821e6df3518d397af Mon Sep 17 00:00:00 2001
From: GitHub Action <github-actions[bot]@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:23:08 +0000
Subject: [PATCH 023/319] feat: translations updated from POEditor

---
 client/src/locales/ar.json    |   9 +-
 client/src/locales/cs.json    |   9 +-
 client/src/locales/de.json    |   9 +-
 client/src/locales/en.json    |  14 +-
 client/src/locales/es.json    |   9 +-
 client/src/locales/fi.json    |  25 +--
 client/src/locales/fr.json    | 295 +++++++++++++++++-----------------
 client/src/locales/pt-BR.json |  14 +-
 client/src/locales/ru.json    |  14 +-
 client/src/locales/tr.json    |  91 ++++++-----
 client/src/locales/zh-TW.json |   9 +-
 11 files changed, 269 insertions(+), 229 deletions(-)

diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
index 5dcb98d51..765627912 100644
--- a/client/src/locales/ar.json
+++ b/client/src/locales/ar.json
@@ -532,7 +532,6 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 330812453..ac728160e 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -532,7 +532,6 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 29a79c93c..948748de3 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -532,7 +532,6 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index f74e9ac92..c67b85f04 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -532,12 +532,6 @@
 		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
 		"saving": "Saving..."
 	},
-	"uptimeGeneralInstructions": {
-		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
-		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	},
 	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
 	"sendTestEmail": "Send test email",
 	"emailSent": "Email sent successfully",
@@ -558,5 +552,11 @@
 	"settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
 	"settingsURLSelectTitle": "Display IP/URL on status page",
 	"settingsURLEnabled": "Enabled",
-	"settingURLDisabled": "Disabled"
+	"settingURLDisabled": "Disabled",
+	"uptimeGeneralInstructions": {
+		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
+		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+	}
 }
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 616ece47a..a278312af 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -532,7 +532,6 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index c1543cc13..7f6ffa2ba 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -237,7 +237,7 @@
 	"infrastructureCustomizeAlerts": "",
 	"infrastructureAlertNotificationDescription": "",
 	"infrastructureCreateMonitor": "",
-	"infrastructureProtocol": "",
+	"infrastructureProtocol": "Protokolla",
 	"infrastructureServerUrlLabel": "Palvelimen URL-osoite",
 	"infrastructureDisplayNameLabel": "",
 	"infrastructureAuthorizationSecretLabel": "",
@@ -353,11 +353,11 @@
 	"statusPageCreateTabsContent": "",
 	"statusPageCreateTabsContentDescription": "",
 	"statusPageCreateTabsContentFeaturesDescription": "",
-	"showCharts": "",
+	"showCharts": "Näytä kaaviot",
 	"showUptimePercentage": "",
 	"removeLogo": "Poista logo",
 	"statusPageStatus": "",
-	"statusPageStatusContactAdmin": "",
+	"statusPageStatusContactAdmin": "Ota yhteyttä järjestelmänvalvojaan",
 	"statusPageStatusNotPublic": "",
 	"statusPageStatusNoPage": "",
 	"statusPageStatusServiceStatus": "",
@@ -397,7 +397,7 @@
 	"authRegisterFirstName": "Nimi",
 	"authRegisterLastName": "Sukunimi",
 	"authRegisterEmail": "Sähköpostiosoite",
-	"authRegisterEmailRequired": "",
+	"authRegisterEmailRequired": "Syötä sähköpostiosoitteesi jatkaaksesi",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -426,7 +426,7 @@
 	"backendUnreachableMessage": "",
 	"backendUnreachableError": "",
 	"retryConnection": "",
-	"retryingConnection": "",
+	"retryingConnection": "Yhdistetään...",
 	"backendReconnected": "",
 	"backendStillUnreachable": "",
 	"backendConnectionError": "",
@@ -441,7 +441,7 @@
 	"ignoreTLSErrorDescription": "",
 	"createNew": "Luo uusi",
 	"greeting": {
-		"prepend": "",
+		"prepend": "Hei",
 		"append": "",
 		"overview": ""
 	},
@@ -453,11 +453,11 @@
 	"roles": {
 		"superAdmin": "Pääylläpitäjä",
 		"admin": "Ylläpitäjä",
-		"teamMember": "",
+		"teamMember": "Tiimin jäsen",
 		"demoUser": "Demokäyttäjä"
 	},
 	"teamPanel": {
-		"teamMembers": "",
+		"teamMembers": "Tiimin jäsenet",
 		"filter": {
 			"all": "Kaikki",
 			"member": "Jäsen"
@@ -532,7 +532,6 @@
 		"passwordRequirements": "Uuden salasanan on oltava vähintään 8 merkkiä pitkä ja sen on sisältävä vähintään yksi iso kirjain, yksi pieni kirjain, yksi numero sekä yksi erikoismerkki.",
 		"saving": "Tallennetaan..."
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "Lähetä testi sähköposti",
 	"emailSent": "Sähköpostin lähetys onnistui",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 68ac45f33..d31e73f48 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -22,10 +22,10 @@
 	"authRegisterTitle": "Créer un compte",
 	"authRegisterStepOneTitle": "Créez votre compte",
 	"authRegisterStepOneDescription": "Entrez vos informations pour commencer",
-	"authRegisterStepTwoTitle": "",
-	"authRegisterStepTwoDescription": "",
+	"authRegisterStepTwoTitle": "Créer votre profil",
+	"authRegisterStepTwoDescription": "Parlez-nous un peu de vous",
 	"authRegisterStepThreeTitle": "Presque fini !",
-	"authRegisterStepThreeDescription": "",
+	"authRegisterStepThreeDescription": "Vérifiez vos infos",
 	"authForgotPasswordDescription": "Pas d'inquiétude, nous allons vous envoyer des instructions de réinitialisation.",
 	"authForgotPasswordSendInstructions": "Envoyer les instructions",
 	"authForgotPasswordBackTo": "Retourner à",
@@ -50,7 +50,7 @@
 	"authPasswordOneNumber": "un nombre",
 	"authPasswordUpperCharacter": "une lettre majuscule",
 	"authPasswordLowerCharacter": "une lettre minuscule",
-	"authPasswordConfirmAndPassword": "",
+	"authPasswordConfirmAndPassword": "Confirmer le mot de passe",
 	"authPasswordMustMatch": "doit correspondre",
 	"authRegisterCreateAccount": "Créez votre compte pour commencer",
 	"authRegisterCreateSuperAdminAccount": "Créez votre compte Super admin pour commencer",
@@ -72,12 +72,12 @@
 	"settingsHistoryAndMonitoring": "",
 	"settingsHistoryAndMonitoringDescription": "",
 	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
+	"settingsTTLOptionalLabel": "0 pour infini",
+	"settingsClearAllStats": "Effacer les stats. C'est irréversible.",
+	"settingsClearAllStatsButton": "Effacer les stats",
+	"settingsClearAllStatsDialogTitle": "Voulez-vous effacer toutes les stats ?",
 	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
+	"settingsClearAllStatsDialogConfirm": "Oui, effacer les stats",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
 	"settingsAddDemoMonitors": "",
@@ -104,37 +104,37 @@
 	"https": "",
 	"http": "",
 	"monitor": "",
-	"aboutus": "",
+	"aboutus": "A propos de nous",
 	"now": "",
-	"delete": "",
+	"delete": "Supprimer",
 	"configure": "",
 	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
-	"area": "",
-	"country": "",
-	"city": "",
+	"area": "Zone",
+	"country": "PAYS",
+	"city": "VILLE",
 	"response": "",
-	"checkConnection": "",
+	"checkConnection": "Vérifiez votre connexion",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
+	"authRegisterStepOnePersonalDetails": "Saisissez vos infos",
+	"authCheckEmailOpenEmailButton": "Ouvrir l'appli mail",
+	"authNewPasswordConfirmed": "Votre mot de passe a été réinitialisé avec succès. Cliquez ci-dessous pour vous connecter.",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
 	"webhookSendError": "",
 	"webhookUnsupportedPlatform": "",
-	"distributedRightCategoryTitle": "",
+	"distributedRightCategoryTitle": "Moniteur",
 	"distributedStatusServerMonitors": "",
 	"distributedStatusServerMonitorsDescription": "",
 	"distributedUptimeCreateSelectURL": "",
 	"distributedUptimeCreateChecks": "",
 	"distributedUptimeCreateChecksDescription": "",
-	"distributedUptimeCreateIncidentNotification": "",
+	"distributedUptimeCreateIncidentNotification": "Notifications d'incidents",
 	"distributedUptimeCreateIncidentDescription": "",
-	"distributedUptimeCreateAdvancedSettings": "",
+	"distributedUptimeCreateAdvancedSettings": "Paramètres avancés",
 	"distributedUptimeDetailsNoMonitorHistory": "",
 	"distributedUptimeDetailsFooterHeading": "",
 	"distributedUptimeDetailsFooterBuilt": "",
@@ -144,19 +144,19 @@
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
 		"enableNotifications": "",
-		"testNotification": "",
-		"addOrEditNotifications": "",
+		"testNotification": "Notification de test",
+		"addOrEditNotifications": "Ajouter ou éditer des notifications",
 		"slack": {
 			"label": "",
 			"description": "",
-			"webhookLabel": "",
+			"webhookLabel": "URL du webhook",
 			"webhookPlaceholder": "",
 			"webhookRequired": ""
 		},
 		"discord": {
 			"label": "",
 			"description": "",
-			"webhookLabel": "",
+			"webhookLabel": "URL du webhook Discord",
 			"webhookPlaceholder": "",
 			"webhookRequired": ""
 		},
@@ -165,71 +165,71 @@
 			"description": "",
 			"tokenLabel": "",
 			"tokenPlaceholder": "",
-			"chatIdLabel": "",
-			"chatIdPlaceholder": "",
+			"chatIdLabel": "Votre Chat ID",
+			"chatIdPlaceholder": "-1001234567890",
 			"fieldsRequired": ""
 		},
 		"webhook": {
 			"label": "",
 			"description": "",
-			"urlLabel": "",
-			"urlPlaceholder": "",
-			"urlRequired": ""
+			"urlLabel": "URL du webhook",
+			"urlPlaceholder": "https://votre-serveur.fr/webhook",
+			"urlRequired": "L'URL du webhook est nécessaire"
 		},
-		"testNotificationDevelop": "",
-		"integrationButton": "",
-		"testSuccess": "",
-		"testFailed": "",
+		"testNotificationDevelop": "Notification de test 2",
+		"integrationButton": "Intégration de notification",
+		"testSuccess": "La notification de test a été envoyée avec succès !",
+		"testFailed": "Échec de l'envoi de la notification de test",
 		"unsupportedType": "",
 		"networkError": ""
 	},
 	"testLocale": "",
-	"add": "",
+	"add": "Ajouter",
 	"monitors": "",
-	"distributedUptimeStatusCreateStatusPage": "",
-	"distributedUptimeStatusCreateStatusPageAccess": "",
+	"distributedUptimeStatusCreateStatusPage": "page de statut",
+	"distributedUptimeStatusCreateStatusPageAccess": "Accès",
 	"distributedUptimeStatusCreateStatusPageReady": "",
 	"distributedUptimeStatusBasicInfoHeader": "",
 	"distributedUptimeStatusBasicInfoDescription": "",
-	"distributedUptimeStatusLogoHeader": "",
+	"distributedUptimeStatusLogoHeader": "Logo",
 	"distributedUptimeStatusLogoDescription": "",
-	"distributedUptimeStatusLogoUploadButton": "",
+	"distributedUptimeStatusLogoUploadButton": "Téléverser un logo",
 	"distributedUptimeStatusStandardMonitorsHeader": "",
 	"distributedUptimeStatusStandardMonitorsDescription": "",
 	"distributedUptimeStatusCreateYour": "",
 	"distributedUptimeStatusEditYour": "",
 	"distributedUptimeStatusPublishedLabel": "",
-	"distributedUptimeStatusCompanyNameLabel": "",
-	"distributedUptimeStatusPageAddressLabel": "",
-	"distributedUptimeStatus30Days": "",
-	"distributedUptimeStatus60Days": "",
-	"distributedUptimeStatus90Days": "",
+	"distributedUptimeStatusCompanyNameLabel": "Nom de l'entreprise",
+	"distributedUptimeStatusPageAddressLabel": "Adresse de votre page de statut",
+	"distributedUptimeStatus30Days": "30 jours",
+	"distributedUptimeStatus60Days": "60 jours",
+	"distributedUptimeStatus90Days": "90 jours",
 	"distributedUptimeStatusPageNotSetUp": "",
-	"distributedUptimeStatusContactAdmin": "",
-	"distributedUptimeStatusPageNotPublic": "",
-	"distributedUptimeStatusPageDeleteDialog": "",
-	"distributedUptimeStatusPageDeleteConfirm": "",
-	"distributedUptimeStatusPageDeleteDescription": "",
+	"distributedUptimeStatusContactAdmin": "Veuillez contacter votre administrateur",
+	"distributedUptimeStatusPageNotPublic": "Cette page de statut n'est pas publique.",
+	"distributedUptimeStatusPageDeleteDialog": "Voulez-vous supprimer cette page de statut ?",
+	"distributedUptimeStatusPageDeleteConfirm": "Oui, supprimer la page de statut",
+	"distributedUptimeStatusPageDeleteDescription": "Supprimer votre page de statut est irréversible.",
 	"distributedUptimeStatusDevices": "",
 	"distributedUptimeStatusUpt": "",
 	"distributedUptimeStatusUptBurned": "",
 	"distributedUptimeStatusUptLogo": "",
 	"incidentsTableNoIncidents": "",
-	"incidentsTablePaginationLabel": "",
+	"incidentsTablePaginationLabel": "incidents",
 	"incidentsTableMonitorName": "",
 	"incidentsTableStatus": "",
-	"incidentsTableDateTime": "",
+	"incidentsTableDateTime": "Date et heure",
 	"incidentsTableStatusCode": "",
-	"incidentsTableMessage": "",
+	"incidentsTableMessage": "Message",
 	"incidentsOptionsHeader": "",
 	"incidentsOptionsHeaderFilterBy": "",
 	"incidentsOptionsHeaderFilterAll": "",
 	"incidentsOptionsHeaderFilterDown": "",
 	"incidentsOptionsHeaderFilterCannotResolve": "",
 	"incidentsOptionsHeaderShow": "",
-	"incidentsOptionsHeaderLastHour": "",
-	"incidentsOptionsHeaderLastDay": "",
-	"incidentsOptionsHeaderLastWeek": "",
+	"incidentsOptionsHeaderLastHour": "Dernière heure",
+	"incidentsOptionsHeaderLastDay": "Dernier jour",
+	"incidentsOptionsHeaderLastWeek": "Dernière semaine",
 	"incidentsOptionsPlaceholderAllServers": "",
 	"infrastructureCreateYour": "",
 	"infrastructureCreateGeneralSettingsDescription": "",
@@ -237,18 +237,18 @@
 	"infrastructureCustomizeAlerts": "",
 	"infrastructureAlertNotificationDescription": "",
 	"infrastructureCreateMonitor": "",
-	"infrastructureProtocol": "",
-	"infrastructureServerUrlLabel": "",
+	"infrastructureProtocol": "Protocole",
+	"infrastructureServerUrlLabel": "URL du serveur",
 	"infrastructureDisplayNameLabel": "",
 	"infrastructureAuthorizationSecretLabel": "",
 	"gb": "",
 	"mb": "",
 	"mem": "",
 	"memoryUsage": "",
-	"cpu": "",
+	"cpu": "CPU",
 	"cpuUsage": "",
 	"cpuTemperature": "",
-	"diskUsage": "",
+	"diskUsage": "Utilisation du disque",
 	"used": "",
 	"total": "",
 	"cores": "",
@@ -256,36 +256,36 @@
 	"status": "",
 	"cpuPhysical": "",
 	"cpuLogical": "",
-	"cpuFrequency": "",
-	"avgCpuTemperature": "",
+	"cpuFrequency": "Fréquence CPU",
+	"avgCpuTemperature": "Température moyenne du CPU",
 	"memory": "",
-	"disk": "",
+	"disk": "Disque",
 	"uptime": "",
 	"os": "",
 	"host": "",
-	"actions": "",
-	"integrations": "",
-	"integrationsPrism": "",
-	"integrationsSlack": "",
-	"integrationsSlackInfo": "",
-	"integrationsDiscord": "",
-	"integrationsDiscordInfo": "",
-	"integrationsZapier": "",
-	"integrationsZapierInfo": "",
-	"commonSave": "",
-	"createYour": "",
+	"actions": "Actions",
+	"integrations": "Intégrations",
+	"integrationsPrism": "Connecter Prism à votre service préféré.",
+	"integrationsSlack": "Slack",
+	"integrationsSlackInfo": "Connecter à Slack et voir les incidents dans un canal",
+	"integrationsDiscord": "Discord",
+	"integrationsDiscordInfo": "Connecter à Discord et voir les incidents dans un canal",
+	"integrationsZapier": "Zapier",
+	"integrationsZapierInfo": "Envoyer tous les incidents à Zapier",
+	"commonSave": "Sauvegarder",
+	"createYour": "Créez votre",
 	"createMonitor": "",
 	"pause": "",
 	"resume": "",
 	"editing": "",
-	"url": "",
-	"access": "",
-	"timezone": "",
+	"url": "URL",
+	"access": "Accès",
+	"timezone": "Fuseau horaire",
 	"features": "",
-	"administrator": "",
+	"administrator": "Administrateur ?",
 	"loginHere": "",
-	"displayName": "",
-	"urlMonitor": "",
+	"displayName": "Nom d'affichage",
+	"urlMonitor": "URL à suivre",
 	"portToMonitor": "",
 	"websiteMonitoring": "",
 	"websiteMonitoringDescription": "",
@@ -296,7 +296,7 @@
 	"portMonitoring": "",
 	"portMonitoringDescription": "",
 	"createMaintenanceWindow": "",
-	"createMaintenance": "",
+	"createMaintenance": "Créer une maintenance",
 	"editMaintenance": "",
 	"maintenanceWindowName": "",
 	"friendlyNameInput": "",
@@ -304,20 +304,20 @@
 	"maintenanceRepeat": "",
 	"maintenance": "",
 	"duration": "",
-	"addMonitors": "",
+	"addMonitors": "Ajouter des moniteurs",
 	"window": "",
-	"cancel": "",
+	"cancel": "Annuler",
 	"message": "",
 	"low": "",
 	"high": "",
 	"statusCode": "",
-	"date&Time": "",
+	"date&Time": "Date et heure",
 	"type": "",
 	"statusPageName": "",
 	"publicURL": "",
 	"repeat": "",
 	"edit": "",
-	"createA": "",
+	"createA": "Créer un",
 	"remove": "",
 	"maintenanceWindowDescription": "",
 	"startTime": "",
@@ -327,22 +327,22 @@
 	"notFoundButton": "",
 	"pageSpeedConfigureSettingsDescription": "",
 	"monitorDisplayName": "",
-	"whenNewIncident": "",
+	"whenNewIncident": "Lors d'un nouvel incident,",
 	"notifySMS": "",
 	"notifyEmails": "",
 	"seperateEmails": "",
-	"checkFrequency": "",
+	"checkFrequency": "Vérifier la fréquence",
 	"matchMethod": "",
 	"expectedValue": "",
 	"deleteDialogTitle": "",
 	"deleteDialogDescription": "",
 	"pageSpeedMonitor": "",
 	"shown": "",
-	"ago": "",
+	"ago": "depuis",
 	"companyName": "",
 	"pageSpeedDetailsPerformanceReport": "",
 	"pageSpeedDetailsPerformanceReportCalculator": "",
-	"checkingEvery": "",
+	"checkingEvery": "Vérification tous les",
 	"statusPageCreateSettings": "",
 	"basicInformation": "",
 	"statusPageCreateBasicInfoDescription": "",
@@ -362,7 +362,7 @@
 	"statusPageStatusNoPage": "",
 	"statusPageStatusServiceStatus": "",
 	"deleteStatusPage": "",
-	"deleteStatusPageConfirm": "",
+	"deleteStatusPageConfirm": "Oui, supprimer la page de statut",
 	"deleteStatusPageDescription": "",
 	"uptimeCreate": "",
 	"uptimeCreateJsonPath": "",
@@ -379,25 +379,25 @@
 	"pageSpeedLearnMoreLink": "",
 	"pageSpeedAddApiKey": "",
 	"update": "",
-	"invalidFileFormat": "",
-	"invalidFileSize": "",
-	"ClickUpload": "",
+	"invalidFileFormat": "Format de fichier non supporté !",
+	"invalidFileSize": "Le fichier est trop volumineux !",
+	"ClickUpload": "Cliquez pour téléverser",
 	"DragandDrop": "",
 	"MaxSize": "",
 	"SupportedFormats": "",
 	"FirstName": "",
 	"LastName": "",
 	"EmailDescriptionText": "",
-	"YourPhoto": "",
+	"YourPhoto": "Photo de profil",
 	"PhotoDescriptionText": "",
 	"save": "",
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
-	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
-	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
+	"DeleteWarningTitle": "Vous supprimez vraiment ce compte ?",
+	"authRegisterFirstName": "Prénom",
+	"authRegisterLastName": "Nom",
+	"authRegisterEmail": "Email",
+	"authRegisterEmailRequired": "Pour continuer, veuillez saisir votre adresse e-mail",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -405,31 +405,31 @@
 		"selectFile": "",
 		"parsingFailed": "",
 		"uploadSuccess": "",
-		"validationFailed": "",
+		"validationFailed": "Echec de la validation",
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
-	"validationNameRequired": "",
+	"welcomeBack": "Bienvenue ! Vous êtes connecté avec succès.",
+	"authRegisterLoginLink": "Se connecter",
+	"validationNameRequired": "Veuillez saisir votre nom",
 	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
+	"validationNameInvalidCharacters": "Veuillez utiliser uniquement des lettres, des espaces, des apostrophes ou des traits d'union",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
-	"DeleteAccountTitle": "",
-	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
+	"DeleteAccountTitle": "Supprimer le compte",
+	"DeleteAccountButton": "Supprimer le compte",
+	"authRegisterEmailInvalid": "Veuillez saisir une adresse e-mail valide",
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "",
+	"backendUnreachable": "Erreur de connexion au serveur",
 	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
+	"backendUnreachableError": "Impossible de se connecter au serveur. Veuillez réessayer plus tard.",
 	"retryConnection": "",
 	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
+	"backendReconnected": "Reconnexion au serveur réussie.",
+	"backendStillUnreachable": "Le serveur est toujours inaccessible. Veuillez réessayer plus tard.",
+	"backendConnectionError": "Erreur de connexion au serveur. Veuillez vérifier votre connexion réseau.",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -439,10 +439,10 @@
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
 	"ignoreTLSErrorDescription": "",
-	"createNew": "",
+	"createNew": "Créer un nouveau",
 	"greeting": {
 		"prepend": "",
-		"append": "",
+		"append": "L'après-midi est votre libre, rendons-le épique !",
 		"overview": ""
 	},
 	"monitorStatus": {
@@ -452,37 +452,37 @@
 	},
 	"roles": {
 		"superAdmin": "",
-		"admin": "",
+		"admin": "Admin",
 		"teamMember": "",
 		"demoUser": ""
 	},
 	"teamPanel": {
-		"teamMembers": "",
+		"teamMembers": "Membres de l'équipe",
 		"filter": {
-			"all": "",
+			"all": "Tous",
 			"member": ""
 		},
 		"inviteTeamMember": "",
 		"inviteNewTeamMember": "",
 		"inviteDescription": "",
-		"email": "",
+		"email": "Email",
 		"selectRole": "",
-		"inviteLink": "",
-		"cancel": "",
+		"inviteLink": "Lien d'invitation",
+		"cancel": "Annuler",
 		"noMembers": "",
 		"getToken": "",
 		"emailToken": "",
 		"table": {
 			"name": "",
-			"email": "",
+			"email": "Email",
 			"role": "",
-			"created": ""
+			"created": "Créée"
 		}
 	},
 	"monitorState": {
 		"paused": "",
 		"resumed": "",
-		"active": ""
+		"active": "Actif"
 	},
 	"menu": {
 		"uptime": "",
@@ -492,18 +492,18 @@
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
-		"integrations": "",
+		"integrations": "Intégrations",
 		"settings": "",
 		"support": "",
-		"discussions": "",
+		"discussions": "Discussions",
 		"docs": "",
-		"changelog": "",
+		"changelog": "Changelog",
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "Déconnexion"
 	},
-	"settingsEmail": "",
+	"settingsEmail": "Email",
 	"settingsEmailDescription": "",
 	"settingsEmailHost": "",
 	"settingsEmailPort": "",
@@ -514,25 +514,24 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
-	"commonSaving": "",
+	"authForgotPasswordInstructions": "Nous vous enverrons des instructions de réinitialisation.",
+	"settingsThemeModeLight": "Clair",
+	"settingsThemeModeDark": "Sombre",
+	"settingsClearAllStatsDialogCancel": "Annuler",
+	"commonSaving": "Sauvegarde...",
 	"navControls": "",
-	"incidentsPageTitle": "",
+	"incidentsPageTitle": "Incidents",
 	"passwordPanel": {
-		"passwordChangedSuccess": "",
-		"passwordInputIncorrect": "",
-		"currentPassword": "",
-		"enterCurrentPassword": "",
-		"newPassword": "",
-		"enterNewPassword": "",
-		"confirmNewPassword": "",
-		"passwordRequirements": "",
-		"saving": ""
+		"passwordChangedSuccess": "Votre mot de passe a été modifié avec succès.",
+		"passwordInputIncorrect": "La saisie de votre mot de passe est incorrecte.",
+		"currentPassword": "Mot de passe actuel",
+		"enterCurrentPassword": "Entrez votre mot de passe actuel",
+		"newPassword": "Nouveau mot de passe",
+		"enterNewPassword": "Entrez votre nouveau mot de passe",
+		"confirmNewPassword": "Confirmer le nouveau mot de passe",
+		"passwordRequirements": "Le nouveau mot de passe doit contenir au moins 8 caractères et au moins une lettre majuscule, une lettre minuscule, un chiffre et un caractère spécial.",
+		"saving": "Sauvegarde..."
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -541,7 +540,7 @@
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
-	"settingsTestEmailUnknownError": "",
+	"settingsTestEmailUnknownError": "Erreur inconnue",
 	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index c1b4815e6..773d3c023 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -532,12 +532,6 @@
 		"passwordRequirements": "A nova senha deve conter pelo menos 8 caracteres e deve ter pelo menos uma letra maiúscula, uma letra minúscula, um número e um caractere especial.",
 		"saving": "Salvando..."
 	},
-	"uptimeGeneralInstructions": {
-		"http": "Insira a URL ou o IP a ser monitorado (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.",
-		"ping": "Insira a URL ou o IP para executar o ping (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.",
-		"docker": "Insira o ID do seu contêiner Docker. Os IDs do Docker devem conter todos os 64 caracteres. Você pode executar o comando docker inspect <short_id> para obter o ID completo do contêiner.",
-		"port": "Insira a URL ou o IP do servidor, o número da porta e um nome de exibição claro que será exibido no painel."
-	},
 	"settingsEmailConnectionHost": "Host de conexão de e-mail - Nome do host a ser usado na saudação HELO/EHLO",
 	"sendTestEmail": "Enviar e-mail de teste",
 	"emailSent": "E-mail enviado com sucesso",
@@ -558,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 039743be7..817867c2d 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -532,12 +532,6 @@
 		"passwordRequirements": "Новый пароль должен содержать не менее 8 символов и содержать как минимум одну заглавную букву, одну строчную букву, одну цифру и один специальный символ.",
 		"saving": "Сохранение..."
 	},
-	"uptimeGeneralInstructions": {
-		"http": "Введите URL или IP-адрес для мониторинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.",
-		"ping": "Введите URL или IP-адрес для пинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.",
-		"docker": "Введите идентификатор контейнера Docker. Идентификатор должен содержать все 64 символа. Вы можете выполнить команду docker inspect <short_id>, чтобы получить полный идентификатор контейнера.",
-		"port": "Введите URL или IP-адрес сервера, номер порта и понятное имя, которое будет отображаться на панели."
-	},
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -558,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 91626478e..fb1be3c57 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -501,57 +501,62 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "Çıkış yap"
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
 	"settingsEmailHost": "",
 	"settingsEmailPort": "",
 	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
-	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
-	"state": "",
-	"statusBreadCrumbsStatusPages": "",
-	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
-	"commonSaving": "",
-	"navControls": "",
-	"incidentsPageTitle": "",
+	"settingsEmailPassword": "E-posta şifresi - Kimlik doğrulama şifresi.",
+	"settingsEmailUser": "E-posta kullanıcısı – Kimlik doğrulama için kullanıcı adı; belirtilirse e-posta adresinin yerine geçer.",
+	"settingsEmailFieldResetLabel": "Şifre ayarlandı. Değiştirmek için \"Sıfırla\"ya tıklayın.",
+	"state": "Durum",
+	"statusBreadCrumbsStatusPages": "Durum sayfası",
+	"statusBreadCrumbsDetails": "Detaylar",
+	"authForgotPasswordInstructions": "Endişelenmeyin, size sıfırlama talimatlarını göndereceğiz.",
+	"settingsThemeModeLight": "Aydınlat",
+	"settingsThemeModeDark": "Karart",
+	"settingsClearAllStatsDialogCancel": "İptal",
+	"commonSaving": "Kaydediliyor.",
+	"navControls": "Kontroller",
+	"incidentsPageTitle": "Olaylar",
 	"passwordPanel": {
-		"passwordChangedSuccess": "",
-		"passwordInputIncorrect": "",
-		"currentPassword": "",
-		"enterCurrentPassword": "",
-		"newPassword": "",
-		"enterNewPassword": "",
-		"confirmNewPassword": "",
-		"passwordRequirements": "",
-		"saving": ""
+		"passwordChangedSuccess": "Şifreniz başarı ile değiştirildi.",
+		"passwordInputIncorrect": "Şifreniz hatalı",
+		"currentPassword": "Mevcut parola",
+		"enterCurrentPassword": "Mevcut parolanızı girin",
+		"newPassword": "Yeni parola",
+		"enterNewPassword": "Yeni parolanızı girin",
+		"confirmNewPassword": "Yeni şifrenizi onaylayın",
+		"passwordRequirements": "Yeni şifreniz en az 8 karakterden oluşmalı ve en az bir büyük harf, bir küçük harf, bir rakam ve bir özel karakter içermelidir.",
+		"saving": "Kaydediliyor..."
 	},
-	"uptimeCreateSelectURL": "",
-	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
-	"emailSent": "",
-	"failedToSendEmail": "",
-	"settingsTestEmail": "",
-	"settingsTestEmailSuccess": "",
-	"settingsTestEmailFailed": "",
-	"settingsTestEmailFailedWithReason": "",
-	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
+	"settingsEmailConnectionHost": "E-posta bağlantı ana bilgisayarı - HELO/EHLO selamlamasında kullanılacak ana bilgisayar adı",
+	"sendTestEmail": "Test maili gönder",
+	"emailSent": "E-posta başarı ile gönderildi.",
+	"failedToSendEmail": "E-posta gönderimi başarısız.",
+	"settingsTestEmail": "Test  E-postası gönder.",
+	"settingsTestEmailSuccess": "Test E-postası başarı ile gönderildi.",
+	"settingsTestEmailFailed": "Test E-postası gönderimi başarısız.",
+	"settingsTestEmailFailedWithReason": "Test E-postası gönderimi başarısız: {{reason}}",
+	"settingsTestEmailUnknownError": "Bilinmeyen hata.",
+	"settingsEmailRequiredFields": "E-posta sunucusu ve portu gereklidir.",
 	"statusMsg": {
-		"paused": "",
-		"up": "",
-		"down": "",
-		"pending": ""
+		"paused": "İzleme duraklatıldı.",
+		"up": "Siteniz yayında.",
+		"down": "Siteniz kapalı.",
+		"pending": "Sırada.."
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingsURLTitle": "Durum Sayfasında IP/URL'yi İzle",
+	"settingsURLDescription": "Genel Durum sayfasında monitörün IP adresini veya URL'sini görüntüleyin. Devre dışı bırakılırsa, hassas bilgileri korumak için yalnızca monitör adı gösterilecektir.",
+	"settingsURLSelectTitle": "Durum sayfasında IP/URL'yi görüntüle",
+	"settingsURLEnabled": "Etkinleştirilmiş",
+	"settingURLDisabled": "Devre dışı bırakılmış",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 8a34a6835..bb44d91da 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -532,7 +532,6 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"uptimeCreateSelectURL": "",
 	"settingsEmailConnectionHost": "",
 	"sendTestEmail": "",
 	"emailSent": "",
@@ -553,5 +552,11 @@
 	"settingsURLDescription": "",
 	"settingsURLSelectTitle": "",
 	"settingsURLEnabled": "",
-	"settingURLDisabled": ""
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	}
 }

From 958a8ad5a7fc9132bbb3e1f89514fdfddcfe100d Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sat, 7 Jun 2025 21:14:03 +0530
Subject: [PATCH 024/319] FIX for csv file case sensitive file ending.

---
 client/src/Pages/Uptime/BulkImport/Upload.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Uptime/BulkImport/Upload.jsx b/client/src/Pages/Uptime/BulkImport/Upload.jsx
index 261dcffe6..24bc0ec38 100644
--- a/client/src/Pages/Uptime/BulkImport/Upload.jsx
+++ b/client/src/Pages/Uptime/BulkImport/Upload.jsx
@@ -23,7 +23,7 @@ const UploadFile = ({ onFileSelect }) => {
 		// Basic file validation
 		if (!selectedFile) return;
 
-		if (!selectedFile.name.endsWith(".csv")) {
+		if (!selectedFile.name.toLowerCase().endsWith(".csv")) {
 			setError(t("bulkImport.invalidFileType"));
 			return;
 		}

From 1bf1387a05f06c11bfe72b4e2557c660434f68e1 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sat, 7 Jun 2025 14:19:43 -0400
Subject: [PATCH 025/319] update ping monitoring desc

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index c67b85f04..ab1dc2b5a 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -555,7 +555,7 @@
 	"settingURLDisabled": "Disabled",
 	"uptimeGeneralInstructions": {
 		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
 	}

From fe041bc0c0bca0fbdc9ae9a02396856cf2068dc9 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Sat, 7 Jun 2025 14:20:26 -0400
Subject: [PATCH 026/319] fix typo in docker desc

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index ab1dc2b5a..0c739d349 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -556,7 +556,7 @@
 	"uptimeGeneralInstructions": {
 		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
 	}
 }

From ccc9faa89289498a62208b8aedc66a76523e3a40 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sun, 8 Jun 2025 00:13:47 +0530
Subject: [PATCH 027/319] Feature for adding capture version on the deatils
 page.

---
 client/src/Components/MonitorStatusHeader/index.jsx    | 10 +++++++++-
 .../Details/Hooks/useHardwareMonitorsFetch.jsx         |  1 -
 server/db/models/HardwareCheck.js                      | 10 ++++++++++
 server/service/statusService.js                        |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index edadfb8df..1f0189cae 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -36,7 +36,15 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 					</Typography>
 					<Dot />
 					<Typography>
-						Checking every {formatDurationRounded(monitor?.interval)}.
+						Checking every {formatDurationRounded(monitor?.interval)}{" "}
+						{monitor?.stats?.aggregateData?.latestCheck?.capture?.version && (
+							<>
+								{" "}
+								with Capture agent{" "}
+								{monitor.stats.aggregateData.latestCheck.capture.version}
+							</>
+						)}
+						.
 					</Typography>
 				</Stack>
 			</Stack>
diff --git a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
index 30a54eef0..f7cb2abb1 100644
--- a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
+++ b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
@@ -17,7 +17,6 @@ const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => {
 					monitorId: monitorId,
 					dateRange: dateRange,
 				});
-				response.data.data;
 				setMonitor(response.data.data);
 			} catch (error) {
 				setNetworkError(true);
diff --git a/server/db/models/HardwareCheck.js b/server/db/models/HardwareCheck.js
index 76b9dfc2e..bda9f693c 100755
--- a/server/db/models/HardwareCheck.js
+++ b/server/db/models/HardwareCheck.js
@@ -35,6 +35,11 @@ const errorSchema = mongoose.Schema({
 	err: { type: String, default: "" },
 });
 
+const captureSchema = mongoose.Schema({
+	version: { type: String, default: "" },
+	mode: { type: String, default: "" },
+});
+
 const HardwareCheckSchema = mongoose.Schema(
 	{
 		...BaseCheckSchema.obj,
@@ -59,6 +64,11 @@ const HardwareCheckSchema = mongoose.Schema(
 			type: [errorSchema],
 			default: () => [],
 		},
+
+		capture: {
+			type: captureSchema,
+			default: () => ({}),
+		},
 	},
 	{ timestamps: true }
 );
diff --git a/server/service/statusService.js b/server/service/statusService.js
index a53552717..edb58ad0d 100755
--- a/server/service/statusService.js
+++ b/server/service/statusService.js
@@ -254,6 +254,7 @@ class StatusService {
 			check.disk = disk ?? {};
 			check.host = host ?? {};
 			check.errors = errors ?? [];
+			check.capture = payload?.capture ?? {};
 		}
 		return check;
 	};

From a13056bd1b0f3599a9b37d274eb7d303de26f6ee Mon Sep 17 00:00:00 2001
From: mohadeseh safari <mohadeseh.safari1992@gmail.com>
Date: Sat, 7 Jun 2025 19:12:22 -0400
Subject: [PATCH 028/319] Fix #2365: Add port monitor support to status page

---
 client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
index e3c4ae2fc..5c523b635 100644
--- a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
+++ b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
@@ -15,7 +15,7 @@ const useMonitorsFetch = () => {
 				const response = await networkService.getMonitorsByTeamId({
 					teamId: user.teamId,
 					limit: null, // donot return any checks for the monitors
-					types: ["http", "ping"], // status page is available for uptime and ping monitors
+					types: ["http", "ping", "port"], // status page is available for uptime, ping, and port monitors
 				});
 				setMonitors(response.data.data.monitors);
 			} catch (error) {

From dfe88b30e8e92395df2e560abe01a8fe62c9639c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:09:00 +0800
Subject: [PATCH 029/319] fix formatting

---
 client/src/Pages/Settings/index.jsx      | 4 ++--
 client/src/Pages/Uptime/Create/index.jsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index f7271e6db..dd0135edb 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -205,7 +205,7 @@ const Settings = () => {
 					bottom: 0,
 					boxShadow: theme.shape.boxShadow,
 					zIndex: 1000,
-					mt : 3,
+					mt: 3,
 					backgroundColor: theme.palette.primary.main,
 					display: "flex",
 					justifyContent: "flex-end",
@@ -216,7 +216,7 @@ const Settings = () => {
 					border: 1,
 					borderStyle: "solid",
 					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.spacing(2)
+					borderRadius: theme.spacing(2),
 				}}
 			>
 				<Button
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index cd81d1cad..6e45230f6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
+						<Typography component="p">
+							{t(`uptimeGeneralInstructions.${monitor.type}`)}
+						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From ecd8ca094086a42d6e034132867e7c95cd7faa3f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:11:31 +0800
Subject: [PATCH 030/319] fix formatting

---
 client/src/Pages/Settings/index.jsx      | 4 ++--
 client/src/Pages/Uptime/Create/index.jsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index f7271e6db..dd0135edb 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -205,7 +205,7 @@ const Settings = () => {
 					bottom: 0,
 					boxShadow: theme.shape.boxShadow,
 					zIndex: 1000,
-					mt : 3,
+					mt: 3,
 					backgroundColor: theme.palette.primary.main,
 					display: "flex",
 					justifyContent: "flex-end",
@@ -216,7 +216,7 @@ const Settings = () => {
 					border: 1,
 					borderStyle: "solid",
 					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.spacing(2)
+					borderRadius: theme.spacing(2),
 				}}
 			>
 				<Button
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index cd81d1cad..6e45230f6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
+						<Typography component="p">
+							{t(`uptimeGeneralInstructions.${monitor.type}`)}
+						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From f2b7a9cc6734b54d7b152dda0574c7f134d90076 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:14:17 +0800
Subject: [PATCH 031/319] fix formatting

---
 client/src/Pages/Settings/index.jsx      | 4 ++--
 client/src/Pages/Uptime/Create/index.jsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index f7271e6db..dd0135edb 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -205,7 +205,7 @@ const Settings = () => {
 					bottom: 0,
 					boxShadow: theme.shape.boxShadow,
 					zIndex: 1000,
-					mt : 3,
+					mt: 3,
 					backgroundColor: theme.palette.primary.main,
 					display: "flex",
 					justifyContent: "flex-end",
@@ -216,7 +216,7 @@ const Settings = () => {
 					border: 1,
 					borderStyle: "solid",
 					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.spacing(2)
+					borderRadius: theme.spacing(2),
 				}}
 			>
 				<Button
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index cd81d1cad..6e45230f6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
+						<Typography component="p">
+							{t(`uptimeGeneralInstructions.${monitor.type}`)}
+						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From 7475dcfb210ea38ab142ffe034d4326c93041dcd Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:41:42 +0800
Subject: [PATCH 032/319] add update job method

---
 server/controllers/monitorController.js |  6 ++----
 server/service/JobQueue/JobQueue.js     |  5 +++++
 server/service/PulseQueue/PulseQueue.js | 19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 5f0e22ecf..1247e4509 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -550,10 +550,8 @@ class MonitorController {
 				})
 			);
 
-			// Delete the old job(editedMonitor has the same ID as the old monitor)
-			await this.jobQueue.deleteJob(monitorBeforeEdit);
-			// Add the new job back to the queue
-			await this.jobQueue.addJob(editedMonitor._id, editedMonitor);
+			await this.jobQueue.updateJob(editedMonitor);
+
 			return res.success({
 				msg: this.stringService.monitorEdit,
 				data: editedMonitor,
diff --git a/server/service/JobQueue/JobQueue.js b/server/service/JobQueue/JobQueue.js
index 9349eba7e..ed662e322 100644
--- a/server/service/JobQueue/JobQueue.js
+++ b/server/service/JobQueue/JobQueue.js
@@ -188,6 +188,11 @@ class JobQueue {
 		}
 	}
 
+	async updateJob(monitor) {
+		await this.deleteJob(monitor);
+		await this.addJob(monitor._id, monitor);
+	}
+
 	async getJobs() {
 		try {
 			let stats = {};
diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index 63e363b71..25dcbd4d9 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -62,10 +62,9 @@ class PulseQueue {
 			service: SERVICE_NAME,
 			method: "deleteJob",
 		});
-		const result = await this.pulse.cancel({
+		await this.pulse.cancel({
 			"data.monitor._id": monitor._id,
 		});
-		console.log(result);
 	};
 
 	pauseJob = async (monitor) => {
@@ -100,6 +99,22 @@ class PulseQueue {
 		});
 	};
 
+	updateJob = async (monitor) => {
+		const jobs = await this.pulse.jobs({
+			"data.monitor._id": monitor._id,
+		});
+
+		const job = jobs[0];
+		if (!job) {
+			throw new Error("Job not found");
+		}
+
+		const intervalInSeconds = monitor.interval / 1000;
+		job.repeatEvery(`${intervalInSeconds} seconds`);
+		job.attrs.data.monitor = monitor;
+		await job.save();
+	};
+
 	shutdown = async () => {
 		this.logger.info({
 			message: "Shutting down JobQueue",

From 267693668d000808b6af3a15d153a18f89e77c7e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:42:16 +0800
Subject: [PATCH 033/319] format fix

---
 client/src/Pages/Uptime/Create/index.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index cd81d1cad..6e45230f6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
+						<Typography component="p">
+							{t(`uptimeGeneralInstructions.${monitor.type}`)}
+						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From 8de2c0387cc07a9b01a42394cd0a81ebc4f564fb Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 08:57:45 +0800
Subject: [PATCH 034/319] fix method name

---
 server/service/PulseQueue/PulseQueueHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/service/PulseQueue/PulseQueueHelper.js b/server/service/PulseQueue/PulseQueueHelper.js
index b1454ce26..01207d211 100644
--- a/server/service/PulseQueue/PulseQueueHelper.js
+++ b/server/service/PulseQueue/PulseQueueHelper.js
@@ -55,7 +55,7 @@ class PulseQueueHelper {
 						this.logger.error({
 							message: error.message,
 							service: SERVICE_NAME,
-							method: "createJobHandler",
+							method: "getMonitorJob",
 							details: `Error sending notifications for job ${job.id}: ${error.message}`,
 							stack: error.stack,
 						});

From afbd1157c0379a856cc8df6e2e00347e54d3d796 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sun, 8 Jun 2025 09:01:30 +0800
Subject: [PATCH 035/319] add factory method

---
 server/index.js                         | 7 ++++++-
 server/service/PulseQueue/PulseQueue.js | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/index.js b/server/index.js
index 81970ae7a..dccf77c9b 100755
--- a/server/index.js
+++ b/server/index.js
@@ -210,7 +210,12 @@ const startApp = async () => {
 		statusService,
 		notificationService,
 	});
-	const pulseQueue = new PulseQueue({ appSettings, db, pulseQueueHelper, logger });
+	const pulseQueue = await PulseQueue.create({
+		appSettings,
+		db,
+		pulseQueueHelper,
+		logger,
+	});
 
 	// Register services
 	// ServiceRegistry.register(JobQueue.SERVICE_NAME, jobQueue);
diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index 25dcbd4d9..fd420400f 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -10,7 +10,12 @@ class PulseQueue {
 		this.appSettings = appSettings;
 		this.pulseQueueHelper = pulseQueueHelper;
 		this.logger = logger;
-		this.init();
+	}
+
+	static async create({ appSettings, db, pulseQueueHelper, logger }) {
+		const instance = new PulseQueue({ appSettings, db, pulseQueueHelper, logger });
+		await instance.init();
+		return instance;
 	}
 
 	// ****************************************

From 6d236477ac4ea231fdb6b308c5a73c4a90e851dc Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Sun, 8 Jun 2025 00:30:59 -0400
Subject: [PATCH 036/319] Add npm run format directive

---
 .github/pull_request_template.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 26956309b..16273e9d5 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -20,7 +20,8 @@ const { t } = useTranslation();
 ```
 - [ ] I have **not** included any files that are not related to my pull request, including package-lock and package-json if dependencies have not changed
 - [ ] I didn't use any hardcoded values (otherwise it will not scale, and will make it difficult to maintain consistency across the application).
-- [ ] I made sure font sizes, color choices etc are all referenced from the theme. I have no hardcoded dimensions.
+- [ ] I made sure font sizes, color choices etc are all referenced from the theme. I don't have any hardcoded dimensions.
 - [ ] My PR is granular and targeted to one specific feature.
+- [ ] I ran `npm run format` in server and client directories, which automatically formats your code.
 - [ ] I took a screenshot or a video and attached to this PR if there is a UI change.
 

From 1f6826e04590c76ea6df8d4b6d46d1cf582ea005 Mon Sep 17 00:00:00 2001
From: varunrmantri23 <varunrmantri23@gmail.com>
Date: Sun, 8 Jun 2025 12:53:30 +0530
Subject: [PATCH 037/319] fix: add CSS classes to prevent URL and name overflow
 in monitors

---
 .../MonitorDetailsControlHeader/status.jsx        |  8 +++++++-
 .../src/Components/MonitorStatusHeader/index.jsx  | 10 ++++++++--
 client/src/Pages/PageSpeed/Configure/index.jsx    |  2 ++
 client/src/Pages/Uptime/Configure/index.jsx       |  2 ++
 client/src/index.css                              | 15 +++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 9e01dd502..685663695 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -27,7 +27,12 @@ const Status = ({ monitor }) => {
 
 	return (
 		<Stack>
-			<Typography variant="h1">{monitor?.name}</Typography>
+			<Typography
+				variant="h1"
+				className="monitor-name-text"
+			>
+				{monitor?.name}
+			</Typography>
 			<Stack
 				direction="row"
 				alignItems={"center"}
@@ -37,6 +42,7 @@ const Status = ({ monitor }) => {
 				<Typography
 					variant="h2"
 					style={{ fontFamily: "monospace", fontWeight: "bolder" }}
+					className="monitor-url-text"
 				>
 					{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 				</Typography>
diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index edadfb8df..71ce80679 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -21,7 +21,12 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 			justifyContent="space-between"
 		>
 			<Stack>
-				<Typography variant="h1">{monitor?.name}</Typography>
+				<Typography
+					variant="h1"
+					className="monitor-name-text"
+				>
+					{monitor?.name}
+				</Typography>
 				<Stack
 					direction="row"
 					alignItems={"center"}
@@ -29,8 +34,9 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 				>
 					<PulseDot color={statusColor[determineState(monitor)]} />
 					<Typography
+						component="h2"
 						variant="h2"
-						style={{ fontFamily: "monospace", fontWeight: "bolder" }}
+						className="monitor-url-text"
 					>
 						{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 					</Typography>
diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index d81387e1b..5305f8b59 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -203,6 +203,7 @@ const PageSpeedConfigure = () => {
 								<Typography
 									component="h1"
 									variant="h1"
+									className="monitor-name-text"
 								>
 									{monitor.name}
 								</Typography>
@@ -235,6 +236,7 @@ const PageSpeedConfigure = () => {
 									<Typography
 										component="h2"
 										variant="h2"
+										className="monitor-url-text"
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 395486228..09cdbc0b9 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -249,6 +249,7 @@ const Configure = () => {
 								<Typography
 									component="h1"
 									variant="h1"
+									className="monitor-name-text"
 								>
 									{monitor.name}
 								</Typography>
@@ -281,6 +282,7 @@ const Configure = () => {
 									<Typography
 										component="h2"
 										variant="h2"
+										className="monitor-url-text"
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/index.css b/client/src/index.css
index f83cdc461..8ede1627d 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -84,6 +84,21 @@ html {
 	display: none;
 }
 
+/*adding the classes for handling the overflow of url and name for monitors in one place*/
+.monitor-url-text {
+	max-width: 70vh;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.monitor-name-text {
+	max-width: 70vh;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
 @keyframes ripple {
 	from {
 		opacity: 1;

From e4ade39db7352a73b85c597e3b2c1adad9f5b174 Mon Sep 17 00:00:00 2001
From: varunrmantri23 <varunrmantri23@gmail.com>
Date: Sun, 8 Jun 2025 13:25:57 +0530
Subject: [PATCH 038/319] fix: prevent monitor URL and name overflow using MUI
 sx prop

---
 .../MonitorDetailsControlHeader/status.jsx      | 17 ++++++++++++++---
 .../Components/MonitorStatusHeader/index.jsx    | 16 ++++++++++++++--
 client/src/Pages/PageSpeed/Configure/index.jsx  | 14 ++++++++++++--
 client/src/Pages/Uptime/Configure/index.jsx     | 14 ++++++++++++--
 client/src/index.css                            | 15 ---------------
 5 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 685663695..392779f4a 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -29,7 +29,12 @@ const Status = ({ monitor }) => {
 		<Stack>
 			<Typography
 				variant="h1"
-				className="monitor-name-text"
+				sx={{
+					maxWidth: "45vw",
+					overflow: "hidden",
+					textOverflow: "ellipsis",
+					whiteSpace: "nowrap",
+				}}
 			>
 				{monitor?.name}
 			</Typography>
@@ -41,8 +46,14 @@ const Status = ({ monitor }) => {
 				<PulseDot color={statusColor[determineState(monitor)]} />
 				<Typography
 					variant="h2"
-					style={{ fontFamily: "monospace", fontWeight: "bolder" }}
-					className="monitor-url-text"
+					sx={{
+						fontFamily: "monospace",
+						fontWeight: "bolder",
+						maxWidth: "60vw",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						whiteSpace: "nowrap",
+					}}
 				>
 					{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 				</Typography>
diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index 71ce80679..c7ae57c0b 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -23,7 +23,12 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 			<Stack>
 				<Typography
 					variant="h1"
-					className="monitor-name-text"
+					sx={{
+						maxWidth: "60vw",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						whiteSpace: "nowrap",
+					}}
 				>
 					{monitor?.name}
 				</Typography>
@@ -36,7 +41,14 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 					<Typography
 						component="h2"
 						variant="h2"
-						className="monitor-url-text"
+						sx={{
+							fontFamily: "monospace",
+							fontWeight: "bolder",
+							maxWidth: "60vw",
+							overflow: "hidden",
+							textOverflow: "ellipsis",
+							whiteSpace: "nowrap",
+						}}
 					>
 						{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 					</Typography>
diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index 5305f8b59..2ac6d27c0 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -203,7 +203,12 @@ const PageSpeedConfigure = () => {
 								<Typography
 									component="h1"
 									variant="h1"
-									className="monitor-name-text"
+									sx={{
+										maxWidth: "60vw",
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
 								>
 									{monitor.name}
 								</Typography>
@@ -236,7 +241,12 @@ const PageSpeedConfigure = () => {
 									<Typography
 										component="h2"
 										variant="h2"
-										className="monitor-url-text"
+										sx={{
+											maxWidth: "60vw",
+											overflow: "hidden",
+											textOverflow: "ellipsis",
+											whiteSpace: "nowrap",
+										}}
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 09cdbc0b9..16eb37492 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -249,7 +249,12 @@ const Configure = () => {
 								<Typography
 									component="h1"
 									variant="h1"
-									className="monitor-name-text"
+									sx={{
+										maxWidth: "60vw",
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
 								>
 									{monitor.name}
 								</Typography>
@@ -282,7 +287,12 @@ const Configure = () => {
 									<Typography
 										component="h2"
 										variant="h2"
-										className="monitor-url-text"
+										sx={{
+											maxWidth: "60vw",
+											overflow: "hidden",
+											textOverflow: "ellipsis",
+											whiteSpace: "nowrap",
+										}}
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/index.css b/client/src/index.css
index 8ede1627d..f83cdc461 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -84,21 +84,6 @@ html {
 	display: none;
 }
 
-/*adding the classes for handling the overflow of url and name for monitors in one place*/
-.monitor-url-text {
-	max-width: 70vh;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.monitor-name-text {
-	max-width: 70vh;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
 @keyframes ripple {
 	from {
 		opacity: 1;

From 3886617b11e0ae41e801f63c7ef177c98d362b06 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sun, 8 Jun 2025 17:32:45 +0530
Subject: [PATCH 039/319] Fix formatted the files.

---
 client/src/Pages/Settings/index.jsx      | 4 ++--
 client/src/Pages/Uptime/Create/index.jsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index f7271e6db..dd0135edb 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -205,7 +205,7 @@ const Settings = () => {
 					bottom: 0,
 					boxShadow: theme.shape.boxShadow,
 					zIndex: 1000,
-					mt : 3,
+					mt: 3,
 					backgroundColor: theme.palette.primary.main,
 					display: "flex",
 					justifyContent: "flex-end",
@@ -216,7 +216,7 @@ const Settings = () => {
 					border: 1,
 					borderStyle: "solid",
 					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.spacing(2)
+					borderRadius: theme.spacing(2),
 				}}
 			>
 				<Button
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index cd81d1cad..6e45230f6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
 						>
 							{t("settingsGeneralSettings")}
 						</Typography>
-						<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
+						<Typography component="p">
+							{t(`uptimeGeneralInstructions.${monitor.type}`)}
+						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput

From d0dbc7558702d4afd0c150088c42320d8b1c6d25 Mon Sep 17 00:00:00 2001
From: Shivansh-22866 <shivanshp0418@gmail.com>
Date: Sun, 8 Jun 2025 19:27:33 +0530
Subject: [PATCH 040/319] Remove future email features from Page Speed
 configure

---
 client/src/Pages/PageSpeed/Configure/index.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index d81387e1b..79a9fb3dd 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -366,14 +366,14 @@ const PageSpeedConfigure = () => {
 							</Box>
 							<Stack gap={theme.spacing(6)}>
 								<Typography component="p">{t("whenNewIncident")}</Typography>
-								<Checkbox
+								{/* <Checkbox
 									id="notify-sms"
 									label={t("notifySMS")}
 									isChecked={false}
 									value=""
 									onChange={() => logger.warn("disabled")}
 									isDisabled={true}
-								/>
+								/> */}
 								<Checkbox
 									id="notify-email-default"
 									label={`Notify via email (to ${user.email})`}
@@ -385,14 +385,14 @@ const PageSpeedConfigure = () => {
 									value={user?.email}
 									onChange={(event) => handleChange(event)}
 								/>
-								<Checkbox
+								{/* <Checkbox
 									id="notify-email"
 									label={t("notifyEmails")}
 									isChecked={false}
 									value=""
 									onChange={() => logger.warn("disabled")}
 									isDisabled={true}
-								/>
+								/> */}
 								{monitor?.notifications?.some(
 									(notification) => notification.type === "emails"
 								) ? (

From 5e2fa7a8f0a9c4b045c43e33c041228b3c87e59e Mon Sep 17 00:00:00 2001
From: varunrmantri23 <varunrmantri23@gmail.com>
Date: Sun, 8 Jun 2025 23:12:48 +0530
Subject: [PATCH 041/319] fix: add global Typography variants for monitor text
 truncation

---
 .../MonitorDetailsControlHeader/status.jsx    | 24 ++-------------
 .../Components/MonitorStatusHeader/index.jsx  | 22 ++------------
 .../src/Pages/PageSpeed/Configure/index.jsx   | 16 ++--------
 .../Monitors/Components/Card/index.jsx        |  2 +-
 client/src/Pages/Uptime/Configure/index.jsx   | 16 ++--------
 client/src/Utils/Theme/globalTheme.js         | 29 +++++++++++++++++++
 6 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 392779f4a..3d6e62c60 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -27,34 +27,14 @@ const Status = ({ monitor }) => {
 
 	return (
 		<Stack>
-			<Typography
-				variant="h1"
-				sx={{
-					maxWidth: "45vw",
-					overflow: "hidden",
-					textOverflow: "ellipsis",
-					whiteSpace: "nowrap",
-				}}
-			>
-				{monitor?.name}
-			</Typography>
+			<Typography variant="monitorName">{monitor?.name}</Typography>
 			<Stack
 				direction="row"
 				alignItems={"center"}
 				gap={theme.spacing(4)}
 			>
 				<PulseDot color={statusColor[determineState(monitor)]} />
-				<Typography
-					variant="h2"
-					sx={{
-						fontFamily: "monospace",
-						fontWeight: "bolder",
-						maxWidth: "60vw",
-						overflow: "hidden",
-						textOverflow: "ellipsis",
-						whiteSpace: "nowrap",
-					}}
-				>
+				<Typography variant="monitorUrl">
 					{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 				</Typography>
 				<Dot />
diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index c7ae57c0b..14ae39b8a 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -21,17 +21,7 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 			justifyContent="space-between"
 		>
 			<Stack>
-				<Typography
-					variant="h1"
-					sx={{
-						maxWidth: "60vw",
-						overflow: "hidden",
-						textOverflow: "ellipsis",
-						whiteSpace: "nowrap",
-					}}
-				>
-					{monitor?.name}
-				</Typography>
+				<Typography variant="monitorName">{monitor?.name}</Typography>
 				<Stack
 					direction="row"
 					alignItems={"center"}
@@ -40,15 +30,7 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 					<PulseDot color={statusColor[determineState(monitor)]} />
 					<Typography
 						component="h2"
-						variant="h2"
-						sx={{
-							fontFamily: "monospace",
-							fontWeight: "bolder",
-							maxWidth: "60vw",
-							overflow: "hidden",
-							textOverflow: "ellipsis",
-							whiteSpace: "nowrap",
-						}}
+						variant="monitorUrl"
 					>
 						{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
 					</Typography>
diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index 2ac6d27c0..19112314b 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -202,13 +202,7 @@ const PageSpeedConfigure = () => {
 							<Box>
 								<Typography
 									component="h1"
-									variant="h1"
-									sx={{
-										maxWidth: "60vw",
-										overflow: "hidden",
-										textOverflow: "ellipsis",
-										whiteSpace: "nowrap",
-									}}
+									variant="monitorName"
 								>
 									{monitor.name}
 								</Typography>
@@ -240,13 +234,7 @@ const PageSpeedConfigure = () => {
 									</Tooltip>
 									<Typography
 										component="h2"
-										variant="h2"
-										sx={{
-											maxWidth: "60vw",
-											overflow: "hidden",
-											textOverflow: "ellipsis",
-											whiteSpace: "nowrap",
-										}}
+										variant="monitorUrl"
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
index 36bf91eee..8c83f102a 100644
--- a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
@@ -245,7 +245,7 @@ const Card = ({ monitor }) => {
 				</IconBox>
 				<Typography
 					component="h2"
-					variant="h2"
+					variant="monitorUrl"
 					fontWeight={500}
 					alignSelf="center"
 				>
diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 16eb37492..f75e53e84 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -248,13 +248,7 @@ const Configure = () => {
 							<Box>
 								<Typography
 									component="h1"
-									variant="h1"
-									sx={{
-										maxWidth: "60vw",
-										overflow: "hidden",
-										textOverflow: "ellipsis",
-										whiteSpace: "nowrap",
-									}}
+									variant="monitorName"
 								>
 									{monitor.name}
 								</Typography>
@@ -286,13 +280,7 @@ const Configure = () => {
 									</Tooltip>
 									<Typography
 										component="h2"
-										variant="h2"
-										sx={{
-											maxWidth: "60vw",
-											overflow: "hidden",
-											textOverflow: "ellipsis",
-											whiteSpace: "nowrap",
-										}}
+										variant="monitorUrl"
 									>
 										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
 									</Typography>
diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 631f056dd..59c26866a 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -632,6 +632,35 @@ const baseTheme = (palette) => ({
 				}),
 			},
 		},
+		MuiTypography: {
+			variants: [
+				{
+					props: { variant: "monitorName" },
+					style: {
+						fontSize: typographyLevels.xl,
+						color: palette.primary.contrastText,
+						fontWeight: 500,
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						whiteSpace: "nowrap",
+						maxWidth: "calc((100vw - var(--env-var-width-2)) / 2)",
+					},
+				},
+				{
+					props: { variant: "monitorUrl" },
+					style: {
+						fontSize: typographyLevels.l,
+						color: palette.primary.contrastTextSecondary,
+						fontWeight: "bolder",
+						fontFamily: "monospace",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						whiteSpace: "nowrap",
+						maxWidth: "calc((100vw - var(--env-var-width-2)) / 2)",
+					},
+				},
+			],
+		},
 	},
 	shape: {
 		borderRadius: 2,

From 8412e0f17fe58c663fbaefcdb19b327fe131e06b Mon Sep 17 00:00:00 2001
From: Shivansh-22866 <shivanshp0418@gmail.com>
Date: Sun, 8 Jun 2025 23:20:48 +0530
Subject: [PATCH 042/319] Add comments

---
 client/src/Pages/PageSpeed/Configure/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index 79a9fb3dd..c20b4daf4 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -366,6 +366,7 @@ const PageSpeedConfigure = () => {
 							</Box>
 							<Stack gap={theme.spacing(6)}>
 								<Typography component="p">{t("whenNewIncident")}</Typography>
+								{/* Future Feature: Notify via SMS */}
 								{/* <Checkbox
 									id="notify-sms"
 									label={t("notifySMS")}
@@ -385,6 +386,7 @@ const PageSpeedConfigure = () => {
 									value={user?.email}
 									onChange={(event) => handleChange(event)}
 								/>
+								{/* Future Feature: Notify via Email */}
 								{/* <Checkbox
 									id="notify-email"
 									label={t("notifyEmails")}

From 274595a5339c02dc0f6587915c8bb35da422fcde Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 10:17:09 +0800
Subject: [PATCH 043/319] purge distributed uptime

---
 client/src/Components/Sidebar/index.jsx       |  18 +-
 client/src/Hooks/useFetchDepinStatusPage.js   |  58 ---
 .../src/Hooks/useSubscribeToDepinDetails.js   |  96 -----
 .../src/Hooks/useSubscribeToDepinMonitors.js  |  95 -----
 .../useCreateDistributedUptimeMonitor.jsx     |  31 --
 .../Create/Hooks/useMonitorFetch.jsx          |  31 --
 .../Pages/DistributedUptime/Create/index.jsx  | 349 ------------------
 .../Details/Components/Chatbot/index.jsx      |  50 ---
 .../Components/ControlsHeader/index.jsx       |  92 -----
 .../Details/Components/DeviceTicker/index.jsx |  98 -----
 .../DistributedUptimeMapStyle.json            | 169 ---------
 .../DistributedUptimeMap/buildStyle.js        |  33 --
 .../Components/DistributedUptimeMap/index.jsx | 118 ------
 .../Area/index.jsx                            |  95 -----
 .../Bar/index.jsx                             |  95 -----
 .../Helpers/Tick.jsx                          |  31 --
 .../Helpers/ToolTip.jsx                       |  89 -----
 .../DistributedUptimeResponseChart/index.jsx  |  53 ---
 .../Details/Components/Footer/index.jsx       |  34 --
 .../Details/Components/LastUpdate/index.jsx   |  15 -
 .../Components/MonitorHeader/index.jsx        |  23 --
 .../Components/NextExpectedCheck/index.jsx    |  30 --
 .../Details/Components/Skeleton/index.jsx     |  14 -
 .../Details/Components/StatBoxes/index.jsx    |  60 ---
 .../Details/Components/StatusHeader/index.jsx |  94 -----
 .../Details/Hooks/useDeleteMonitor.jsx        |  25 --
 .../Pages/DistributedUptime/Details/index.jsx | 148 --------
 .../Components/MonitorTable/index.jsx         |  93 -----
 .../Monitors/Components/Skeleton/index.jsx    |  14 -
 .../DistributedUptime/Monitors/index.jsx      | 102 -----
 .../Components/VisuallyHiddenInput/index.jsx  |  22 --
 .../DistributedUptimeStatus/Create/index.jsx  | 322 ----------------
 .../Status/Components/MonitorsList/index.jsx  |  66 ----
 .../Status/Components/Skeleton/index.jsx      |  14 -
 .../Components/TimeframeHeader/index.jsx      |  42 ---
 .../DistributedUptimeStatus/Status/index.jsx  | 319 ----------------
 .../Components/ControlsHeader/index.jsx       |   6 -
 .../Components/StatusPagesTable/index.jsx     |  11 +-
 client/src/Routes/index.jsx                   |  73 ----
 client/src/Utils/NetworkService.js            | 151 +-------
 client/src/Validation/validation.js           |   2 +-
 client/src/locales/en.json                    |   9 -
 client/src/locales/pt-BR.json                 |   1 -
 client/src/locales/ru.json                    |   5 -
 server/controllers/diagnosticController.js    |  14 -
 .../distributedUptimeController.js            | 339 -----------------
 server/controllers/monitorController.js       |  12 +-
 server/controllers/statusPageController.js    |  23 --
 server/db/models/DistributedUptimeCheck.js    | 137 -------
 server/db/models/Monitor.js                   |  11 +-
 server/db/models/StatusPage.js                |   2 +-
 server/db/mongo/MongoDB.js                    |   6 -
 server/db/mongo/modules/checkModule.js        |  10 +-
 server/db/mongo/modules/diagnosticModule.js   |  50 +--
 .../mongo/modules/distributedCheckModule.js   | 156 --------
 server/db/mongo/modules/monitorModule.js      |  68 ----
 .../db/mongo/modules/monitorModuleQueries.js  |  32 --
 server/db/mongo/modules/statusPageModule.js   | 100 -----
 server/db/mongo/utils/seedDb.js               | 102 -----
 server/index.js                               |  15 +-
 server/routes/diagnosticRoute.js              |   5 -
 server/routes/distributedUptimeRoute.js       |  44 ---
 server/routes/statusPageRoute.js              |   4 -
 server/service/JobQueue/JobQueue.js           |   3 +-
 server/service/JobQueue/JobQueueHelper.js     |   7 -
 server/service/PulseQueue/PulseQueueHelper.js |   4 -
 server/service/bufferService.js               |   3 -
 server/service/networkService.js              |  34 --
 server/service/statusService.js               |  17 -
 server/validation/joi.js                      |  17 +-
 70 files changed, 17 insertions(+), 4494 deletions(-)
 delete mode 100644 client/src/Hooks/useFetchDepinStatusPage.js
 delete mode 100644 client/src/Hooks/useSubscribeToDepinDetails.js
 delete mode 100644 client/src/Hooks/useSubscribeToDepinMonitors.js
 delete mode 100644 client/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Create/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/Chatbot/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/ControlsHeader/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/DistributedUptimeMapStyle.json
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/buildStyle.js
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/Tick.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/Footer/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/LastUpdate/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/MonitorHeader/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/NextExpectedCheck/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/Skeleton/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Details/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Monitors/Components/MonitorTable/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Monitors/Components/Skeleton/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptime/Monitors/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Create/Components/VisuallyHiddenInput/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Create/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Status/Components/MonitorsList/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Status/Components/Skeleton/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Status/Components/TimeframeHeader/index.jsx
 delete mode 100644 client/src/Pages/DistributedUptimeStatus/Status/index.jsx
 delete mode 100755 server/controllers/distributedUptimeController.js
 delete mode 100755 server/db/models/DistributedUptimeCheck.js
 delete mode 100755 server/db/mongo/modules/distributedCheckModule.js
 delete mode 100755 server/routes/distributedUptimeRoute.js

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index f78ac62f0..6073f428d 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -23,7 +23,6 @@ import UserSvg from "../../assets/icons/user.svg?react";
 import TeamSvg from "../../assets/icons/user-two.svg?react";
 import LogoutSvg from "../../assets/icons/logout.svg?react";
 import Support from "../../assets/icons/support.svg?react";
-import Account from "../../assets/icons/user-edit.svg?react";
 import Maintenance from "../../assets/icons/maintenance.svg?react";
 import Monitors from "../../assets/icons/monitors.svg?react";
 import Incidents from "../../assets/icons/incidents.svg?react";
@@ -37,10 +36,8 @@ import ArrowLeft from "../../assets/icons/left-arrow.svg?react";
 import DotsVertical from "../../assets/icons/dots-vertical.svg?react";
 import ChangeLog from "../../assets/icons/changeLog.svg?react";
 import Docs from "../../assets/icons/docs.svg?react";
-import Folder from "../../assets/icons/folder.svg?react";
 import StatusPages from "../../assets/icons/status-pages.svg?react";
 import Discussions from "../../assets/icons/discussions.svg?react";
-import DistributedUptimeIcon from "../../assets/icons/distributed-uptime.svg?react";
 import "./index.css";
 
 // Utils
@@ -56,11 +53,7 @@ const getMenu = (t) => [
 	{ name: t("menu.uptime"), path: "uptime", icon: <Monitors /> },
 	{ name: t("menu.pagespeed"), path: "pagespeed", icon: <PageSpeed /> },
 	{ name: t("menu.infrastructure"), path: "infrastructure", icon: <Integrations /> },
-	{
-		name: t("menu.distributedUptime"),
-		path: "distributed-uptime",
-		icon: <DistributedUptimeIcon />,
-	},
+
 	{ name: t("menu.incidents"), path: "incidents", icon: <Incidents /> },
 
 	{ name: t("menu.statusPages"), path: "status", icon: <StatusPages /> },
@@ -95,14 +88,13 @@ const URL_MAP = {
 	support: "https://discord.com/invite/NAb6H3UTjK",
 	discussions: "https://github.com/bluewave-labs/checkmate/discussions",
 	docs: "https://bluewavelabs.gitbook.io/checkmate",
-	changelog: "https://github.com/bluewave-labs/bluewave-uptime/releases",
+	changelog: "https://github.com/bluewave-labs/checkmate/releases",
 };
 
 const PATH_MAP = {
 	monitors: "Dashboard",
 	pagespeed: "Dashboard",
 	infrastructure: "Dashboard",
-	["distributed-uptime"]: "Dashboard",
 	account: "Account",
 	settings: "Settings",
 };
@@ -375,12 +367,6 @@ function Sidebar() {
 					}}
 				>
 					{menu.map((item) => {
-						if (
-							item.path === "distributed-uptime" &&
-							distributedUptimeEnabled === false
-						) {
-							return null;
-						}
 						return item.path ? (
 							/* If item has a path */
 							<Tooltip
diff --git a/client/src/Hooks/useFetchDepinStatusPage.js b/client/src/Hooks/useFetchDepinStatusPage.js
deleted file mode 100644
index cb436d6d6..000000000
--- a/client/src/Hooks/useFetchDepinStatusPage.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useState, useEffect } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-import { useSelector } from "react-redux";
-import { useTheme } from "@emotion/react";
-import { useMonitorUtils } from "./useMonitorUtils";
-
-const useFetchDepinStatusPage = ({ url, timeFrame, isCreate = false }) => {
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	const [statusPage, setStatusPage] = useState(undefined);
-	const [monitorId, setMonitorId] = useState(undefined);
-	const [isPublished, setIsPublished] = useState(false);
-	const { authToken } = useSelector((state) => state.auth);
-	const theme = useTheme();
-	const { getMonitorWithPercentage } = useMonitorUtils();
-
-	useEffect(() => {
-		if (isCreate) return;
-		const fetchStatusPageByUrl = async () => {
-			try {
-				const response = await networkService.getDistributedStatusPageByUrl({
-					authToken,
-					url,
-					type: "distributed",
-					timeFrame,
-				});
-				if (!response?.data?.data) return;
-				const statusPage = response.data.data;
-
-				const monitorsWithPercentage = statusPage?.subMonitors.map((monitor) =>
-					getMonitorWithPercentage(monitor, theme)
-				);
-
-				const statusPageWithSubmonitorPercentages = {
-					...statusPage,
-					subMonitors: monitorsWithPercentage,
-				};
-				setStatusPage(statusPageWithSubmonitorPercentages);
-
-				setMonitorId(statusPage?.monitors[0]);
-				setIsPublished(statusPage?.isPublished);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchStatusPageByUrl();
-	}, [authToken, url, getMonitorWithPercentage, theme, timeFrame, isCreate]);
-
-	return [isLoading, networkError, statusPage, monitorId, isPublished];
-};
-
-export { useFetchDepinStatusPage };
diff --git a/client/src/Hooks/useSubscribeToDepinDetails.js b/client/src/Hooks/useSubscribeToDepinDetails.js
deleted file mode 100644
index 0e8c2744f..000000000
--- a/client/src/Hooks/useSubscribeToDepinDetails.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import { useState, useEffect } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-
-const useSubscribeToDepinDetails = ({ monitorId, isPublic, isPublished, dateRange }) => {
-	const [isLoading, setIsLoading] = useState(true);
-	const [connectionStatus, setConnectionStatus] = useState(undefined);
-	const [retryCount, setRetryCount] = useState(0);
-	const [networkError, setNetworkError] = useState(false);
-	const [monitor, setMonitor] = useState(undefined);
-	const [lastUpdateTrigger, setLastUpdateTrigger] = useState(0);
-
-	useEffect(() => {
-		if (typeof monitorId === "undefined") {
-			return;
-		}
-		// If this page is public and not published, don't subscribe to details
-		if (isPublic && isPublished === false) {
-			return;
-		}
-
-		// Get initial data
-
-		const fetchInitialData = async () => {
-			try {
-				const res = await networkService.getDistributedUptimeDetails({
-					monitorId,
-					dateRange: dateRange,
-					normalize: true,
-					isPublic,
-				});
-				const responseData = res?.data?.data;
-
-				if (typeof responseData === "undefined") {
-					throw new Error("No data");
-				}
-				setConnectionStatus("up");
-				setLastUpdateTrigger(Date.now());
-				setMonitor(responseData);
-			} catch (error) {
-				setNetworkError(true);
-				setConnectionStatus("down");
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchInitialData();
-
-		try {
-			const cleanup = networkService.subscribeToDistributedUptimeDetails({
-				monitorId,
-				dateRange: dateRange,
-				normalize: true,
-				onUpdate: (data) => {
-					if (isLoading === true) {
-						setIsLoading(false);
-					}
-					if (networkError === true) {
-						setNetworkError(false);
-					}
-					setLastUpdateTrigger(Date.now());
-					setMonitor(data.monitor);
-				},
-				onOpen: () => {
-					setConnectionStatus("up");
-					setRetryCount(0); // Reset retry count on successful connection
-				},
-				onError: () => {
-					setIsLoading(false);
-					setNetworkError(true);
-					setConnectionStatus("down");
-				},
-			});
-			return cleanup;
-		} catch (error) {
-			setNetworkError(true);
-		}
-	}, [
-		dateRange,
-		monitorId,
-		retryCount,
-		setConnectionStatus,
-		networkError,
-		isLoading,
-		isPublic,
-		isPublished,
-	]);
-
-	return [isLoading, networkError, connectionStatus, monitor, lastUpdateTrigger];
-};
-
-export { useSubscribeToDepinDetails };
diff --git a/client/src/Hooks/useSubscribeToDepinMonitors.js b/client/src/Hooks/useSubscribeToDepinMonitors.js
deleted file mode 100644
index 918ead6bc..000000000
--- a/client/src/Hooks/useSubscribeToDepinMonitors.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../main";
-import { useSelector } from "react-redux";
-import { useTheme } from "@emotion/react";
-import { useMonitorUtils } from "./useMonitorUtils";
-import { createToast } from "../Utils/toastUtils";
-
-const useSubscribeToDepinMonitors = (page, rowsPerPage) => {
-	// Redux
-	const { user } = useSelector((state) => state.auth);
-
-	// Local state
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	const [count, setCount] = useState(undefined);
-	const [monitors, setMonitors] = useState(undefined);
-
-	const theme = useTheme();
-	const { getMonitorWithPercentage } = useMonitorUtils();
-
-	useEffect(() => {
-		const fetchInitialData = async () => {
-			try {
-				const initialDataRes = await networkService.getDistributedUptimeMonitors({
-					teamId: user.teamId,
-					limit: 25,
-					types: ["distributed_http"],
-					page,
-					rowsPerPage,
-				});
-
-				const { count, monitors } = initialDataRes?.data?.data ?? {};
-				const responseData = initialDataRes?.data?.data;
-				if (typeof responseData === "undefined") throw new Error("No data");
-
-				const mappedMonitors = monitors?.map((monitor) =>
-					getMonitorWithPercentage(monitor, theme)
-				);
-
-				setMonitors(mappedMonitors);
-				setCount(count?.monitorsCount ?? 0);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchInitialData();
-
-		try {
-			const cleanup = networkService.subscribeToDistributedUptimeMonitors({
-				teamId: user.teamId,
-				limit: 25,
-				types: [
-					typeof import.meta.env.VITE_DEPIN_TESTING === "undefined"
-						? "distributed_http"
-						: "distributed_test",
-				],
-				page,
-				rowsPerPage,
-				filter: null,
-				field: null,
-				order: null,
-				onUpdate: (data) => {
-					if (isLoading === true) {
-						setIsLoading(false);
-					}
-					const { count, monitors } = data;
-					const mappedMonitors = monitors.map((monitor) =>
-						getMonitorWithPercentage(monitor, theme)
-					);
-					setMonitors(mappedMonitors);
-					setCount(count?.monitorsCount ?? 0);
-				},
-				onError: () => {
-					setIsLoading(false);
-					setNetworkError(true);
-				},
-			});
-
-			return cleanup;
-		} catch (error) {
-			createToast({
-				body: error.message,
-			});
-			setNetworkError(true);
-		}
-	}, [user, getMonitorWithPercentage, theme, isLoading, page, rowsPerPage]);
-	return [monitors, count, isLoading, networkError];
-};
-export { useSubscribeToDepinMonitors };
diff --git a/client/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx b/client/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx
deleted file mode 100644
index b2634e9a7..000000000
--- a/client/src/Pages/DistributedUptime/Create/Hooks/useCreateDistributedUptimeMonitor.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useState } from "react";
-import { networkService } from "../../../../main";
-import { useSelector } from "react-redux";
-import { createToast } from "../../../../Utils/toastUtils";
-
-const useCreateDistributedUptimeMonitor = ({ isCreate, monitorId }) => {
-	const [isLoading, setIsLoading] = useState(false);
-	const [networkError, setNetworkError] = useState(false);
-	const createDistributedUptimeMonitor = async ({ form }) => {
-		setIsLoading(true);
-		try {
-			if (isCreate) {
-				await networkService.createMonitor({ monitor: form });
-			} else {
-				await networkService.updateMonitor({ monitor: form, monitorId });
-			}
-
-			return true;
-		} catch (error) {
-			setNetworkError(true);
-			createToast({ body: error?.response?.data?.msg ?? error.message });
-			return false;
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return [createDistributedUptimeMonitor, isLoading, networkError];
-};
-
-export { useCreateDistributedUptimeMonitor };
diff --git a/client/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx b/client/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx
deleted file mode 100644
index efffbe437..000000000
--- a/client/src/Pages/DistributedUptime/Create/Hooks/useMonitorFetch.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-
-export const useMonitorFetch = ({ monitorId, isCreate }) => {
-	const [networkError, setNetworkError] = useState(false);
-	const [isLoading, setIsLoading] = useState(true);
-	const [monitor, setMonitor] = useState(undefined);
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				if (isCreate) return;
-				const res = await networkService.getUptimeDetailsById({
-					monitorId: monitorId,
-					normalize: true,
-				});
-				setMonitor(res?.data?.data ?? {});
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [monitorId, isCreate]);
-	return [monitor, isLoading, networkError];
-};
-
-export default useMonitorFetch;
diff --git a/client/src/Pages/DistributedUptime/Create/index.jsx b/client/src/Pages/DistributedUptime/Create/index.jsx
deleted file mode 100644
index aff2a7d22..000000000
--- a/client/src/Pages/DistributedUptime/Create/index.jsx
+++ /dev/null
@@ -1,349 +0,0 @@
-// Components
-import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
-
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import ConfigBox from "../../../Components/ConfigBox";
-import TextInput from "../../../Components/Inputs/TextInput";
-import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
-import Radio from "../../../Components/Inputs/Radio";
-import Checkbox from "../../../Components/Inputs/Checkbox";
-import Select from "../../../Components/Inputs/Select";
-import { createToast } from "../../../Utils/toastUtils";
-
-// Utility
-import { useTheme } from "@emotion/react";
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import { useSelector } from "react-redux";
-import { monitorValidation } from "../../../Validation/validation";
-import { useParams } from "react-router-dom";
-import { useCreateDistributedUptimeMonitor } from "./Hooks/useCreateDistributedUptimeMonitor";
-import { useMonitorFetch } from "./Hooks/useMonitorFetch";
-import { useTranslation } from "react-i18next";
-
-// Constants
-const MS_PER_MINUTE = 60000;
-const SELECT_VALUES = [
-	{ _id: 1, name: "1 minute" },
-	{ _id: 2, name: "2 minutes" },
-	{ _id: 3, name: "3 minutes" },
-	{ _id: 4, name: "4 minutes" },
-	{ _id: 5, name: "5 minutes" },
-];
-
-const parseUrl = (url) => {
-	try {
-		return new URL(url);
-	} catch (error) {
-		return null;
-	}
-};
-
-const CreateDistributedUptime = () => {
-	const { monitorId } = useParams();
-	const isCreate = typeof monitorId === "undefined";
-	const { t } = useTranslation();
-
-	let BREADCRUMBS = [
-		{ name: `distributed uptime`, path: "/distributed-uptime" },
-		...(isCreate ? [] : [{ name: "details", path: `/distributed-uptime/${monitorId}` }]),
-		{ name: isCreate ? "create" : "configure", path: `` },
-	];
-
-	// Redux state
-	const { user } = useSelector((state) => state.auth);
-
-	// Local state
-	const [https, setHttps] = useState(true);
-	const [notifications, setNotifications] = useState([]);
-	const [form, setForm] = useState({
-		type: "distributed_http",
-		name: "",
-		url: "",
-		interval: 1,
-	});
-	const [errors, setErrors] = useState({});
-
-	//utils
-	const theme = useTheme();
-	const navigate = useNavigate();
-	const [createDistributedUptimeMonitor, isLoading, networkError] =
-		useCreateDistributedUptimeMonitor({ isCreate, monitorId });
-
-	const [monitor, monitorIsLoading, monitorNetworkError] = useMonitorFetch({
-		monitorId,
-		isCreate,
-	});
-
-	// Effect to set monitor to fetched monitor
-	useEffect(() => {
-		if (typeof monitor !== "undefined") {
-			const parsedUrl = parseUrl(monitor?.url);
-			const protocol = parsedUrl?.protocol?.replace(":", "") || "";
-			setHttps(protocol === "https");
-
-			const newForm = {
-				name: monitor.name,
-				interval: monitor.interval / MS_PER_MINUTE,
-				url: parsedUrl.host,
-				type: monitor.type,
-			};
-
-			setForm(newForm);
-		}
-	}, [monitor]);
-
-	// Handlers
-	const handleCreateMonitor = async () => {
-		const monitorToSubmit = { ...form };
-
-		// Prepend protocol to url
-		monitorToSubmit.url = `http${https ? "s" : ""}://` + monitorToSubmit.url;
-
-		const { error } = monitorValidation.validate(monitorToSubmit, {
-			abortEarly: false,
-		});
-		if (error) {
-			const newErrors = {};
-			error.details.forEach((err) => {
-				newErrors[err.path[0]] = err.message;
-			});
-			setErrors(newErrors);
-			createToast({ body: "Please check the form for errors." });
-			return;
-		}
-
-		// Append needed fields
-		monitorToSubmit.description = form.name;
-		monitorToSubmit.interval = form.interval * MS_PER_MINUTE;
-		monitorToSubmit.teamId = user.teamId;
-		monitorToSubmit.userId = user._id;
-		monitorToSubmit.notifications = notifications;
-
-		const success = await createDistributedUptimeMonitor({ form: monitorToSubmit });
-		if (success) {
-			createToast({ body: "Monitor created successfully!" });
-			navigate("/distributed-uptime");
-		} else {
-			createToast({ body: "Failed to create monitor." });
-		}
-	};
-
-	const handleChange = (event) => {
-		let { name, value } = event.target;
-
-		setForm({
-			...form,
-			[name]: value,
-		});
-		const { error } = monitorValidation.validate(
-			{ [name]: value },
-			{ abortEarly: false }
-		);
-		setErrors((prev) => ({
-			...prev,
-			...(error ? { [name]: error.details[0].message } : { [name]: undefined }),
-		}));
-	};
-
-	const handleNotifications = (event, type) => {
-		const { value } = event.target;
-		let currentNotifications = [...notifications];
-		const notificationAlreadyExists = notifications.some((notification) => {
-			if (notification.type === type && notification.address === value) {
-				return true;
-			}
-			return false;
-		});
-		if (notificationAlreadyExists) {
-			currentNotifications = currentNotifications.filter((notification) => {
-				if (notification.type === type && notification.address === value) {
-					return false;
-				}
-				return true;
-			});
-		} else {
-			currentNotifications.push({ type, address: value });
-		}
-		setNotifications(currentNotifications);
-	};
-
-	return (
-		<Box>
-			<Breadcrumbs list={BREADCRUMBS} />
-			<Stack
-				component="form"
-				gap={theme.spacing(12)}
-				mt={theme.spacing(6)}
-				onSubmit={() => console.log("submit")}
-			>
-				<Typography
-					component="h1"
-					variant="h1"
-				>
-					<Typography
-						component="span"
-						fontSize="inherit"
-					>
-						{isCreate ? "Create your" : "Edit your"}{" "}
-					</Typography>
-					<Typography
-						component="span"
-						variant="h2"
-						fontSize="inherit"
-						fontWeight="inherit"
-					>
-						{t("monitor")}
-					</Typography>
-				</Typography>
-				<ConfigBox>
-					<Box>
-						<Typography component="h2">{t("settingsGeneralSettings")}</Typography>
-						<Typography component="p">{t("distributedUptimeCreateSelectURL")}</Typography>
-					</Box>
-					<Stack gap={theme.spacing(15)}>
-						<TextInput
-							type={"url"}
-							id="monitor-url"
-							startAdornment={<HttpAdornment https={https} />}
-							label="URL to monitor"
-							https={https}
-							placeholder={"www.google.com"}
-							disabled={!isCreate}
-							value={form.url}
-							name="url"
-							onChange={handleChange}
-							error={errors["url"] ? true : false}
-							helperText={errors["url"]}
-						/>
-						<TextInput
-							type="text"
-							id="monitor-name"
-							label="Display name"
-							isOptional={true}
-							placeholder={"Google"}
-							value={form.name}
-							name="name"
-							onChange={handleChange}
-							error={errors["name"] ? true : false}
-							helperText={errors["name"]}
-						/>
-					</Stack>
-				</ConfigBox>
-				<ConfigBox>
-					<Box>
-						<Typography component="h2">{t("distributedUptimeCreateChecks")}</Typography>
-						<Typography component="p">
-							{t("distributedUptimeCreateChecksDescription")}
-						</Typography>
-					</Box>
-					<Stack gap={theme.spacing(12)}>
-						<Stack gap={theme.spacing(6)}>
-							<Radio
-								id="monitor-checks-http"
-								title="Website monitoring"
-								desc="Use HTTP(s) to monitor your website or API endpoint."
-								size="small"
-								value="http"
-								name="type"
-								checked={true}
-								onChange={handleChange}
-							/>
-							{form.type === "http" || form.type === "distributed_http" ? (
-								<ButtonGroup
-									disabled={!isCreate}
-									sx={{ ml: theme.spacing(16) }}
-								>
-									<Button
-										variant="group"
-										filled={https.toString()}
-										onClick={() => setHttps(true)}
-									>
-										{t("https")}
-									</Button>
-									<Button
-										variant="group"
-										filled={(!https).toString()}
-										onClick={() => setHttps(false)}
-									>
-										{t("http")}
-									</Button>
-								</ButtonGroup>
-							) : (
-								""
-							)}
-						</Stack>
-
-						{errors["type"] ? (
-							<Box className="error-container">
-								<Typography
-									component="p"
-									className="input-error"
-									color={theme.palette.error.contrastText}
-								>
-									{errors["type"]}
-								</Typography>
-							</Box>
-						) : (
-							""
-						)}
-					</Stack>
-				</ConfigBox>
-				<ConfigBox>
-					<Box>
-						<Typography component="h2">
-							{t("distributedUptimeCreateIncidentNotification")}
-						</Typography>
-						<Typography component="p">
-							{t("distributedUptimeCreateIncidentDescription")}
-						</Typography>
-					</Box>
-					<Stack gap={theme.spacing(6)}>
-						<Checkbox
-							id="notify-email-default"
-							label={`Notify via email (to ${user.email})`}
-							isChecked={notifications.some(
-								(notification) => notification.type === "email"
-							)}
-							value={user?.email}
-							onChange={(event) => handleNotifications(event, "email")}
-						/>
-					</Stack>
-				</ConfigBox>
-				<ConfigBox>
-					<Box>
-						<Typography component="h2">
-							{t("distributedUptimeCreateAdvancedSettings")}
-						</Typography>
-					</Box>
-					<Stack gap={theme.spacing(12)}>
-						<Select
-							id="monitor-interval"
-							label="Check frequency"
-							name="interval"
-							value={form.interval}
-							onChange={handleChange}
-							items={SELECT_VALUES}
-						/>
-					</Stack>
-				</ConfigBox>
-				<Stack
-					direction="row"
-					justifyContent="flex-end"
-				>
-					<Button
-						variant="contained"
-						color="accent"
-						onClick={() => handleCreateMonitor()}
-						disabled={!Object.values(errors).every((value) => value === undefined)}
-						loading={isLoading}
-					>
-						{isCreate ? "Create monitor" : "Configure monitor"}
-					</Button>
-				</Stack>
-			</Stack>
-		</Box>
-	);
-};
-
-export default CreateDistributedUptime;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/Chatbot/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/Chatbot/index.jsx
deleted file mode 100644
index 05f631d95..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/Chatbot/index.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-// Components
-import { Stack, Typography } from "@mui/material";
-import { ColContainer } from "../../../../../Components/StandardContainer";
-import SmartToyIcon from "@mui/icons-material/SmartToy";
-import Dot from "../../../../../Components/Dot";
-// Utils
-import { useTheme } from "@emotion/react";
-import { useTranslation } from "react-i18next";
-
-const MESSAGES = [
-	"I've checked the network status, and we're seeing excellent performance across all regions.",
-	"The network is stable and functioning optimally. All connections are active and stable.",
-	"I've reviewed the network status, and everything looks great. No issues detected.",
-	"The network is up and running smoothly. All connections are active and stable.",
-	"I've checked the network status, and everything is looking good. No issues detected.",
-];
-
-const ChatBot = ({ sx }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<ColContainer
-			backgroundColor={theme.palette.chatbot.background}
-			sx={{ ...sx }}
-		>
-			<Stack
-				direction="row"
-				alignItems="center"
-				gap={theme.spacing(4)}
-			>
-				<SmartToyIcon sx={{ color: theme.palette.chatbot.textAccent }} />
-				<Typography color={theme.palette.chatbot.textAccent}>Status Bot</Typography>
-				<Dot
-					color={theme.palette.chatbot.textAccent}
-					style={{ opacity: 0.4 }}
-				/>
-				<Typography
-					variant="body2"
-					color={theme.palette.chatbot.textAccent}
-					sx={{ opacity: 0.4 }}
-				>
-					{t("now")}
-				</Typography>
-			</Stack>
-			<Typography>{MESSAGES[Math.floor(Math.random() * MESSAGES.length)]}</Typography>
-		</ColContainer>
-	);
-};
-
-export default ChatBot;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/ControlsHeader/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/ControlsHeader/index.jsx
deleted file mode 100644
index 206a67d1b..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/ControlsHeader/index.jsx
+++ /dev/null
@@ -1,92 +0,0 @@
-// Components
-import { Box, Stack, Button } from "@mui/material";
-import Image from "../../../../../Components/Image";
-import SettingsIcon from "../../../../../assets/icons/settings-bold.svg?react";
-
-//Utils
-import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router-dom";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-const Controls = ({ isDeleteOpen, setIsDeleteOpen, isDeleting, monitorId }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-	const { t } = useTranslation();
-
-	return (
-		<Stack
-			direction="row"
-			gap={theme.spacing(2)}
-		>
-			<Box>
-				<Button
-					variant="contained"
-					color="error"
-					onClick={() => setIsDeleteOpen(!isDeleteOpen)}
-					loading={isDeleting}
-				>
-					{t("delete")}
-				</Button>
-			</Box>
-			<Box>
-				<Button
-					variant="contained"
-					color="secondary"
-					onClick={() => {
-						navigate(`/distributed-uptime/configure/${monitorId}`);
-					}}
-					sx={{
-						px: theme.spacing(5),
-						"& svg": {
-							mr: theme.spacing(3),
-							"& path": {
-								stroke: theme.palette.secondary.contrastText,
-							},
-						},
-					}}
-				>
-					<SettingsIcon /> {t("configure")}
-				</Button>
-			</Box>
-		</Stack>
-	);
-};
-
-Controls.propTypes = {
-	isDeleting: PropTypes.bool,
-	monitorId: PropTypes.string,
-	isDeleteOpen: PropTypes.bool.isRequired,
-	setIsDeleteOpen: PropTypes.func.isRequired,
-};
-
-const ControlsHeader = ({ isDeleting, isDeleteOpen, setIsDeleteOpen, monitorId }) => {
-	const theme = useTheme();
-
-	return (
-		<Stack
-			alignSelf="flex-start"
-			direction="row"
-			width="100%"
-			gap={theme.spacing(2)}
-			justifyContent="flex-end"
-			alignItems="flex-end"
-		>
-			<Controls
-				isDeleting={isDeleting}
-				isDeleteOpen={isDeleteOpen}
-				setIsDeleteOpen={setIsDeleteOpen}
-				monitorId={monitorId}
-			/>
-		</Stack>
-	);
-};
-
-ControlsHeader.propTypes = {
-	monitorId: PropTypes.string,
-	isDeleting: PropTypes.bool,
-	isDeleteOpen: PropTypes.bool.isRequired,
-	setIsDeleteOpen: PropTypes.func.isRequired,
-};
-
-export default ControlsHeader;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx
deleted file mode 100644
index 92780717b..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DeviceTicker/index.jsx
+++ /dev/null
@@ -1,98 +0,0 @@
-// Components
-import { Stack, Typography } from "@mui/material";
-import PulseDot from "../../../../../Components/Animated/PulseDot";
-import "flag-icons/css/flag-icons.min.css";
-import { ColContainer } from "../../../../../Components/StandardContainer";
-
-// Utils
-import { useTheme } from "@emotion/react";
-import { useTranslation } from "react-i18next";
-
-const DeviceTicker = ({ data, width = "100%", connectionStatus }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const statusColor = {
-		up: theme.palette.success.main,
-		down: theme.palette.error.main,
-		undefined: theme.palette.warning.main,
-	};
-
-	return (
-		<ColContainer sx={{ height: "100%" }}>
-			<Stack
-				direction="row"
-				gap={theme.spacing(4)}
-			>
-				<PulseDot color={statusColor[connectionStatus]} />
-
-				<Typography
-					variant="h1"
-					mb={theme.spacing(8)}
-					sx={{ alignSelf: "center" }}
-				>
-					{connectionStatus === "up" ? "Connected" : "Connecting..."}
-				</Typography>
-			</Stack>
-			<div
-				style={{
-					overflowX: "auto",
-					maxWidth: "100%",
-					// Optional: add a max height if you want vertical scrolling too
-					// maxHeight: '400px',
-					// overflowY: 'auto'
-				}}
-			>
-				<table style={{ width: "100%" }}>
-					<thead>
-						<tr>
-							<th style={{ textAlign: "left", paddingLeft: theme.spacing(4) }}>
-								<Typography>{t("country")}</Typography>
-							</th>
-							<th style={{ textAlign: "left", paddingLeft: theme.spacing(4) }}>
-								<Typography>{t("city")}</Typography>
-							</th>
-							<th style={{ textAlign: "right", paddingLeft: theme.spacing(4) }}>
-								<Typography>{t("response")}</Typography>
-							</th>
-							<th style={{ textAlign: "right", paddingLeft: theme.spacing(4) }}>
-								<Typography sx={{ whiteSpace: "nowrap" }}>{"UPT BURNED"}</Typography>
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						{data.map((dataPoint) => {
-							const countryCode = dataPoint?.countryCode?.toLowerCase() ?? null;
-							const flag = countryCode ? `fi fi-${countryCode}` : null;
-							const city = dataPoint?.city !== "" ? dataPoint?.city : "Unknown";
-							return (
-								<tr key={Math.random()}>
-									<td style={{ paddingLeft: theme.spacing(4) }}>
-										<Typography>
-											{flag ? <span className={flag} /> : null}{" "}
-											{countryCode?.toUpperCase() ?? "N/A"}
-										</Typography>
-									</td>
-									<td style={{ paddingLeft: theme.spacing(4) }}>
-										<Typography>{city}</Typography>
-									</td>
-									<td style={{ textAlign: "right", paddingLeft: theme.spacing(4) }}>
-										<Typography>
-											{Math.floor(dataPoint.responseTime)} {t("ms")}
-										</Typography>
-									</td>
-									<td style={{ textAlign: "right", paddingLeft: theme.spacing(4) }}>
-										<Typography color={theme.palette.warning.main}>
-											+{dataPoint.uptBurnt}
-										</Typography>
-									</td>
-								</tr>
-							);
-						})}
-					</tbody>
-				</table>
-			</div>
-		</ColContainer>
-	);
-};
-
-export default DeviceTicker;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/DistributedUptimeMapStyle.json b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/DistributedUptimeMapStyle.json
deleted file mode 100644
index 86ca8204d..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/DistributedUptimeMapStyle.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-	"id": "43f36e14-e3f5-43c1-84c0-50a9c80dc5c7",
-	"name": "MapLibre",
-	"zoom": 0.861983335785597,
-	"pitch": 0,
-	"center": [17.6543171043124, 32.9541203267468],
-	"glyphs": "https://demotiles.maplibre.org/font/{fontstack}/{range}.pbf",
-	"layers": [
-		{
-			"id": "background",
-			"type": "background",
-			"paint": {
-				"background-color": "#121217"
-			},
-			"filter": ["all"],
-			"layout": {
-				"visibility": "visible"
-			},
-			"maxzoom": 24
-		},
-		{
-			"id": "coastline",
-			"type": "line",
-			"paint": {
-				"line-blur": 0.5,
-				"line-color": "#000000",
-				"line-width": {
-					"stops": [
-						[0, 2],
-						[6, 6],
-						[14, 9],
-						[22, 18]
-					]
-				}
-			},
-			"filter": ["all"],
-			"layout": {
-				"line-cap": "round",
-				"line-join": "round",
-				"visibility": "visible"
-			},
-			"source": "maplibre",
-			"maxzoom": 24,
-			"minzoom": 0,
-			"source-layer": "countries"
-		},
-		{
-			"id": "countries-fill",
-			"type": "fill",
-			"paint": {
-				"fill-color": "#292929"
-			},
-			"filter": ["all"],
-			"layout": {
-				"visibility": "visible"
-			},
-			"source": "maplibre",
-			"maxzoom": 24,
-			"source-layer": "countries"
-		},
-		{
-			"id": "countries-boundary",
-			"type": "line",
-			"paint": {
-				"line-color": "#484848",
-				"line-width": {
-					"stops": [
-						[1, 1],
-						[6, 2],
-						[14, 6],
-						[22, 12]
-					]
-				},
-				"line-opacity": {
-					"stops": [
-						[3, 0.5],
-						[6, 1]
-					]
-				}
-			},
-			"layout": {
-				"line-cap": "round",
-				"line-join": "round",
-				"visibility": "visible"
-			},
-			"source": "maplibre",
-			"maxzoom": 24,
-			"source-layer": "countries"
-		},
-		{
-			"id": "countries-label",
-			"type": "symbol",
-			"paint": {
-				"text-color": "rgba(8, 37, 77, 1)",
-				"text-halo-blur": {
-					"stops": [
-						[2, 0.2],
-						[6, 0]
-					]
-				},
-				"text-halo-color": "rgba(255, 255, 255, 1)",
-				"text-halo-width": {
-					"stops": [
-						[2, 1],
-						[6, 1.6]
-					]
-				}
-			},
-			"filter": ["all"],
-			"layout": {
-				"text-font": ["Open Sans Semibold"],
-				"text-size": {
-					"stops": [
-						[2, 10],
-						[4, 12],
-						[6, 16]
-					]
-				},
-				"text-field": {
-					"stops": [
-						[2, "{ABBREV}"],
-						[4, "{NAME}"]
-					]
-				},
-				"visibility": "visible",
-				"text-max-width": 10,
-				"text-transform": {
-					"stops": [
-						[0, "uppercase"],
-						[2, "none"]
-					]
-				}
-			},
-			"source": "maplibre",
-			"maxzoom": 24,
-			"minzoom": 2,
-			"source-layer": "centroids"
-		},
-		{
-			"id": "data-dots",
-			"type": "circle",
-			"source": "data-dots",
-			"paint": {
-				"circle-radius": 3,
-				"circle-color": ["get", "color"],
-				"circle-opacity": 0.5
-			}
-		}
-	],
-	"bearing": 0,
-	"sources": {
-		"maplibre": {
-			"url": "https://demotiles.maplibre.org/tiles/tiles.json",
-			"type": "vector"
-		},
-		"data-dots": {
-			"type": "geojson",
-			"data": {
-				"type": "FeatureCollection",
-				"features": []
-			}
-		}
-	},
-	"version": 8,
-	"metadata": {
-		"maptiler:copyright": "This style was generated on MapTiler Cloud. Usage is governed by the license terms in https://github.com/maplibre/demotiles/blob/gh-pages/LICENSE",
-		"openmaptiles:version": "3.x"
-	}
-}
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/buildStyle.js b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/buildStyle.js
deleted file mode 100644
index e4aaa49ce..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/buildStyle.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import baseStyle from "./DistributedUptimeMapStyle.json";
-
-const buildStyle = (theme, mode) => {
-	const style = JSON.parse(JSON.stringify(baseStyle));
-
-	if (mode === "dark") {
-		return baseStyle;
-	}
-
-	if (style.layers) {
-		const newLayers = style.layers.map((layer) => {
-			if (layer.id === "background") {
-				layer.paint["background-color"] = theme.palette.map.main;
-			}
-
-			if (layer.id === "countries-fill") {
-				layer.paint["fill-color"] = theme.palette.map.lowContrast;
-			}
-
-			if (layer.id === "coastline") {
-				layer.paint["line-color"] = theme.palette.map.highContrast;
-			}
-			if (layer.id === "countries-boundary") {
-				layer.paint["line-color"] = theme.palette.map.highContrast;
-			}
-			return layer;
-		});
-		style.layers = newLayers;
-	}
-	return style;
-};
-
-export default buildStyle;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx
deleted file mode 100644
index 03993dcc3..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import "maplibre-gl/dist/maplibre-gl.css";
-import PropTypes from "prop-types";
-import { useRef, useState, useEffect } from "react";
-import { useTheme } from "@mui/material/styles";
-import maplibregl from "maplibre-gl";
-import { useSelector } from "react-redux";
-import buildStyle from "./buildStyle";
-
-const DistributedUptimeMap = ({
-	width = "100%",
-	checks,
-	height,
-	minHeight = "350px",
-}) => {
-	const mapContainer = useRef(null);
-	const map = useRef(null);
-	const theme = useTheme();
-	const [mapLoaded, setMapLoaded] = useState(false);
-	const mode = useSelector((state) => state.ui.mode);
-	const initialTheme = useRef(theme);
-	const initialMode = useRef(mode);
-
-	const colorLookup = (avgResponseTime) => {
-		if (avgResponseTime <= 150) {
-			return "#00FF00"; // Green
-		} else if (avgResponseTime <= 250) {
-			return "#FFFF00"; // Yellow
-		} else {
-			return "#FF0000"; // Red
-		}
-	};
-
-	useEffect(() => {
-		if (mapContainer.current && !map.current) {
-			const initialStyle = buildStyle(initialTheme.current, initialMode.current);
-
-			map.current = new maplibregl.Map({
-				container: mapContainer.current,
-				style: initialStyle,
-				center: [0, 20],
-				zoom: 0.8,
-				attributionControl: false,
-				canvasContextAttributes: {
-					antialias: true,
-					preserveDrawingBuffer: true,
-				},
-			});
-		}
-		map.current.on("load", () => {
-			setMapLoaded(true);
-		});
-
-		return () => {
-			if (map.current) {
-				map.current.remove();
-				map.current = null;
-			}
-		};
-	}, []);
-
-	useEffect(() => {
-		const style = buildStyle(theme, mode);
-		if (map.current && mapLoaded) {
-			map.current.setStyle(style);
-		}
-	}, [theme, mode, mapLoaded]);
-
-	useEffect(() => {
-		if (map.current && checks?.length > 0) {
-			// Convert dots to GeoJSON
-			const geojson = {
-				type: "FeatureCollection",
-				features: checks.map((check) => {
-					return {
-						type: "Feature",
-						geometry: {
-							type: "Point",
-							coordinates: [check._id.lng, check._id.lat],
-						},
-						properties: {
-							color: theme.palette.accent.main,
-							// color: colorLookup(check.avgResponseTime) || "blue", // Default to blue if no color specified
-						},
-					};
-				}),
-			};
-
-			// Update the source with new dots
-			const source = map.current.getSource("data-dots");
-			if (source) {
-				source.setData(geojson);
-			}
-		}
-	}, [checks, theme, mapLoaded]);
-	return (
-		<div
-			ref={mapContainer}
-			style={{
-				width: width,
-				height: height,
-				minHeight: minHeight,
-				borderRadius: theme.spacing(4),
-				borderColor: theme.palette.primary.lowContrast,
-				borderStyle: "solid",
-				borderWidth: 1,
-			}}
-		/>
-	);
-};
-
-DistributedUptimeMap.propTypes = {
-	checks: PropTypes.array,
-	width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-	height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-	minHeight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-};
-
-export default DistributedUptimeMap;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx
deleted file mode 100644
index 1102f72b8..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Area/index.jsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useState } from "react";
-import { useTheme } from "@emotion/react";
-import {
-	AreaChart,
-	Area,
-	XAxis,
-	Tooltip,
-	CartesianGrid,
-	ResponsiveContainer,
-} from "recharts";
-import CustomTick from "../Helpers/Tick";
-import CustomToolTip from "../Helpers/ToolTip";
-import PropTypes from "prop-types";
-
-const DistributedUptimeResponseAreaChart = ({ checks }) => {
-	const theme = useTheme();
-	const [isHovered, setIsHovered] = useState(false);
-	return (
-		<ResponsiveContainer
-			width="100%"
-			minWidth={25}
-			height={220}
-		>
-			<AreaChart
-				width="100%"
-				height="100%"
-				data={checks}
-				margin={{
-					top: 10,
-					right: 0,
-					left: 0,
-					bottom: 0,
-				}}
-				onMouseMove={() => setIsHovered(true)}
-				onMouseLeave={() => setIsHovered(false)}
-			>
-				<CartesianGrid
-					stroke={theme.palette.primary.lowContrast}
-					strokeWidth={1}
-					strokeOpacity={1}
-					fill="transparent"
-					vertical={false}
-				/>
-				<defs>
-					<linearGradient
-						id="colorUv"
-						x1="0"
-						y1="0"
-						x2="0"
-						y2="1"
-					>
-						<stop
-							offset="0%"
-							stopColor={theme.palette.accent.darker}
-							stopOpacity={0.8}
-						/>
-						<stop
-							offset="100%"
-							stopColor={theme.palette.accent.main}
-							stopOpacity={0}
-						/>
-					</linearGradient>
-				</defs>
-				<XAxis
-					stroke={theme.palette.primary.lowContrast}
-					dataKey="_id.date"
-					tick={<CustomTick />}
-					minTickGap={0}
-					axisLine={false}
-					tickLine={false}
-					height={20}
-				/>
-				<Tooltip
-					cursor={{ stroke: theme.palette.primary.lowContrast }}
-					content={<CustomToolTip />}
-					wrapperStyle={{ pointerEvents: "none" }}
-				/>
-				<Area
-					type="monotone"
-					dataKey="avgResponseTime"
-					stroke={theme.palette.primary.accent}
-					fill="url(#colorUv)"
-					strokeWidth={isHovered ? 2.5 : 1.5}
-					activeDot={{ stroke: theme.palette.background.main, r: 5 }}
-				/>
-			</AreaChart>
-		</ResponsiveContainer>
-	);
-};
-
-DistributedUptimeResponseAreaChart.propTypes = {
-	checks: PropTypes.array,
-};
-
-export default DistributedUptimeResponseAreaChart;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx
deleted file mode 100644
index a6d3d455b..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Bar/index.jsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
-	BarChart,
-	Bar,
-	CartesianGrid,
-	ResponsiveContainer,
-	Tooltip,
-	XAxis,
-} from "recharts";
-import { useTheme } from "@emotion/react";
-import PropTypes from "prop-types";
-import CustomToolTip from "../Helpers/ToolTip";
-import CustomTick from "../Helpers/Tick";
-
-const DistributedUptimeResponseBarChart = ({ checks }) => {
-	const theme = useTheme();
-	return (
-		<ResponsiveContainer
-			width="100%"
-			minWidth={25}
-			height={220}
-		>
-			<BarChart
-				width="100%"
-				height="100%"
-				data={checks}
-				margin={{
-					top: 10,
-					right: 0,
-					left: 0,
-					bottom: 0,
-				}}
-			>
-				<defs>
-					<linearGradient
-						id="colorUv"
-						x1="0"
-						y1="0"
-						x2="0"
-						y2="1"
-					>
-						<stop
-							offset="0%"
-							stopColor={theme.palette.accent.darker}
-							stopOpacity={0.8}
-						/>
-						<stop
-							offset="100%"
-							stopColor={theme.palette.accent.main}
-							stopOpacity={0}
-						/>
-					</linearGradient>
-				</defs>
-				<CartesianGrid
-					stroke={theme.palette.primary.lowContrast}
-					strokeWidth={1}
-					strokeOpacity={1}
-					fill="transparent"
-					vertical={false}
-				/>
-				<Tooltip
-					cursor={{
-						stroke: theme.palette.primary.lowContrast,
-						fill: "transparent",
-					}}
-					content={<CustomToolTip />}
-					wrapperStyle={{ pointerEvents: "none" }}
-				/>
-				<XAxis
-					stroke={theme.palette.primary.lowContrast}
-					dataKey="_id.date"
-					tick={<CustomTick />}
-					minTickGap={0}
-					axisLine={false}
-					tickLine={false}
-					height={20}
-				/>
-				<Bar
-					maxBarSize={25}
-					dataKey="avgResponseTime"
-					fill="url(#colorUv)"
-					activeBar={{
-						stroke: theme.palette.accent.main,
-						r: 5,
-					}}
-				/>
-			</BarChart>
-		</ResponsiveContainer>
-	);
-};
-
-DistributedUptimeResponseBarChart.propTypes = {
-	checks: PropTypes.array,
-};
-
-export default DistributedUptimeResponseBarChart;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/Tick.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/Tick.jsx
deleted file mode 100644
index 15efd5dfa..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/Tick.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useTheme } from "@emotion/react";
-import { useSelector } from "react-redux";
-import { formatDateWithTz } from "../../../../../../Utils/timeUtils";
-import PropTypes from "prop-types";
-import { Text } from "recharts";
-const CustomTick = ({ x, y, payload, index }) => {
-	const theme = useTheme();
-
-	const uiTimezone = useSelector((state) => state.ui.timezone);
-	return (
-		<Text
-			x={x}
-			y={y + 10}
-			textAnchor="middle"
-			fill={theme.palette.text.tertiary}
-			fontSize={11}
-			fontWeight={400}
-		>
-			{formatDateWithTz(payload?.value, "h:mm a", uiTimezone)}
-		</Text>
-	);
-};
-
-CustomTick.propTypes = {
-	x: PropTypes.number,
-	y: PropTypes.number,
-	payload: PropTypes.object,
-	index: PropTypes.number,
-};
-
-export default CustomTick;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx
deleted file mode 100644
index 737b26106..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Box, Stack, Typography } from "@mui/material";
-import { useSelector } from "react-redux";
-import { formatDateWithTz } from "../../../../../../Utils/timeUtils";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import AccessTimeIcon from "@mui/icons-material/AccessTime";
-import { useTranslation } from "react-i18next";
-
-const CustomToolTip = ({ active, payload, label }) => {
-	const uiTimezone = useSelector((state) => state.ui.timezone);
-	const theme = useTheme();
-	const { t } = useTranslation();
-	if (active && payload && payload.length) {
-		const responseTime = payload[0]?.payload?.originalAvgResponseTime
-			? payload[0]?.payload?.originalAvgResponseTime
-			: (payload[0]?.payload?.avgResponseTime ?? 0);
-		return (
-			<Stack
-				className="area-tooltip"
-				sx={{
-					backgroundColor: theme.palette.primary.main,
-					border: 1,
-					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.shape.borderRadius,
-					py: theme.spacing(2),
-					px: theme.spacing(4),
-				}}
-			>
-				<Typography
-					sx={{
-						color: theme.palette.text.tertiary,
-						fontSize: 12,
-						fontWeight: 500,
-					}}
-				>
-					{formatDateWithTz(label, "ddd, MMMM D, YYYY, h:mm A", uiTimezone)}
-				</Typography>
-
-				<Stack
-					direction="row"
-					alignItems="end"
-					gap={theme.spacing(2)}
-					sx={{
-						"& span": {
-							color: theme.palette.text.tertiary,
-							fontSize: 11,
-							fontWeight: 500,
-						},
-					}}
-				>
-					<AccessTimeIcon fontSize="small" />
-
-					<Typography
-						component="span"
-						sx={{ opacity: 0.8 }}
-					>
-						{t("responseTime")}
-					</Typography>
-					<Typography component="span">
-						{Math.floor(responseTime)}
-						<Typography
-							component="span"
-							sx={{ opacity: 0.8 }}
-						>
-							{t("ms")}
-						</Typography>
-					</Typography>
-				</Stack>
-			</Stack>
-		);
-	}
-	return null;
-};
-
-CustomToolTip.propTypes = {
-	active: PropTypes.bool,
-	payload: PropTypes.arrayOf(
-		PropTypes.shape({
-			value: PropTypes.number,
-			payload: PropTypes.shape({
-				_id: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-				avgResponseTime: PropTypes.number,
-				originalAvgResponseTime: PropTypes.number,
-			}),
-		})
-	),
-	label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-};
-export default CustomToolTip;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/index.jsx
deleted file mode 100644
index 90a7671db..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/index.jsx
+++ /dev/null
@@ -1,53 +0,0 @@
-//Components
-import { Stack, Switch, Typography } from "@mui/material";
-import { useState } from "react";
-import DistributedUptimeResponseAreaChart from "./Area";
-import DistributedUptimeResponseBarChart from "./Bar";
-import ChartBox from "../../../../../Components/Charts/ChartBox";
-import ResponseTimeIcon from "../../../../../assets/icons/response-time-icon.svg?react";
-
-// Utils
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-const DistributedUptimeResponseChart = ({ checks }) => {
-	const [chartType, setChartType] = useState("bar");
-	const { t } = useTranslation();
-	let Chart = null;
-	if (chartType === "area") {
-		Chart = DistributedUptimeResponseAreaChart;
-	}
-	if (chartType === "bar") {
-		Chart = DistributedUptimeResponseBarChart;
-	}
-	return (
-		<Stack>
-			<Stack
-				direction="row"
-				alignItems="center"
-			>
-				<Typography>{t("bar")}</Typography>
-				<Switch
-					color="main"
-					value={chartType}
-					onChange={(e) => setChartType(e.target.checked ? "area" : "bar")}
-				/>
-				<Typography>{t("area")}</Typography>
-			</Stack>
-			<ChartBox
-				icon={<ResponseTimeIcon />}
-				header="Response Times"
-				sx={{ padding: 0 }}
-			>
-				<Chart checks={checks} />
-			</ChartBox>
-		</Stack>
-	);
-};
-
-DistributedUptimeResponseChart.propTypes = {
-	checks: PropTypes.array,
-	type: PropTypes.string,
-};
-
-export default DistributedUptimeResponseChart;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/Footer/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/Footer/index.jsx
deleted file mode 100644
index 62a1f465a..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/Footer/index.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Stack, Typography, Box } from "@mui/material";
-import SolanaLogo from "../../../../../assets/icons/solana_logo.svg?react";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-
-const Footer = () => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<Stack
-			justifyContent="space-between"
-			alignItems="center"
-			spacing={2}
-		>
-			<Typography variant="h2">{t("distributedUptimeDetailsFooterHeading")}</Typography>
-			<Stack
-				width="100%"
-				direction="row"
-				gap={theme.spacing(2)}
-				justifyContent="center"
-				alignItems="center"
-			>
-				<Typography variant="h2">{t("distributedUptimeDetailsFooterBuilt")}</Typography>
-				<SolanaLogo
-					width={15}
-					height={15}
-				/>
-				<Typography variant="h2">{t("distributedUptimeDetailsFooterSolana")}</Typography>
-			</Stack>
-		</Stack>
-	);
-};
-
-export default Footer;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/LastUpdate/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/LastUpdate/index.jsx
deleted file mode 100644
index a095b5feb..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/LastUpdate/index.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useState, useEffect } from "react";
-const LastUpdate = ({ suffix, lastUpdateTime, trigger }) => {
-	const [elapsedMs, setElapsedMs] = useState(lastUpdateTime);
-
-	useEffect(() => {
-		setElapsedMs(lastUpdateTime);
-		const timer = setInterval(() => {
-			setElapsedMs((prev) => prev + 1000);
-		}, 1000);
-		return () => clearInterval(timer);
-	}, [lastUpdateTime, trigger]);
-
-	return `${Math.floor(elapsedMs / 1000)} ${suffix}`;
-};
-export default LastUpdate;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/MonitorHeader/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/MonitorHeader/index.jsx
deleted file mode 100644
index 056bd721a..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/MonitorHeader/index.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Stack, Typography } from "@mui/material";
-import { useTheme } from "@mui/material/styles";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-const MonitorHeader = ({ monitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<Stack direction="row">
-			<Stack gap={theme.spacing(2)}>
-				<Typography variant="h1">{monitor.name}</Typography>
-				<Typography variant="h2">{t("distributedUptimeDetailsMonitorHeader")}</Typography>
-			</Stack>
-		</Stack>
-	);
-};
-
-MonitorHeader.propTypes = {
-	monitor: PropTypes.object,
-};
-
-export default MonitorHeader;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/NextExpectedCheck/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/NextExpectedCheck/index.jsx
deleted file mode 100644
index 03949a9f7..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/NextExpectedCheck/index.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { LinearProgress } from "@mui/material";
-import { useState, useEffect } from "react";
-
-const NextExpectedCheck = ({ lastUpdateTime, interval, trigger }) => {
-	const [elapsedMs, setElapsedMs] = useState(lastUpdateTime);
-
-	useEffect(() => {
-		setElapsedMs(lastUpdateTime);
-		const timer = setInterval(() => {
-			setElapsedMs((prev) => {
-				const newElapsedMs = prev + 100;
-				return newElapsedMs;
-			});
-		}, 100);
-		return () => clearInterval(timer);
-	}, [interval, trigger]);
-
-	return (
-		<LinearProgress
-			variant="determinate"
-			color="accent"
-			value={Math.min((elapsedMs / interval) * 100, 100)}
-			sx={{
-				transition: "width 1s linear", // Smooth transition over 1 second
-			}}
-		/>
-	);
-};
-
-export default NextExpectedCheck;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/Skeleton/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/Skeleton/index.jsx
deleted file mode 100644
index 233fc3c06..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/Skeleton/index.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Stack, Skeleton } from "@mui/material";
-
-export const SkeletonLayout = () => {
-	return (
-		<Stack>
-			<Skeleton
-				variant="rectangular"
-				height={"90vh"}
-			/>
-		</Stack>
-	);
-};
-
-export default SkeletonLayout;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx
deleted file mode 100644
index 97513bb4f..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx
+++ /dev/null
@@ -1,60 +0,0 @@
-// Components
-import { Stack } from "@mui/material";
-import InfoBox from "../../../../../Components/InfoBox";
-import LastUpdate from "../LastUpdate";
-
-// Utils
-import { useTheme } from "@mui/material/styles";
-import PropTypes from "prop-types";
-
-const StatBoxes = ({ monitor, lastUpdateTrigger }) => {
-	const theme = useTheme();
-
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-			flexWrap="wrap"
-			gap={theme.spacing(8)}
-		>
-			<InfoBox
-				sx={{ flex: 1 }}
-				heading="Avg Response Time"
-				subHeading={`${Math.floor(monitor?.avgResponseTime ?? 0)} ms`}
-			/>
-			<InfoBox
-				sx={{ flex: 1 }}
-				heading="Checking every"
-				subHeading={`${(monitor?.interval ?? 0) / 1000} seconds`}
-			/>
-			<InfoBox
-				sx={{ flex: 1 }}
-				heading={"Last check"}
-				subHeading={
-					<LastUpdate
-						lastUpdateTime={monitor?.timeSinceLastCheck}
-						suffix={"seconds ago"}
-					/>
-				}
-			/>
-			<InfoBox
-				sx={{ flex: 1 }}
-				heading="Last server push"
-				subHeading={
-					<LastUpdate
-						suffix={"seconds ago"}
-						lastUpdateTime={0}
-						trigger={lastUpdateTrigger}
-					/>
-				}
-			/>
-		</Stack>
-	);
-};
-
-StatBoxes.propTypes = {
-	monitor: PropTypes.object,
-	lastUpdateTrigger: PropTypes.number,
-};
-
-export default StatBoxes;
diff --git a/client/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx b/client/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx
deleted file mode 100644
index 22a56bd7e..000000000
--- a/client/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx
+++ /dev/null
@@ -1,94 +0,0 @@
-// Components
-import { ColContainer } from "../../../../../Components/StandardContainer";
-import { Stack, Typography } from "@mui/material";
-import PulseDot from "../../../../../Components/Animated/PulseDot";
-import LastUpdate from "../LastUpdate";
-import ChatBot from "../Chatbot";
-import ShareComponent from "../../../../../Components/ShareComponent";
-
-// Utils
-import { useTheme } from "@emotion/react";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const COLOR_MAP = {
-		up: theme.palette.successSecondary.main,
-		down: theme.palette.error.lowContrast,
-	};
-
-	const MSG_MAP = {
-		up: "All Systems Operational",
-		down: "Last Check Failed",
-	};
-
-	const PULSE_COLOR = {
-		up: theme.palette.success.main,
-		down: theme.palette.error.main,
-	};
-
-	let bgColor = COLOR_MAP[connectionStatus];
-	return (
-		<ColContainer backgroundColor={bgColor}>
-			<Stack
-				direction={{ s: "column", md: "row" }}
-				justifyContent="space-between"
-				gap={theme.spacing(8)}
-			>
-				<Stack
-					direction="row"
-					gap={theme.spacing(8)}
-				>
-					<PulseDot color={PULSE_COLOR[connectionStatus]} />
-					<Stack>
-						<Stack
-							direction="row"
-							gap={theme.spacing(8)}
-						>
-							<Typography
-								variant="h1"
-								color={theme.palette.success.lowContrast}
-							>
-								{MSG_MAP[connectionStatus]}
-							</Typography>
-							<Typography
-								variant="body2"
-								borderRadius={theme.spacing(8)}
-								padding={theme.spacing(4)}
-								backgroundColor={theme.palette.successSecondary.lowContrast}
-								color={theme.palette.success.lowContrast}
-							>
-								{t("distributedUptimeDetailsStatusHeaderUptime")}{" "}
-								{(monitor.uptimePercentage * 100).toFixed(2)}%
-							</Typography>
-						</Stack>
-						<Typography
-							variant="body2"
-							color={theme.palette.success.lowContrast}
-						>
-							{t("distributedUptimeDetailsStatusHeaderLastUpdate")}{" "}
-							<LastUpdate
-								suffix={"seconds ago"}
-								lastUpdateTime={monitor?.timeSinceLastCheck}
-							/>
-						</Typography>
-					</Stack>
-				</Stack>
-				<ShareComponent
-					elementToCapture={elementToCapture}
-					fileName={monitor.name}
-				/>
-			</Stack>
-			<ChatBot sx={{ marginTop: theme.spacing(10) }} />
-		</ColContainer>
-	);
-};
-
-StatusHeader.propTypes = {
-	monitor: PropTypes.object,
-	connectionStatus: PropTypes.string,
-};
-
-export default StatusHeader;
diff --git a/client/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx b/client/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx
deleted file mode 100644
index a26de2a5e..000000000
--- a/client/src/Pages/DistributedUptime/Details/Hooks/useDeleteMonitor.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useState } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-
-const useDeleteMonitor = ({ monitorId }) => {
-	const [isLoading, setIsLoading] = useState(false);
-	const deleteMonitor = async () => {
-		try {
-			setIsLoading(true);
-			await networkService.deleteMonitorById({ monitorId });
-			return true;
-		} catch (error) {
-			createToast({
-				body: error.message,
-			});
-			return false;
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return [deleteMonitor, isLoading];
-};
-
-export { useDeleteMonitor };
diff --git a/client/src/Pages/DistributedUptime/Details/index.jsx b/client/src/Pages/DistributedUptime/Details/index.jsx
deleted file mode 100644
index 27b39b600..000000000
--- a/client/src/Pages/DistributedUptime/Details/index.jsx
+++ /dev/null
@@ -1,148 +0,0 @@
-//Components
-import DistributedUptimeMap from "./Components/DistributedUptimeMap";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import { Stack, Typography } from "@mui/material";
-import DeviceTicker from "./Components/DeviceTicker";
-import ResponseTimeChart from "./Components/DistributedUptimeResponseChart";
-import NextExpectedCheck from "./Components/NextExpectedCheck";
-import Footer from "./Components/Footer";
-import StatBoxes from "./Components/StatBoxes";
-import MonitorHeader from "./Components/MonitorHeader";
-import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
-import GenericFallback from "../../../Components/GenericFallback";
-import MonitorCreateHeader from "../../../Components/MonitorCreateHeader";
-import SkeletonLayout from "./Components/Skeleton";
-import ControlsHeader from "./Components/ControlsHeader";
-import Dialog from "../../../Components/Dialog";
-//Utils
-import { useTheme } from "@mui/material/styles";
-import { useState } from "react";
-import { useParams } from "react-router-dom";
-import { useIsAdmin } from "../../../Hooks/useIsAdmin";
-import { useSubscribeToDepinDetails } from "../../../Hooks/useSubscribeToDepinDetails";
-import { useDeleteMonitor } from "./Hooks/useDeleteMonitor";
-import { useNavigate } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-
-const DistributedUptimeDetails = () => {
-	const { monitorId } = useParams();
-	// Local State
-	const [dateRange, setDateRange] = useState("recent");
-	const [isDeleteOpen, setIsDeleteOpen] = useState(false);
-
-	// Utils
-	const theme = useTheme();
-	const isAdmin = useIsAdmin();
-	const { t } = useTranslation();
-	const navigate = useNavigate();
-	const [isLoading, networkError, connectionStatus, monitor, lastUpdateTrigger] =
-		useSubscribeToDepinDetails({ monitorId, dateRange });
-
-	const [deleteMonitor, isDeleting] = useDeleteMonitor({ monitorId });
-	// Constants
-	const BREADCRUMBS = [
-		{ name: "Distributed Uptime", path: "/distributed-uptime" },
-		{ name: "Details", path: `/distributed-uptime/${monitorId}` },
-	];
-
-	if (isLoading) {
-		return <SkeletonLayout />;
-	}
-
-	if (networkError) {
-		return (
-			<GenericFallback>
-				<Typography
-					variant="h1"
-					marginY={theme.spacing(4)}
-					color={theme.palette.primary.contrastTextTertiary}
-				>
-					{t("networkError")}
-				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
-			</GenericFallback>
-		);
-	}
-	if (
-		typeof monitor === "undefined" ||
-		typeof monitor?.totalChecks === "undefined" ||
-		monitor?.totalChecks === 0
-	) {
-		return (
-			<Stack gap={theme.spacing(10)}>
-				<Breadcrumbs list={BREADCRUMBS} />
-				<GenericFallback>
-					<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
-				</GenericFallback>
-			</Stack>
-		);
-	}
-	return (
-		<Stack
-			direction="column"
-			gap={theme.spacing(10)}
-		>
-			<Breadcrumbs list={BREADCRUMBS} />
-			<MonitorCreateHeader
-				label="Create status page"
-				isAdmin={isAdmin}
-				path={`/status/distributed/create/${monitorId}`}
-			/>
-			<ControlsHeader
-				isDeleting={isDeleting}
-				isDeleteOpen={isDeleteOpen}
-				setIsDeleteOpen={setIsDeleteOpen}
-				monitorId={monitorId}
-			/>
-			<MonitorHeader monitor={monitor} />
-			<StatBoxes
-				monitor={monitor}
-				lastUpdateTrigger={lastUpdateTrigger}
-			/>
-			<NextExpectedCheck
-				lastUpdateTime={monitor?.timeSinceLastCheck ?? 0}
-				interval={monitor?.interval ?? 0}
-				trigger={lastUpdateTrigger}
-			/>
-			<MonitorTimeFrameHeader
-				dateRange={dateRange}
-				setDateRange={setDateRange}
-			/>
-
-			<ResponseTimeChart checks={monitor?.groupedChecks ?? []} />
-			<Stack
-				direction="row"
-				gap={theme.spacing(8)}
-			>
-				<DistributedUptimeMap
-					checks={monitor?.groupedMapChecks ?? []}
-					height={"100%"}
-					width={"100%"}
-				/>
-				<DeviceTicker
-					width={"25vw"}
-					data={monitor?.latestChecks ?? []}
-					connectionStatus={connectionStatus}
-				/>
-			</Stack>
-			<Footer />
-			<Dialog
-				title="Do you want to delete this monitor?"
-				onConfirm={() => {
-					deleteMonitor();
-					setIsDeleteOpen(false);
-					navigate("/distributed-uptime");
-				}}
-				onCancel={() => {
-					setIsDeleteOpen(false);
-				}}
-				open={isDeleteOpen}
-				confirmationButtonLabel="Yes, delete monitor"
-				description="Once deleted, your monitor cannot be retrieved."
-				isLoading={isDeleting || isLoading}
-			/>
-		</Stack>
-	);
-};
-
-export default DistributedUptimeDetails;
diff --git a/client/src/Pages/DistributedUptime/Monitors/Components/MonitorTable/index.jsx b/client/src/Pages/DistributedUptime/Monitors/Components/MonitorTable/index.jsx
deleted file mode 100644
index fa8593cf1..000000000
--- a/client/src/Pages/DistributedUptime/Monitors/Components/MonitorTable/index.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-// Components
-import DataTable from "../../../../../Components/Table";
-import BarChart from "../../../../../Components/Charts/BarChart";
-import { Box } from "@mui/material";
-import { StatusLabel } from "../../../../../Components/Label";
-import Host from "../../../../../Components/Host";
-
-// Utils
-import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router-dom";
-import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
-import PropTypes from "prop-types";
-
-// Constants
-const TYPE_MAP = {
-	distributed_http: "Distributed HTTP",
-};
-
-const MonitorTable = ({ isLoading, monitors }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-	const { determineState } = useMonitorUtils();
-	const headers = [
-		{
-			id: "name",
-			content: <Box>Host</Box>,
-			render: (row) => (
-				<Host
-					key={row._id}
-					url={row.url}
-					title={row.name}
-					percentageColor={row.percentageColor}
-					percentage={row.percentage}
-				/>
-			),
-		},
-		{
-			id: "status",
-			content: <Box width="max-content"> Status</Box>,
-			render: (row) => {
-				const status = determineState(row?.monitor);
-				return (
-					<StatusLabel
-						status={status}
-						text={status}
-						customStyles={{ textTransform: "capitalize" }}
-					/>
-				);
-			},
-		},
-		{
-			id: "responseTime",
-			content: "Response Time",
-			render: (row) => <BarChart checks={row?.monitor?.checks.slice().reverse()} />,
-		},
-		{
-			id: "type",
-			content: "Type",
-			render: (row) => <span>{TYPE_MAP[row.monitor.type]}</span>,
-		},
-		{
-			id: "actions",
-			content: "Actions",
-			render: (row) => <span>{"TODO"}</span>,
-		},
-	];
-
-	return (
-		<DataTable
-			shouldRender={!isLoading}
-			headers={headers}
-			data={monitors}
-			config={{
-				rowSX: {
-					cursor: "pointer",
-					"&:hover": {
-						backgroundColor: theme.palette.background.accent,
-					},
-				},
-				onRowClick: (row) => {
-					navigate(`/distributed-uptime/${row._id}`);
-				},
-			}}
-		/>
-	);
-};
-
-MonitorTable.propTypes = {
-	isLoading: PropTypes.bool,
-	monitors: PropTypes.array,
-};
-
-export default MonitorTable;
diff --git a/client/src/Pages/DistributedUptime/Monitors/Components/Skeleton/index.jsx b/client/src/Pages/DistributedUptime/Monitors/Components/Skeleton/index.jsx
deleted file mode 100644
index 233fc3c06..000000000
--- a/client/src/Pages/DistributedUptime/Monitors/Components/Skeleton/index.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Stack, Skeleton } from "@mui/material";
-
-export const SkeletonLayout = () => {
-	return (
-		<Stack>
-			<Skeleton
-				variant="rectangular"
-				height={"90vh"}
-			/>
-		</Stack>
-	);
-};
-
-export default SkeletonLayout;
diff --git a/client/src/Pages/DistributedUptime/Monitors/index.jsx b/client/src/Pages/DistributedUptime/Monitors/index.jsx
deleted file mode 100644
index d2cea7432..000000000
--- a/client/src/Pages/DistributedUptime/Monitors/index.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-// Components
-import { Stack, Typography } from "@mui/material";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import CreateMonitorHeader from "../../../Components/MonitorCreateHeader";
-import MonitorTable from "./Components/MonitorTable";
-import Pagination from "../../../Components/Table/TablePagination";
-import Fallback from "../../../Components/Fallback";
-import GenericFallback from "../../../Components/GenericFallback";
-
-// Utils
-import { useState } from "react";
-import { useTheme } from "@mui/material/styles";
-import { useIsAdmin } from "../../../Hooks/useIsAdmin";
-import { useSubscribeToDepinMonitors } from "../../../Hooks/useSubscribeToDepinMonitors";
-import SkeletonLayout from "./Components/Skeleton";
-import { useTranslation } from "react-i18next";
-// Constants
-const BREADCRUMBS = [{ name: `Distributed Uptime`, path: "/distributed-uptime" }];
-
-const DistributedUptimeMonitors = () => {
-	// Local state
-	const [page, setPage] = useState(0);
-	const [rowsPerPage, setRowsPerPage] = useState(10);
-
-	// Utils
-	const theme = useTheme();
-	const isAdmin = useIsAdmin();
-	const { t } = useTranslation();
-	const [monitors, count, isLoading, networkError] = useSubscribeToDepinMonitors(
-		page,
-		rowsPerPage
-	);
-	// Handlers
-	const handleChangePage = (event, newPage) => {
-		setPage(newPage);
-	};
-
-	const handleChangeRowsPerPage = (event) => {
-		setRowsPerPage(event.target.value);
-		setPage(0);
-	};
-
-	if (isLoading) {
-		return <SkeletonLayout />;
-	}
-
-	if (networkError) {
-		return (
-			<GenericFallback>
-				<Typography
-					variant="h1"
-					marginY={theme.spacing(4)}
-					color={theme.palette.primary.contrastTextTertiary}
-				>
-					{t("networkError")}
-				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
-			</GenericFallback>
-		);
-	}
-
-	if (count === 0) {
-		return (
-			<Fallback
-				vowelStart={false}
-				title="distributed uptime monitor"
-				checks={[
-					"Check if a server is online from multiple locations",
-					"Detect outages and performance issues in real time",
-					"Reduce false alarms by verifying downtime from different networks",
-					"Provide insights on regional availability and latency",
-				]}
-				link="/distributed-uptime/create"
-				isAdmin={isAdmin}
-			/>
-		);
-	}
-	return (
-		<Stack gap={theme.spacing(10)}>
-			<Breadcrumbs list={BREADCRUMBS} />
-			<CreateMonitorHeader
-				isAdmin={isAdmin}
-				shouldRender={!isLoading}
-				path="/distributed-uptime/create"
-			/>
-			<MonitorTable
-				isLoading={isLoading}
-				monitors={monitors}
-			/>
-			<Pagination
-				itemCount={count}
-				paginationLabel="monitors"
-				page={page}
-				rowsPerPage={rowsPerPage}
-				handleChangePage={handleChangePage}
-				handleChangeRowsPerPage={handleChangeRowsPerPage}
-			/>
-		</Stack>
-	);
-};
-
-export default DistributedUptimeMonitors;
diff --git a/client/src/Pages/DistributedUptimeStatus/Create/Components/VisuallyHiddenInput/index.jsx b/client/src/Pages/DistributedUptimeStatus/Create/Components/VisuallyHiddenInput/index.jsx
deleted file mode 100644
index fd002d2a4..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Create/Components/VisuallyHiddenInput/index.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-const VisuallyHiddenInput = ({ onChange }) => {
-	return (
-		<input
-			type="file"
-			accept="image/*"
-			onChange={onChange}
-			style={{
-				clip: "rect(0 0 0 0)",
-				clipPath: "inset(50%)",
-				height: 1,
-				overflow: "hidden",
-				position: "absolute",
-				bottom: 0,
-				left: 0,
-				whiteSpace: "nowrap",
-				width: 1,
-			}}
-		/>
-	);
-};
-
-export default VisuallyHiddenInput;
diff --git a/client/src/Pages/DistributedUptimeStatus/Create/index.jsx b/client/src/Pages/DistributedUptimeStatus/Create/index.jsx
deleted file mode 100644
index 308f9489b..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Create/index.jsx
+++ /dev/null
@@ -1,322 +0,0 @@
-// Components
-import { Stack, Typography, Button, Box } from "@mui/material";
-import ConfigBox from "../../../Components/ConfigBox";
-import Checkbox from "../../../Components/Inputs/Checkbox";
-import TextInput from "../../../Components/Inputs/TextInput";
-import VisuallyHiddenInput from "./Components/VisuallyHiddenInput";
-import Image from "../../../Components/Image";
-import LogoPlaceholder from "../../../assets/Images/logo_placeholder.svg";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import Search from "../../../Components/Inputs/Search";
-import MonitorList from "../../StatusPage/Create/Components/MonitorList";
-// Utils
-import { useTheme } from "@emotion/react";
-import { useState, useEffect } from "react";
-import { useParams } from "react-router-dom";
-import { useCreateStatusPage } from "../../StatusPage/Create/Hooks/useCreateStatusPage";
-import { statusPageValidation } from "../../../Validation/validation";
-import { buildErrors } from "../../../Validation/error";
-import { createToast } from "../../../Utils/toastUtils";
-import { useNavigate } from "react-router-dom";
-import { useMonitorsFetch } from "../../StatusPage/Create/Hooks/useMonitorsFetch";
-import { useTranslation } from "react-i18next";
-import { useFetchDepinStatusPage } from "../../../Hooks/useFetchDepinStatusPage";
-const CreateStatus = () => {
-	const theme = useTheme();
-	const { monitorId, url } = useParams();
-	const navigate = useNavigate();
-	const { t } = useTranslation();
-	const isCreate = typeof url === "undefined";
-
-	const [createStatusPage, isLoading, networkError] = useCreateStatusPage(isCreate);
-
-	const [statusPageIsLoading, statusPageNetworkError, statusPage, _, isPublished] =
-		useFetchDepinStatusPage({
-			url,
-			timeFrame: 30,
-			isCreate,
-		});
-
-	const [monitors, monitorsIsLoading, monitorsNetworkError] = useMonitorsFetch();
-
-	const BREADCRUMBS = [
-		{ name: "distributed uptime", path: "/distributed-uptime" },
-		{
-			name: "details",
-			path: `/distributed-uptime/${isCreate ? monitorId : statusPage?.monitors[0]}`,
-		},
-		{ name: isCreate ? "create status page" : "edit status page", path: `` },
-	];
-	// Local state
-	const [form, setForm] = useState({
-		type: "distributed",
-		isPublished: false,
-		url: url ?? Math.floor(Math.random() * 1000000).toFixed(0),
-		logo: undefined,
-		companyName: "",
-		monitors: [monitorId],
-	});
-	const [errors, setErrors] = useState({});
-	const [search, setSearch] = useState("");
-	const [selectedMonitors, setSelectedMonitors] = useState([]);
-
-	const handleFormChange = (e) => {
-		const { name, value, checked, type } = e.target;
-
-		// Check for errors
-		const { error } = statusPageValidation.validate(
-			{ [name]: value },
-			{ abortEarly: false }
-		);
-
-		setErrors((prev) => buildErrors(prev, name, error));
-
-		if (type === "checkbox") {
-			setForm({ ...form, [name]: checked });
-			return;
-		}
-		setForm({ ...form, [name]: value });
-	};
-
-	const handleMonitorsChange = (selectedMonitors) => {
-		handleFormChange({
-			target: {
-				name: "subMonitors",
-				value: selectedMonitors.map((monitor) => monitor._id),
-			},
-		});
-		setSelectedMonitors(selectedMonitors);
-	};
-
-	const handleImageUpload = (e) => {
-		const img = e.target?.files?.[0];
-		setForm((prev) => ({
-			...prev,
-			logo: img,
-		}));
-	};
-	const handleSubmit = async () => {
-		let logoToSubmit = undefined;
-
-		// Handle image
-		if (typeof form.logo !== "undefined" && typeof form.logo.src === "undefined") {
-			logoToSubmit = {
-				src: URL.createObjectURL(form.logo),
-				name: form.logo.name,
-				type: form.logo.type,
-				size: form.logo.size,
-			};
-		} else if (typeof form.logo !== "undefined") {
-			logoToSubmit = form.logo;
-		}
-		const formToSubmit = { ...form };
-		if (typeof logoToSubmit !== "undefined") {
-			formToSubmit.logo = logoToSubmit;
-		}
-		// Validate
-		const { error } = statusPageValidation.validate(formToSubmit, { abortEarly: false });
-		if (typeof error === "undefined") {
-			const success = await createStatusPage({ form: formToSubmit });
-			if (success) {
-				const verb = isCreate ? "created" : "updated";
-				createToast({ body: `Status page ${verb} successfully` });
-				navigate(`/status/distributed/${form.url}`);
-			}
-			return;
-		}
-		const newErrors = {};
-		error?.details?.forEach((err) => {
-			newErrors[err.path[0]] = err.message;
-		});
-		setErrors((prev) => ({ ...prev, ...newErrors }));
-	};
-
-	// If we are configuring, populate fields
-	useEffect(() => {
-		if (isCreate) return;
-		if (typeof statusPage === "undefined") {
-			return;
-		}
-
-		let newLogo = undefined;
-		if (statusPage.logo) {
-			newLogo = {
-				src: `data:${statusPage.logo.contentType};base64,${statusPage.logo.data}`,
-				name: "logo",
-				type: statusPage.logo.contentType,
-				size: null,
-			};
-		}
-
-		setForm((prev) => {
-			return {
-				...prev,
-				companyName: statusPage?.companyName,
-				isPublished: statusPage?.isPublished,
-				timezone: statusPage?.timezone,
-				monitors: statusPage?.monitors,
-				subMonitors: statusPage?.subMonitors.map((monitor) => monitor._id),
-				color: statusPage?.color,
-				logo: newLogo,
-			};
-		});
-		setSelectedMonitors(statusPage?.subMonitors);
-	}, [isCreate, statusPage]);
-
-	const imgSrc = form?.logo?.src
-		? form.logo.src
-		: form.logo
-			? URL.createObjectURL(form.logo)
-			: undefined;
-
-	return (
-		<Stack gap={theme.spacing(10)}>
-			<Breadcrumbs list={BREADCRUMBS} />
-			<Typography variant="h1">
-				<Typography
-					component="span"
-					fontSize="inherit"
-				>
-					{isCreate
-						? t("distributedUptimeStatusCreateYour")
-						: t("distributedUptimeStatusEditYour")}{" "}
-				</Typography>
-				<Typography
-					component="span"
-					variant="h2"
-					fontSize="inherit"
-					fontWeight="inherit"
-				>
-					{t("distributedUptimeStatusCreateStatusPage")}
-				</Typography>
-			</Typography>
-			<ConfigBox>
-				<Stack>
-					<Typography component="h2">
-						{t("distributedUptimeStatusCreateStatusPageAccess")}
-					</Typography>
-					<Typography component="p">
-						{t("distributedUptimeStatusCreateStatusPageReady")}
-					</Typography>
-				</Stack>
-				<Stack gap={theme.spacing(18)}>
-					<Checkbox
-						id="publish"
-						name="isPublished"
-						label={t("distributedUptimeStatusPublishedLabel")}
-						isChecked={form.isPublished}
-						onChange={handleFormChange}
-					/>
-				</Stack>
-			</ConfigBox>
-			<ConfigBox>
-				<Stack gap={theme.spacing(6)}>
-					<Typography component="h2">
-						{t("distributedUptimeStatusBasicInfoHeader")}
-					</Typography>
-					<Typography component="p">
-						{t("distributedUptimeStatusBasicInfoDescription")}
-					</Typography>
-				</Stack>
-				<Stack gap={theme.spacing(18)}>
-					<TextInput
-						id="companyName"
-						name="companyName"
-						type="text"
-						label={t("distributedUptimeStatusCompanyNameLabel")}
-						placeholder="Company name"
-						value={form.companyName}
-						onChange={handleFormChange}
-						helperText={errors["companyName"]}
-						error={errors["companyName"] ? true : false}
-					/>
-					<TextInput
-						id="url"
-						name="url"
-						type="url"
-						label={t("distributedUptimeStatusPageAddressLabel")}
-						disabled={!isCreate}
-						value={form.url}
-						onChange={handleFormChange}
-						helperText={errors["url"]}
-						error={errors["url"] ? true : false}
-					/>
-				</Stack>
-			</ConfigBox>
-			<ConfigBox>
-				<Stack gap={theme.spacing(6)}>
-					<Typography component="h2">{t("distributedUptimeStatusLogoHeader")}</Typography>
-					<Typography component="p">
-						{t("distributedUptimeStatusLogoDescription")}{" "}
-					</Typography>
-				</Stack>
-				<Stack
-					gap={theme.spacing(18)}
-					alignItems="center"
-				>
-					<Image
-						src={imgSrc}
-						alt="Logo"
-						minWidth={"300px"}
-						minHeight={"100px"}
-						maxWidth={"300px"}
-						maxHeight={"300px"}
-						placeholder={LogoPlaceholder}
-					/>
-					<Box>
-						<Button
-							component="label"
-							role={undefined}
-							variant="contained"
-							color="accent"
-							tabIndex={-1}
-						>
-							{t("distributedUptimeStatusLogoUploadButton")}
-							<VisuallyHiddenInput onChange={handleImageUpload} />
-						</Button>
-					</Box>
-				</Stack>
-			</ConfigBox>
-			<ConfigBox>
-				<Stack>
-					<Typography component="h2">
-						{t("distributedUptimeStatusStandardMonitorsHeader")}
-					</Typography>
-					<Typography component="p">
-						{t("distributedUptimeStatusStandardMonitorsDescription")}
-					</Typography>
-				</Stack>
-				<Stack gap={theme.spacing(18)}>
-					<Search
-						options={monitors ?? []}
-						multiple={true}
-						filteredBy="name"
-						value={selectedMonitors}
-						inputValue={search}
-						handleInputChange={setSearch}
-						handleChange={handleMonitorsChange}
-					/>
-					<MonitorList
-						monitors={monitors}
-						selectedMonitors={selectedMonitors}
-						setSelectedMonitors={handleMonitorsChange}
-					/>
-				</Stack>
-			</ConfigBox>
-			<Stack
-				direction="row"
-				justifyContent="flex-end"
-			>
-				<Button
-					variant="contained"
-					color="accent"
-					onClick={handleSubmit}
-				>
-					{t("settingsSave")}
-				</Button>
-			</Stack>
-		</Stack>
-	);
-};
-
-export default CreateStatus;
diff --git a/client/src/Pages/DistributedUptimeStatus/Status/Components/MonitorsList/index.jsx b/client/src/Pages/DistributedUptimeStatus/Status/Components/MonitorsList/index.jsx
deleted file mode 100644
index d9ed16e63..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Status/Components/MonitorsList/index.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// Components
-import { Stack, Box } from "@mui/material";
-import Host from "../../../../../Components/Host";
-import DePINStatusPageBarChart from "../../../../../Components/Charts/DePINStatusPageBarChart";
-import { StatusLabel } from "../../../../../Components/Label";
-
-//Utils
-import { useTheme } from "@mui/material/styles";
-import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
-import PropTypes from "prop-types";
-const MonitorsList = ({
-	isLoading = false,
-	shouldRender = true,
-	monitors = [],
-	timeFrame,
-}) => {
-	const theme = useTheme();
-	const { determineState } = useUtils();
-	return (
-		<>
-			{monitors?.map((monitor) => {
-				const status = determineState(monitor);
-				return (
-					<Stack
-						key={monitor._id}
-						width="100%"
-						gap={theme.spacing(2)}
-					>
-						<Host
-							key={monitor._id}
-							url={monitor.url}
-							title={monitor.name}
-							percentageColor={monitor.percentageColor}
-							percentage={monitor.percentage}
-						/>
-						<Stack
-							direction="row"
-							alignItems="center"
-							gap={theme.spacing(20)}
-						>
-							<Box flex={9}>
-								<DePINStatusPageBarChart
-									checks={monitor?.checks?.slice().reverse()}
-									daysToShow={timeFrame}
-								/>
-							</Box>
-							<Box flex={1}>
-								<StatusLabel
-									status={status}
-									text={status}
-									customStyles={{ textTransform: "capitalize" }}
-								/>
-							</Box>
-						</Stack>
-					</Stack>
-				);
-			})}
-		</>
-	);
-};
-
-MonitorsList.propTypes = {
-	monitors: PropTypes.array.isRequired,
-};
-
-export default MonitorsList;
diff --git a/client/src/Pages/DistributedUptimeStatus/Status/Components/Skeleton/index.jsx b/client/src/Pages/DistributedUptimeStatus/Status/Components/Skeleton/index.jsx
deleted file mode 100644
index 233fc3c06..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Status/Components/Skeleton/index.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Stack, Skeleton } from "@mui/material";
-
-export const SkeletonLayout = () => {
-	return (
-		<Stack>
-			<Skeleton
-				variant="rectangular"
-				height={"90vh"}
-			/>
-		</Stack>
-	);
-};
-
-export default SkeletonLayout;
diff --git a/client/src/Pages/DistributedUptimeStatus/Status/Components/TimeframeHeader/index.jsx b/client/src/Pages/DistributedUptimeStatus/Status/Components/TimeframeHeader/index.jsx
deleted file mode 100644
index 7ee4ff292..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Status/Components/TimeframeHeader/index.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Stack, Button, ButtonGroup } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { useTranslation } from "react-i18next";
-
-const TimeFrameHeader = ({ timeFrame, setTimeFrame, sx, ...props }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<Stack
-			direction="row"
-			justifyContent="flex-end"
-			sx={{ ...sx }}
-			{...props}
-		>
-			<ButtonGroup>
-				<Button
-					variant="group"
-					filled={(timeFrame === 30).toString()}
-					onClick={() => setTimeFrame(30)}
-				>
-					{t("distributedUptimeStatus30Days")}
-				</Button>
-				<Button
-					variant="group"
-					filled={(timeFrame === 60).toString()}
-					onClick={() => setTimeFrame(60)}
-				>
-					{t("distributedUptimeStatus60Days")}
-				</Button>
-				<Button
-					variant="group"
-					filled={(timeFrame === 90).toString()}
-					onClick={() => setTimeFrame(90)}
-				>
-					{t("distributedUptimeStatus90Days")}
-				</Button>
-			</ButtonGroup>
-		</Stack>
-	);
-};
-
-export default TimeFrameHeader;
diff --git a/client/src/Pages/DistributedUptimeStatus/Status/index.jsx b/client/src/Pages/DistributedUptimeStatus/Status/index.jsx
deleted file mode 100644
index 117a297e5..000000000
--- a/client/src/Pages/DistributedUptimeStatus/Status/index.jsx
+++ /dev/null
@@ -1,319 +0,0 @@
-//Components
-import DistributedUptimeMap from "../../DistributedUptime/Details/Components/DistributedUptimeMap";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import { Stack, Typography } from "@mui/material";
-import DeviceTicker from "../../DistributedUptime/Details/Components/DeviceTicker";
-import DistributedUptimeResponseChart from "../../DistributedUptime/Details/Components/DistributedUptimeResponseChart";
-import NextExpectedCheck from "../../DistributedUptime/Details/Components/NextExpectedCheck";
-import Footer from "../../DistributedUptime/Details/Components/Footer";
-import StatBoxes from "../../DistributedUptime/Details/Components/StatBoxes";
-import ControlsHeader from "../../StatusPage/Status/Components/ControlsHeader";
-import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
-import GenericFallback from "../../../Components/GenericFallback";
-import Dialog from "../../../Components/Dialog";
-import SkeletonLayout from "./Components/Skeleton";
-import UptLogo from "../../../assets/icons/upt_logo.png";
-import PeopleAltOutlinedIcon from "@mui/icons-material/PeopleAltOutlined";
-import InfoBox from "../../../Components/InfoBox";
-import StatusHeader from "../../DistributedUptime/Details/Components/StatusHeader";
-import MonitorsList from "./Components/MonitorsList";
-import { RowContainer } from "../../../Components/StandardContainer";
-
-//Utils
-import { useTheme } from "@mui/material/styles";
-import { useState, useEffect, useRef } from "react";
-import { useParams } from "react-router-dom";
-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";
-import { safelyParseFloat } from "../../../Utils/utils";
-import { useNavigate, useLocation } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { useSelector, useDispatch } from "react-redux";
-import { setMode } from "../../../Features/UI/uiSlice";
-
-// Responsive
-import { useMediaQuery } from "@mui/material";
-
-const DistributedUptimeStatus = () => {
-	const { url } = useParams();
-	const location = useLocation();
-	const { t } = useTranslation();
-	const isPublic = location.pathname.startsWith("/status/distributed/public");
-	const elementToCapture = useRef(null);
-
-	// Redux state
-	const mode = useSelector((state) => state.ui.mode);
-	const originalModeRef = useRef(null);
-
-	// Local State
-	const [dateRange, setDateRange] = useState("recent");
-	const [isDeleteOpen, setIsDeleteOpen] = useState(false);
-	const [timeFrame, setTimeFrame] = useState(30);
-	// Utils
-	const theme = useTheme();
-	const isSmallScreen = useMediaQuery(theme.breakpoints.down("sm"));
-	const navigate = useNavigate();
-	const dispatch = useDispatch();
-
-	const [
-		statusPageIsLoading,
-		statusPageNetworkError,
-		statusPage,
-		monitorId,
-		isPublished,
-	] = useFetchDepinStatusPage({
-		url,
-		timeFrame,
-	});
-
-	const [isLoading, networkError, connectionStatus, monitor, lastUpdateTrigger] =
-		useSubscribeToDepinDetails({ monitorId, dateRange, isPublic, isPublished });
-
-	const [deleteStatusPage, isDeleting] = useStatusPageDelete(() => {
-		navigate("/distributed-uptime");
-	}, url);
-	// Constants
-	const BREADCRUMBS = [
-		{ name: "Distributed Uptime", path: "/distributed-uptime" },
-		{ name: "details", path: `/distributed-uptime/${monitorId}` },
-		{ name: "status", path: `` },
-	];
-
-	let sx = {};
-	if (isPublic) {
-		sx = {
-			paddingTop: "10vh",
-			paddingRight: "10vw",
-			paddingBottom: "10vh",
-			paddingLeft: "10vw",
-		};
-	}
-
-	// Default to dark mode
-	useEffect(() => {
-		const cleanup = () => {
-			if (originalModeRef.current === null) {
-				originalModeRef.current = mode;
-			}
-
-			if (isPublic) {
-				dispatch(setMode(originalModeRef.current));
-			}
-		};
-
-		if (isPublic) {
-			dispatch(setMode("dark"));
-		}
-
-		window.addEventListener("beforeunload", cleanup);
-		return () => {
-			window.removeEventListener("beforeunload", cleanup);
-		};
-	}, [dispatch, isPublic]);
-
-	// Done loading, a status page doesn't exist
-	if (!statusPageIsLoading && typeof statusPage === "undefined") {
-		return (
-			<Stack sx={sx}>
-				<GenericFallback>
-					<Typography
-						variant="h1"
-						marginY={theme.spacing(4)}
-						color={theme.palette.primary.contrastTextTertiary}
-					>
-						{t("distributedUptimeStatusPageNotSetUp")}
-					</Typography>
-					<Typography>{t("distributedUptimeStatusContactAdmin")}</Typography>
-				</GenericFallback>
-			</Stack>
-		);
-	}
-
-	// Done loading, a status page exists but is not public
-	if (!statusPageIsLoading && isPublic && statusPage.isPublished === false) {
-		return (
-			<Stack sx={sx}>
-				<GenericFallback>
-					<Typography>{t("distributedUptimeStatusPageNotPublic")}</Typography>
-				</GenericFallback>
-			</Stack>
-		);
-	}
-
-	if (isLoading || statusPageIsLoading) {
-		return <SkeletonLayout />;
-	}
-
-	if (networkError || statusPageNetworkError) {
-		return (
-			<GenericFallback>
-				<Typography
-					variant="h1"
-					marginY={theme.spacing(4)}
-					color={theme.palette.primary.contrastTextTertiary}
-				>
-					{t("networkError")}
-				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
-			</GenericFallback>
-		);
-	}
-
-	if (
-		typeof statusPage === "undefined" ||
-		typeof monitor === "undefined" ||
-		monitor.totalChecks === 0
-	) {
-		return (
-			<Stack gap={theme.spacing(10)}>
-				<Breadcrumbs list={BREADCRUMBS} />
-				<GenericFallback>
-					<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
-				</GenericFallback>
-			</Stack>
-		);
-	}
-
-	return (
-		<Stack
-			ref={elementToCapture}
-			direction="column"
-			gap={theme.spacing(10)}
-			sx={{
-				...sx,
-			}}
-		>
-			{!isPublic && <Breadcrumbs list={BREADCRUMBS} />}
-
-			<ControlsHeader
-				statusPage={statusPage}
-				isPublic={isPublic}
-				isDeleting={isDeleting}
-				isDeleteOpen={isDeleteOpen}
-				setIsDeleteOpen={setIsDeleteOpen}
-				url={url}
-				type="distributed"
-			/>
-			<StatusHeader
-				monitor={monitor}
-				connectionStatus={connectionStatus}
-				elementToCapture={elementToCapture}
-			/>
-
-			<SubHeader
-				direction={{ s: "column", md: "row" }}
-				headerText={t("distributedStatusHeaderText")}
-				subHeaderText={t("distributedStatusSubHeaderText")}
-				gap={isSmallScreen ? theme.spacing(10) : 0}
-				alignItems={{ s: "flex-start", md: "flex-end" }}
-			>
-				<RowContainer>
-					<Stack>
-						<Typography variant={`body2`}>
-							{t("distributedRightCategoryTitle")}
-						</Typography>
-						<Typography variant={`h2`}>{statusPage.companyName}</Typography>
-					</Stack>
-				</RowContainer>
-			</SubHeader>
-
-			<NextExpectedCheck
-				lastUpdateTime={monitor?.timeSinceLastCheck ?? 0}
-				interval={monitor?.interval ?? 0}
-				trigger={lastUpdateTrigger}
-			/>
-			<MonitorTimeFrameHeader
-				dateRange={dateRange}
-				setDateRange={setDateRange}
-			/>
-			<Stack
-				gap={theme.spacing(8)}
-				direction={{ s: "column", md: "row" }}
-			>
-				<DistributedUptimeMap
-					checks={monitor?.groupedMapChecks ?? []}
-					width={isSmallScreen ? "100%" : "50%"}
-				/>
-				<Stack
-					width={{ s: "100%", md: "50%" }}
-					gap={theme.spacing(8)}
-				>
-					<Stack
-						direction="row"
-						gap={theme.spacing(8)}
-					>
-						<InfoBox
-							heading={t("distributedUptimeStatusDevices")}
-							subHeading={monitor?.totalChecks ?? 0}
-							icon={PeopleAltOutlinedIcon}
-							alt="Upt Logo"
-							sx={{ width: "50%" }}
-						/>
-						<InfoBox
-							heading={
-								isSmallScreen
-									? t("distributedUptimeStatusUpt")
-									: t("distributedUptimeStatusUptBurned")
-							}
-							subHeading={safelyParseFloat(monitor?.uptBurnt).toFixed(4)}
-							img={UptLogo}
-							alt={t("distributedUptimeStatusUptLogo")}
-							sx={{ width: "50%" }}
-						/>
-					</Stack>
-
-					<DeviceTicker
-						data={monitor?.latestChecks ?? []}
-						connectionStatus={connectionStatus}
-					/>
-				</Stack>
-			</Stack>
-			<DistributedUptimeResponseChart checks={monitor?.groupedChecks ?? []} />
-			<StatBoxes
-				monitor={monitor}
-				lastUpdateTrigger={lastUpdateTrigger}
-			/>
-
-			<SubHeader
-				shouldRender={statusPage?.subMonitors?.length > 0}
-				direction={{ s: "column", md: "row" }}
-				headerText={t("distributedStatusServerMonitors")}
-				subHeaderText={t("distributedStatusServerMonitorsDescription")}
-				gap={isSmallScreen ? theme.spacing(10) : 0}
-				alignItems={{ s: "flex-start", md: "flex-end" }}
-			>
-				<TimeFrameHeader
-					timeFrame={timeFrame}
-					setTimeFrame={setTimeFrame}
-					alignSelf="flex-start"
-				/>
-			</SubHeader>
-
-			<MonitorsList
-				monitors={statusPage?.subMonitors}
-				timeFrame={timeFrame}
-			/>
-			<Footer />
-			<Dialog
-				// open={isOpen.deleteStats}
-				title={t("distributedUptimeStatusPageDeleteDialog")}
-				onConfirm={() => {
-					deleteStatusPage();
-					setIsDeleteOpen(false);
-				}}
-				onCancel={() => {
-					setIsDeleteOpen(false);
-				}}
-				open={isDeleteOpen}
-				confirmationButtonLabel={t("distributedUptimeStatusPageDeleteConfirm")}
-				description={t("distributedUptimeStatusPageDeleteDescription")}
-				isLoading={isDeleting || isLoading}
-			/>
-		</Stack>
-	);
-};
-
-export default DistributedUptimeStatus;
diff --git a/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx b/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
index 7546e8725..dcbf96399 100644
--- a/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
+++ b/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
@@ -22,10 +22,6 @@ const Controls = ({ isDeleteOpen, setIsDeleteOpen, isDeleting, url, type }) => {
 		return null;
 	}
 
-	if (currentPath.startsWith("/status/distributed/public")) {
-		return null;
-	}
-
 	return (
 		<Stack
 			direction="row"
@@ -48,8 +44,6 @@ const Controls = ({ isDeleteOpen, setIsDeleteOpen, isDeleting, url, type }) => {
 					onClick={() => {
 						if (type === "uptime") {
 							navigate(`/status/uptime/configure/${url}`);
-						} else {
-							navigate(`/status/distributed/configure/${url}`);
 						}
 					}}
 					sx={{
diff --git a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
index a7b69ded0..04d7a6cfb 100644
--- a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
+++ b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
@@ -23,10 +23,7 @@ const StatusPagesTable = ({ data }) => {
 			onClick: (e, row) => {
 				if (row.isPublished) {
 					e.stopPropagation();
-					const url =
-						row.type === "distributed"
-							? `/status/distributed/public/${row.url}`
-							: `/status/uptime/public/${row.url}`;
+					const url = `/status/uptime/public/${row.url}`;
 					window.open(url, "_blank", "noopener,noreferrer");
 				}
 			},
@@ -79,11 +76,7 @@ const StatusPagesTable = ({ data }) => {
 	];
 
 	const handleRowClick = (statusPage) => {
-		if (statusPage.type === "distributed") {
-			navigate(`/status/distributed/${statusPage.url}`);
-		} else if (statusPage.type === "uptime") {
-			navigate(`/status/uptime/${statusPage.url}`);
-		}
+		navigate(`/status/uptime/${statusPage.url}`);
 	};
 
 	return (
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index e334af912..0f2079265 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -27,15 +27,6 @@ import Infrastructure from "../Pages/Infrastructure/Monitors";
 import InfrastructureCreate from "../Pages/Infrastructure/Create";
 import InfrastructureDetails from "../Pages/Infrastructure/Details";
 
-// Distributed Uptime
-import DistributedUptimeMonitors from "../Pages/DistributedUptime/Monitors";
-import CreateDistributedUptime from "../Pages/DistributedUptime/Create";
-import DistributedUptimeDetails from "../Pages/DistributedUptime/Details";
-
-// Distributed Uptime Status
-import CreateDistributedUptimeStatus from "../Pages/DistributedUptimeStatus/Create";
-import DistributedUptimeStatus from "../Pages/DistributedUptimeStatus/Status";
-
 // Server Status
 import ServerUnreachable from "../Pages/ServerUnreachable";
 
@@ -99,39 +90,6 @@ const Routes = () => {
 					path="/uptime/configure/:monitorId/"
 					element={<UptimeConfigure />}
 				/>
-				{/* <Route
-					path="/distributed-uptime"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<DistributedUptimeMonitors />{" "}
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
-
-				{/* <Route
-					path="/distributed-uptime/create"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<CreateDistributedUptime />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/>
-				<Route
-					path="/distributed-uptime/configure/:monitorId"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<CreateDistributedUptime />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
-				{/* <Route
-					path="/distributed-uptime/:monitorId"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<DistributedUptimeDetails />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
 
 				<Route
 					path="pagespeed"
@@ -180,43 +138,16 @@ const Routes = () => {
 					element={<Status />}
 				/>
 
-				{/* <Route
-					path="/status/distributed/:url"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<DistributedUptimeStatus />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
-
 				<Route
 					path="status/uptime/create"
 					element={<CreateStatus />}
 				/>
 
-				{/* <Route
-					path="/status/distributed/create/:monitorId"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<CreateDistributedUptimeStatus />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
-
 				<Route
 					path="status/uptime/configure/:url"
 					element={<CreateStatus />}
 				/>
 
-				{/* <Route
-					path="/status/distributed/configure/:url"
-					element={
-						<ProtectedDistributedUptimeRoute>
-							<CreateDistributedUptimeStatus />
-						</ProtectedDistributedUptimeRoute>
-					}
-				/> */}
-
 				<Route
 					path="integrations"
 					element={<Integrations />}
@@ -283,10 +214,6 @@ const Routes = () => {
 				path="/status/uptime/public/:url"
 				element={<Status />}
 			/>
-			{/* <Route
-				path="/status/distributed/public/:url"
-				element={<DistributedUptimeStatus />}
-			/> */}
 
 			<Route
 				path="/server-unreachable"
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index cf2202c33..7cfa5a7f1 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -847,7 +847,7 @@ class NetworkService {
 	 */
 	async fetchGithubLatestRelease() {
 		return this.axiosInstance.get(
-			"https://api.github.com/repos/bluewave-labs/bluewave-uptime/releases/latest",
+			"https://api.github.com/repos/bluewave-labs/checkmate/releases/latest",
 			{
 				headers: {
 					Authorization: null, // No authorization header for this request
@@ -856,141 +856,6 @@ class NetworkService {
 		);
 	}
 
-	getDistributedUptimeMonitors(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
-
-		const params = new URLSearchParams();
-
-		if (limit) params.append("limit", limit);
-		if (types) {
-			types.forEach((type) => {
-				params.append("type", type);
-			});
-		}
-		if (page) params.append("page", page);
-		if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
-		if (filter) params.append("filter", filter);
-		if (field) params.append("field", field);
-		if (order) params.append("order", order);
-
-		if (this.eventSource) {
-			this.eventSource.close();
-		}
-
-		const url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/${teamId}/initial?${params.toString()}`;
-		return this.axiosInstance.get(url);
-	}
-
-	subscribeToDistributedUptimeMonitors(config) {
-		const {
-			teamId,
-			onUpdate,
-			onError,
-			onOpen,
-			limit,
-			types,
-			page,
-			rowsPerPage,
-			filter,
-			field,
-			order,
-		} = config;
-
-		const params = new URLSearchParams();
-
-		if (limit) params.append("limit", limit);
-		if (types) {
-			types.forEach((type) => {
-				params.append("type", type);
-			});
-		}
-		if (page) params.append("page", page);
-		if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
-		if (filter) params.append("filter", filter);
-		if (field) params.append("field", field);
-		if (order) params.append("order", order);
-
-		if (this.eventSource) {
-			this.eventSource.close();
-		}
-
-		const url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/${teamId}?${params.toString()}`;
-		this.eventSource = new EventSource(url);
-
-		this.eventSource.onopen = () => {
-			onOpen?.();
-		};
-
-		this.eventSource.addEventListener("open", (e) => {});
-
-		this.eventSource.onmessage = (event) => {
-			const data = JSON.parse(event.data);
-			onUpdate(data);
-		};
-
-		this.eventSource.onerror = (error) => {
-			console.error("Monitor stream error:", error);
-			onError?.();
-			this.eventSource.close();
-		};
-
-		// Returns a cleanup function
-		return () => {
-			if (this.eventSource) {
-				this.eventSource.close();
-				this.eventSource = null;
-			}
-			return () => {
-				console.log("Nothing to cleanup");
-			};
-		};
-	}
-
-	getDistributedUptimeDetails(config) {
-		const params = new URLSearchParams();
-		const { monitorId, dateRange, normalize, isPublic } = config;
-		if (dateRange) params.append("dateRange", dateRange);
-		if (normalize) params.append("normalize", normalize);
-		let url;
-		if (isPublic) {
-			url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/details/public/${monitorId}/initial?${params.toString()}`;
-		} else {
-			url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/details/${monitorId}/initial?${params.toString()}`;
-		}
-		return this.axiosInstance.get(url);
-	}
-
-	subscribeToDistributedUptimeDetails(config) {
-		const params = new URLSearchParams();
-		const { monitorId, onUpdate, onOpen, onError, dateRange, normalize } = config;
-		if (dateRange) params.append("dateRange", dateRange);
-		if (normalize) params.append("normalize", normalize);
-
-		const url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/details/${monitorId}?${params.toString()}`;
-		this.eventSource = new EventSource(url);
-
-		this.eventSource.onopen = (e) => {
-			onOpen?.();
-		};
-
-		this.eventSource.onmessage = (event) => {
-			const data = JSON.parse(event.data);
-			onUpdate(data);
-		};
-
-		this.eventSource.onerror = (error) => {
-			console.error("Monitor stream error:", error);
-			onError?.();
-			this.eventSource.close();
-		};
-		return () => {
-			if (this.eventSource) {
-				this.eventSource.close();
-				this.eventSource = null;
-			}
-		};
-	}
-
 	async getStatusPage() {
 		return this.axiosInstance.get(`/status-page`, {
 			headers: {
@@ -1010,20 +875,6 @@ class NetworkService {
 			},
 		});
 	}
-	async getDistributedStatusPageByUrl(config) {
-		const { url, type, timeFrame } = config;
-		const params = new URLSearchParams();
-		params.append("type", type);
-		params.append("timeFrame", timeFrame);
-		return this.axiosInstance.get(
-			`/status-page/distributed/${url}?${params.toString()}`,
-			{
-				headers: {
-					"Content-Type": "application/json",
-				},
-			}
-		);
-	}
 
 	async getStatusPagesByTeamId(config) {
 		const { teamId } = config;
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 211e62995..d94f7c49a 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -239,7 +239,7 @@ const logoImageValidation = joi
 	.optional(); // Make entire object optional
 
 const statusPageValidation = joi.object({
-	type: joi.string().valid("uptime", "distributed").required(),
+	type: joi.string().valid("uptime").required(),
 	isPublished: joi.bool(),
 	companyName: joi
 		.string()
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 0c739d349..12442246c 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -65,8 +65,6 @@
 	"settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
 	"settingsThemeMode": "Theme Mode",
 	"settingsLanguage": "Language",
-	"settingsDistributedUptime": "Distributed uptime",
-	"settingsDistributedUptimeDescription": "Enable/disable distributed uptime monitoring.",
 	"settingsEnabled": "Enabled",
 	"settingsDisabled": "Disabled",
 	"settingsHistoryAndMonitoring": "History of monitoring",
@@ -86,8 +84,6 @@
 	"settingsRemoveAllMonitorsButton": "Remove all monitors",
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
-	"settingsWallet": "Wallet",
-	"settingsWalletDescription": "Connect your wallet here. This is required for the Distributed Uptime monitor to connect to multiple nodes globally.",
 	"settingsAbout": "About",
 	"settingsDevelopedBy": "Developed by Bluewave Labs.",
 	"settingsSave": "Save",
@@ -136,10 +132,6 @@
 	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
 	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
 	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
-	"distributedUptimeDetailsFooterHeading": "Made with ❤️ by UpRock & Bluewave Labs",
-	"distributedUptimeDetailsFooterBuilt": "Built on",
-	"distributedUptimeDetailsFooterSolana": "Solana",
-	"distributedUptimeDetailsMonitorHeader": "Distributed Uptime Monitoring powered by DePIN",
 	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
 	"notifications": {
@@ -488,7 +480,6 @@
 		"uptime": "Uptime",
 		"pagespeed": "Pagespeed",
 		"infrastructure": "Infrastructure",
-		"distributedUptime": "Distributed Uptime",
 		"incidents": "Incidents",
 		"statusPages": "Status pages",
 		"maintenance": "Maintenance",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 773d3c023..fdc3e50a6 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -87,7 +87,6 @@
 	"settingsRemoveAllMonitorsDialogTitle": "Você deseja remover todos os monitores?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Sim, remova todos os monitores",
 	"settingsWallet": "Carteira",
-	"settingsWalletDescription": "Conecte sua carteira aqui. Isso é necessário para que o Distributed Uptime Monitor se conecte a vários nós globalmente.",
 	"settingsAbout": "Sobre",
 	"settingsDevelopedBy": "Desenvolvido pela Bluewave Labs.",
 	"settingsSave": "Salvar",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 817867c2d..fce8fd6ab 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -65,8 +65,6 @@
 	"settingsAppearanceDescription": "Переключение между светлым и темным режимом или изменение языка пользовательского интерфейса",
 	"settingsThemeMode": "Тема",
 	"settingsLanguage": "Язык",
-	"settingsDistributedUptime": "Distributed uptime",
-	"settingsDistributedUptimeDescription": "Включить/выключить distributed uptime monitoring.",
 	"settingsEnabled": "Включено",
 	"settingsDisabled": "Выключено",
 	"settingsHistoryAndMonitoring": "История и мониторинг",
@@ -86,8 +84,6 @@
 	"settingsRemoveAllMonitorsButton": "Удалить все демонстрационные мониторы",
 	"settingsRemoveAllMonitorsDialogTitle": "Хотите удалить все мониторы?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Да, очистить все мониторы",
-	"settingsWallet": "Кошелёк",
-	"settingsWalletDescription": "Подключите свой кошелек здесь. Это необходимо для того, чтобы монитор Distributed Uptime мог подключиться к нескольким узлам по всему миру.",
 	"settingsAbout": "О",
 	"settingsDevelopedBy": "Developed by Bluewave Labs.",
 	"settingsSave": "Сохранить",
@@ -139,7 +135,6 @@
 	"distributedUptimeDetailsFooterHeading": "Made with ❤️ by UpRock & Bluewave Labs",
 	"distributedUptimeDetailsFooterBuilt": "Built on",
 	"distributedUptimeDetailsFooterSolana": "Solana",
-	"distributedUptimeDetailsMonitorHeader": "Distributed Uptime Monitoring powered by DePIN",
 	"distributedUptimeDetailsStatusHeaderUptime": "Аптайм:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Последнее обновление",
 	"notifications": {
diff --git a/server/controllers/diagnosticController.js b/server/controllers/diagnosticController.js
index c46ac5ccb..8fa5fa42b 100755
--- a/server/controllers/diagnosticController.js
+++ b/server/controllers/diagnosticController.js
@@ -4,25 +4,11 @@ const SERVICE_NAME = "diagnosticController";
 class DiagnosticController {
 	constructor(db) {
 		this.db = db;
-		this.getDistributedUptimeDbExecutionStats =
-			this.getDistributedUptimeDbExecutionStats.bind(this);
 		this.getMonitorsByTeamIdExecutionStats =
 			this.getMonitorsByTeamIdExecutionStats.bind(this);
 		this.getDbStats = this.getDbStats.bind(this);
 	}
 
-	async getDistributedUptimeDbExecutionStats(req, res, next) {
-		try {
-			const data = await this.db.getDistributedUptimeDbExecutionStats(req);
-			return res.success({
-				msg: "OK",
-				data,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getDbExecutionStats"));
-		}
-	}
-
 	async getMonitorsByTeamIdExecutionStats(req, res, next) {
 		try {
 			const data = await this.db.getMonitorsByTeamIdExecutionStats(req);
diff --git a/server/controllers/distributedUptimeController.js b/server/controllers/distributedUptimeController.js
deleted file mode 100755
index c036e97bc..000000000
--- a/server/controllers/distributedUptimeController.js
+++ /dev/null
@@ -1,339 +0,0 @@
-import { handleError } from "./controllerUtils.js";
-import Monitor from "../db/models/Monitor.js";
-import DistributedUptimeCheck from "../db/models/DistributedUptimeCheck.js";
-const SERVICE_NAME = "DistributedUptimeQueueController";
-
-class DistributedUptimeController {
-	constructor({ db, http, statusService, logger }) {
-		this.db = db;
-		this.http = http;
-		this.statusService = statusService;
-		this.logger = logger;
-		this.resultsCallback = this.resultsCallback.bind(this);
-		this.getDistributedUptimeMonitors = this.getDistributedUptimeMonitors.bind(this);
-		this.subscribeToDistributedUptimeMonitors =
-			this.subscribeToDistributedUptimeMonitors.bind(this);
-
-		this.subscribeToDistributedUptimeMonitorDetails =
-			this.subscribeToDistributedUptimeMonitorDetails.bind(this);
-		this.getDistributedUptimeMonitorDetails =
-			this.getDistributedUptimeMonitorDetails.bind(this);
-	}
-
-	async resultsCallback(req, res, next) {
-		try {
-			const { id, result } = req.body;
-			// Calculate response time
-			const {
-				first_byte_took,
-				body_read_took,
-				dns_took,
-				conn_took,
-				connect_took,
-				tls_took,
-				status_code,
-				error,
-				upt_burnt,
-			} = result;
-
-			// Calculate response time
-			const responseTime = first_byte_took / 1_000_000;
-			if (!isFinite(responseTime) || responseTime <= 0 || responseTime > 30000) {
-				this.logger.info({
-					message: `Unreasonable response time detected: ${responseTime}ms from first_byte_took: ${first_byte_took}ns`,
-					service: SERVICE_NAME,
-					method: "resultsCallback",
-				});
-				return;
-			}
-
-			// Calculate if server is up or down
-			const isErrorStatus = status_code >= 400;
-			const hasError = error !== "";
-
-			const status = isErrorStatus || hasError ? false : true;
-
-			// Build response
-			const distributedUptimeResponse = {
-				monitorId: id,
-				type: "distributed_http",
-				payload: result,
-				status,
-				code: status_code,
-				responseTime,
-				first_byte_took,
-				body_read_took,
-				dns_took,
-				conn_took,
-				connect_took,
-				tls_took,
-				upt_burnt,
-			};
-			if (error) {
-				const code = status_code || this.NETWORK_ERROR;
-				distributedUptimeResponse.code = code;
-				distributedUptimeResponse.message =
-					this.http.STATUS_CODES[code] || "Network Error";
-			} else {
-				distributedUptimeResponse.message = this.http.STATUS_CODES[status_code];
-			}
-
-			await this.statusService.updateStatus(distributedUptimeResponse);
-
-			res.status(200).json({ message: "OK" });
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "resultsCallback"));
-		}
-	}
-
-	async getDistributedUptimeMonitors(req, res, next) {
-		try {
-			const monitors = await this.db.getMonitorsWithChecksByTeamId(req);
-			return res.success({
-				msg: "OK",
-				data: monitors,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getDistributedUptimeMonitors"));
-		}
-	}
-
-	async subscribeToDistributedUptimeMonitors(req, res, next) {
-		try {
-			res.setHeader("Content-Type", "text/event-stream");
-			res.setHeader("Cache-Control", "no-cache");
-			res.setHeader("Connection", "keep-alive");
-			res.setHeader("Access-Control-Allow-Origin", "*");
-			// Disable compression
-			req.headers["accept-encoding"] = "identity";
-			res.removeHeader("Content-Encoding");
-			const BATCH_DELAY = 1000;
-			let batchTimeout = null;
-			let opInProgress = false;
-			let monitorStream = null;
-			let checksStream = null;
-
-			// Do things here
-			const notifyChange = async () => {
-				if (opInProgress) {
-					// Get data
-					const { count, monitors } = await this.db.getMonitorsWithChecksByTeamId(req);
-					res.write(`data: ${JSON.stringify({ count, monitors })}\n\n`);
-					opInProgress = false;
-				}
-				batchTimeout = null;
-			};
-
-			const handleChange = () => {
-				opInProgress = true;
-				if (batchTimeout) clearTimeout(batchTimeout);
-				batchTimeout = setTimeout(notifyChange, BATCH_DELAY);
-			};
-
-			const createMonitorStream = () => {
-				if (monitorStream) {
-					try {
-						monitorStream.close();
-					} catch (error) {
-						this.logger.error({
-							message: "Error closing monitor stream",
-							service: SERVICE_NAME,
-							method: "subscribeToDistributedUptimeMonitors",
-							stack: error.stack,
-						});
-					}
-				}
-				monitorStream = Monitor.watch(
-					[{ $match: { operationType: { $in: ["insert", "update", "delete"] } } }],
-					{ fullDocument: "updateLookup" }
-				);
-
-				monitorStream.on("change", handleChange);
-				monitorStream.on("error", (error) => {
-					this.logger.error({
-						message: "Error in monitor stream",
-						service: SERVICE_NAME,
-						method: "subscribeToDistributedUptimeMonitors",
-						stack: error.stack,
-					});
-					createMonitorStream();
-				});
-				monitorStream.on("close", () => {
-					monitorStream = null;
-				});
-			};
-
-			const createChecksStream = () => {
-				if (checksStream) {
-					try {
-						checksStream.close();
-					} catch (error) {
-						this.logger.error({
-							message: "Error closing checks stream",
-							service: SERVICE_NAME,
-							method: "subscribeToDistributedUptimeMonitors",
-							details: error,
-						});
-					}
-				}
-				checksStream = DistributedUptimeCheck.watch(
-					[{ $match: { operationType: { $in: ["insert", "update", "delete"] } } }],
-					{ fullDocument: "updateLookup" }
-				);
-				checksStream.on("change", handleChange);
-				checksStream.on("error", (error) => {
-					this.logger.error({
-						message: "Error in checks stream",
-						service: SERVICE_NAME,
-						method: "subscribeToDistributedUptimeMonitors",
-						stack: error.stack,
-					});
-					createChecksStream();
-				});
-				checksStream.on("close", () => {
-					checksStream = null;
-				});
-			};
-
-			createMonitorStream();
-			createChecksStream();
-
-			req.on("close", () => {
-				if (batchTimeout) {
-					clearTimeout(batchTimeout);
-				}
-				monitorStream.close();
-				checksStream.close();
-				clearInterval(keepAlive);
-			});
-
-			// Keep connection alive
-			const keepAlive = setInterval(() => {
-				res.write(": keepalive\n\n");
-			}, 10000);
-
-			// Clean up on close
-			req.on("close", () => {
-				clearInterval(keepAlive);
-			});
-		} catch (error) {
-			this.logger.error({
-				message: "Error in subscribeToDistributedUptimeMonitors",
-				service: SERVICE_NAME,
-				method: "subscribeToDistributedUptimeMonitors",
-				stack: error.stack,
-			});
-			next(handleError(error, SERVICE_NAME, "subscribeToDistributedUptimeMonitors"));
-		}
-	}
-
-	async getDistributedUptimeMonitorDetails(req, res, next) {
-		try {
-			const monitor = await this.db.getDistributedUptimeDetailsById(req);
-			return res.success({
-				msg: "OK",
-				data: monitor,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getDistributedUptimeMonitorDetails"));
-		}
-	}
-
-	async subscribeToDistributedUptimeMonitorDetails(req, res, next) {
-		try {
-			res.setHeader("Content-Type", "text/event-stream");
-			res.setHeader("Cache-Control", "no-cache");
-			res.setHeader("Connection", "keep-alive");
-			res.setHeader("Access-Control-Allow-Origin", "*");
-
-			// disable compression
-			req.headers["accept-encoding"] = "identity";
-			res.removeHeader("Content-Encoding");
-
-			const BATCH_DELAY = 1000;
-			let batchTimeout = null;
-			let opInProgress = false;
-			let checksStream = null;
-			// Do things here
-			const notifyChange = async () => {
-				try {
-					if (opInProgress) {
-						// Get data
-						const monitor = await this.db.getDistributedUptimeDetailsById(req);
-						res.write(`data: ${JSON.stringify({ monitor })}\n\n`);
-						opInProgress = false;
-					}
-					batchTimeout = null;
-				} catch (error) {
-					opInProgress = false;
-					batchTimeout = null;
-					this.logger.error({
-						message: "Error in notifyChange",
-						service: SERVICE_NAME,
-						method: "subscribeToDistributedUptimeMonitorDetails",
-						stack: error.stack,
-					});
-					next(handleError(error, SERVICE_NAME, "getDistributedUptimeMonitorDetails"));
-				}
-			};
-
-			const handleChange = () => {
-				opInProgress = true;
-				if (batchTimeout) clearTimeout(batchTimeout);
-				batchTimeout = setTimeout(notifyChange, BATCH_DELAY);
-			};
-
-			const createCheckStream = () => {
-				if (checksStream) {
-					try {
-						checksStream.close();
-					} catch (error) {
-						this.logger.error({
-							message: "Error closing checks stream",
-							service: SERVICE_NAME,
-							method: "subscribeToDistributedUptimeMonitorDetails",
-							stack: error.stack,
-						});
-					}
-				}
-				checksStream = DistributedUptimeCheck.watch(
-					[{ $match: { operationType: { $in: ["insert", "update", "delete"] } } }],
-					{ fullDocument: "updateLookup" }
-				);
-
-				checksStream.on("change", handleChange);
-				checksStream.on("error", (error) => {
-					this.logger.error({
-						message: "Error in checks stream",
-						service: SERVICE_NAME,
-						method: "subscribeToDistributedUptimeMonitorDetails",
-						stack: error.stack,
-					});
-					createCheckStream();
-				});
-				checksStream.on("close", () => {
-					checksStream = null;
-				});
-			};
-
-			createCheckStream();
-
-			// Handle client disconnect
-			req.on("close", () => {
-				if (batchTimeout) {
-					clearTimeout(batchTimeout);
-				}
-				checksStream.close();
-				clearInterval(keepAlive);
-			});
-
-			// Keep connection alive
-			const keepAlive = setInterval(() => {
-				res.write(": keepalive\n\n");
-			}, 10000);
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getDistributedUptimeMonitorDetails"));
-		}
-	}
-}
-export default DistributedUptimeController;
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 1247e4509..822cf8688 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -22,7 +22,6 @@ import logger from "../utils/logger.js";
 import { handleError, handleValidationError } from "./controllerUtils.js";
 import axios from "axios";
 import seedDb from "../db/mongo/utils/seedDb.js";
-import { seedDistributedTest } from "../db/mongo/utils/seedDb.js";
 const SERVICE_NAME = "monitorController";
 import pkg from "papaparse";
 
@@ -431,10 +430,6 @@ class MonitorController {
 						name: "deleteHardwareChecks",
 						fn: () => this.db.deleteHardwareChecksByMonitorId(monitor._id),
 					},
-					{
-						name: "deleteDistributedUptimeChecks",
-						fn: () => this.db.deleteDistributedChecksByMonitorId(monitor._id),
-					},
 
 					// TODO  We don't actually want to delete the status page if there are other monitors in it
 					// We actually just want to remove the monitor being deleted from the status page.
@@ -743,11 +738,8 @@ class MonitorController {
 			const token = getTokenFromHeaders(req.headers);
 			const { jwtSecret } = this.settingsService.getSettings();
 			const { _id, teamId } = jwt.verify(token, jwtSecret);
-			if (type === "distributed_test") {
-				await seedDistributedTest(_id, teamId);
-			} else {
-				await seedDb(_id, teamId);
-			}
+
+			await seedDb(_id, teamId);
 			res.success({ msg: "Database seeded" });
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "seedDb"));
diff --git a/server/controllers/statusPageController.js b/server/controllers/statusPageController.js
index d0bdcf4b5..eb3e69484 100755
--- a/server/controllers/statusPageController.js
+++ b/server/controllers/statusPageController.js
@@ -71,29 +71,6 @@ class StatusPageController {
 		}
 	};
 
-	getDistributedStatusPageByUrl = async (req, res, next) => {
-		try {
-			await getStatusPageParamValidation.validateAsync(req.params);
-			await getStatusPageQueryValidation.validateAsync(req.query);
-		} catch (error) {
-			next(handleValidationError(error, SERVICE_NAME));
-			return;
-		}
-
-		try {
-			const statusPage = await this.db.getDistributedStatusPageByUrl({
-				url: req.params.url,
-				daysToShow: req.params.timeFrame,
-			});
-			return res.success({
-				msg: this.stringService.statusPageByUrl,
-				data: statusPage,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getDistributedStatusPageByUrl"));
-		}
-	};
-
 	getStatusPageByUrl = async (req, res, next) => {
 		try {
 			await getStatusPageParamValidation.validateAsync(req.params);
diff --git a/server/db/models/DistributedUptimeCheck.js b/server/db/models/DistributedUptimeCheck.js
deleted file mode 100755
index cb88e2c31..000000000
--- a/server/db/models/DistributedUptimeCheck.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import mongoose from "mongoose";
-
-import { BaseCheckSchema } from "./Check.js";
-
-// {
-// 	"id": "12123",
-// 	"result": {
-// 	  "task_arrived": "2025-01-13T19:21:37.463466602Z",
-// 	  "dns_start": "2025-01-14T00:21:33.1801319+05:00",
-// 	  "dns_end": "2025-01-14T00:21:33.4582552+05:00",
-// 	  "conn_start": "2025-01-14T00:21:33.1801319+05:00",
-// 	  "conn_end": "2025-01-14T00:21:33.7076318+05:00",
-// 	  "connect_start": "2025-01-14T00:21:33.4582552+05:00",
-// 	  "connect_end": "2025-01-14T00:21:33.541899+05:00",
-// 	  "tls_hand_shake_start": "2025-01-14T00:21:33.541899+05:00",
-// 	  "tls_hand_shake_end": "2025-01-14T00:21:33.7076318+05:00",
-// 	  "body_read_start": "2025-01-14T00:21:34.1894707+05:00",
-// 	  "body_read_end": "2025-01-14T00:21:34.1894707+05:00",
-// 	  "wrote_request": "2025-01-14T00:21:33.7076318+05:00",
-// 	  "got_first_response_byte": "2025-01-14T00:21:34.1327652+05:00",
-// 	  "first_byte_took": 425133400,
-// 	  "body_read_took": 56030000,
-// 	  "dns_took": 278123300,
-// 	  "conn_took": 527499900,
-// 	  "connect_took": 83643800,
-// 	  "tls_took": 165732800,
-// 	  "sni_name": "uprock.com",
-// 	  "status_code": 200,
-// 	  "body_size": 19320,
-// 	  "request_header_size": 95,
-// 	  "response_header_size": 246,
-// 	  "response_headers": "X-Vercel-Id: bom1::iad1::sm87v-1736796096856-aec270c01f23\nDate: Mon, 13 Jan 2025 19:21:37 GMT\nServer: Vercel\nStrict-Transport-Security: max-age=63072000\nVary: RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url\nX-Matched-Path: /\nX-Powered-By: Next.js\nX-Vercel-Cache: MISS\nAge: 0\nCache-Control: private, no-cache, no-store, max-age=0, must-revalidate\nContent-Type: text/html; charset=utf-8",
-// 	  "error": "",
-// 	  "device_id": "d5f578e143a2cd603dd6bf5f846a86a538bde4a8fbe2ad1fca284ad9f033daf8",
-// 	  "ip_address": "223.123.19.0",
-// 	  "proof": "",
-// 	  "created_at": "2025-01-13T19:21:37.463466912Z",
-// 	  "continent": "AS",
-// 	  "country_code": "PK",
-// 	  "city": "Muzaffargarh",
-// 	  "upt_burnt" : "0.01",
-// 	  "location": {
-// 		"lat": 71.0968,
-// 		"lng": 30.0208
-// 	  },
-// 	  "payload": {
-// 		"callback": "https://webhook.site/2a15b0af-545a-4ac2-b913-153b97592d7a",
-// 		"x": "y"
-// 	  }
-// 	}
-//   }
-
-const LocationSchema = new mongoose.Schema(
-	{
-		lat: { type: Number, required: true },
-		lng: { type: Number, required: true },
-	},
-	{ _id: false }
-);
-
-const DistributedUptimeCheckSchema = mongoose.Schema(
-	{
-		...BaseCheckSchema.obj,
-		first_byte_took: {
-			type: Number,
-			required: false,
-		},
-		body_read_took: {
-			type: Number,
-			required: false,
-		},
-		dns_took: {
-			type: Number,
-			required: false,
-		},
-		conn_took: {
-			type: Number,
-			required: false,
-		},
-		connect_took: {
-			type: Number,
-			required: false,
-		},
-		tls_took: {
-			type: Number,
-			required: false,
-		},
-		location: {
-			type: LocationSchema,
-			required: false,
-		},
-		continent: {
-			type: String,
-			required: false,
-		},
-		countryCode: {
-			type: String,
-			required: false,
-		},
-		city: {
-			type: String,
-			required: false,
-		},
-		uptBurnt: {
-			type: mongoose.Schema.Types.Decimal128,
-			required: false,
-		},
-		count: {
-			type: Number,
-			required: false,
-		},
-	},
-	{ timestamps: true }
-);
-
-DistributedUptimeCheckSchema.pre("save", function (next) {
-	if (this.isModified("uptBurnt") && typeof this.uptBurnt === "string") {
-		this.uptBurnt = mongoose.Types.Decimal128.fromString(this.uptBurnt);
-	}
-	next();
-});
-
-DistributedUptimeCheckSchema.index({ createdAt: 1 });
-DistributedUptimeCheckSchema.index({ monitorId: 1, updatedAt: 1 });
-DistributedUptimeCheckSchema.index({ monitorId: 1, updatedAt: -1 });
-DistributedUptimeCheckSchema.index(
-	{
-		monitorId: 1,
-		createdAt: -1,
-		city: 1,
-		"location.lat": 1,
-		"location.lng": 1,
-		responseTime: 1,
-	},
-	{ background: true }
-);
-export default mongoose.model("DistributedUptimeCheck", DistributedUptimeCheckSchema);
diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 508c1c655..5fa2834fa 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -28,16 +28,7 @@ const MonitorSchema = mongoose.Schema(
 		type: {
 			type: String,
 			required: true,
-			enum: [
-				"http",
-				"ping",
-				"pagespeed",
-				"hardware",
-				"docker",
-				"port",
-				"distributed_http",
-				"distributed_test",
-			],
+			enum: ["http", "ping", "pagespeed", "hardware", "docker", "port"],
 		},
 		ignoreTlsErrors: {
 			type: Boolean,
diff --git a/server/db/models/StatusPage.js b/server/db/models/StatusPage.js
index ab7be6955..e4c81707f 100755
--- a/server/db/models/StatusPage.js
+++ b/server/db/models/StatusPage.js
@@ -18,7 +18,7 @@ const StatusPageSchema = mongoose.Schema(
 			type: String,
 			required: true,
 			default: "uptime",
-			enum: ["uptime", "distributed"],
+			enum: ["uptime"],
 		},
 		companyName: {
 			type: String,
diff --git a/server/db/mongo/MongoDB.js b/server/db/mongo/MongoDB.js
index b657caec4..5e5e7aec7 100755
--- a/server/db/mongo/MongoDB.js
+++ b/server/db/mongo/MongoDB.js
@@ -43,11 +43,6 @@ import * as hardwareCheckModule from "./modules/hardwareCheckModule.js";
 
 import * as checkModule from "./modules/checkModule.js";
 
-//****************************************
-// Distributed Checks
-//****************************************
-import * as distributedCheckModule from "./modules/distributedCheckModule.js";
-
 //****************************************
 // Maintenance Window
 //****************************************
@@ -85,7 +80,6 @@ class MongoDB {
 		Object.assign(this, pageSpeedCheckModule);
 		Object.assign(this, hardwareCheckModule);
 		Object.assign(this, checkModule);
-		Object.assign(this, distributedCheckModule);
 		Object.assign(this, maintenanceWindowModule);
 		Object.assign(this, notificationModule);
 		Object.assign(this, settingsModule);
diff --git a/server/db/mongo/modules/checkModule.js b/server/db/mongo/modules/checkModule.js
index 2339edbed..8e71dd6eb 100755
--- a/server/db/mongo/modules/checkModule.js
+++ b/server/db/mongo/modules/checkModule.js
@@ -2,7 +2,6 @@ import Check from "../../models/Check.js";
 import Monitor from "../../models/Monitor.js";
 import HardwareCheck from "../../models/HardwareCheck.js";
 import PageSpeedCheck from "../../models/PageSpeedCheck.js";
-import DistributedUptimeCheck from "../../models/DistributedUptimeCheck.js";
 import User from "../../models/User.js";
 import logger from "../../../utils/logger.js";
 import { ObjectId } from "mongodb";
@@ -111,8 +110,6 @@ const getChecksByMonitor = async (req) => {
 			port: Check,
 			pagespeed: PageSpeedCheck,
 			hardware: HardwareCheck,
-			distributed_http: DistributedUptimeCheck,
-			distributed_test: DistributedUptimeCheck,
 		};
 
 		const Model = checkModels[type];
@@ -202,12 +199,7 @@ const getChecksByTeam = async (req) => {
 					pipeline: [{ $match: matchStage }],
 				},
 			},
-			{
-				$unionWith: {
-					coll: "distributeduptimechecks",
-					pipeline: [{ $match: matchStage }],
-				},
-			},
+
 			{ $sort: { createdAt: sortOrder } },
 			{
 				$facet: {
diff --git a/server/db/mongo/modules/diagnosticModule.js b/server/db/mongo/modules/diagnosticModule.js
index 2fd8acc71..af6d83764 100755
--- a/server/db/mongo/modules/diagnosticModule.js
+++ b/server/db/mongo/modules/diagnosticModule.js
@@ -1,4 +1,3 @@
-import DistributedUptimeCheck from "../../models/DistributedUptimeCheck.js";
 import Monitor from "../../models/Monitor.js";
 import { ObjectId } from "mongodb";
 
@@ -12,53 +11,6 @@ import {
 } from "./monitorModuleQueries.js";
 import { getDateRange } from "./monitorModule.js";
 
-const getDistributedUptimeDbExecutionStats = async (req) => {
-	try {
-		const { monitorId } = req?.params ?? {};
-		if (typeof monitorId === "undefined") {
-			throw new Error();
-		}
-		const monitor = await Monitor.findById(monitorId);
-		if (monitor === null || monitor === undefined) {
-			throw new Error(this.stringService.dbFindMonitorById(monitorId));
-		}
-
-		const { dateRange } = req.query;
-		const dates = getDateRange(dateRange);
-		const formatLookup = {
-			recent: "%Y-%m-%dT%H:%M:00Z",
-			day: {
-				$concat: [
-					{ $dateToString: { format: "%Y-%m-%dT%H:", date: "$createdAt" } },
-					{
-						$cond: [{ $lt: [{ $minute: "$createdAt" }, 30] }, "00:00Z", "30:00Z"],
-					},
-				],
-			},
-			week: "%Y-%m-%dT%H:00:00Z",
-			month: "%Y-%m-%dT00:00:00Z",
-		};
-
-		const dateString = formatLookup[dateRange];
-
-		const dePINDetailsByDateRangeStats = await DistributedUptimeCheck.aggregate(
-			buildDePINDetailsByDateRange(monitor, dates, dateString)
-		).explain("executionStats");
-		const latestChecksStats = await DistributedUptimeCheck.aggregate(
-			buildDePINLatestChecks(monitor)
-		).explain("executionStats");
-
-		return {
-			dePINDetailsByDateRangeStats,
-			latestChecksStats,
-		};
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "getAllMonitorsWithUptimeStats";
-		throw error;
-	}
-};
-
 const getMonitorsByTeamIdExecutionStats = async (req) => {
 	try {
 		let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
@@ -104,4 +56,4 @@ const getMonitorsByTeamIdExecutionStats = async (req) => {
 	}
 };
 
-export { getDistributedUptimeDbExecutionStats, getMonitorsByTeamIdExecutionStats };
+export { getMonitorsByTeamIdExecutionStats };
diff --git a/server/db/mongo/modules/distributedCheckModule.js b/server/db/mongo/modules/distributedCheckModule.js
deleted file mode 100755
index 7200cba33..000000000
--- a/server/db/mongo/modules/distributedCheckModule.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import DistributedUptimeCheck from "../../models/DistributedUptimeCheck.js";
-import { ObjectId } from "mongodb";
-
-const SERVICE_NAME = "distributedCheckModule";
-
-const createDistributedCheck = async (checkData) => {
-	try {
-		if (typeof checkData.monitorId === "string") {
-			checkData.monitorId = ObjectId.createFromHexString(checkData.monitorId);
-		}
-		const check = await DistributedUptimeCheck.findOneAndUpdate(
-			{
-				monitorId: checkData.monitorId,
-				city: checkData.city,
-			},
-			[
-				{
-					$set: {
-						...checkData,
-
-						responseTime: {
-							$cond: {
-								if: { $ifNull: ["$count", false] },
-								then: {
-									$cond: {
-										// Check if the new value is an outlier (3x the current average)
-										if: {
-											$and: [
-												{ $gt: ["$responseTime", 0] },
-												{
-													$gt: [
-														checkData.responseTime,
-														{ $multiply: ["$responseTime", 3] },
-													],
-												},
-											],
-										},
-										then: "$responseTime", // Keep the current value if it's an outlier
-										else: {
-											// Normal case - calculate new average
-											$round: [
-												{
-													$divide: [
-														{
-															$add: [
-																{ $multiply: ["$responseTime", "$count"] },
-																checkData.responseTime,
-															],
-														},
-														{ $add: ["$count", 1] },
-													],
-												},
-												2,
-											],
-										},
-									},
-								},
-								else: checkData.responseTime,
-							},
-						},
-						count: { $add: [{ $ifNull: ["$count", 0] }, 1] },
-					},
-				},
-			],
-			{
-				upsert: true,
-				new: true,
-				runValidators: true,
-			}
-		);
-		return check;
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "createCheck";
-		throw error;
-	}
-};
-
-const createDistributedChecks = async (checksData) => {
-	try {
-		if (!Array.isArray(checksData) || checksData.length === 0) {
-			return;
-		}
-
-		const bulkOps = checksData.map((checkData) => {
-			if (typeof checkData.monitorId === "string") {
-				checkData.monitorId = ObjectId.createFromHexString(checkData.monitorId);
-			}
-
-			return {
-				updateOne: {
-					filter: {
-						monitorId: checkData.monitorId,
-						city: checkData.city,
-					},
-					update: [
-						{
-							$set: {
-								...checkData,
-								responseTime: {
-									$cond: {
-										if: { $ifNull: ["$count", false] },
-										then: {
-											$round: [
-												{
-													$divide: [
-														{
-															$add: [
-																{ $multiply: ["$responseTime", "$count"] },
-																checkData.responseTime,
-															],
-														},
-														{ $add: ["$count", 1] },
-													],
-												},
-												2,
-											],
-										},
-										else: checkData.responseTime,
-									},
-								},
-								count: { $add: [{ $ifNull: ["$count", 0] }, 1] },
-							},
-						},
-					],
-					upsert: true,
-				},
-			};
-		});
-
-		await DistributedUptimeCheck.bulkWrite(bulkOps, {
-			ordered: false,
-		});
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "createDistributedChecks";
-		throw error;
-	}
-};
-
-const deleteDistributedChecksByMonitorId = async (monitorId) => {
-	try {
-		const result = await DistributedUptimeCheck.deleteMany({ monitorId });
-		return result.deletedCount;
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "deleteDistributedChecksByMonitorId";
-		throw error;
-	}
-};
-
-export {
-	createDistributedCheck,
-	createDistributedChecks,
-	deleteDistributedChecksByMonitorId,
-};
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index fe8e3c2fc..8e44daea7 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -3,7 +3,6 @@ import MonitorStats from "../../models/MonitorStats.js";
 import Check from "../../models/Check.js";
 import PageSpeedCheck from "../../models/PageSpeedCheck.js";
 import HardwareCheck from "../../models/HardwareCheck.js";
-import DistributedUptimeCheck from "../../models/DistributedUptimeCheck.js";
 import Notification from "../../models/Notification.js";
 import { NormalizeData, NormalizeDataUptimeDetails } from "../../../utils/dataUtils.js";
 import ServiceRegistry from "../../../service/serviceRegistry.js";
@@ -385,72 +384,6 @@ const getUptimeDetailsById = async (req) => {
 	}
 };
 
-const getDistributedUptimeDetailsById = async (req) => {
-	try {
-		const { monitorId } = req?.params ?? {};
-		if (typeof monitorId === "undefined") {
-			throw new Error();
-		}
-		const monitor = await Monitor.findById(monitorId);
-		if (monitor === null || monitor === undefined) {
-			throw new Error(this.stringService.dbFindMonitorById(monitorId));
-		}
-
-		const { dateRange, normalize } = req.query;
-		const dates = getDateRange(dateRange);
-		const formatLookup = {
-			recent: "%Y-%m-%dT%H:%M:00Z",
-			day: {
-				$concat: [
-					{ $dateToString: { format: "%Y-%m-%dT%H:", date: "$updatedAt" } },
-					{
-						$cond: [{ $lt: [{ $minute: "$updatedAt" }, 30] }, "00:00Z", "30:00Z"],
-					},
-				],
-			},
-			week: "%Y-%m-%dT%H:00:00Z",
-			month: "%Y-%m-%dT00:00:00Z",
-		};
-
-		const dateString = formatLookup[dateRange];
-
-		const monitorStatsResult = await MonitorStats.aggregate(
-			buildMonitorStatsPipeline(monitor)
-		);
-		const monitorStats = monitorStatsResult[0];
-		const dePINDetailsByDateRange = await DistributedUptimeCheck.aggregate(
-			buildDePINDetailsByDateRange(monitor, dates, dateString)
-		);
-		const latestChecks = await DistributedUptimeCheck.aggregate(
-			buildDePINLatestChecks(monitor)
-		);
-
-		const checkData = dePINDetailsByDateRange[0];
-		const normalizedGroupChecks = NormalizeDataUptimeDetails(
-			checkData.groupedChecks,
-			10,
-			100
-		);
-		const data = {
-			...monitor.toObject(),
-			latestChecks,
-			totalChecks: monitorStats?.totalChecks,
-			avgResponseTime: monitorStats?.avgResponseTime,
-			uptimePercentage: monitorStats?.uptimePercentage,
-			timeSinceLastCheck: monitorStats?.timeSinceLastCheck,
-			uptBurnt: monitorStats?.uptBurnt,
-			groupedChecks: normalizedGroupChecks,
-			groupedMapChecks: checkData.groupedMapChecks,
-		};
-
-		return data;
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "getDistributedUptimeDetailsById";
-		throw error;
-	}
-};
-
 /**
  * Get stats by monitor ID
  * @async
@@ -876,7 +809,6 @@ export {
 	getMonitorsAndSummaryByTeamId,
 	getMonitorsWithChecksByTeamId,
 	getUptimeDetailsById,
-	getDistributedUptimeDetailsById,
 	createMonitor,
 	createBulkMonitors,
 	deleteMonitor,
diff --git a/server/db/mongo/modules/monitorModuleQueries.js b/server/db/mongo/modules/monitorModuleQueries.js
index 4af3f8985..abf91b325 100755
--- a/server/db/mongo/modules/monitorModuleQueries.js
+++ b/server/db/mongo/modules/monitorModuleQueries.js
@@ -613,8 +613,6 @@ const buildMonitorsWithChecksByTeamIdPipeline = ({
 			checksCollection = "pagespeedchecks";
 		} else if (type === "hardware") {
 			checksCollection = "hardwarechecks";
-		} else if (type === "distributed_http" || type === "distributed_test") {
-			checksCollection = "distributeduptimechecks";
 		}
 		monitorsPipeline.push({
 			$lookup: {
@@ -702,8 +700,6 @@ const buildFilteredMonitorsByTeamIdPipeline = ({
 			checksCollection = "pagespeedchecks";
 		} else if (type === "hardware") {
 			checksCollection = "hardwarechecks";
-		} else if (type === "distributed_http" || type === "distributed_test") {
-			checksCollection = "distributeduptimechecks";
 		}
 		pipeline.push({
 			$lookup: {
@@ -861,26 +857,6 @@ const buildGetMonitorsByTeamIdPipeline = (req) => {
 								},
 							]
 						: []),
-					...(limit
-						? [
-								{
-									$lookup: {
-										from: "distributeduptimechecks",
-										let: { monitorId: "$_id" },
-										pipeline: [
-											{
-												$match: {
-													$expr: { $eq: ["$monitorId", "$$monitorId"] },
-												},
-											},
-											{ $sort: { createdAt: -1 } },
-											...(limit ? [{ $limit: limit }] : []),
-										],
-										as: "distributeduptimechecks",
-									},
-								},
-							]
-						: []),
 
 					{
 						$addFields: {
@@ -899,14 +875,6 @@ const buildGetMonitorsByTeamIdPipeline = (req) => {
 											case: { $eq: ["$type", "hardware"] },
 											then: "$hardwarechecks",
 										},
-										{
-											case: { $eq: ["$type", "distributed_http"] },
-											then: "$distributeduptimechecks",
-										},
-										{
-											case: { $eq: ["$type", "distributed_test"] },
-											then: "$distributeduptimechecks",
-										},
 									],
 									default: [],
 								},
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index e06e50a5d..cd985588a 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -61,105 +61,6 @@ const updateStatusPage = async (statusPageData, image) => {
 	}
 };
 
-const getDistributedStatusPageByUrl = async ({ url, daysToShow = 30 }) => {
-	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
-	try {
-		const statusPage = await StatusPage.findOne({ url }).lean();
-
-		if (!statusPage) {
-			const error = new Error(stringService.statusPageNotFound);
-			error.status = 404;
-			throw error;
-		}
-
-		// No sub monitors, return status page
-		if (statusPage.subMonitors.length === 0) {
-			return statusPage;
-		}
-		// Sub monitors, return status page with sub monitors
-		const daysAgo = new Date();
-		daysAgo.setDate(daysAgo.getDate() - daysToShow);
-
-		const subMonitors = await Monitor.aggregate([
-			{ $match: { _id: { $in: statusPage.subMonitors } } },
-			{
-				$addFields: {
-					orderIndex: { $indexOfArray: [statusPage.subMonitors, "$_id"] },
-				},
-			},
-
-			// Return 30 days of checks by default
-			{
-				$lookup: {
-					from: "checks",
-					let: { monitorId: "$_id" },
-					pipeline: [
-						{
-							$match: {
-								$expr: {
-									$and: [
-										{ $eq: ["$monitorId", "$$monitorId"] },
-										{ $gte: ["$updatedAt", daysAgo] },
-									],
-								},
-							},
-						},
-						{
-							$group: {
-								_id: {
-									$dateToString: { format: "%Y-%m-%d", date: "$updatedAt" },
-								},
-								responseTime: {
-									$avg: "$responseTime",
-								},
-								trueCount: {
-									$sum: {
-										$cond: [{ $eq: ["$status", true] }, 1, 0],
-									},
-								},
-								totalCount: {
-									$sum: 1,
-								},
-							},
-						},
-						{
-							$project: {
-								_id: 1,
-								responseTime: 1,
-								upPercentage: {
-									$cond: [
-										{ $eq: ["$totalCount", 0] },
-										0,
-										{ $multiply: [{ $divide: ["$trueCount", "$totalCount"] }, 100] },
-									],
-								},
-							},
-						},
-						{
-							$sort: { _id: -1 },
-						},
-					],
-					as: "checks",
-				},
-			},
-			{ $sort: { orderIndex: 1 } },
-			{ $project: { orderIndex: 0 } },
-		]);
-
-		const normalizedSubMonitors = subMonitors.map((monitor) => {
-			return {
-				...monitor,
-				checks: NormalizeData(monitor.checks, 10, 100),
-			};
-		});
-		return { ...statusPage, subMonitors: normalizedSubMonitors };
-	} catch (error) {
-		error.service = SERVICE_NAME;
-		error.method = "getDistributedStatusPageByUrl";
-		throw error;
-	}
-};
-
 const getStatusPageByUrl = async (url, type) => {
 	// TODO This is deprecated, can remove and have controller call getStatusPage
 	try {
@@ -306,7 +207,6 @@ export {
 	getStatusPagesByTeamId,
 	getStatusPage,
 	getStatusPageByUrl,
-	getDistributedStatusPageByUrl,
 	deleteStatusPage,
 	deleteStatusPagesByMonitorId,
 };
diff --git a/server/db/mongo/utils/seedDb.js b/server/db/mongo/utils/seedDb.js
index d8317c89b..64f23178c 100755
--- a/server/db/mongo/utils/seedDb.js
+++ b/server/db/mongo/utils/seedDb.js
@@ -1,6 +1,5 @@
 import Monitor from "../../models/Monitor.js";
 import Check from "../../models/Check.js";
-import DistributedUptimeCheck from "../../models/DistributedUptimeCheck.js";
 import logger from "../../../utils/logger.js";
 
 const generateRandomUrl = () => {
@@ -73,105 +72,4 @@ const seedDb = async (userId, teamId) => {
 	}
 };
 
-const generateDistributedChecks = (monitorId, teamId, count = 2880) => {
-	const checks = [];
-	const endTime = new Date();
-	const startTime = new Date(endTime - 48 * 60 * 60 * 1000);
-
-	// Sample locations for variety
-	const locations = [
-		{
-			city: "New York",
-			countryCode: "US",
-			continent: "NA",
-			location: { lat: 40.7128, lng: -74.006 },
-		},
-		{
-			city: "London",
-			countryCode: "GB",
-			continent: "EU",
-			location: { lat: 51.5074, lng: -0.1278 },
-		},
-		{
-			city: "Singapore",
-			countryCode: "SG",
-			continent: "AS",
-			location: { lat: 1.3521, lng: 103.8198 },
-		},
-	];
-
-	for (let i = 0; i < count; i++) {
-		const timestamp = new Date(startTime.getTime() + i * 60 * 1000);
-		const location = locations[Math.floor(Math.random() * locations.length)];
-		const status = Math.random() > 0.05; // 95% success rate
-
-		checks.push({
-			monitorId,
-			teamId,
-			status,
-			responseTime: Math.floor(Math.random() * 1000), // Random response time between 0-1000ms
-			first_byte_took: Math.floor(Math.random() * 300000), // 0-300ms
-			body_read_took: Math.floor(Math.random() * 100000), // 0-100ms
-			dns_took: Math.floor(Math.random() * 100000), // 0-100ms
-			conn_took: Math.floor(Math.random() * 200000), // 0-200ms
-			connect_took: Math.floor(Math.random() * 150000), // 0-150ms
-			tls_took: Math.floor(Math.random() * 200000), // 0-200ms
-			location: location.location,
-			continent: location.continent,
-			countryCode: location.countryCode,
-			city: location.city,
-			uptBurnt: "0.01", // Will be converted to Decimal128 by the schema
-			createdAt: timestamp,
-			updatedAt: timestamp,
-		});
-	}
-
-	return checks;
-};
-
-export const seedDistributedTest = async (userId, teamId) => {
-	try {
-		logger.info({
-			message: "Deleting all test monitors and checks",
-			service: "DB",
-			method: "seedDistributedTest",
-		});
-
-		const testMonitors = await Monitor.find({
-			type: "distributed_test",
-		});
-
-		testMonitors.forEach(async (monitor) => {
-			await DistributedUptimeCheck.deleteMany({ monitorId: monitor._id });
-			await Monitor.deleteOne({ _id: monitor._id });
-		});
-
-		logger.info({
-			message: "Adding test monitors and checks",
-			service: "DB",
-			method: "seedDistributedTest",
-		});
-		const monitor = await Monitor.create({
-			name: "Distributed Test",
-			url: "https://distributed-test.com",
-			type: "distributed_test",
-			userId,
-			teamId,
-			interval: 60000,
-			active: false,
-		});
-		const checks = generateDistributedChecks(monitor._id, teamId, 2800);
-		await DistributedUptimeCheck.insertMany(checks);
-		return monitor;
-	} catch (error) {
-		logger.error({
-			message: "Error seeding distributed test",
-			service: "DB",
-			method: "seedDistributedTest",
-			stack: error.stack,
-		});
-		throw error;
-	}
-};
-
 export default seedDb;
diff --git a/server/index.js b/server/index.js
index dccf77c9b..2d48d753f 100755
--- a/server/index.js
+++ b/server/index.js
@@ -36,9 +36,6 @@ import StatusPageController from "./controllers/statusPageController.js";
 import QueueRoutes from "./routes/queueRoute.js";
 import QueueController from "./controllers/queueController.js";
 
-import DistributedUptimeRoutes from "./routes/distributedUptimeRoute.js";
-import DistributedUptimeController from "./controllers/distributedUptimeController.js";
-
 import NotificationRoutes from "./routes/notificationRoute.js";
 import NotificationController from "./controllers/notificationController.js";
 
@@ -300,13 +297,6 @@ const startApp = async () => {
 		ServiceRegistry.get(StatusService.SERVICE_NAME)
 	);
 
-	const distributedUptimeController = new DistributedUptimeController({
-		db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
-		http,
-		statusService: ServiceRegistry.get(StatusService.SERVICE_NAME),
-		logger,
-	});
-
 	const diagnosticController = new DiagnosticController(
 		ServiceRegistry.get(MongoDB.SERVICE_NAME)
 	);
@@ -322,9 +312,7 @@ const startApp = async () => {
 	);
 	const queueRoutes = new QueueRoutes(queueController);
 	const statusPageRoutes = new StatusPageRoutes(statusPageController);
-	const distributedUptimeRoutes = new DistributedUptimeRoutes(
-		distributedUptimeController
-	);
+
 	const notificationRoutes = new NotificationRoutes(notificationController);
 	const diagnosticRoutes = new DiagnosticRoutes(diagnosticController);
 	// Middleware
@@ -375,7 +363,6 @@ const startApp = async () => {
 	app.use("/api/v1/checks", verifyJWT, checkRoutes.getRouter());
 	app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRoutes.getRouter());
 	app.use("/api/v1/queue", verifyJWT, queueRoutes.getRouter());
-	app.use("/api/v1/distributed-uptime", distributedUptimeRoutes.getRouter());
 	app.use("/api/v1/status-page", statusPageRoutes.getRouter());
 	app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
 	app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
diff --git a/server/routes/diagnosticRoute.js b/server/routes/diagnosticRoute.js
index c5ee7cdeb..616d01ccf 100755
--- a/server/routes/diagnosticRoute.js
+++ b/server/routes/diagnosticRoute.js
@@ -7,11 +7,6 @@ class DiagnosticRoutes {
 		this.initRoutes();
 	}
 	initRoutes() {
-		this.router.get(
-			"/db/execution-stats/:monitorId",
-			this.diagnosticController.getDistributedUptimeDbExecutionStats
-		);
-
 		this.router.get(
 			"/db/get-monitors-by-team-id/:teamId",
 			this.diagnosticController.getMonitorsByTeamIdExecutionStats
diff --git a/server/routes/distributedUptimeRoute.js b/server/routes/distributedUptimeRoute.js
deleted file mode 100755
index 51e8086cb..000000000
--- a/server/routes/distributedUptimeRoute.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Router } from "express";
-import { verifyJWT } from "../middleware/verifyJWT.js";
-class DistributedUptimeRoutes {
-	constructor(distributedUptimeController) {
-		this.router = Router();
-		this.distributedUptimeController = distributedUptimeController;
-		this.initRoutes();
-	}
-	initRoutes() {
-		this.router.post("/callback", this.distributedUptimeController.resultsCallback);
-
-		this.router.get(
-			"/monitors/:teamId/initial",
-			verifyJWT,
-			this.distributedUptimeController.getDistributedUptimeMonitors
-		);
-
-		this.router.get(
-			"/monitors/:teamId",
-			this.distributedUptimeController.subscribeToDistributedUptimeMonitors
-		);
-
-		this.router.get(
-			"/monitors/details/:monitorId/initial",
-			verifyJWT,
-			this.distributedUptimeController.getDistributedUptimeMonitorDetails
-		);
-		this.router.get(
-			"/monitors/details/public/:monitorId/initial",
-			this.distributedUptimeController.getDistributedUptimeMonitorDetails
-		);
-
-		this.router.get(
-			"/monitors/details/:monitorId",
-			this.distributedUptimeController.subscribeToDistributedUptimeMonitorDetails
-		);
-	}
-
-	getRouter() {
-		return this.router;
-	}
-}
-
-export default DistributedUptimeRoutes;
diff --git a/server/routes/statusPageRoute.js b/server/routes/statusPageRoute.js
index bac960b08..4e6a4d248 100755
--- a/server/routes/statusPageRoute.js
+++ b/server/routes/statusPageRoute.js
@@ -18,10 +18,6 @@ class StatusPageRoutes {
 			this.statusPageController.getStatusPagesByTeamId
 		);
 		this.router.get("/:url", this.statusPageController.getStatusPageByUrl);
-		this.router.get(
-			"/distributed/:url",
-			this.statusPageController.getDistributedStatusPageByUrl
-		);
 
 		this.router.post(
 			"/",
diff --git a/server/service/JobQueue/JobQueue.js b/server/service/JobQueue/JobQueue.js
index ed662e322..38cca7d4d 100644
--- a/server/service/JobQueue/JobQueue.js
+++ b/server/service/JobQueue/JobQueue.js
@@ -1,4 +1,4 @@
-const QUEUE_NAMES = ["uptime", "pagespeed", "hardware", "distributed"];
+const QUEUE_NAMES = ["uptime", "pagespeed", "hardware"];
 const SERVICE_NAME = "JobQueue";
 const HEALTH_CHECK_INTERVAL = 10 * 60 * 1000; // 10 minutes
 const QUEUE_LOOKUP = {
@@ -8,7 +8,6 @@ const QUEUE_LOOKUP = {
 	port: "uptime",
 	docker: "uptime",
 	pagespeed: "pagespeed",
-	distributed_http: "distributed",
 };
 const getSchedulerId = (monitor) => `scheduler:${monitor.type}:${monitor._id}`;
 
diff --git a/server/service/JobQueue/JobQueueHelper.js b/server/service/JobQueue/JobQueueHelper.js
index 9e08e2cf1..d286b7b14 100644
--- a/server/service/JobQueue/JobQueueHelper.js
+++ b/server/service/JobQueue/JobQueueHelper.js
@@ -256,13 +256,6 @@ class JobQueueHelper {
 				await job.updateProgress(30);
 				const monitor = job.data;
 				const networkResponse = await this.networkService.getStatus(monitor);
-				if (
-					job.data.type === "distributed_http" ||
-					job.data.type === "distributed_test"
-				) {
-					await job.updateProgress(100);
-					return true;
-				}
 
 				// If the network response is not found, we're done
 				if (!networkResponse) {
diff --git a/server/service/PulseQueue/PulseQueueHelper.js b/server/service/PulseQueue/PulseQueueHelper.js
index 01207d211..959c12e3b 100644
--- a/server/service/PulseQueue/PulseQueueHelper.js
+++ b/server/service/PulseQueue/PulseQueueHelper.js
@@ -29,10 +29,6 @@ class PulseQueueHelper {
 				}
 
 				const networkResponse = await this.networkService.getStatus(monitor);
-				if (monitor.type === "distributed_http" || monitor.type === "distributed_test") {
-					await job.updateProgress(100);
-					return true;
-				}
 
 				if (!networkResponse) {
 					throw new Error("No network response");
diff --git a/server/service/bufferService.js b/server/service/bufferService.js
index 255c3db9f..888b3ed08 100755
--- a/server/service/bufferService.js
+++ b/server/service/bufferService.js
@@ -7,7 +7,6 @@ const TYPE_MAP = {
 	docker: "checks",
 	pagespeed: "pagespeedChecks",
 	hardware: "hardwareChecks",
-	distributed_http: "distributedChecks",
 };
 
 class BufferService {
@@ -19,13 +18,11 @@ class BufferService {
 			checks: [],
 			pagespeedChecks: [],
 			hardwareChecks: [],
-			distributedChecks: [],
 		};
 		this.OPERATION_MAP = {
 			checks: this.db.createChecks,
 			pagespeedChecks: this.db.createPageSpeedChecks,
 			hardwareChecks: this.db.createHardwareChecks,
-			distributedChecks: this.db.createDistributedChecks,
 		};
 
 		this.scheduleNextFlush();
diff --git a/server/service/networkService.js b/server/service/networkService.js
index 9e5e83d24..5ceddb8fd 100755
--- a/server/service/networkService.js
+++ b/server/service/networkService.js
@@ -23,8 +23,6 @@ class NetworkService {
 		this.TYPE_HARDWARE = "hardware";
 		this.TYPE_DOCKER = "docker";
 		this.TYPE_PORT = "port";
-		this.TYPE_DISTRIBUTED_HTTP = "distributed_http";
-		this.TYPE_DISTRIBUTED_TEST = "distributed_test";
 		this.SERVICE_NAME = SERVICE_NAME;
 		this.NETWORK_ERROR = 5000;
 		this.PING_ERROR = 5001;
@@ -414,34 +412,6 @@ class NetworkService {
 		}
 	}
 
-	async requestDistributedHttp(monitor) {
-		try {
-			const CALLBACK_URL = process.env.CALLBACK_URL;
-
-			const response = await this.axios.post(
-				UPROCK_ENDPOINT,
-				{
-					id: monitor._id,
-					url: monitor.url,
-					callback: `${CALLBACK_URL}/api/v1/distributed-uptime/callback`,
-				},
-				{
-					headers: {
-						"Content-Type": "application/json",
-						"x-checkmate-key": process.env.UPROCK_API_KEY,
-					},
-				}
-			);
-			if (response.data.success === false) {
-				throw new Error(response.data.message);
-			}
-		} catch (error) {
-			error.service = this.SERVICE_NAME;
-			error.method = "requestDistributedHttp";
-			throw error;
-		}
-	}
-
 	/**
 	 * Handles unsupported job types by throwing an error with details.
 	 *
@@ -517,10 +487,6 @@ class NetworkService {
 				return await this.requestDocker(monitor);
 			case this.TYPE_PORT:
 				return await this.requestPort(monitor);
-			case this.TYPE_DISTRIBUTED_HTTP:
-				return await this.requestDistributedHttp(monitor);
-			case this.TYPE_DISTRIBUTED_TEST:
-				return;
 			default:
 				return this.handleUnsupportedType(type);
 		}
diff --git a/server/service/statusService.js b/server/service/statusService.js
index ebd3e2b41..0b555439d 100755
--- a/server/service/statusService.js
+++ b/server/service/statusService.js
@@ -209,23 +209,6 @@ class StatusService {
 			tls_took,
 		};
 
-		if (type === "distributed_http") {
-			if (typeof payload === "undefined") {
-				return undefined;
-			}
-			check.continent = payload.continent;
-			check.countryCode = payload.country_code;
-			check.city = payload.city;
-			check.location = payload.location;
-			check.uptBurnt = payload.upt_burnt;
-			check.first_byte_took = payload.first_byte_took;
-			check.body_read_took = payload.body_read_took;
-			check.dns_took = payload.dns_took;
-			check.conn_took = payload.conn_took;
-			check.connect_took = payload.connect_took;
-			check.tls_took = payload.tls_took;
-		}
-
 		if (type === "pagespeed") {
 			if (typeof payload === "undefined") {
 				this.logger.warn({
diff --git a/server/validation/joi.js b/server/validation/joi.js
index e0e563e84..3efd202b5 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -303,18 +303,7 @@ const getChecksParamValidation = joi.object({
 });
 
 const getChecksQueryValidation = joi.object({
-	type: joi
-		.string()
-		.valid(
-			"http",
-			"ping",
-			"pagespeed",
-			"hardware",
-			"docker",
-			"port",
-			"distributed_http",
-			"distributed_test"
-		),
+	type: joi.string().valid("http", "ping", "pagespeed", "hardware", "docker", "port"),
 	sortOrder: joi.string().valid("asc", "desc"),
 	limit: joi.number(),
 	dateRange: joi.string().valid("recent", "hour", "day", "week", "month", "all"),
@@ -446,14 +435,14 @@ const getStatusPageParamValidation = joi.object({
 });
 
 const getStatusPageQueryValidation = joi.object({
-	type: joi.string().valid("uptime", "distributed").required(),
+	type: joi.string().valid("uptime").required(),
 	timeFrame: joi.number().optional(),
 });
 
 const createStatusPageBodyValidation = joi.object({
 	userId: joi.string().required(),
 	teamId: joi.string().required(),
-	type: joi.string().valid("uptime", "distributed").required(),
+	type: joi.string().valid("uptime").required(),
 	companyName: joi.string().required(),
 	url: joi
 		.string()

From 55a871cb3c33cecce1a519f293488f6650213d1f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 10:24:06 +0800
Subject: [PATCH 044/319] update notification model

---
 server/db/models/Notification.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index ab51e0617..7ba3bb142 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -5,20 +5,32 @@ const configSchema = mongoose.Schema(
 		webhookUrl: { type: String },
 		botToken: { type: String },
 		chatId: { type: String },
+		platform: {
+			type: String,
+			enum: ["slack", "pager_duty"],
+		},
+		routingKey: { type: String },
 	},
 	{ _id: false }
 );
 
 const NotificationSchema = mongoose.Schema(
 	{
-		monitorId: {
+		userId: {
 			type: mongoose.Schema.Types.ObjectId,
-			ref: "Monitor",
+			ref: "User",
 			immutable: true,
+			required: true,
+		},
+		teamId: {
+			type: mongoose.Schema.Types.ObjectId,
+			ref: "Team",
+			immutable: true,
+			required: true,
 		},
 		type: {
 			type: String,
-			enum: ["email", "sms", "webhook"],
+			enum: ["email", "sms", "webhook", "pager_duty"],
 		},
 		platform: {
 			type: String,

From 0f10a39f91720eb96158b7189e093e48ad00cbbf Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 10:25:06 +0800
Subject: [PATCH 045/319] add notification routes

---
 server/routes/notificationRoute.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index 2c0bbf5b7..fe6b1c2dd 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -14,6 +14,15 @@ class NotificationRoutes {
 		this.router.post("/trigger", this.notificationController.triggerNotification);
 
 		this.router.post("/test-webhook", this.notificationController.testWebhook);
+
+		this.router.post("/", this.notificationController.createNotification);
+
+		this.router.get(
+			"/team/:teamId",
+			this.notificationController.getNotificationsByTeamId
+		);
+
+		this.router.delete("/:id", this.notificationController.deleteNotification);
 	}
 
 	getRouter() {

From 5a50e9b30119a4db6fd015c58f91fcd1a8daffff Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 10:30:21 +0800
Subject: [PATCH 046/319] Add controller, db, and validation for notifications

---
 server/controllers/notificationController.js  | 49 ++++++++++++++++++-
 server/db/mongo/modules/notificationModule.js | 38 ++++++++++++++
 server/validation/joi.js                      | 42 ++++++++++++++++
 3 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 3164a111b..108233847 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -1,4 +1,7 @@
-import { triggerNotificationBodyValidation } from "../validation/joi.js";
+import {
+	triggerNotificationBodyValidation,
+	createNotificationBodyValidation,
+} from "../validation/joi.js";
 import { handleError, handleValidationError } from "./controllerUtils.js";
 
 const SERVICE_NAME = "NotificationController";
@@ -169,6 +172,50 @@ class NotificationController {
 			next(handleError(error, SERVICE_NAME, "testWebhook"));
 		}
 	}
+
+	createNotification = async (req, res, next) => {
+		try {
+			await createNotificationBodyValidation.validateAsync(req.body, {
+				abortEarly: false,
+			});
+		} catch (error) {
+			next(handleValidationError(error, SERVICE_NAME));
+			return;
+		}
+
+		try {
+			const notification = await this.db.createNotification(req.body);
+			return res.success({
+				msg: "Notification created successfully",
+				data: notification,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "createNotification"));
+		}
+	};
+
+	getNotificationsByTeamId = async (req, res, next) => {
+		try {
+			const notifications = await this.db.getNotificationsByTeamId(req.params.teamId);
+			return res.success({
+				msg: "Notifications fetched successfully",
+				data: notifications,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "getNotificationsByTeamId"));
+		}
+	};
+
+	deleteNotification = async (req, res, next) => {
+		try {
+			await this.db.deleteNotificationById(req.params.id);
+			return res.success({
+				msg: "Notification deleted successfully",
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "deleteNotification"));
+		}
+	};
 }
 
 export default NotificationController;
diff --git a/server/db/mongo/modules/notificationModule.js b/server/db/mongo/modules/notificationModule.js
index aab2d03bd..d172ee8cf 100755
--- a/server/db/mongo/modules/notificationModule.js
+++ b/server/db/mongo/modules/notificationModule.js
@@ -1,4 +1,5 @@
 import Notification from "../../models/Notification.js";
+import Monitor from "../../models/Monitor.js";
 const SERVICE_NAME = "notificationModule";
 /**
  * Creates a new notification.
@@ -21,6 +22,28 @@ const createNotification = async (notificationData) => {
 	}
 };
 
+const getNotificationsByTeamId = async (teamId) => {
+	try {
+		const notifications = await Notification.find({ teamId });
+		return notifications;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "getNotificationsByTeamId";
+		throw error;
+	}
+};
+
+const getNotificationsByIds = async (notificationIds) => {
+	try {
+		const notifications = await Notification.find({ _id: { $in: notificationIds } });
+		return notifications;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "getNotificationsByIds";
+		throw error;
+	}
+};
+
 /**
  * Retrieves notifications by monitor ID.
  * @param {mongoose.Types.ObjectId} monitorId - The ID of the monitor.
@@ -49,8 +72,23 @@ const deleteNotificationsByMonitorId = async (monitorId) => {
 	}
 };
 
+const deleteNotificationById = async (id) => {
+	try {
+		const result = await Notification.findByIdAndDelete(id);
+		await Monitor.updateMany({ notifications: id }, { $pull: { notifications: id } });
+		return result;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "deleteNotificationById";
+		throw error;
+	}
+};
+
 export {
 	createNotification,
+	getNotificationsByTeamId,
+	getNotificationsByIds,
 	getNotificationsByMonitorId,
 	deleteNotificationsByMonitorId,
+	deleteNotificationById,
 };
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 3efd202b5..1e3325fcb 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -566,6 +566,47 @@ const triggerNotificationBodyValidation = joi.object({
 	}),
 });
 
+const createNotificationBodyValidation = joi.object({
+	userId: joi.number().required().messages({
+		"number.empty": "User ID is required",
+		"any.required": "User ID is required",
+	}),
+	teamId: joi.number().required().messages({
+		"string.empty": "Team ID is required",
+		"any.required": "Team ID is required",
+	}),
+	notificationName: joi.string().required().messages({
+		"string.empty": "Notification name is required",
+		"any.required": "Notification name is required",
+	}),
+	address: joi.when("type", {
+		is: "email",
+		then: joi.string().email().required().messages({
+			"string.empty": "E-mail address cannot be empty",
+			"any.required": "E-mail address is required",
+			"string.email": "Please enter a valid e-mail address",
+		}),
+	}),
+	type: joi.string().valid("email", "webhook", "pager_duty").required().messages({
+		"string.empty": "Notification type is required",
+		"any.required": "Notification type is required",
+		"any.only": "Notification type must be email, webhook, or pager_duty",
+	}),
+	config: joi.when("type", {
+		is: "webhook",
+		then: joi.object({
+			webhookUrl: joi.string().uri().required().messages({
+				"string.uri": "Webhook URL must be a valid URI",
+				"any.required": "Webhook URL is required",
+			}),
+			platform: joi.string().required().messages({
+				"string.empty": "Platform is required",
+				"any.required": "Platform is required",
+			}),
+		}),
+	}),
+});
+
 //****************************************
 // Announcetment Page Validation
 //****************************************
@@ -653,6 +694,7 @@ export {
 	getStatusPageQueryValidation,
 	imageValidation,
 	triggerNotificationBodyValidation,
+	createNotificationBodyValidation,
 	webhookConfigValidation,
 	createAnnouncementValidation,
 	sendTestEmailBodyValidation,

From 92ddf023ec3bbb186525b107ee8448d5bb8ae8a2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 10:49:52 +0800
Subject: [PATCH 047/319] add pager duty handling method

---
 server/controllers/notificationController.js |  3 +-
 server/db/models/Notification.js             |  4 ++
 server/index.js                              | 11 ++---
 server/service/notificationService.js        | 43 +++++++++++++++++---
 server/validation/joi.js                     |  4 +-
 5 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 108233847..7cb642977 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -18,10 +18,11 @@ const PLATFORMS = {
 };
 
 class NotificationController {
-	constructor(notificationService, stringService, statusService) {
+	constructor({ notificationService, stringService, statusService, db }) {
 		this.notificationService = notificationService;
 		this.stringService = stringService;
 		this.statusService = statusService;
+		this.db = db;
 		this.triggerNotification = this.triggerNotification.bind(this);
 		this.testWebhook = this.testWebhook.bind(this);
 	}
diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index 7ba3bb142..27f2f932a 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -39,6 +39,10 @@ const NotificationSchema = mongoose.Schema(
 			type: configSchema,
 			default: () => ({}),
 		},
+		notificationName: {
+			type: String,
+			required: true,
+		},
 		address: {
 			type: String,
 		},
diff --git a/server/index.js b/server/index.js
index 2d48d753f..b520e6171 100755
--- a/server/index.js
+++ b/server/index.js
@@ -291,11 +291,12 @@ const startApp = async () => {
 		ServiceRegistry.get(StringService.SERVICE_NAME)
 	);
 
-	const notificationController = new NotificationController(
-		ServiceRegistry.get(NotificationService.SERVICE_NAME),
-		ServiceRegistry.get(StringService.SERVICE_NAME),
-		ServiceRegistry.get(StatusService.SERVICE_NAME)
-	);
+	const notificationController = new NotificationController({
+		notificationService: ServiceRegistry.get(NotificationService.SERVICE_NAME),
+		stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
+		statusService: ServiceRegistry.get(StatusService.SERVICE_NAME),
+		db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
+	});
 
 	const diagnosticController = new DiagnosticController(
 		ServiceRegistry.get(MongoDB.SERVICE_NAME)
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index ed74ff539..878881334 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -112,8 +112,7 @@ class NotificationService {
 
 	async sendWebhookNotification(networkResponse, notification) {
 		const { monitor, status, code } = networkResponse;
-		const { platform } = notification;
-		const { webhookUrl, botToken, chatId } = notification.config;
+		const { webhookUrl, platform, botToken, chatId } = notification.config;
 
 		// Early return if platform is not supported
 		if (!PLATFORM_TYPES.includes(platform)) {
@@ -204,6 +203,38 @@ class NotificationService {
 		return true;
 	}
 
+	async sendPagerDutyNotification(networkResponse, notification) {
+		const { monitor, status, code } = networkResponse;
+		const { routingKey, platform } = notification.config;
+
+		const message = this.formatNotificationMessage(
+			monitor,
+			status,
+			platform,
+			null,
+			code, // Pass the code field directly
+			networkResponse.timestamp
+		);
+
+		try {
+			const response = await this.networkService.requestPagerDuty({
+				message,
+				routingKey,
+				monitorUrl: monitor.url,
+			});
+			return response.status;
+		} catch (error) {
+			this.logger.error({
+				message: "Failed to send PagerDuty notification",
+				details: error.details,
+				service: error.service || this.SERVICE_NAME,
+				method: error.method || "sendPagerDutyNotification",
+				stack: error.stack,
+			});
+			return false;
+		}
+	}
+
 	async handleStatusNotifications(networkResponse) {
 		try {
 			// If status hasn't changed, we're done
@@ -211,17 +242,17 @@ class NotificationService {
 			// if prevStatus is undefined, monitor is resuming, we're done
 			if (networkResponse.prevStatus === undefined) return false;
 
-			const notifications = await this.db.getNotificationsByMonitorId(
-				networkResponse.monitorId
-			);
+			const notificationIDs = networkResponse.monitor?.notifications ?? [];
+			const notifications = await this.db.getNotificationsByIds(notificationIDs);
 
 			for (const notification of notifications) {
 				if (notification.type === "email") {
 					await this.sendEmail(networkResponse, notification.address);
 				} else if (notification.type === "webhook") {
 					await this.sendWebhookNotification(networkResponse, notification);
+				} else if (notification.type === "pager_duty") {
+					await this.sendPagerDutyNotification(networkResponse, notification);
 				}
-				// Handle other types of notifications here
 			}
 			return true;
 		} catch (error) {
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 1e3325fcb..d261b852a 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -567,11 +567,11 @@ const triggerNotificationBodyValidation = joi.object({
 });
 
 const createNotificationBodyValidation = joi.object({
-	userId: joi.number().required().messages({
+	userId: joi.string().required().messages({
 		"number.empty": "User ID is required",
 		"any.required": "User ID is required",
 	}),
-	teamId: joi.number().required().messages({
+	teamId: joi.string().required().messages({
 		"string.empty": "Team ID is required",
 		"any.required": "Team ID is required",
 	}),

From 302760652454872b19dbbf3097aa470df6f6eee1 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:52:32 +0800
Subject: [PATCH 048/319] remove console.log

---
 client/src/Components/Common/AppBar.jsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/Components/Common/AppBar.jsx b/client/src/Components/Common/AppBar.jsx
index df0660cf5..de5f0992e 100644
--- a/client/src/Components/Common/AppBar.jsx
+++ b/client/src/Components/Common/AppBar.jsx
@@ -47,9 +47,6 @@ const AppAppBar = () => {
 	const location = useLocation();
 	const navigate = useNavigate();
 
-	// Debugging: Log the current theme mode
-	console.log("Current theme mode:", mode);
-
 	const logoSrc =
 		mode === "light" ? "/images/prism-black.png" : "/images/prism-white.png";
 

From 0225b93c72fb59f81c88f6748933c31fbba9e884 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:52:52 +0800
Subject: [PATCH 049/319] add notifications channel to sidebar

---
 client/src/Components/Sidebar/index.jsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index 6073f428d..b0de10b5e 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -38,6 +38,8 @@ import ChangeLog from "../../assets/icons/changeLog.svg?react";
 import Docs from "../../assets/icons/docs.svg?react";
 import StatusPages from "../../assets/icons/status-pages.svg?react";
 import Discussions from "../../assets/icons/discussions.svg?react";
+import NotificationAddOutlinedIcon from "@mui/icons-material/NotificationAddOutlined";
+
 import "./index.css";
 
 // Utils
@@ -52,13 +54,18 @@ import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMon
 const getMenu = (t) => [
 	{ name: t("menu.uptime"), path: "uptime", icon: <Monitors /> },
 	{ name: t("menu.pagespeed"), path: "pagespeed", icon: <PageSpeed /> },
-	{ name: t("menu.infrastructure"), path: "infrastructure", icon: <Integrations /> },
 
+	{ name: t("menu.infrastructure"), path: "infrastructure", icon: <Integrations /> },
+	{
+		name: t("menu.notifications"),
+		path: "notifications",
+		icon: <NotificationAddOutlinedIcon />,
+	},
 	{ name: t("menu.incidents"), path: "incidents", icon: <Incidents /> },
 
 	{ name: t("menu.statusPages"), path: "status", icon: <StatusPages /> },
 	{ name: t("menu.maintenance"), path: "maintenance", icon: <Maintenance /> },
-	// { name: t("menu.integrations"), path: "integrations", icon: <Integrations /> },
+
 	{
 		name: t("menu.settings"),
 		icon: <Settings />,

From 95703c15057fb6825e8d8ad8ceb13560e6b1678e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:54:41 +0800
Subject: [PATCH 050/319] remove console.log

---
 client/src/Pages/Settings/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index dd0135edb..b0e3c476b 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -132,7 +132,6 @@ const Settings = () => {
 	};
 
 	const handleSave = () => {
-		console.log(settingsData.settings);
 		const { error } = settingsValidation.validate(settingsData.settings, {
 			abortEarly: false,
 		});

From 1fbfbc42049102ea11723208e1ac01adae8e9dad Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:55:01 +0800
Subject: [PATCH 051/319] add strings

---
 client/src/locales/en.json | 53 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 12442246c..16e1f5ebd 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -134,7 +134,45 @@
 	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
 	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
+	"createNotifications": {
+		"title": "Create notification channel",
+		"nameSettings": {
+			"title": "Name",
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications"
+		},
+		"typeSettings": {
+			"title": "Type",
+			"description": "Select the type of notification channel you want to create.",
+			"typeLabel": "Type"
+		},
+		"emailSettings": {
+			"title": "Email",
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com"
+		},
+		"slackSettings": {
+			"title": "Slack",
+			"description": "Configure your Slack webhook here",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"pagerdutySettings": {
+			"title": "PagerDuty",
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890"
+		}
+	},
 	"notifications": {
+		"fallback": {
+			"title": "Notification",
+			"checks": "Alert teams about downtime or performance issues"
+		},
+		"createButton": "Create notification channel",
+		"createTitle": "Notification channel",
 		"enableNotifications": "Enable {{platform}} notifications",
 		"testNotification": "Test notification",
 		"addOrEditNotifications": "Add or edit notifications",
@@ -173,7 +211,19 @@
 		"testSuccess": "Test notification sent successfully!",
 		"testFailed": "Failed to send test notification",
 		"unsupportedType": "Unsupported notification type",
-		"networkError": "Network error occurred"
+		"networkError": "Network error occurred",
+		"create": {
+			"success": "Notification created successfully",
+			"failed": "Failed to create notification"
+		},
+		"fetch": {
+			"success": "Notifications fetched successfully",
+			"failed": "Failed to fetch notifications"
+		},
+		"delete": {
+			"success": "Notification deleted successfully",
+			"failed": "Failed to delete notification"
+		}
 	},
 	"testLocale": "testLocale",
 	"add": "Add",
@@ -479,6 +529,7 @@
 	"menu": {
 		"uptime": "Uptime",
 		"pagespeed": "Pagespeed",
+		"notifications": "Notifications",
 		"infrastructure": "Infrastructure",
 		"incidents": "Incidents",
 		"statusPages": "Status pages",

From 358381ddc259572db52a439bca5f071ceb3ecd9f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:55:13 +0800
Subject: [PATCH 052/319] update client side validation

---
 client/src/Validation/validation.js | 66 +++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index d94f7c49a..9232b481b 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -104,6 +104,9 @@ const credentials = joi.object({
 });
 
 const monitorValidation = joi.object({
+	_id: joi.string(),
+	userId: joi.string(),
+	teamId: joi.string(),
 	url: joi.when("type", {
 		is: "docker",
 		then: joi
@@ -191,9 +194,9 @@ const monitorValidation = joi.object({
 		"number.base": "Frequency must be a number.",
 		"any.required": "Frequency is required.",
 	}),
-	expectedValue: joi.string().allow(""),
-	jsonPath: joi.string().allow(""),
-	matchMethod: joi.string(),
+	expectedValue: joi.string().allow(null, ""),
+	jsonPath: joi.string().allow(null, ""),
+	matchMethod: joi.string().allow(null, ""),
 });
 
 const imageValidation = joi.object({
@@ -396,6 +399,60 @@ const infrastructureMonitorValidation = joi.object({
 	),
 });
 
+const notificationEmailValidation = joi.object({
+	notificationName: joi.string().required().messages({
+		"string.empty": "Notification name is required",
+		"any.required": "Notification name is required",
+	}),
+	address: joi
+		.string()
+		.email({ tlds: { allow: false } })
+		.required()
+		.messages({
+			"string.empty": "E-mail address cannot be empty",
+
+			"string.email": "Please enter a valid e-mail address",
+			"string.base": "E-mail address must be a string",
+			"any.required": "E-mail address is required",
+		}),
+});
+const notificationWebhookValidation = joi.object({
+	notificationName: joi.string().required().messages({
+		"string.empty": "Notification name is required",
+		"any.required": "Notification name is required",
+	}),
+	config: joi
+		.object({
+			webhookUrl: joi.string().uri().required().messages({
+				"string.empty": "Webhook URL is required",
+				"string.uri": "Webhook URL must be a valid URI",
+				"any.required": "Webhook URL is required",
+			}),
+			platform: joi.string().required().messages({
+				"string.base": "Platform must be a string",
+				"any.required": "Platform is required",
+			}),
+		})
+		.unknown(true),
+});
+
+const notificationPagerDutyValidation = joi.object({
+	notificationName: joi.string().required().messages({
+		"string.empty": "Notification name is required",
+		"any.required": "Notification name is required",
+	}),
+	config: joi.object({
+		platform: joi.string().required().messages({
+			"string.base": "Platform must be a string",
+			"any.required": "Platform is required",
+		}),
+		routingKey: joi.string().required().messages({
+			"string.empty": "Routing key is required",
+			"any.required": "Routing key is required",
+		}),
+	}),
+});
+
 export {
 	credentials,
 	imageValidation,
@@ -406,4 +463,7 @@ export {
 	infrastructureMonitorValidation,
 	statusPageValidation,
 	logoImageValidation,
+	notificationEmailValidation,
+	notificationWebhookValidation,
+	notificationPagerDutyValidation,
 };

From e36abfa9a6a13fa361e919146da0b2bddd97ee87 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:55:45 +0800
Subject: [PATCH 053/319] add notificaitons channel to Create Uptime

---
 client/src/Pages/Uptime/Create/index.jsx | 302 +++++++++--------------
 1 file changed, 112 insertions(+), 190 deletions(-)

diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 6e45230f6..b9e1e8423 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -1,15 +1,12 @@
 // React, Redux, Router
 import { useTheme } from "@emotion/react";
-import { useNavigate, useParams } from "react-router-dom";
-import { useEffect } from "react";
+import { useNavigate } from "react-router-dom";
 import { useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
 
 // Utility and Network
-import { checkEndpointResolution } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import { monitorValidation } from "../../../Validation/validation";
-import { getUptimeMonitorById } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import { createUptimeMonitor } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 // MUI
 import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
@@ -22,11 +19,37 @@ import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import { createToast } from "../../../Utils/toastUtils";
 import Radio from "../../../Components/Inputs/Radio";
-import Checkbox from "../../../Components/Inputs/Checkbox";
 import Select from "../../../Components/Inputs/Select";
 import ConfigBox from "../../../Components/ConfigBox";
-import NotificationIntegrationModal from "../../../Components/NotificationIntegrationModal/Components/NotificationIntegrationModal";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import NotificationsConfig from "../../../Components/NotificationConfig";
+
 const CreateMonitor = () => {
+	// Redux state
+	const { user } = useSelector((state) => state.auth);
+	const { isLoading } = useSelector((state) => state.uptimeMonitors);
+	const dispatch = useDispatch();
+
+	// Local state
+	const [errors, setErrors] = useState({});
+	const [https, setHttps] = useState(true);
+	const [useAdvancedMatching, setUseAdvancedMatching] = useState(false);
+	const [monitor, setMonitor] = useState({
+		url: "",
+		name: "",
+		type: "http",
+		matchMethod: "equal",
+		notifications: [],
+		interval: 1,
+		ignoreTlsErrors: false,
+	});
+
+	// Setup
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const navigate = useNavigate();
+	const [notifications, notificationsAreLoading, error] = useGetNotificationsByTeamId();
+
 	const MS_PER_MINUTE = 60000;
 	const SELECT_VALUES = [
 		{ _id: 1, name: "1 minute" },
@@ -71,37 +94,19 @@ const CreateMonitor = () => {
 		},
 	};
 
-	const { user } = useSelector((state) => state.auth);
-	const { isLoading } = useSelector((state) => state.uptimeMonitors);
-	const dispatch = useDispatch();
-	const navigate = useNavigate();
-	const theme = useTheme();
-	const { monitorId } = useParams();
-	const crumbs = [
+	const BREADCRUMBS = [
 		{ name: "uptime", path: "/uptime" },
 		{ name: "create", path: `/uptime/create` },
 	];
 
-	// State
-	const [isNotificationModalOpen, setIsNotificationModalOpen] = useState(false);
+	// Handlers
 
-	const handleOpenNotificationModal = () => {
-		setIsNotificationModalOpen(true);
-	};
-	const [errors, setErrors] = useState({});
-	const [https, setHttps] = useState(true);
-	const [monitor, setMonitor] = useState({
-		url: "",
-		name: "",
-		type: "http",
-		ignoreTlsErrors: false,
-		notifications: [],
-		interval: 1,
-	});
-
-	const handleCreateMonitor = async (event) => {
+	const onSubmit = async (event) => {
 		event.preventDefault();
+		const { notifications, ...rest } = monitor;
+
 		let form = {
+			...rest,
 			url:
 				//prepending protocol for url
 				monitor.type === "http"
@@ -110,14 +115,14 @@ const CreateMonitor = () => {
 			port: monitor.type === "port" ? monitor.port : undefined,
 			name: monitor.name || monitor.url.substring(0, 50),
 			type: monitor.type,
-			ignoreTlsErrors: monitor.ignoreTlsErrors,
 			interval: monitor.interval * MS_PER_MINUTE,
 		};
 
-		if (monitor.type === "http") {
-			form.expectedValue = monitor.expectedValue;
-			form.jsonPath = monitor.jsonPath;
-			form.matchMethod = monitor.matchMethod;
+		// If not using advanced matching, remove advanced settings
+		if (!useAdvancedMatching) {
+			form.matchMethod = undefined;
+			form.expectedValue = undefined;
+			form.jsonPath = undefined;
 		}
 
 		const { error } = monitorValidation.validate(form, {
@@ -141,6 +146,7 @@ const CreateMonitor = () => {
 			userId: user._id,
 			notifications: monitor.notifications,
 		};
+
 		const action = await dispatch(createUptimeMonitor({ monitor: form }));
 		if (action.meta.requestStatus === "fulfilled") {
 			createToast({ body: "Monitor created successfully!" });
@@ -150,115 +156,60 @@ const CreateMonitor = () => {
 		}
 	};
 
-	const handleChange = (event, formName) => {
-		const { type, checked, value } = event.target;
-
-		const newVal = type === "checkbox" ? checked : value;
-
-		const newMonitor = {
-			...monitor,
-			[formName]: newVal,
-		};
-		if (formName === "type") {
-			newMonitor.url = "";
+	const onChange = (event) => {
+		const { name, value, checked } = event.target;
+		let newValue = value;
+		if (name === "ignoreTlsErrors") {
+			newValue = checked;
 		}
-		setMonitor(newMonitor);
+		const updatedMonitor = {
+			...monitor,
+			[name]: newValue,
+		};
+
+		setMonitor(updatedMonitor);
 
 		const { error } = monitorValidation.validate(
-			{ type: monitor.type, [formName]: newVal },
+			{ type: monitor.type, [name]: newValue },
 			{ abortEarly: false }
 		);
+
 		setErrors((prev) => ({
 			...prev,
-			url: undefined,
-			...(error ? { [formName]: error.details[0].message } : { [formName]: undefined }),
+			...(error ? { [name]: error.details[0].message } : { [name]: undefined }),
 		}));
 	};
 
-	const handleNotifications = (event, type) => {
-		const { value } = event.target;
-		let notifications = [...monitor.notifications];
-		const notificationExists = notifications.some((notification) => {
-			if (notification.type === type && notification.address === value) {
-				return true;
-			}
-			return false;
-		});
-		if (notificationExists) {
-			notifications = notifications.filter((notification) => {
-				if (notification.type === type && notification.address === value) {
-					return false;
-				}
-				return true;
-			});
-		} else {
-			notifications.push({ type, address: value });
-		}
-
-		setMonitor((prev) => ({
-			...prev,
-			notifications,
-		}));
-	};
-
-	useEffect(() => {
-		const fetchMonitor = async () => {
-			if (monitorId) {
-				const action = await dispatch(getUptimeMonitorById({ monitorId }));
-
-				if (action.payload.success) {
-					const data = action.payload.data;
-					const { name, ...rest } = data; //data.name is read-only
-					if (rest.type === "http") {
-						const url = new URL(rest.url);
-						rest.url = url.host;
-					}
-					rest.name = `${name} (Clone)`;
-					rest.interval /= MS_PER_MINUTE;
-					setMonitor({
-						...rest,
-					});
-				} else {
-					navigate("/not-found", { replace: true });
-					createToast({
-						body: "There was an error cloning the monitor.",
-					});
-				}
-			}
-		};
-		fetchMonitor();
-	}, [monitorId, dispatch, navigate]);
-
-	const { t } = useTranslation();
-
 	return (
-		<Box className="create-monitor">
-			<Breadcrumbs list={crumbs} />
-			<Stack
-				component="form"
-				gap={theme.spacing(12)}
-				mt={theme.spacing(6)}
-				onSubmit={handleCreateMonitor}
+		<Stack gap={theme.spacing(10)}>
+			<Breadcrumbs list={BREADCRUMBS} />
+
+			<Typography
+				component="h1"
+				variant="h1"
 			>
 				<Typography
-					component="h1"
-					variant="h1"
+					component="span"
+					fontSize="inherit"
 				>
-					<Typography
-						component="span"
-						fontSize="inherit"
-					>
-						{t("createYour")}{" "}
-					</Typography>
-					<Typography
-						component="span"
-						variant="h2"
-						fontSize="inherit"
-						fontWeight="inherit"
-					>
-						{t("monitor")}
-					</Typography>
+					{t("createYour")}{" "}
 				</Typography>
+				<Typography
+					component="span"
+					variant="h2"
+					fontSize="inherit"
+					fontWeight="inherit"
+				>
+					{t("monitor")}
+				</Typography>
+			</Typography>
+			<Stack
+				component="form"
+				noValidate
+				gap={theme.spacing(12)}
+				mt={theme.spacing(6)}
+				onSubmit={onSubmit}
+			>
 				<ConfigBox>
 					<Box>
 						<Typography
@@ -274,13 +225,13 @@ const CreateMonitor = () => {
 					<Stack gap={theme.spacing(12)}>
 						<Stack gap={theme.spacing(6)}>
 							<Radio
-								id="monitor-checks-http"
+								name="type"
 								title={t("websiteMonitoring")}
 								desc={t("websiteMonitoringDescription")}
 								size="small"
 								value="http"
 								checked={monitor.type === "http"}
-								onChange={(event) => handleChange(event, "type")}
+								onChange={onChange}
 							/>
 							{monitor.type === "http" ? (
 								<ButtonGroup sx={{ ml: theme.spacing(16) }}>
@@ -304,31 +255,31 @@ const CreateMonitor = () => {
 							)}
 						</Stack>
 						<Radio
-							id="monitor-checks-ping"
+							name="type"
 							title={t("pingMonitoring")}
 							desc={t("pingMonitoringDescription")}
 							size="small"
 							value="ping"
 							checked={monitor.type === "ping"}
-							onChange={(event) => handleChange(event, "type")}
+							onChange={onChange}
 						/>
 						<Radio
-							id="monitor-checks-docker"
+							name="type"
 							title={t("dockerContainerMonitoring")}
 							desc={t("dockerContainerMonitoringDescription")}
 							size="small"
 							value="docker"
 							checked={monitor.type === "docker"}
-							onChange={(event) => handleChange(event, "type")}
+							onChange={onChange}
 						/>
 						<Radio
-							id="monitor-checks-port"
+							name="type"
 							title={t("portMonitoring")}
 							desc={t("portMonitoringDescription")}
 							size="small"
 							value="port"
 							checked={monitor.type === "port"}
-							onChange={(event) => handleChange(event, "type")}
+							onChange={onChange}
 						/>
 						{errors["type"] ? (
 							<Box className="error-container">
@@ -359,8 +310,8 @@ const CreateMonitor = () => {
 					</Box>
 					<Stack gap={theme.spacing(15)}>
 						<TextInput
+							name="url"
 							type={monitor.type === "http" ? "url" : "text"}
-							id="monitor-url"
 							startAdornment={
 								monitor.type === "http" ? <HttpAdornment https={https} /> : null
 							}
@@ -368,29 +319,29 @@ const CreateMonitor = () => {
 							https={https}
 							placeholder={monitorTypeMaps[monitor.type].placeholder || ""}
 							value={monitor.url}
-							onChange={(event) => handleChange(event, "url")}
+							onChange={onChange}
 							error={errors["url"] ? true : false}
 							helperText={errors["url"]}
 						/>
 						<TextInput
+							name="port"
 							type="number"
-							id="monitor-port"
 							label={t("portToMonitor")}
 							placeholder="5173"
 							value={monitor.port}
-							onChange={(event) => handleChange(event, "port")}
+							onChange={onChange}
 							error={errors["port"] ? true : false}
 							helperText={errors["port"]}
 							hidden={monitor.type !== "port"}
 						/>
 						<TextInput
+							name="name"
 							type="text"
-							id="monitor-name"
 							label={t("displayName")}
 							isOptional={true}
 							placeholder={monitorTypeMaps[monitor.type].namePlaceholder || ""}
 							value={monitor.name}
-							onChange={(event) => handleChange(event, "name")}
+							onChange={onChange}
 							error={errors["name"] ? true : false}
 							helperText={errors["name"]}
 						/>
@@ -398,37 +349,15 @@ const CreateMonitor = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography
-							component="h2"
-							variant="h2"
-						>
-							{t("distributedUptimeCreateIncidentNotification")}
-						</Typography>
+						<Typography component="h2">Notifications</Typography>
 						<Typography component="p">
-							{t("distributedUptimeCreateIncidentDescription")}
+							Select the notifications you want to send out
 						</Typography>
 					</Box>
-					<Stack gap={theme.spacing(6)}>
-						<Checkbox
-							id="notify-email-default"
-							label={`Notify via email (to ${user.email})`}
-							isChecked={monitor.notifications.some(
-								(notification) => notification.type === "email"
-							)}
-							value={user?.email}
-							onChange={(event) => handleNotifications(event, "email")}
-						/>
-
-						<Box mt={theme.spacing(2)}>
-							<Button
-								variant="contained"
-								color="accent"
-								onClick={handleOpenNotificationModal}
-							>
-								{t("notifications.integrationButton")}
-							</Button>
-						</Box>
-					</Stack>
+					<NotificationsConfig
+						notifications={notifications}
+						setMonitor={setMonitor}
+					/>
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
@@ -445,9 +374,9 @@ const CreateMonitor = () => {
 							sx={{ marginLeft: 0 }}
 							control={
 								<Switch
-									name="ignore-error"
+									name="ignoreTlsErrors"
 									checked={monitor.ignoreTlsErrors}
-									onChange={(event) => handleChange(event, "ignoreTlsErrors")}
+									onChange={onChange}
 									sx={{ mr: theme.spacing(2) }}
 								/>
 							}
@@ -466,32 +395,32 @@ const CreateMonitor = () => {
 					</Box>
 					<Stack gap={theme.spacing(12)}>
 						<Select
-							id="monitor-interval"
+							name="interval"
 							label="Check frequency"
 							value={monitor.interval || 1}
-							onChange={(event) => handleChange(event, "interval")}
+							onChange={onChange}
 							items={SELECT_VALUES}
 						/>
 						{monitor.type === "http" && (
 							<>
 								<Select
-									id="match-method"
+									name="matchMethod"
 									label="Match Method"
 									value={monitor.matchMethod || "equal"}
-									onChange={(event) => handleChange(event, "matchMethod")}
+									onChange={onChange}
 									items={matchMethodOptions}
 								/>
 								<Stack>
 									<TextInput
+										name="expectedValue"
 										type="text"
-										id="expected-value"
 										label="Expected value"
 										isOptional={true}
 										placeholder={
 											expectedValuePlaceholders[monitor.matchMethod || "equal"]
 										}
 										value={monitor.expectedValue}
-										onChange={(event) => handleChange(event, "expectedValue")}
+										onChange={onChange}
 										error={errors["expectedValue"] ? true : false}
 										helperText={errors["expectedValue"]}
 									/>
@@ -505,13 +434,13 @@ const CreateMonitor = () => {
 								</Stack>
 								<Stack>
 									<TextInput
+										name="jsonPath"
 										type="text"
-										id="json-path"
 										label="JSON Path"
 										isOptional={true}
 										placeholder="data.status"
 										value={monitor.jsonPath}
-										onChange={(event) => handleChange(event, "jsonPath")}
+										onChange={onChange}
 										error={errors["jsonPath"] ? true : false}
 										helperText={errors["jsonPath"]}
 									/>
@@ -541,9 +470,9 @@ const CreateMonitor = () => {
 					justifyContent="flex-end"
 				>
 					<Button
+						type="submit"
 						variant="contained"
 						color="accent"
-						onClick={handleCreateMonitor}
 						disabled={!Object.values(errors).every((value) => value === undefined)}
 						loading={isLoading}
 					>
@@ -551,14 +480,7 @@ const CreateMonitor = () => {
 					</Button>
 				</Stack>
 			</Stack>
-
-			<NotificationIntegrationModal
-				open={isNotificationModalOpen}
-				onClose={() => setIsNotificationModalOpen(false)}
-				monitor={monitor}
-				setMonitor={setMonitor}
-			/>
-		</Box>
+		</Stack>
 	);
 };
 

From 04ab4e23db941b46aae2000dd79ae4a113257b98 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:56:05 +0800
Subject: [PATCH 054/319] add notificaions channel to Uptime Configure

---
 client/src/Pages/Uptime/Configure/index.jsx | 909 +++++++++-----------
 1 file changed, 414 insertions(+), 495 deletions(-)

diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index f75e53e84..9667728cb 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -1,7 +1,7 @@
 import { useNavigate, useParams } from "react-router";
 import { useTheme } from "@emotion/react";
 import { useDispatch, useSelector } from "react-redux";
-import { useEffect, useState } from "react";
+import { useState, useEffect } from "react";
 import {
 	Box,
 	Stack,
@@ -13,31 +13,26 @@ import {
 } from "@mui/material";
 import { monitorValidation } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
-import { logger } from "../../../Utils/Logger";
 import { useTranslation } from "react-i18next";
 import ConfigBox from "../../../Components/ConfigBox";
 import {
 	updateUptimeMonitor,
-	pauseUptimeMonitor,
-	getUptimeMonitorById,
 	deleteUptimeMonitor,
 } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
-import PauseIcon from "../../../assets/icons/pause-icon.svg?react";
-import ResumeIcon from "../../../assets/icons/resume-icon.svg?react";
 import Select from "../../../Components/Inputs/Select";
-import Checkbox from "../../../Components/Inputs/Checkbox";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
 import PulseDot from "../../../Components/Animated/PulseDot";
-import SkeletonLayout from "./skeleton";
 import "./index.css";
 import Dialog from "../../../Components/Dialog";
-import NotificationIntegrationModal from "../../../Components/NotificationIntegrationModal/Components/NotificationIntegrationModal";
 import { usePauseMonitor } from "../../../Hooks/useMonitorControls";
 import PauseOutlinedIcon from "@mui/icons-material/PauseOutlined";
 import PlayArrowOutlinedIcon from "@mui/icons-material/PlayArrowOutlined";
 import { useMonitorUtils } from "../../../Hooks/useMonitorUtils";
+import { useFetchUptimeMonitorById } from "../../../Hooks/useFetchUptimeMonitorById";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import NotificationsConfig from "../../../Components/NotificationConfig";
 
 /**
  * Parses a URL string and returns a URL object.
@@ -58,22 +53,41 @@ const parseUrl = (url) => {
  * @component
  */
 const Configure = () => {
+	const { monitorId } = useParams();
+
+	// Local state
+	const [form, setForm] = useState({
+		ignoreTlsErrors: false,
+		interval: 60000,
+		matchMethod: "equal",
+		expectedValue: "",
+		jsonPath: "",
+		notifications: [],
+		port: "",
+		type: "http",
+	});
+	const [useAdvancedMatching, setUseAdvancedMatching] = useState(false);
+	const [updateTrigger, setUpdateTrigger] = useState(false);
+	const [isOpen, setIsOpen] = useState(false);
+	const [errors, setErrors] = useState({});
+
+	const triggerUpdate = () => {
+		setUpdateTrigger(!updateTrigger);
+	};
+
+	// Network
+	const [monitor, isLoading, error] = useFetchUptimeMonitorById(monitorId, updateTrigger);
+	const [notifications, notificationsAreLoading, notificationsError] =
+		useGetNotificationsByTeamId();
+	const [pauseMonitor, isPausing, pauseError] = usePauseMonitor({
+		monitorId: monitor?._id,
+		triggerUpdate,
+	});
+
 	const MS_PER_MINUTE = 60000;
 	const navigate = useNavigate();
 	const theme = useTheme();
 	const dispatch = useDispatch();
-	const { user } = useSelector((state) => state.auth);
-	const { isLoading } = useSelector((state) => state.uptimeMonitors);
-	const [monitor, setMonitor] = useState({});
-	const [errors, setErrors] = useState({});
-	const { monitorId } = useParams();
-	const idMap = {
-		"monitor-url": "url",
-		"monitor-name": "name",
-		"monitor-checks-http": "type",
-		"monitor-checks-ping": "type",
-		"notify-email-default": "notification-email",
-	};
 
 	const matchMethodOptions = [
 		{ _id: "equal", name: "Equal" },
@@ -81,106 +95,28 @@ const Configure = () => {
 		{ _id: "regex", name: "Regex" },
 	];
 
+	const frequencies = [
+		{ _id: 1, name: "1 minute" },
+		{ _id: 2, name: "2 minutes" },
+		{ _id: 3, name: "3 minutes" },
+		{ _id: 4, name: "4 minutes" },
+		{ _id: 5, name: "5 minutes" },
+	];
+
 	const expectedValuePlaceholders = {
 		regex: "^(success|ok)$",
 		equal: "success",
 		include: "ok",
 	};
 
-	const [trigger, setTrigger] = useState(false);
-	const triggerUpdate = () => {
-		setTrigger(!trigger);
-	};
-	const [pauseMonitor, isPausing, error] = usePauseMonitor({
-		monitorId: monitor?._id,
-		triggerUpdate,
-	});
-
-	useEffect(() => {
-		const fetchMonitor = async () => {
-			try {
-				const action = await dispatch(getUptimeMonitorById({ monitorId }));
-				if (getUptimeMonitorById.fulfilled.match(action)) {
-					const monitor = action.payload.data;
-					setMonitor(monitor);
-				} else if (getUptimeMonitorById.rejected.match(action)) {
-					throw new Error(action.error.message);
-				}
-			} catch (error) {
-				logger.error("Error fetching monitor of id: " + monitorId);
-				navigate("/not-found", { replace: true });
-			}
-		};
-		fetchMonitor();
-	}, [monitorId, navigate, trigger]);
-
-	const handleChange = (event, name) => {
-		let { checked, value, id } = event.target;
-		if (!name) name = idMap[id];
-
-		if (name.includes("notification-")) {
-			name = name.replace("notification-", "");
-			let hasNotif = monitor.notifications.some(
-				(notification) => notification.type === name
-			);
-			setMonitor((prev) => {
-				const notifs = [...prev.notifications];
-				if (hasNotif) {
-					return {
-						...prev,
-						notifications: notifs.filter((notif) => notif.type !== name),
-					};
-				} else {
-					return {
-						...prev,
-						notifications: [
-							...notifs,
-							name === "email"
-								? { type: name, address: value }
-								: // TODO - phone number
-									{ type: name, phone: value },
-						],
-					};
-				}
-			});
-		} else {
-			if (name === "interval") {
-				value = value * MS_PER_MINUTE;
-			}
-			if (name === "ignoreTlsErrors") {
-				value = checked;
-			}
-			setMonitor((prev) => ({
-				...prev,
-				[name]: value,
-			}));
-
-			const validation = monitorValidation.validate(
-				{ [name]: value },
-				{ abortEarly: false }
-			);
-
-			setErrors((prev) => {
-				const updatedErrors = { ...prev };
-
-				if (validation.error) updatedErrors[name] = validation.error.details[0].message;
-				else delete updatedErrors[name];
-				return updatedErrors;
-			});
+	// Handlers
+	const handlePause = async () => {
+		const res = await pauseMonitor();
+		if (typeof res !== "undefined") {
+			triggerUpdate();
 		}
 	};
 
-	const handleSubmit = async (event) => {
-		event.preventDefault();
-		const action = await dispatch(updateUptimeMonitor({ monitor: monitor }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({ body: "Monitor updated successfully!" });
-		} else {
-			createToast({ body: "Failed to update monitor." });
-		}
-	};
-
-	const [isOpen, setIsOpen] = useState(false);
 	const handleRemove = async (event) => {
 		event.preventDefault();
 		const action = await dispatch(deleteUptimeMonitor({ monitor }));
@@ -191,403 +127,393 @@ const Configure = () => {
 		}
 	};
 
-	const frequencies = [
-		{ _id: 1, name: "1 minute" },
-		{ _id: 2, name: "2 minutes" },
-		{ _id: 3, name: "3 minutes" },
-		{ _id: 4, name: "4 minutes" },
-		{ _id: 5, name: "5 minutes" },
-	];
+	const onChange = (event) => {
+		let { name, value, checked } = event.target;
+
+		if (name === "ignoreTlsErrors") {
+			value = checked;
+		}
+
+		if (name === "interval") {
+			value = value * MS_PER_MINUTE;
+		}
+		setForm({ ...form, [name]: value });
+
+		const validation = monitorValidation.validate(
+			{ [name]: value },
+			{ abortEarly: false }
+		);
+
+		setErrors((prev) => {
+			const updatedErrors = { ...prev };
+
+			if (validation.error) updatedErrors[name] = validation.error.details[0].message;
+			else delete updatedErrors[name];
+			return updatedErrors;
+		});
+	};
+
+	const onSubmit = async (e) => {
+		e.preventDefault();
+
+		const toSubmit = {
+			_id: form._id,
+			url: form.url,
+			name: form.name,
+			type: form.type,
+			matchMethod: form.matchMethod,
+			expectedValue: form.expectedValue,
+			jsonPath: form.jsonPath,
+			interval: form.interval,
+			teamId: form.teamId,
+			userId: form.userId,
+			port: form.port,
+			ignoreTlsErrors: form.ignoreTlsErrors,
+		};
+
+		if (!useAdvancedMatching) {
+			toSubmit.matchMethod = "";
+			toSubmit.expectedValue = "";
+			toSubmit.jsonPath = "";
+		}
+
+		const validation = monitorValidation.validate(toSubmit, {
+			abortEarly: false,
+		});
+
+		if (validation.error) {
+			const newErrors = {};
+			error.details.forEach((err) => {
+				newErrors[err.path[0]] = err.message;
+			});
+			setErrors(newErrors);
+			createToast({ body: "Please check the form for errors." });
+			return;
+		}
+
+		toSubmit.notifications = form.notifications;
+		const action = await dispatch(updateUptimeMonitor({ monitor: toSubmit }));
+		if (action.meta.requestStatus === "fulfilled") {
+			createToast({ body: "Monitor updated successfully!" });
+		} else {
+			createToast({ body: "Failed to update monitor." });
+		}
+	};
+
+	// Effects
+	useEffect(() => {
+		if (monitor?.matchMethod) {
+			setUseAdvancedMatching(true);
+		}
+
+		setForm({
+			...monitor,
+		});
+	}, [monitor, notifications]);
 
 	// Parse the URL
 	const parsedUrl = parseUrl(monitor?.url);
 	const protocol = parsedUrl?.protocol?.replace(":", "") || "";
 
-	// Notification modal state
-	const [isNotificationModalOpen, setIsNotificationModalOpen] = useState(false);
-
-	const handleOpenNotificationModal = () => {
-		setIsNotificationModalOpen(true);
-	};
-
-	const handleClosenNotificationModal = () => {
-		setIsNotificationModalOpen(false);
-	};
-
 	const { determineState, statusColor } = useMonitorUtils();
 
 	const { t } = useTranslation();
 
 	return (
-		<Stack
-			className="configure-monitor"
-			gap={theme.spacing(10)}
-		>
-			{Object.keys(monitor).length === 0 ? (
-				<SkeletonLayout />
-			) : (
-				<>
-					<Breadcrumbs
-						list={[
-							{ name: "uptime", path: "/uptime" },
-							{ name: "details", path: `/uptime/${monitorId}` },
-							{ name: "configure", path: `/uptime/configure/${monitorId}` },
-						]}
-					/>
-					<Stack
-						component="form"
-						noValidate
-						spellCheck="false"
-						gap={theme.spacing(12)}
-						flex={1}
-					>
+		<Stack gap={theme.spacing(10)}>
+			<Breadcrumbs
+				list={[
+					{ name: "uptime", path: "/uptime" },
+					{ name: "details", path: `/uptime/${monitorId}` },
+					{ name: "configure", path: `/uptime/configure/${monitorId}` },
+				]}
+			/>
+			<Stack
+				component="form"
+				onSubmit={onSubmit}
+				noValidate
+				spellCheck="false"
+				gap={theme.spacing(12)}
+				flex={1}
+			>
+				<Stack
+					direction="row"
+					gap={theme.spacing(12)}
+				>
+					<Box>
+						<Typography
+							component="h1"
+							variant="monitorName"
+						>
+							{form.name}
+						</Typography>
 						<Stack
 							direction="row"
+							alignItems="center"
+							height="fit-content"
 							gap={theme.spacing(2)}
 						>
-							<Box>
-								<Typography
-									component="h1"
-									variant="monitorName"
-								>
-									{monitor.name}
-								</Typography>
-								<Stack
-									direction="row"
-									alignItems="center"
-									height="fit-content"
-									gap={theme.spacing(2)}
-								>
-									<Tooltip
-										title={t(`statusMsg.${[determineState(monitor)]}`)}
-										disableInteractive
-										slotProps={{
-											popper: {
-												modifiers: [
-													{
-														name: "offset",
-														options: {
-															offset: [0, -8],
-														},
-													},
-												],
+							<Tooltip
+								title={t(`statusMsg.${[determineState(form)]}`)}
+								disableInteractive
+								slotProps={{
+									popper: {
+										modifiers: [
+											{
+												name: "offset",
+												options: {
+													offset: [0, -8],
+												},
 											},
-										}}
-									>
-										<Box>
-											<PulseDot color={statusColor[determineState(monitor)]} />
-										</Box>
-									</Tooltip>
-									<Typography
-										component="h2"
-										variant="monitorUrl"
-									>
-										{monitor.url?.replace(/^https?:\/\//, "") || "..."}
-									</Typography>
-									<Typography
-										position="relative"
-										variant="body2"
-										ml={theme.spacing(6)}
-										mt={theme.spacing(1)}
-										sx={{
-											"&:before": {
-												position: "absolute",
-												content: `""`,
-												width: 4,
-												height: 4,
-												borderRadius: "50%",
-												backgroundColor: theme.palette.primary.contrastTextTertiary,
-												opacity: 0.8,
-												left: -10,
-												top: "50%",
-												transform: "translateY(-50%)",
-											},
-										}}
-									>
-										{t("editing")}
-									</Typography>
-								</Stack>
-							</Box>
-							<Box
-								justifyContent="space-between"
-								sx={{
-									alignSelf: "flex-end",
-									ml: "auto",
-									display: "flex",
-									gap: theme.spacing(2),
+										],
+									},
 								}}
 							>
-								<Button
-									variant="contained"
-									color="secondary"
-									loading={isPausing}
-									startIcon={
-										monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
-									}
-									onClick={() => {
-										pauseMonitor();
-									}}
-								>
-									{monitor?.isActive ? t("pause") : t("resume")}
-								</Button>
-								<Button
-									loading={isLoading}
-									variant="contained"
-									color="error"
-									sx={{ px: theme.spacing(8) }}
-									onClick={() => setIsOpen(true)}
-								>
-									{t("remove")}
-								</Button>
-							</Box>
-						</Stack>
-						<ConfigBox>
-							<Box>
-								<Typography
-									component="h2"
-									variant="h2"
-								>
-									{t("settingsGeneralSettings")}
-								</Typography>
-								<Typography component="p">
-									{t("distributedUptimeCreateSelectURL")}
-								</Typography>
-							</Box>
-							<Stack gap={theme.spacing(20)}>
-								<TextInput
-									type={monitor?.type === "http" ? "url" : "text"}
-									https={protocol === "https"}
-									startAdornment={
-										monitor?.type === "http" && (
-											<HttpAdornment https={protocol === "https"} />
-										)
-									}
-									id="monitor-url"
-									label={t("urlMonitor")}
-									placeholder="google.com"
-									value={parsedUrl?.host || monitor?.url || ""}
-									disabled={true}
-								/>
-								<TextInput
-									type="number"
-									id="monitor-port"
-									label={t("portToMonitor")}
-									placeholder="5173"
-									value={monitor.port || ""}
-									onChange={(event) => handleChange(event, "port")}
-									error={errors["port"] ? true : false}
-									helperText={errors["port"]}
-									hidden={monitor.type !== "port"}
-								/>
-								<TextInput
-									type="text"
-									id="monitor-name"
-									label={t("displayName")}
-									isOptional={true}
-									placeholder="Google"
-									value={monitor?.name || ""}
-									onChange={handleChange}
-									error={errors["name"] ? true : false}
-									helperText={errors["name"]}
-								/>
-							</Stack>
-						</ConfigBox>
-						<ConfigBox>
-							<Box>
-								<Typography
-									component="h2"
-									variant="h2"
-								>
-									{t("distributedUptimeCreateIncidentNotification")}
-								</Typography>
-								<Typography component="p">
-									{t("distributedUptimeCreateIncidentDescription")}
-								</Typography>
-							</Box>
-							<Stack gap={theme.spacing(6)}>
-								<Typography component="p">{t("whenNewIncident")}</Typography>
-								{/* {Leaving components commented for future funtionality implimentation} */}
-								{/* <Checkbox
-									id="notify-sms"
-									label="Notify via SMS (coming soon)"
-									isChecked={false}
-									value=""
-									onChange={() => logger.warn("disabled")}
-									isDisabled={true}
-								/> */}
-								<Checkbox
-									id="notify-email-default"
-									label={`Notify via email (to ${user.email})`}
-									isChecked={
-										monitor?.notifications?.some(
-											(notification) => notification.type === "email"
-										) || false
-									}
-									value={user?.email}
-									onChange={(event) => handleChange(event)}
-								/>
-								<Box mt={theme.spacing(2)}>
-									<Button
-										variant="contained"
-										color="accent"
-										onClick={handleOpenNotificationModal}
-									>
-										{t("notifications.integrationButton")}
-									</Button>
+								<Box>
+									<PulseDot color={statusColor[determineState(form)]} />
 								</Box>
-								{/* <Checkbox
-									id="notify-email"
-									label="Also notify via email to multiple addresses (coming soon)"
-									isChecked={false}
-									value=""
-									onChange={() => logger.warn("disabled")}
-									isDisabled={true}
-								/> */}
-								{/* {monitor?.notifications?.some(
-									(notification) => notification.type === "emails"
-								) ? (
-									<Box mx={theme.spacing(16)}>
-										<TextInput
-											id="notify-email-list"
-											type="text"
-											placeholder="name@gmail.com"
-											value=""
-											onChange={() => logger.warn("disabled")}
-										/>
-										<Typography mt={theme.spacing(4)}>
-											You can separate multiple emails with a comma
-										</Typography>
-									</Box>
-								) : (
-									""
-								)} */}
-							</Stack>
-						</ConfigBox>
-						<ConfigBox>
-							<Box>
-								<Typography
-									component="h2"
-									variant="h2"
-								>
-									{t("ignoreTLSError")}
-								</Typography>
-								<Typography component="p">{t("ignoreTLSErrorDescription")}</Typography>
-							</Box>
-							<Stack>
-								<FormControlLabel
-									sx={{ marginLeft: 0 }}
-									control={
-										<Switch
-											name="ignore-error"
-											checked={monitor.ignoreTlsErrors}
-											onChange={(event) => handleChange(event, "ignoreTlsErrors")}
-											sx={{ mr: theme.spacing(2) }}
-										/>
-									}
-									label={t("tlsErrorIgnored")}
-								/>
-							</Stack>
-						</ConfigBox>
-						<ConfigBox>
-							<Box>
-								<Typography
-									component="h2"
-									variant="h2"
-								>
-									{t("distributedUptimeCreateAdvancedSettings")}
-								</Typography>
-							</Box>
-							<Stack gap={theme.spacing(20)}>
-								<Select
-									id="monitor-interval-configure"
-									label={t("checkFrequency")}
-									value={monitor?.interval / MS_PER_MINUTE || 1}
-									onChange={(event) => handleChange(event, "interval")}
-									items={frequencies}
-								/>
-								{monitor.type === "http" && (
-									<>
-										<Select
-											id="match-method"
-											label={t("matchMethod")}
-											value={monitor.matchMethod || "equal"}
-											onChange={(event) => handleChange(event, "matchMethod")}
-											items={matchMethodOptions}
-										/>
-										<Stack>
-											<TextInput
-												type="text"
-												id="expected-value"
-												label={t("expectedValue")}
-												isOptional={true}
-												placeholder={
-													expectedValuePlaceholders[monitor.matchMethod || "equal"]
-												}
-												value={monitor.expectedValue}
-												onChange={(event) => handleChange(event, "expectedValue")}
-												error={errors["expectedValue"] ? true : false}
-												helperText={errors["expectedValue"]}
-											/>
-											<Typography
-												component="span"
-												color={theme.palette.primary.contrastTextTertiary}
-												opacity={0.8}
-											>
-												{t("uptimeCreate")}
-											</Typography>
-										</Stack>
-										<Stack>
-											<TextInput
-												type="text"
-												id="json-path"
-												label="JSON Path"
-												isOptional={true}
-												placeholder="data.status"
-												value={monitor.jsonPath}
-												onChange={(event) => handleChange(event, "jsonPath")}
-												error={errors["jsonPath"] ? true : false}
-												helperText={errors["jsonPath"]}
-											/>
-											<Typography
-												component="span"
-												color={theme.palette.primary.contrastTextTertiary}
-												opacity={0.8}
-											>
-												{t("uptimeCreateJsonPath")}&nbsp;
-												<Typography
-													component="a"
-													href="https://jmespath.org/"
-													target="_blank"
-													color="info"
-												>
-													jmespath.org
-												</Typography>
-												&nbsp;{t("uptimeCreateJsonPathQuery")}
-											</Typography>
-										</Stack>
-									</>
-								)}
-							</Stack>
-						</ConfigBox>
-						<Stack
-							direction="row"
-							justifyContent="flex-end"
-							mt="auto"
-						>
-							<Button
-								variant="contained"
-								color="accent"
-								loading={isLoading}
-								sx={{ px: theme.spacing(12) }}
-								onClick={handleSubmit}
+							</Tooltip>
+							<Typography
+								component="h2"
+								variant="monitorUrl"
 							>
-								{t("settingsSave")}
-							</Button>
+								{form.url?.replace(/^https?:\/\//, "") || "..."}
+							</Typography>
+							<Typography
+								position="relative"
+								variant="body2"
+								ml={theme.spacing(6)}
+								mt={theme.spacing(1)}
+								sx={{
+									"&:before": {
+										position: "absolute",
+										content: `""`,
+										width: 4,
+										height: 4,
+										borderRadius: "50%",
+										backgroundColor: theme.palette.primary.contrastTextTertiary,
+										opacity: 0.8,
+										left: -10,
+										top: "50%",
+										transform: "translateY(-50%)",
+									},
+								}}
+							>
+								{t("editing")}
+							</Typography>
 						</Stack>
+					</Box>
+					<Box
+						justifyContent="space-between"
+						sx={{
+							alignSelf: "flex-end",
+							ml: "auto",
+							display: "flex",
+							gap: theme.spacing(2),
+						}}
+					>
+						<Button
+							variant="contained"
+							color="secondary"
+							loading={isPausing}
+							startIcon={
+								form?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
+							}
+							onClick={handlePause}
+						>
+							{form?.isActive ? t("pause") : t("resume")}
+						</Button>
+						<Button
+							loading={isLoading}
+							variant="contained"
+							color="error"
+							sx={{ px: theme.spacing(8) }}
+							onClick={() => setIsOpen(true)}
+						>
+							{t("remove")}
+						</Button>
+					</Box>
+				</Stack>
+				<ConfigBox>
+					<Box>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t("settingsGeneralSettings")}
+						</Typography>
+						<Typography component="p">{t("distributedUptimeCreateSelectURL")}</Typography>
+					</Box>
+					<Stack gap={theme.spacing(20)}>
+						<TextInput
+							type={form?.type === "http" ? "url" : "text"}
+							https={protocol === "https"}
+							startAdornment={
+								form?.type === "http" && <HttpAdornment https={protocol === "https"} />
+							}
+							id="monitor-url"
+							label={t("urlMonitor")}
+							placeholder="google.com"
+							value={parsedUrl?.host || form?.url || ""}
+							disabled={true}
+						/>
+						<TextInput
+							name="port"
+							type="number"
+							label={t("portToMonitor")}
+							placeholder="5173"
+							value={form.port || ""}
+							onChange={onChange}
+							error={errors["port"] ? true : false}
+							helperText={errors["port"]}
+							hidden={form.type !== "port"}
+						/>
+						<TextInput
+							name="name"
+							type="text"
+							label={t("displayName")}
+							isOptional={true}
+							placeholder="Google"
+							value={form?.name || ""}
+							onChange={onChange}
+							error={errors["name"] ? true : false}
+							helperText={errors["name"]}
+						/>
 					</Stack>
-				</>
-			)}
-
+				</ConfigBox>
+				<ConfigBox>
+					<Box>
+						<Typography component="h2">Notifications</Typography>
+						<Typography component="p">
+							Select the notifications you want to send out
+						</Typography>
+					</Box>
+					<NotificationsConfig
+						notifications={notifications}
+						setMonitor={setForm}
+						setNotifications={form.notifications}
+					/>
+				</ConfigBox>
+				<ConfigBox>
+					<Box>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t("ignoreTLSError")}
+						</Typography>
+						<Typography component="p">{t("ignoreTLSErrorDescription")}</Typography>
+					</Box>
+					<Stack>
+						<FormControlLabel
+							sx={{ marginLeft: 0 }}
+							control={
+								<Switch
+									name="ignoreTlsErrors"
+									checked={form.ignoreTlsErrors ?? false}
+									onChange={onChange}
+									sx={{ mr: theme.spacing(2) }}
+								/>
+							}
+							label={t("tlsErrorIgnored")}
+						/>
+					</Stack>
+				</ConfigBox>
+				<ConfigBox>
+					<Box>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t("distributedUptimeCreateAdvancedSettings")}
+						</Typography>
+					</Box>
+					<Stack gap={theme.spacing(20)}>
+						<Select
+							name="interval"
+							label={t("checkFrequency")}
+							value={form?.interval / MS_PER_MINUTE || 1}
+							onChange={onChange}
+							items={frequencies}
+						/>
+						{form.type === "http" && (
+							<>
+								<Select
+									name="matchMethod"
+									label={t("matchMethod")}
+									value={form.matchMethod || "equal"}
+									onChange={onChange}
+									items={matchMethodOptions}
+								/>
+								<Stack>
+									<TextInput
+										type="text"
+										name="expectedValue"
+										label={t("expectedValue")}
+										isOptional={true}
+										placeholder={expectedValuePlaceholders[form.matchMethod || "equal"]}
+										value={form.expectedValue}
+										onChange={onChange}
+										error={errors["expectedValue"] ? true : false}
+										helperText={errors["expectedValue"]}
+									/>
+									<Typography
+										component="span"
+										color={theme.palette.primary.contrastTextTertiary}
+										opacity={0.8}
+									>
+										{t("uptimeCreate")}
+									</Typography>
+								</Stack>
+								<Stack>
+									<TextInput
+										name="jsonPath"
+										type="text"
+										label="JSON Path"
+										isOptional={true}
+										placeholder="data.status"
+										value={form.jsonPath}
+										onChange={onChange}
+										error={errors["jsonPath"] ? true : false}
+										helperText={errors["jsonPath"]}
+									/>
+									<Typography
+										component="span"
+										color={theme.palette.primary.contrastTextTertiary}
+										opacity={0.8}
+									>
+										{t("uptimeCreateJsonPath")}&nbsp;
+										<Typography
+											component="a"
+											href="https://jmespath.org/"
+											target="_blank"
+											color="info"
+										>
+											jmespath.org
+										</Typography>
+										&nbsp;{t("uptimeCreateJsonPathQuery")}
+									</Typography>
+								</Stack>
+							</>
+						)}
+					</Stack>
+				</ConfigBox>
+				<Stack
+					direction="row"
+					justifyContent="flex-end"
+					mt="auto"
+				>
+					<Button
+						type="submit"
+						variant="contained"
+						color="accent"
+						loading={isLoading}
+						sx={{ px: theme.spacing(12) }}
+					>
+						{t("settingsSave")}
+					</Button>
+				</Stack>
+			</Stack>
 			<Dialog
 				open={isOpen}
 				theme={theme}
@@ -598,13 +524,6 @@ const Configure = () => {
 				onConfirm={handleRemove}
 				isLoading={isLoading}
 			/>
-
-			<NotificationIntegrationModal
-				open={isNotificationModalOpen}
-				onClose={handleClosenNotificationModal}
-				monitor={monitor}
-				setMonitor={setMonitor}
-			/>
 		</Stack>
 	);
 };

From e8a4496199232eae95acda0606681e96fed16093 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:56:24 +0800
Subject: [PATCH 055/319] add notification channel pages

---
 client/src/Routes/index.jsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 0f2079265..48343cd22 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -38,7 +38,8 @@ import CreateStatus from "../Pages/StatusPage/Create";
 import StatusPages from "../Pages/StatusPage/StatusPages";
 import Status from "../Pages/StatusPage/Status";
 
-import Integrations from "../Pages/Integrations";
+import Notifications from "../Pages/Notifications";
+import CreateNotifications from "../Pages/Notifications/create";
 
 // Settings
 import Account from "../Pages/Account";
@@ -149,8 +150,12 @@ const Routes = () => {
 				/>
 
 				<Route
-					path="integrations"
-					element={<Integrations />}
+					path="notifications"
+					element={<Notifications />}
+				/>
+				<Route
+					path="notifications/create"
+					element={<CreateNotifications />}
 				/>
 				<Route
 					path="maintenance"

From eb79eef2a261072a5936efb09b26992362e9d462 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:56:45 +0800
Subject: [PATCH 056/319] Add network service methods

---
 client/src/Utils/NetworkService.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 7cfa5a7f1..26c6bd460 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1034,6 +1034,21 @@ class NetworkService {
 		// Fallback to original behavior for backward compatibility
 		return this.axiosInstance.post(`/settings/test-email`, { to });
 	}
+
+	async createNotification(config) {
+		const { notification } = config;
+		return this.axiosInstance.post(`/notifications`, notification);
+	}
+
+	async getNotificationsByTeamId(config) {
+		const { teamId } = config;
+		return this.axiosInstance.get(`/notifications/team/${teamId}`);
+	}
+
+	async deleteNotificationById(config) {
+		const { id } = config;
+		return this.axiosInstance.delete(`/notifications/${id}`);
+	}
 }
 
 export default NetworkService;

From ff11a911903028d7ad660087d7c55a96390906c9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:57:02 +0800
Subject: [PATCH 057/319] add notification config component

---
 .../Components/NotificationConfig/index.jsx   | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 client/src/Components/NotificationConfig/index.jsx

diff --git a/client/src/Components/NotificationConfig/index.jsx b/client/src/Components/NotificationConfig/index.jsx
new file mode 100644
index 000000000..d3707eae4
--- /dev/null
+++ b/client/src/Components/NotificationConfig/index.jsx
@@ -0,0 +1,106 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Divider from "@mui/material/Divider";
+import DeleteOutlineRoundedIcon from "@mui/icons-material/DeleteOutlineRounded";
+import Search from "../Inputs/Search";
+
+// Utils
+import { useState, useEffect } from "react";
+import { useTheme } from "@mui/material/styles";
+import PropTypes from "prop-types";
+
+const NotificationConfig = ({ notifications, setMonitor, setNotifications }) => {
+	// Local state
+	const [notificationsSearch, setNotificationsSearch] = useState("");
+	const [selectedNotifications, setSelectedNotifications] = useState([]);
+
+	const handleSearch = (value) => {
+		setSelectedNotifications(value);
+		setMonitor((prev) => {
+			return {
+				...prev,
+				notifications: value.map((notification) => notification._id),
+			};
+		});
+	};
+
+	// Handlers
+	const handleDelete = (id) => {
+		const updatedNotifications = selectedNotifications.filter(
+			(notification) => notification._id !== id
+		);
+
+		setSelectedNotifications(updatedNotifications);
+		setMonitor((prev) => {
+			return {
+				...prev,
+				notifications: updatedNotifications.map((notification) => notification._id),
+			};
+		});
+	};
+
+	// Setup
+	const theme = useTheme();
+
+	useEffect(() => {
+		if (setNotifications) {
+			const toSet = setNotifications.map((notification) => {
+				return notifications.find((n) => n._id === notification);
+			});
+			setSelectedNotifications(toSet);
+		}
+	}, [setNotifications, notifications]);
+
+	return (
+		<Stack gap={theme.spacing(6)}>
+			<Search
+				type="notifications"
+				label="Notifications"
+				options={notifications}
+				filteredBy="notificationName"
+				multiple={true}
+				value={selectedNotifications}
+				inputValue={notificationsSearch}
+				handleInputChange={setNotificationsSearch}
+				handleChange={(value) => {
+					handleSearch(value);
+				}}
+			/>
+			<Stack
+				flex={1}
+				width="100%"
+			>
+				{selectedNotifications.map((notification, index) => (
+					<Stack
+						direction="row"
+						alignItems="center"
+						key={notification._id}
+						width="100%"
+					>
+						<Typography
+							flexGrow={1} // <-- This will take up all available horizontal space
+						>
+							{notification.notificationName}
+						</Typography>
+						<DeleteOutlineRoundedIcon
+							onClick={() => {
+								handleDelete(notification._id);
+							}}
+							sx={{ cursor: "pointer" }}
+						/>
+						{index < selectedNotifications.length - 1 && <Divider />}
+					</Stack>
+				))}
+			</Stack>
+		</Stack>
+	);
+};
+
+NotificationConfig.propTypes = {
+	notifications: PropTypes.array,
+	setMonitor: PropTypes.func,
+	setNotifications: PropTypes.array,
+};
+
+export default NotificationConfig;

From 46b2b4c3ab0db38a7f2561eb099333337ffa0f34 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:57:15 +0800
Subject: [PATCH 058/319] add hooks

---
 client/src/Hooks/useFetchUptimeMonitorById.js | 35 +++++++
 client/src/Hooks/useNotifications.js          | 91 +++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 client/src/Hooks/useFetchUptimeMonitorById.js
 create mode 100644 client/src/Hooks/useNotifications.js

diff --git a/client/src/Hooks/useFetchUptimeMonitorById.js b/client/src/Hooks/useFetchUptimeMonitorById.js
new file mode 100644
index 000000000..cb344569c
--- /dev/null
+++ b/client/src/Hooks/useFetchUptimeMonitorById.js
@@ -0,0 +1,35 @@
+import { useState, useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { getUptimeMonitorById } from "../Features/UptimeMonitors/uptimeMonitorsSlice";
+import { useNavigate } from "react-router";
+
+const useFetchUptimeMonitorById = (monitorId, updateTrigger) => {
+	const [isLoading, setIsLoading] = useState(true);
+	const [error, setError] = useState(null);
+	const [monitor, setMonitor] = useState(null);
+	const navigate = useNavigate();
+	const dispatch = useDispatch();
+	useEffect(() => {
+		const fetchMonitor = async () => {
+			try {
+				setIsLoading(true);
+				const action = await dispatch(getUptimeMonitorById({ monitorId }));
+
+				if (getUptimeMonitorById.fulfilled.match(action)) {
+					const monitor = action.payload.data;
+					setMonitor(monitor);
+				} else if (getUptimeMonitorById.rejected.match(action)) {
+					throw new Error(action.error.message);
+				}
+			} catch (error) {
+				navigate("/not-found", { replace: true });
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitor();
+	}, [monitorId, dispatch, navigate, updateTrigger]);
+	return [monitor, isLoading, error];
+};
+
+export { useFetchUptimeMonitorById };
diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
new file mode 100644
index 000000000..4ece55acd
--- /dev/null
+++ b/client/src/Hooks/useNotifications.js
@@ -0,0 +1,91 @@
+import { useState, useEffect, useCallback } from "react";
+import { createToast } from "../Utils/toastUtils";
+import { networkService } from "../main";
+import { useNavigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import { useTranslation } from "react-i18next";
+
+const useCreateNotification = () => {
+	const navigate = useNavigate();
+	const { t } = useTranslation();
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+
+	const createNotification = async (notification) => {
+		try {
+			setIsLoading(true);
+			await networkService.createNotification({ notification });
+			createToast({
+				body: t("notifications.create.success"),
+			});
+			navigate("/notifications");
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: t("notifications.create.failed"),
+			});
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [createNotification, isLoading, error];
+};
+
+const useGetNotificationsByTeamId = (updateTrigger) => {
+	const [notifications, setNotifications] = useState([]);
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+	const { user } = useSelector((state) => state.auth);
+	const { t } = useTranslation();
+
+	const getNotifications = useCallback(async () => {
+		try {
+			setIsLoading(true);
+			const response = await networkService.getNotificationsByTeamId({
+				teamId: user.teamId,
+			});
+			setNotifications(response?.data?.data ?? []);
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: t("notifications.fetch.failed"),
+			});
+		} finally {
+			setIsLoading(false);
+		}
+	}, [user.teamId]);
+
+	useEffect(() => {
+		getNotifications();
+	}, [getNotifications, updateTrigger]);
+
+	return [notifications, isLoading, error];
+};
+
+const useDeleteNotification = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+	const { t } = useTranslation();
+
+	const deleteNotification = async (id, triggerUpdate) => {
+		try {
+			setIsLoading(true);
+			await networkService.deleteNotificationById({ id });
+			createToast({
+				body: t("notifications.delete.success"),
+			});
+			triggerUpdate();
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: t("notifications.delete.failed"),
+			});
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [deleteNotification, isLoading, error];
+};
+export { useCreateNotification, useGetNotificationsByTeamId, useDeleteNotification };

From 5b219068942a161be9feaf646954190710255a7d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:57:30 +0800
Subject: [PATCH 059/319] add notificaion pages

---
 .../src/Pages/Notifications/create/index.jsx  | 324 ++++++++++++++++++
 client/src/Pages/Notifications/index.jsx      | 121 +++++++
 2 files changed, 445 insertions(+)
 create mode 100644 client/src/Pages/Notifications/create/index.jsx
 create mode 100644 client/src/Pages/Notifications/index.jsx

diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
new file mode 100644
index 000000000..c188aca22
--- /dev/null
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -0,0 +1,324 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Breadcrumbs from "../../../Components/Breadcrumbs";
+import Button from "@mui/material/Button";
+import ConfigBox from "../../../Components/ConfigBox";
+import Box from "@mui/material/Box";
+import Select from "../../../Components/Inputs/Select";
+import TextInput from "../../../Components/Inputs/TextInput";
+
+// Utils
+import { useState } from "react";
+import { useSelector } from "react-redux";
+import { useTheme } from "@emotion/react";
+import { useCreateNotification } from "../../../Hooks/useNotifications";
+import {
+	notificationEmailValidation,
+	notificationWebhookValidation,
+	notificationPagerDutyValidation,
+} from "../../../Validation/validation";
+import { createToast } from "../../../Utils/toastUtils";
+import { useTranslation } from "react-i18next";
+
+// Setup
+
+const NOTIFICATION_TYPES = [
+	{ _id: 1, name: "E-mail", value: "email" },
+	{ _id: 2, name: "Slack", value: "webhook" },
+	{ _id: 3, name: "PagerDuty", value: "pager_duty" },
+];
+
+const CreateNotifications = () => {
+	const theme = useTheme();
+	const [createNotification, isLoading, error] = useCreateNotification();
+	const BREADCRUMBS = [
+		{ name: "notifications", path: "/notifications" },
+		{ name: "create", path: "/notifications/create" },
+	];
+
+	// Redux state
+	const { user } = useSelector((state) => state.auth);
+
+	// local state
+	const [notification, setNotification] = useState({
+		userId: user._id,
+		teamId: user.teamId,
+		notificationName: "",
+		address: "",
+		type: NOTIFICATION_TYPES[0]._id,
+		config: {
+			webhookUrl: "",
+			platform: "",
+			routingKey: "",
+		},
+	});
+	const [errors, setErrors] = useState({});
+	const { t } = useTranslation();
+
+	// handlers
+	const onSubmit = (e) => {
+		e.preventDefault();
+		const form = {
+			...notification,
+			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
+		};
+
+		if (notification.type === 2) {
+			form.type = "webhook";
+		}
+
+		let error = null;
+
+		if (form.type === "email") {
+			error = notificationEmailValidation.validate(
+				{ notificationName: form.notificationName, address: form.address },
+				{ abortEarly: false }
+			).error;
+		} else if (form.type === "webhook") {
+			form.config = {
+				platform: form.config.platform,
+				webhookUrl: form.config.webhookUrl,
+			};
+			error = notificationWebhookValidation.validate(
+				{ notificationName: form.notificationName, config: form.config },
+				{ abortEarly: false }
+			).error;
+		} else if (form.type === "pager_duty") {
+			form.config = {
+				platform: form.config.platform,
+				routingKey: form.config.routingKey,
+			};
+			error = notificationPagerDutyValidation.validate(
+				{ notificationName: form.notificationName, config: form.config },
+				{ abortEarly: false }
+			).error;
+		}
+
+		if (error) {
+			const newErrors = {};
+			error.details.forEach((err) => {
+				newErrors[err.path[0]] = err.message;
+			});
+			createToast({ body: "Please check the form for errors." });
+			setErrors(newErrors);
+			return;
+		}
+
+		createNotification(form);
+	};
+
+	const onChange = (e) => {
+		const { name, value } = e.target;
+
+		const newNotification = { ...notification, [name]: value };
+
+		// Handle config/platform initialization if type is webhook
+
+		if (newNotification.type === 1) {
+			newNotification.config = null;
+		} else if (newNotification.type === 2) {
+			newNotification.address = "";
+			newNotification.config = newNotification.config || {};
+			if (name === "config") {
+				newNotification.config = value;
+			}
+			newNotification.config.platform = "slack";
+		} else if (newNotification.type === 3) {
+			newNotification.config = newNotification.config || {};
+			if (name === "config") {
+				newNotification.config = value;
+			}
+			newNotification.config.platform = "pager_duty";
+		}
+
+		// Field-level validation
+		let fieldError;
+
+		if (name === "notificationName") {
+			const { error } = notificationEmailValidation.extract(name).validate(value);
+			fieldError = error?.message;
+		}
+
+		if (newNotification.type === 1 && name === "address") {
+			const { error } = notificationEmailValidation.extract(name).validate(value);
+			fieldError = error?.message;
+		}
+
+		if (newNotification.type === 2 && name === "config") {
+			// Validate only webhookUrl inside config
+			const { error } = notificationWebhookValidation.extract("config").validate(value);
+			fieldError = error?.message;
+		}
+
+		// Set field-level error
+		setErrors((prev) => ({
+			...prev,
+			[name]: fieldError,
+		}));
+
+		setNotification(newNotification);
+	};
+
+	return (
+		<Stack gap={theme.spacing(10)}>
+			<Breadcrumbs list={BREADCRUMBS} />
+			<Typography variant="h1">{t("createNotifications.title")}</Typography>
+			<Stack
+				component="form"
+				onSubmit={onSubmit}
+				noValidate
+				gap={theme.spacing(12)}
+				mt={theme.spacing(6)}
+			>
+				<ConfigBox>
+					<Box>
+						<Typography component="h2">
+							{t("createNotifications.nameSettings.title")}
+						</Typography>
+						<Typography component="p">
+							{t("createNotifications.nameSettings.description")}
+						</Typography>
+					</Box>
+					<Stack gap={theme.spacing(12)}>
+						<TextInput
+							label={t("createNotifications.nameSettings.nameLabel")}
+							name="notificationName"
+							placeholder={t("createNotifications.nameSettings.namePlaceholder")}
+							value={notification.notificationName}
+							onChange={onChange}
+							error={Boolean(errors.notificationName)}
+							helperText={errors["notificationName"]}
+						/>
+					</Stack>
+				</ConfigBox>
+				<ConfigBox>
+					<Box>
+						<Typography component="h2">
+							{t("createNotifications.typeSettings.title")}
+						</Typography>
+						<Typography component="p">
+							{t("createNotifications.typeSettings.description")}
+						</Typography>
+					</Box>
+					<Stack gap={theme.spacing(12)}>
+						<Select
+							items={NOTIFICATION_TYPES}
+							label="Type"
+							name="type"
+							value={notification.type}
+							onChange={onChange}
+						/>
+					</Stack>
+				</ConfigBox>
+				{notification.type === 1 && (
+					<ConfigBox>
+						<Box>
+							<Typography component="h2">
+								{t("createNotifications.emailSettings.title")}
+							</Typography>
+							<Typography component="p">
+								{t("createNotifications.emailSettings.description")}
+							</Typography>
+						</Box>
+						<Stack gap={theme.spacing(12)}>
+							<TextInput
+								label={t("createNotifications.emailSettings.emailLabel")}
+								name="address"
+								placeholder={t("createNotifications.emailSettings.emailPlaceholder")}
+								value={notification.address}
+								onChange={onChange}
+								error={Boolean(errors.address)}
+								helperText={errors["address"]}
+							/>
+						</Stack>
+					</ConfigBox>
+				)}
+				{notification.type === 2 && (
+					<ConfigBox>
+						<Box>
+							<Typography component="h2">
+								{t("createNotifications.slackSettings.title")}
+							</Typography>
+							<Typography component="p">
+								{t("createNotifications.slackSettings.description")}
+							</Typography>
+						</Box>
+						<Stack gap={theme.spacing(12)}>
+							<TextInput
+								label={t("createNotifications.slackSettings.webhookLabel")}
+								value={notification.config.webhookUrl}
+								error={Boolean(errors.config)}
+								helperText={errors["config"]}
+								onChange={(e) => {
+									const updatedConfig = {
+										...notification.config,
+										webhookUrl: e.target.value,
+									};
+
+									onChange({
+										target: {
+											name: "config",
+											value: updatedConfig,
+										},
+									});
+								}}
+							/>
+						</Stack>
+					</ConfigBox>
+				)}
+				{notification.type === 3 && (
+					<ConfigBox>
+						<Box>
+							<Typography component="h2">
+								{t("createNotifications.pagerdutySettings.title")}
+							</Typography>
+							<Typography component="p">
+								{t("createNotifications.pagerdutySettings.description")}
+							</Typography>
+						</Box>
+						<Stack gap={theme.spacing(12)}>
+							<TextInput
+								label={t("createNotifications.pagerdutySettings.integrationKeyLabel")}
+								placeholder={t(
+									"createNotifications.pagerdutySettings.integrationKeyPlaceholder"
+								)}
+								value={notification.config.routingKey}
+								error={Boolean(errors.config)}
+								helperText={errors["config"]}
+								onChange={(e) => {
+									const updatedConfig = {
+										...notification.config,
+										routingKey: e.target.value,
+									};
+
+									onChange({
+										target: {
+											name: "config",
+											value: updatedConfig,
+										},
+									});
+								}}
+							/>
+						</Stack>
+					</ConfigBox>
+				)}
+				<Stack
+					direction="row"
+					justifyContent="flex-end"
+				>
+					<Button
+						loading={isLoading}
+						type="submit"
+						variant="contained"
+						color="accent"
+					>
+						Submit
+					</Button>
+				</Stack>
+			</Stack>
+		</Stack>
+	);
+};
+
+export default CreateNotifications;
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
new file mode 100644
index 000000000..d55bca297
--- /dev/null
+++ b/client/src/Pages/Notifications/index.jsx
@@ -0,0 +1,121 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Breadcrumbs from "../../Components/Breadcrumbs";
+import Button from "@mui/material/Button";
+import DataTable from "../../Components/Table";
+import Fallback from "../../Components/Fallback";
+// Utils
+import { useIsAdmin } from "../../Hooks/useIsAdmin";
+import { useState } from "react";
+import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router-dom";
+import {
+	useGetNotificationsByTeamId,
+	useDeleteNotification,
+} from "../../Hooks/useNotifications";
+import { useTranslation } from "react-i18next";
+// Setup
+
+const Notifications = () => {
+	const navigate = useNavigate();
+	const theme = useTheme();
+	const BREADCRUMBS = [{ name: "notifications", path: "/notifications" }];
+	const [updateTrigger, setUpdateTrigger] = useState(false);
+	const isAdmin = useIsAdmin();
+	const [notifications, isLoading, error] = useGetNotificationsByTeamId(updateTrigger);
+	const [deleteNotification, isDeleting, deleteError] = useDeleteNotification();
+	const { t } = useTranslation();
+	// Handlers
+	const triggerUpdate = () => {
+		setUpdateTrigger(!updateTrigger);
+	};
+
+	const onDelete = (id) => {
+		deleteNotification(id, triggerUpdate);
+	};
+
+	const headers = [
+		{
+			id: "name",
+			content: "Name",
+			render: (row) => {
+				return row.notificationName;
+			},
+		},
+		{
+			id: "type",
+			content: "Type",
+			render: (row) => {
+				return row.type;
+			},
+		},
+		{
+			id: "target",
+			content: "Target",
+			render: (row) => {
+				return row.address || row.config?.webhookUrl || row.config?.routingKey;
+			},
+		},
+		{
+			id: "platform",
+			content: "Platform",
+			render: (row) => {
+				return row?.config?.platform || row.type;
+			},
+		},
+
+		{
+			id: "actions",
+			content: "Actions",
+			render: (row) => {
+				return (
+					<Button
+						variant="contained"
+						color="error"
+						onClick={() => onDelete(row._id)}
+					>
+						Delete
+					</Button>
+				);
+			},
+		},
+	];
+
+	if (notifications?.length === 0) {
+		return (
+			<Fallback
+				vowelStart={false}
+				title={t("notifications.fallback.title")}
+				checks={[t("notifications.fallback.checks")]}
+				link="/notifications/create"
+				isAdmin={isAdmin}
+			/>
+		);
+	}
+
+	return (
+		<Stack gap={theme.spacing(10)}>
+			<Breadcrumbs list={BREADCRUMBS} />
+			<Stack
+				direction="row"
+				justifyContent="flex-end"
+			>
+				<Button
+					variant="contained"
+					color="accent"
+					onClick={() => navigate("/notifications/create")}
+				>
+					{t("notifications.createButton")}
+				</Button>
+			</Stack>
+			<Typography variant="h1">{t("notifications.createTitle")}</Typography>
+			<DataTable
+				headers={headers}
+				data={notifications}
+			/>
+		</Stack>
+	);
+};
+
+export default Notifications;

From b825e0fef420cc24f49f9bffa6254d9fdaaee295 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:58:04 +0800
Subject: [PATCH 060/319] remove old notification code

---
 server/controllers/monitorController.js | 40 +------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 822cf8688..447027c57 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -219,19 +219,8 @@ class MonitorController {
 		}
 
 		try {
-			const notifications = req.body.notifications;
 			const monitor = await this.db.createMonitor(req, res);
 
-			if (notifications && notifications.length > 0) {
-				monitor.notifications = await Promise.all(
-					notifications.map(async (notification) => {
-						notification.monitorId = monitor._id;
-						return await this.db.createNotification(notification);
-					})
-				);
-			}
-
-			await monitor.save();
 			// Add monitor to job queue
 			this.jobQueue.addJob(monitor._id, monitor);
 			return res.success({
@@ -325,18 +314,6 @@ class MonitorController {
 
 							await Promise.all(
 								monitors.map(async (monitor, index) => {
-									const notifications = enrichedData[index].notifications;
-
-									if (notifications?.length) {
-										monitor.notifications = await Promise.all(
-											notifications.map(async (notification) => {
-												notification.monitorId = monitor._id;
-												return await this.db.createNotification(notification);
-											})
-										);
-										await monitor.save();
-									}
-
 									this.jobQueue.addJob(monitor._id, monitor);
 								})
 							);
@@ -422,10 +399,7 @@ class MonitorController {
 						name: "deletePageSpeedChecks",
 						fn: () => this.db.deletePageSpeedChecksByMonitorId(monitor._id),
 					},
-					{
-						name: "deleteNotifications",
-						fn: () => this.db.deleteNotificationsByMonitorId(monitor._id),
-					},
+
 					{
 						name: "deleteHardwareChecks",
 						fn: () => this.db.deleteHardwareChecksByMonitorId(monitor._id),
@@ -530,21 +504,9 @@ class MonitorController {
 
 		try {
 			const { monitorId } = req.params;
-			const monitorBeforeEdit = await this.db.getMonitorById(monitorId);
 
-			// Get notifications from the request body
-			const notifications = req.body.notifications ?? [];
 			const editedMonitor = await this.db.editMonitor(monitorId, req.body);
 
-			await this.db.deleteNotificationsByMonitorId(editedMonitor._id);
-
-			await Promise.all(
-				notifications.map(async (notification) => {
-					notification.monitorId = editedMonitor._id;
-					await this.db.createNotification(notification);
-				})
-			);
-
 			await this.jobQueue.updateJob(editedMonitor);
 
 			return res.success({

From a0de1e3c720b2b45c4f5d8b472dce3b00c0144b5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:58:25 +0800
Subject: [PATCH 061/319] remove old notificaiton code

---
 server/db/mongo/modules/monitorModule.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 8e44daea7..3d9adab39 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -500,14 +500,6 @@ const getMonitorById = async (monitorId) => {
 			error.status = 404;
 			throw error;
 		}
-		// Get notifications
-		const notifications = await Notification.find({
-			monitorId: monitorId,
-		});
-
-		// Update monitor with notifications and save
-		monitor.notifications = notifications;
-		await monitor.save();
 
 		return monitor;
 	} catch (error) {
@@ -664,10 +656,8 @@ const getMonitorsWithChecksByTeamId = async (req) => {
 const createMonitor = async (req, res) => {
 	try {
 		const monitor = new Monitor({ ...req.body });
-		// Remove notifications fom monitor as they aren't needed here
-		monitor.notifications = undefined;
-		await monitor.save();
-		return monitor;
+		const saved = await monitor.save();
+		return saved;
 	} catch (error) {
 		error.service = SERVICE_NAME;
 		error.method = "createMonitor";
@@ -764,8 +754,6 @@ const deleteMonitorsByUserId = async (userId) => {
  * @throws {Error}
  */
 const editMonitor = async (candidateId, candidateMonitor) => {
-	candidateMonitor.notifications = undefined;
-
 	try {
 		const editedMonitor = await Monitor.findByIdAndUpdate(candidateId, candidateMonitor, {
 			new: true,

From f2000ffe56d6a31e9feec55411266553a18313d2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:58:52 +0800
Subject: [PATCH 062/319] add notificaitons to projection

---
 server/db/mongo/modules/monitorModuleQueries.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/db/mongo/modules/monitorModuleQueries.js b/server/db/mongo/modules/monitorModuleQueries.js
index abf91b325..f17eff2c2 100755
--- a/server/db/mongo/modules/monitorModuleQueries.js
+++ b/server/db/mongo/modules/monitorModuleQueries.js
@@ -148,6 +148,7 @@ const buildUptimeDetailsPipeline = (monitorId, dates, dateString) => {
 							type: 1,
 							url: 1,
 							isActive: 1,
+							notifications: 1,
 						},
 					},
 				],

From 4c3ea2fd655260f91ad1aeb985ce809faa740050 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 12:59:02 +0800
Subject: [PATCH 063/319] add validation

---
 server/validation/joi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/validation/joi.js b/server/validation/joi.js
index d261b852a..75f580180 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -193,7 +193,7 @@ const createMonitorBodyValidation = joi.object({
 		usage_disk: joi.number(),
 		usage_temperature: joi.number(),
 	}),
-	notifications: joi.array().items(joi.object()),
+	notifications: joi.array().items(joi.string()),
 	secret: joi.string(),
 	jsonPath: joi.string().allow(""),
 	expectedValue: joi.string().allow(""),
@@ -206,12 +206,12 @@ const editMonitorBodyValidation = joi.object({
 	name: joi.string(),
 	description: joi.string(),
 	interval: joi.number(),
-	notifications: joi.array().items(joi.object()),
+	notifications: joi.array().items(joi.string()),
 	secret: joi.string(),
 	ignoreTlsErrors: joi.boolean(),
 	jsonPath: joi.string().allow(""),
 	expectedValue: joi.string().allow(""),
-	matchMethod: joi.string(),
+	matchMethod: joi.string().allow(null, ""),
 	port: joi.number().min(1).max(65535),
 	thresholds: joi.object().keys({
 		usage_cpu: joi.number(),

From de673ea5d13ac671550e9931cb1d0e462777d687 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 14:22:11 +0800
Subject: [PATCH 064/319] add notifications to pagespeed

---
 .../ConfigButton/index.jsx                    |   4 +-
 .../src/Pages/PageSpeed/Configure/index.jsx   | 204 ++++++------------
 client/src/Pages/PageSpeed/Create/index.jsx   |  59 ++---
 client/src/Pages/Uptime/Configure/index.jsx   |   6 +-
 client/src/Pages/Uptime/Create/index.jsx      |   6 +-
 client/src/locales/en.json                    |   4 +
 server/db/models/Monitor.js                   |   2 +-
 7 files changed, 87 insertions(+), 198 deletions(-)

diff --git a/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx b/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
index c966abf33..7ad6ae9af 100644
--- a/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
@@ -34,8 +34,8 @@ const ConfigButton = ({ shouldRender = true, monitorId, path }) => {
 
 ConfigButton.propTypes = {
 	shouldRender: PropTypes.bool,
-	monitorId: PropTypes.string.isRequired,
-	path: PropTypes.string.isRequired,
+	monitorId: PropTypes.string,
+	path: PropTypes.string,
 };
 
 export default ConfigButton;
diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index 84e26c6a0..487106247 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -1,6 +1,19 @@
+// Components
+import { Box, Stack, Tooltip, Typography, Button } from "@mui/material";
+import ConfigBox from "../../../Components/ConfigBox";
+import Select from "../../../Components/Inputs/Select";
+import TextInput from "../../../Components/Inputs/TextInput";
+import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline";
+import Breadcrumbs from "../../../Components/Breadcrumbs";
+import PulseDot from "../../../Components/Animated/PulseDot";
+import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
+import SkeletonLayout from "./skeleton";
+import NotificationsConfig from "../../../Components/NotificationConfig";
+import Dialog from "../../../Components/Dialog";
+
+// Utils
 import { useEffect, useState } from "react";
 import { useTheme } from "@emotion/react";
-import { Box, Stack, Tooltip, Typography, Button } from "@mui/material";
 import { useDispatch, useSelector } from "react-redux";
 import { useNavigate, useParams } from "react-router";
 import {
@@ -12,41 +25,31 @@ import {
 } from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import { monitorValidation } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
-import { logger } from "../../../Utils/Logger";
 import { useTranslation } from "react-i18next";
-import ConfigBox from "../../../Components/ConfigBox";
-import TextInput from "../../../Components/Inputs/TextInput";
-import Select from "../../../Components/Inputs/Select";
-import Checkbox from "../../../Components/Inputs/Checkbox";
-import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import PulseDot from "../../../Components/Animated/PulseDot";
-import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
-import SkeletonLayout from "./skeleton";
 import useUtils from "../../Uptime/Monitors/Hooks/useUtils";
-import "./index.css";
-import Dialog from "../../../Components/Dialog";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 
 const PageSpeedConfigure = () => {
+	// Redux state
+	const { isLoading } = useSelector((state) => state.pageSpeedMonitors);
+
+	// Local state
+	const [monitor, setMonitor] = useState({});
+	const [errors, setErrors] = useState({});
+	const [buttonLoading, setButtonLoading] = useState(false);
+	const [isOpen, setIsOpen] = useState(false);
+
+	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const navigate = useNavigate();
 	const dispatch = useDispatch();
 	const MS_PER_MINUTE = 60000;
-	const { user } = useSelector((state) => state.auth);
-	const { isLoading } = useSelector((state) => state.pageSpeedMonitors);
 	const { monitorId } = useParams();
-	const [monitor, setMonitor] = useState({});
-	const [errors, setErrors] = useState({});
 	const { statusColor, pagespeedStatusMsg, determineState } = useUtils();
-	const [buttonLoading, setButtonLoading] = useState(false);
-	const idMap = {
-		"monitor-url": "url",
-		"monitor-name": "name",
-		"monitor-checks-http": "type",
-		"monitor-checks-ping": "type",
-		"notify-email-default": "notification-email",
-	};
+
+	const [notifications, notificationsAreLoading, notificationsError] =
+		useGetNotificationsByTeamId();
 
 	const frequencies = [
 		{ _id: 3, name: "3 minutes" },
@@ -77,57 +80,29 @@ const PageSpeedConfigure = () => {
 		fetchMonitor();
 	}, [dispatch, monitorId, navigate]);
 
-	const handleChange = (event, name) => {
-		let { value, id } = event.target;
-		if (!name) name = idMap[id];
+	const onChange = (event) => {
+		let { value, name } = event.target;
 
-		if (name.includes("notification-")) {
-			name = name.replace("notification-", "");
-			let hasNotif = monitor.notifications.some(
-				(notification) => notification.type === name
-			);
-			setMonitor((prev) => {
-				const notifs = [...prev.notifications];
-				if (hasNotif) {
-					return {
-						...prev,
-						notifications: notifs.filter((notif) => notif.type !== name),
-					};
-				} else {
-					return {
-						...prev,
-						notifications: [
-							...notifs,
-							name === "email"
-								? { type: name, address: value }
-								: // TODO - phone number
-									{ type: name, phone: value },
-						],
-					};
-				}
-			});
-		} else {
-			if (name === "interval") {
-				value = value * MS_PER_MINUTE;
-			}
-			setMonitor((prev) => ({
-				...prev,
-				[name]: value,
-			}));
-
-			const validation = monitorValidation.validate(
-				{ [name]: value },
-				{ abortEarly: false }
-			);
-
-			setErrors((prev) => {
-				const updatedErrors = { ...prev };
-
-				if (validation.error) updatedErrors[name] = validation.error.details[0].message;
-				else delete updatedErrors[name];
-				return updatedErrors;
-			});
+		if (name === "interval") {
+			value = value * MS_PER_MINUTE;
 		}
+		setMonitor((prev) => ({
+			...prev,
+			[name]: value,
+		}));
+
+		const validation = monitorValidation.validate(
+			{ [name]: value },
+			{ abortEarly: false }
+		);
+
+		setErrors((prev) => {
+			const updatedErrors = { ...prev };
+
+			if (validation.error) updatedErrors[name] = validation.error.details[0].message;
+			else delete updatedErrors[name];
+			return updatedErrors;
+		});
 	};
 
 	const handlePause = async () => {
@@ -142,12 +117,11 @@ const PageSpeedConfigure = () => {
 				throw new Error(action.error.message);
 			}
 		} catch (error) {
-			logger.error("Error pausing monitor: " + monitorId);
 			createToast({ body: "Failed to pause monitor" });
 		}
 	};
 
-	const handleSave = async (event) => {
+	const onSubmit = async (event) => {
 		event.preventDefault();
 		const action = await dispatch(updatePageSpeed({ monitor: monitor }));
 		if (action.meta.requestStatus === "fulfilled") {
@@ -158,7 +132,6 @@ const PageSpeedConfigure = () => {
 		}
 	};
 
-	const [isOpen, setIsOpen] = useState(false);
 	const handleRemove = async (event) => {
 		event.preventDefault();
 		setButtonLoading(true);
@@ -191,7 +164,7 @@ const PageSpeedConfigure = () => {
 						component="form"
 						noValidate
 						spellCheck="false"
-						onSubmit={handleSave}
+						onSubmit={onSubmit}
 						flex={1}
 						gap={theme.spacing(10)}
 					>
@@ -329,24 +302,24 @@ const PageSpeedConfigure = () => {
 								}}
 							>
 								<TextInput
+									name="url"
 									type="url"
-									id="monitor-url"
 									label={t("url")}
 									placeholder="random.website.com"
 									value={monitor?.url || ""}
-									onChange={handleChange}
+									onChange={onChange}
 									error={errors.url ? true : false}
 									helperText={errors.url}
 									disabled={true}
 								/>
 								<TextInput
+									name="name"
 									type="text"
-									id="monitor-name"
 									label={t("monitorDisplayName")}
 									placeholder="Example monitor"
 									isOptional={true}
 									value={monitor?.name || ""}
-									onChange={handleChange}
+									onChange={onChange}
 									error={errors.name ? true : false}
 									helperText={errors.name}
 								/>
@@ -354,64 +327,16 @@ const PageSpeedConfigure = () => {
 						</ConfigBox>
 						<ConfigBox>
 							<Box>
-								<Typography
-									component="h2"
-									variant="h2"
-								>
-									{t("distributedUptimeCreateIncidentNotification")}
-								</Typography>
+								<Typography component="h2">{t("notificationConfig.title")}</Typography>
 								<Typography component="p">
-									{t("distributedUptimeCreateIncidentDescription")}
+									{t("notificationConfig.description")}
 								</Typography>
 							</Box>
-							<Stack gap={theme.spacing(6)}>
-								<Typography component="p">{t("whenNewIncident")}</Typography>
-								{/* Future Feature: Notify via SMS */}
-								{/* <Checkbox
-									id="notify-sms"
-									label={t("notifySMS")}
-									isChecked={false}
-									value=""
-									onChange={() => logger.warn("disabled")}
-									isDisabled={true}
-								/> */}
-								<Checkbox
-									id="notify-email-default"
-									label={`Notify via email (to ${user.email})`}
-									isChecked={
-										monitor?.notifications?.some(
-											(notification) => notification.type === "email"
-										) || false
-									}
-									value={user?.email}
-									onChange={(event) => handleChange(event)}
-								/>
-								{/* Future Feature: Notify via Email */}
-								{/* <Checkbox
-									id="notify-email"
-									label={t("notifyEmails")}
-									isChecked={false}
-									value=""
-									onChange={() => logger.warn("disabled")}
-									isDisabled={true}
-								/> */}
-								{monitor?.notifications?.some(
-									(notification) => notification.type === "emails"
-								) ? (
-									<Box mx={theme.spacing(16)}>
-										<TextInput
-											id="notify-email-list"
-											type="text"
-											placeholder="name@gmail.com"
-											value=""
-											onChange={() => logger.warn("disabled")}
-										/>
-										<Typography mt={theme.spacing(4)}>{t("seperateEmails")}</Typography>
-									</Box>
-								) : (
-									""
-								)}
-							</Stack>
+							<NotificationsConfig
+								notifications={notifications}
+								setMonitor={setMonitor}
+								setNotifications={monitor.notifications}
+							/>
 						</ConfigBox>
 						<ConfigBox>
 							<Box>
@@ -424,11 +349,11 @@ const PageSpeedConfigure = () => {
 							</Box>
 							<Stack gap={theme.spacing(20)}>
 								<Select
-									id="monitor-frequency"
+									name="interval"
 									label={t("checkFrequency")}
 									items={frequencies}
 									value={monitor?.interval / MS_PER_MINUTE || 3}
-									onChange={(event) => handleChange(event, "interval")}
+									onChange={onChange}
 								/>
 							</Stack>
 						</ConfigBox>
@@ -442,7 +367,6 @@ const PageSpeedConfigure = () => {
 								type="submit"
 								variant="contained"
 								color="accent"
-								onClick={handleSave}
 								sx={{ px: theme.spacing(12) }}
 							>
 								{t("settingsSave")}
diff --git a/client/src/Pages/PageSpeed/Create/index.jsx b/client/src/Pages/PageSpeed/Create/index.jsx
index 1d40d4667..2b3e6e4e4 100644
--- a/client/src/Pages/PageSpeed/Create/index.jsx
+++ b/client/src/Pages/PageSpeed/Create/index.jsx
@@ -2,7 +2,6 @@
 import { useNavigate } from "react-router-dom";
 import { useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-
 // Utility and Network
 import { monitorValidation } from "../../../Validation/validation";
 import {
@@ -11,6 +10,7 @@ import {
 } from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import { parseDomainName } from "../../../Utils/monitorUtils";
 import { useTranslation } from "react-i18next";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 
 // MUI
 import { useTheme } from "@emotion/react";
@@ -23,8 +23,8 @@ import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import ConfigBox from "../../../Components/ConfigBox";
 import { createToast } from "../../../Utils/toastUtils";
 import Radio from "../../../Components/Inputs/Radio";
-import Checkbox from "../../../Components/Inputs/Checkbox";
 import Select from "../../../Components/Inputs/Select";
+import NotificationsConfig from "../../../Components/NotificationConfig";
 
 const MS_PER_MINUTE = 60000;
 
@@ -57,6 +57,7 @@ const CreatePageSpeed = () => {
 	const [errors, setErrors] = useState({});
 	const { user } = useSelector((state) => state.auth);
 	const { isLoading } = useSelector((state) => state.pageSpeedMonitors);
+	const [notifications, notificationsAreLoading, error] = useGetNotificationsByTeamId();
 
 	// Setup
 	const dispatch = useDispatch();
@@ -64,7 +65,7 @@ const CreatePageSpeed = () => {
 	const theme = useTheme();
 
 	// Handlers
-	const handleCreateMonitor = async (event) => {
+	const onSubmit = async (event) => {
 		event.preventDefault();
 		let form = {
 			url: `http${https ? "s" : ""}://` + monitor.url,
@@ -134,32 +135,6 @@ const CreatePageSpeed = () => {
 		}));
 	};
 
-	const handleNotifications = (event, type) => {
-		const { value } = event.target;
-		let notifications = [...monitor.notifications];
-		const notificationExists = notifications.some((notification) => {
-			if (notification.type === type && notification.address === value) {
-				return true;
-			}
-			return false;
-		});
-		if (notificationExists) {
-			notifications = notifications.filter((notification) => {
-				if (notification.type === type && notification.address === value) {
-					return false;
-				}
-				return true;
-			});
-		} else {
-			notifications.push({ type, address: value });
-		}
-
-		setMonitor((prev) => ({
-			...prev,
-			notifications,
-		}));
-	};
-
 	const handleBlur = (event) => {
 		const { name } = event.target;
 		if (name === "url") {
@@ -189,7 +164,7 @@ const CreatePageSpeed = () => {
 			<Stack
 				component="form"
 				className="create-monitor-form"
-				onSubmit={handleCreateMonitor}
+				onSubmit={onSubmit}
 				noValidate
 				spellCheck="false"
 				gap={theme.spacing(12)}
@@ -312,24 +287,14 @@ const CreatePageSpeed = () => {
 							component="h2"
 							variant="h2"
 						>
-							{t("distributedUptimeCreateIncidentNotification")}
-						</Typography>
-						<Typography component="p">
-							{t("distributedUptimeCreateIncidentDescription")}
+							{t("notificationConfig.title")}
 						</Typography>
+						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
-					<Stack gap={theme.spacing(6)}>
-						<Typography component="p">{t("whenNewIncident")}</Typography>
-						<Checkbox
-							id="notify-email-default"
-							label={`Notify via email (to ${user.email})`}
-							isChecked={monitor.notifications.some(
-								(notification) => notification.type === "email"
-							)}
-							value={user?.email}
-							onChange={(event) => handleNotifications(event, "email")}
-						/>
-					</Stack>
+					<NotificationsConfig
+						notifications={notifications}
+						setMonitor={setMonitor}
+					/>
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
@@ -356,9 +321,9 @@ const CreatePageSpeed = () => {
 					justifyContent="flex-end"
 				>
 					<Button
+						type="submit"
 						variant="contained"
 						color="accent"
-						onClick={handleCreateMonitor}
 						disabled={!Object.values(errors).every((value) => value === undefined)}
 						loading={isLoading}
 					>
diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 9667728cb..8718a2209 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -383,10 +383,8 @@ const Configure = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">Notifications</Typography>
-						<Typography component="p">
-							Select the notifications you want to send out
-						</Typography>
+						<Typography component="h2">{t("notificationConfig.title")}</Typography>
+						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
 					<NotificationsConfig
 						notifications={notifications}
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index b9e1e8423..c233b2a36 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -349,10 +349,8 @@ const CreateMonitor = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">Notifications</Typography>
-						<Typography component="p">
-							Select the notifications you want to send out
-						</Typography>
+						<Typography component="h2">{t("notificationConfig.title")}</Typography>
+						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
 					<NotificationsConfig
 						notifications={notifications}
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 16e1f5ebd..568b654b1 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -166,6 +166,10 @@
 			"integrationKeyPlaceholder": "1234567890"
 		}
 	},
+	"notificationConfig": {
+		"title": "Notifications",
+		"description": "Select the notifications channels you want to use"
+	},
 	"notifications": {
 		"fallback": {
 			"title": "Notification",
diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 5fa2834fa..3079abfba 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -42,7 +42,7 @@ const MonitorSchema = mongoose.Schema(
 		},
 		matchMethod: {
 			type: String,
-			enum: ["equal", "include", "regex"],
+			enum: ["equal", "include", "regex", ""],
 		},
 		url: {
 			type: String,

From 1b40aa0dedf6ba7f762980b0cf70d7b1157faf13 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 9 Jun 2025 14:59:26 +0800
Subject: [PATCH 065/319] add notifications to infra page, add generic webhook
 notification channel

---
 .../src/Pages/Infrastructure/Create/index.jsx | 83 +++++--------------
 .../src/Pages/Notifications/create/index.jsx  | 44 +++++++++-
 client/src/Validation/validation.js           | 10 +--
 client/src/locales/en.json                    |  8 +-
 server/db/models/Notification.js              |  2 +-
 server/service/bufferService.js               |  4 +-
 6 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index ab5df3086..1b27ff501 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -13,6 +13,8 @@ import {
 import { useHardwareMonitorsFetch } from "../Details/Hooks/useHardwareMonitorsFetch";
 import { capitalizeFirstLetter } from "../../../Utils/stringUtils";
 import { useTranslation } from "react-i18next";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import NotificationsConfig from "../../../Components/NotificationConfig";
 
 // MUI
 import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
@@ -24,7 +26,6 @@ import ConfigBox from "../../../Components/ConfigBox";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import { createToast } from "../../../Utils/toastUtils";
-import Checkbox from "../../../Components/Inputs/Checkbox";
 import Select from "../../../Components/Inputs/Select";
 import { CustomThreshold } from "./Components/CustomThreshold";
 
@@ -65,6 +66,8 @@ const CreateInfrastructureMonitor = () => {
 
 	// Fetch monitor details if editing
 	const { monitor, isLoading, networkError } = useHardwareMonitorsFetch({ monitorId });
+	const [notifications, notificationsAreLoading, notificationsError] =
+		useGetNotificationsByTeamId();
 
 	// State
 	const [errors, setErrors] = useState({});
@@ -93,8 +96,7 @@ const CreateInfrastructureMonitor = () => {
 		setInfrastructureMonitor({
 			url: monitor.url.replace(/^https?:\/\//, ""),
 			name: monitor.name || "",
-			notifications: monitor.notifications?.filter((n) => typeof n === "object") || [],
-			notify_email: (monitor.notifications?.length ?? 0) > 0,
+			notifications: monitor.notifications,
 			interval: monitor.interval / MS_PER_MINUTE,
 			cpu: monitor.thresholds?.usage_cpu !== undefined,
 			usage_cpu: monitor.thresholds?.usage_cpu ? monitor.thresholds.usage_cpu * 100 : "",
@@ -119,17 +121,9 @@ const CreateInfrastructureMonitor = () => {
 	}, [isCreate, monitor]);
 
 	// Handlers
-	const handleCreateInfrastructureMonitor = async (event) => {
+	const onSubmit = async (event) => {
 		event.preventDefault();
 
-		const formattedNotifications = infrastructureMonitor.notifications.map((n) =>
-			typeof n === "string" ? { type: "email", address: n } : n
-		);
-
-		if (infrastructureMonitor.notify_email) {
-			formattedNotifications.push({ type: "email", address: user.email });
-		}
-
 		// Build the form
 		let form = {
 			url: `http${https ? "s" : ""}://` + infrastructureMonitor.url,
@@ -155,7 +149,6 @@ const CreateInfrastructureMonitor = () => {
 				? { usage_temperature: infrastructureMonitor.usage_temperature }
 				: {}),
 			secret: infrastructureMonitor.secret,
-			notifications: formattedNotifications,
 		};
 
 		const { error } = infrastructureMonitorValidation.validate(form, {
@@ -167,6 +160,7 @@ const CreateInfrastructureMonitor = () => {
 			error.details.forEach((err) => {
 				newErrors[err.path[0]] = err.message;
 			});
+			console.log(newErrors);
 			setErrors(newErrors);
 			createToast({ body: "Please check the form for errors." });
 			return;
@@ -218,7 +212,7 @@ const CreateInfrastructureMonitor = () => {
 		}
 	};
 
-	const handleChange = (event) => {
+	const onChange = (event) => {
 		const { value, name } = event.target;
 		setInfrastructureMonitor({
 			...infrastructureMonitor,
@@ -244,27 +238,6 @@ const CreateInfrastructureMonitor = () => {
 		});
 	};
 
-	const handleNotifications = (event, type) => {
-		const { value, checked } = event.target;
-		let notifications = [...infrastructureMonitor.notifications];
-
-		if (checked) {
-			if (!notifications.some((n) => n.type === type && n.address === value)) {
-				notifications.push({ type, address: value });
-			}
-		} else {
-			notifications = notifications.filter(
-				(n) => !(n.type === type && n.address === value)
-			);
-		}
-
-		setInfrastructureMonitor((prev) => ({
-			...prev,
-			notifications,
-			...(type === "email" ? { notify_email: checked } : {}),
-		}));
-	};
-
 	return (
 		<Box className="create-infrastructure-monitor">
 			<Breadcrumbs
@@ -280,8 +253,7 @@ const CreateInfrastructureMonitor = () => {
 			/>
 			<Stack
 				component="form"
-				className="create-infrastructure-monitor-form"
-				onSubmit={handleCreateInfrastructureMonitor}
+				onSubmit={onSubmit}
 				noValidate
 				spellCheck="false"
 				gap={theme.spacing(12)}
@@ -336,7 +308,7 @@ const CreateInfrastructureMonitor = () => {
 							label={t("infrastructureServerUrlLabel")}
 							https={https}
 							value={infrastructureMonitor.url}
-							onChange={handleChange}
+							onChange={onChange}
 							error={errors["url"] ? true : false}
 							helperText={errors["url"]}
 							disabled={!isCreate}
@@ -370,7 +342,7 @@ const CreateInfrastructureMonitor = () => {
 							placeholder="Google"
 							isOptional={true}
 							value={infrastructureMonitor.name}
-							onChange={handleChange}
+							onChange={onChange}
 							error={errors["name"]}
 						/>
 						<TextInput
@@ -379,7 +351,7 @@ const CreateInfrastructureMonitor = () => {
 							name="secret"
 							label={t("infrastructureAuthorizationSecretLabel")}
 							value={infrastructureMonitor.secret}
-							onChange={handleChange}
+							onChange={onChange}
 							error={errors["secret"] ? true : false}
 							helperText={errors["secret"]}
 						/>
@@ -387,25 +359,14 @@ const CreateInfrastructureMonitor = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography
-							component="h2"
-							variant="h2"
-						>
-							{t("distributedUptimeCreateIncidentNotification")}
-						</Typography>
-						<Typography component="p">
-							{t("distributedUptimeCreateIncidentDescription")}
-						</Typography>
+						<Typography component="h2">{t("notificationConfig.title")}</Typography>
+						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
-					<Stack gap={theme.spacing(6)}>
-						<Checkbox
-							id="notify-email-default"
-							label={`Notify via email (to ${user.email})`}
-							isChecked={infrastructureMonitor.notify_email}
-							value={user?.email}
-							onChange={(event) => handleNotifications(event, "email")}
-						/>
-					</Stack>
+					<NotificationsConfig
+						notifications={notifications}
+						setMonitor={setInfrastructureMonitor}
+						setNotifications={infrastructureMonitor.notifications}
+					/>
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
@@ -438,7 +399,7 @@ const CreateInfrastructureMonitor = () => {
 									fieldId={METRIC_PREFIX + metric}
 									fieldName={METRIC_PREFIX + metric}
 									fieldValue={String(infrastructureMonitor[METRIC_PREFIX + metric])}
-									onFieldChange={handleChange}
+									onFieldChange={onChange}
 									alertUnit={metric == "temperature" ? "°C" : "%"}
 								/>
 							);
@@ -474,7 +435,7 @@ const CreateInfrastructureMonitor = () => {
 							name="interval"
 							label="Check frequency"
 							value={infrastructureMonitor.interval || 15}
-							onChange={handleChange}
+							onChange={onChange}
 							items={SELECT_VALUES}
 						/>
 					</Stack>
@@ -484,9 +445,9 @@ const CreateInfrastructureMonitor = () => {
 					justifyContent="flex-end"
 				>
 					<Button
+						type="submit"
 						variant="contained"
 						color="accent"
-						onClick={handleCreateInfrastructureMonitor}
 						loading={monitorState?.isLoading}
 					>
 						{t(isCreate ? "infrastructureCreateMonitor" : "infrastructureEditMonitor")}
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index c188aca22..b1469bff0 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -27,6 +27,7 @@ const NOTIFICATION_TYPES = [
 	{ _id: 1, name: "E-mail", value: "email" },
 	{ _id: 2, name: "Slack", value: "webhook" },
 	{ _id: 3, name: "PagerDuty", value: "pager_duty" },
+	{ _id: 4, name: "Webhook", value: "webhook" },
 ];
 
 const CreateNotifications = () => {
@@ -130,6 +131,12 @@ const CreateNotifications = () => {
 				newNotification.config = value;
 			}
 			newNotification.config.platform = "pager_duty";
+		} else if (newNotification.type === 4) {
+			newNotification.config = newNotification.config || {};
+			if (name === "config") {
+				newNotification.config = value;
+			}
+			newNotification.config.platform = "webhook";
 		}
 
 		// Field-level validation
@@ -247,7 +254,7 @@ const CreateNotifications = () => {
 						<Stack gap={theme.spacing(12)}>
 							<TextInput
 								label={t("createNotifications.slackSettings.webhookLabel")}
-								value={notification.config.webhookUrl}
+								value={notification.config.webhookUrl || ""}
 								error={Boolean(errors.config)}
 								helperText={errors["config"]}
 								onChange={(e) => {
@@ -283,7 +290,7 @@ const CreateNotifications = () => {
 								placeholder={t(
 									"createNotifications.pagerdutySettings.integrationKeyPlaceholder"
 								)}
-								value={notification.config.routingKey}
+								value={notification.config.routingKey || ""}
 								error={Boolean(errors.config)}
 								helperText={errors["config"]}
 								onChange={(e) => {
@@ -303,6 +310,39 @@ const CreateNotifications = () => {
 						</Stack>
 					</ConfigBox>
 				)}
+				{notification.type === 4 && (
+					<ConfigBox>
+						<Box>
+							<Typography component="h2">
+								{t("createNotifications.genericWebhookSettings.title")}
+							</Typography>
+							<Typography component="p">
+								{t("createNotifications.genericWebhookSettings.description")}
+							</Typography>
+						</Box>
+						<Stack gap={theme.spacing(12)}>
+							<TextInput
+								label={t("createNotifications.genericWebhookSettings.webhookLabel")}
+								value={notification.config.webhookUrl || ""}
+								error={Boolean(errors.config)}
+								helperText={errors["config"]}
+								onChange={(e) => {
+									const updatedConfig = {
+										...notification.config,
+										webhookUrl: e.target.value,
+									};
+
+									onChange({
+										target: {
+											name: "config",
+											value: updatedConfig,
+										},
+									});
+								}}
+							/>
+						</Stack>
+					</ConfigBox>
+				)}
 				<Stack
 					direction="row"
 					justifyContent="flex-end"
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 9232b481b..bd7a337a9 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -388,15 +388,7 @@ const infrastructureMonitorValidation = joi.object({
 		"number.base": "Frequency must be a number.",
 		"any.required": "Frequency is required.",
 	}),
-	notifications: joi.array().items(
-		joi.object({
-			type: joi.string().valid("email").required(),
-			address: joi
-				.string()
-				.email({ tlds: { allow: false } })
-				.required(),
-		})
-	),
+	notifications: joi.array().items(joi.string()),
 });
 
 const notificationEmailValidation = joi.object({
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 568b654b1..6ff309c5d 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -164,6 +164,12 @@
 			"description": "Configure your PagerDuty integration here",
 			"integrationKeyLabel": "Integration key",
 			"integrationKeyPlaceholder": "1234567890"
+		},
+		"genericWebhookSettings": {
+			"title": "Webhook",
+			"description": "Configure your webhook here",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
 		}
 	},
 	"notificationConfig": {
@@ -172,7 +178,7 @@
 	},
 	"notifications": {
 		"fallback": {
-			"title": "Notification",
+			"title": "notification channel",
 			"checks": "Alert teams about downtime or performance issues"
 		},
 		"createButton": "Create notification channel",
diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index 27f2f932a..34afa1f31 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -7,7 +7,7 @@ const configSchema = mongoose.Schema(
 		chatId: { type: String },
 		platform: {
 			type: String,
-			enum: ["slack", "pager_duty"],
+			enum: ["slack", "pager_duty", "webhook"],
 		},
 		routingKey: { type: String },
 	},
diff --git a/server/service/bufferService.js b/server/service/bufferService.js
index 888b3ed08..84f3efd30 100755
--- a/server/service/bufferService.js
+++ b/server/service/bufferService.js
@@ -1,5 +1,5 @@
 const SERVICE_NAME = "BufferService";
-const BUFFER_TIMEOUT = 1000 * 60 * 1; // 1 minute
+const BUFFER_TIMEOUT = process.env.NODE_ENV === "development" ? 5000 : 1000 * 60 * 1; // 1 minute
 const TYPE_MAP = {
 	http: "checks",
 	ping: "checks",
@@ -89,7 +89,7 @@ class BufferService {
 			}
 			this.buffers[bufferName] = [];
 		}
-		this.logger.info({
+		this.logger.debug({
 			message: `Flushed ${items} items`,
 			service: this.SERVICE_NAME,
 			method: "flushBuffers",

From a73d3ec83eb6c590c99e4a4002e2daa3b16f3659 Mon Sep 17 00:00:00 2001
From: SaikatDeb12 <saikat.rcld@gmail.com>
Date: Mon, 9 Jun 2025 16:03:44 +0530
Subject: [PATCH 066/319] fix: changed login error display message

---
 server/middleware/handleErrors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/middleware/handleErrors.js b/server/middleware/handleErrors.js
index b64cda897..87895fcf2 100755
--- a/server/middleware/handleErrors.js
+++ b/server/middleware/handleErrors.js
@@ -5,7 +5,7 @@ import StringService from "../service/stringService.js";
 const handleErrors = (error, req, res, next) => {
 	const status = error.status || 500;
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
-	const message = error.message || stringService.friendlyError;
+	const message = error.message || stringService.authIncorrectPassword;
 	const service = error.service || stringService.unknownService;
 	logger.error({
 		message: message,

From 4608390cfdc52772fbe79db94f1e55e33d64cbfb Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Mon, 9 Jun 2025 21:25:34 +0530
Subject: [PATCH 067/319] Added local support for the page.

---
 .../Components/MonitorStatusHeader/index.jsx    | 17 +++++++++++++----
 client/src/locales/en.json                      |  4 ++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index 1f0189cae..c259c1e59 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -7,14 +7,22 @@ import { formatDurationRounded } from "../../Utils/timeUtils";
 import ConfigButton from "./ConfigButton";
 import SkeletonLayout from "./skeleton";
 import PropTypes from "prop-types";
+import { useTranslation } from "react-i18next";
 
 const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 	const theme = useTheme();
+	const { t } = useTranslation();
 	const { statusColor, determineState } = useUtils();
 	if (isLoading) {
 		return <SkeletonLayout />;
 	}
 
+	const intervalText = t("monitorStatus.checkingEvery", {
+		interval: formatDurationRounded(monitor?.interval),
+	});
+
+	const captureVersion = monitor?.stats?.aggregateData?.latestCheck?.capture?.version;
+
 	return (
 		<Stack
 			direction="row"
@@ -36,12 +44,13 @@ const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 					</Typography>
 					<Dot />
 					<Typography>
-						Checking every {formatDurationRounded(monitor?.interval)}{" "}
-						{monitor?.stats?.aggregateData?.latestCheck?.capture?.version && (
+						{intervalText}
+						{captureVersion && (
 							<>
 								{" "}
-								with Capture agent{" "}
-								{monitor.stats.aggregateData.latestCheck.capture.version}
+								{t("monitorStatus.withCaptureAgent", {
+									version: captureVersion,
+								})}
 							</>
 						)}
 						.
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index c67b85f04..e5795a2f5 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -558,5 +558,9 @@
 		"ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+	},
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"withCaptureAgent": "with Capture agent {{version}}"
 	}
 }

From 21a26a5ebba2d4a2cebdc23bfbc3faca310cbdf6 Mon Sep 17 00:00:00 2001
From: Kelvin Yim <133249124+kelvinyim0705@users.noreply.github.com>
Date: Mon, 9 Jun 2025 17:36:26 +0100
Subject: [PATCH 068/319]  fix: standardize pagination alignment in ChartBox
 components

Remove alignItems="center" from ChartBox to prevent unintended centering of pagination controls in uptime details, ensuring consistent pagination layout across all tables per

issue #2405
---
 client/src/Components/Charts/ChartBox/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Components/Charts/ChartBox/index.jsx b/client/src/Components/Charts/ChartBox/index.jsx
index 6b74ace68..cde6e02a0 100644
--- a/client/src/Components/Charts/ChartBox/index.jsx
+++ b/client/src/Components/Charts/ChartBox/index.jsx
@@ -43,7 +43,7 @@ const ChartBox = ({
 		>
 			<Stack
 				flex={1}
-				alignItems="center"
+
 				sx={{
 					padding: theme.spacing(8),
 					justifyContent,

From fe5f24ef4446981e907a655c1262d56f95fcda66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 15:11:13 +0200
Subject: [PATCH 069/319] l10n(cs): Clean up localization file

---
 client/src/locales/cs.json | 88 +++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index ac728160e..765627912 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -1,49 +1,49 @@
 {
 	"dontHaveAccount": "",
-	"email": "E-mail",
-	"forgotPassword": "Zapomenuté heslo",
+	"email": "",
+	"forgotPassword": "",
 	"password": "",
-	"signUp": "Registace",
-	"submit": "Odeslat",
+	"signUp": "",
+	"submit": "",
 	"title": "",
-	"continue": "Pokračovat",
-	"enterEmail": "Zadejte svůj e-mail",
-	"authLoginTitle": "Přihlášení",
-	"authLoginEnterPassword": "Zadejte své heslo",
-	"commonPassword": "Heslo",
-	"commonBack": "Zpět",
-	"authForgotPasswordTitle": "Zapomněli jste heslo?",
-	"authForgotPasswordResetPassword": "Resetovat heslo",
+	"continue": "",
+	"enterEmail": "",
+	"authLoginTitle": "",
+	"authLoginEnterPassword": "",
+	"commonPassword": "",
+	"commonBack": "",
+	"authForgotPasswordTitle": "",
+	"authForgotPasswordResetPassword": "",
 	"createPassword": "",
 	"createAPassword": "",
-	"authRegisterAlreadyHaveAccount": "Máte již účet?",
-	"commonAppName": "Checkmate",
-	"authLoginEnterEmail": "Zadejte svůj e-mail",
-	"authRegisterTitle": "Vytvoření účtu",
+	"authRegisterAlreadyHaveAccount": "",
+	"commonAppName": "",
+	"authLoginEnterEmail": "",
+	"authRegisterTitle": "",
 	"authRegisterStepOneTitle": "",
-	"authRegisterStepOneDescription": "Začněte tím, že zadáte své údaje",
+	"authRegisterStepOneDescription": "",
 	"authRegisterStepTwoTitle": "",
-	"authRegisterStepTwoDescription": "Řekněte nám o sobě víc",
-	"authRegisterStepThreeTitle": "Téměř hotovo!",
-	"authRegisterStepThreeDescription": "Zkontrolujte své údaje",
-	"authForgotPasswordDescription": "Není se čeho obávat, zašleme vám instrukce k obnově.",
+	"authRegisterStepTwoDescription": "",
+	"authRegisterStepThreeTitle": "",
+	"authRegisterStepThreeDescription": "",
+	"authForgotPasswordDescription": "",
 	"authForgotPasswordSendInstructions": "",
 	"authForgotPasswordBackTo": "",
 	"authCheckEmailTitle": "",
-	"authCheckEmailDescription": "Odkaz pro obnovu hesla zašleme na",
-	"authCheckEmailResendEmail": "Znovu odeslat e-mail",
+	"authCheckEmailDescription": "",
+	"authCheckEmailResendEmail": "",
 	"authCheckEmailBackTo": "",
 	"goBackTo": "",
-	"authCheckEmailDidntReceiveEmail": "Neobdrželi jste e-mail?",
-	"authCheckEmailClickToResend": "Klepněte pro opětovné odeslání",
-	"authSetNewPasswordTitle": "Nastavení nového hesla",
-	"authSetNewPasswordDescription": "Nové heslo se musí lišit od těch, které jste použili dříve.",
-	"authSetNewPasswordNewPassword": "Nové heslo",
+	"authCheckEmailDidntReceiveEmail": "",
+	"authCheckEmailClickToResend": "",
+	"authSetNewPasswordTitle": "",
+	"authSetNewPasswordDescription": "",
+	"authSetNewPasswordNewPassword": "",
 	"authSetNewPasswordConfirmPassword": "",
 	"confirmPassword": "",
-	"authSetNewPasswordResetPassword": "Resetovat heslo",
+	"authSetNewPasswordResetPassword": "",
 	"authSetNewPasswordBackTo": "",
-	"authPasswordMustBeAtLeast": "Musí být alespoň",
+	"authPasswordMustBeAtLeast": "",
 	"authPasswordCharactersLong": "",
 	"authPasswordMustContainAtLeast": "",
 	"authPasswordSpecialCharacter": "",
@@ -53,23 +53,23 @@
 	"authPasswordConfirmAndPassword": "",
 	"authPasswordMustMatch": "",
 	"authRegisterCreateAccount": "",
-	"authRegisterCreateSuperAdminAccount": "Začněte tím, že si vytvoříte účet superadministrátora",
-	"authRegisterSignUpWithEmail": "Registrovat přes e-mail",
-	"authRegisterBySigningUp": "Registrací souhlasíte s našimi",
+	"authRegisterCreateSuperAdminAccount": "",
+	"authRegisterSignUpWithEmail": "",
+	"authRegisterBySigningUp": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "Obecná nastavení",
+	"settingsGeneralSettings": "",
 	"settingsDisplayTimezone": "",
 	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "Vzhled",
+	"settingsAppearance": "",
 	"settingsAppearanceDescription": "",
 	"settingsThemeMode": "",
-	"settingsLanguage": "Jazyk",
+	"settingsLanguage": "",
 	"settingsDistributedUptime": "",
 	"settingsDistributedUptimeDescription": "",
-	"settingsEnabled": "Zapnuto",
-	"settingsDisabled": "Vypnuto",
-	"settingsHistoryAndMonitoring": "Historie a monitorování",
+	"settingsEnabled": "",
+	"settingsDisabled": "",
+	"settingsHistoryAndMonitoring": "",
 	"settingsHistoryAndMonitoringDescription": "",
 	"settingsTTLLabel": "",
 	"settingsTTLOptionalLabel": "",
@@ -89,10 +89,10 @@
 	"settingsWallet": "",
 	"settingsWalletDescription": "",
 	"settingsAbout": "",
-	"settingsDevelopedBy": "Vyvinuto společností Bluewave Labs.",
-	"settingsSave": "Uložit",
-	"settingsSuccessSaved": "Nastavení bylo úspěšně uloženo",
-	"settingsFailedToSave": "Nepodařilo se uložit nastavení",
+	"settingsDevelopedBy": "",
+	"settingsSave": "",
+	"settingsSuccessSaved": "",
+	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
 	"settingsDemoMonitorsAdded": "",
@@ -118,7 +118,7 @@
 	"response": "",
 	"checkConnection": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "Zadejte své osobní údaje",
+	"authRegisterStepOnePersonalDetails": "",
 	"authCheckEmailOpenEmailButton": "",
 	"authNewPasswordConfirmed": "",
 	"monitorStatusUp": "",

From 7e873161bc6909277afa63272c5a95bb279fc4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 15:15:08 +0200
Subject: [PATCH 070/319] l10n(ar): Remove empty localization

---
 client/src/locales/ar.json | 562 -------------------------------------
 1 file changed, 562 deletions(-)
 delete mode 100644 client/src/locales/ar.json

diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
deleted file mode 100644
index 765627912..000000000
--- a/client/src/locales/ar.json
+++ /dev/null
@@ -1,562 +0,0 @@
-{
-	"dontHaveAccount": "",
-	"email": "",
-	"forgotPassword": "",
-	"password": "",
-	"signUp": "",
-	"submit": "",
-	"title": "",
-	"continue": "",
-	"enterEmail": "",
-	"authLoginTitle": "",
-	"authLoginEnterPassword": "",
-	"commonPassword": "",
-	"commonBack": "",
-	"authForgotPasswordTitle": "",
-	"authForgotPasswordResetPassword": "",
-	"createPassword": "",
-	"createAPassword": "",
-	"authRegisterAlreadyHaveAccount": "",
-	"commonAppName": "",
-	"authLoginEnterEmail": "",
-	"authRegisterTitle": "",
-	"authRegisterStepOneTitle": "",
-	"authRegisterStepOneDescription": "",
-	"authRegisterStepTwoTitle": "",
-	"authRegisterStepTwoDescription": "",
-	"authRegisterStepThreeTitle": "",
-	"authRegisterStepThreeDescription": "",
-	"authForgotPasswordDescription": "",
-	"authForgotPasswordSendInstructions": "",
-	"authForgotPasswordBackTo": "",
-	"authCheckEmailTitle": "",
-	"authCheckEmailDescription": "",
-	"authCheckEmailResendEmail": "",
-	"authCheckEmailBackTo": "",
-	"goBackTo": "",
-	"authCheckEmailDidntReceiveEmail": "",
-	"authCheckEmailClickToResend": "",
-	"authSetNewPasswordTitle": "",
-	"authSetNewPasswordDescription": "",
-	"authSetNewPasswordNewPassword": "",
-	"authSetNewPasswordConfirmPassword": "",
-	"confirmPassword": "",
-	"authSetNewPasswordResetPassword": "",
-	"authSetNewPasswordBackTo": "",
-	"authPasswordMustBeAtLeast": "",
-	"authPasswordCharactersLong": "",
-	"authPasswordMustContainAtLeast": "",
-	"authPasswordSpecialCharacter": "",
-	"authPasswordOneNumber": "",
-	"authPasswordUpperCharacter": "",
-	"authPasswordLowerCharacter": "",
-	"authPasswordConfirmAndPassword": "",
-	"authPasswordMustMatch": "",
-	"authRegisterCreateAccount": "",
-	"authRegisterCreateSuperAdminAccount": "",
-	"authRegisterSignUpWithEmail": "",
-	"authRegisterBySigningUp": "",
-	"distributedStatusHeaderText": "",
-	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "",
-	"settingsDisplayTimezone": "",
-	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
-	"settingsEnabled": "",
-	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
-	"settingsSuccessSaved": "",
-	"settingsFailedToSave": "",
-	"settingsStatsCleared": "",
-	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
-	"settingsFailedToAddDemoMonitors": "",
-	"settingsMonitorsDeleted": "",
-	"settingsFailedToDeleteMonitors": "",
-	"starPromptTitle": "",
-	"starPromptDescription": "",
-	"https": "",
-	"http": "",
-	"monitor": "",
-	"aboutus": "",
-	"now": "",
-	"delete": "",
-	"configure": "",
-	"networkError": "",
-	"responseTime": "",
-	"ms": "",
-	"bar": "",
-	"area": "",
-	"country": "",
-	"city": "",
-	"response": "",
-	"checkConnection": "",
-	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
-	"monitorStatusUp": "",
-	"monitorStatusDown": "",
-	"webhookSendSuccess": "",
-	"webhookSendError": "",
-	"webhookUnsupportedPlatform": "",
-	"distributedRightCategoryTitle": "",
-	"distributedStatusServerMonitors": "",
-	"distributedStatusServerMonitorsDescription": "",
-	"distributedUptimeCreateSelectURL": "",
-	"distributedUptimeCreateChecks": "",
-	"distributedUptimeCreateChecksDescription": "",
-	"distributedUptimeCreateIncidentNotification": "",
-	"distributedUptimeCreateIncidentDescription": "",
-	"distributedUptimeCreateAdvancedSettings": "",
-	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
-	"distributedUptimeDetailsStatusHeaderUptime": "",
-	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
-	"notifications": {
-		"enableNotifications": "",
-		"testNotification": "",
-		"addOrEditNotifications": "",
-		"slack": {
-			"label": "",
-			"description": "",
-			"webhookLabel": "",
-			"webhookPlaceholder": "",
-			"webhookRequired": ""
-		},
-		"discord": {
-			"label": "",
-			"description": "",
-			"webhookLabel": "",
-			"webhookPlaceholder": "",
-			"webhookRequired": ""
-		},
-		"telegram": {
-			"label": "",
-			"description": "",
-			"tokenLabel": "",
-			"tokenPlaceholder": "",
-			"chatIdLabel": "",
-			"chatIdPlaceholder": "",
-			"fieldsRequired": ""
-		},
-		"webhook": {
-			"label": "",
-			"description": "",
-			"urlLabel": "",
-			"urlPlaceholder": "",
-			"urlRequired": ""
-		},
-		"testNotificationDevelop": "",
-		"integrationButton": "",
-		"testSuccess": "",
-		"testFailed": "",
-		"unsupportedType": "",
-		"networkError": ""
-	},
-	"testLocale": "",
-	"add": "",
-	"monitors": "",
-	"distributedUptimeStatusCreateStatusPage": "",
-	"distributedUptimeStatusCreateStatusPageAccess": "",
-	"distributedUptimeStatusCreateStatusPageReady": "",
-	"distributedUptimeStatusBasicInfoHeader": "",
-	"distributedUptimeStatusBasicInfoDescription": "",
-	"distributedUptimeStatusLogoHeader": "",
-	"distributedUptimeStatusLogoDescription": "",
-	"distributedUptimeStatusLogoUploadButton": "",
-	"distributedUptimeStatusStandardMonitorsHeader": "",
-	"distributedUptimeStatusStandardMonitorsDescription": "",
-	"distributedUptimeStatusCreateYour": "",
-	"distributedUptimeStatusEditYour": "",
-	"distributedUptimeStatusPublishedLabel": "",
-	"distributedUptimeStatusCompanyNameLabel": "",
-	"distributedUptimeStatusPageAddressLabel": "",
-	"distributedUptimeStatus30Days": "",
-	"distributedUptimeStatus60Days": "",
-	"distributedUptimeStatus90Days": "",
-	"distributedUptimeStatusPageNotSetUp": "",
-	"distributedUptimeStatusContactAdmin": "",
-	"distributedUptimeStatusPageNotPublic": "",
-	"distributedUptimeStatusPageDeleteDialog": "",
-	"distributedUptimeStatusPageDeleteConfirm": "",
-	"distributedUptimeStatusPageDeleteDescription": "",
-	"distributedUptimeStatusDevices": "",
-	"distributedUptimeStatusUpt": "",
-	"distributedUptimeStatusUptBurned": "",
-	"distributedUptimeStatusUptLogo": "",
-	"incidentsTableNoIncidents": "",
-	"incidentsTablePaginationLabel": "",
-	"incidentsTableMonitorName": "",
-	"incidentsTableStatus": "",
-	"incidentsTableDateTime": "",
-	"incidentsTableStatusCode": "",
-	"incidentsTableMessage": "",
-	"incidentsOptionsHeader": "",
-	"incidentsOptionsHeaderFilterBy": "",
-	"incidentsOptionsHeaderFilterAll": "",
-	"incidentsOptionsHeaderFilterDown": "",
-	"incidentsOptionsHeaderFilterCannotResolve": "",
-	"incidentsOptionsHeaderShow": "",
-	"incidentsOptionsHeaderLastHour": "",
-	"incidentsOptionsHeaderLastDay": "",
-	"incidentsOptionsHeaderLastWeek": "",
-	"incidentsOptionsPlaceholderAllServers": "",
-	"infrastructureCreateYour": "",
-	"infrastructureCreateGeneralSettingsDescription": "",
-	"infrastructureServerRequirement": "",
-	"infrastructureCustomizeAlerts": "",
-	"infrastructureAlertNotificationDescription": "",
-	"infrastructureCreateMonitor": "",
-	"infrastructureProtocol": "",
-	"infrastructureServerUrlLabel": "",
-	"infrastructureDisplayNameLabel": "",
-	"infrastructureAuthorizationSecretLabel": "",
-	"gb": "",
-	"mb": "",
-	"mem": "",
-	"memoryUsage": "",
-	"cpu": "",
-	"cpuUsage": "",
-	"cpuTemperature": "",
-	"diskUsage": "",
-	"used": "",
-	"total": "",
-	"cores": "",
-	"frequency": "",
-	"status": "",
-	"cpuPhysical": "",
-	"cpuLogical": "",
-	"cpuFrequency": "",
-	"avgCpuTemperature": "",
-	"memory": "",
-	"disk": "",
-	"uptime": "",
-	"os": "",
-	"host": "",
-	"actions": "",
-	"integrations": "",
-	"integrationsPrism": "",
-	"integrationsSlack": "",
-	"integrationsSlackInfo": "",
-	"integrationsDiscord": "",
-	"integrationsDiscordInfo": "",
-	"integrationsZapier": "",
-	"integrationsZapierInfo": "",
-	"commonSave": "",
-	"createYour": "",
-	"createMonitor": "",
-	"pause": "",
-	"resume": "",
-	"editing": "",
-	"url": "",
-	"access": "",
-	"timezone": "",
-	"features": "",
-	"administrator": "",
-	"loginHere": "",
-	"displayName": "",
-	"urlMonitor": "",
-	"portToMonitor": "",
-	"websiteMonitoring": "",
-	"websiteMonitoringDescription": "",
-	"pingMonitoring": "",
-	"pingMonitoringDescription": "",
-	"dockerContainerMonitoring": "",
-	"dockerContainerMonitoringDescription": "",
-	"portMonitoring": "",
-	"portMonitoringDescription": "",
-	"createMaintenanceWindow": "",
-	"createMaintenance": "",
-	"editMaintenance": "",
-	"maintenanceWindowName": "",
-	"friendlyNameInput": "",
-	"friendlyNamePlaceholder": "",
-	"maintenanceRepeat": "",
-	"maintenance": "",
-	"duration": "",
-	"addMonitors": "",
-	"window": "",
-	"cancel": "",
-	"message": "",
-	"low": "",
-	"high": "",
-	"statusCode": "",
-	"date&Time": "",
-	"type": "",
-	"statusPageName": "",
-	"publicURL": "",
-	"repeat": "",
-	"edit": "",
-	"createA": "",
-	"remove": "",
-	"maintenanceWindowDescription": "",
-	"startTime": "",
-	"timeZoneInfo": "",
-	"monitorsToApply": "",
-	"nextWindow": "",
-	"notFoundButton": "",
-	"pageSpeedConfigureSettingsDescription": "",
-	"monitorDisplayName": "",
-	"whenNewIncident": "",
-	"notifySMS": "",
-	"notifyEmails": "",
-	"seperateEmails": "",
-	"checkFrequency": "",
-	"matchMethod": "",
-	"expectedValue": "",
-	"deleteDialogTitle": "",
-	"deleteDialogDescription": "",
-	"pageSpeedMonitor": "",
-	"shown": "",
-	"ago": "",
-	"companyName": "",
-	"pageSpeedDetailsPerformanceReport": "",
-	"pageSpeedDetailsPerformanceReportCalculator": "",
-	"checkingEvery": "",
-	"statusPageCreateSettings": "",
-	"basicInformation": "",
-	"statusPageCreateBasicInfoDescription": "",
-	"statusPageCreateSelectTimeZoneDescription": "",
-	"statusPageCreateAppearanceDescription": "",
-	"statusPageCreateSettingsCheckboxLabel": "",
-	"statusPageCreateBasicInfoStatusPageAddress": "",
-	"statusPageCreateTabsContent": "",
-	"statusPageCreateTabsContentDescription": "",
-	"statusPageCreateTabsContentFeaturesDescription": "",
-	"showCharts": "",
-	"showUptimePercentage": "",
-	"removeLogo": "",
-	"statusPageStatus": "",
-	"statusPageStatusContactAdmin": "",
-	"statusPageStatusNotPublic": "",
-	"statusPageStatusNoPage": "",
-	"statusPageStatusServiceStatus": "",
-	"deleteStatusPage": "",
-	"deleteStatusPageConfirm": "",
-	"deleteStatusPageDescription": "",
-	"uptimeCreate": "",
-	"uptimeCreateJsonPath": "",
-	"uptimeCreateJsonPathQuery": "",
-	"maintenanceTableActionMenuDialogTitle": "",
-	"infrastructureEditYour": "",
-	"infrastructureEditMonitor": "",
-	"infrastructureMonitorCreated": "",
-	"infrastructureMonitorUpdated": "",
-	"errorInvalidTypeId": "",
-	"errorInvalidFieldId": "",
-	"inviteNoTokenFound": "",
-	"pageSpeedWarning": "",
-	"pageSpeedLearnMoreLink": "",
-	"pageSpeedAddApiKey": "",
-	"update": "",
-	"invalidFileFormat": "",
-	"invalidFileSize": "",
-	"ClickUpload": "",
-	"DragandDrop": "",
-	"MaxSize": "",
-	"SupportedFormats": "",
-	"FirstName": "",
-	"LastName": "",
-	"EmailDescriptionText": "",
-	"YourPhoto": "",
-	"PhotoDescriptionText": "",
-	"save": "",
-	"DeleteDescriptionText": "",
-	"DeleteAccountWarning": "",
-	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
-	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
-	"bulkImport": {
-		"title": "",
-		"selectFileTips": "",
-		"selectFileDescription": "",
-		"selectFile": "",
-		"parsingFailed": "",
-		"uploadSuccess": "",
-		"validationFailed": "",
-		"noFileSelected": "",
-		"fallbackPage": ""
-	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
-	"validationNameRequired": "",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
-	"DeleteAccountTitle": "",
-	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
-	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
-	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
-	"reset": "",
-	"ignoreTLSError": "",
-	"tlsErrorIgnored": "",
-	"ignoreTLSErrorDescription": "",
-	"createNew": "",
-	"greeting": {
-		"prepend": "",
-		"append": "",
-		"overview": ""
-	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
-	"roles": {
-		"superAdmin": "",
-		"admin": "",
-		"teamMember": "",
-		"demoUser": ""
-	},
-	"teamPanel": {
-		"teamMembers": "",
-		"filter": {
-			"all": "",
-			"member": ""
-		},
-		"inviteTeamMember": "",
-		"inviteNewTeamMember": "",
-		"inviteDescription": "",
-		"email": "",
-		"selectRole": "",
-		"inviteLink": "",
-		"cancel": "",
-		"noMembers": "",
-		"getToken": "",
-		"emailToken": "",
-		"table": {
-			"name": "",
-			"email": "",
-			"role": "",
-			"created": ""
-		}
-	},
-	"monitorState": {
-		"paused": "",
-		"resumed": "",
-		"active": ""
-	},
-	"menu": {
-		"uptime": "",
-		"pagespeed": "",
-		"infrastructure": "",
-		"distributedUptime": "",
-		"incidents": "",
-		"statusPages": "",
-		"maintenance": "",
-		"integrations": "",
-		"settings": "",
-		"support": "",
-		"discussions": "",
-		"docs": "",
-		"changelog": "",
-		"profile": "",
-		"password": "",
-		"team": "",
-		"logOut": ""
-	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
-	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
-	"state": "",
-	"statusBreadCrumbsStatusPages": "",
-	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
-	"commonSaving": "",
-	"navControls": "",
-	"incidentsPageTitle": "",
-	"passwordPanel": {
-		"passwordChangedSuccess": "",
-		"passwordInputIncorrect": "",
-		"currentPassword": "",
-		"enterCurrentPassword": "",
-		"newPassword": "",
-		"enterNewPassword": "",
-		"confirmNewPassword": "",
-		"passwordRequirements": "",
-		"saving": ""
-	},
-	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
-	"emailSent": "",
-	"failedToSendEmail": "",
-	"settingsTestEmail": "",
-	"settingsTestEmailSuccess": "",
-	"settingsTestEmailFailed": "",
-	"settingsTestEmailFailedWithReason": "",
-	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
-	"statusMsg": {
-		"paused": "",
-		"up": "",
-		"down": "",
-		"pending": ""
-	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
-	"uptimeGeneralInstructions": {
-		"http": "",
-		"ping": "",
-		"docker": "",
-		"port": ""
-	}
-}

From d63e3db2163ade14e96d38f198c0c806e228a2a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 17:40:07 +0200
Subject: [PATCH 071/319] i18n: Refactor and fix app names (Checkmate and
 Capture)

---
 client/src/Components/Sidebar/index.jsx          | 2 +-
 client/src/Pages/Auth/CheckEmail.jsx             | 2 +-
 client/src/Pages/Auth/ForgotPassword.jsx         | 2 +-
 client/src/Pages/Auth/Login/Login.jsx            | 2 +-
 client/src/Pages/Auth/NewPasswordConfirmed.jsx   | 2 +-
 client/src/Pages/Auth/Register/Register.jsx      | 2 +-
 client/src/Pages/Auth/SetNewPassword.jsx         | 2 +-
 client/src/Pages/Infrastructure/Create/index.jsx | 2 +-
 client/src/Pages/ServerUnreachable.jsx           | 2 +-
 client/src/Pages/Settings/SettingsAbout.jsx      | 2 +-
 client/src/locales/cs.json                       | 5 ++++-
 client/src/locales/de.json                       | 5 ++++-
 client/src/locales/en.json                       | 5 ++++-
 client/src/locales/es.json                       | 5 ++++-
 client/src/locales/fi.json                       | 5 ++++-
 client/src/locales/fr.json                       | 5 ++++-
 client/src/locales/pt-BR.json                    | 5 ++++-
 client/src/locales/ru.json                       | 5 ++++-
 client/src/locales/tr.json                       | 5 ++++-
 client/src/locales/zh-TW.json                    | 5 ++++-
 20 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index 6073f428d..f1c512771 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -338,7 +338,7 @@ function Sidebar() {
 						mt={theme.spacing(2)}
 						sx={{ opacity: 0.8, fontWeight: 500 }}
 					>
-						Checkmate
+						{t("common.appName")}
 					</Typography>
 				</Stack>
 			</Stack>
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 695be62b0..5ee6edb74 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -118,7 +118,7 @@ const CheckEmail = () => {
 				gap={theme.spacing(4)}
 			>
 				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>Checkmate</Typography>
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 			</Stack>
 			<Stack
 				width="100%"
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 6a31092c9..344bddac1 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -120,7 +120,7 @@ const ForgotPassword = () => {
 				gap={theme.spacing(4)}
 			>
 				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>Checkmate</Typography>
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 			</Stack>
 			<Stack
 				width="100%"
diff --git a/client/src/Pages/Auth/Login/Login.jsx b/client/src/Pages/Auth/Login/Login.jsx
index 5df2ed011..c81f0b892 100644
--- a/client/src/Pages/Auth/Login/Login.jsx
+++ b/client/src/Pages/Auth/Login/Login.jsx
@@ -174,7 +174,7 @@ const Login = () => {
 					gap={theme.spacing(4)}
 				>
 					<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-					<Typography sx={{ userSelect: "none" }}>Checkmate</Typography>
+					<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 				</Stack>
 				<Stack
 					direction="row"
diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index 57a4aaf25..f1980e23b 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -54,7 +54,7 @@ const NewPasswordConfirmed = () => {
 				gap={theme.spacing(4)}
 			>
 				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>Checkmate</Typography>
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 			</Stack>
 			<Stack
 				width="100%"
diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
index ffa1dd0ad..fd3f20cd9 100644
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ b/client/src/Pages/Auth/Register/Register.jsx
@@ -316,7 +316,7 @@ const Register = ({ isSuperAdmin }) => {
 				gap={theme.spacing(4)}
 			>
 				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>{t("commonAppName")}</Typography>
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 			</Stack>
 			<Stack
 				width="100%"
diff --git a/client/src/Pages/Auth/SetNewPassword.jsx b/client/src/Pages/Auth/SetNewPassword.jsx
index 4467a4adf..2d0aa01bc 100644
--- a/client/src/Pages/Auth/SetNewPassword.jsx
+++ b/client/src/Pages/Auth/SetNewPassword.jsx
@@ -98,7 +98,7 @@ const SetNewPassword = () => {
 				gap={theme.spacing(4)}
 			>
 				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>{t("commonAppName")}</Typography>
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 			</Stack>
 			<Stack
 				width="100%"
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index ab5df3086..3e439a6e0 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -322,7 +322,7 @@ const CreateInfrastructureMonitor = () => {
 							<Link
 								level="primary"
 								url="https://github.com/bluewave-labs/checkmate-agent"
-								label="Checkmate Monitoring Agent"
+								label={t("common.monitoringAgentName")}
 							/>
 						</Typography>
 					</Stack>
diff --git a/client/src/Pages/ServerUnreachable.jsx b/client/src/Pages/ServerUnreachable.jsx
index e7d81926e..7e067425a 100644
--- a/client/src/Pages/ServerUnreachable.jsx
+++ b/client/src/Pages/ServerUnreachable.jsx
@@ -71,7 +71,7 @@ const ServerUnreachable = () => {
 					gap={theme.spacing(4)}
 				>
 					<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-					<Typography sx={{ userSelect: "none" }}>Checkmate</Typography>
+					<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
 				</Stack>
 				<Stack
 					direction="row"
diff --git a/client/src/Pages/Settings/SettingsAbout.jsx b/client/src/Pages/Settings/SettingsAbout.jsx
index 121b732f8..fd11df3ad 100644
--- a/client/src/Pages/Settings/SettingsAbout.jsx
+++ b/client/src/Pages/Settings/SettingsAbout.jsx
@@ -20,7 +20,7 @@ const SettingsAbout = () => {
 				</Typography>
 			</Box>
 			<Box>
-				<Typography component="h2">Checkmate {2.1}</Typography>
+				<Typography component="h2">{t("common.appName")} {2.1}</Typography>
 				<Typography sx={{ mt: theme.spacing(2), mb: theme.spacing(6), opacity: 0.6 }}>
 					{t("settingsDevelopedBy")}
 				</Typography>
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 765627912..97762043a 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "",
 	"email": "",
 	"forgotPassword": "",
@@ -17,7 +21,6 @@
 	"createPassword": "",
 	"createAPassword": "",
 	"authRegisterAlreadyHaveAccount": "",
-	"commonAppName": "",
 	"authLoginEnterEmail": "",
 	"authRegisterTitle": "",
 	"authRegisterStepOneTitle": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 948748de3..0bf0119bc 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Noch kein Konto",
 	"email": "E-Mail",
 	"forgotPassword": "Passwort vergessen",
@@ -17,7 +21,6 @@
 	"createPassword": "Erstelle dein Passwort",
 	"createAPassword": "Passwort",
 	"authRegisterAlreadyHaveAccount": "Hast du schon eine Account?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "",
 	"authRegisterTitle": "",
 	"authRegisterStepOneTitle": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 12442246c..09eeecfe4 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Don't have account",
 	"email": "E-mail",
 	"forgotPassword": "Forgot Password",
@@ -17,7 +21,6 @@
 	"createPassword": "Create your password",
 	"createAPassword": "Password",
 	"authRegisterAlreadyHaveAccount": "Already have an account?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "Enter your email",
 	"authRegisterTitle": "Create an account",
 	"authRegisterStepOneTitle": "Create your account",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index a278312af..b998bd855 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "No tengo una cuenta",
 	"email": "Correo electronico",
 	"forgotPassword": "He olvidado mi contraseña",
@@ -17,7 +21,6 @@
 	"createPassword": "Crear contraseña",
 	"createAPassword": "Contraseña",
 	"authRegisterAlreadyHaveAccount": "Ya tienes un cuenta?",
-	"commonAppName": "",
 	"authLoginEnterEmail": "Introduce tu correo electronico",
 	"authRegisterTitle": "Crear una cuenta",
 	"authRegisterStepOneTitle": "Crea tu cuenta",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 7f6ffa2ba..191eb530a 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Ei tiliä",
 	"email": "Sähköposti",
 	"forgotPassword": "Unohtunut salasana",
@@ -17,7 +21,6 @@
 	"createPassword": "Luo salasanasi",
 	"createAPassword": "Salasana",
 	"authRegisterAlreadyHaveAccount": "Onko sinulla jo tili?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "Syötä salasanasi",
 	"authRegisterTitle": "Luo tili",
 	"authRegisterStepOneTitle": "Luo tilisi",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index d31e73f48..4dc39dc69 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Vous n'avez pas de compte",
 	"email": "E-mail",
 	"forgotPassword": "Mot de passe oublié",
@@ -17,7 +21,6 @@
 	"createPassword": "Créez votre mot de passe",
 	"createAPassword": "Créer un mot de passe",
 	"authRegisterAlreadyHaveAccount": "Vous avez un compte ?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "Entrez votre e-mail",
 	"authRegisterTitle": "Créer un compte",
 	"authRegisterStepOneTitle": "Créez votre compte",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index fdc3e50a6..0e32f7b36 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Não tenho conta",
 	"email": "E-mail",
 	"forgotPassword": "Esqueci a senha",
@@ -17,7 +21,6 @@
 	"createPassword": "Criar sua senha",
 	"createAPassword": "Senha",
 	"authRegisterAlreadyHaveAccount": "Já possui uma conta?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "Insira seu e-mail",
 	"authRegisterTitle": "Criar uma conta",
 	"authRegisterStepOneTitle": "Crie sua conta",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index fce8fd6ab..64342f618 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Нет аккаунта",
 	"email": "Почта",
 	"forgotPassword": "Забыли пароль",
@@ -17,7 +21,6 @@
 	"createPassword": "Создайте свой пароль",
 	"createAPassword": "Создайте пароль",
 	"authRegisterAlreadyHaveAccount": "Уже есть аккаунт?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "Введите свой email",
 	"authRegisterTitle": "Создать аккаунт",
 	"authRegisterStepOneTitle": "Создайте свой аккаут",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index fb1be3c57..d314d5bfb 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "Hesabınız yok mu",
 	"email": "E-posta",
 	"forgotPassword": "Parolamı unuttum",
@@ -17,7 +21,6 @@
 	"createPassword": "Parolanızı oluşturun",
 	"createAPassword": "Bir parola oluşturun",
 	"authRegisterAlreadyHaveAccount": "Zaten hesabınız var mı?",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "E-posta adresinizi girin",
 	"authRegisterTitle": "Hesap oluştur",
 	"authRegisterStepOneTitle": "Hesabınızı oluşturun",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index bb44d91da..d4451017d 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -1,4 +1,8 @@
 {
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture"
+	},
 	"dontHaveAccount": "沒有帳號",
 	"email": "E-mail",
 	"forgotPassword": "忘記密碼",
@@ -17,7 +21,6 @@
 	"createPassword": "",
 	"createAPassword": "",
 	"authRegisterAlreadyHaveAccount": "已經有帳號嗎？",
-	"commonAppName": "Checkmate",
 	"authLoginEnterEmail": "輸入您的 E-mail",
 	"authRegisterTitle": "建立帳號",
 	"authRegisterStepOneTitle": "建立您的帳號",

From 6b81eabf07533ea574915744236a009b55758952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 17:49:37 +0200
Subject: [PATCH 072/319] i18n: Fix theme toggle

---
 client/src/Components/ThemeSwitch/index.jsx | 4 +++-
 client/src/locales/cs.json                  | 5 ++++-
 client/src/locales/de.json                  | 5 ++++-
 client/src/locales/en.json                  | 5 ++++-
 client/src/locales/es.json                  | 5 ++++-
 client/src/locales/fi.json                  | 5 ++++-
 client/src/locales/fr.json                  | 5 ++++-
 client/src/locales/pt-BR.json               | 5 ++++-
 client/src/locales/ru.json                  | 5 ++++-
 client/src/locales/tr.json                  | 5 ++++-
 client/src/locales/zh-TW.json               | 5 ++++-
 11 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/client/src/Components/ThemeSwitch/index.jsx b/client/src/Components/ThemeSwitch/index.jsx
index 6c879b289..d1a7661bc 100644
--- a/client/src/Components/ThemeSwitch/index.jsx
+++ b/client/src/Components/ThemeSwitch/index.jsx
@@ -14,10 +14,12 @@ import SunAndMoonIcon from "./SunAndMoonIcon";
 import { useDispatch, useSelector } from "react-redux";
 import { setMode } from "../../Features/UI/uiSlice";
 import "./index.css";
+import {useTranslation} from "react-i18next";
 
 const ThemeSwitch = ({ width = 48, height = 48, color }) => {
 	const mode = useSelector((state) => state.ui.mode);
 	const dispatch = useDispatch();
+	const { t } = useTranslation();
 
 	const toggleTheme = () => {
 		dispatch(setMode(mode === "light" ? "dark" : "light"));
@@ -26,7 +28,7 @@ const ThemeSwitch = ({ width = 48, height = 48, color }) => {
 	return (
 		<IconButton
 			id="theme-toggle"
-			title="Toggles light & dark"
+			title={t("common.buttons.toggleTheme")}
 			className={`theme-${mode}`}
 			aria-label="auto"
 			aria-live="polite"
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 97762043a..9cb584cd3 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Přepnout mezi světlým a tmavým motivem"
+		}
 	},
 	"dontHaveAccount": "",
 	"email": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 0bf0119bc..7cd727828 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Noch kein Konto",
 	"email": "E-Mail",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 09eeecfe4..524cbfeb4 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		}
 	},
 	"dontHaveAccount": "Don't have account",
 	"email": "E-mail",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index b998bd855..e2741d8b2 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "No tengo una cuenta",
 	"email": "Correo electronico",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 191eb530a..2439cd7aa 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Ei tiliä",
 	"email": "Sähköposti",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 4dc39dc69..19eb7709c 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Vous n'avez pas de compte",
 	"email": "E-mail",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 0e32f7b36..3cf618bc5 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Não tenho conta",
 	"email": "E-mail",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 64342f618..5189032c3 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Нет аккаунта",
 	"email": "Почта",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index d314d5bfb..004d1d8a0 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "Hesabınız yok mu",
 	"email": "E-posta",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index d4451017d..cad6b52ba 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -1,7 +1,10 @@
 {
 	"common": {
 		"appName": "Checkmate",
-		"monitoringAgentName": "Capture"
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": ""
+		}
 	},
 	"dontHaveAccount": "沒有帳號",
 	"email": "E-mail",

From 6460fe33d6d0f500e450c06f2c159b32e339be23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 19:22:54 +0200
Subject: [PATCH 073/319] i18n: Refactor page for server unreachable and remove
 unused

---
 client/src/Pages/ServerUnreachable.jsx | 15 ++++++---------
 client/src/locales/cs.json             | 22 ++++++++++++++--------
 client/src/locales/de.json             | 22 ++++++++++++++--------
 client/src/locales/en.json             | 22 ++++++++++++++--------
 client/src/locales/es.json             | 22 ++++++++++++++--------
 client/src/locales/fi.json             | 22 ++++++++++++++--------
 client/src/locales/fr.json             | 22 ++++++++++++++--------
 client/src/locales/pt-BR.json          | 22 ++++++++++++++--------
 client/src/locales/ru.json             | 22 ++++++++++++++--------
 client/src/locales/tr.json             | 22 ++++++++++++++--------
 client/src/locales/zh-TW.json          | 22 ++++++++++++++--------
 11 files changed, 146 insertions(+), 89 deletions(-)

diff --git a/client/src/Pages/ServerUnreachable.jsx b/client/src/Pages/ServerUnreachable.jsx
index 7e067425a..7ab96dd96 100644
--- a/client/src/Pages/ServerUnreachable.jsx
+++ b/client/src/Pages/ServerUnreachable.jsx
@@ -28,13 +28,13 @@ const ServerUnreachable = () => {
 
 			// If successful, show toast and navigate to login page
 			createToast({
-				body: t("backendReconnected", "Connection to server restored"),
+				body: t("errorPages.serverUnreachable.toasts.reconnected"),
 			});
 			navigate("/login");
 		} catch (error) {
 			// If still unreachable, stay on this page and show toast
 			createToast({
-				body: t("backendStillUnreachable", "Server is still unreachable"),
+				body: t("errorPages.serverUnreachable.toasts.stillUnreachable"),
 			});
 		} finally {
 			setIsCheckingConnection(false);
@@ -121,7 +121,7 @@ const ServerUnreachable = () => {
 					>
 						<Alert
 							variant="error"
-							body={t("backendUnreachable", "Server Unreachable")}
+							body={t("errorPages.serverUnreachable.alertBox")}
 							hasIcon={true}
 						/>
 					</Box>
@@ -131,10 +131,7 @@ const ServerUnreachable = () => {
 							align="center"
 							color={theme.palette.primary.contrastTextSecondary}
 						>
-							{t(
-								"backendUnreachableMessage",
-								"The Checkmate server is not responding. Please check your deployment configuration or try again later."
-							)}
+							{t("errorPages.serverUnreachable.description")}
 						</Typography>
 					</Box>
 					<Box sx={{ mt: theme.spacing(4) }}>
@@ -156,8 +153,8 @@ const ServerUnreachable = () => {
 							}}
 						>
 							{isCheckingConnection
-								? t("retryingConnection", "Retrying Connection...")
-								: t("retryConnection", "Retry Connection")}
+								? t("errorPages.serverUnreachable.retryButton.processing")
+								: t("errorPages.serverUnreachable.retryButton.default")}
 						</Button>
 					</Box>
 				</Stack>
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 9cb584cd3..10a0f3c45 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -6,6 +6,20 @@
 			"toggleTheme": "Přepnout mezi světlým a tmavým motivem"
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Podařilo se úspěšně obnovit spojení se serverem",
+				"stillUnreachable": "Server je stále nedosažitelný. Zkuste to prosím později."
+			},
+			"alertBox": "Chyba připojení k serveru",
+			"description": "Nepodařilo se připojit k serveru. Zkontrolujte si prosím internetové připojení a pokud problém přetrvává, ověřte konfiguraci aplikace Checkmate.",
+			"retryButton": {
+				"default": "Zkusit se znovu připojit",
+				"processing": "Probíhá připojování…"
+			}
+		}
+	},
 	"dontHaveAccount": "",
 	"email": "",
 	"forgotPassword": "",
@@ -428,14 +442,6 @@
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 7cd727828..9c13009b7 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
 	"dontHaveAccount": "Noch kein Konto",
 	"email": "E-Mail",
 	"forgotPassword": "Passwort vergessen",
@@ -428,14 +442,6 @@
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 524cbfeb4..055ddbdca 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -6,6 +6,20 @@
 			"toggleTheme": "Toggles light & dark"
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
+			},
+			"alertBox": "Server Connection Error",
+			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
+			"retryButton": {
+				"default": "Retry connection",
+				"processing": "Connecting..."
+			}
+		}
+	},
 	"dontHaveAccount": "Don't have account",
 	"email": "E-mail",
 	"forgotPassword": "Forgot Password",
@@ -420,14 +434,6 @@
 	"publicLink": "Public link",
 	"doNotHaveAccount": "Do not have an account?",
 	"registerHere": "Register here",
-	"backendUnreachable": "Server Connection Error",
-	"backendUnreachableMessage": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
-	"backendUnreachableError": "Cannot connect to the server. Please try again later.",
-	"retryConnection": "Retry connection",
-	"retryingConnection": "Connecting...",
-	"backendReconnected": "Successfully reconnected to the server.",
-	"backendStillUnreachable": "Server is still unreachable. Please try again later.",
-	"backendConnectionError": "Error connecting to the server. Please check your network connection.",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index e2741d8b2..2f76a6c93 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
 	"dontHaveAccount": "No tengo una cuenta",
 	"email": "Correo electronico",
 	"forgotPassword": "He olvidado mi contraseña",
@@ -428,14 +442,6 @@
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 2439cd7aa..463665ef5 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": "Yhdistetään..."
+			}
+		}
+	},
 	"dontHaveAccount": "Ei tiliä",
 	"email": "Sähköposti",
 	"forgotPassword": "Unohtunut salasana",
@@ -428,14 +442,6 @@
 	"publicLink": "Julkinen linkki",
 	"doNotHaveAccount": "Onko sinulla tili?",
 	"registerHere": "Rekisteröidy tästä",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "Yhdistetään...",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API-avain",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API-avain",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 19eb7709c..b430ea903 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Reconnexion au serveur réussie.",
+				"stillUnreachable": "Le serveur est toujours inaccessible. Veuillez réessayer plus tard."
+			},
+			"alertBox": "Erreur de connexion au serveur",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
 	"dontHaveAccount": "Vous n'avez pas de compte",
 	"email": "E-mail",
 	"forgotPassword": "Mot de passe oublié",
@@ -428,14 +442,6 @@
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "Erreur de connexion au serveur",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "Impossible de se connecter au serveur. Veuillez réessayer plus tard.",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "Reconnexion au serveur réussie.",
-	"backendStillUnreachable": "Le serveur est toujours inaccessible. Veuillez réessayer plus tard.",
-	"backendConnectionError": "Erreur de connexion au serveur. Veuillez vérifier votre connexion réseau.",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 3cf618bc5..273e40d67 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Reconectado ao servidor com sucesso.",
+				"stillUnreachable": "O servidor ainda está inacessível. Tente novamente mais tarde."
+			},
+			"alertBox": "Erro de conexão com o servidor",
+			"description": "Não conseguimos conectar ao servidor. Verifique sua conexão com a internet ou sua configuração de implantação se o problema persistir.",
+			"retryButton": {
+				"default": "Reconectar",
+				"processing": "Conectando..."
+			}
+		}
+	},
 	"dontHaveAccount": "Não tenho conta",
 	"email": "E-mail",
 	"forgotPassword": "Esqueci a senha",
@@ -427,14 +441,6 @@
 	"publicLink": "Link publico",
 	"doNotHaveAccount": "Ainda não tem uma conta?",
 	"registerHere": "Registre-se aqui",
-	"backendUnreachable": "Erro de conexão com o servidor",
-	"backendUnreachableMessage": "Não conseguimos conectar ao servidor. Verifique sua conexão com a internet ou sua configuração de implantação se o problema persistir.",
-	"backendUnreachableError": "Não foi possível conectar ao servidor. Tente novamente mais tarde.",
-	"retryConnection": "Reconectar",
-	"retryingConnection": "Conectando...",
-	"backendReconnected": "Reconectado ao servidor com sucesso.",
-	"backendStillUnreachable": "O servidor ainda está inacessível. Tente novamente mais tarde.",
-	"backendConnectionError": "Erro ao conectar ao servidor. Verifique sua conexão de internet.",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 5189032c3..facd85cb3 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Успешно подключен к серверу.",
+				"stillUnreachable": "Сервер по-прежнему недоступен. Пожалуйста, повторите попытку позже."
+			},
+			"alertBox": "Ошибка подключения к серверу",
+			"description": "Нам не удается подключиться к серверу. Пожалуйста, проверьте подключение к Интернету или конфигурацию вашего развертывания, если проблема не устранена.",
+			"retryButton": {
+				"default": "Повторите попытку подключения",
+				"processing": "Подключение..."
+			}
+		}
+	},
 	"dontHaveAccount": "Нет аккаунта",
 	"email": "Почта",
 	"forgotPassword": "Забыли пароль",
@@ -423,14 +437,6 @@
 	"publicLink": "Публичная ссылка",
 	"doNotHaveAccount": "У вас нет учетной записи?",
 	"registerHere": "Зарегистрируйтесь здесь",
-	"backendUnreachable": "Ошибка подключения к серверу",
-	"backendUnreachableMessage": "Нам не удается подключиться к серверу. Пожалуйста, проверьте подключение к Интернету или конфигурацию вашего развертывания, если проблема не устранена.",
-	"backendUnreachableError": "Не удается подключиться к серверу. Пожалуйста, повторите попытку позже.",
-	"retryConnection": "Повторите попытку подключения",
-	"retryingConnection": "Подключение...",
-	"backendReconnected": "Успешно подключен к серверу.",
-	"backendStillUnreachable": "Сервер по-прежнему недоступен. Пожалуйста, повторите попытку позже.",
-	"backendConnectionError": "Ошибка подключения к серверу. Пожалуйста, проверьте свое сетевое подключение.",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Ключ API Google PageSpeed",
 	"pageSpeedApiKeyFieldLabel": "Ключ API PageSpeed",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 004d1d8a0..c7a0d300a 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Sunucuya başarıyla yeniden bağlanıldı.",
+				"stillUnreachable": "Sunucuya hala ulaşılamıyor. Lütfen daha sonra tekrar deneyin."
+			},
+			"alertBox": "Sunucu bağlantı hatası",
+			"description": "Sunucuya bağlanamıyoruz. Lütfen internet bağlantınızı kontrol edin veya sorun devam ederse dağıtım yapılandırmanızı doğrulayın.",
+			"retryButton": {
+				"default": "Bağlantıyı yeniden deneyin",
+				"processing": "Bağlanıyor..."
+			}
+		}
+	},
 	"dontHaveAccount": "Hesabınız yok mu",
 	"email": "E-posta",
 	"forgotPassword": "Parolamı unuttum",
@@ -428,14 +442,6 @@
 	"publicLink": "Herkese açık bağlantı",
 	"doNotHaveAccount": "Bir hesabınız yok mu?",
 	"registerHere": "Buradan kayıt olun",
-	"backendUnreachable": "Sunucu bağlantı hatası",
-	"backendUnreachableMessage": "Sunucuya bağlanamıyoruz. Lütfen internet bağlantınızı kontrol edin veya sorun devam ederse dağıtım yapılandırmanızı doğrulayın.",
-	"backendUnreachableError": "Sunucuya bağlanılamıyor. Lütfen daha sonra tekrar deneyin.",
-	"retryConnection": "Bağlantıyı yeniden deneyin",
-	"retryingConnection": "Bağlanıyor...",
-	"backendReconnected": "Sunucuya başarıyla yeniden bağlanıldı.",
-	"backendStillUnreachable": "Sunucuya hala ulaşılamıyor. Lütfen daha sonra tekrar deneyin.",
-	"backendConnectionError": "Sunucuya bağlanırken hata oluştu. Lütfen ağ bağlantınızı kontrol edin.",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API anahtarı",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API anahtarı",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index cad6b52ba..ff48a0ddc 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -6,6 +6,20 @@
 			"toggleTheme": ""
 		}
 	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
 	"dontHaveAccount": "沒有帳號",
 	"email": "E-mail",
 	"forgotPassword": "忘記密碼",
@@ -428,14 +442,6 @@
 	"publicLink": "",
 	"doNotHaveAccount": "",
 	"registerHere": "",
-	"backendUnreachable": "",
-	"backendUnreachableMessage": "",
-	"backendUnreachableError": "",
-	"retryConnection": "",
-	"retryingConnection": "",
-	"backendReconnected": "",
-	"backendStillUnreachable": "",
-	"backendConnectionError": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",

From c5efa71875c2bc5bb5ac91c0c15ceb4939502d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 19:30:55 +0200
Subject: [PATCH 074/319] i18n: Refactor and fix network error

---
 client/src/Components/GenericFallback/NetworkError.jsx | 7 +++++--
 client/src/Pages/Infrastructure/Details/index.jsx      | 4 ++--
 client/src/Pages/Infrastructure/Monitors/index.jsx     | 4 ++--
 client/src/Pages/Maintenance/index.jsx                 | 4 ++--
 client/src/Pages/PageSpeed/Details/index.jsx           | 4 ++--
 client/src/Pages/PageSpeed/Monitors/index.jsx          | 4 ++--
 client/src/Pages/StatusPage/Create/index.jsx           | 4 ++--
 client/src/Pages/StatusPage/Status/index.jsx           | 4 ++--
 client/src/Pages/StatusPage/StatusPages/index.jsx      | 4 ++--
 client/src/Pages/Uptime/Details/index.jsx              | 4 ++--
 client/src/Pages/Uptime/Monitors/index.jsx             | 4 ++--
 client/src/locales/cs.json                             | 6 ++++--
 client/src/locales/de.json                             | 6 ++++--
 client/src/locales/en.json                             | 6 ++++--
 client/src/locales/es.json                             | 6 ++++--
 client/src/locales/fi.json                             | 6 ++++--
 client/src/locales/fr.json                             | 6 ++++--
 client/src/locales/pt-BR.json                          | 6 ++++--
 client/src/locales/ru.json                             | 6 ++++--
 client/src/locales/tr.json                             | 6 ++++--
 client/src/locales/zh-TW.json                          | 6 ++++--
 21 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/client/src/Components/GenericFallback/NetworkError.jsx b/client/src/Components/GenericFallback/NetworkError.jsx
index b26037a57..ddffa1c31 100644
--- a/client/src/Components/GenericFallback/NetworkError.jsx
+++ b/client/src/Components/GenericFallback/NetworkError.jsx
@@ -1,8 +1,11 @@
 import { Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
+import { useTranslation } from "react-i18next";
 
 const NetworkError = () => {
 	const theme = useTheme();
+	const { t } = useTranslation();
+
 	return (
 		<>
 			<Typography
@@ -10,9 +13,9 @@ const NetworkError = () => {
 				marginY={theme.spacing(4)}
 				color={theme.palette.primary.contrastTextTertiary}
 			>
-				Network error
+				{t("common.toasts.networkError")}
 			</Typography>
-			<Typography>Please check your connection</Typography>
+			<Typography>{t("common.toasts.checkConnection")}</Typography>
 		</>
 	);
 };
diff --git a/client/src/Pages/Infrastructure/Details/index.jsx b/client/src/Pages/Infrastructure/Details/index.jsx
index f7f96f931..fefb7d2aa 100644
--- a/client/src/Pages/Infrastructure/Details/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/index.jsx
@@ -46,9 +46,9 @@ const InfrastructureDetails = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 9797736c4..bfba843c0 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -66,9 +66,9 @@ const InfrastructureMonitors = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/Maintenance/index.jsx b/client/src/Pages/Maintenance/index.jsx
index eccc95b50..f155680a5 100644
--- a/client/src/Pages/Maintenance/index.jsx
+++ b/client/src/Pages/Maintenance/index.jsx
@@ -58,9 +58,9 @@ const Maintenance = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/PageSpeed/Details/index.jsx b/client/src/Pages/PageSpeed/Details/index.jsx
index d429858d2..5724f12a1 100644
--- a/client/src/Pages/PageSpeed/Details/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/index.jsx
@@ -52,9 +52,9 @@ const PageSpeedDetails = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index bd40aedff..808541cee 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -35,9 +35,9 @@ const PageSpeed = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/StatusPage/Create/index.jsx b/client/src/Pages/StatusPage/Create/index.jsx
index d1bb8d196..50535cd90 100644
--- a/client/src/Pages/StatusPage/Create/index.jsx
+++ b/client/src/Pages/StatusPage/Create/index.jsx
@@ -208,9 +208,9 @@ const CreateStatusPage = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/StatusPage/Status/index.jsx b/client/src/Pages/StatusPage/Status/index.jsx
index 341c6d731..ee1ec436c 100644
--- a/client/src/Pages/StatusPage/Status/index.jsx
+++ b/client/src/Pages/StatusPage/Status/index.jsx
@@ -69,9 +69,9 @@ const PublicStatus = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/StatusPage/StatusPages/index.jsx b/client/src/Pages/StatusPage/StatusPages/index.jsx
index 095023d76..650307bdb 100644
--- a/client/src/Pages/StatusPage/StatusPages/index.jsx
+++ b/client/src/Pages/StatusPage/StatusPages/index.jsx
@@ -32,9 +32,9 @@ const StatusPages = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 5ad8bd61b..570b687d5 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -95,9 +95,9 @@ const UptimeDetails = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index ce9123816..793731190 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -158,9 +158,9 @@ const UptimeMonitors = () => {
 					marginY={theme.spacing(4)}
 					color={theme.palette.primary.contrastTextTertiary}
 				>
-					{t("networkError")}
+					{t("common.toasts.networkError")}
 				</Typography>
-				<Typography>{t("checkConnection")}</Typography>
+				<Typography>{t("common.toasts.checkConnection")}</Typography>
 			</GenericFallback>
 		);
 	}
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 10a0f3c45..5f2fde219 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": "Přepnout mezi světlým a tmavým motivem"
+		},
+		"toasts": {
+			"networkError": "Chyba připojení k síti",
+			"checkConnection": "Zkontrolujte prosím své připojení k síti"
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "",
 	"delete": "",
 	"configure": "",
-	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
@@ -136,7 +139,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"checkConnection": "",
 	"passwordreset": "",
 	"authRegisterStepOnePersonalDetails": "",
 	"authCheckEmailOpenEmailButton": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 9c13009b7..fb1a58019 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": ""
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "",
 	"delete": "",
 	"configure": "",
-	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
@@ -136,7 +139,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"checkConnection": "",
 	"passwordreset": "",
 	"authRegisterStepOnePersonalDetails": "",
 	"authCheckEmailOpenEmailButton": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 055ddbdca..145aa0af3 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": "Toggles light & dark"
+		},
+		"toasts": {
+			"networkError": "Network error",
+			"checkConnection": "Please check your connection"
 		}
 	},
 	"errorPages": {
@@ -124,7 +128,6 @@
 	"now": "Now",
 	"delete": "Delete",
 	"configure": "Configure",
-	"networkError": "Network error",
 	"responseTime": "Response time",
 	"ms": "ms",
 	"bar": "Bar",
@@ -132,7 +135,6 @@
 	"country": "COUNTRY",
 	"city": "CITY",
 	"response": "RESPONSE",
-	"checkConnection": "Please check your connection",
 	"passwordreset": "Password Reset",
 	"authRegisterStepOnePersonalDetails": "Enter your personal details",
 	"authCheckEmailOpenEmailButton": "Open email app",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 2f76a6c93..722833d99 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": ""
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "",
 	"delete": "",
 	"configure": "",
-	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
@@ -136,7 +139,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"checkConnection": "",
 	"passwordreset": "",
 	"authRegisterStepOnePersonalDetails": "",
 	"authCheckEmailOpenEmailButton": "",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 463665ef5..16517778a 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "Verkkovirhe",
+			"checkConnection": "Tarkista yhteytesi"
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "Nyt",
 	"delete": "Poista",
 	"configure": "Määritä",
-	"networkError": "Verkkovirhe",
 	"responseTime": "Vasteaika",
 	"ms": "ms",
 	"bar": "Palkki",
@@ -136,7 +139,6 @@
 	"country": "MAA",
 	"city": "KAUPUNKI",
 	"response": "Vastaus",
-	"checkConnection": "Tarkista yhteytesi",
 	"passwordreset": "Salasanan nollaus",
 	"authRegisterStepOnePersonalDetails": "Syötä henkilökohtaiset tietosi",
 	"authCheckEmailOpenEmailButton": "Avaa sähköpostisovellus",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index b430ea903..4acde5888 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "Vérifiez votre connexion"
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "",
 	"delete": "Supprimer",
 	"configure": "",
-	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
@@ -136,7 +139,6 @@
 	"country": "PAYS",
 	"city": "VILLE",
 	"response": "",
-	"checkConnection": "Vérifiez votre connexion",
 	"passwordreset": "",
 	"authRegisterStepOnePersonalDetails": "Saisissez vos infos",
 	"authCheckEmailOpenEmailButton": "Ouvrir l'appli mail",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 273e40d67..25f14086e 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "Erro de rede",
+			"checkConnection": "Verifique sua conexão"
 		}
 	},
 	"errorPages": {
@@ -127,7 +131,6 @@
 	"now": "Agora",
 	"delete": "Deletar",
 	"configure": "Configurar",
-	"networkError": "Erro de rede",
 	"responseTime": "Tempo de resposta",
 	"ms": "ms",
 	"bar": "Bar",
@@ -135,7 +138,6 @@
 	"country": "PAÍS",
 	"city": "CIDADE",
 	"response": "RESPOSTA",
-	"checkConnection": "Verifique sua conexão",
 	"passwordreset": "Redefinição de senha",
 	"authRegisterStepOnePersonalDetails": "Insira seus dados pessoais",
 	"authCheckEmailOpenEmailButton": "Abra o aplicativo de e-mail",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index facd85cb3..ae83dc57a 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "Ошибка сети",
+			"checkConnection": "Пожалуйста, проверьте ваше соединение"
 		}
 	},
 	"errorPages": {
@@ -124,7 +128,6 @@
 	"now": "Сейчас",
 	"delete": "Удалить",
 	"configure": "Настроить",
-	"networkError": "Ошибка сети",
 	"responseTime": "Время ответа:",
 	"ms": "мс",
 	"bar": "Bar",
@@ -132,7 +135,6 @@
 	"country": "СТРАНА",
 	"city": "ГОРОД",
 	"response": "ОТВЕТ",
-	"checkConnection": "Пожалуйста, проверьте ваше соединение",
 	"passwordreset": "Сброс пароля",
 	"authRegisterStepOnePersonalDetails": "Введите свои личные данные",
 	"authCheckEmailOpenEmailButton": "Откройте приложение почты",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index c7a0d300a..59e911118 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "Ağ hatası",
+			"checkConnection": "Lütfen bağlantınızı kontrol edin"
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "Şimdi",
 	"delete": "Sil",
 	"configure": "Yapılandır",
-	"networkError": "Ağ hatası",
 	"responseTime": "Yanıt süresi:",
 	"ms": "ms",
 	"bar": "Çubuk",
@@ -136,7 +139,6 @@
 	"country": "ÜLKE",
 	"city": "ŞEHİR",
 	"response": "YANIT",
-	"checkConnection": "Lütfen bağlantınızı kontrol edin",
 	"passwordreset": "Parola Sıfırlama",
 	"authRegisterStepOnePersonalDetails": "Kişisel bilgilerinizi girin",
 	"authCheckEmailOpenEmailButton": "Eposta uygulamasını aç",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index ff48a0ddc..98fed65ef 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -4,6 +4,10 @@
 		"monitoringAgentName": "Capture",
 		"buttons": {
 			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": ""
 		}
 	},
 	"errorPages": {
@@ -128,7 +132,6 @@
 	"now": "",
 	"delete": "",
 	"configure": "",
-	"networkError": "",
 	"responseTime": "",
 	"ms": "",
 	"bar": "",
@@ -136,7 +139,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"checkConnection": "",
 	"passwordreset": "",
 	"authRegisterStepOnePersonalDetails": "",
 	"authCheckEmailOpenEmailButton": "",

From 3ac0eb212847afb09b7cccff0d289e30919649f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 21:44:04 +0200
Subject: [PATCH 075/319] refactor: Simplify client-side email validation

We don't need to implement custom check for lowercase, as it's
been already implemented in joi library. Also we don't need to
convert email to lowercase twice (via onChange and onInput event
handlers), onChange is completely sufficient and as it's just
before form validation, it's the better one.
---
 client/src/Pages/Auth/Login/Components/EmailStep.jsx | 1 -
 client/src/Validation/validation.js                  | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/client/src/Pages/Auth/Login/Components/EmailStep.jsx b/client/src/Pages/Auth/Login/Components/EmailStep.jsx
index 45babead1..20e8d6bfb 100644
--- a/client/src/Pages/Auth/Login/Components/EmailStep.jsx
+++ b/client/src/Pages/Auth/Login/Components/EmailStep.jsx
@@ -55,7 +55,6 @@ const EmailStep = ({ form, errors, onSubmit, onChange }) => {
 						placeholder="jordan.ellis@domain.com"
 						autoComplete="email"
 						value={form.email}
-						onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
 						onChange={onChange}
 						error={errors.email ? true : false}
 						helperText={errors.email ? t(errors.email) : ""}
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index d94f7c49a..b79d4c824 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -71,13 +71,7 @@ const credentials = joi.object({
 		.string()
 		.trim()
 		.email({ tlds: { allow: false } })
-		.custom((value, helpers) => {
-			const lowercasedValue = value.toLowerCase();
-			if (value !== lowercasedValue) {
-				return helpers.message("Email must be in lowercase");
-			}
-			return lowercasedValue;
-		})
+		.lowercase()
 		.messages({
 			"string.empty": "authRegisterEmailRequired",
 			"string.email": "authRegisterEmailInvalid",

From 74915f6840be8816f3233da65a858abe2eb2fad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sat, 7 Jun 2025 22:52:41 +0200
Subject: [PATCH 076/319] fix: Strict password validation in login form

Strict password validation is for registration, change password,
reset password and similar forms. In login form, we don't want
to interrupt user with unnecessary validation as it's completely
irrelevant what they actually entered. The one thing it's about
is the correctness of the email and the password.

Disabling strict validation for password is a kind of security
through obscurity, which could filter some untargeted attempts
for trying passwords by bots. If the bot immediatelly receives
notes about the requirements, it has more imformation for better
attacks.
---
 .../TabPanels/Account/PasswordPanel.jsx       |  6 ++--
 .../TabPanels/Account/ProfilePanel.jsx        |  4 +--
 .../TabPanels/Account/TeamPanel.jsx           |  6 ++--
 client/src/Pages/Auth/ForgotPassword.jsx      |  6 ++--
 client/src/Pages/Auth/Login/Login.jsx         |  8 +++---
 client/src/Pages/Auth/Register/Register.jsx   |  6 ++--
 client/src/Pages/Auth/SetNewPassword.jsx      |  4 +--
 .../Pages/Auth/hooks/useValidatePassword.jsx  |  4 +--
 client/src/Validation/validation.js           | 28 +++++++++++++++----
 server/validation/joi.js                      | 12 +++-----
 10 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/client/src/Components/TabPanels/Account/PasswordPanel.jsx b/client/src/Components/TabPanels/Account/PasswordPanel.jsx
index 88604c72b..84d16e8b0 100644
--- a/client/src/Components/TabPanels/Account/PasswordPanel.jsx
+++ b/client/src/Components/TabPanels/Account/PasswordPanel.jsx
@@ -4,7 +4,7 @@ import { useTheme } from "@emotion/react";
 import { Box, Stack, Typography, Button } from "@mui/material";
 import { PasswordEndAdornment } from "../../Inputs/TextInput/Adornments";
 import TextInput from "../../Inputs/TextInput";
-import { credentials } from "../../../Validation/validation";
+import { newOrChangedCredentials } from "../../../Validation/validation";
 import Alert from "../../Alert";
 import { update } from "../../../Features/Auth/authSlice";
 import { useDispatch, useSelector } from "react-redux";
@@ -61,7 +61,7 @@ const PasswordPanel = () => {
 			[name]: true,
 		};
 
-		const validation = credentials.validate(
+		const validation = newOrChangedCredentials.validate(
 			{ ...updatedData },
 			{ abortEarly: false, context: { password: updatedData.newPassword } }
 		);
@@ -79,7 +79,7 @@ const PasswordPanel = () => {
 	const handleSubmit = async (event) => {
 		event.preventDefault();
 
-		const { error } = credentials.validate(localData, {
+		const { error } = newOrChangedCredentials.validate(localData, {
 			abortEarly: false,
 			context: { password: localData.newPassword },
 		});
diff --git a/client/src/Components/TabPanels/Account/ProfilePanel.jsx b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
index 53a8a8d77..46a2bdb79 100644
--- a/client/src/Components/TabPanels/Account/ProfilePanel.jsx
+++ b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
@@ -5,7 +5,7 @@ import { Box, Button, Divider, Stack, Typography } from "@mui/material";
 import Avatar from "../../Avatar";
 import TextInput from "../../Inputs/TextInput";
 import ImageUpload from "../../Inputs/ImageUpload";
-import { credentials } from "../../../Validation/validation";
+import { newOrChangedCredentials } from "../../../Validation/validation";
 import { useDispatch, useSelector } from "react-redux";
 import { clearAuthState, deleteUser, update } from "../../../Features/Auth/authSlice";
 import { clearUptimeMonitorState } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
@@ -58,7 +58,7 @@ const ProfilePanel = () => {
 			[name]: value,
 		}));
 
-		validateField({ [name]: value }, credentials, name);
+		validateField({ [name]: value }, newOrChangedCredentials, name);
 	};
 
 	// Validates input against provided schema and updates error state
diff --git a/client/src/Components/TabPanels/Account/TeamPanel.jsx b/client/src/Components/TabPanels/Account/TeamPanel.jsx
index c29762233..52e3ea9ee 100644
--- a/client/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -4,7 +4,7 @@ import { Button, ButtonGroup, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import TextInput from "../../Inputs/TextInput";
-import { credentials } from "../../../Validation/validation";
+import { newOrChangedCredentials } from "../../../Validation/validation";
 import { networkService } from "../../../main";
 import { createToast } from "../../../Utils/toastUtils";
 import Select from "../../Inputs/Select";
@@ -115,7 +115,7 @@ const TeamPanel = () => {
 			email: newEmail,
 		}));
 
-		const validation = credentials.validate({ email: newEmail }, { abortEarly: false });
+		const validation = newOrChangedCredentials.validate({ email: newEmail }, { abortEarly: false });
 
 		setErrors((prev) => {
 			const updatedErrors = { ...prev };
@@ -142,7 +142,7 @@ const TeamPanel = () => {
 		if (!toInvite.role.includes("user") || !toInvite.role.includes("admin"))
 			setToInvite((prev) => ({ ...prev, role: ["user"] }));
 
-		const { error } = credentials.validate(
+		const { error } = newOrChangedCredentials.validate(
 			{ email: toInvite.email },
 			{
 				abortEarly: false,
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 344bddac1..47b8fc3bf 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -4,7 +4,7 @@ import { createToast } from "../../Utils/toastUtils";
 import { useDispatch, useSelector } from "react-redux";
 import { forgotPassword } from "../../Features/Auth/authSlice";
 import { useEffect, useState } from "react";
-import { credentials } from "../../Validation/validation";
+import { newOrChangedCredentials } from "../../Validation/validation";
 import { useNavigate } from "react-router-dom";
 import TextInput from "../../Components/Inputs/TextInput";
 import Logo from "../../assets/icons/checkmate-icon.svg?react";
@@ -35,7 +35,7 @@ const ForgotPassword = () => {
 	const handleSubmit = async (event) => {
 		event.preventDefault();
 
-		const { error } = credentials.validate(form, { abortEarly: false });
+		const { error } = newOrChangedCredentials.validate(form, { abortEarly: false });
 
 		if (error) {
 			// validation errors
@@ -75,7 +75,7 @@ const ForgotPassword = () => {
 		const { value } = event.target;
 		setForm({ email: value });
 
-		const { error } = credentials.validate({ email: value }, { abortEarly: false });
+		const { error } = newOrChangedCredentials.validate({ email: value }, { abortEarly: false });
 
 		if (error) setErrors({ email: error.details[0].message });
 		else delete errors.email;
diff --git a/client/src/Pages/Auth/Login/Login.jsx b/client/src/Pages/Auth/Login/Login.jsx
index c81f0b892..f3b2253d2 100644
--- a/client/src/Pages/Auth/Login/Login.jsx
+++ b/client/src/Pages/Auth/Login/Login.jsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { Box, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { credentials } from "../../../Validation/validation";
+import { loginCredentials } from "../../../Validation/validation";
 import { login } from "../../../Features/Auth/authSlice";
 import { useDispatch, useSelector } from "react-redux";
 import { createToast } from "../../../Utils/toastUtils";
@@ -59,7 +59,7 @@ const Login = () => {
 			[name]: lowerCasedValue,
 		}));
 
-		const { error } = credentials.validate(
+		const { error } = loginCredentials.validate(
 			{ [name]: lowerCasedValue },
 			{ abortEarly: false }
 		);
@@ -76,7 +76,7 @@ const Login = () => {
 		event.preventDefault();
 
 		if (step === 0) {
-			const { error } = credentials.validate(
+			const { error } = loginCredentials.validate(
 				{ email: form.email },
 				{ abortEarly: false }
 			);
@@ -91,7 +91,7 @@ const Login = () => {
 				setStep(1);
 			}
 		} else if (step === 1) {
-			const { error } = credentials.validate(form, { abortEarly: false });
+			const { error } = loginCredentials.validate(form, { abortEarly: false });
 
 			if (error) {
 				// validation errors
diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
index fd3f20cd9..49997e8cb 100644
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ b/client/src/Pages/Auth/Register/Register.jsx
@@ -8,7 +8,7 @@ import { StepOne } from "./StepOne";
 import { StepTwo } from "./StepTwo";
 import { StepThree } from "./StepThree";
 import { networkService } from "../../../main";
-import { credentials } from "../../../Validation/validation";
+import { newOrChangedCredentials } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
 import { register } from "../../../Features/Auth/authSlice";
 import Background from "../../../assets/Images/background-grid.svg?react";
@@ -171,7 +171,7 @@ const Register = ({ isSuperAdmin }) => {
 	 * @returns {Object | undefined} - Returns the validation error object if there are validation errors; otherwise, `undefined`.
 	 */
 	const validateForm = (data, options = {}) => {
-		const { error } = credentials.validate(data, {
+		const { error } = newOrChangedCredentials.validate(data, {
 			abortEarly: false,
 			...options,
 		});
@@ -271,7 +271,7 @@ const Register = ({ isSuperAdmin }) => {
 			[name]: lowerCasedValue,
 		}));
 
-		const { error } = credentials.validate(
+		const { error } = newOrChangedCredentials.validate(
 			{ [name]: lowerCasedValue },
 			{ abortEarly: false, context: { password: form.password } }
 		);
diff --git a/client/src/Pages/Auth/SetNewPassword.jsx b/client/src/Pages/Auth/SetNewPassword.jsx
index 2d0aa01bc..21dfe2d39 100644
--- a/client/src/Pages/Auth/SetNewPassword.jsx
+++ b/client/src/Pages/Auth/SetNewPassword.jsx
@@ -6,7 +6,7 @@ import { useTheme } from "@emotion/react";
 import { Box, Stack, Typography, Button } from "@mui/material";
 import { setNewPassword } from "../../Features/Auth/authSlice";
 import { createToast } from "../../Utils/toastUtils";
-import { credentials } from "../../Validation/validation";
+import { newOrChangedCredentials } from "../../Validation/validation";
 import Check from "../../Components/Check/Check";
 import TextInput from "../../Components/Inputs/TextInput";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
@@ -34,7 +34,7 @@ const SetNewPassword = () => {
 
 	const handleSubmit = async (e) => {
 		e.preventDefault();
-		const { error } = credentials.validate(form, {
+		const { error } = newOrChangedCredentials.validate(form, {
 			abortEarly: false,
 			context: { password: form.password },
 		});
diff --git a/client/src/Pages/Auth/hooks/useValidatePassword.jsx b/client/src/Pages/Auth/hooks/useValidatePassword.jsx
index b49d0944b..102d8d73e 100644
--- a/client/src/Pages/Auth/hooks/useValidatePassword.jsx
+++ b/client/src/Pages/Auth/hooks/useValidatePassword.jsx
@@ -1,5 +1,5 @@
 import { useMemo, useState } from "react";
-import { credentials } from "../../../Validation/validation";
+import { newOrChangedCredentials } from "../../../Validation/validation";
 
 const getFeedbackStatus = (form, errors, field, criteria) => {
 	const fieldErrors = errors[field];
@@ -36,7 +36,7 @@ function useValidatePassword() {
 			validateValue.password = form.password;
 		}
 
-		const { error } = credentials.validate(validateValue, validateOptions);
+		const { error } = newOrChangedCredentials.validate(validateValue, validateOptions);
 		const errors = error?.details.map((error) => ({
 			path: error.path[0],
 			type: error.type,
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index b79d4c824..acb05116e 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -27,7 +27,7 @@ const lastnameSchema = joi
 			"Surname must contain only letters, spaces, apostrophes, or hyphens",
 	});
 
-const passwordSchema = joi
+const newPasswordSchema = joi
 	.string()
 	.trim()
 	.min(8)
@@ -64,7 +64,7 @@ const passwordSchema = joi
 		special: "Password must contain at least one special character",
 	});
 
-const credentials = joi.object({
+const newOrChangedCredentials = joi.object({
 	firstName: nameSchema,
 	lastName: lastnameSchema,
 	email: joi
@@ -76,8 +76,8 @@ const credentials = joi.object({
 			"string.empty": "authRegisterEmailRequired",
 			"string.email": "authRegisterEmailInvalid",
 		}),
-	password: passwordSchema,
-	newPassword: passwordSchema,
+	password: newPasswordSchema,
+	newPassword: newPasswordSchema,
 	confirm: joi
 		.string()
 		.trim()
@@ -97,6 +97,23 @@ const credentials = joi.object({
 	inviteToken: joi.string().allow(""),
 });
 
+const loginCredentials = joi.object({
+	email: joi
+		.string()
+		.trim()
+		.email({ tlds: { allow: false } })
+		.lowercase()
+		.messages({
+			"string.empty": "authRegisterEmailRequired",
+			"string.email": "authRegisterEmailInvalid",
+		}),
+	password: joi
+		.string()
+		.messages({
+			"string.empty": "Please enter your password",
+		}),
+});
+
 const monitorValidation = joi.object({
 	url: joi.when("type", {
 		is: "docker",
@@ -391,7 +408,8 @@ const infrastructureMonitorValidation = joi.object({
 });
 
 export {
-	credentials,
+	newOrChangedCredentials,
+	loginCredentials,
 	imageValidation,
 	monitorValidation,
 	settingsValidation,
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 3efd202b5..9a3c61a7c 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -26,14 +26,10 @@ const loginValidation = joi.object({
 		.string()
 		.email()
 		.required()
-		.custom((value, helpers) => {
-			const lowercasedValue = value.toLowerCase();
-			if (value !== lowercasedValue) {
-				return helpers.message("Email must be in lowercase");
-			}
-			return lowercasedValue;
-		}),
-	password: joi.string().min(8).required().pattern(passwordPattern),
+		.lowercase(),
+	password: joi
+		.string()
+		.required(),
 });
 const nameValidation = joi
 	.string()

From 00f3941ca62d765fca00e79e08b2f7a0bfbb1b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sun, 8 Jun 2025 04:28:41 +0200
Subject: [PATCH 077/319] i18n: Refactor, fix and clean up auth forms

---
 .../TabPanels/Account/ProfilePanel.jsx        |   2 +-
 client/src/Pages/Auth/CheckEmail.jsx          |  96 ++++----
 client/src/Pages/Auth/ForgotPassword.jsx      |  50 +++--
 .../Pages/Auth/Login/Components/EmailStep.jsx |  12 +-
 .../Login/Components/ForgotPasswordLabel.jsx  |  26 ++-
 .../Auth/Login/Components/PasswordStep.jsx    |  12 +-
 client/src/Pages/Auth/Login/Login.jsx         |  54 ++---
 .../src/Pages/Auth/NewPasswordConfirmed.jsx   |  34 +--
 client/src/Pages/Auth/Register/Register.jsx   |  52 +++--
 .../src/Pages/Auth/Register/StepOne/index.jsx |  28 ++-
 .../Pages/Auth/Register/StepThree/index.jsx   |  52 +++--
 .../src/Pages/Auth/Register/StepTwo/index.jsx |  29 ++-
 client/src/Pages/Auth/SetNewPassword.jsx      |  80 ++++---
 client/src/Validation/validation.js           |  40 ++--
 client/src/locales/cs.json                    | 204 +++++++++++++----
 client/src/locales/de.json                    | 205 ++++++++++++++----
 client/src/locales/en.json                    | 205 ++++++++++++++----
 client/src/locales/es.json                    | 205 ++++++++++++++----
 client/src/locales/fi.json                    | 205 ++++++++++++++----
 client/src/locales/fr.json                    | 205 ++++++++++++++----
 client/src/locales/pt-BR.json                 | 205 ++++++++++++++----
 client/src/locales/ru.json                    | 205 ++++++++++++++----
 client/src/locales/tr.json                    | 205 ++++++++++++++----
 client/src/locales/zh-TW.json                 | 205 ++++++++++++++----
 24 files changed, 1899 insertions(+), 717 deletions(-)

diff --git a/client/src/Components/TabPanels/Account/ProfilePanel.jsx b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
index 46a2bdb79..ad6d15b98 100644
--- a/client/src/Components/TabPanels/Account/ProfilePanel.jsx
+++ b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
@@ -240,7 +240,7 @@ const ProfilePanel = () => {
 					gap={SPACING_GAP}
 				>
 					<Stack flex={0.9}>
-						<Typography component="h1">{t("email")}</Typography>
+						<Typography component="h1">{t("auth.common.inputs.email.label")}</Typography>
 						<Typography
 							component="p"
 							sx={{ opacity: 0.6 }}
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 5ee6edb74..d85fa0c2f 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -5,7 +5,7 @@ import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router";
 import { createToast } from "../../Utils/toastUtils";
 import { forgotPassword } from "../../Features/Auth/authSlice";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import Background from "../../assets/Images/background-grid.svg?react";
 import EmailIcon from "../../assets/icons/email.svg?react";
 import Logo from "../../assets/icons/checkmate-icon.svg?react";
@@ -31,16 +31,16 @@ const CheckEmail = () => {
 
 	const toastFail = [
 		{
-			body: "Email not found.",
+			body: t("auth.forgotPassword.toasts.emailNotFound"),
 		},
 		{
-			body: "Redirecting in 3...",
+			body: t("auth.forgotPassword.toasts.redirect").replace("<seconds/>", "3"),
 		},
 		{
-			body: "Redirecting in 2...",
+			body: t("auth.forgotPassword.toasts.redirect").replace("<seconds/>", "2"),
 		},
 		{
-			body: "Redirecting in 1...",
+			body: t("auth.forgotPassword.toasts.redirect").replace("<seconds/>", "1"),
 		},
 	];
 
@@ -62,19 +62,19 @@ const CheckEmail = () => {
 			const action = await dispatch(forgotPassword(form));
 			if (action.payload.success) {
 				createToast({
-					body: `Instructions sent to ${form.email}.`,
+					body: t("auth.forgotPassword.toasts.sent").replace("<email/>", form.email),
 				});
 				setDisabled(false);
 			} else {
 				if (action.payload) {
 					// dispatch errors
 					createToast({
-						body: action.payload.msg,
+						body: action.payload.msg, // FIXME: Potential untranslated string
 					});
 				} else {
 					// unknown errors
 					createToast({
-						body: "Unknown error.",
+						body: t("common.toasts.unknownError"),
 					});
 				}
 			}
@@ -160,18 +160,24 @@ const CheckEmail = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<EmailIcon alt="email icon" />
+								<EmailIcon alt={t("auth.forgotPassword.imageAlts.email")} />
 							</IconBox>
 						</Stack>
-						<Typography component="h1">{t("authCheckEmailTitle")}</Typography>
+						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
 						<Typography>
-							{t("authCheckEmailDescription")}{" "}
-							<Typography
-								className="email-sent-to"
-								component="span"
-							>
-								{email || "username@email.com"}
-							</Typography>
+							<Trans
+								i18nKey="auth.forgotPassword.subheadings.stepTwo"
+								components={{
+									email: (
+										<Typography
+											className="email-sent-to"
+											component="span"
+										>
+											{email || "username@email.com"}
+										</Typography>
+									),
+								}}
+							/>
 						</Typography>
 					</Box>
 					<Button
@@ -183,23 +189,27 @@ const CheckEmail = () => {
 							maxWidth: 400,
 						}}
 					>
-						{t("authCheckEmailOpenEmailButton")}
+						{t("auth.forgotPassword.buttons.openEmail")}
 					</Button>
 					<Typography sx={{ alignSelf: "center", mt: theme.spacing(6) }}>
-						{t("authCheckEmailDidntReceiveEmail")}{" "}
-						<Typography
-							component="span"
-							onClick={resendToken}
-							sx={{
-								color: theme.palette.accent.main,
-								userSelect: "none",
-								pointerEvents: disabled ? "none" : "auto",
-								cursor: disabled ? "default" : "pointer",
-								opacity: disabled ? 0.5 : 1,
+						<Trans
+							i18nKey="auth.forgotPassword.links.resend"
+							components={{
+								a: (
+									<Typography
+										component="span"
+										onClick={resendToken}
+										sx={{
+											color: theme.palette.accent.main,
+											userSelect: "none",
+											pointerEvents: disabled ? "none" : "auto",
+											cursor: disabled ? "default" : "pointer",
+											opacity: disabled ? 0.5 : 1,
+										}}
+									/>
+								),
 							}}
-						>
-							{t("authCheckEmailClickToResend")}
-						</Typography>
+						/>
 					</Typography>
 				</Stack>
 			</Stack>
@@ -207,15 +217,21 @@ const CheckEmail = () => {
 				textAlign="center"
 				p={theme.spacing(12)}
 			>
-				<Typography display="inline-block">{t("goBackTo")}</Typography>
-				<Typography
-					component="span"
-					ml={theme.spacing(2)}
-					color={theme.palette.accent.main}
-					onClick={handleNavigate}
-					sx={{ userSelect: "none" }}
-				>
-					{t("authLoginTitle")}
+				<Typography display="inline-block">
+					<Trans
+						i18nKey="auth.forgotPassword.links.login"
+						components={{
+							a: (
+								<Typography
+									component="span"
+									color={theme.palette.accent.main}
+									ml={theme.spacing(2)}
+									onClick={handleNavigate}
+									sx={{ userSelect: "none" }}
+								/>
+							),
+						}}
+					/>
 				</Typography>
 			</Box>
 		</Stack>
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 47b8fc3bf..3ab6913dd 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -11,7 +11,7 @@ import Logo from "../../assets/icons/checkmate-icon.svg?react";
 import Key from "../../assets/icons/key.svg?react";
 import Background from "../../assets/Images/background-grid.svg?react";
 import IconBox from "../../Components/IconBox";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import "./index.css";
 
 const ForgotPassword = () => {
@@ -41,8 +41,8 @@ const ForgotPassword = () => {
 			// validation errors
 			const err =
 				error.details && error.details.length > 0
-					? error.details[0].message
-					: "Error validating data.";
+					? error.details[0].message // FIXME: Possibly untranslated string
+					: t("auth.common.errors.validation");
 			setErrors({ email: err });
 			createToast({
 				body: err,
@@ -53,18 +53,18 @@ const ForgotPassword = () => {
 				sessionStorage.setItem("email", form.email);
 				navigate("/check-email");
 				createToast({
-					body: `Instructions sent to ${form.email}.`,
+					body: t("auth.forgotPassword.toasts.sent").replace("<email/>", form.email),
 				});
 			} else {
 				if (action.payload) {
 					// dispatch errors
 					createToast({
-						body: action.payload.msg,
+						body: action.payload.msg, // FIXME: Potentially untranslated string
 					});
 				} else {
 					// unknown errors
 					createToast({
-						body: "Unknown error.",
+						body: t("common.toasts.unknownError"),
 					});
 				}
 			}
@@ -162,11 +162,11 @@ const ForgotPassword = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<Key alt="password key icon" />
+								<Key alt={t("auth.forgotPassword.imageAlts.passwordKey")} />
 							</IconBox>
 						</Stack>
-						<Typography component="h1">{t("authForgotPasswordTitle")}</Typography>
-						<Typography>{t("authForgotPasswordInstructions")}</Typography>
+						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
+						<Typography>{t("auth.forgotPassword.subheadings.stepOne")}</Typography>
 					</Box>
 					<Box
 						component="form"
@@ -179,13 +179,13 @@ const ForgotPassword = () => {
 						<TextInput
 							type="email"
 							id="forgot-password-email-input"
-							label={t("email")}
+							label={t("auth.common.inputs.email.label")}
 							isRequired={true}
-							placeholder={t("enterEmail")}
+							placeholder={t("auth.common.inputs.email.placeholder")}
 							value={form.email}
 							onChange={handleChange}
 							error={errors.email ? true : false}
-							helperText={t(errors.email)}
+							helperText={t(errors.email)} // Localization keys are in validation.js
 						/>
 						<Button
 							variant="contained"
@@ -198,7 +198,7 @@ const ForgotPassword = () => {
 								mt: theme.spacing(15),
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Box>
 				</Stack>
@@ -207,15 +207,21 @@ const ForgotPassword = () => {
 				textAlign="center"
 				p={theme.spacing(12)}
 			>
-				<Typography display="inline-block">{t("goBackTo")}</Typography>
-				<Typography
-					component="span"
-					color={theme.palette.accent.main}
-					ml={theme.spacing(2)}
-					onClick={handleNavigate}
-					sx={{ userSelect: "none" }}
-				>
-					{t("authLoginTitle")}
+				<Typography display="inline-block">
+					<Trans
+						i18nKey="auth.forgotPassword.links.login"
+						components={{
+							a: (
+								<Typography
+									component="span"
+									color={theme.palette.accent.main}
+									ml={theme.spacing(2)}
+									onClick={handleNavigate}
+									sx={{ userSelect: "none" }}
+								/>
+							),
+						}}
+					/>
 				</Typography>
 			</Box>
 		</Stack>
diff --git a/client/src/Pages/Auth/Login/Components/EmailStep.jsx b/client/src/Pages/Auth/Login/Components/EmailStep.jsx
index 20e8d6bfb..f3f56ec26 100644
--- a/client/src/Pages/Auth/Login/Components/EmailStep.jsx
+++ b/client/src/Pages/Auth/Login/Components/EmailStep.jsx
@@ -35,8 +35,8 @@ const EmailStep = ({ form, errors, onSubmit, onChange }) => {
 				position="relative"
 			>
 				<Box>
-					<Typography component="h1">{t("authLoginTitle")}</Typography>
-					<Typography>{t("authLoginEnterEmail")}</Typography>
+					<Typography component="h1">{t("auth.login.heading")}</Typography>
+					<Typography>{t("auth.login.subheadings.stepOne")}</Typography>
 				</Box>
 				<Box
 					textAlign="left"
@@ -50,14 +50,14 @@ const EmailStep = ({ form, errors, onSubmit, onChange }) => {
 					<TextInput
 						type="email"
 						id="login-email-input"
-						label={t("email")}
+						label={t("auth.common.inputs.email.label")}
 						isRequired={true}
-						placeholder="jordan.ellis@domain.com"
+						placeholder={t("auth.common.inputs.email.placeholder")}
 						autoComplete="email"
 						value={form.email}
 						onChange={onChange}
 						error={errors.email ? true : false}
-						helperText={errors.email ? t(errors.email) : ""}
+						helperText={errors.email ? t(errors.email) : ""} // Localization keys are in validation.js
 						ref={inputRef}
 					/>
 					<Stack
@@ -87,7 +87,7 @@ const EmailStep = ({ form, errors, onSubmit, onChange }) => {
 								},
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Stack>
 				</Box>
diff --git a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx b/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
index a9cb17d7c..5fc2430c7 100644
--- a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
+++ b/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
@@ -1,7 +1,7 @@
 import { Box, Typography, useTheme } from "@mui/material";
 import PropTypes from "prop-types";
 import { useNavigate } from "react-router";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 
 const ForgotPasswordLabel = ({ email, errorEmail }) => {
 	const theme = useTheme();
@@ -22,16 +22,20 @@ const ForgotPasswordLabel = ({ email, errorEmail }) => {
 				display="inline-block"
 				color={theme.palette.primary.main}
 			>
-				{t("authForgotPasswordTitle")}
-			</Typography>
-			<Typography
-				component="span"
-				color={theme.palette.accent.main}
-				ml={theme.spacing(2)}
-				sx={{ userSelect: "none" }}
-				onClick={handleNavigate}
-			>
-				{t("authForgotPasswordResetPassword")}
+				<Trans
+					i18nKey="auth.login.links.forgotPassword"
+					components={{
+						a: (
+							<Typography
+								component="span"
+								color={theme.palette.accent.main}
+								ml={theme.spacing(2)}
+								sx={{ userSelect: "none" }}
+								onClick={handleNavigate}
+							/>
+						),
+					}}
+				/>
 			</Typography>
 		</Box>
 	);
diff --git a/client/src/Pages/Auth/Login/Components/PasswordStep.jsx b/client/src/Pages/Auth/Login/Components/PasswordStep.jsx
index 1fbdf93f0..5aa56fbb0 100644
--- a/client/src/Pages/Auth/Login/Components/PasswordStep.jsx
+++ b/client/src/Pages/Auth/Login/Components/PasswordStep.jsx
@@ -38,8 +38,8 @@ const PasswordStep = ({ form, errors, onSubmit, onChange, onBack }) => {
 				textAlign="center"
 			>
 				<Box>
-					<Typography component="h1">{t("authLoginTitle")}</Typography>
-					<Typography>{t("authLoginEnterPassword")}</Typography>
+					<Typography component="h1">{t("auth.login.heading")}</Typography>
+					<Typography>{t("auth.login.subheadings.stepTwo")}</Typography>
 				</Box>
 				<Box
 					component="form"
@@ -56,14 +56,14 @@ const PasswordStep = ({ form, errors, onSubmit, onChange, onBack }) => {
 					<TextInput
 						type="password"
 						id="login-password-input"
-						label={t("password")}
+						label={t("auth.common.inputs.password.label")}
 						isRequired={true}
 						placeholder="••••••••••"
 						autoComplete="current-password"
 						value={form.password}
 						onChange={onChange}
 						error={errors.password ? true : false}
-						helperText={errors.password}
+						helperText={errors.password ? t(errors.password) : ""} // Localization keys are in validation.js
 						ref={inputRef}
 						endAdornment={<PasswordEndAdornment />}
 					/>
@@ -95,7 +95,7 @@ const PasswordStep = ({ form, errors, onSubmit, onChange, onBack }) => {
 							}}
 						>
 							<ArrowBackRoundedIcon />
-							{t("commonBack")}{" "}
+							{t("auth.common.navigation.back")}{" "}
 						</Button>
 						<Button
 							variant="contained"
@@ -121,7 +121,7 @@ const PasswordStep = ({ form, errors, onSubmit, onChange, onBack }) => {
 								boxShadow: `none`,
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Stack>
 				</Box>
diff --git a/client/src/Pages/Auth/Login/Login.jsx b/client/src/Pages/Auth/Login/Login.jsx
index f3b2253d2..d2be3af35 100644
--- a/client/src/Pages/Auth/Login/Login.jsx
+++ b/client/src/Pages/Auth/Login/Login.jsx
@@ -15,7 +15,7 @@ import PasswordStep from "./Components/PasswordStep";
 import ThemeSwitch from "../../../Components/ThemeSwitch";
 import ForgotPasswordLabel from "./Components/ForgotPasswordLabel";
 import LanguageSelector from "../../../Components/LanguageSelector";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 
 const DEMO = import.meta.env.VITE_APP_DEMO;
 
@@ -83,8 +83,8 @@ const Login = () => {
 			if (error) {
 				const errorMessage = error.details[0].message;
 				const translatedMessage = errorMessage.startsWith("auth")
-					? t(errorMessage)
-					: errorMessage;
+					? t(errorMessage) // Localization keys are in validation.js
+					: errorMessage; // FIXME: Potential untranslated string
 				setErrors((prev) => ({ ...prev, email: translatedMessage }));
 				createToast({ body: translatedMessage });
 			} else {
@@ -104,31 +104,31 @@ const Login = () => {
 					body:
 						error.details && error.details.length > 0
 							? error.details[0].message.startsWith("auth")
-								? t(error.details[0].message)
-								: error.details[0].message
-							: t("Error validating data."),
+								? t(error.details[0].message) // Localization keys are in validation.js
+								: error.details[0].message // FIXME: Potential untranslated string
+							: t("auth.common.errors.validation"),
 				});
 			} else {
 				const action = await dispatch(login(form));
 				if (action.payload.success) {
 					navigate("/uptime");
 					createToast({
-						body: t("welcomeBack"),
+						body: t("auth.login.toasts.success"),
 					});
 				} else {
 					if (action.payload) {
 						if (action.payload.msg === "Incorrect password")
 							setErrors({
-								password: "The password you provided does not match our records",
+								password: t("auth.common.fields.password.errors.incorrect"),
 							});
 						// dispatch errors
 						createToast({
-							body: action.payload.msg,
+							body: t("auth.login.toasts.incorrectPassword"),
 						});
 					} else {
 						// unknown errors
 						createToast({
-							body: "Unknown error.",
+							body: t("common.toasts.unknownError"),
 						});
 					}
 				}
@@ -237,21 +237,25 @@ const Login = () => {
 						display="inline-block"
 						color={theme.palette.primary.main}
 					>
-						{t("doNotHaveAccount")}
-					</Typography>
-					<Typography
-						component="span"
-						color={theme.palette.accent.main}
-						ml={theme.spacing(2)}
-						sx={{
-							cursor: "pointer",
-							"&:hover": {
-								color: theme.palette.accent.darker,
-							},
-						}}
-						onClick={() => navigate("/register")}
-					>
-						{t("registerHere")}
+						<Trans
+							i18nKey="auth.login.links.register"
+							components={{
+								a: (
+									<Typography
+										component="span"
+										color={theme.palette.accent.main}
+										ml={theme.spacing(2)}
+										sx={{
+											cursor: "pointer",
+											"&:hover": {
+												color: theme.palette.accent.darker,
+											},
+										}}
+										onClick={() => navigate("/register")}
+									/>
+								),
+							}}
+						/>
 					</Typography>
 				</Box>
 			</Stack>
diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index f1980e23b..aba1fefea 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -8,7 +8,7 @@ import Background from "../../assets/Images/background-grid.svg?react";
 import ConfirmIcon from "../../assets/icons/check-outlined.svg?react";
 import Logo from "../../assets/icons/checkmate-icon.svg?react";
 import IconBox from "../../Components/IconBox";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import "./index.css";
 
 const NewPasswordConfirmed = () => {
@@ -96,11 +96,11 @@ const NewPasswordConfirmed = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<ConfirmIcon alt="password confirm icon" />
+								<ConfirmIcon alt={t("auth.forgotPassword.imageAlts.passwordConfirm")} />
 							</IconBox>
 						</Stack>
-						<Typography component="h1">{t("passwordreset")}</Typography>
-						<Typography mb={theme.spacing(2)}>{t("authNewPasswordConfirmed")}</Typography>
+						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
+						<Typography mb={theme.spacing(2)}>{t("auth.forgotPassword.subheadings.stepFour")}</Typography>
 					</Box>
 					<Button
 						variant="contained"
@@ -110,7 +110,7 @@ const NewPasswordConfirmed = () => {
 							maxWidth: 400,
 						}}
 					>
-						{t("continue")}
+						{t("auth.common.navigation.continue")}
 					</Button>
 				</Stack>
 			</Stack>
@@ -118,15 +118,21 @@ const NewPasswordConfirmed = () => {
 				textAlign="center"
 				p={theme.spacing(12)}
 			>
-				<Typography display="inline-block">{t("goBackTo")}</Typography>
-				<Typography
-					component="span"
-					color={theme.palette.accent.main}
-					ml={theme.spacing(2)}
-					onClick={handleNavigate}
-					sx={{ userSelect: "none" }}
-				>
-					{t("authLoginTitle")}
+				<Typography display="inline-block">
+					<Trans
+						i18nKey="auth.forgotPassword.links.login"
+						components={{
+							a: (
+								<Typography
+									component="span"
+									color={theme.palette.accent.main}
+									ml={theme.spacing(2)}
+									onClick={handleNavigate}
+									sx={{ userSelect: "none" }}
+								/>
+							),
+						}}
+					/>
 				</Typography>
 			</Box>
 		</Stack>
diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
index 49997e8cb..390aa6e36 100644
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ b/client/src/Pages/Auth/Register/Register.jsx
@@ -35,11 +35,15 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => {
 				textAlign="center"
 			>
 				<Box>
-					<Typography component="h1">{t("signUp")}</Typography>
+					<Typography component="h1">
+						{isSuperAdmin
+							? t("auth.registration.heading.superAdmin")
+							: t("auth.registration.heading.user")}
+					</Typography>
 					<Typography>
 						{isSuperAdmin
-							? t("authRegisterCreateSuperAdminAccount")
-							: t("authRegisterCreateAccount")}
+							? t("auth.registration.description.superAdmin")
+							: t("auth.registration.description.user")}
 					</Typography>
 				</Box>
 				<Box width="100%">
@@ -62,13 +66,15 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => {
 						}}
 					>
 						<Mail />
-						{t("authRegisterSignUpWithEmail")}
+						{isSuperAdmin
+							? t("auth.registration.gettingStartedButton.superAdmin")
+							: t("auth.registration.gettingStartedButton.user")}
 					</Button>
 				</Box>
 				<Box maxWidth={400}>
 					<Typography className="tos-p">
 						<Trans
-							i18nKey="authRegisterBySigningUp"
+							i18nKey="auth.registration.termsAndPolicies"
 							components={{
 								a1: (
 									<Typography
@@ -189,7 +195,8 @@ const Register = ({ isSuperAdmin }) => {
 			newErrors[err.path[0]] = err.message;
 		});
 		setErrors(newErrors);
-		createToast({ body: error.details[0].message || "Error validating data." });
+		// Localization keys are in validation.js
+		createToast({ body: t(error.details[0].message || "auth.common.errors.validation") });
 	};
 
 	const handleStepOne = async (e) => {
@@ -246,7 +253,7 @@ const Register = ({ isSuperAdmin }) => {
 			const authToken = action.payload.data;
 			navigate("/uptime");
 			createToast({
-				body: "Welcome! Your account was created successfully.",
+				body: t("auth.registration.toasts.success"),
 			});
 		} else {
 			if (action.payload) {
@@ -255,7 +262,7 @@ const Register = ({ isSuperAdmin }) => {
 				});
 			} else {
 				createToast({
-					body: "Unknown error.",
+					body: t("common.toasts.unknownError"),
 				});
 			}
 		}
@@ -346,6 +353,7 @@ const Register = ({ isSuperAdmin }) => {
 					/>
 				) : step === 1 ? (
 					<StepOne
+						isSuperAdmin={isSuperAdmin}
 						form={form}
 						errors={errors}
 						onSubmit={handleStepOne}
@@ -354,6 +362,7 @@ const Register = ({ isSuperAdmin }) => {
 					/>
 				) : step === 2 ? (
 					<StepTwo
+						isSuperAdmin={isSuperAdmin}
 						form={form}
 						errors={errors}
 						onSubmit={handleStepTwo}
@@ -362,6 +371,7 @@ const Register = ({ isSuperAdmin }) => {
 					/>
 				) : step === 3 ? (
 					<StepThree
+						isSuperAdmin={isSuperAdmin}
 						/* form={form}
 						errors={errors} */
 						onSubmit={handleStepThree}
@@ -377,17 +387,21 @@ const Register = ({ isSuperAdmin }) => {
 				p={theme.spacing(12)}
 			>
 				<Typography display="inline-block">
-					{t("authRegisterAlreadyHaveAccount")}
-				</Typography>
-				<Typography
-					component="span"
-					ml={theme.spacing(2)}
-					onClick={() => {
-						navigate("/login");
-					}}
-					sx={{ userSelect: "none", color: theme.palette.accent.main }}
-				>
-					{t("authRegisterLoginLink")}
+					<Trans
+						i18nKey="auth.registration.links.login"
+						components={{
+							a: (
+								<Typography
+									component="span"
+									ml={theme.spacing(2)}
+									onClick={() => {
+										navigate("/login");
+									}}
+									sx={{ userSelect: "none", color: theme.palette.accent.main }}
+								/>
+							),
+						}}
+					/>
 				</Typography>
 			</Box>
 		</Stack>
diff --git a/client/src/Pages/Auth/Register/StepOne/index.jsx b/client/src/Pages/Auth/Register/StepOne/index.jsx
index cb66f6704..575a9132f 100644
--- a/client/src/Pages/Auth/Register/StepOne/index.jsx
+++ b/client/src/Pages/Auth/Register/StepOne/index.jsx
@@ -7,6 +7,7 @@ import TextInput from "../../../../Components/Inputs/TextInput";
 import { useTranslation } from "react-i18next";
 
 StepOne.propTypes = {
+	isSuperAdmin: PropTypes.bool,
 	form: PropTypes.object,
 	errors: PropTypes.object,
 	onSubmit: PropTypes.func,
@@ -18,6 +19,7 @@ StepOne.propTypes = {
  * Renders the first step of the sign up process.
  *
  * @param {Object} props
+ * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
  * @param {Object} props.form - Form state object.
  * @param {Object} props.errors - Object containing form validation errors.
  * @param {Function} props.onSubmit - Callback function to handle form submission.
@@ -26,7 +28,7 @@ StepOne.propTypes = {
  * @returns {JSX.Element}
  */
 
-function StepOne({ form, errors, onSubmit, onChange, onBack }) {
+function StepOne({ isSuperAdmin, form, errors, onSubmit, onChange, onBack }) {
 	const theme = useTheme();
 	const inputRef = useRef(null);
 	const { t } = useTranslation();
@@ -45,8 +47,12 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 				textAlign="center"
 			>
 				<Box>
-					<Typography component="h1">{t("signUp")}</Typography>
-					<Typography>{t("authRegisterStepOnePersonalDetails")}</Typography>
+					<Typography component="h1">
+						{isSuperAdmin
+							? t("auth.registration.heading.superAdmin")
+							: t("auth.registration.heading.user")}
+					</Typography>
+					<Typography>{t("auth.registration.subheadings.stepOne")}</Typography>
 				</Box>
 
 				<Box
@@ -64,26 +70,26 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 					>
 						<TextInput
 							id="register-firstname-input"
-							label={t("authRegisterFirstName")}
+							label={t("auth.common.inputs.firstName.label")}
 							isRequired={true}
-							placeholder="Jordan"
+							placeholder={t("auth.common.inputs.firstName.placeholder")}
 							autoComplete="given-name"
 							value={form.firstName}
 							onChange={onChange}
 							error={errors.firstName ? true : false}
-							helperText={errors.firstName}
+							helperText={t(errors.firstName)} // Localization keys are in validation.js
 							ref={inputRef}
 						/>
 						<TextInput
 							id="register-lastname-input"
-							label={t("authRegisterLastName")}
+							label={t("auth.common.inputs.lastName.label")}
 							isRequired={true}
-							placeholder="Ellis"
+							placeholder={t("auth.common.inputs.lastName.placeholder")}
 							autoComplete="family-name"
 							value={form.lastName}
 							onChange={onChange}
 							error={errors.lastName ? true : false}
-							helperText={errors.lastName}
+							helperText={t(errors.lastName)} // Localization keys are in validation.js
 						/>
 					</Box>
 					<Stack
@@ -108,7 +114,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 							}}
 						>
 							<ArrowBackRoundedIcon />
-							{t("commonBack")}
+							{t("auth.common.navigation.back")}
 						</Button>
 						<Button
 							variant="contained"
@@ -124,7 +130,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 								},
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Stack>
 				</Box>
diff --git a/client/src/Pages/Auth/Register/StepThree/index.jsx b/client/src/Pages/Auth/Register/StepThree/index.jsx
index 1af8a60dc..f34c7af7e 100644
--- a/client/src/Pages/Auth/Register/StepThree/index.jsx
+++ b/client/src/Pages/Auth/Register/StepThree/index.jsx
@@ -8,6 +8,7 @@ import Check from "../../../../Components/Check/Check";
 import { useValidatePassword } from "../../hooks/useValidatePassword";
 import { useTranslation } from "react-i18next";
 StepThree.propTypes = {
+	isSuperAdmin: PropTypes.bool,
 	onSubmit: PropTypes.func,
 	onBack: PropTypes.func,
 };
@@ -16,11 +17,12 @@ StepThree.propTypes = {
  * Renders the third step of the sign up process.
  *
  * @param {Object} props
+ * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
  * @param {Function} props.onSubmit - Callback function to handle form submission.
  * @param {Function} props.onBack - Callback function to handle "Back" button click.
  * @returns {JSX.Element}
  */
-function StepThree({ onSubmit, onBack }) {
+function StepThree({ isSuperAdmin, onSubmit, onBack }) {
 	const theme = useTheme();
 	const inputRef = useRef(null);
 	const { t } = useTranslation();
@@ -39,8 +41,12 @@ function StepThree({ onSubmit, onBack }) {
 				textAlign="center"
 			>
 				<Box>
-					<Typography component="h1">{t("signUp")}</Typography>
-					<Typography>{t("createPassword")}</Typography>
+					<Typography component="h1">
+						{isSuperAdmin
+							? t("auth.registration.heading.superAdmin")
+							: t("auth.registration.heading.user")}
+					</Typography>
+					<Typography>{t("auth.registration.subheadings.stepThree")}</Typography>
 				</Box>
 				<Box
 					component="form"
@@ -64,26 +70,30 @@ function StepThree({ onSubmit, onBack }) {
 							type="password"
 							id="register-password-input"
 							name="password"
-							label={t("authLoginEnterPassword")}
+							label={t("auth.common.inputs.password.label")}
 							isRequired={true}
-							placeholder={t("createAPassword")}
+							placeholder="••••••••••"
 							autoComplete="current-password"
 							value={form.password}
 							onChange={handleChange}
 							error={errors.password && errors.password[0] ? true : false}
+							helperText={errors.password === "auth.common.inputs.password.errors.empty"
+								? t(errors.password)
+								: ""} // Other errors are related to required password conditions and are visualized below the input
 							ref={inputRef}
 						/>
 						<TextInput
 							type="password"
 							id="register-confirm-input"
 							name="confirm"
-							label={t("authSetNewPasswordConfirmPassword")}
+							label={t("auth.common.inputs.passwordConfirm.label")}
 							isRequired={true}
-							placeholder={t("confirmPassword")}
+							placeholder={t("auth.common.inputs.passwordConfirm.placeholder")}
 							autoComplete="current-password"
 							value={form.confirm}
 							onChange={handleChange}
 							error={errors.confirm && errors.confirm[0] ? true : false}
+							helperText={t(errors.confirm)} // Localization keys are in validation.js
 						/>
 					</Box>
 					<Stack
@@ -91,33 +101,33 @@ function StepThree({ onSubmit, onBack }) {
 						mb={{ xs: theme.spacing(6), sm: theme.spacing(8) }}
 					>
 						<Check
-							noHighlightText={t("authPasswordMustBeAtLeast")}
-							text={t("authPasswordCharactersLong")}
+							noHighlightText={t("auth.common.inputs.password.rules.length.beginning")}
+							text={t("auth.common.inputs.password.rules.length.highlighted")}
 							variant={feedbacks.length}
 						/>
 						<Check
-							noHighlightText={t("authPasswordMustContainAtLeast")}
-							text={t("authPasswordSpecialCharacter")}
+							noHighlightText={t("auth.common.inputs.password.rules.special.beginning")}
+							text={t("auth.common.inputs.password.rules.special.highlighted")}
 							variant={feedbacks.special}
 						/>
 						<Check
-							noHighlightText={t("authPasswordMustContainAtLeast")}
-							text={t("authPasswordOneNumber")}
+							noHighlightText={t("auth.common.inputs.password.rules.number.beginning")}
+							text={t("auth.common.inputs.password.rules.number.highlighted")}
 							variant={feedbacks.number}
 						/>
 						<Check
-							noHighlightText={t("authPasswordMustContainAtLeast")}
-							text={t("authPasswordUpperCharacter")}
+							noHighlightText={t("auth.common.inputs.password.rules.uppercase.beginning")}
+							text={t("auth.common.inputs.password.rules.uppercase.highlighted")}
 							variant={feedbacks.uppercase}
 						/>
 						<Check
-							noHighlightText={t("authPasswordMustContainAtLeast")}
-							text={t("authPasswordLowerCharacter")}
+							noHighlightText={t("auth.common.inputs.password.rules.lowercase.beginning")}
+							text={t("auth.common.inputs.password.rules.lowercase.highlighted")}
 							variant={feedbacks.lowercase}
 						/>
 						<Check
-							noHighlightText={t("authPasswordConfirmAndPassword")}
-							text={t("authPasswordMustMatch")}
+							noHighlightText={t("auth.common.inputs.password.rules.match.beginning")}
+							text={t("auth.common.inputs.password.rules.match.highlighted")}
 							variant={feedbacks.confirm}
 						/>
 					</Stack>
@@ -141,7 +151,7 @@ function StepThree({ onSubmit, onBack }) {
 							}}
 						>
 							<ArrowBackRoundedIcon />
-							{t("commonBack")}
+							{t("auth.common.navigation.back")}
 						</Button>
 						<Button
 							type="submit"
@@ -161,7 +171,7 @@ function StepThree({ onSubmit, onBack }) {
 								},
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Stack>
 				</Box>
diff --git a/client/src/Pages/Auth/Register/StepTwo/index.jsx b/client/src/Pages/Auth/Register/StepTwo/index.jsx
index 4fa0e8ebc..306a2b750 100644
--- a/client/src/Pages/Auth/Register/StepTwo/index.jsx
+++ b/client/src/Pages/Auth/Register/StepTwo/index.jsx
@@ -7,6 +7,7 @@ import TextInput from "../../../../Components/Inputs/TextInput";
 import { useTranslation } from "react-i18next";
 
 StepTwo.propTypes = {
+	isSuperAdmin: PropTypes.bool,
 	form: PropTypes.object,
 	errors: PropTypes.object,
 	onSubmit: PropTypes.func,
@@ -18,6 +19,7 @@ StepTwo.propTypes = {
  * Renders the second step of the sign up process.
  *
  * @param {Object} props
+ * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
  * @param {Object} props.form - Form state object.
  * @param {Object} props.errors - Object containing form validation errors.
  * @param {Function} props.onSubmit - Callback function to handle form submission.
@@ -25,7 +27,7 @@ StepTwo.propTypes = {
  * @param {Function} props.onBack - Callback function to handle "Back" button click.
  * @returns {JSX.Element}
  */
-function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
+function StepTwo({ isSuperAdmin, form, errors, onSubmit, onChange, onBack }) {
 	const theme = useTheme();
 	const inputRef = useRef(null);
 	const { t } = useTranslation();
@@ -43,8 +45,12 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 				textAlign="center"
 			>
 				<Box>
-					<Typography component="h1">{t("signUp")}</Typography>
-					<Typography>{t("enterEmail")}</Typography>
+					<Typography component="h1">
+						{isSuperAdmin
+							? t("auth.registration.heading.superAdmin")
+							: t("auth.registration.heading.user")}
+					</Typography>
+					<Typography>{t("auth.registration.subheadings.stepTwo")}</Typography>
 				</Box>
 
 				<Box
@@ -60,22 +66,15 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 					<TextInput
 						type="email"
 						id="register-email-input"
-						label={t("authRegisterEmail")}
+						label={t("auth.common.inputs.email.label")}
 						isRequired={true}
-						placeholder="jordan.ellis@domain.com"
+						placeholder={t("auth.common.inputs.email.placeholder")}
 						autoComplete="email"
 						value={form.email}
 						onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
 						onChange={onChange}
 						error={errors.email ? true : false}
-						helperText={
-							errors.email &&
-							(errors.email.includes("required")
-								? t("authRegisterEmailRequired")
-								: errors.email.includes("valid email")
-									? t("authRegisterEmailInvalid")
-									: t(errors.email))
-						}
+						helperText={t(errors.email)} // Localization keys are in validation.js
 						ref={inputRef}
 					/>
 					<Stack
@@ -98,7 +97,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 							}}
 						>
 							<ArrowBackRoundedIcon />
-							{t("commonBack")}
+							{t("auth.common.navigation.back")}
 						</Button>
 						<Button
 							variant="contained"
@@ -114,7 +113,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 								},
 							}}
 						>
-							{t("continue")}
+							{t("auth.common.navigation.continue")}
 						</Button>
 					</Stack>
 				</Box>
diff --git a/client/src/Pages/Auth/SetNewPassword.jsx b/client/src/Pages/Auth/SetNewPassword.jsx
index 21dfe2d39..c2cd64b23 100644
--- a/client/src/Pages/Auth/SetNewPassword.jsx
+++ b/client/src/Pages/Auth/SetNewPassword.jsx
@@ -16,7 +16,7 @@ import Logo from "../../assets/icons/checkmate-icon.svg?react";
 import Background from "../../assets/Images/background-grid.svg?react";
 import "./index.css";
 import { useValidatePassword } from "./hooks/useValidatePassword";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 
 const SetNewPassword = () => {
 	const navigate = useNavigate();
@@ -43,20 +43,20 @@ const SetNewPassword = () => {
 			createToast({
 				body:
 					error.details && error.details.length > 0
-						? error.details[0].message
-						: "Error validating data.",
+						? error.details[0].message // FIXME: Potential untranslated string
+						: t("auth.common.errors.validation"),
 			});
 		} else {
 			const action = await dispatch(setNewPassword({ token, form }));
 			if (action.payload.success) {
 				navigate("/new-password-confirmed");
 				createToast({
-					body: "Your password was reset successfully.",
+					body: t("auth.forgotPassword.toasts.success"),
 				});
 			} else {
 				const errorMessage = action.payload
-					? action.payload.msg
-					: "Unable to reset password. Please try again later or contact support.";
+					? action.payload.msg // FIXME: Potential untranslated string
+					: t("auth.forgotPassword.toasts.error");
 				createToast({
 					body: errorMessage,
 				});
@@ -140,11 +140,11 @@ const SetNewPassword = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<LockIcon alt="lock icon" />
+								<LockIcon alt={t("auth.forgotPassword.imageAlts.lock")} />
 							</IconBox>
 						</Stack>
-						<Typography component="h1">{t("authSetNewPasswordTitle")}</Typography>
-						<Typography>{t("authSetNewPasswordDescription")}</Typography>
+						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
+						<Typography>{t("auth.forgotPassword.subheadings.stepThree")}</Typography>
 					</Box>
 					<Box
 						width="100%"
@@ -165,13 +165,15 @@ const SetNewPassword = () => {
 								id={passwordId}
 								type="password"
 								name="password"
-								label={t("commonPassword")}
+								label={t("auth.common.inputs.password.label")}
 								isRequired={true}
 								placeholder="••••••••"
 								value={form.password}
 								onChange={handleChange}
 								error={errors.password ? true : false}
-								helperText={errors.password}
+								helperText={errors.password === "auth.common.inputs.password.errors.empty"
+								? t(errors.password)
+								: ""} // Other errors are related to required password conditions and are visualized below the input
 								endAdornment={<PasswordEndAdornment />}
 							/>
 						</Box>
@@ -185,13 +187,13 @@ const SetNewPassword = () => {
 								id={confirmPasswordId}
 								type="password"
 								name="confirm"
-								label={t("authSetNewPasswordConfirmPassword")}
+								label={t("auth.common.inputs.passwordConfirm.label")}
 								isRequired={true}
-								placeholder="••••••••"
+								placeholder={t("auth.common.inputs.passwordConfirm.placeholder")}
 								value={form.confirm}
 								onChange={handleChange}
 								error={errors.confirm ? true : false}
-								helperText={errors.confirm}
+								helperText={t(errors.confirm)} // Localization keys are in validation.js
 								endAdornment={<PasswordEndAdornment />}
 							/>
 						</Box>
@@ -200,33 +202,33 @@ const SetNewPassword = () => {
 							mb={theme.spacing(12)}
 						>
 							<Check
-								noHighlightText={t("authPasswordMustBeAtLeast")}
-								text={t("authPasswordCharactersLong")}
+								noHighlightText={t("auth.common.inputs.password.rules.length.beginning")}
+								text={t("auth.common.inputs.password.rules.length.highlighted")}
 								variant={feedbacks.length}
 							/>
 							<Check
-								noHighlightText={t("authPasswordMustContainAtLeast")}
-								text={t("authPasswordSpecialCharacter")}
+								noHighlightText={t("auth.common.inputs.password.rules.special.beginning")}
+								text={t("auth.common.inputs.password.rules.special.highlighted")}
 								variant={feedbacks.special}
 							/>
 							<Check
-								noHighlightText={t("authPasswordMustContainAtLeast")}
-								text={t("authPasswordOneNumber")}
+								noHighlightText={t("auth.common.inputs.password.rules.number.beginning")}
+								text={t("auth.common.inputs.password.rules.number.highlighted")}
 								variant={feedbacks.number}
 							/>
 							<Check
-								noHighlightText={t("authPasswordMustContainAtLeast")}
-								text={t("authPasswordUpperCharacter")}
+								noHighlightText={t("auth.common.inputs.password.rules.uppercase.beginning")}
+								text={t("auth.common.inputs.password.rules.uppercase.highlighted")}
 								variant={feedbacks.uppercase}
 							/>
 							<Check
-								noHighlightText={t("authPasswordMustContainAtLeast")}
-								text={t("authPasswordLowerCharacter")}
+								noHighlightText={t("auth.common.inputs.password.rules.lowercase.beginning")}
+								text={t("auth.common.inputs.password.rules.lowercase.highlighted")}
 								variant={feedbacks.lowercase}
 							/>
 							<Check
-								noHighlightText={t("authPasswordConfirmAndPassword")}
-								text={t("authPasswordMustMatch")}
+								noHighlightText={t("auth.common.inputs.password.rules.match.beginning")}
+								text={t("auth.common.inputs.password.rules.match.highlighted")}
 								variant={feedbacks.confirm}
 							/>
 						</Stack>
@@ -243,7 +245,7 @@ const SetNewPassword = () => {
 						}
 						sx={{ width: "100%", maxWidth: 400 }}
 					>
-						{t("authSetNewPasswordResetPassword")}
+						{t("auth.forgotPassword.buttons.resetPassword")}
 					</Button>
 				</Stack>
 			</Stack>
@@ -251,15 +253,21 @@ const SetNewPassword = () => {
 				textAlign="center"
 				p={theme.spacing(12)}
 			>
-				<Typography display="inline-block">{t("goBackTo")} —</Typography>
-				<Typography
-					component="span"
-					color={theme.palette.primary.main}
-					ml={theme.spacing(2)}
-					onClick={() => navigate("/login")}
-					sx={{ userSelect: "none" }}
-				>
-					{t("authLoginTitle")}
+				<Typography display="inline-block">
+					<Trans
+						i18nKey="auth.forgotPassword.links.login"
+						components={{
+							a: (
+								<Typography
+									component="span"
+									color={theme.palette.primary.main}
+									ml={theme.spacing(2)}
+									onClick={() => navigate("/login")}
+									sx={{ userSelect: "none" }}
+								/>
+							),
+						}}
+					/>
 				</Typography>
 			</Box>
 		</Stack>
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index acb05116e..1074f3bb2 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -9,10 +9,9 @@ const nameSchema = joi
 	.trim()
 	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
 	.messages({
-		"string.empty": "Name is required",
-		"string.max": "Name must be less than 50 characters",
-		"string.pattern.base":
-			"Name must contain only letters, spaces, apostrophes, or hyphens",
+		"string.empty": "auth.common.inputs.firstName.errors.empty",
+		"string.max": "auth.common.inputs.firstName.errors.length",
+		"string.pattern.base": "auth.common.inputs.firstName.errors.pattern",
 	});
 
 const lastnameSchema = joi
@@ -21,10 +20,9 @@ const lastnameSchema = joi
 	.trim()
 	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
 	.messages({
-		"string.empty": "Surname is required",
-		"string.max": "Surname must be less than 50 characters",
-		"string.pattern.base":
-			"Surname must contain only letters, spaces, apostrophes, or hyphens",
+		"string.empty": "auth.common.inputs.lastName.errors.empty",
+		"string.max": "auth.common.inputs.lastName.errors.length",
+		"string.pattern.base": "auth.common.inputs.lastName.errors.pattern",
 	});
 
 const newPasswordSchema = joi
@@ -56,12 +54,12 @@ const newPasswordSchema = joi
 		return value;
 	})
 	.messages({
-		"string.empty": "Password is required",
-		"string.min": "Password must be at least 8 characters long",
-		uppercase: "Password must contain at least one uppercase letter",
-		lowercase: "Password must contain at least one lowercase letter",
-		number: "Password must contain at least one number",
-		special: "Password must contain at least one special character",
+		"string.empty": "auth.common.inputs.password.errors.empty",
+		"string.min": "auth.common.inputs.password.errors.length",
+		uppercase: "auth.common.inputs.password.errors.uppercase",
+		lowercase: "auth.common.inputs.password.errors.lowercase",
+		number: "auth.common.inputs.password.errors.number",
+		special: "auth.common.inputs.password.errors.special",
 	});
 
 const newOrChangedCredentials = joi.object({
@@ -73,8 +71,8 @@ const newOrChangedCredentials = joi.object({
 		.email({ tlds: { allow: false } })
 		.lowercase()
 		.messages({
-			"string.empty": "authRegisterEmailRequired",
-			"string.email": "authRegisterEmailInvalid",
+			"string.empty": "auth.common.inputs.email.errors.empty",
+			"string.email": "auth.common.inputs.email.errors.invalid",
 		}),
 	password: newPasswordSchema,
 	newPassword: newPasswordSchema,
@@ -89,8 +87,8 @@ const newOrChangedCredentials = joi.object({
 			return value;
 		})
 		.messages({
-			"string.empty": "This field can't be empty",
-			different: "Passwords do not match",
+			"string.empty": "auth.common.inputs.passwordConfirm.errors.empty",
+			different: "auth.common.inputs.passwordConfirm.errors.different",
 		}),
 	role: joi.array(),
 	teamId: joi.string().allow("").optional(),
@@ -104,13 +102,13 @@ const loginCredentials = joi.object({
 		.email({ tlds: { allow: false } })
 		.lowercase()
 		.messages({
-			"string.empty": "authRegisterEmailRequired",
-			"string.email": "authRegisterEmailInvalid",
+			"string.empty": "auth.common.inputs.email.errors.empty",
+			"string.email": "auth.common.inputs.email.errors.invalid",
 		}),
 	password: joi
 		.string()
 		.messages({
-			"string.empty": "Please enter your password",
+			"string.empty": "auth.common.inputs.password.errors.empty",
 		}),
 });
 
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 5f2fde219..3bb64e6c9 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Chyba připojení k síti",
-			"checkConnection": "Zkontrolujte prosím své připojení k síti"
+			"checkConnection": "Zkontrolujte prosím své připojení k síti",
+			"unknownError": "Nastala neznámá chyba"
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Pokračovat",
+				"back": "Zpět"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-mail",
+					"placeholder": "jan.novak@domena.cz",
+					"errors": {
+						"empty": "Zadejte prosím e-mailovou adresu",
+						"invalid": "Překontrolujte si prosím správnost zadané e-mailové adresy"
+					}
+				},
+				"password": {
+					"label": "Heslo",
+					"rules": {
+						"length": {
+							"beginning": "Heslo musí být dlouhé alespoň",
+							"highlighted": "8 znaků"
+						},
+						"special": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 speciální znak"
+						},
+						"number": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 číslo"
+						},
+						"uppercase": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 velké písmeno"
+						},
+						"lowercase": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 malé písmeno"
+						},
+						"match": {
+							"beginning": "Obě hesla se",
+							"highlighted": "musí shodovat"
+						}
+					},
+					"errors": {
+						"empty": "Zadejte prosím heslo",
+						"length": "Heslo musí být dlouhé alespoň 8 znaků",
+						"uppercase": "Heslo musí obsahovat alespoň 1 velké písmeno",
+						"lowercase": "Heslo musí obsahovat alespoň 1 malé písmeno",
+						"number": "Heslo musí obsahovat alespoň 1 číslo",
+						"special": "Heslo musí obsahovat alespoň 1 speciální znak",
+						"incorrect": "Zadané heslo neodpovídá tomu, co bylo nastaveno"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Potvrzení hesla",
+					"placeholder": "Pro ověření správnosti zadejte heslo ještě jednou",
+					"errors": {
+						"empty": "Zadejte prosím své heslo ještě jednou, aby mohla být potvrzena jeho správnost (odhalí překlepy)",
+						"different": "Zadaná hesla se liší, takže je nejspíše jedno z nich špatně zapsané"
+					}
+				},
+				"firstName": {
+					"label": "Jméno",
+					"placeholder": "Jan",
+					"errors": {
+						"empty": "Zadejte prosím své křestní jméno",
+						"length": "Jméno se musí vejít do 50 znaků",
+						"pattern": "Součástí jména mohou být pouze písmena, mezery apostrofy nebo spojovníky"
+					}
+				},
+				"lastName": {
+					"label": "Příjmení",
+					"placeholder": "Novák",
+					"errors": {
+						"empty": "Zadejte prosím své příjmení",
+						"length": "Příjmení se musí vejít do 50 znaků",
+						"pattern": "Součástí příjmení mohou být pouze písmena, mezery apostrofy nebo spojovníky"
+					}
+				}
+			},
+			"errors": {
+				"validation": "Nastala chyba při ověřování dat."
+			}
+		},
+		"login": {
+			"heading": "Přihlášení",
+			"subheadings": {
+				"stepOne": "Zadejte svůj e-mail",
+				"stepTwo": "Zadejte své heslo"
+			},
+			"links": {
+				"forgotPassword": "Zapomněli jste heslo? <a>Obnovte si ho</a>",
+				"register": "Ještě nemáte účet? <a>Zaregistrujte se</a>"
+			},
+			"toasts": {
+				"success": "Vítejte zpět",
+				"incorrectPassword": "Nesprávné heslo"
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "Vytvoření superadministrátora",
+				"user": "Registrace"
+			},
+			"subheadings": {
+				"stepOne": "Zadejte své osobní údaje",
+				"stepTwo": "Zadejte svůj e-mail",
+				"stepThree": "Nastavte si heslo"
+			},
+			"description": {
+				"superAdmin": "Pro začátek vytvořte účet superadministrátora",
+				"user": "Zaregistrujte se jako uživatel a požádejte svého superadministrátora, aby vám přidělil oprávnění k hlídačům"
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Vytvořit účet superadministrátora",
+				"user": "Zaregistrovat se jako běžný uživatel"
+			},
+			"termsAndPolicies": "Vytvořením účtu souhlasíte s našimi <a1>Podmínkami použití</a1> (anglicky) a <a2>Podmínkami zpracování osobních údajů</a2> (anglicky).",
+			"links": {
+				"login": "Máte již vytvořený účet? <a>Přihlašte se</a>"
+			},
+			"toasts": {
+				"success": "Vítejte! Váš účet byl úspěšně vytvořen."
+			}
+		},
+		"forgotPassword": {
+			"heading": "Zapomenuté heslo",
+			"subheadings": {
+				"stepOne": "Nebojte se, zašleme vám pokyny pro obnovení hesla.",
+				"stepTwo": "Odkaz pro obnovení hesla byl odeslán na <email/>",
+				"stepThree": "Nové heslo se musí lišit od těch, které jste již použili.",
+				"stepFour": "Heslo bylo úspěšně obnoveno. Klepněte na tlačítko a dojde k čarovnému přihlášení."
+			},
+			"buttons": {
+				"openEmail": "Otevřít e-mailovou aplikaci",
+				"resetPassword": "Obnovit heslo"
+			},
+			"imageAlts": {
+				"passwordKey": "Ikonka přístupového klíče",
+				"email": "Ikonka e-mailu",
+				"lock": "Ikonka zámku",
+				"passwordConfirm": "Ikonka potvrzeného hesla"
+			},
+			"links": {
+				"login": "Vrátit se k <a>Přihlášení</a>",
+				"resend": "Nedorazil vám e-mail? <a>Klepněte pro opětovné zaslání</a>"
+			},
+			"toasts": {
+				"sent": "Instrukce vám dorazí na <email/>.",
+				"emailNotFound": "Nepodařilo se nalézt e-mailovou adresu.",
+				"redirect": "Přesměrování proběhne za <seconds/>...",
+				"success": "Heslo bylo úspěšně obnoveno.",
+				"error": "Obnova hesla se nepodařila. Zkuste to prosím znovu nebo kontaktujte podporu."
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,12 @@
 		}
 	},
 	"dontHaveAccount": "",
-	"email": "",
 	"forgotPassword": "",
-	"password": "",
-	"signUp": "",
 	"submit": "",
 	"title": "",
-	"continue": "",
 	"enterEmail": "",
-	"authLoginTitle": "",
-	"authLoginEnterPassword": "",
 	"commonPassword": "",
-	"commonBack": "",
-	"authForgotPasswordTitle": "",
-	"authForgotPasswordResetPassword": "",
 	"createPassword": "",
-	"createAPassword": "",
-	"authRegisterAlreadyHaveAccount": "",
-	"authLoginEnterEmail": "",
 	"authRegisterTitle": "",
 	"authRegisterStepOneTitle": "",
 	"authRegisterStepOneDescription": "",
@@ -50,36 +195,15 @@
 	"authRegisterStepTwoDescription": "",
 	"authRegisterStepThreeTitle": "",
 	"authRegisterStepThreeDescription": "",
-	"authForgotPasswordDescription": "",
 	"authForgotPasswordSendInstructions": "",
 	"authForgotPasswordBackTo": "",
 	"authCheckEmailTitle": "",
-	"authCheckEmailDescription": "",
 	"authCheckEmailResendEmail": "",
 	"authCheckEmailBackTo": "",
-	"goBackTo": "",
-	"authCheckEmailDidntReceiveEmail": "",
-	"authCheckEmailClickToResend": "",
 	"authSetNewPasswordTitle": "",
-	"authSetNewPasswordDescription": "",
 	"authSetNewPasswordNewPassword": "",
-	"authSetNewPasswordConfirmPassword": "",
-	"confirmPassword": "",
-	"authSetNewPasswordResetPassword": "",
 	"authSetNewPasswordBackTo": "",
-	"authPasswordMustBeAtLeast": "",
-	"authPasswordCharactersLong": "",
-	"authPasswordMustContainAtLeast": "",
-	"authPasswordSpecialCharacter": "",
-	"authPasswordOneNumber": "",
-	"authPasswordUpperCharacter": "",
-	"authPasswordLowerCharacter": "",
-	"authPasswordConfirmAndPassword": "",
-	"authPasswordMustMatch": "",
 	"authRegisterCreateAccount": "",
-	"authRegisterCreateSuperAdminAccount": "",
-	"authRegisterSignUpWithEmail": "",
-	"authRegisterBySigningUp": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -140,9 +264,6 @@
 	"city": "",
 	"response": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -416,10 +537,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
 	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +549,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
 	"validationNameRequired": "",
 	"validationNameTooLong": "",
 	"validationNameInvalidCharacters": "",
@@ -440,10 +556,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
 	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -528,7 +641,6 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
 	"settingsThemeModeLight": "",
 	"settingsThemeModeDark": "",
 	"settingsClearAllStatsDialogCancel": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index fb1a58019..753af8b3c 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "",
-			"checkConnection": ""
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Weiter",
+				"back": "Zurück"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-Mail",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "Passwort",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Anmelden",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "Geben Sie Ihr Passwort ein"
+			},
+			"links": {
+				"forgotPassword": "Passwort vergessen? <a>Passwort zurücksetzen</a>",
+				"register": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Registrieren"
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "Erstelle dein Passwort"
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Passwort zurücksetzen",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Noch kein Konto",
-	"email": "E-Mail",
 	"forgotPassword": "Passwort vergessen",
-	"password": "passwort",
-	"signUp": "Registrieren",
 	"submit": "Absenden",
 	"title": "Titel",
-	"continue": "Weiter",
 	"enterEmail": "Geben Sie Ihre E-Mail-Adresse ein",
-	"authLoginTitle": "Anmelden",
-	"authLoginEnterPassword": "Geben Sie Ihr Passwort ein",
 	"commonPassword": "Passwort",
-	"commonBack": "Zurück",
-	"authForgotPasswordTitle": "Passwort vergessen?",
-	"authForgotPasswordResetPassword": "Passwort zurücksetzen",
-	"createPassword": "Erstelle dein Passwort",
-	"createAPassword": "Passwort",
-	"authRegisterAlreadyHaveAccount": "Hast du schon eine Account?",
-	"authLoginEnterEmail": "",
 	"authRegisterTitle": "",
 	"authRegisterStepOneTitle": "",
 	"authRegisterStepOneDescription": "",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "",
 	"authRegisterStepThreeTitle": "",
 	"authRegisterStepThreeDescription": "",
-	"authForgotPasswordDescription": "",
 	"authForgotPasswordSendInstructions": "",
 	"authForgotPasswordBackTo": "",
 	"authCheckEmailTitle": "",
-	"authCheckEmailDescription": "",
 	"authCheckEmailResendEmail": "",
 	"authCheckEmailBackTo": "",
-	"goBackTo": "",
-	"authCheckEmailDidntReceiveEmail": "",
-	"authCheckEmailClickToResend": "",
 	"authSetNewPasswordTitle": "",
-	"authSetNewPasswordDescription": "",
 	"authSetNewPasswordNewPassword": "",
-	"authSetNewPasswordConfirmPassword": "",
-	"confirmPassword": "",
-	"authSetNewPasswordResetPassword": "",
 	"authSetNewPasswordBackTo": "",
-	"authPasswordMustBeAtLeast": "",
-	"authPasswordCharactersLong": "",
-	"authPasswordMustContainAtLeast": "",
-	"authPasswordSpecialCharacter": "",
-	"authPasswordOneNumber": "",
-	"authPasswordUpperCharacter": "",
-	"authPasswordLowerCharacter": "",
-	"authPasswordConfirmAndPassword": "",
-	"authPasswordMustMatch": "",
 	"authRegisterCreateAccount": "",
-	"authRegisterCreateSuperAdminAccount": "",
-	"authRegisterSignUpWithEmail": "",
-	"authRegisterBySigningUp": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -140,9 +263,6 @@
 	"city": "",
 	"response": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
 	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +548,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
 	"validationNameRequired": "",
 	"validationNameTooLong": "",
 	"validationNameInvalidCharacters": "",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
 	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -528,7 +640,6 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
 	"settingsThemeModeLight": "",
 	"settingsThemeModeDark": "",
 	"settingsClearAllStatsDialogCancel": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 145aa0af3..af06f419b 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Network error",
-			"checkConnection": "Please check your connection"
+			"checkConnection": "Please check your connection",
+			"unknownError": "Unknown error"
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continue",
+				"back": "Back"
+			},
+			"inputs": {
+				"email": {
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com",
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					}
+				},
+				"password": {
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						}
+					},
+					"errors": {
+						"empty": "Please enter your password",
+						"length": "Password must be at least 8 characters long",
+						"uppercase": "Password must contain at least 1 uppercase letter",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"incorrect": "The password you provided does not match our records"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm",
+					"errors": {
+						"empty": "Please enter your password again for confirmation (helps with typos)",
+						"different": "Entered passwords don't match, so one of them is probably mistyped"
+					}
+				},
+				"firstName": {
+					"label": "Name",
+					"placeholder": "Jordan",
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				},
+				"lastName": {
+					"label": "Surname",
+					"placeholder": "Ellis",
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				}
+			},
+			"errors": {
+				"validation": "Error validating data."
+			}
+		},
+		"login": {
+			"heading": "Log In",
+			"subheadings": {
+				"stepOne": "Enter your email",
+				"stepTwo": "Enter your password"
+			},
+			"links": {
+				"forgotPassword": "Forgot password? <a>Reset password</a>",
+				"register": "Do not have an account? <a>Register here</a>"
+			},
+			"toasts": {
+				"success": "Welcome back! You're successfully logged in.",
+				"incorrectPassword": "Incorrect password"
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepTwo": "Enter your email",
+				"stepThree": "Create your password"
+			},
+			"description": {
+				"superAdmin": "Create your super admin account to get started",
+				"user": "Sign up as a user and ask super admin for access to your monitors"
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Create super admin account",
+				"user": "Sign up regular user"
+			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+			"links": {
+				"login": "Already have an account? <a>Log In</a>"
+			},
+			"toasts": {
+				"success": "Welcome! Your account was created successfully."
+			}
+		},
+		"forgotPassword": {
+			"heading": "Forgot password?",
+			"subheadings": {
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepTwo": "We sent a password reset link to <email/>",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepFour": "Your password has been successfully reset. Click below to log in magically."
+			},
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"imageAlts": {
+				"passwordKey": "Password key icon",
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"toasts": {
+				"sent": "Instructions sent to <email/>.",
+				"emailNotFound": "Email not found.",
+				"redirect": "Redirecting in <seconds/>...",
+				"success": "Your password was reset successfully.",
+				"error": "Unable to reset password. Please try again later or contact support."
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Don't have account",
-	"email": "E-mail",
 	"forgotPassword": "Forgot Password",
-	"password": "Password",
-	"signUp": "Sign Up",
 	"submit": "Submit",
 	"title": "Title",
-	"continue": "Continue",
 	"enterEmail": "Enter your email",
-	"authLoginTitle": "Log In",
-	"authLoginEnterPassword": "Enter your password",
 	"commonPassword": "Password",
-	"commonBack": "Back",
-	"authForgotPasswordTitle": "Forgot password?",
-	"authForgotPasswordResetPassword": "Reset password",
-	"createPassword": "Create your password",
-	"createAPassword": "Password",
-	"authRegisterAlreadyHaveAccount": "Already have an account?",
-	"authLoginEnterEmail": "Enter your email",
 	"authRegisterTitle": "Create an account",
 	"authRegisterStepOneTitle": "Create your account",
 	"authRegisterStepOneDescription": "Enter your details to get started",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Tell us more about yourself",
 	"authRegisterStepThreeTitle": "Almost done!",
 	"authRegisterStepThreeDescription": "Review your information",
-	"authForgotPasswordDescription": "No worries, we'll send you reset instructions.",
 	"authForgotPasswordSendInstructions": "Send instructions",
 	"authForgotPasswordBackTo": "Back to",
 	"authCheckEmailTitle": "Check your email",
-	"authCheckEmailDescription": "We sent a password reset link to",
 	"authCheckEmailResendEmail": "Resend email",
 	"authCheckEmailBackTo": "Back to",
-	"goBackTo": "Go back to",
-	"authCheckEmailDidntReceiveEmail": "Didn't receive the email?",
-	"authCheckEmailClickToResend": "Click to resend",
 	"authSetNewPasswordTitle": "Set new password",
-	"authSetNewPasswordDescription": "Your new password must be different from previously used passwords.",
 	"authSetNewPasswordNewPassword": "New password",
-	"authSetNewPasswordConfirmPassword": "Confirm password",
-	"confirmPassword": "Re-enter password to confirm",
-	"authSetNewPasswordResetPassword": "Reset password",
 	"authSetNewPasswordBackTo": "Back to",
-	"authPasswordMustBeAtLeast": "Must be at least",
-	"authPasswordCharactersLong": "8 characters long",
-	"authPasswordMustContainAtLeast": "Must contain at least",
-	"authPasswordSpecialCharacter": "one special character",
-	"authPasswordOneNumber": "one number",
-	"authPasswordUpperCharacter": "one upper character",
-	"authPasswordLowerCharacter": "one lower character",
-	"authPasswordConfirmAndPassword": "Confirm password and password",
-	"authPasswordMustMatch": "Passwords must match",
 	"authRegisterCreateAccount": "Create your account to get started",
-	"authRegisterCreateSuperAdminAccount": "Create your super admin account to get started",
-	"authRegisterSignUpWithEmail": "Create super admin account",
-	"authRegisterBySigningUp": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
 	"distributedStatusHeaderText": "Real-time, real-device coverage",
 	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
 	"settingsGeneralSettings": "General settings",
@@ -136,9 +259,6 @@
 	"city": "CITY",
 	"response": "RESPONSE",
 	"passwordreset": "Password Reset",
-	"authRegisterStepOnePersonalDetails": "Enter your personal details",
-	"authCheckEmailOpenEmailButton": "Open email app",
-	"authNewPasswordConfirmed": "Your password has been successfully reset. Click below to log in magically.",
 	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
 	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
 	"webhookSendSuccess": "Webhook notification sent successfully",
@@ -408,10 +528,7 @@
 	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
 	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
 	"DeleteWarningTitle": "Really remove this account?",
-	"authRegisterFirstName": "Name",
-	"authRegisterLastName": "Surname",
 	"authRegisterEmail": "Email",
-	"authRegisterEmailRequired": "To continue, please enter your email address",
 	"bulkImport": {
 		"title": "Bulk Import",
 		"selectFileTips": "Select CSV file to upload",
@@ -423,8 +540,6 @@
 		"noFileSelected": "No file selected",
 		"fallbackPage": "Import a file to upload a list of servers in bulk"
 	},
-	"welcomeBack": "Welcome back! You're successfully logged in.",
-	"authRegisterLoginLink": "Log In",
 	"validationNameRequired": "Please enter your name",
 	"validationNameTooLong": "Name should be less than 50 characters",
 	"validationNameInvalidCharacters": "Please use only letters, spaces, apostrophes, or hyphens",
@@ -432,10 +547,7 @@
 	"settingsSystemResetDescription": "Remove all monitors from your system.",
 	"DeleteAccountTitle": "Remove account",
 	"DeleteAccountButton": "Remove account",
-	"authRegisterEmailInvalid": "Please enter a valid email address",
 	"publicLink": "Public link",
-	"doNotHaveAccount": "Do not have an account?",
-	"registerHere": "Register here",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
@@ -519,7 +631,6 @@
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",
-	"authForgotPasswordInstructions": "No worries, we'll send you reset instructions.",
 	"settingsThemeModeLight": "Light",
 	"settingsThemeModeDark": "Dark",
 	"settingsClearAllStatsDialogCancel": "Cancel",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 722833d99..5c0f551ad 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "",
-			"checkConnection": ""
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continuar",
+				"back": "Atras"
+			},
+			"inputs": {
+				"email": {
+					"label": "Correo electronico",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "Contraseña",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": "8 caracteres de longitud"
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": "un numero"
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirmar contraseña",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Inicio de session",
+			"subheadings": {
+				"stepOne": "Introduce tu correo electronico",
+				"stepTwo": "Introduce tu contraseña"
+			},
+			"links": {
+				"forgotPassword": "¿Has olvidado tu contraseña? <a>Restablecer contraseña</a>",
+				"register": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Registrarse"
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "Introduce tu correo electronico",
+				"stepThree": "Crear contraseña"
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "¿Has olvidado tu contraseña?",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "Hemos enviado un link para reiniciar la contraseña a <email/>",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": "Restablecer contraseña"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Volver a <a>Inicio de session</a>",
+				"resend": "No has recibido el correo electronico? <a>Presiona para reenviar</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "No tengo una cuenta",
-	"email": "Correo electronico",
 	"forgotPassword": "He olvidado mi contraseña",
-	"password": "Contraseña",
-	"signUp": "Registrarse",
 	"submit": "Enviar",
 	"title": "Titulo",
-	"continue": "Continuar",
 	"enterEmail": "Introduce tu email",
-	"authLoginTitle": "Inicio de session",
-	"authLoginEnterPassword": "Introduce tu contraseña",
 	"commonPassword": "Contraseña",
-	"commonBack": "Atras",
-	"authForgotPasswordTitle": "¿Has olvidado tu contraseña?",
-	"authForgotPasswordResetPassword": "Restablecer contraseña",
-	"createPassword": "Crear contraseña",
-	"createAPassword": "Contraseña",
-	"authRegisterAlreadyHaveAccount": "Ya tienes un cuenta?",
-	"authLoginEnterEmail": "Introduce tu correo electronico",
 	"authRegisterTitle": "Crear una cuenta",
 	"authRegisterStepOneTitle": "Crea tu cuenta",
 	"authRegisterStepOneDescription": "",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Cuentano mas sobre ti",
 	"authRegisterStepThreeTitle": "Ya casi estamos!",
 	"authRegisterStepThreeDescription": "Revisa tu informacion",
-	"authForgotPasswordDescription": "",
 	"authForgotPasswordSendInstructions": "Enviar instrucciones",
 	"authForgotPasswordBackTo": "Volver a",
 	"authCheckEmailTitle": "Comprueba tu correo",
-	"authCheckEmailDescription": "Hemos enviado un link para reiniciar la contraseña a",
 	"authCheckEmailResendEmail": "Reenviar correo",
 	"authCheckEmailBackTo": "Volver a",
-	"goBackTo": "Volver a",
-	"authCheckEmailDidntReceiveEmail": "No has recibido el correo electronico?",
-	"authCheckEmailClickToResend": "Presiona para reenviar",
 	"authSetNewPasswordTitle": "Configurar nueva contraseña",
-	"authSetNewPasswordDescription": "",
 	"authSetNewPasswordNewPassword": "Nueva contraseña",
-	"authSetNewPasswordConfirmPassword": "Confirmar contraseña",
-	"confirmPassword": "",
-	"authSetNewPasswordResetPassword": "Restablecer contraseña",
 	"authSetNewPasswordBackTo": "Volver a",
-	"authPasswordMustBeAtLeast": "",
-	"authPasswordCharactersLong": "8 caracteres de longitud",
-	"authPasswordMustContainAtLeast": "",
-	"authPasswordSpecialCharacter": "",
-	"authPasswordOneNumber": "un numero",
-	"authPasswordUpperCharacter": "",
-	"authPasswordLowerCharacter": "",
-	"authPasswordConfirmAndPassword": "",
-	"authPasswordMustMatch": "",
 	"authRegisterCreateAccount": "",
-	"authRegisterCreateSuperAdminAccount": "",
-	"authRegisterSignUpWithEmail": "",
-	"authRegisterBySigningUp": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -140,9 +263,6 @@
 	"city": "",
 	"response": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
 	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +548,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
 	"validationNameRequired": "",
 	"validationNameTooLong": "",
 	"validationNameInvalidCharacters": "",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
 	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -528,7 +640,6 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
 	"settingsThemeModeLight": "",
 	"settingsThemeModeDark": "",
 	"settingsClearAllStatsDialogCancel": "",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 16517778a..b4c364fe5 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Verkkovirhe",
-			"checkConnection": "Tarkista yhteytesi"
+			"checkConnection": "Tarkista yhteytesi",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Jatka",
+				"back": "Takaisin"
+			},
+			"inputs": {
+				"email": {
+					"label": "Sähköposti",
+					"placeholder": "",
+					"errors": {
+						"empty": "Syötä sähköpostiosoitteesi jatkaaksesi",
+						"invalid": "Kirjoita kelvollinen sähköpostiosoite"
+					}
+				},
+				"password": {
+					"label": "Salasana",
+					"rules": {
+						"length": {
+							"beginning": "Vähintään",
+							"highlighted": "8 merkkiä pitkä"
+						},
+						"special": {
+							"beginning": "Tulee sisältää vähintään",
+							"highlighted": "yksi erikoismerkki"
+						},
+						"number": {
+							"beginning": "Tulee sisältää vähintään",
+							"highlighted": "yksi numero"
+						},
+						"uppercase": {
+							"beginning": "Tulee sisältää vähintään",
+							"highlighted": "yksi pieni kirjain"
+						},
+						"lowercase": {
+							"beginning": "Tulee sisältää vähintään",
+							"highlighted": "yksi iso kirjain"
+						},
+						"match": {
+							"beginning": "Vahvista salasana ja salasana",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Vahvista salasana",
+					"placeholder": "Syötä salasana uudelleen",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "Nimi",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "Sukunimi",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Kirjaudu",
+			"subheadings": {
+				"stepOne": "Syötä salasanasi",
+				"stepTwo": "Syötä salasanasi"
+			},
+			"links": {
+				"forgotPassword": "Unohditko salasanasi? <a>Nollaa salasana</a>",
+				"register": "Onko sinulla tili? <a>Rekisteröidy tästä</a>"
+			},
+			"toasts": {
+				"success": "Tervetuloa takaisin! Olet kirjautunut sisään.",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Rekisteröidy"
+			},
+			"subheadings": {
+				"stepOne": "Syötä henkilökohtaiset tietosi",
+				"stepTwo": "Syötä salasanasi",
+				"stepThree": "Luo salasanasi"
+			},
+			"description": {
+				"superAdmin": "Luo pääkäyttäjän tili aloittaaksesi",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Luo pääkäyttäjän tili",
+				"user": ""
+			},
+			"termsAndPolicies": "Luomalla tilin hyväksyt <a1>Käyttöehdot</a1> ja <a2>Tietosuojakäytännön</a2>.",
+			"links": {
+				"login": "Onko sinulla jo tili? <a>Kirjaudu</a>"
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Unohditko salasanasi?",
+			"subheadings": {
+				"stepOne": "Ei hätää, lähetämme sinulle ohjeet salasanan palauttamiseen.",
+				"stepTwo": "Lähetimme salasanan nollauslinkin osoitteeseen <email/>",
+				"stepThree": "Uuden salasanan pitää olla eri kuin aiemmin käyttämäsi.",
+				"stepFour": "Salasanasi on onnistuneesti nollattu. Klikkaa alta kirjautuaksesi taianomaisesti."
+			},
+			"buttons": {
+				"openEmail": "Avaa sähköpostisovellus",
+				"resetPassword": "Nollaa salasana"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Palaa edelliseen <a>Kirjaudu</a>",
+				"resend": "Etkö saanut sähköpostia? <a>Klikkaa lähettääksesi uudelleen</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Ei tiliä",
-	"email": "Sähköposti",
 	"forgotPassword": "Unohtunut salasana",
-	"password": "Salasana",
-	"signUp": "Rekisteröidy",
 	"submit": "Lähetä",
 	"title": "Otsikko",
-	"continue": "Jatka",
 	"enterEmail": "Syötä sähköpostiosoitteesi",
-	"authLoginTitle": "Kirjaudu",
-	"authLoginEnterPassword": "Syötä salasanasi",
 	"commonPassword": "Salasana",
-	"commonBack": "Takaisin",
-	"authForgotPasswordTitle": "Unohditko salasanasi?",
-	"authForgotPasswordResetPassword": "Nollaa salasana",
-	"createPassword": "Luo salasanasi",
-	"createAPassword": "Salasana",
-	"authRegisterAlreadyHaveAccount": "Onko sinulla jo tili?",
-	"authLoginEnterEmail": "Syötä salasanasi",
 	"authRegisterTitle": "Luo tili",
 	"authRegisterStepOneTitle": "Luo tilisi",
 	"authRegisterStepOneDescription": "Kirjoita tietosi aloittaaksesi",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Kerro meille lisää itsestäsi",
 	"authRegisterStepThreeTitle": "Melkein valmis!",
 	"authRegisterStepThreeDescription": "Tarkista tietosi",
-	"authForgotPasswordDescription": "Ei hätää, lähetämme sinulle salasanan nollausohjeet.",
 	"authForgotPasswordSendInstructions": "Lähetä ohjeet",
 	"authForgotPasswordBackTo": "Palaa",
 	"authCheckEmailTitle": "Tarkista sähköpostisi",
-	"authCheckEmailDescription": "Lähetimme salasanan nollauslinkin osoitteeseen",
 	"authCheckEmailResendEmail": "Lähetä sähköposti uudelleen",
 	"authCheckEmailBackTo": "Palaa",
-	"goBackTo": "Palaa edelliseen",
-	"authCheckEmailDidntReceiveEmail": "Etkö saanut sähköpostia?",
-	"authCheckEmailClickToResend": "Klikkaa lähettääksesi uudelleen",
 	"authSetNewPasswordTitle": "Aseta uusi salasana",
-	"authSetNewPasswordDescription": "Uuden salasanan pitää olla eri kuin aiemmin käyttämäsi.",
 	"authSetNewPasswordNewPassword": "Uusi salasana",
-	"authSetNewPasswordConfirmPassword": "Vahvista salasana",
-	"confirmPassword": "Syötä salasana uudelleen",
-	"authSetNewPasswordResetPassword": "Nollaa salasana",
 	"authSetNewPasswordBackTo": "Takaisin",
-	"authPasswordMustBeAtLeast": "Vähintään",
-	"authPasswordCharactersLong": "8 merkkiä pitkä",
-	"authPasswordMustContainAtLeast": "Tulee sisältää vähintään",
-	"authPasswordSpecialCharacter": "yksi erikoismerkki",
-	"authPasswordOneNumber": "yksi numero",
-	"authPasswordUpperCharacter": "yksi pieni kirjain",
-	"authPasswordLowerCharacter": "yksi iso kirjain",
-	"authPasswordConfirmAndPassword": "Vahvista salasana ja salasana",
-	"authPasswordMustMatch": "Salasanojen on oltava samat",
 	"authRegisterCreateAccount": "Luo tili aloittaaksesi",
-	"authRegisterCreateSuperAdminAccount": "Luo pääkäyttäjän tili aloittaaksesi",
-	"authRegisterSignUpWithEmail": "Luo pääkäyttäjän tili",
-	"authRegisterBySigningUp": "Luomalla tilin hyväksyt <a1>Käyttöehdot</a1> ja <a2>Tietosuojakäytännön</a2>.",
 	"distributedStatusHeaderText": "Reaaliaikainen kattavuus oikeilla laitteilla",
 	"distributedStatusSubHeaderText": "Miljoonien laitteiden voimin ympäri maailman näet järjestelmän suorituskyvyn maailman alueittain, maittain tai kaupungeittain",
 	"settingsGeneralSettings": "Yleiset asetukset",
@@ -140,9 +263,6 @@
 	"city": "KAUPUNKI",
 	"response": "Vastaus",
 	"passwordreset": "Salasanan nollaus",
-	"authRegisterStepOnePersonalDetails": "Syötä henkilökohtaiset tietosi",
-	"authCheckEmailOpenEmailButton": "Avaa sähköpostisovellus",
-	"authNewPasswordConfirmed": "Salasanasi on onnistuneesti nollattu. Klikkaa alta kirjautuaksesi taianomaisesti.",
 	"monitorStatusUp": "Valvontakohde {name} ({url}) on nyt toiminnassa ja vastaa",
 	"monitorStatusDown": "Valvontakohde {name} ({url}) ei ole toiminnassa, eikä vastaa",
 	"webhookSendSuccess": "Webhook-ilmoitus lähetettiin onnistuneesti",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "Haluatko todella poistaa tämän tilin?",
-	"authRegisterFirstName": "Nimi",
-	"authRegisterLastName": "Sukunimi",
 	"authRegisterEmail": "Sähköpostiosoite",
-	"authRegisterEmailRequired": "Syötä sähköpostiosoitteesi jatkaaksesi",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +548,6 @@
 		"noFileSelected": "Ei valittua tiedostoa",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "Tervetuloa takaisin! Olet kirjautunut sisään.",
-	"authRegisterLoginLink": "Kirjaudu",
 	"validationNameRequired": "Kirjoita nimesi",
 	"validationNameTooLong": "Nimen tulee olla alle 50 merkkiä",
 	"validationNameInvalidCharacters": "Käytäthän vain kirjaimia, välilyöntejä, heittomerkkejä tai yhdysmerkkejä",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Poista tili",
 	"DeleteAccountButton": "Poista tili",
-	"authRegisterEmailInvalid": "Kirjoita kelvollinen sähköpostiosoite",
 	"publicLink": "Julkinen linkki",
-	"doNotHaveAccount": "Onko sinulla tili?",
-	"registerHere": "Rekisteröidy tästä",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API-avain",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API-avain",
@@ -528,7 +640,6 @@
 	"state": "Tila",
 	"statusBreadCrumbsStatusPages": "Tilasivut",
 	"statusBreadCrumbsDetails": "Tiedot",
-	"authForgotPasswordInstructions": "Ei hätää, lähetämme sinulle ohjeet salasanan palauttamiseen.",
 	"settingsThemeModeLight": "Vaalea",
 	"settingsThemeModeDark": "Tumma",
 	"settingsClearAllStatsDialogCancel": "Peruuta",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 4acde5888..092cb3c9d 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "",
-			"checkConnection": "Vérifiez votre connexion"
+			"checkConnection": "Vérifiez votre connexion",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continuer",
+				"back": "Retour"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-mail",
+					"placeholder": "",
+					"errors": {
+						"empty": "Pour continuer, veuillez saisir votre adresse e-mail",
+						"invalid": "Veuillez saisir une adresse e-mail valide"
+					}
+				},
+				"password": {
+					"label": "Mot de passe",
+					"rules": {
+						"length": {
+							"beginning": "Doit faire au moins",
+							"highlighted": "8 caractères"
+						},
+						"special": {
+							"beginning": "Doit contenir au moins",
+							"highlighted": "un caractère spécial"
+						},
+						"number": {
+							"beginning": "Doit contenir au moins",
+							"highlighted": "un nombre"
+						},
+						"uppercase": {
+							"beginning": "Doit contenir au moins",
+							"highlighted": "une lettre majuscule"
+						},
+						"lowercase": {
+							"beginning": "Doit contenir au moins",
+							"highlighted": "une lettre minuscule"
+						},
+						"match": {
+							"beginning": "Confirmer le mot de passe",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirmer le mot de passe",
+					"placeholder": "Confirmez votre mot de passe",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "Prénom",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "Nom",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Se connecter",
+			"subheadings": {
+				"stepOne": "Entrez votre e-mail",
+				"stepTwo": "Entrez votre mot de passe"
+			},
+			"links": {
+				"forgotPassword": "Mot de passe oublié ? <a>Réinitialiser le mot de passe</a>",
+				"register": ""
+			},
+			"toasts": {
+				"success": "Bienvenue ! Vous êtes connecté avec succès.",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "S'inscrire"
+			},
+			"subheadings": {
+				"stepOne": "Saisissez vos infos",
+				"stepTwo": "Entrez votre e-mail",
+				"stepThree": "Créez votre mot de passe"
+			},
+			"description": {
+				"superAdmin": "Créez votre compte Super admin pour commencer",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "S'inscrire avec E-mail",
+				"user": ""
+			},
+			"termsAndPolicies": "En vous inscrivant, vous acceptez nos",
+			"links": {
+				"login": "Vous avez un compte ? <a>Se connecter</a>"
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Mot de passe oublié ?",
+			"subheadings": {
+				"stepOne": "Nous vous enverrons des instructions de réinitialisation.",
+				"stepTwo": "Nous avons envoyé un lien de réinitialisation à <email/>",
+				"stepThree": "Votre nouveau mot de passe doit être différent des anciens mots de passes utilisés.",
+				"stepFour": "Votre mot de passe a été réinitialisé avec succès. Cliquez ci-dessous pour vous connecter."
+			},
+			"buttons": {
+				"openEmail": "Ouvrir l'appli mail",
+				"resetPassword": "Réinitialiser le mot de passe"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Retourner à <a>Se connecter</a>",
+				"resend": "Vous n'avez pas reçu l'e-mail ? <a>Cliquez pour renvoyer</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Vous n'avez pas de compte",
-	"email": "E-mail",
 	"forgotPassword": "Mot de passe oublié",
-	"password": "mot de passe",
-	"signUp": "S'inscrire",
 	"submit": "Envoyer",
 	"title": "Titre",
-	"continue": "Continuer",
 	"enterEmail": "Entrez votre adresse e-mail",
-	"authLoginTitle": "Se connecter",
-	"authLoginEnterPassword": "Entrez votre mot de passe",
 	"commonPassword": "Mot de passe",
-	"commonBack": "Retour",
-	"authForgotPasswordTitle": "Mot de passe oublié ?",
-	"authForgotPasswordResetPassword": "Réinitialiser le mot de passe",
-	"createPassword": "Créez votre mot de passe",
-	"createAPassword": "Créer un mot de passe",
-	"authRegisterAlreadyHaveAccount": "Vous avez un compte ?",
-	"authLoginEnterEmail": "Entrez votre e-mail",
 	"authRegisterTitle": "Créer un compte",
 	"authRegisterStepOneTitle": "Créez votre compte",
 	"authRegisterStepOneDescription": "Entrez vos informations pour commencer",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Parlez-nous un peu de vous",
 	"authRegisterStepThreeTitle": "Presque fini !",
 	"authRegisterStepThreeDescription": "Vérifiez vos infos",
-	"authForgotPasswordDescription": "Pas d'inquiétude, nous allons vous envoyer des instructions de réinitialisation.",
 	"authForgotPasswordSendInstructions": "Envoyer les instructions",
 	"authForgotPasswordBackTo": "Retourner à",
 	"authCheckEmailTitle": "Vérifiez votre e-mail",
-	"authCheckEmailDescription": "Nous avons envoyé un lien de réinitialisation à",
 	"authCheckEmailResendEmail": "Renvoyer le mail",
 	"authCheckEmailBackTo": "Retourner à",
-	"goBackTo": "Retourner à",
-	"authCheckEmailDidntReceiveEmail": "Vous n'avez pas reçu l'e-mail ?",
-	"authCheckEmailClickToResend": "Cliquez pour renvoyer",
 	"authSetNewPasswordTitle": "Définir un nouveau mot de passe",
-	"authSetNewPasswordDescription": "Votre nouveau mot de passe doit être différent des anciens mots de passes utilisés.",
 	"authSetNewPasswordNewPassword": "Nouveau mot de passe",
-	"authSetNewPasswordConfirmPassword": "Confirmer le mot de passe",
-	"confirmPassword": "Confirmez votre mot de passe",
-	"authSetNewPasswordResetPassword": "Réinitialiser le mot de passe",
 	"authSetNewPasswordBackTo": "Retourner à",
-	"authPasswordMustBeAtLeast": "Doit faire au moins",
-	"authPasswordCharactersLong": "8 caractères",
-	"authPasswordMustContainAtLeast": "Doit contenir au moins",
-	"authPasswordSpecialCharacter": "un caractère spécial",
-	"authPasswordOneNumber": "un nombre",
-	"authPasswordUpperCharacter": "une lettre majuscule",
-	"authPasswordLowerCharacter": "une lettre minuscule",
-	"authPasswordConfirmAndPassword": "Confirmer le mot de passe",
-	"authPasswordMustMatch": "doit correspondre",
 	"authRegisterCreateAccount": "Créez votre compte pour commencer",
-	"authRegisterCreateSuperAdminAccount": "Créez votre compte Super admin pour commencer",
-	"authRegisterSignUpWithEmail": "S'inscrire avec E-mail",
-	"authRegisterBySigningUp": "En vous inscrivant, vous acceptez nos",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "Paramètres généraux",
@@ -140,9 +263,6 @@
 	"city": "VILLE",
 	"response": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "Saisissez vos infos",
-	"authCheckEmailOpenEmailButton": "Ouvrir l'appli mail",
-	"authNewPasswordConfirmed": "Votre mot de passe a été réinitialisé avec succès. Cliquez ci-dessous pour vous connecter.",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "Vous supprimez vraiment ce compte ?",
-	"authRegisterFirstName": "Prénom",
-	"authRegisterLastName": "Nom",
 	"authRegisterEmail": "Email",
-	"authRegisterEmailRequired": "Pour continuer, veuillez saisir votre adresse e-mail",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +548,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "Bienvenue ! Vous êtes connecté avec succès.",
-	"authRegisterLoginLink": "Se connecter",
 	"validationNameRequired": "Veuillez saisir votre nom",
 	"validationNameTooLong": "",
 	"validationNameInvalidCharacters": "Veuillez utiliser uniquement des lettres, des espaces, des apostrophes ou des traits d'union",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Supprimer le compte",
 	"DeleteAccountButton": "Supprimer le compte",
-	"authRegisterEmailInvalid": "Veuillez saisir une adresse e-mail valide",
 	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -528,7 +640,6 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "Nous vous enverrons des instructions de réinitialisation.",
 	"settingsThemeModeLight": "Clair",
 	"settingsThemeModeDark": "Sombre",
 	"settingsClearAllStatsDialogCancel": "Annuler",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 25f14086e..f042e5fd6 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Erro de rede",
-			"checkConnection": "Verifique sua conexão"
+			"checkConnection": "Verifique sua conexão",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continuar",
+				"back": "Voltar"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-mail",
+					"placeholder": "",
+					"errors": {
+						"empty": "Para continuar, insira seu endereço de e-mail",
+						"invalid": "Por favor, insira um endereço de e-mail válido"
+					}
+				},
+				"password": {
+					"label": "Senha",
+					"rules": {
+						"length": {
+							"beginning": "Deve ser pelo menos",
+							"highlighted": "8 caracteres de comprimento"
+						},
+						"special": {
+							"beginning": "Deve conter pelo menos",
+							"highlighted": "um caractere especial"
+						},
+						"number": {
+							"beginning": "Deve conter pelo menos",
+							"highlighted": "um número"
+						},
+						"uppercase": {
+							"beginning": "Deve conter pelo menos",
+							"highlighted": "um caractere maiúsculo"
+						},
+						"lowercase": {
+							"beginning": "Deve conter pelo menos",
+							"highlighted": "um caractere minúsculo"
+						},
+						"match": {
+							"beginning": "Confirme a senha",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirme sua senha",
+					"placeholder": "Digite a senha novamente para confirmar",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "Nome",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "Sobrenome",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Login",
+			"subheadings": {
+				"stepOne": "Insira seu e-mail",
+				"stepTwo": "Digite sua senha"
+			},
+			"links": {
+				"forgotPassword": "Esqueceu a senha? <a>Redefinir a senha</a>",
+				"register": "Ainda não tem uma conta? <a>Registre-se aqui</a>"
+			},
+			"toasts": {
+				"success": "Bem-vindo de volta! Você fez login com sucesso.",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Inscreva-se"
+			},
+			"subheadings": {
+				"stepOne": "Insira seus dados pessoais",
+				"stepTwo": "Insira seu e-mail",
+				"stepThree": "Criar sua senha"
+			},
+			"description": {
+				"superAdmin": "Crie sua conta de super admin para começar",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Criar conta de super admin",
+				"user": ""
+			},
+			"termsAndPolicies": "Ao criar uma conta, você concorda com nossos <a1>Termos de Serviço</a1> e <a2>Política de Privacidade</a2>.",
+			"links": {
+				"login": "Já possui uma conta? <a>Login</a>"
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Esqueceu a senha?",
+			"subheadings": {
+				"stepOne": "Não se preocupe, enviaremos instruções de redefinição.",
+				"stepTwo": "Enviamos um link para redefinir a senha para <email/>",
+				"stepThree": "Sua nova senha deve ser diferente das senhas usadas anteriormente.",
+				"stepFour": "Sua senha foi redefinida com sucesso. Clique abaixo para fazer login magicamente."
+			},
+			"buttons": {
+				"openEmail": "Abra o aplicativo de e-mail",
+				"resetPassword": "Redefinir senha"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Volte para <a>Login</a>",
+				"resend": "Não recebeu o e-mail? <a>Clique para reenviar</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Não tenho conta",
-	"email": "E-mail",
 	"forgotPassword": "Esqueci a senha",
-	"password": "Senha",
-	"signUp": "Inscreva-se",
 	"submit": "Enviar",
 	"title": "Título",
-	"continue": "Continuar",
 	"enterEmail": "Insira seu e-mail",
-	"authLoginTitle": "Login",
-	"authLoginEnterPassword": "Digite sua senha",
 	"commonPassword": "Senha",
-	"commonBack": "Voltar",
-	"authForgotPasswordTitle": "Esqueceu a senha?",
-	"authForgotPasswordResetPassword": "Redefinir a senha",
-	"createPassword": "Criar sua senha",
-	"createAPassword": "Senha",
-	"authRegisterAlreadyHaveAccount": "Já possui uma conta?",
-	"authLoginEnterEmail": "Insira seu e-mail",
 	"authRegisterTitle": "Criar uma conta",
 	"authRegisterStepOneTitle": "Crie sua conta",
 	"authRegisterStepOneDescription": "Insira seus dados para começar",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Conte-nos mais sobre você",
 	"authRegisterStepThreeTitle": "Quase pronto!",
 	"authRegisterStepThreeDescription": "Revise suas informações",
-	"authForgotPasswordDescription": "Não se preocupe, enviaremos instruções de redefinição.",
 	"authForgotPasswordSendInstructions": "Enviar instruções",
 	"authForgotPasswordBackTo": "Voltar para",
 	"authCheckEmailTitle": "Verifique seu e-mail",
-	"authCheckEmailDescription": "Enviamos um link para redefinir a senha para",
 	"authCheckEmailResendEmail": "Reenviar e-mail",
 	"authCheckEmailBackTo": "Voltar para",
-	"goBackTo": "Volte para",
-	"authCheckEmailDidntReceiveEmail": "Não recebeu o e-mail?",
-	"authCheckEmailClickToResend": "Clique para reenviar",
 	"authSetNewPasswordTitle": "Definir nova senha",
-	"authSetNewPasswordDescription": "Sua nova senha deve ser diferente das senhas usadas anteriormente.",
 	"authSetNewPasswordNewPassword": "Nova senha",
-	"authSetNewPasswordConfirmPassword": "Confirme sua senha",
-	"confirmPassword": "Digite a senha novamente para confirmar",
-	"authSetNewPasswordResetPassword": "Redefinir senha",
 	"authSetNewPasswordBackTo": "Voltar para",
-	"authPasswordMustBeAtLeast": "Deve ser pelo menos",
-	"authPasswordCharactersLong": "8 caracteres de comprimento",
-	"authPasswordMustContainAtLeast": "Deve conter pelo menos",
-	"authPasswordSpecialCharacter": "um caractere especial",
-	"authPasswordOneNumber": "um número",
-	"authPasswordUpperCharacter": "um caractere maiúsculo",
-	"authPasswordLowerCharacter": "um caractere minúsculo",
-	"authPasswordConfirmAndPassword": "Confirme a senha",
-	"authPasswordMustMatch": "As senhas devem corresponder",
 	"authRegisterCreateAccount": "Crie sua conta para começar",
-	"authRegisterCreateSuperAdminAccount": "Crie sua conta de super admin para começar",
-	"authRegisterSignUpWithEmail": "Criar conta de super admin",
-	"authRegisterBySigningUp": "Ao criar uma conta, você concorda com nossos <a1>Termos de Serviço</a1> e <a2>Política de Privacidade</a2>.",
 	"distributedStatusHeaderText": "Cobertura em tempo real e em dispositivos reais",
 	"distributedStatusSubHeaderText": "Impulsionado por milhões de dispositivos em todo o mundo, visualize o desempenho do sistema por região global, país ou cidade",
 	"settingsGeneralSettings": "Configurações gerais",
@@ -139,9 +262,6 @@
 	"city": "CIDADE",
 	"response": "RESPOSTA",
 	"passwordreset": "Redefinição de senha",
-	"authRegisterStepOnePersonalDetails": "Insira seus dados pessoais",
-	"authCheckEmailOpenEmailButton": "Abra o aplicativo de e-mail",
-	"authNewPasswordConfirmed": "Sua senha foi redefinida com sucesso. Clique abaixo para fazer login magicamente.",
 	"monitorStatusUp": "O monitor {name} ({url}) agora está ATIVO e respondendo",
 	"monitorStatusDown": "O monitor {name} ({url}) está INATIVO e não está respondendo",
 	"webhookSendSuccess": "Notificação de webhook enviada com sucesso",
@@ -415,10 +535,7 @@
 	"DeleteDescriptionText": "Isso removerá a conta e todos os dados associados do servidor. Essa ação não é reversível.",
 	"DeleteAccountWarning": "Remover sua conta significa que você não poderá fazer login novamente e todos os seus dados serão removidos. Isso não é reversível.",
 	"DeleteWarningTitle": "Deseja realmente remover esta conta?",
-	"authRegisterFirstName": "Nome",
-	"authRegisterLastName": "Sobrenome",
 	"authRegisterEmail": "E-mail",
-	"authRegisterEmailRequired": "Para continuar, insira seu endereço de e-mail",
 	"bulkImport": {
 		"title": "Bulk Import",
 		"selectFileTips": "Selecione o arquivo CSV para enviar",
@@ -430,8 +547,6 @@
 		"noFileSelected": "Nenhum arquivo selecionado",
 		"fallbackPage": "Importe um arquivo para enviar uma lista de servidores em massa"
 	},
-	"welcomeBack": "Bem-vindo de volta! Você fez login com sucesso.",
-	"authRegisterLoginLink": "Login",
 	"validationNameRequired": "Por favor digite seu nome",
 	"validationNameTooLong": "O nome deve ter menos de 50 caracteres",
 	"validationNameInvalidCharacters": "Por favor, use apenas letras, espaços, apóstrofos ou hifens",
@@ -439,10 +554,7 @@
 	"settingsSystemResetDescription": "Remova todos os monitores do seu sistema.",
 	"DeleteAccountTitle": "Remover conta",
 	"DeleteAccountButton": "Remover conta",
-	"authRegisterEmailInvalid": "Por favor, insira um endereço de e-mail válido",
 	"publicLink": "Link publico",
-	"doNotHaveAccount": "Ainda não tem uma conta?",
-	"registerHere": "Registre-se aqui",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
@@ -527,7 +639,6 @@
 	"state": "Estado",
 	"statusBreadCrumbsStatusPages": "Pagina de status",
 	"statusBreadCrumbsDetails": "Detalhes",
-	"authForgotPasswordInstructions": "Não se preocupe, enviaremos instruções de redefinição.",
 	"settingsThemeModeLight": "Claro",
 	"settingsThemeModeDark": "Escuro",
 	"settingsClearAllStatsDialogCancel": "Cancelar",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index ae83dc57a..f6ccdd5fd 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Ошибка сети",
-			"checkConnection": "Пожалуйста, проверьте ваше соединение"
+			"checkConnection": "Пожалуйста, проверьте ваше соединение",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Продолжить",
+				"back": "Назад"
+			},
+			"inputs": {
+				"email": {
+					"label": "Почта",
+					"placeholder": "",
+					"errors": {
+						"empty": "Чтобы продолжить, пожалуйста, введите свой адрес электронной почты",
+						"invalid": "Пожалуйста, введите действительный адрес электронной почты"
+					}
+				},
+				"password": {
+					"label": "пароль",
+					"rules": {
+						"length": {
+							"beginning": "Должно быть как минимум",
+							"highlighted": "длиной 8 символов"
+						},
+						"special": {
+							"beginning": "Должен содержать как минимум",
+							"highlighted": "один специальный символ"
+						},
+						"number": {
+							"beginning": "Должен содержать как минимум",
+							"highlighted": "одно число"
+						},
+						"uppercase": {
+							"beginning": "Должен содержать как минимум",
+							"highlighted": "один верхний символ"
+						},
+						"lowercase": {
+							"beginning": "Должен содержать как минимум",
+							"highlighted": "один нижний символ"
+						},
+						"match": {
+							"beginning": "Подтвердите пароль и пароль",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Подтвердите пароль",
+					"placeholder": "Подтвердите ваш пароль",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "Имя",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "Фамилия",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Войти",
+			"subheadings": {
+				"stepOne": "Введите свой email",
+				"stepTwo": "Введите свой пароль"
+			},
+			"links": {
+				"forgotPassword": "Забыли пароль? <a>Сбросить пароль</a>",
+				"register": "У вас нет учетной записи? <a>Зарегистрируйтесь здесь</a>"
+			},
+			"toasts": {
+				"success": "Добро пожаловать обратно! Вы успешно вошли в систему.",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Зарегистрироваться"
+			},
+			"subheadings": {
+				"stepOne": "Введите свои личные данные",
+				"stepTwo": "Введите свой email",
+				"stepThree": "Создайте свой пароль"
+			},
+			"description": {
+				"superAdmin": "Создайте учетную запись суперадминистратора, чтобы начать работу",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Зарегистрироваться по электронной почте",
+				"user": ""
+			},
+			"termsAndPolicies": "Регистрируясь, вы соглашаетесь с нашими",
+			"links": {
+				"login": "Уже есть аккаунт? <a>Войти</a>"
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Забыли пароль?",
+			"subheadings": {
+				"stepOne": "Не беспокойтесь, мы вышлем вам инструкции по сбросу настроек.",
+				"stepTwo": "Мы отправили ссылку для сброса пароля <email/>",
+				"stepThree": "Ваш новый пароль должен отличаться от ранее использованных паролей.",
+				"stepFour": "Ваш пароль успешно сброшен. Нажмите ниже, чтобы войти в систему магическим образом."
+			},
+			"buttons": {
+				"openEmail": "Откройте приложение почты",
+				"resetPassword": "Сбросить пароль"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Назад к <a>Войти</a>",
+				"resend": "Не получили письмо? <a>Нажмите, чтобы отправить повторно</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Нет аккаунта",
-	"email": "Почта",
 	"forgotPassword": "Забыли пароль",
-	"password": "пароль",
-	"signUp": "Зарегистрироваться",
 	"submit": "Подтвердить",
 	"title": "Название",
-	"continue": "Продолжить",
 	"enterEmail": "Введите свой email",
-	"authLoginTitle": "Войти",
-	"authLoginEnterPassword": "Введите свой пароль",
 	"commonPassword": "Пароль",
-	"commonBack": "Назад",
-	"authForgotPasswordTitle": "Забыли пароль?",
-	"authForgotPasswordResetPassword": "Сбросить пароль",
-	"createPassword": "Создайте свой пароль",
-	"createAPassword": "Создайте пароль",
-	"authRegisterAlreadyHaveAccount": "Уже есть аккаунт?",
-	"authLoginEnterEmail": "Введите свой email",
 	"authRegisterTitle": "Создать аккаунт",
 	"authRegisterStepOneTitle": "Создайте свой аккаут",
 	"authRegisterStepOneDescription": "Введите свои данные, чтобы начать",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Расскажите нам о себе",
 	"authRegisterStepThreeTitle": "Почти готово!",
 	"authRegisterStepThreeDescription": "Проверьте свою информацию",
-	"authForgotPasswordDescription": "Не волнуйтесь, мы вышлем вам инструкции по сбросу настроек.",
 	"authForgotPasswordSendInstructions": "Отправить инструкции",
 	"authForgotPasswordBackTo": "Назад к",
 	"authCheckEmailTitle": "Проверьте свою почту",
-	"authCheckEmailDescription": "Мы отправили ссылку для сброса пароля",
 	"authCheckEmailResendEmail": "Отправить письмо повторно",
 	"authCheckEmailBackTo": "Назад к",
-	"goBackTo": "Назад к",
-	"authCheckEmailDidntReceiveEmail": "Не получили письмо?",
-	"authCheckEmailClickToResend": "Нажмите, чтобы отправить повторно",
 	"authSetNewPasswordTitle": "Установите новый пароль",
-	"authSetNewPasswordDescription": "Ваш новый пароль должен отличаться от ранее использованных паролей.",
 	"authSetNewPasswordNewPassword": "Новый пароль",
-	"authSetNewPasswordConfirmPassword": "Подтвердите пароль",
-	"confirmPassword": "Подтвердите ваш пароль",
-	"authSetNewPasswordResetPassword": "Сбросить пароль",
 	"authSetNewPasswordBackTo": "Назад к",
-	"authPasswordMustBeAtLeast": "Должно быть как минимум",
-	"authPasswordCharactersLong": "длиной 8 символов",
-	"authPasswordMustContainAtLeast": "Должен содержать как минимум",
-	"authPasswordSpecialCharacter": "один специальный символ",
-	"authPasswordOneNumber": "одно число",
-	"authPasswordUpperCharacter": "один верхний символ",
-	"authPasswordLowerCharacter": "один нижний символ",
-	"authPasswordConfirmAndPassword": "Подтвердите пароль и пароль",
-	"authPasswordMustMatch": "должен совпадать",
 	"authRegisterCreateAccount": "Создайте свою учетную запись, чтобы начать",
-	"authRegisterCreateSuperAdminAccount": "Создайте учетную запись суперадминистратора, чтобы начать работу",
-	"authRegisterSignUpWithEmail": "Зарегистрироваться по электронной почте",
-	"authRegisterBySigningUp": "Регистрируясь, вы соглашаетесь с нашими",
 	"distributedStatusHeaderText": "Охват реального времени и реального устройства",
 	"distributedStatusSubHeaderText": "Работает на миллионах устройств по всему миру, просматривайте производительность системы по глобальному региону, стране или городу",
 	"settingsGeneralSettings": "Общие настройки",
@@ -136,9 +259,6 @@
 	"city": "ГОРОД",
 	"response": "ОТВЕТ",
 	"passwordreset": "Сброс пароля",
-	"authRegisterStepOnePersonalDetails": "Введите свои личные данные",
-	"authCheckEmailOpenEmailButton": "Откройте приложение почты",
-	"authNewPasswordConfirmed": "Ваш пароль успешно сброшен. Нажмите ниже, чтобы войти в систему магическим образом.",
 	"monitorStatusUp": "Монитор {name} ({url}) теперь включен и отвечает",
 	"monitorStatusDown": "Монитор {name} ({url}) ОТКЛЮЧЕН и не отвечает",
 	"webhookSendSuccess": "Уведомление Webhook успешно отправлено",
@@ -411,10 +531,7 @@
 	"DeleteDescriptionText": "Это приведет к удалению учетной записи и всех связанных с ней данных с сервера. Это необратимо.",
 	"DeleteAccountWarning": "Удаление вашей учетной записи означает, что вы не сможете снова войти в систему, и все ваши данные будут удалены. Это необратимо.",
 	"DeleteWarningTitle": "Действительно удаляете эту учетную запись?",
-	"authRegisterFirstName": "Имя",
-	"authRegisterLastName": "Фамилия",
 	"authRegisterEmail": "Email",
-	"authRegisterEmailRequired": "Чтобы продолжить, пожалуйста, введите свой адрес электронной почты",
 	"bulkImport": {
 		"title": "Массовый импорт",
 		"selectFileTips": "Выберите CSV-файл для загрузки",
@@ -426,8 +543,6 @@
 		"noFileSelected": "Файл не выбран",
 		"fallbackPage": "Импортируйте файл для массовой загрузки списка серверов"
 	},
-	"welcomeBack": "Добро пожаловать обратно! Вы успешно вошли в систему.",
-	"authRegisterLoginLink": "Войти",
 	"validationNameRequired": "Пожалуйста, введите свое имя",
 	"validationNameTooLong": "Длина имени не должна превышать 50 символов",
 	"validationNameInvalidCharacters": "Пожалуйста, используйте только буквы, пробелы, апострофы или дефисы",
@@ -435,10 +550,7 @@
 	"settingsSystemResetDescription": "Удалите все мониторы из вашей системы.",
 	"DeleteAccountTitle": "Удалить аккаунт",
 	"DeleteAccountButton": "Удалить аккаунт",
-	"authRegisterEmailInvalid": "Пожалуйста, введите действительный адрес электронной почты",
 	"publicLink": "Публичная ссылка",
-	"doNotHaveAccount": "У вас нет учетной записи?",
-	"registerHere": "Зарегистрируйтесь здесь",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Ключ API Google PageSpeed",
 	"pageSpeedApiKeyFieldLabel": "Ключ API PageSpeed",
@@ -523,7 +635,6 @@
 	"state": "Состояние",
 	"statusBreadCrumbsStatusPages": "Страницы статуса",
 	"statusBreadCrumbsDetails": "Подробности",
-	"authForgotPasswordInstructions": "Не беспокойтесь, мы вышлем вам инструкции по сбросу настроек.",
 	"settingsThemeModeLight": "Светлая",
 	"settingsThemeModeDark": "Тёмная",
 	"settingsClearAllStatsDialogCancel": "Отменить",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 59e911118..0d650e985 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "Ağ hatası",
-			"checkConnection": "Lütfen bağlantınızı kontrol edin"
+			"checkConnection": "Lütfen bağlantınızı kontrol edin",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Devam Et",
+				"back": "Geri"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-posta",
+					"placeholder": "",
+					"errors": {
+						"empty": "Devam etmek için lütfen e-posta adresinizi girin",
+						"invalid": "Lütfen geçerli bir eposta hesabı girin"
+					}
+				},
+				"password": {
+					"label": "Parola",
+					"rules": {
+						"length": {
+							"beginning": "En az",
+							"highlighted": "8 karakter uzunluğunda olmalı"
+						},
+						"special": {
+							"beginning": "En az içermeli",
+							"highlighted": "bir özel karakter"
+						},
+						"number": {
+							"beginning": "En az içermeli",
+							"highlighted": "bir rakam"
+						},
+						"uppercase": {
+							"beginning": "En az içermeli",
+							"highlighted": "bir büyük harf"
+						},
+						"lowercase": {
+							"beginning": "En az içermeli",
+							"highlighted": "bir küçük harf"
+						},
+						"match": {
+							"beginning": "Onay şifresi ve şifre",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "Parolayı onayla",
+					"placeholder": "Parolanızı onaylayın",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "İsim",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "Soyisim",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "Giriş Yap",
+			"subheadings": {
+				"stepOne": "E-posta adresinizi girin",
+				"stepTwo": "Parolanızı girin"
+			},
+			"links": {
+				"forgotPassword": "Parolanızı mı unuttunuz? <a>Parola sıfırla</a>",
+				"register": "Bir hesabınız yok mu? <a>Buradan kayıt olun</a>"
+			},
+			"toasts": {
+				"success": "Tekrar hoş geldiniz! Başarıyla giriş yaptınız.",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "Kayıt Ol"
+			},
+			"subheadings": {
+				"stepOne": "Kişisel bilgilerinizi girin",
+				"stepTwo": "E-posta adresinizi girin",
+				"stepThree": "Parolanızı oluşturun"
+			},
+			"description": {
+				"superAdmin": "Super admin hesabınızı oluşturmak için devam edin",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "E-posta ile kayıt ol",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": "Zaten hesabınız var mı? <a>Giriş yap</a>"
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "Parolanızı mı unuttunuz?",
+			"subheadings": {
+				"stepOne": "Endişelenmeyin, size sıfırlama talimatlarını göndereceğiz.",
+				"stepTwo": "<email/> adresine şifre sıfırlama bağlantısı gönderdik",
+				"stepThree": "Yeni şifreniz daha önce kullanılan şifrelerden farklı olmalıdır.",
+				"stepFour": "Parolanız başarıyla sıfırlandı. Otomatik olarak giriş yapmak için aşağıya tıklayın."
+			},
+			"buttons": {
+				"openEmail": "Eposta uygulamasını aç",
+				"resetPassword": "Parola sıfırla"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "Geri dön <a>Giriş Yap</a>",
+				"resend": "E-posta almadınız mı? <a>Yeniden göndermek için tıklayın</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "Hesabınız yok mu",
-	"email": "E-posta",
 	"forgotPassword": "Parolamı unuttum",
-	"password": "Parola",
-	"signUp": "Kayıt Ol",
 	"submit": "Gönder",
 	"title": "Başlık",
-	"continue": "Devam Et",
 	"enterEmail": "E-posta adresinizi girin",
-	"authLoginTitle": "Giriş Yap",
-	"authLoginEnterPassword": "Parolanızı girin",
 	"commonPassword": "Parola",
-	"commonBack": "Geri",
-	"authForgotPasswordTitle": "Parolanızı mı unuttunuz?",
-	"authForgotPasswordResetPassword": "Parola sıfırla",
-	"createPassword": "Parolanızı oluşturun",
-	"createAPassword": "Bir parola oluşturun",
-	"authRegisterAlreadyHaveAccount": "Zaten hesabınız var mı?",
-	"authLoginEnterEmail": "E-posta adresinizi girin",
 	"authRegisterTitle": "Hesap oluştur",
 	"authRegisterStepOneTitle": "Hesabınızı oluşturun",
 	"authRegisterStepOneDescription": "Başlamak için bilgilerinizi girin",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "Kendiniz hakkında daha fazla bilgi verin",
 	"authRegisterStepThreeTitle": "Neredeyse bitti!",
 	"authRegisterStepThreeDescription": "Bilgilerinizi gözden geçirin",
-	"authForgotPasswordDescription": "Endişelenmeyin, size sıfırlama talimatlarını göndereceğiz.",
 	"authForgotPasswordSendInstructions": "Talimatları gönder",
 	"authForgotPasswordBackTo": "Geri dön",
 	"authCheckEmailTitle": "E-postanızı kontrol edin",
-	"authCheckEmailDescription": "{{email}} adresine şifre sıfırlama bağlantısı gönderdik",
 	"authCheckEmailResendEmail": "E-postayı yeniden gönder",
 	"authCheckEmailBackTo": "Geri dön",
-	"goBackTo": "Geri dön",
-	"authCheckEmailDidntReceiveEmail": "E-posta almadınız mı?",
-	"authCheckEmailClickToResend": "Yeniden göndermek için tıklayın",
 	"authSetNewPasswordTitle": "Yeni şifre belirle",
-	"authSetNewPasswordDescription": "Yeni şifreniz daha önce kullanılan şifrelerden farklı olmalıdır.",
 	"authSetNewPasswordNewPassword": "Yeni şifre",
-	"authSetNewPasswordConfirmPassword": "Parolayı onayla",
-	"confirmPassword": "Parolanızı onaylayın",
-	"authSetNewPasswordResetPassword": "Parola sıfırla",
 	"authSetNewPasswordBackTo": "Geri dön",
-	"authPasswordMustBeAtLeast": "En az",
-	"authPasswordCharactersLong": "8 karakter uzunluğunda olmalı",
-	"authPasswordMustContainAtLeast": "En az içermeli",
-	"authPasswordSpecialCharacter": "bir özel karakter",
-	"authPasswordOneNumber": "bir rakam",
-	"authPasswordUpperCharacter": "bir büyük harf",
-	"authPasswordLowerCharacter": "bir küçük harf",
-	"authPasswordConfirmAndPassword": "Onay şifresi ve şifre",
-	"authPasswordMustMatch": "eşleşmelidir",
 	"authRegisterCreateAccount": "Hesap oluşturmak için devam et",
-	"authRegisterCreateSuperAdminAccount": "Super admin hesabınızı oluşturmak için devam edin",
-	"authRegisterSignUpWithEmail": "E-posta ile kayıt ol",
-	"authRegisterBySigningUp": "Kayıt olarak, aşağıdaki şartları kabul ediyorsunuz:",
 	"distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
 	"distributedStatusSubHeaderText": "Dünya çapında milyonlarca cihaz tarafından desteklenen sistem performansını küresel bölgeye, ülkeye veya şehre göre görüntüleyin",
 	"settingsGeneralSettings": "Genel ayarlar",
@@ -140,9 +263,6 @@
 	"city": "ŞEHİR",
 	"response": "YANIT",
 	"passwordreset": "Parola Sıfırlama",
-	"authRegisterStepOnePersonalDetails": "Kişisel bilgilerinizi girin",
-	"authCheckEmailOpenEmailButton": "Eposta uygulamasını aç",
-	"authNewPasswordConfirmed": "Parolanız başarıyla sıfırlandı. Otomatik olarak giriş yapmak için aşağıya tıklayın.",
 	"monitorStatusUp": "Monitör {name} ({url}) ayakta ve yanıt veriyor",
 	"monitorStatusDown": "Monitör {name} ({url}) yanıt vermiyor",
 	"webhookSendSuccess": "Web kanca bildirimi başarıyla gönderildi",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "Bu, hesabı ve ilişkili tüm verileri sunucudan kaldıracaktır. Bu geri alınamaz.",
 	"DeleteAccountWarning": "Hesabınızı kaldırmanız, tekrar oturum açamayacağınız ve tüm verilerinizin silineceği anlamına gelir. Bu geri alınamaz.",
 	"DeleteWarningTitle": "Gerçekten bu hesabı silmek istiyor musunuz?",
-	"authRegisterFirstName": "İsim",
-	"authRegisterLastName": "Soyisim",
 	"authRegisterEmail": "E-posta",
-	"authRegisterEmailRequired": "Devam etmek için lütfen e-posta adresinizi girin",
 	"bulkImport": {
 		"title": "Toplu içeri alma",
 		"selectFileTips": "Yüklenecek CSV dosyasını seçin",
@@ -431,8 +548,6 @@
 		"noFileSelected": "Hiçbir dosya seçilmedi",
 		"fallbackPage": "Toplu olarak sunucu listesini yüklemek için bir dosyayı içe aktarın"
 	},
-	"welcomeBack": "Tekrar hoş geldiniz! Başarıyla giriş yaptınız.",
-	"authRegisterLoginLink": "Giriş yap",
 	"validationNameRequired": "Lütfen adınızı girin",
 	"validationNameTooLong": "İsim 50 karakterden az olmalıdır",
 	"validationNameInvalidCharacters": "Lütfen sadece harfler, boşluk, tırnak ve çizgi kullanın",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "Sistemdeki tüm monitörleri silin",
 	"DeleteAccountTitle": "Hesabı sil",
 	"DeleteAccountButton": "Hesabı sil",
-	"authRegisterEmailInvalid": "Lütfen geçerli bir eposta hesabı girin",
 	"publicLink": "Herkese açık bağlantı",
-	"doNotHaveAccount": "Bir hesabınız yok mu?",
-	"registerHere": "Buradan kayıt olun",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
 	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API anahtarı",
 	"pageSpeedApiKeyFieldLabel": "PageSpeed API anahtarı",
@@ -528,7 +640,6 @@
 	"state": "Durum",
 	"statusBreadCrumbsStatusPages": "Durum sayfası",
 	"statusBreadCrumbsDetails": "Detaylar",
-	"authForgotPasswordInstructions": "Endişelenmeyin, size sıfırlama talimatlarını göndereceğiz.",
 	"settingsThemeModeLight": "Aydınlat",
 	"settingsThemeModeDark": "Karart",
 	"settingsClearAllStatsDialogCancel": "İptal",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 98fed65ef..11c063580 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -7,7 +7,164 @@
 		},
 		"toasts": {
 			"networkError": "",
-			"checkConnection": ""
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "繼續",
+				"back": "回去"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-mail",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "密碼",
+					"rules": {
+						"length": {
+							"beginning": "必須至少",
+							"highlighted": "8 個字符長"
+						},
+						"special": {
+							"beginning": "必須至少包含",
+							"highlighted": "一個特殊字符"
+						},
+						"number": {
+							"beginning": "必須至少包含",
+							"highlighted": "一個數字"
+						},
+						"uppercase": {
+							"beginning": "必須至少包含",
+							"highlighted": "一個大寫字母"
+						},
+						"lowercase": {
+							"beginning": "必須至少包含",
+							"highlighted": "一個小寫字母"
+						},
+						"match": {
+							"beginning": "確認密碼",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "確認密碼",
+					"placeholder": "確認您的密碼",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "登入",
+			"subheadings": {
+				"stepOne": "輸入您的 E-mail",
+				"stepTwo": "輸入您的密碼"
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": "註冊"
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "輸入您的 E-mail",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "建立您的超級管理員帳號開始使用",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "用 E-mail 註冊",
+				"user": ""
+			},
+			"termsAndPolicies": "註冊即表示您同意我們的",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "忘記密碼？",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "我們已將密碼重設連結發送至 <email/>",
+				"stepThree": "您的新密碼必須與之前使用過的密碼不同。",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": "重設密碼"
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "回去 <a>登入</a>",
+				"resend": "沒有受到 E-mail？ <a>點擊</a>"
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
 		}
 	},
 	"errorPages": {
@@ -25,24 +182,11 @@
 		}
 	},
 	"dontHaveAccount": "沒有帳號",
-	"email": "E-mail",
 	"forgotPassword": "忘記密碼",
-	"password": "密碼",
-	"signUp": "註冊",
 	"submit": "",
 	"title": "",
-	"continue": "繼續",
 	"enterEmail": "輸入您的 E-mail",
-	"authLoginTitle": "登入",
-	"authLoginEnterPassword": "輸入您的密碼",
 	"commonPassword": "密碼",
-	"commonBack": "回去",
-	"authForgotPasswordTitle": "忘記密碼？",
-	"authForgotPasswordResetPassword": "",
-	"createPassword": "",
-	"createAPassword": "",
-	"authRegisterAlreadyHaveAccount": "已經有帳號嗎？",
-	"authLoginEnterEmail": "輸入您的 E-mail",
 	"authRegisterTitle": "建立帳號",
 	"authRegisterStepOneTitle": "建立您的帳號",
 	"authRegisterStepOneDescription": "清輸入您的個人檔案",
@@ -50,36 +194,15 @@
 	"authRegisterStepTwoDescription": "請分享更多關於您的資訊",
 	"authRegisterStepThreeTitle": "快完成了！",
 	"authRegisterStepThreeDescription": "請確認您的資訊",
-	"authForgotPasswordDescription": "別擔心，我們會發送重設說明給您。",
 	"authForgotPasswordSendInstructions": "將說明發送至",
 	"authForgotPasswordBackTo": "回去",
 	"authCheckEmailTitle": "請查看您的電子郵件",
-	"authCheckEmailDescription": "我們已將密碼重設連結發送至",
 	"authCheckEmailResendEmail": "重新發送 E-mail",
 	"authCheckEmailBackTo": "回去",
-	"goBackTo": "回去",
-	"authCheckEmailDidntReceiveEmail": "沒有受到 E-mail？",
-	"authCheckEmailClickToResend": "點擊",
 	"authSetNewPasswordTitle": "設定新密碼",
-	"authSetNewPasswordDescription": "您的新密碼必須與之前使用過的密碼不同。",
 	"authSetNewPasswordNewPassword": "新密碼",
-	"authSetNewPasswordConfirmPassword": "確認密碼",
-	"confirmPassword": "確認您的密碼",
-	"authSetNewPasswordResetPassword": "重設密碼",
 	"authSetNewPasswordBackTo": "回去",
-	"authPasswordMustBeAtLeast": "必須至少",
-	"authPasswordCharactersLong": "8 個字符長",
-	"authPasswordMustContainAtLeast": "必須至少包含",
-	"authPasswordSpecialCharacter": "一個特殊字符",
-	"authPasswordOneNumber": "一個數字",
-	"authPasswordUpperCharacter": "一個大寫字母",
-	"authPasswordLowerCharacter": "一個小寫字母",
-	"authPasswordConfirmAndPassword": "確認密碼",
-	"authPasswordMustMatch": "必須相符",
 	"authRegisterCreateAccount": "建立您的帳號開始使用",
-	"authRegisterCreateSuperAdminAccount": "建立您的超級管理員帳號開始使用",
-	"authRegisterSignUpWithEmail": "用 E-mail 註冊",
-	"authRegisterBySigningUp": "註冊即表示您同意我們的",
 	"distributedStatusHeaderText": "實時、真實設備覆蓋",
 	"distributedStatusSubHeaderText": "由全球數百萬個設備提供支持，您可以按全球區域、國家或城市查看系統效能",
 	"settingsGeneralSettings": "一般設定",
@@ -140,9 +263,6 @@
 	"city": "",
 	"response": "",
 	"passwordreset": "",
-	"authRegisterStepOnePersonalDetails": "",
-	"authCheckEmailOpenEmailButton": "",
-	"authNewPasswordConfirmed": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -416,10 +536,7 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterFirstName": "",
-	"authRegisterLastName": "",
 	"authRegisterEmail": "",
-	"authRegisterEmailRequired": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -431,8 +548,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"welcomeBack": "",
-	"authRegisterLoginLink": "",
 	"validationNameRequired": "",
 	"validationNameTooLong": "",
 	"validationNameInvalidCharacters": "",
@@ -440,10 +555,7 @@
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
-	"authRegisterEmailInvalid": "",
 	"publicLink": "",
-	"doNotHaveAccount": "",
-	"registerHere": "",
 	"maskedPageSpeedKeyPlaceholder": "",
 	"pageSpeedApiKeyFieldTitle": "",
 	"pageSpeedApiKeyFieldLabel": "",
@@ -528,7 +640,6 @@
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"authForgotPasswordInstructions": "",
 	"settingsThemeModeLight": "",
 	"settingsThemeModeDark": "",
 	"settingsClearAllStatsDialogCancel": "",

From 8c9084cc7a7840cad239705897959224681530c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sun, 8 Jun 2025 16:15:37 +0200
Subject: [PATCH 078/319] i18n: Clean up auth-related keys

Removes only keys that aren't used on any place (I searched for
each of them in all Components and Pages).
---
 client/src/locales/cs.json    | 25 -------------------------
 client/src/locales/de.json    | 25 -------------------------
 client/src/locales/en.json    | 25 -------------------------
 client/src/locales/es.json    | 25 -------------------------
 client/src/locales/fi.json    | 25 -------------------------
 client/src/locales/fr.json    | 25 -------------------------
 client/src/locales/pt-BR.json | 25 -------------------------
 client/src/locales/ru.json    | 25 -------------------------
 client/src/locales/tr.json    | 25 -------------------------
 client/src/locales/zh-TW.json | 25 -------------------------
 10 files changed, 250 deletions(-)

diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 3bb64e6c9..60bc510f0 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -181,29 +181,9 @@
 			}
 		}
 	},
-	"dontHaveAccount": "",
-	"forgotPassword": "",
 	"submit": "",
 	"title": "",
-	"enterEmail": "",
-	"commonPassword": "",
 	"createPassword": "",
-	"authRegisterTitle": "",
-	"authRegisterStepOneTitle": "",
-	"authRegisterStepOneDescription": "",
-	"authRegisterStepTwoTitle": "",
-	"authRegisterStepTwoDescription": "",
-	"authRegisterStepThreeTitle": "",
-	"authRegisterStepThreeDescription": "",
-	"authForgotPasswordSendInstructions": "",
-	"authForgotPasswordBackTo": "",
-	"authCheckEmailTitle": "",
-	"authCheckEmailResendEmail": "",
-	"authCheckEmailBackTo": "",
-	"authSetNewPasswordTitle": "",
-	"authSetNewPasswordNewPassword": "",
-	"authSetNewPasswordBackTo": "",
-	"authRegisterCreateAccount": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -263,7 +243,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"passwordreset": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -537,7 +516,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterEmail": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -549,9 +527,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 753af8b3c..8aa520e29 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Noch kein Konto",
-	"forgotPassword": "Passwort vergessen",
 	"submit": "Absenden",
 	"title": "Titel",
-	"enterEmail": "Geben Sie Ihre E-Mail-Adresse ein",
-	"commonPassword": "Passwort",
-	"authRegisterTitle": "",
-	"authRegisterStepOneTitle": "",
-	"authRegisterStepOneDescription": "",
-	"authRegisterStepTwoTitle": "",
-	"authRegisterStepTwoDescription": "",
-	"authRegisterStepThreeTitle": "",
-	"authRegisterStepThreeDescription": "",
-	"authForgotPasswordSendInstructions": "",
-	"authForgotPasswordBackTo": "",
-	"authCheckEmailTitle": "",
-	"authCheckEmailResendEmail": "",
-	"authCheckEmailBackTo": "",
-	"authSetNewPasswordTitle": "",
-	"authSetNewPasswordNewPassword": "",
-	"authSetNewPasswordBackTo": "",
-	"authRegisterCreateAccount": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -262,7 +242,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"passwordreset": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterEmail": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -548,9 +526,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index af06f419b..63802c7dc 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Don't have account",
-	"forgotPassword": "Forgot Password",
 	"submit": "Submit",
 	"title": "Title",
-	"enterEmail": "Enter your email",
-	"commonPassword": "Password",
-	"authRegisterTitle": "Create an account",
-	"authRegisterStepOneTitle": "Create your account",
-	"authRegisterStepOneDescription": "Enter your details to get started",
-	"authRegisterStepTwoTitle": "Set up your profile",
-	"authRegisterStepTwoDescription": "Tell us more about yourself",
-	"authRegisterStepThreeTitle": "Almost done!",
-	"authRegisterStepThreeDescription": "Review your information",
-	"authForgotPasswordSendInstructions": "Send instructions",
-	"authForgotPasswordBackTo": "Back to",
-	"authCheckEmailTitle": "Check your email",
-	"authCheckEmailResendEmail": "Resend email",
-	"authCheckEmailBackTo": "Back to",
-	"authSetNewPasswordTitle": "Set new password",
-	"authSetNewPasswordNewPassword": "New password",
-	"authSetNewPasswordBackTo": "Back to",
-	"authRegisterCreateAccount": "Create your account to get started",
 	"distributedStatusHeaderText": "Real-time, real-device coverage",
 	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
 	"settingsGeneralSettings": "General settings",
@@ -258,7 +238,6 @@
 	"country": "COUNTRY",
 	"city": "CITY",
 	"response": "RESPONSE",
-	"passwordreset": "Password Reset",
 	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
 	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
 	"webhookSendSuccess": "Webhook notification sent successfully",
@@ -528,7 +507,6 @@
 	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
 	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
 	"DeleteWarningTitle": "Really remove this account?",
-	"authRegisterEmail": "Email",
 	"bulkImport": {
 		"title": "Bulk Import",
 		"selectFileTips": "Select CSV file to upload",
@@ -540,9 +518,6 @@
 		"noFileSelected": "No file selected",
 		"fallbackPage": "Import a file to upload a list of servers in bulk"
 	},
-	"validationNameRequired": "Please enter your name",
-	"validationNameTooLong": "Name should be less than 50 characters",
-	"validationNameInvalidCharacters": "Please use only letters, spaces, apostrophes, or hyphens",
 	"settingsSystemReset": "System reset",
 	"settingsSystemResetDescription": "Remove all monitors from your system.",
 	"DeleteAccountTitle": "Remove account",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 5c0f551ad..0abc46c8c 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "No tengo una cuenta",
-	"forgotPassword": "He olvidado mi contraseña",
 	"submit": "Enviar",
 	"title": "Titulo",
-	"enterEmail": "Introduce tu email",
-	"commonPassword": "Contraseña",
-	"authRegisterTitle": "Crear una cuenta",
-	"authRegisterStepOneTitle": "Crea tu cuenta",
-	"authRegisterStepOneDescription": "",
-	"authRegisterStepTwoTitle": "Configura tu perfil",
-	"authRegisterStepTwoDescription": "Cuentano mas sobre ti",
-	"authRegisterStepThreeTitle": "Ya casi estamos!",
-	"authRegisterStepThreeDescription": "Revisa tu informacion",
-	"authForgotPasswordSendInstructions": "Enviar instrucciones",
-	"authForgotPasswordBackTo": "Volver a",
-	"authCheckEmailTitle": "Comprueba tu correo",
-	"authCheckEmailResendEmail": "Reenviar correo",
-	"authCheckEmailBackTo": "Volver a",
-	"authSetNewPasswordTitle": "Configurar nueva contraseña",
-	"authSetNewPasswordNewPassword": "Nueva contraseña",
-	"authSetNewPasswordBackTo": "Volver a",
-	"authRegisterCreateAccount": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "",
@@ -262,7 +242,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"passwordreset": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterEmail": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -548,9 +526,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index b4c364fe5..bd6f9a81f 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Ei tiliä",
-	"forgotPassword": "Unohtunut salasana",
 	"submit": "Lähetä",
 	"title": "Otsikko",
-	"enterEmail": "Syötä sähköpostiosoitteesi",
-	"commonPassword": "Salasana",
-	"authRegisterTitle": "Luo tili",
-	"authRegisterStepOneTitle": "Luo tilisi",
-	"authRegisterStepOneDescription": "Kirjoita tietosi aloittaaksesi",
-	"authRegisterStepTwoTitle": "Määritä profiilisi",
-	"authRegisterStepTwoDescription": "Kerro meille lisää itsestäsi",
-	"authRegisterStepThreeTitle": "Melkein valmis!",
-	"authRegisterStepThreeDescription": "Tarkista tietosi",
-	"authForgotPasswordSendInstructions": "Lähetä ohjeet",
-	"authForgotPasswordBackTo": "Palaa",
-	"authCheckEmailTitle": "Tarkista sähköpostisi",
-	"authCheckEmailResendEmail": "Lähetä sähköposti uudelleen",
-	"authCheckEmailBackTo": "Palaa",
-	"authSetNewPasswordTitle": "Aseta uusi salasana",
-	"authSetNewPasswordNewPassword": "Uusi salasana",
-	"authSetNewPasswordBackTo": "Takaisin",
-	"authRegisterCreateAccount": "Luo tili aloittaaksesi",
 	"distributedStatusHeaderText": "Reaaliaikainen kattavuus oikeilla laitteilla",
 	"distributedStatusSubHeaderText": "Miljoonien laitteiden voimin ympäri maailman näet järjestelmän suorituskyvyn maailman alueittain, maittain tai kaupungeittain",
 	"settingsGeneralSettings": "Yleiset asetukset",
@@ -262,7 +242,6 @@
 	"country": "MAA",
 	"city": "KAUPUNKI",
 	"response": "Vastaus",
-	"passwordreset": "Salasanan nollaus",
 	"monitorStatusUp": "Valvontakohde {name} ({url}) on nyt toiminnassa ja vastaa",
 	"monitorStatusDown": "Valvontakohde {name} ({url}) ei ole toiminnassa, eikä vastaa",
 	"webhookSendSuccess": "Webhook-ilmoitus lähetettiin onnistuneesti",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "Haluatko todella poistaa tämän tilin?",
-	"authRegisterEmail": "Sähköpostiosoite",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -548,9 +526,6 @@
 		"noFileSelected": "Ei valittua tiedostoa",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "Kirjoita nimesi",
-	"validationNameTooLong": "Nimen tulee olla alle 50 merkkiä",
-	"validationNameInvalidCharacters": "Käytäthän vain kirjaimia, välilyöntejä, heittomerkkejä tai yhdysmerkkejä",
 	"settingsSystemReset": "Järjestelmän palautus",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Poista tili",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 092cb3c9d..a4c31b5c6 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Vous n'avez pas de compte",
-	"forgotPassword": "Mot de passe oublié",
 	"submit": "Envoyer",
 	"title": "Titre",
-	"enterEmail": "Entrez votre adresse e-mail",
-	"commonPassword": "Mot de passe",
-	"authRegisterTitle": "Créer un compte",
-	"authRegisterStepOneTitle": "Créez votre compte",
-	"authRegisterStepOneDescription": "Entrez vos informations pour commencer",
-	"authRegisterStepTwoTitle": "Créer votre profil",
-	"authRegisterStepTwoDescription": "Parlez-nous un peu de vous",
-	"authRegisterStepThreeTitle": "Presque fini !",
-	"authRegisterStepThreeDescription": "Vérifiez vos infos",
-	"authForgotPasswordSendInstructions": "Envoyer les instructions",
-	"authForgotPasswordBackTo": "Retourner à",
-	"authCheckEmailTitle": "Vérifiez votre e-mail",
-	"authCheckEmailResendEmail": "Renvoyer le mail",
-	"authCheckEmailBackTo": "Retourner à",
-	"authSetNewPasswordTitle": "Définir un nouveau mot de passe",
-	"authSetNewPasswordNewPassword": "Nouveau mot de passe",
-	"authSetNewPasswordBackTo": "Retourner à",
-	"authRegisterCreateAccount": "Créez votre compte pour commencer",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
 	"settingsGeneralSettings": "Paramètres généraux",
@@ -262,7 +242,6 @@
 	"country": "PAYS",
 	"city": "VILLE",
 	"response": "",
-	"passwordreset": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "Vous supprimez vraiment ce compte ?",
-	"authRegisterEmail": "Email",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -548,9 +526,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "Veuillez saisir votre nom",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "Veuillez utiliser uniquement des lettres, des espaces, des apostrophes ou des traits d'union",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Supprimer le compte",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index f042e5fd6..e90c89a62 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Não tenho conta",
-	"forgotPassword": "Esqueci a senha",
 	"submit": "Enviar",
 	"title": "Título",
-	"enterEmail": "Insira seu e-mail",
-	"commonPassword": "Senha",
-	"authRegisterTitle": "Criar uma conta",
-	"authRegisterStepOneTitle": "Crie sua conta",
-	"authRegisterStepOneDescription": "Insira seus dados para começar",
-	"authRegisterStepTwoTitle": "Configure seu perfil",
-	"authRegisterStepTwoDescription": "Conte-nos mais sobre você",
-	"authRegisterStepThreeTitle": "Quase pronto!",
-	"authRegisterStepThreeDescription": "Revise suas informações",
-	"authForgotPasswordSendInstructions": "Enviar instruções",
-	"authForgotPasswordBackTo": "Voltar para",
-	"authCheckEmailTitle": "Verifique seu e-mail",
-	"authCheckEmailResendEmail": "Reenviar e-mail",
-	"authCheckEmailBackTo": "Voltar para",
-	"authSetNewPasswordTitle": "Definir nova senha",
-	"authSetNewPasswordNewPassword": "Nova senha",
-	"authSetNewPasswordBackTo": "Voltar para",
-	"authRegisterCreateAccount": "Crie sua conta para começar",
 	"distributedStatusHeaderText": "Cobertura em tempo real e em dispositivos reais",
 	"distributedStatusSubHeaderText": "Impulsionado por milhões de dispositivos em todo o mundo, visualize o desempenho do sistema por região global, país ou cidade",
 	"settingsGeneralSettings": "Configurações gerais",
@@ -261,7 +241,6 @@
 	"country": "PAÍS",
 	"city": "CIDADE",
 	"response": "RESPOSTA",
-	"passwordreset": "Redefinição de senha",
 	"monitorStatusUp": "O monitor {name} ({url}) agora está ATIVO e respondendo",
 	"monitorStatusDown": "O monitor {name} ({url}) está INATIVO e não está respondendo",
 	"webhookSendSuccess": "Notificação de webhook enviada com sucesso",
@@ -535,7 +514,6 @@
 	"DeleteDescriptionText": "Isso removerá a conta e todos os dados associados do servidor. Essa ação não é reversível.",
 	"DeleteAccountWarning": "Remover sua conta significa que você não poderá fazer login novamente e todos os seus dados serão removidos. Isso não é reversível.",
 	"DeleteWarningTitle": "Deseja realmente remover esta conta?",
-	"authRegisterEmail": "E-mail",
 	"bulkImport": {
 		"title": "Bulk Import",
 		"selectFileTips": "Selecione o arquivo CSV para enviar",
@@ -547,9 +525,6 @@
 		"noFileSelected": "Nenhum arquivo selecionado",
 		"fallbackPage": "Importe um arquivo para enviar uma lista de servidores em massa"
 	},
-	"validationNameRequired": "Por favor digite seu nome",
-	"validationNameTooLong": "O nome deve ter menos de 50 caracteres",
-	"validationNameInvalidCharacters": "Por favor, use apenas letras, espaços, apóstrofos ou hifens",
 	"settingsSystemReset": "Resetar sistema",
 	"settingsSystemResetDescription": "Remova todos os monitores do seu sistema.",
 	"DeleteAccountTitle": "Remover conta",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index f6ccdd5fd..9c74921a1 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Нет аккаунта",
-	"forgotPassword": "Забыли пароль",
 	"submit": "Подтвердить",
 	"title": "Название",
-	"enterEmail": "Введите свой email",
-	"commonPassword": "Пароль",
-	"authRegisterTitle": "Создать аккаунт",
-	"authRegisterStepOneTitle": "Создайте свой аккаут",
-	"authRegisterStepOneDescription": "Введите свои данные, чтобы начать",
-	"authRegisterStepTwoTitle": "Настройте свой профиль",
-	"authRegisterStepTwoDescription": "Расскажите нам о себе",
-	"authRegisterStepThreeTitle": "Почти готово!",
-	"authRegisterStepThreeDescription": "Проверьте свою информацию",
-	"authForgotPasswordSendInstructions": "Отправить инструкции",
-	"authForgotPasswordBackTo": "Назад к",
-	"authCheckEmailTitle": "Проверьте свою почту",
-	"authCheckEmailResendEmail": "Отправить письмо повторно",
-	"authCheckEmailBackTo": "Назад к",
-	"authSetNewPasswordTitle": "Установите новый пароль",
-	"authSetNewPasswordNewPassword": "Новый пароль",
-	"authSetNewPasswordBackTo": "Назад к",
-	"authRegisterCreateAccount": "Создайте свою учетную запись, чтобы начать",
 	"distributedStatusHeaderText": "Охват реального времени и реального устройства",
 	"distributedStatusSubHeaderText": "Работает на миллионах устройств по всему миру, просматривайте производительность системы по глобальному региону, стране или городу",
 	"settingsGeneralSettings": "Общие настройки",
@@ -258,7 +238,6 @@
 	"country": "СТРАНА",
 	"city": "ГОРОД",
 	"response": "ОТВЕТ",
-	"passwordreset": "Сброс пароля",
 	"monitorStatusUp": "Монитор {name} ({url}) теперь включен и отвечает",
 	"monitorStatusDown": "Монитор {name} ({url}) ОТКЛЮЧЕН и не отвечает",
 	"webhookSendSuccess": "Уведомление Webhook успешно отправлено",
@@ -531,7 +510,6 @@
 	"DeleteDescriptionText": "Это приведет к удалению учетной записи и всех связанных с ней данных с сервера. Это необратимо.",
 	"DeleteAccountWarning": "Удаление вашей учетной записи означает, что вы не сможете снова войти в систему, и все ваши данные будут удалены. Это необратимо.",
 	"DeleteWarningTitle": "Действительно удаляете эту учетную запись?",
-	"authRegisterEmail": "Email",
 	"bulkImport": {
 		"title": "Массовый импорт",
 		"selectFileTips": "Выберите CSV-файл для загрузки",
@@ -543,9 +521,6 @@
 		"noFileSelected": "Файл не выбран",
 		"fallbackPage": "Импортируйте файл для массовой загрузки списка серверов"
 	},
-	"validationNameRequired": "Пожалуйста, введите свое имя",
-	"validationNameTooLong": "Длина имени не должна превышать 50 символов",
-	"validationNameInvalidCharacters": "Пожалуйста, используйте только буквы, пробелы, апострофы или дефисы",
 	"settingsSystemReset": "Сброс системы",
 	"settingsSystemResetDescription": "Удалите все мониторы из вашей системы.",
 	"DeleteAccountTitle": "Удалить аккаунт",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 0d650e985..28b9bd346 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "Hesabınız yok mu",
-	"forgotPassword": "Parolamı unuttum",
 	"submit": "Gönder",
 	"title": "Başlık",
-	"enterEmail": "E-posta adresinizi girin",
-	"commonPassword": "Parola",
-	"authRegisterTitle": "Hesap oluştur",
-	"authRegisterStepOneTitle": "Hesabınızı oluşturun",
-	"authRegisterStepOneDescription": "Başlamak için bilgilerinizi girin",
-	"authRegisterStepTwoTitle": "Profilinizi ayarlayın",
-	"authRegisterStepTwoDescription": "Kendiniz hakkında daha fazla bilgi verin",
-	"authRegisterStepThreeTitle": "Neredeyse bitti!",
-	"authRegisterStepThreeDescription": "Bilgilerinizi gözden geçirin",
-	"authForgotPasswordSendInstructions": "Talimatları gönder",
-	"authForgotPasswordBackTo": "Geri dön",
-	"authCheckEmailTitle": "E-postanızı kontrol edin",
-	"authCheckEmailResendEmail": "E-postayı yeniden gönder",
-	"authCheckEmailBackTo": "Geri dön",
-	"authSetNewPasswordTitle": "Yeni şifre belirle",
-	"authSetNewPasswordNewPassword": "Yeni şifre",
-	"authSetNewPasswordBackTo": "Geri dön",
-	"authRegisterCreateAccount": "Hesap oluşturmak için devam et",
 	"distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
 	"distributedStatusSubHeaderText": "Dünya çapında milyonlarca cihaz tarafından desteklenen sistem performansını küresel bölgeye, ülkeye veya şehre göre görüntüleyin",
 	"settingsGeneralSettings": "Genel ayarlar",
@@ -262,7 +242,6 @@
 	"country": "ÜLKE",
 	"city": "ŞEHİR",
 	"response": "YANIT",
-	"passwordreset": "Parola Sıfırlama",
 	"monitorStatusUp": "Monitör {name} ({url}) ayakta ve yanıt veriyor",
 	"monitorStatusDown": "Monitör {name} ({url}) yanıt vermiyor",
 	"webhookSendSuccess": "Web kanca bildirimi başarıyla gönderildi",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "Bu, hesabı ve ilişkili tüm verileri sunucudan kaldıracaktır. Bu geri alınamaz.",
 	"DeleteAccountWarning": "Hesabınızı kaldırmanız, tekrar oturum açamayacağınız ve tüm verilerinizin silineceği anlamına gelir. Bu geri alınamaz.",
 	"DeleteWarningTitle": "Gerçekten bu hesabı silmek istiyor musunuz?",
-	"authRegisterEmail": "E-posta",
 	"bulkImport": {
 		"title": "Toplu içeri alma",
 		"selectFileTips": "Yüklenecek CSV dosyasını seçin",
@@ -548,9 +526,6 @@
 		"noFileSelected": "Hiçbir dosya seçilmedi",
 		"fallbackPage": "Toplu olarak sunucu listesini yüklemek için bir dosyayı içe aktarın"
 	},
-	"validationNameRequired": "Lütfen adınızı girin",
-	"validationNameTooLong": "İsim 50 karakterden az olmalıdır",
-	"validationNameInvalidCharacters": "Lütfen sadece harfler, boşluk, tırnak ve çizgi kullanın",
 	"settingsSystemReset": "Sistem sıfırla",
 	"settingsSystemResetDescription": "Sistemdeki tüm monitörleri silin",
 	"DeleteAccountTitle": "Hesabı sil",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 11c063580..2f4668548 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -181,28 +181,8 @@
 			}
 		}
 	},
-	"dontHaveAccount": "沒有帳號",
-	"forgotPassword": "忘記密碼",
 	"submit": "",
 	"title": "",
-	"enterEmail": "輸入您的 E-mail",
-	"commonPassword": "密碼",
-	"authRegisterTitle": "建立帳號",
-	"authRegisterStepOneTitle": "建立您的帳號",
-	"authRegisterStepOneDescription": "清輸入您的個人檔案",
-	"authRegisterStepTwoTitle": "設定您的個人檔案",
-	"authRegisterStepTwoDescription": "請分享更多關於您的資訊",
-	"authRegisterStepThreeTitle": "快完成了！",
-	"authRegisterStepThreeDescription": "請確認您的資訊",
-	"authForgotPasswordSendInstructions": "將說明發送至",
-	"authForgotPasswordBackTo": "回去",
-	"authCheckEmailTitle": "請查看您的電子郵件",
-	"authCheckEmailResendEmail": "重新發送 E-mail",
-	"authCheckEmailBackTo": "回去",
-	"authSetNewPasswordTitle": "設定新密碼",
-	"authSetNewPasswordNewPassword": "新密碼",
-	"authSetNewPasswordBackTo": "回去",
-	"authRegisterCreateAccount": "建立您的帳號開始使用",
 	"distributedStatusHeaderText": "實時、真實設備覆蓋",
 	"distributedStatusSubHeaderText": "由全球數百萬個設備提供支持，您可以按全球區域、國家或城市查看系統效能",
 	"settingsGeneralSettings": "一般設定",
@@ -262,7 +242,6 @@
 	"country": "",
 	"city": "",
 	"response": "",
-	"passwordreset": "",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -536,7 +515,6 @@
 	"DeleteDescriptionText": "",
 	"DeleteAccountWarning": "",
 	"DeleteWarningTitle": "",
-	"authRegisterEmail": "",
 	"bulkImport": {
 		"title": "",
 		"selectFileTips": "",
@@ -548,9 +526,6 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"validationNameRequired": "",
-	"validationNameTooLong": "",
-	"validationNameInvalidCharacters": "",
 	"settingsSystemReset": "",
 	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",

From 89bc2a9293ca15a099375bb68132f285d0400fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0mahel?=
 <48548230+ceskyDJ@users.noreply.github.com>
Date: Sun, 8 Jun 2025 16:33:12 +0200
Subject: [PATCH 079/319] style: Reformat code

---
 .../Components/TabPanels/Account/TeamPanel.jsx   |  5 ++++-
 client/src/Components/ThemeSwitch/index.jsx      |  2 +-
 client/src/Pages/Auth/ForgotPassword.jsx         |  5 ++++-
 client/src/Pages/Auth/NewPasswordConfirmed.jsx   |  4 +++-
 .../src/Pages/Auth/Register/StepThree/index.jsx  |  8 +++++---
 client/src/Pages/Auth/SetNewPassword.jsx         | 16 +++++++++++-----
 client/src/Pages/Settings/SettingsAbout.jsx      |  4 +++-
 client/src/Validation/validation.js              |  8 +++-----
 server/validation/joi.js                         | 10 ++--------
 9 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/client/src/Components/TabPanels/Account/TeamPanel.jsx b/client/src/Components/TabPanels/Account/TeamPanel.jsx
index 52e3ea9ee..341f84ba7 100644
--- a/client/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -115,7 +115,10 @@ const TeamPanel = () => {
 			email: newEmail,
 		}));
 
-		const validation = newOrChangedCredentials.validate({ email: newEmail }, { abortEarly: false });
+		const validation = newOrChangedCredentials.validate(
+			{ email: newEmail },
+			{ abortEarly: false }
+		);
 
 		setErrors((prev) => {
 			const updatedErrors = { ...prev };
diff --git a/client/src/Components/ThemeSwitch/index.jsx b/client/src/Components/ThemeSwitch/index.jsx
index d1a7661bc..5efb17419 100644
--- a/client/src/Components/ThemeSwitch/index.jsx
+++ b/client/src/Components/ThemeSwitch/index.jsx
@@ -14,7 +14,7 @@ import SunAndMoonIcon from "./SunAndMoonIcon";
 import { useDispatch, useSelector } from "react-redux";
 import { setMode } from "../../Features/UI/uiSlice";
 import "./index.css";
-import {useTranslation} from "react-i18next";
+import { useTranslation } from "react-i18next";
 
 const ThemeSwitch = ({ width = 48, height = 48, color }) => {
 	const mode = useSelector((state) => state.ui.mode);
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 3ab6913dd..2a887756e 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -75,7 +75,10 @@ const ForgotPassword = () => {
 		const { value } = event.target;
 		setForm({ email: value });
 
-		const { error } = newOrChangedCredentials.validate({ email: value }, { abortEarly: false });
+		const { error } = newOrChangedCredentials.validate(
+			{ email: value },
+			{ abortEarly: false }
+		);
 
 		if (error) setErrors({ email: error.details[0].message });
 		else delete errors.email;
diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index aba1fefea..db03f7de3 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -100,7 +100,9 @@ const NewPasswordConfirmed = () => {
 							</IconBox>
 						</Stack>
 						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
-						<Typography mb={theme.spacing(2)}>{t("auth.forgotPassword.subheadings.stepFour")}</Typography>
+						<Typography mb={theme.spacing(2)}>
+							{t("auth.forgotPassword.subheadings.stepFour")}
+						</Typography>
 					</Box>
 					<Button
 						variant="contained"
diff --git a/client/src/Pages/Auth/Register/StepThree/index.jsx b/client/src/Pages/Auth/Register/StepThree/index.jsx
index f34c7af7e..c81ae08a7 100644
--- a/client/src/Pages/Auth/Register/StepThree/index.jsx
+++ b/client/src/Pages/Auth/Register/StepThree/index.jsx
@@ -77,9 +77,11 @@ function StepThree({ isSuperAdmin, onSubmit, onBack }) {
 							value={form.password}
 							onChange={handleChange}
 							error={errors.password && errors.password[0] ? true : false}
-							helperText={errors.password === "auth.common.inputs.password.errors.empty"
-								? t(errors.password)
-								: ""} // Other errors are related to required password conditions and are visualized below the input
+							helperText={
+								errors.password === "auth.common.inputs.password.errors.empty"
+									? t(errors.password)
+									: ""
+							} // Other errors are related to required password conditions and are visualized below the input
 							ref={inputRef}
 						/>
 						<TextInput
diff --git a/client/src/Pages/Auth/SetNewPassword.jsx b/client/src/Pages/Auth/SetNewPassword.jsx
index c2cd64b23..b4899f47c 100644
--- a/client/src/Pages/Auth/SetNewPassword.jsx
+++ b/client/src/Pages/Auth/SetNewPassword.jsx
@@ -171,9 +171,11 @@ const SetNewPassword = () => {
 								value={form.password}
 								onChange={handleChange}
 								error={errors.password ? true : false}
-								helperText={errors.password === "auth.common.inputs.password.errors.empty"
-								? t(errors.password)
-								: ""} // Other errors are related to required password conditions and are visualized below the input
+								helperText={
+									errors.password === "auth.common.inputs.password.errors.empty"
+										? t(errors.password)
+										: ""
+								} // Other errors are related to required password conditions and are visualized below the input
 								endAdornment={<PasswordEndAdornment />}
 							/>
 						</Box>
@@ -217,12 +219,16 @@ const SetNewPassword = () => {
 								variant={feedbacks.number}
 							/>
 							<Check
-								noHighlightText={t("auth.common.inputs.password.rules.uppercase.beginning")}
+								noHighlightText={t(
+									"auth.common.inputs.password.rules.uppercase.beginning"
+								)}
 								text={t("auth.common.inputs.password.rules.uppercase.highlighted")}
 								variant={feedbacks.uppercase}
 							/>
 							<Check
-								noHighlightText={t("auth.common.inputs.password.rules.lowercase.beginning")}
+								noHighlightText={t(
+									"auth.common.inputs.password.rules.lowercase.beginning"
+								)}
 								text={t("auth.common.inputs.password.rules.lowercase.highlighted")}
 								variant={feedbacks.lowercase}
 							/>
diff --git a/client/src/Pages/Settings/SettingsAbout.jsx b/client/src/Pages/Settings/SettingsAbout.jsx
index fd11df3ad..6acadd444 100644
--- a/client/src/Pages/Settings/SettingsAbout.jsx
+++ b/client/src/Pages/Settings/SettingsAbout.jsx
@@ -20,7 +20,9 @@ const SettingsAbout = () => {
 				</Typography>
 			</Box>
 			<Box>
-				<Typography component="h2">{t("common.appName")} {2.1}</Typography>
+				<Typography component="h2">
+					{t("common.appName")} {2.1}
+				</Typography>
 				<Typography sx={{ mt: theme.spacing(2), mb: theme.spacing(6), opacity: 0.6 }}>
 					{t("settingsDevelopedBy")}
 				</Typography>
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 1074f3bb2..2826605c8 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -105,11 +105,9 @@ const loginCredentials = joi.object({
 			"string.empty": "auth.common.inputs.email.errors.empty",
 			"string.email": "auth.common.inputs.email.errors.invalid",
 		}),
-	password: joi
-		.string()
-		.messages({
-			"string.empty": "auth.common.inputs.password.errors.empty",
-		}),
+	password: joi.string().messages({
+		"string.empty": "auth.common.inputs.password.errors.empty",
+	}),
 });
 
 const monitorValidation = joi.object({
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 9a3c61a7c..9024c26a4 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -22,14 +22,8 @@ const passwordPattern =
 	/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!?@#$%^&*()\-_=+[\]{};:'",.<>~`|\\/])[A-Za-z0-9!?@#$%^&*()\-_=+[\]{};:'",.<>~`|\\/]+$/;
 
 const loginValidation = joi.object({
-	email: joi
-		.string()
-		.email()
-		.required()
-		.lowercase(),
-	password: joi
-		.string()
-		.required(),
+	email: joi.string().email().required().lowercase(),
+	password: joi.string().required(),
 });
 const nameValidation = joi
 	.string()

From f445c2b310dd0059ac0f9485d5b1f7a3f32283a4 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 09:16:38 +0800
Subject: [PATCH 080/319] add empty query object to fix default destructuring

---
 server/controllers/authController.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index 9d5fe0c20..fdd589c1c 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -404,7 +404,8 @@ class AuthController {
 			// 1. Find all the monitors associated with the team ID if superadmin
 
 			const result = await this.db.getMonitorsByTeamId({
-				params: { teamId: user.teamId },
+				query: {},
+				params: { teamId: user.teamId.toString() },
 			});
 
 			if (user.role.includes("superadmin")) {

From 711e85cb6e17792a9fe9c5649e7f98b5dcebd1e5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 09:49:53 +0800
Subject: [PATCH 081/319] implement delete cascade

---
 server/controllers/authController.js    |  3 --
 server/controllers/monitorController.js | 47 ++-----------------------
 server/db/models/Monitor.js             | 40 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index fdd589c1c..b05a9635a 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -414,9 +414,6 @@ class AuthController {
 					(await Promise.all(
 						result.monitors.map(async (monitor) => {
 							await this.jobQueue.deleteJob(monitor);
-							await this.db.deleteChecks(monitor._id);
-							await this.db.deletePageSpeedChecksByMonitorId(monitor._id);
-							await this.db.deleteNotificationsByMonitorId(monitor._id);
 						})
 					));
 
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 447027c57..00b525125 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -389,51 +389,8 @@ class MonitorController {
 
 		try {
 			const monitor = await this.db.deleteMonitor(req, res, next);
-			// Delete associated checks,alerts,and notifications
-
-			try {
-				const operations = [
-					{ name: "deleteJob", fn: () => this.jobQueue.deleteJob(monitor) },
-					{ name: "deleteChecks", fn: () => this.db.deleteChecks(monitor._id) },
-					{
-						name: "deletePageSpeedChecks",
-						fn: () => this.db.deletePageSpeedChecksByMonitorId(monitor._id),
-					},
-
-					{
-						name: "deleteHardwareChecks",
-						fn: () => this.db.deleteHardwareChecksByMonitorId(monitor._id),
-					},
-
-					// TODO  We don't actually want to delete the status page if there are other monitors in it
-					// We actually just want to remove the monitor being deleted from the status page.
-					// Only delete he status page if there are no other monitors in it.
-					{
-						name: "deleteStatusPages",
-						fn: () => this.db.deleteStatusPagesByMonitorId(monitor._id),
-					},
-				];
-				const results = await Promise.allSettled(operations.map((op) => op.fn()));
-
-				results.forEach((result, index) => {
-					if (result.status === "rejected") {
-						const operationName = operations[index].name;
-						logger.error({
-							message: `Failed to ${operationName} for monitor ${monitor._id}`,
-							service: SERVICE_NAME,
-							method: "deleteMonitor",
-							stack: result.reason.stack,
-						});
-					}
-				});
-			} catch (error) {
-				logger.error({
-					message: `Error deleting associated records for monitor ${monitor._id} with name ${monitor.name}`,
-					service: SERVICE_NAME,
-					method: "deleteMonitor",
-					stack: error.stack,
-				});
-			}
+			await this.jobQueue.deleteJob(monitor);
+			await this.db.deleteStatusPagesByMonitorId(monitor._id);
 			return res.success({ msg: this.stringService.monitorDelete });
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "deleteMonitor"));
diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 3079abfba..26a79b815 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -1,4 +1,8 @@
 import mongoose from "mongoose";
+import HardwareCheck from "./HardwareCheck.js";
+import PageSpeedCheck from "./PageSpeedCheck.js";
+import Check from "./Check.js";
+import MonitorStats from "./MonitorStats.js";
 
 const MonitorSchema = mongoose.Schema(
 	{
@@ -88,6 +92,42 @@ const MonitorSchema = mongoose.Schema(
 	}
 );
 
+MonitorSchema.pre("findOneAndDelete", async function (next) {
+	// Delete checks and stats
+	try {
+		const doc = await this.model.findOne(this.getFilter());
+
+		if (doc.type === "pagespeed") {
+			await PageSpeedCheck.deleteMany({ monitorId: doc._id });
+		} else if (doc.type === "hardware") {
+			await HardwareCheck.deleteMany({ monitorId: doc._id });
+		} else {
+			await Check.deleteMany({ monitorId: doc._id });
+		}
+
+		await MonitorStats.deleteMany({ monitorId: doc._id.toString() });
+		next();
+	} catch (error) {
+		next(error);
+	}
+});
+
+MonitorSchema.pre("deleteMany", async function (next) {
+	const filter = this.getFilter();
+	const monitors = await this.model.find(filter).select(["_id", "type"]).lean();
+	for (const monitor of monitors) {
+		if (monitor.type === "pagespeed") {
+			await PageSpeedCheck.deleteMany({ monitorId: monitor._id });
+		} else if (monitor.type === "hardware") {
+			await HardwareCheck.deleteMany({ monitorId: monitor._id });
+		} else {
+			await Check.deleteMany({ monitorId: monitor._id });
+		}
+		await MonitorStats.deleteMany({ monitorId: monitor._id.toString() });
+	}
+	next();
+});
+
 MonitorSchema.index({ teamId: 1, type: 1 });
 
 export default mongoose.model("Monitor", MonitorSchema);

From 76de8f11f277eba32d30051e44465fb8cb8eafae Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 09:53:17 +0800
Subject: [PATCH 082/319] formatting

---
 client/src/Components/Charts/ChartBox/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/Components/Charts/ChartBox/index.jsx b/client/src/Components/Charts/ChartBox/index.jsx
index cde6e02a0..2c13ece87 100644
--- a/client/src/Components/Charts/ChartBox/index.jsx
+++ b/client/src/Components/Charts/ChartBox/index.jsx
@@ -43,7 +43,6 @@ const ChartBox = ({
 		>
 			<Stack
 				flex={1}
-
 				sx={{
 					padding: theme.spacing(8),
 					justifyContent,

From 0ac1f13043a3acff565d34e39ca7875c12e5dfce Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 11:13:19 +0800
Subject: [PATCH 083/319] implement editing notification channels

---
 client/src/Hooks/useNotifications.js          | 72 ++++++++++++++++++-
 .../Login/Components/ForgotPasswordLabel.jsx  |  4 +-
 .../Hooks/useHardwareMonitorsFetch.jsx        |  7 +-
 .../Notifications/components/ActionMenu.jsx   | 70 ++++++++++++++++++
 .../src/Pages/Notifications/create/index.jsx  | 33 ++++++---
 client/src/Pages/Notifications/index.jsx      | 15 ++--
 client/src/Pages/Notifications/utils.js       |  6 ++
 client/src/Routes/index.jsx                   |  6 ++
 client/src/Utils/NetworkService.js            | 10 +++
 client/src/locales/en.json                    |  5 ++
 server/controllers/notificationController.js  | 33 +++++++++
 server/db/mongo/modules/notificationModule.js | 26 +++++++
 server/routes/notificationRoute.js            |  3 +
 13 files changed, 265 insertions(+), 25 deletions(-)
 create mode 100644 client/src/Pages/Notifications/components/ActionMenu.jsx
 create mode 100644 client/src/Pages/Notifications/utils.js

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 4ece55acd..c8dc6b3db 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -4,6 +4,7 @@ import { networkService } from "../main";
 import { useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
+import { NOTIFICATION_TYPES } from "../Pages/Notifications/utils";
 
 const useCreateNotification = () => {
 	const navigate = useNavigate();
@@ -88,4 +89,73 @@ const useDeleteNotification = () => {
 
 	return [deleteNotification, isLoading, error];
 };
-export { useCreateNotification, useGetNotificationsByTeamId, useDeleteNotification };
+
+const useGetNotificationById = (id, setNotification) => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+
+	const getNotificationById = useCallback(async () => {
+		try {
+			setIsLoading(true);
+			const response = await networkService.getNotificationById({ id });
+
+			const notification = response?.data?.data ?? null;
+
+			const notificationData = {
+				userId: notification?.userId,
+				teamId: notification?.teamId,
+				address: notification?.address,
+				notificationName: notification?.notificationName,
+				type: NOTIFICATION_TYPES.find((type) => type.value === notification?.type)?._id,
+				config: notification?.config,
+			};
+
+			setNotification(notificationData);
+		} catch (error) {
+			setError(error);
+		} finally {
+			setIsLoading(false);
+		}
+	}, [id, setNotification]);
+
+	useEffect(() => {
+		if (id) {
+			getNotificationById();
+		}
+	}, [getNotificationById, id]);
+
+	return [isLoading, error];
+};
+
+const useEditNotification = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+	const { t } = useTranslation();
+
+	const editNotification = async (id, notification) => {
+		try {
+			setIsLoading(true);
+			await networkService.editNotification({ id, notification });
+			createToast({
+				body: t("notifications.edit.success"),
+			});
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: t("notifications.edit.failed"),
+			});
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [editNotification, isLoading, error];
+};
+
+export {
+	useCreateNotification,
+	useGetNotificationsByTeamId,
+	useDeleteNotification,
+	useGetNotificationById,
+	useEditNotification,
+};
diff --git a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx b/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
index 5fc2430c7..fe8c688ac 100644
--- a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
+++ b/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
@@ -42,8 +42,8 @@ const ForgotPasswordLabel = ({ email, errorEmail }) => {
 };
 
 ForgotPasswordLabel.propTypes = {
-	email: PropTypes.string.isRequired,
-	errorEmail: PropTypes.string.isRequired,
+	email: PropTypes.string,
+	errorEmail: PropTypes.string,
 };
 
 export default ForgotPasswordLabel;
diff --git a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
index f7cb2abb1..c0b61ef62 100644
--- a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
+++ b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
@@ -3,9 +3,7 @@ import { networkService } from "../../../../main";
 
 const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => {
 	// Abort early if creating monitor
-	if (!monitorId) {
-		return { monitor: undefined, isLoading: false, networkError: undefined };
-	}
+
 	const [isLoading, setIsLoading] = useState(true);
 	const [networkError, setNetworkError] = useState(false);
 	const [monitor, setMonitor] = useState(undefined);
@@ -13,6 +11,9 @@ const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => {
 	useEffect(() => {
 		const fetchData = async () => {
 			try {
+				if (!monitorId) {
+					return { monitor: undefined, isLoading: false, networkError: undefined };
+				}
 				const response = await networkService.getHardwareDetailsByMonitorId({
 					monitorId: monitorId,
 					dateRange: dateRange,
diff --git a/client/src/Pages/Notifications/components/ActionMenu.jsx b/client/src/Pages/Notifications/components/ActionMenu.jsx
new file mode 100644
index 000000000..bd719bfee
--- /dev/null
+++ b/client/src/Pages/Notifications/components/ActionMenu.jsx
@@ -0,0 +1,70 @@
+// Components
+import Menu from "@mui/material/Menu";
+import IconButton from "@mui/material/IconButton";
+import SettingsOutlinedIcon from "@mui/icons-material/SettingsOutlined";
+import MenuItem from "@mui/material/MenuItem";
+
+// Utils
+import { useState } from "react";
+import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router-dom";
+import PropTypes from "prop-types";
+
+const ActionMenu = ({ notification, onDelete }) => {
+	const theme = useTheme();
+	const navigate = useNavigate();
+	const [anchorEl, setAnchorEl] = useState(null);
+	const open = Boolean(anchorEl);
+
+	// Handlers
+	const handleClick = (event) => {
+		setAnchorEl(event.currentTarget);
+	};
+
+	const handleClose = () => {
+		setAnchorEl(null);
+	};
+
+	const handleRemove = () => {
+		onDelete(notification._id);
+		handleClose();
+	};
+
+	const handleConfigure = () => {
+		navigate(`/notifications/${notification._id}`);
+		handleClose();
+	};
+
+	return (
+		<>
+			<IconButton
+				aria-label="monitor actions"
+				onClick={handleClick}
+			>
+				<SettingsOutlinedIcon />
+			</IconButton>
+
+			<Menu
+				anchorEl={anchorEl}
+				open={open}
+				onClose={handleClose}
+				anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
+			>
+				<MenuItem onClick={handleConfigure}>Configure</MenuItem>
+				<MenuItem
+					onClick={handleRemove}
+					sx={{ "&.MuiButtonBase-root": { color: theme.palette.error.main } }}
+				>
+					Remove
+				</MenuItem>
+			</Menu>
+		</>
+	);
+};
+
+ActionMenu.propTypes = {
+	notification: PropTypes.object,
+	onDelete: PropTypes.func,
+};
+
+export default ActionMenu;
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index b1469bff0..b123dcbd7 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -12,7 +12,11 @@ import TextInput from "../../../Components/Inputs/TextInput";
 import { useState } from "react";
 import { useSelector } from "react-redux";
 import { useTheme } from "@emotion/react";
-import { useCreateNotification } from "../../../Hooks/useNotifications";
+import {
+	useCreateNotification,
+	useGetNotificationById,
+	useEditNotification,
+} from "../../../Hooks/useNotifications";
 import {
 	notificationEmailValidation,
 	notificationWebhookValidation,
@@ -20,19 +24,17 @@ import {
 } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
 import { useTranslation } from "react-i18next";
+import { useParams } from "react-router-dom";
+import { NOTIFICATION_TYPES } from "../utils";
 
 // Setup
 
-const NOTIFICATION_TYPES = [
-	{ _id: 1, name: "E-mail", value: "email" },
-	{ _id: 2, name: "Slack", value: "webhook" },
-	{ _id: 3, name: "PagerDuty", value: "pager_duty" },
-	{ _id: 4, name: "Webhook", value: "webhook" },
-];
-
 const CreateNotifications = () => {
+	const { notificationId } = useParams();
 	const theme = useTheme();
-	const [createNotification, isLoading, error] = useCreateNotification();
+	const [createNotification, isCreating, createNotificationError] =
+		useCreateNotification();
+	const [editNotification, isEditing, editNotificationError] = useEditNotification();
 	const BREADCRUMBS = [
 		{ name: "notifications", path: "/notifications" },
 		{ name: "create", path: "/notifications/create" },
@@ -57,6 +59,11 @@ const CreateNotifications = () => {
 	const [errors, setErrors] = useState({});
 	const { t } = useTranslation();
 
+	const [notificationIsLoading, getNotificationError] = useGetNotificationById(
+		notificationId,
+		setNotification
+	);
+
 	// handlers
 	const onSubmit = (e) => {
 		e.preventDefault();
@@ -106,7 +113,11 @@ const CreateNotifications = () => {
 			return;
 		}
 
-		createNotification(form);
+		if (notificationId) {
+			editNotification(notificationId, form);
+		} else {
+			createNotification(form);
+		}
 	};
 
 	const onChange = (e) => {
@@ -348,7 +359,7 @@ const CreateNotifications = () => {
 					justifyContent="flex-end"
 				>
 					<Button
-						loading={isLoading}
+						loading={isCreating || isEditing || notificationIsLoading}
 						type="submit"
 						variant="contained"
 						color="accent"
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index d55bca297..b90ff22cc 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -5,6 +5,8 @@ import Breadcrumbs from "../../Components/Breadcrumbs";
 import Button from "@mui/material/Button";
 import DataTable from "../../Components/Table";
 import Fallback from "../../Components/Fallback";
+import ActionMenu from "./components/ActionMenu";
+
 // Utils
 import { useIsAdmin } from "../../Hooks/useIsAdmin";
 import { useState } from "react";
@@ -15,7 +17,7 @@ import {
 	useDeleteNotification,
 } from "../../Hooks/useNotifications";
 import { useTranslation } from "react-i18next";
-// Setup
+import { useParams } from "react-router-dom";
 
 const Notifications = () => {
 	const navigate = useNavigate();
@@ -70,13 +72,10 @@ const Notifications = () => {
 			content: "Actions",
 			render: (row) => {
 				return (
-					<Button
-						variant="contained"
-						color="error"
-						onClick={() => onDelete(row._id)}
-					>
-						Delete
-					</Button>
+					<ActionMenu
+						notification={row}
+						onDelete={onDelete}
+					/>
 				);
 			},
 		},
diff --git a/client/src/Pages/Notifications/utils.js b/client/src/Pages/Notifications/utils.js
new file mode 100644
index 000000000..7135e5c63
--- /dev/null
+++ b/client/src/Pages/Notifications/utils.js
@@ -0,0 +1,6 @@
+export const NOTIFICATION_TYPES = [
+	{ _id: 1, name: "E-mail", value: "email" },
+	{ _id: 2, name: "Slack", value: "webhook" },
+	{ _id: 3, name: "PagerDuty", value: "pager_duty" },
+	{ _id: 4, name: "Webhook", value: "webhook" },
+];
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 48343cd22..3f815a665 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -157,6 +157,12 @@ const Routes = () => {
 					path="notifications/create"
 					element={<CreateNotifications />}
 				/>
+
+				<Route
+					path="notifications/:notificationId"
+					element={<CreateNotifications />}
+				/>
+
 				<Route
 					path="maintenance"
 					element={<Maintenance />}
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 26c6bd460..56ec4dcb7 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1049,6 +1049,16 @@ class NetworkService {
 		const { id } = config;
 		return this.axiosInstance.delete(`/notifications/${id}`);
 	}
+
+	async getNotificationById(config) {
+		const { id } = config;
+		return this.axiosInstance.get(`/notifications/${id}`);
+	}
+
+	async editNotification(config) {
+		const { id, notification } = config;
+		return this.axiosInstance.put(`/notifications/${id}`, notification);
+	}
 }
 
 export default NetworkService;
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 5510e5c54..92f490aba 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -293,6 +293,7 @@
 			"webhookPlaceholder": "https://your-server.com/webhook"
 		}
 	},
+
 	"notificationConfig": {
 		"title": "Notifications",
 		"description": "Select the notifications channels you want to use"
@@ -354,6 +355,10 @@
 		"delete": {
 			"success": "Notification deleted successfully",
 			"failed": "Failed to delete notification"
+		},
+		"edit": {
+			"success": "Notification updated successfully",
+			"failed": "Failed to update notification"
 		}
 	},
 	"testLocale": "testLocale",
diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 7cb642977..df8fe8ca3 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -217,6 +217,39 @@ class NotificationController {
 			next(handleError(error, SERVICE_NAME, "deleteNotification"));
 		}
 	};
+
+	getNotificationById = async (req, res, next) => {
+		try {
+			const notification = await this.db.getNotificationById(req.params.id);
+			return res.success({
+				msg: "Notification fetched successfully",
+				data: notification,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "getNotificationById"));
+		}
+	};
+
+	editNotification = async (req, res, next) => {
+		try {
+			await createNotificationBodyValidation.validateAsync(req.body, {
+				abortEarly: false,
+			});
+		} catch (error) {
+			next(handleValidationError(error, SERVICE_NAME));
+			return;
+		}
+
+		try {
+			const notification = await this.db.editNotification(req.params.id, req.body);
+			return res.success({
+				msg: "Notification updated successfully",
+				data: notification,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "editNotification"));
+		}
+	};
 }
 
 export default NotificationController;
diff --git a/server/db/mongo/modules/notificationModule.js b/server/db/mongo/modules/notificationModule.js
index d172ee8cf..08d57b1a9 100755
--- a/server/db/mongo/modules/notificationModule.js
+++ b/server/db/mongo/modules/notificationModule.js
@@ -84,6 +84,30 @@ const deleteNotificationById = async (id) => {
 	}
 };
 
+const getNotificationById = async (id) => {
+	try {
+		const notification = await Notification.findById(id);
+		return notification;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "getNotificationById";
+		throw error;
+	}
+};
+
+const editNotification = async (id, notificationData) => {
+	try {
+		const notification = await Notification.findByIdAndUpdate(id, notificationData, {
+			new: true,
+		});
+		return notification;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "editNotification";
+		throw error;
+	}
+};
+
 export {
 	createNotification,
 	getNotificationsByTeamId,
@@ -91,4 +115,6 @@ export {
 	getNotificationsByMonitorId,
 	deleteNotificationsByMonitorId,
 	deleteNotificationById,
+	getNotificationById,
+	editNotification,
 };
diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index fe6b1c2dd..aa8433e53 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -23,6 +23,9 @@ class NotificationRoutes {
 		);
 
 		this.router.delete("/:id", this.notificationController.deleteNotification);
+
+		this.router.get("/:id", this.notificationController.getNotificationById);
+		this.router.put("/:id", this.notificationController.editNotification);
 	}
 
 	getRouter() {

From 910bf4c72e652a741c8276b5713c1a418c35e39e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 11:16:39 +0800
Subject: [PATCH 084/319] formatting

---
 client/src/Components/Charts/ChartBox/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/Components/Charts/ChartBox/index.jsx b/client/src/Components/Charts/ChartBox/index.jsx
index cde6e02a0..2c13ece87 100644
--- a/client/src/Components/Charts/ChartBox/index.jsx
+++ b/client/src/Components/Charts/ChartBox/index.jsx
@@ -43,7 +43,6 @@ const ChartBox = ({
 		>
 			<Stack
 				flex={1}
-
 				sx={{
 					padding: theme.spacing(8),
 					justifyContent,

From df63e74116a6105269822f82b064263373be9712 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 11:22:24 +0800
Subject: [PATCH 085/319] update icon

---
 client/src/Components/Sidebar/index.jsx   | 8 +++-----
 client/src/assets/icons/notifications.svg | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 client/src/assets/icons/notifications.svg

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index 831782b53..6be67a43d 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -38,7 +38,7 @@ import ChangeLog from "../../assets/icons/changeLog.svg?react";
 import Docs from "../../assets/icons/docs.svg?react";
 import StatusPages from "../../assets/icons/status-pages.svg?react";
 import Discussions from "../../assets/icons/discussions.svg?react";
-import NotificationAddOutlinedIcon from "@mui/icons-material/NotificationAddOutlined";
+import Notifications from "../../assets/icons/notifications.svg?react";
 
 import "./index.css";
 
@@ -59,7 +59,7 @@ const getMenu = (t) => [
 	{
 		name: t("menu.notifications"),
 		path: "notifications",
-		icon: <NotificationAddOutlinedIcon />,
+		icon: <Notifications />,
 	},
 	{ name: t("menu.incidents"), path: "incidents", icon: <Incidents /> },
 
@@ -129,9 +129,7 @@ function Sidebar() {
 	const [anchorEl, setAnchorEl] = useState(null);
 	const [popup, setPopup] = useState();
 	const { user } = useSelector((state) => state.auth);
-	const distributedUptimeEnabled = useSelector(
-		(state) => state.ui.distributedUptimeEnabled
-	);
+
 	const sidebarRef = useRef(null);
 	const [sidebarReady, setSidebarReady] = useState(false);
 	const TRANSITION_DURATION = 200;
diff --git a/client/src/assets/icons/notifications.svg b/client/src/assets/icons/notifications.svg
new file mode 100644
index 000000000..c09ac5746
--- /dev/null
+++ b/client/src/assets/icons/notifications.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M9.35395 21C10.0591 21.6224 10.9853 22 11.9998 22C13.0142 22 13.9405 21.6224 14.6456 21M17.9998 8V2M14.9998 5H20.9998M12.9998 2.08389C12.6715 2.02841 12.3371 2 11.9998 2C10.4085 2 8.88235 2.63214 7.75713 3.75736C6.63192 4.88258 5.99977 6.4087 5.99977 8C5.99977 11.0902 5.22024 13.206 4.34944 14.6054C3.61491 15.7859 3.24763 16.3761 3.2611 16.5408C3.27601 16.7231 3.31463 16.7926 3.46155 16.9016C3.59423 17 4.19237 17 5.38863 17H18.6109C19.8071 17 20.4052 17 20.5379 16.9016C20.6848 16.7926 20.7235 16.7231 20.7384 16.5408C20.7518 16.3761 20.3845 15.7858 19.65 14.6052C19.1579 13.8144 18.695 12.7948 18.3855 11.5"
+        stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file

From 1ed317d0cb83d7a03c8b21b68ab1311cfbad4cbf Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 11:29:03 +0800
Subject: [PATCH 086/319] update fallback

---
 client/src/Pages/Notifications/index.jsx | 2 +-
 client/src/locales/en.json               | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index b90ff22cc..41cefda76 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -86,7 +86,7 @@ const Notifications = () => {
 			<Fallback
 				vowelStart={false}
 				title={t("notifications.fallback.title")}
-				checks={[t("notifications.fallback.checks")]}
+				checks={t("notifications.fallback.checks", { returnObjects: true })}
 				link="/notifications/create"
 				isAdmin={isAdmin}
 			/>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 92f490aba..27b296556 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -301,7 +301,11 @@
 	"notifications": {
 		"fallback": {
 			"title": "notification channel",
-			"checks": "Alert teams about downtime or performance issues"
+			"checks": [
+				"Alert teams about downtime or performance issues",
+				"Let engineers know when incidents happen",
+				"Keep administrators informed of system changes"
+			]
 		},
 		"createButton": "Create notification channel",
 		"createTitle": "Notification channel",

From e6493df881bee71178f93c7169a3cc9385c3d828 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 12:07:31 +0800
Subject: [PATCH 087/319] add test notificaiton button and methods

---
 client/src/Hooks/useNotifications.js          | 26 +++++
 .../src/Pages/Notifications/create/index.jsx  | 62 ++++++++++++
 client/src/Pages/Notifications/index.jsx      | 11 ++-
 client/src/Utils/NetworkService.js            | 15 +--
 client/src/locales/en.json                    |  4 +
 server/controllers/notificationController.js  | 94 ++++---------------
 server/routes/notificationRoute.js            |  2 +-
 server/service/notificationService.js         | 11 +++
 8 files changed, 135 insertions(+), 90 deletions(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index c8dc6b3db..8e7f896e9 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -152,10 +152,36 @@ const useEditNotification = () => {
 	return [editNotification, isLoading, error];
 };
 
+const useTestNotification = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(null);
+	const { t } = useTranslation();
+
+	const testNotification = async (notification) => {
+		try {
+			setIsLoading(true);
+			await networkService.testNotification({ notification });
+			createToast({
+				body: t("notifications.test.success"),
+			});
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: t("notifications.test.failed"),
+			});
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [testNotification, isLoading, error];
+};
+
 export {
 	useCreateNotification,
 	useGetNotificationsByTeamId,
 	useDeleteNotification,
 	useGetNotificationById,
 	useEditNotification,
+	useTestNotification,
 };
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index b123dcbd7..19335c790 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -16,6 +16,7 @@ import {
 	useCreateNotification,
 	useGetNotificationById,
 	useEditNotification,
+	useTestNotification,
 } from "../../../Hooks/useNotifications";
 import {
 	notificationEmailValidation,
@@ -35,6 +36,8 @@ const CreateNotifications = () => {
 	const [createNotification, isCreating, createNotificationError] =
 		useCreateNotification();
 	const [editNotification, isEditing, editNotificationError] = useEditNotification();
+	const [testNotification, isTesting, testNotificationError] = useTestNotification();
+
 	const BREADCRUMBS = [
 		{ name: "notifications", path: "/notifications" },
 		{ name: "create", path: "/notifications/create" },
@@ -178,6 +181,56 @@ const CreateNotifications = () => {
 		setNotification(newNotification);
 	};
 
+	const onTestNotification = () => {
+		const form = {
+			...notification,
+			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
+		};
+
+		if (notification.type === 2) {
+			form.type = "webhook";
+		}
+
+		let error = null;
+
+		if (form.type === "email") {
+			error = notificationEmailValidation.validate(
+				{ notificationName: form.notificationName, address: form.address },
+				{ abortEarly: false }
+			).error;
+		} else if (form.type === "webhook") {
+			form.config = {
+				platform: form.config.platform,
+				webhookUrl: form.config.webhookUrl,
+			};
+			error = notificationWebhookValidation.validate(
+				{ notificationName: form.notificationName, config: form.config },
+				{ abortEarly: false }
+			).error;
+		} else if (form.type === "pager_duty") {
+			form.config = {
+				platform: form.config.platform,
+				routingKey: form.config.routingKey,
+			};
+			error = notificationPagerDutyValidation.validate(
+				{ notificationName: form.notificationName, config: form.config },
+				{ abortEarly: false }
+			).error;
+		}
+
+		if (error) {
+			const newErrors = {};
+			error.details.forEach((err) => {
+				newErrors[err.path[0]] = err.message;
+			});
+			createToast({ body: "Please check the form for errors." });
+			setErrors(newErrors);
+			return;
+		}
+
+		testNotification(form);
+	};
+
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />
@@ -357,7 +410,16 @@ const CreateNotifications = () => {
 				<Stack
 					direction="row"
 					justifyContent="flex-end"
+					spacing={theme.spacing(2)}
 				>
+					<Button
+						loading={isCreating || isEditing || notificationIsLoading}
+						variant="contained"
+						color="secondary"
+						onClick={onTestNotification}
+					>
+						Test notification
+					</Button>
 					<Button
 						loading={isCreating || isEditing || notificationIsLoading}
 						type="submit"
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index 41cefda76..2694a3fea 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -56,7 +56,16 @@ const Notifications = () => {
 			id: "target",
 			content: "Target",
 			render: (row) => {
-				return row.address || row.config?.webhookUrl || row.config?.routingKey;
+				const type = row.type;
+				if (type === "email") {
+					return row.address;
+				}
+				if (type === "webhook") {
+					return row.config?.webhookUrl;
+				}
+				if (type === "pager_duty") {
+					return row.config?.routingKey;
+				}
 			},
 		},
 		{
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 56ec4dcb7..3d124a3e6 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -703,18 +703,11 @@ class NetworkService {
 	 * @returns {Promise<AxiosResponse>} The response from the axios POST request.
 	 */
 	async testNotification(config) {
-		return this.axiosInstance.post(
-			"/notifications/test-webhook",
-			{
-				platform: config.platform,
-				...config.payload,
+		return this.axiosInstance.post("/notifications/test", config.notification, {
+			headers: {
+				"Content-Type": "application/json",
 			},
-			{
-				headers: {
-					"Content-Type": "application/json",
-				},
-			}
-		);
+		});
 	}
 
 	/**
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 27b296556..4b79b88d5 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -363,6 +363,10 @@
 		"edit": {
 			"success": "Notification updated successfully",
 			"failed": "Failed to update notification"
+		},
+		"test": {
+			"success": "Test notification sent successfully",
+			"failed": "Failed to send test notification"
 		}
 	},
 	"testLocale": "testLocale",
diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index df8fe8ca3..edb18adfb 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -24,7 +24,6 @@ class NotificationController {
 		this.statusService = statusService;
 		this.db = db;
 		this.triggerNotification = this.triggerNotification.bind(this);
-		this.testWebhook = this.testWebhook.bind(this);
 	}
 
 	async triggerNotification(req, res, next) {
@@ -85,94 +84,35 @@ class NotificationController {
 		};
 	}
 
-	handleTelegramTest(botToken, chatId) {
-		if (!botToken || !chatId) {
-			return {
-				isValid: false,
-				error: {
-					msg: this.stringService.telegramRequiresBotTokenAndChatId,
-					status: 400,
-				},
-			};
-		}
-
-		return {
-			isValid: true,
-			notification: {
-				type: NOTIFICATION_TYPES.WEBHOOK,
-				platform: PLATFORMS.TELEGRAM,
-				config: { botToken, chatId },
-			},
-		};
-	}
-
-	handleWebhookTest(webhookUrl, platform) {
-		if (webhookUrl === null) {
-			return {
-				isValid: false,
-				error: {
-					msg: this.stringService.webhookUrlRequired,
-					status: 400,
-				},
-			};
-		}
-
-		return {
-			isValid: true,
-			notification: {
-				type: NOTIFICATION_TYPES.WEBHOOK,
-				platform: platform,
-				config: { webhookUrl },
-			},
-		};
-	}
-
-	async testWebhook(req, res, next) {
+	testNotification = async (req, res, next) => {
+		console.log("TESTING");
 		try {
-			const { webhookUrl, platform, botToken, chatId } = req.body;
+			const notification = req.body;
 
-			if (platform === null) {
-				return res.error({
-					msg: this.stringService.platformRequired,
-					status: 400,
+			if (notification?.type === "email") {
+				console.log("HANDLE EMAIL");
+				return res.success({
+					msg: this.stringService.emailSendSuccess,
 				});
 			}
 
-			// Platform-specific handling
-			const platformHandlers = {
-				[PLATFORMS.TELEGRAM]: () => this.handleTelegramTest(botToken, chatId),
-				// Default handler for webhook-based platforms (Slack, Discord, etc.)
-				default: () => this.handleWebhookTest(webhookUrl, platform),
-			};
-
-			const handler = platformHandlers[platform] || platformHandlers.default;
-			const handlerResult = handler();
-
-			if (!handlerResult.isValid) {
-				return res.error(handlerResult.error);
-			}
-
-			const networkResponse = this.createTestNetworkResponse();
-
-			const result = await this.notificationService.sendWebhookNotification(
-				networkResponse,
-				handlerResult.notification
-			);
-
-			if (result && result !== false) {
+			if (notification?.type === "webhook") {
+				const success =
+					await this.notificationService.sendTestWebhookNotification(notification);
+				if (!success) {
+					return res.error({
+						msg: this.stringService.webhookSendFailed,
+						status: 400,
+					});
+				}
 				return res.success({
 					msg: this.stringService.webhookSendSuccess,
 				});
-			} else {
-				return res.error({
-					msg: this.stringService.testNotificationFailed,
-					status: 400,
-				});
 			}
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "testWebhook"));
 		}
-	}
+	};
 
 	createNotification = async (req, res, next) => {
 		try {
diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index aa8433e53..064cd4b5d 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -13,7 +13,7 @@ class NotificationRoutes {
 
 		this.router.post("/trigger", this.notificationController.triggerNotification);
 
-		this.router.post("/test-webhook", this.notificationController.testWebhook);
+		this.router.post("/test", this.notificationController.testNotification);
 
 		this.router.post("/", this.notificationController.createNotification);
 
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 878881334..56c6d2c1c 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -95,6 +95,17 @@ class NotificationService {
 		return MESSAGE_FORMATTERS[platform](messageText, chatId);
 	}
 
+	sendTestWebhookNotification = async (notification) => {
+		const config = notification.config;
+		const response = await this.networkService.requestWebhook(
+			config.platform,
+			config.webhookUrl,
+			"This is a test notification"
+		);
+
+		return response.status;
+	};
+
 	/**
 	 * Sends a webhook notification to a specified platform.
 	 *

From c20b8c665af8632ca232c1b40a9a0f2352e87b5f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 13:20:44 +0800
Subject: [PATCH 088/319] add tests notification for email

---
 server/controllers/notificationController.js |  2 +-
 server/service/notificationService.js        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index edb18adfb..df16f7a75 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -90,7 +90,7 @@ class NotificationController {
 			const notification = req.body;
 
 			if (notification?.type === "email") {
-				console.log("HANDLE EMAIL");
+				const result = await this.notificationService.sendTestEmail(notification);
 				return res.success({
 					msg: this.stringService.emailSendSuccess,
 				});
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 56c6d2c1c..30c8474c1 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -196,6 +196,24 @@ class NotificationService {
 		return true;
 	}
 
+	sendTestEmail = async (notification) => {
+		const to = notification?.address;
+		if (!to || typeof to !== "string") {
+			throw new Error(this.stringService.errorForValidEmailAddress);
+		}
+
+		const subject = this.stringService.testEmailSubject;
+		const context = { testName: "Monitoring System" };
+
+		const messageId = await this.emailService.buildAndSendEmail(
+			"testEmailTemplate",
+			context,
+			to,
+			subject
+		);
+		console.log(messageId);
+	};
+
 	/**
 	 * Sends an email notification about monitor status change
 	 *

From 08875b07ecb07cc3ceb233304c1a526402528cfe Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 13:44:15 +0800
Subject: [PATCH 089/319] add pagerduty

---
 server/controllers/notificationController.js | 31 +++++++++++---------
 server/service/networkService.js             | 23 +++++++++++++++
 server/service/notificationService.js        | 19 ++++++++++--
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index df16f7a75..4efcf4988 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -85,30 +85,33 @@ class NotificationController {
 	}
 
 	testNotification = async (req, res, next) => {
-		console.log("TESTING");
 		try {
 			const notification = req.body;
+			let success;
 
 			if (notification?.type === "email") {
-				const result = await this.notificationService.sendTestEmail(notification);
-				return res.success({
-					msg: this.stringService.emailSendSuccess,
-				});
+				success = await this.notificationService.sendTestEmail(notification);
 			}
 
 			if (notification?.type === "webhook") {
-				const success =
+				success =
 					await this.notificationService.sendTestWebhookNotification(notification);
-				if (!success) {
-					return res.error({
-						msg: this.stringService.webhookSendFailed,
-						status: 400,
-					});
-				}
-				return res.success({
-					msg: this.stringService.webhookSendSuccess,
+			}
+
+			if (notification?.type === "pager_duty") {
+				success =
+					await this.notificationService.sendTestPagerDutyNotification(notification);
+			}
+			if (!success) {
+				return res.error({
+					msg: "Sending notification failed",
+					status: 400,
 				});
 			}
+
+			return res.success({
+				msg: "Notification sent successfully",
+			});
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "testWebhook"));
 		}
diff --git a/server/service/networkService.js b/server/service/networkService.js
index 5ceddb8fd..e04d69c41 100755
--- a/server/service/networkService.js
+++ b/server/service/networkService.js
@@ -463,6 +463,29 @@ class NetworkService {
 		}
 	}
 
+	async requestPagerDuty({ message, routingKey, monitorUrl }) {
+		try {
+			const response = await this.axios.post(`https://events.pagerduty.com/v2/enqueue`, {
+				routing_key: routingKey,
+				event_action: "trigger",
+				payload: {
+					summary: message,
+					severity: "critical",
+					source: monitorUrl,
+					timestamp: new Date().toISOString(),
+				},
+			});
+
+			if (response?.data?.status !== "success") return false;
+			return true;
+		} catch (error) {
+			error.details = error.response?.data;
+			error.service = this.SERVICE_NAME;
+			error.method = "requestPagerDuty";
+			throw error;
+		}
+	}
+
 	/**
 	 * Gets the status of a job based on its type and returns the appropriate response.
 	 *
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 30c8474c1..6e12722c2 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -211,7 +211,11 @@ class NotificationService {
 			to,
 			subject
 		);
-		console.log(messageId);
+
+		if (messageId) {
+			return true;
+		}
+		return false;
 	};
 
 	/**
@@ -223,6 +227,7 @@ class NotificationService {
 	 * @param {string} address - Email address to send the notification to
 	 * @returns {Promise<boolean>} - Indicates email was sent successfully
 	 */
+
 	async sendEmail(networkResponse, address) {
 		const { monitor, status, prevStatus } = networkResponse;
 		const template = prevStatus === false ? "serverIsUpTemplate" : "serverIsDownTemplate";
@@ -232,6 +237,16 @@ class NotificationService {
 		return true;
 	}
 
+	async sendTestPagerDutyNotification(notification) {
+		const { routingKey } = notification.config;
+		const response = await this.networkService.requestPagerDuty({
+			message: "This is a test notification",
+			monitorUrl: "Test notification",
+			routingKey,
+		});
+
+		return response;
+	}
 	async sendPagerDutyNotification(networkResponse, notification) {
 		const { monitor, status, code } = networkResponse;
 		const { routingKey, platform } = notification.config;
@@ -251,7 +266,7 @@ class NotificationService {
 				routingKey,
 				monitorUrl: monitor.url,
 			});
-			return response.status;
+			return response;
 		} catch (error) {
 			this.logger.error({
 				message: "Failed to send PagerDuty notification",

From 3224feeb9e52f383bf243d87ecb9bd1cdf8aacc5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 13:57:00 +0800
Subject: [PATCH 090/319] fix duplicate strings, remove uptime percentage

---
 .../Details/Components/StatusBoxes/index.jsx              | 6 +++---
 client/src/locales/en.json                                | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
index 447831acb..66483d448 100644
--- a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
@@ -14,7 +14,7 @@ const InfraStatBoxes = ({ shouldRender, monitor }) => {
 	const { determineState } = useUtils();
 	const { t } = useTranslation();
 
-	const { stats, uptimePercentage } = monitor ?? {};
+	const { stats } = monitor ?? {};
 	const latestCheck = stats?.aggregateData?.latestCheck;
 
 	// Get data from latest check
@@ -95,7 +95,7 @@ const InfraStatBoxes = ({ shouldRender, monitor }) => {
 				heading={t("disk")}
 				subHeading={formatBytes(diskTotalBytes)}
 			/>
-			<StatBox
+			{/* <StatBox
 				heading={t("uptime")}
 				subHeading={
 					<>
@@ -103,7 +103,7 @@ const InfraStatBoxes = ({ shouldRender, monitor }) => {
 						<Typography component="span">%</Typography>
 					</>
 				}
-			/>
+			/> */}
 			<StatBox
 				key={8}
 				heading={t("os")}
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 4b79b88d5..83ecf6b55 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -614,7 +614,9 @@
 	"monitorStatus": {
 		"up": "up",
 		"down": "down",
-		"paused": "paused"
+		"paused": "paused",
+		"checkingEvery": "Checking every {{interval}}",
+		"withCaptureAgent": "with Capture agent {{version}}"
 	},
 	"roles": {
 		"superAdmin": "Super admin",
@@ -723,9 +725,5 @@
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	},
-	"monitorStatus": {
-		"checkingEvery": "Checking every {{interval}}",
-		"withCaptureAgent": "with Capture agent {{version}}"
 	}
 }

From 7587fea6d5b0eab4fd4c5fdd7bb6c3b0735a582a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 14:03:49 +0800
Subject: [PATCH 091/319] Add row click handling to notificaitons table

---
 client/src/Hooks/useNotifications.js     |  3 ++-
 client/src/Pages/Notifications/index.jsx | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 8e7f896e9..54e3d1bd9 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -131,7 +131,7 @@ const useEditNotification = () => {
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState(null);
 	const { t } = useTranslation();
-
+	const navigate = useNavigate();
 	const editNotification = async (id, notification) => {
 		try {
 			setIsLoading(true);
@@ -139,6 +139,7 @@ const useEditNotification = () => {
 			createToast({
 				body: t("notifications.edit.success"),
 			});
+			navigate(`/notifications`);
 		} catch (error) {
 			setError(error);
 			createToast({
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index 2694a3fea..9ad5f1578 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -119,6 +119,16 @@ const Notifications = () => {
 			</Stack>
 			<Typography variant="h1">{t("notifications.createTitle")}</Typography>
 			<DataTable
+				config={{
+					onRowClick: (row) => navigate(`/notifications/${row._id}`),
+					rowSX: {
+						cursor: "pointer",
+						"&:hover td": {
+							backgroundColor: theme.palette.tertiary.main,
+							transition: "background-color .3s ease",
+						},
+					},
+				}}
 				headers={headers}
 				data={notifications}
 			/>

From e44114b5e5cfd16cb817b5d3aba2be635a0ebf44 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 10 Jun 2025 14:19:57 +0800
Subject: [PATCH 092/319] fix image name

---
 docker/dist/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml
index a0d13d061..580f21e97 100755
--- a/docker/dist/docker-compose.yaml
+++ b/docker/dist/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   client:
-    image: ghcr.io/bluewave-labs/checkmate-frontend:latest
+    image: ghcr.io/bluewave-labs/checkmate-client:latest
     restart: always
     environment:
       UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1"

From 18ef81f6f15e0e37a23163a46c8e8e975e30c14b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 10:20:14 +0800
Subject: [PATCH 093/319] refactor login page

---
 .../Pages/Auth/Login/Components/EmailStep.jsx | 106 -------
 .../Login/Components/ForgotPasswordLabel.jsx  |  49 ----
 .../Auth/Login/Components/PasswordStep.jsx    | 141 ----------
 client/src/Pages/Auth/Login/Login.jsx         | 266 ------------------
 client/src/Pages/Auth/Login/index.jsx         | 162 +++++++++++
 5 files changed, 162 insertions(+), 562 deletions(-)
 delete mode 100644 client/src/Pages/Auth/Login/Components/EmailStep.jsx
 delete mode 100644 client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
 delete mode 100644 client/src/Pages/Auth/Login/Components/PasswordStep.jsx
 delete mode 100644 client/src/Pages/Auth/Login/Login.jsx
 create mode 100644 client/src/Pages/Auth/Login/index.jsx

diff --git a/client/src/Pages/Auth/Login/Components/EmailStep.jsx b/client/src/Pages/Auth/Login/Components/EmailStep.jsx
deleted file mode 100644
index f3f56ec26..000000000
--- a/client/src/Pages/Auth/Login/Components/EmailStep.jsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { useRef, useEffect } from "react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import TextInput from "../../../../Components/Inputs/TextInput";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-/**
- * Renders the email step of the login process which includes an email field.
- *
- * @param {Object} props
- * @param {Object} props.form - Form state object.
- * @param {Object} props.errors - Object containing form validation errors.
- * @param {Function} props.onSubmit - Callback function to handle form submission.
- * @param {Function} props.onChange - Callback function to handle form input changes.
- * @param {Function} props.onBack - Callback function to handle "Back" button click.
- * @returns {JSX.Element}
- */
-const EmailStep = ({ form, errors, onSubmit, onChange }) => {
-	const theme = useTheme();
-	const inputRef = useRef(null);
-	const { t } = useTranslation();
-
-	useEffect(() => {
-		if (inputRef.current) {
-			inputRef.current.focus();
-		}
-	}, []);
-
-	return (
-		<>
-			<Stack
-				gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				textAlign="center"
-				position="relative"
-			>
-				<Box>
-					<Typography component="h1">{t("auth.login.heading")}</Typography>
-					<Typography>{t("auth.login.subheadings.stepOne")}</Typography>
-				</Box>
-				<Box
-					textAlign="left"
-					component="form"
-					noValidate
-					spellCheck={false}
-					onSubmit={onSubmit}
-					display="grid"
-					gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				>
-					<TextInput
-						type="email"
-						id="login-email-input"
-						label={t("auth.common.inputs.email.label")}
-						isRequired={true}
-						placeholder={t("auth.common.inputs.email.placeholder")}
-						autoComplete="email"
-						value={form.email}
-						onChange={onChange}
-						error={errors.email ? true : false}
-						helperText={errors.email ? t(errors.email) : ""} // Localization keys are in validation.js
-						ref={inputRef}
-					/>
-					<Stack
-						direction="row"
-						justifyContent="flex-end"
-					>
-						<Button
-							variant="contained"
-							color="accent"
-							type="submit"
-							disabled={errors.email && true}
-							className="dashboard-style-button"
-							sx={{
-								width: "30%",
-								px: theme.spacing(6),
-								borderRadius: `${theme.shape.borderRadius}px !important`,
-								"&.MuiButtonBase-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"&.MuiButton-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"&.Mui-focusVisible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-									boxShadow: `none`,
-								},
-							}}
-						>
-							{t("auth.common.navigation.continue")}
-						</Button>
-					</Stack>
-				</Box>
-			</Stack>
-		</>
-	);
-};
-
-EmailStep.propTypes = {
-	form: PropTypes.object.isRequired,
-	errors: PropTypes.object.isRequired,
-	onSubmit: PropTypes.func.isRequired,
-	onChange: PropTypes.func.isRequired,
-};
-
-export default EmailStep;
diff --git a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx b/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
deleted file mode 100644
index fe8c688ac..000000000
--- a/client/src/Pages/Auth/Login/Components/ForgotPasswordLabel.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Box, Typography, useTheme } from "@mui/material";
-import PropTypes from "prop-types";
-import { useNavigate } from "react-router";
-import { Trans, useTranslation } from "react-i18next";
-
-const ForgotPasswordLabel = ({ email, errorEmail }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-	const { t } = useTranslation();
-
-	const handleNavigate = () => {
-		if (email !== "" && !errorEmail) {
-			sessionStorage.setItem("email", email);
-		}
-		navigate("/forgot-password");
-	};
-
-	return (
-		<Box textAlign="center">
-			<Typography
-				className="forgot-p"
-				display="inline-block"
-				color={theme.palette.primary.main}
-			>
-				<Trans
-					i18nKey="auth.login.links.forgotPassword"
-					components={{
-						a: (
-							<Typography
-								component="span"
-								color={theme.palette.accent.main}
-								ml={theme.spacing(2)}
-								sx={{ userSelect: "none" }}
-								onClick={handleNavigate}
-							/>
-						),
-					}}
-				/>
-			</Typography>
-		</Box>
-	);
-};
-
-ForgotPasswordLabel.propTypes = {
-	email: PropTypes.string,
-	errorEmail: PropTypes.string,
-};
-
-export default ForgotPasswordLabel;
diff --git a/client/src/Pages/Auth/Login/Components/PasswordStep.jsx b/client/src/Pages/Auth/Login/Components/PasswordStep.jsx
deleted file mode 100644
index 5aa56fbb0..000000000
--- a/client/src/Pages/Auth/Login/Components/PasswordStep.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { useRef, useEffect } from "react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { useSelector } from "react-redux";
-import TextInput from "../../../../Components/Inputs/TextInput";
-import { PasswordEndAdornment } from "../../../../Components/Inputs/TextInput/Adornments";
-import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-/**
- * Renders the password step of the login process, including a password input field.
- *
- * @param {Object} props
- * @param {Object} props.form - Form state object.
- * @param {Object} props.errors - Object containing form validation errors.
- * @param {Function} props.onSubmit - Callback function to handle form submission.
- * @param {Function} props.onChange - Callback function to handle form input changes.
- * @param {Function} props.onBack - Callback function to handle "Back" button click.
- * @returns {JSX.Element}
- */
-const PasswordStep = ({ form, errors, onSubmit, onChange, onBack }) => {
-	const theme = useTheme();
-	const inputRef = useRef(null);
-	const authState = useSelector((state) => state.auth);
-	const { t } = useTranslation();
-
-	useEffect(() => {
-		if (inputRef.current) {
-			inputRef.current.focus();
-		}
-	}, []);
-
-	return (
-		<>
-			<Stack
-				gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				position="relative"
-				textAlign="center"
-			>
-				<Box>
-					<Typography component="h1">{t("auth.login.heading")}</Typography>
-					<Typography>{t("auth.login.subheadings.stepTwo")}</Typography>
-				</Box>
-				<Box
-					component="form"
-					noValidate
-					spellCheck={false}
-					onSubmit={onSubmit}
-					textAlign="left"
-					mb={theme.spacing(5)}
-					sx={{
-						display: "grid",
-						gap: { xs: theme.spacing(12), sm: theme.spacing(16) },
-					}}
-				>
-					<TextInput
-						type="password"
-						id="login-password-input"
-						label={t("auth.common.inputs.password.label")}
-						isRequired={true}
-						placeholder="••••••••••"
-						autoComplete="current-password"
-						value={form.password}
-						onChange={onChange}
-						error={errors.password ? true : false}
-						helperText={errors.password ? t(errors.password) : ""} // Localization keys are in validation.js
-						ref={inputRef}
-						endAdornment={<PasswordEndAdornment />}
-					/>
-					<Stack
-						direction="row"
-						justifyContent="space-between"
-					>
-						<Button
-							variant="outlined"
-							color="info"
-							onClick={onBack}
-							className="dashboard-style-button"
-							sx={{
-								px: theme.spacing(5),
-								borderRadius: `${theme.shape.borderRadius}px !important`,
-								"&.MuiButtonBase-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"&.MuiButton-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"& svg.MuiSvgIcon-root": {
-									mr: theme.spacing(3),
-								},
-								"&:focus-visible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-								},
-							}}
-						>
-							<ArrowBackRoundedIcon />
-							{t("auth.common.navigation.back")}{" "}
-						</Button>
-						<Button
-							variant="contained"
-							color="accent"
-							type="submit"
-							loading={authState.isLoading}
-							disabled={errors.password && true}
-							className="dashboard-style-button"
-							sx={{
-								width: "30%",
-								px: theme.spacing(4),
-								borderRadius: `${theme.shape.borderRadius}px !important`,
-								"&.MuiButtonBase-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"&.MuiButton-root": {
-									borderRadius: `${theme.shape.borderRadius}px !important`,
-								},
-								"&.Mui-focusVisible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-								},
-								boxShadow: `none`,
-							}}
-						>
-							{t("auth.common.navigation.continue")}
-						</Button>
-					</Stack>
-				</Box>
-			</Stack>
-		</>
-	);
-};
-
-PasswordStep.propTypes = {
-	form: PropTypes.object.isRequired,
-	errors: PropTypes.object.isRequired,
-	onSubmit: PropTypes.func.isRequired,
-	onChange: PropTypes.func.isRequired,
-	onBack: PropTypes.func.isRequired,
-};
-
-export default PasswordStep;
diff --git a/client/src/Pages/Auth/Login/Login.jsx b/client/src/Pages/Auth/Login/Login.jsx
deleted file mode 100644
index d2be3af35..000000000
--- a/client/src/Pages/Auth/Login/Login.jsx
+++ /dev/null
@@ -1,266 +0,0 @@
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import { Box, Stack, Typography } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { loginCredentials } from "../../../Validation/validation";
-import { login } from "../../../Features/Auth/authSlice";
-import { useDispatch, useSelector } from "react-redux";
-import { createToast } from "../../../Utils/toastUtils";
-import { networkService } from "../../../main";
-import Background from "../../../assets/Images/background-grid.svg?react";
-import Logo from "../../../assets/icons/checkmate-icon.svg?react";
-import "../index.css";
-import EmailStep from "./Components/EmailStep";
-import PasswordStep from "./Components/PasswordStep";
-import ThemeSwitch from "../../../Components/ThemeSwitch";
-import ForgotPasswordLabel from "./Components/ForgotPasswordLabel";
-import LanguageSelector from "../../../Components/LanguageSelector";
-import { Trans, useTranslation } from "react-i18next";
-
-const DEMO = import.meta.env.VITE_APP_DEMO;
-
-/**
- * Displays the login page.
- */
-
-const Login = () => {
-	const theme = useTheme();
-	const dispatch = useDispatch();
-	const { t } = useTranslation();
-	const navigate = useNavigate();
-	const authState = useSelector((state) => state.auth);
-	const { authToken } = authState;
-
-	const idMap = {
-		"login-email-input": "email",
-		"login-password-input": "password",
-	};
-
-	const [form, setForm] = useState({
-		email: DEMO !== undefined ? "uptimedemo@demo.com" : "",
-		password: DEMO !== undefined ? "Demouser1!" : "",
-	});
-	const [errors, setErrors] = useState({});
-	const [step, setStep] = useState(0);
-
-	useEffect(() => {
-		if (authToken) {
-			navigate("/uptime");
-		}
-	}, [authToken, navigate]);
-
-	const handleChange = (event) => {
-		const { value, id } = event.target;
-		const name = idMap[id];
-		const lowerCasedValue =
-			name === idMap["login-email-input"] ? value?.toLowerCase() || value : value;
-		setForm((prev) => ({
-			...prev,
-			[name]: lowerCasedValue,
-		}));
-
-		const { error } = loginCredentials.validate(
-			{ [name]: lowerCasedValue },
-			{ abortEarly: false }
-		);
-
-		setErrors((prev) => {
-			const prevErrors = { ...prev };
-			if (error) prevErrors[name] = error.details[0].message;
-			else delete prevErrors[name];
-			return prevErrors;
-		});
-	};
-
-	const handleSubmit = async (event) => {
-		event.preventDefault();
-
-		if (step === 0) {
-			const { error } = loginCredentials.validate(
-				{ email: form.email },
-				{ abortEarly: false }
-			);
-			if (error) {
-				const errorMessage = error.details[0].message;
-				const translatedMessage = errorMessage.startsWith("auth")
-					? t(errorMessage) // Localization keys are in validation.js
-					: errorMessage; // FIXME: Potential untranslated string
-				setErrors((prev) => ({ ...prev, email: translatedMessage }));
-				createToast({ body: translatedMessage });
-			} else {
-				setStep(1);
-			}
-		} else if (step === 1) {
-			const { error } = loginCredentials.validate(form, { abortEarly: false });
-
-			if (error) {
-				// validation errors
-				const newErrors = {};
-				error.details.forEach((err) => {
-					newErrors[err.path[0]] = err.message;
-				});
-				setErrors(newErrors);
-				createToast({
-					body:
-						error.details && error.details.length > 0
-							? error.details[0].message.startsWith("auth")
-								? t(error.details[0].message) // Localization keys are in validation.js
-								: error.details[0].message // FIXME: Potential untranslated string
-							: t("auth.common.errors.validation"),
-				});
-			} else {
-				const action = await dispatch(login(form));
-				if (action.payload.success) {
-					navigate("/uptime");
-					createToast({
-						body: t("auth.login.toasts.success"),
-					});
-				} else {
-					if (action.payload) {
-						if (action.payload.msg === "Incorrect password")
-							setErrors({
-								password: t("auth.common.fields.password.errors.incorrect"),
-							});
-						// dispatch errors
-						createToast({
-							body: t("auth.login.toasts.incorrectPassword"),
-						});
-					} else {
-						// unknown errors
-						createToast({
-							body: t("common.toasts.unknownError"),
-						});
-					}
-				}
-			}
-		}
-	};
-
-	return (
-		<Stack
-			className="login-page auth"
-			overflow="hidden"
-			sx={{
-				"& h1": {
-					color: theme.palette.primary.contrastText,
-					fontWeight: 600,
-					fontSize: 28,
-				},
-				/* TODO set font size from theme */
-				"& p": { fontSize: 14, color: theme.palette.primary.contrastTextSecondary },
-				"& span": { fontSize: "inherit" },
-			}}
-		>
-			<Box
-				className="background-pattern-svg"
-				sx={{
-					"& svg g g:last-of-type path": {
-						stroke: theme.palette.primary.lowContrast,
-					},
-				}}
-			>
-				<Background style={{ width: "100%" }} />
-			</Box>
-			<Stack
-				direction="row"
-				alignItems="center"
-				justifyContent="space-between"
-				px={theme.spacing(12)}
-				gap={theme.spacing(4)}
-			>
-				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(4)}
-				>
-					<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-					<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
-				</Stack>
-				<Stack
-					direction="row"
-					spacing={2}
-					alignItems="center"
-				>
-					<LanguageSelector />
-					<ThemeSwitch />
-				</Stack>
-			</Stack>
-			<Stack
-				width="100%"
-				maxWidth={600}
-				flex={1}
-				justifyContent="center"
-				px={{ xs: theme.spacing(12), lg: theme.spacing(20) }}
-				pb={theme.spacing(20)}
-				mx="auto"
-				rowGap={theme.spacing(8)}
-				sx={{
-					"& > .MuiStack-root": {
-						border: 1,
-						borderRadius: theme.spacing(5),
-						borderColor: theme.palette.primary.lowContrast,
-						backgroundColor: theme.palette.primary.main,
-						padding: {
-							xs: theme.spacing(12),
-							sm: theme.spacing(20),
-						},
-					},
-				}}
-			>
-				{step === 0 ? (
-					<EmailStep
-						form={form}
-						errors={errors}
-						onSubmit={handleSubmit}
-						onChange={handleChange}
-					/>
-				) : (
-					step === 1 && (
-						<PasswordStep
-							form={form}
-							errors={errors}
-							onSubmit={handleSubmit}
-							onChange={handleChange}
-							onBack={() => setStep(0)}
-						/>
-					)
-				)}
-				<ForgotPasswordLabel
-					email={form.email}
-					errorEmail={errors.email}
-				/>
-
-				{/* Registration link */}
-				<Box textAlign="center">
-					<Typography
-						className="forgot-p"
-						display="inline-block"
-						color={theme.palette.primary.main}
-					>
-						<Trans
-							i18nKey="auth.login.links.register"
-							components={{
-								a: (
-									<Typography
-										component="span"
-										color={theme.palette.accent.main}
-										ml={theme.spacing(2)}
-										sx={{
-											cursor: "pointer",
-											"&:hover": {
-												color: theme.palette.accent.darker,
-											},
-										}}
-										onClick={() => navigate("/register")}
-									/>
-								),
-							}}
-						/>
-					</Typography>
-				</Box>
-			</Stack>
-		</Stack>
-	);
-};
-
-export default Login;
diff --git a/client/src/Pages/Auth/Login/index.jsx b/client/src/Pages/Auth/Login/index.jsx
new file mode 100644
index 000000000..04155a9d6
--- /dev/null
+++ b/client/src/Pages/Auth/Login/index.jsx
@@ -0,0 +1,162 @@
+// Components
+import Stack from "@mui/material/Stack";
+import AuthHeader from "../components/AuthHeader";
+import Button from "@mui/material/Button";
+import TextInput from "../../../Components/Inputs/TextInput";
+import { PasswordEndAdornment } from "../../../Components/Inputs/TextInput/Adornments";
+import { loginCredentials } from "../../../Validation/validation";
+import TextLink from "../components/TextLink";
+
+// Utils
+import { login } from "../../../Features/Auth/authSlice";
+import { useNavigate } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { useState } from "react";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import { createToast } from "../../../Utils/toastUtils";
+
+const Login = () => {
+	// Local state
+	const [form, setForm] = useState({
+		email: "",
+		password: "",
+	});
+	const [errors, setErrors] = useState({
+		email: "",
+		password: "",
+	});
+
+	// Hooks
+	const { t } = useTranslation();
+	const theme = useTheme();
+	const dispatch = useDispatch();
+	const navigate = useNavigate();
+
+	// Handlers
+	const onChange = (e) => {
+		const { name, value } = e.target;
+		const updatedForm = { ...form, [name]: value };
+		const { error } = loginCredentials.validate({ [name]: value });
+		setForm(updatedForm);
+		setErrors((prev) => ({
+			...prev,
+			[name]: error?.details?.[0]?.message || "",
+		}));
+	};
+
+	const onSubmit = async (e) => {
+		e.preventDefault();
+		const toSubmit = { ...form };
+		const { error } = loginCredentials.validate(toSubmit, { abortEarly: false });
+
+		if (error) {
+			const formErrors = {};
+			for (const err of error.details) {
+				formErrors[err.path[0]] = err.message;
+			}
+			setErrors(formErrors);
+			return;
+		}
+
+		const action = await dispatch(login(form));
+		if (action.payload.success) {
+			navigate("/uptime");
+			createToast({
+				body: t("auth.login.toasts.success"),
+			});
+		} else {
+			if (action.payload) {
+				if (action.payload.msg === "Incorrect password")
+					setErrors({
+						password: t("auth.login.errors.password.incorrect"),
+					});
+				// dispatch errors
+				createToast({
+					body: t("auth.login.toasts.incorrectPassword"),
+				});
+			} else {
+				// unknown errors
+				createToast({
+					body: t("common.toasts.unknownError"),
+				});
+			}
+		}
+	};
+
+	return (
+		<Stack
+			gap={theme.spacing(10)}
+			height="100vh"
+		>
+			<AuthHeader />
+			<Stack
+				margin="auto"
+				width="100%"
+				alignItems="center"
+				gap={theme.spacing(10)}
+			>
+				<Stack
+					component="form"
+					width="100%"
+					maxWidth={600}
+					alignSelf="center"
+					justifyContent="center"
+					border={1}
+					borderRadius={theme.spacing(5)}
+					borderColor={theme.palette.primary.lowContrast}
+					backgroundColor={theme.palette.primary.main}
+					padding={theme.spacing(12)}
+					gap={theme.spacing(12)}
+					onSubmit={onSubmit}
+				>
+					<TextInput
+						type="email"
+						name="email"
+						label={t("auth.common.inputs.email.label")}
+						isRequired={true}
+						placeholder={t("auth.common.inputs.email.placeholder")}
+						autoComplete="email"
+						value={form.email}
+						onChange={onChange}
+						error={errors.email ? true : false}
+						helperText={errors.email ? t(errors.email) : ""} // Localization keys are in validation.js
+					/>
+					<TextInput
+						type="password"
+						name="password"
+						label={t("auth.common.inputs.password.label")}
+						isRequired={true}
+						placeholder="••••••••••"
+						autoComplete="current-password"
+						value={form.password}
+						onChange={onChange}
+						error={errors.password ? true : false}
+						helperText={errors.password ? t(errors.password) : ""} // Localization keys are in validation.js
+						endAdornment={<PasswordEndAdornment />}
+					/>
+					<Button
+						variant="contained"
+						color="accent"
+						type="submit"
+						sx={{ width: "30%", alignSelf: "flex-end" }}
+					>
+						Login
+					</Button>
+				</Stack>
+				<TextLink
+					text={t("auth.login.links.forgotPassword")}
+					linkText={t("auth.login.links.forgotPasswordLink")}
+					href="/forgot-password"
+				/>
+				<TextLink
+					text={t("auth.login.links.register")}
+					linkText={t("auth.login.links.registerLink")}
+					href="/register"
+				/>
+			</Stack>
+		</Stack>
+	);
+};
+
+export default Login;

From f32892adaf9694a55c10f6e41d1fd39deeaa3e7c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 10:20:36 +0800
Subject: [PATCH 094/319] add components directory

---
 .../src/Pages/Auth/components/AuthHeader.jsx  | 45 +++++++++++++++++++
 client/src/Pages/Auth/components/TextLink.jsx | 34 ++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 client/src/Pages/Auth/components/AuthHeader.jsx
 create mode 100644 client/src/Pages/Auth/components/TextLink.jsx

diff --git a/client/src/Pages/Auth/components/AuthHeader.jsx b/client/src/Pages/Auth/components/AuthHeader.jsx
new file mode 100644
index 000000000..c6ad46a47
--- /dev/null
+++ b/client/src/Pages/Auth/components/AuthHeader.jsx
@@ -0,0 +1,45 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Logo from "../../../assets/icons/checkmate-icon.svg?react";
+import LanguageSelector from "../../../Components/LanguageSelector";
+import ThemeSwitch from "../../../Components/ThemeSwitch";
+
+// Utils
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+
+const AuthHeader = () => {
+	// Hooks
+	const theme = useTheme();
+	const { t } = useTranslation();
+
+	return (
+		<Stack
+			direction="row"
+			alignItems="center"
+			justifyContent="space-between"
+			px={theme.spacing(12)}
+			gap={theme.spacing(4)}
+		>
+			<Stack
+				direction="row"
+				alignItems="center"
+				gap={theme.spacing(4)}
+			>
+				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
+				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
+			</Stack>
+			<Stack
+				direction="row"
+				spacing={theme.spacing(2)}
+				alignItems="center"
+			>
+				<LanguageSelector />
+				<ThemeSwitch />
+			</Stack>
+		</Stack>
+	);
+};
+
+export default AuthHeader;
diff --git a/client/src/Pages/Auth/components/TextLink.jsx b/client/src/Pages/Auth/components/TextLink.jsx
new file mode 100644
index 000000000..a10839e84
--- /dev/null
+++ b/client/src/Pages/Auth/components/TextLink.jsx
@@ -0,0 +1,34 @@
+import Typography from "@mui/material/Typography";
+import Stack from "@mui/material/Stack";
+import Link from "@mui/material/Link";
+import PropTypes from "prop-types";
+import { useTheme } from "@emotion/react";
+import { Link as RouterLink } from "react-router-dom";
+
+const TextLink = ({ text, linkText, href }) => {
+	const theme = useTheme();
+
+	return (
+		<Stack
+			direction="row"
+			gap={theme.spacing(4)}
+		>
+			<Typography>{text}</Typography>
+			<Link
+				color="accent"
+				to={href}
+				component={RouterLink}
+			>
+				{linkText}
+			</Link>
+		</Stack>
+	);
+};
+
+TextLink.propTypes = {
+	text: PropTypes.string,
+	linkText: PropTypes.string,
+	href: PropTypes.string,
+};
+
+export default TextLink;

From cd17ecdadbb81d8bb9a0d5677c62147addb6ba32 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 10:21:33 +0800
Subject: [PATCH 095/319] fix import path

---
 client/src/Routes/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 3f815a665..85b8da82c 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -3,7 +3,7 @@ import HomeLayout from "../Components/Layouts/HomeLayout";
 import NotFound from "../Pages/NotFound";
 
 // Auth
-import AuthLogin from "../Pages/Auth/Login/Login";
+import AuthLogin from "../Pages/Auth/Login";
 import AuthRegister from "../Pages/Auth/Register/Register";
 import AuthForgotPassword from "../Pages/Auth/ForgotPassword";
 import AuthCheckEmail from "../Pages/Auth/CheckEmail";
@@ -48,7 +48,6 @@ import Settings from "../Pages/Settings";
 import Maintenance from "../Pages/Maintenance";
 
 import ProtectedRoute from "../Components/ProtectedRoute";
-import ProtectedDistributedUptimeRoute from "../Components/ProtectedDistributedUptimeRoute";
 import CreateNewMaintenanceWindow from "../Pages/Maintenance/CreateMaintenance";
 import withAdminCheck from "../Components/HOC/withAdminCheck";
 import BulkImport from "../Pages/Uptime/BulkImport";

From 9e6b826f6e8a03c5ab4cd6d423b3a1376dd8be55 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 10:21:47 +0800
Subject: [PATCH 096/319] update translations

---
 client/src/locales/en.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 83ecf6b55..655f427bf 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -102,12 +102,19 @@
 				"stepTwo": "Enter your password"
 			},
 			"links": {
-				"forgotPassword": "Forgot password? <a>Reset password</a>",
-				"register": "Do not have an account? <a>Register here</a>"
+				"forgotPassword": "Forgot password?",
+				"forgotPasswordLink": "Reset password",
+				"register": "Do not have an account?",
+				"registerLink": "Register here"
 			},
 			"toasts": {
 				"success": "Welcome back! You're successfully logged in.",
 				"incorrectPassword": "Incorrect password"
+			},
+			"errors": {
+				"password": {
+					"incorrect": "The password you provided does not match our records"
+				}
 			}
 		},
 		"registration": {

From 045b506e2ad395a9da6ed6e713aaa9d26473c876 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 10:22:17 +0800
Subject: [PATCH 097/319] remove unused component

---
 .../ProtectedDistributedUptimeRoute/index.jsx | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 client/src/Components/ProtectedDistributedUptimeRoute/index.jsx

diff --git a/client/src/Components/ProtectedDistributedUptimeRoute/index.jsx b/client/src/Components/ProtectedDistributedUptimeRoute/index.jsx
deleted file mode 100644
index 4a59859fe..000000000
--- a/client/src/Components/ProtectedDistributedUptimeRoute/index.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Navigate } from "react-router-dom";
-import { useSelector } from "react-redux";
-import PropTypes from "prop-types";
-
-/**
- * @param {Object} props - The props passed to the ProtectedDistributedUptimeRoute component.
- * @param {React.ReactNode} props.children - The children to render if the user is authenticated.
- * @returns {React.ReactElement} The children wrapped in a protected route or a redirect to the login page.
- */
-
-const ProtectedDistributedUptimeRoute = ({ children }) => {
-	const distributedUptimeEnabled = useSelector(
-		(state) => state.ui.distributedUptimeEnabled
-	);
-
-	return distributedUptimeEnabled === true ? (
-		children
-	) : (
-		<Navigate
-			to="/uptime"
-			replace
-		/>
-	);
-};
-
-ProtectedDistributedUptimeRoute.propTypes = {
-	children: PropTypes.node.isRequired,
-};
-
-export default ProtectedDistributedUptimeRoute;

From fac960b9ac913000c9ab4e3751a6cc4dd8948899 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 12:32:03 +0800
Subject: [PATCH 098/319] set minHeight, force lowercase for email

---
 client/src/Pages/Auth/Login/index.jsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Auth/Login/index.jsx b/client/src/Pages/Auth/Login/index.jsx
index 04155a9d6..fbbe29a5e 100644
--- a/client/src/Pages/Auth/Login/index.jsx
+++ b/client/src/Pages/Auth/Login/index.jsx
@@ -35,7 +35,10 @@ const Login = () => {
 
 	// Handlers
 	const onChange = (e) => {
-		const { name, value } = e.target;
+		let { name, value } = e.target;
+		if (name === "email") {
+			value = value.toLowerCase();
+		}
 		const updatedForm = { ...form, [name]: value };
 		const { error } = loginCredentials.validate({ [name]: value });
 		setForm(updatedForm);
@@ -87,7 +90,7 @@ const Login = () => {
 	return (
 		<Stack
 			gap={theme.spacing(10)}
-			height="100vh"
+			minHeight="100vh"
 		>
 			<AuthHeader />
 			<Stack

From 3ade8b5bd4c92841ad4963bfbb1114983ac4e35f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 12:32:16 +0800
Subject: [PATCH 099/319] update admin check HOC

---
 client/src/Components/HOC/withAdminCheck.jsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/HOC/withAdminCheck.jsx b/client/src/Components/HOC/withAdminCheck.jsx
index 8edf7a02b..bd6a21d07 100644
--- a/client/src/Components/HOC/withAdminCheck.jsx
+++ b/client/src/Components/HOC/withAdminCheck.jsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import { logger } from "../../Utils/Logger";
@@ -7,23 +7,35 @@ import { networkService } from "../../main";
 const withAdminCheck = (WrappedComponent) => {
 	const WithAdminCheck = (props) => {
 		const navigate = useNavigate();
+		const [isChecking, setIsChecking] = useState(true);
+		const [superAdminExists, setSuperAdminExists] = useState(false);
 
 		useEffect(() => {
 			networkService
 				.doesSuperAdminExist()
 				.then((response) => {
-					if (response.data.data === true) {
+					if (response?.data?.data === true) {
 						navigate("/login");
+					} else {
+						setSuperAdminExists(true);
 					}
 				})
 				.catch((error) => {
 					logger.error(error);
+				})
+				.finally(() => {
+					setIsChecking(false);
 				});
 		}, [navigate]);
+
+		if (isChecking) {
+			return null;
+		}
+
 		return (
 			<WrappedComponent
 				{...props}
-				isSuperAdmin={true}
+				superAdminExists={superAdminExists}
 			/>
 		);
 	};

From bcea3a5e66dff9d68bcc61860ad97625b4f1b55b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 12:32:36 +0800
Subject: [PATCH 100/319] refactor register page

---
 client/src/Pages/Auth/Register/Register.jsx   | 413 ------------------
 .../src/Pages/Auth/Register/StepOne/index.jsx | 142 ------
 .../Pages/Auth/Register/StepThree/index.jsx   | 185 --------
 .../src/Pages/Auth/Register/StepTwo/index.jsx | 125 ------
 client/src/Pages/Auth/Register/index.jsx      | 347 +++++++++++++++
 5 files changed, 347 insertions(+), 865 deletions(-)
 delete mode 100644 client/src/Pages/Auth/Register/Register.jsx
 delete mode 100644 client/src/Pages/Auth/Register/StepOne/index.jsx
 delete mode 100644 client/src/Pages/Auth/Register/StepThree/index.jsx
 delete mode 100644 client/src/Pages/Auth/Register/StepTwo/index.jsx
 create mode 100644 client/src/Pages/Auth/Register/index.jsx

diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
deleted file mode 100644
index 390aa6e36..000000000
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ /dev/null
@@ -1,413 +0,0 @@
-import { useState, useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-import { useDispatch } from "react-redux";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import { StepOne } from "./StepOne";
-import { StepTwo } from "./StepTwo";
-import { StepThree } from "./StepThree";
-import { networkService } from "../../../main";
-import { newOrChangedCredentials } from "../../../Validation/validation";
-import { createToast } from "../../../Utils/toastUtils";
-import { register } from "../../../Features/Auth/authSlice";
-import Background from "../../../assets/Images/background-grid.svg?react";
-import Logo from "../../../assets/icons/checkmate-icon.svg?react";
-import Mail from "../../../assets/icons/mail.svg?react";
-import "../index.css";
-import { useTranslation, Trans } from "react-i18next";
-/**
- * Displays the initial landing page.
- *
- * @param {Object} props
- * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
- * @param {Function} props.onContinue - Callback function to handle "Continue with Email" button click.
- * @returns {JSX.Element}
- */
-const LandingPage = ({ isSuperAdmin, onSignup }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<>
-			<Stack
-				gap={{ xs: theme.spacing(8), sm: theme.spacing(12) }}
-				alignItems="center"
-				textAlign="center"
-			>
-				<Box>
-					<Typography component="h1">
-						{isSuperAdmin
-							? t("auth.registration.heading.superAdmin")
-							: t("auth.registration.heading.user")}
-					</Typography>
-					<Typography>
-						{isSuperAdmin
-							? t("auth.registration.description.superAdmin")
-							: t("auth.registration.description.user")}
-					</Typography>
-				</Box>
-				<Box width="100%">
-					<Button
-						variant="outlined"
-						color="info"
-						onClick={onSignup}
-						sx={{
-							width: "100%",
-							"& svg": {
-								mr: theme.spacing(4),
-								"& path": {
-									stroke: theme.palette.primary.contrastTextTertiary,
-								},
-							},
-							"&:focus-visible": {
-								outline: `2px solid ${theme.palette.primary.main}`,
-								outlineOffset: `2px`,
-							},
-						}}
-					>
-						<Mail />
-						{isSuperAdmin
-							? t("auth.registration.gettingStartedButton.superAdmin")
-							: t("auth.registration.gettingStartedButton.user")}
-					</Button>
-				</Box>
-				<Box maxWidth={400}>
-					<Typography className="tos-p">
-						<Trans
-							i18nKey="auth.registration.termsAndPolicies"
-							components={{
-								a1: (
-									<Typography
-										component="span"
-										sx={{
-											cursor: "pointer",
-											"&:hover": {
-												color: theme.palette.primary.contrastTextTertiary,
-											},
-										}}
-										onClick={() => {
-											window.open(
-												"https://bluewavelabs.ca/terms-of-service-open-source",
-												"_blank",
-												"noreferrer"
-											);
-										}}
-									/>
-								),
-								a2: (
-									<Typography
-										component="span"
-										sx={{
-											cursor: "pointer",
-											"&:hover": {
-												color: theme.palette.primary.contrastTextTertiary,
-											},
-										}}
-										onClick={() => {
-											window.open(
-												"https://bluewavelabs.ca/privacy-policy-open-source",
-												"_blank",
-												"noreferrer"
-											);
-										}}
-									/>
-								),
-							}}
-						/>
-					</Typography>
-				</Box>
-			</Stack>
-		</>
-	);
-};
-
-LandingPage.propTypes = {
-	isSuperAdmin: PropTypes.bool,
-	onSignup: PropTypes.func,
-};
-
-const Register = ({ isSuperAdmin }) => {
-	const dispatch = useDispatch();
-	const navigate = useNavigate();
-	const { token } = useParams();
-	const theme = useTheme();
-	const { t } = useTranslation();
-	// TODO If possible, change the IDs of these fields to match the backend
-	const idMap = {
-		"register-firstname-input": "firstName",
-		"register-lastname-input": "lastName",
-		"register-email-input": "email",
-		"register-password-input": "password",
-		"register-confirm-input": "confirm",
-	};
-
-	const [form, setForm] = useState({
-		firstName: "",
-		lastName: "",
-		email: "",
-		password: "",
-		confirm: "",
-		role: [],
-		teamId: "",
-	});
-	const [errors, setErrors] = useState({});
-	const [step, setStep] = useState(0);
-
-	useEffect(() => {
-		const fetchInvite = async () => {
-			if (token !== undefined) {
-				try {
-					const res = await networkService.verifyInvitationToken(token);
-					const invite = res.data.data;
-					const { email } = invite;
-					setForm({ ...form, email });
-				} catch (error) {
-					navigate("/register", { replace: true });
-				}
-			}
-		};
-		fetchInvite();
-	}, []);
-
-	/**
-	 * Validates the form data against the validation schema.
-	 *
-	 * @param {Object} data - The form data to validate.
-	 * @param {Object} [options] - Optional settings for validation.
-	 * @returns {Object | undefined} - Returns the validation error object if there are validation errors; otherwise, `undefined`.
-	 */
-	const validateForm = (data, options = {}) => {
-		const { error } = newOrChangedCredentials.validate(data, {
-			abortEarly: false,
-			...options,
-		});
-		return error;
-	};
-
-	/**
-	 * Handles validation errors by setting the state with error messages and displaying a toast notification.
-	 *
-	 * @param {Object} error - The validation error object returned from the validation schema.
-	 */
-	const handleError = (error) => {
-		const newErrors = {};
-		error.details.forEach((err) => {
-			newErrors[err.path[0]] = err.message;
-		});
-		setErrors(newErrors);
-		// Localization keys are in validation.js
-		createToast({ body: t(error.details[0].message || "auth.common.errors.validation") });
-	};
-
-	const handleStepOne = async (e) => {
-		e.preventDefault();
-		let error = validateForm({
-			firstName: form.firstName,
-			lastName: form.lastName,
-		});
-
-		if (error) {
-			handleError(error);
-			return;
-		}
-
-		setStep(2);
-	};
-
-	const handleStepTwo = async (e) => {
-		e.preventDefault();
-
-		let error;
-		error = validateForm({ email: form.email });
-		if (error) {
-			handleError(error);
-			return;
-		}
-
-		setStep(3);
-	};
-
-	// Final step
-	// Attempts account registration
-	const handleStepThree = async (e) => {
-		e.preventDefault();
-		const { password, confirm } = e.target.elements;
-		let registerForm = {
-			...form,
-			password: password.value,
-			confirm: confirm.value,
-			role: isSuperAdmin ? ["superadmin"] : form.role,
-			inviteToken: token ? token : "", // Add the token to the request for verification
-		};
-		let error = validateForm(registerForm, {
-			context: { password: registerForm.password },
-		});
-		if (error) {
-			handleError(error);
-			return;
-		}
-
-		delete registerForm.confirm;
-		const action = await dispatch(register(registerForm));
-		if (action.payload.success) {
-			const authToken = action.payload.data;
-			navigate("/uptime");
-			createToast({
-				body: t("auth.registration.toasts.success"),
-			});
-		} else {
-			if (action.payload) {
-				createToast({
-					body: action.payload.msg,
-				});
-			} else {
-				createToast({
-					body: t("common.toasts.unknownError"),
-				});
-			}
-		}
-	};
-
-	const handleChange = (event) => {
-		const { value, id } = event.target;
-		const name = idMap[id];
-		const lowerCasedValue =
-			name === idMap["register-email-input"] ? value?.toLowerCase() || value : value;
-		setForm((prev) => ({
-			...prev,
-			[name]: lowerCasedValue,
-		}));
-
-		const { error } = newOrChangedCredentials.validate(
-			{ [name]: lowerCasedValue },
-			{ abortEarly: false, context: { password: form.password } }
-		);
-
-		setErrors((prev) => {
-			const prevErrors = { ...prev };
-			if (error) prevErrors[name] = error.details[0].message;
-			else delete prevErrors[name];
-			return prevErrors;
-		});
-	};
-
-	return (
-		<Stack
-			className="register-page auth"
-			overflow="hidden"
-			sx={{
-				"& h1": {
-					color: theme.palette.primary.contrastText,
-					fontWeight: 600,
-					fontSize: 28,
-				},
-				/* TODO set fontsize from theme */
-				"& p": { fontSize: 14, color: theme.palette.primary.contrastTextSecondary },
-				"& span": { fontSize: "inherit" },
-			}}
-		>
-			<Box
-				className="background-pattern-svg"
-				sx={{
-					"& svg g g:last-of-type path": {
-						stroke: theme.palette.primary.lowContrast,
-					},
-				}}
-			>
-				<Background style={{ width: "100%" }} />
-			</Box>
-			<Stack
-				direction="row"
-				alignItems="center"
-				px={theme.spacing(12)}
-				gap={theme.spacing(4)}
-			>
-				<Logo style={{ borderRadius: theme.shape.borderRadius }} />
-				<Typography sx={{ userSelect: "none" }}>{t("common.appName")}</Typography>
-			</Stack>
-			<Stack
-				width="100%"
-				maxWidth={600}
-				flex={1}
-				justifyContent="center"
-				px={{ xs: theme.spacing(12), lg: theme.spacing(20) }}
-				pb={theme.spacing(20)}
-				mx="auto"
-				sx={{
-					"& > .MuiStack-root": {
-						border: 1,
-						borderRadius: theme.spacing(5),
-						borderColor: theme.palette.primary.lowContrast,
-						backgroundColor: theme.palette.primary.main,
-						padding: {
-							xs: theme.spacing(12),
-							sm: theme.spacing(20),
-						},
-					},
-				}}
-			>
-				{step === 0 ? (
-					<LandingPage
-						isSuperAdmin={isSuperAdmin}
-						onSignup={() => setStep(1)}
-					/>
-				) : step === 1 ? (
-					<StepOne
-						isSuperAdmin={isSuperAdmin}
-						form={form}
-						errors={errors}
-						onSubmit={handleStepOne}
-						onChange={handleChange}
-						onBack={() => setStep(0)}
-					/>
-				) : step === 2 ? (
-					<StepTwo
-						isSuperAdmin={isSuperAdmin}
-						form={form}
-						errors={errors}
-						onSubmit={handleStepTwo}
-						onChange={handleChange}
-						onBack={() => setStep(1)}
-					/>
-				) : step === 3 ? (
-					<StepThree
-						isSuperAdmin={isSuperAdmin}
-						/* form={form}
-						errors={errors} */
-						onSubmit={handleStepThree}
-						/* onChange={handleChange} */
-						onBack={() => setStep(2)}
-					/>
-				) : (
-					""
-				)}
-			</Stack>
-			<Box
-				textAlign="center"
-				p={theme.spacing(12)}
-			>
-				<Typography display="inline-block">
-					<Trans
-						i18nKey="auth.registration.links.login"
-						components={{
-							a: (
-								<Typography
-									component="span"
-									ml={theme.spacing(2)}
-									onClick={() => {
-										navigate("/login");
-									}}
-									sx={{ userSelect: "none", color: theme.palette.accent.main }}
-								/>
-							),
-						}}
-					/>
-				</Typography>
-			</Box>
-		</Stack>
-	);
-};
-Register.propTypes = {
-	isSuperAdmin: PropTypes.bool,
-};
-export default Register;
diff --git a/client/src/Pages/Auth/Register/StepOne/index.jsx b/client/src/Pages/Auth/Register/StepOne/index.jsx
deleted file mode 100644
index 575a9132f..000000000
--- a/client/src/Pages/Auth/Register/StepOne/index.jsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { useEffect, useRef } from "react";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
-import TextInput from "../../../../Components/Inputs/TextInput";
-import { useTranslation } from "react-i18next";
-
-StepOne.propTypes = {
-	isSuperAdmin: PropTypes.bool,
-	form: PropTypes.object,
-	errors: PropTypes.object,
-	onSubmit: PropTypes.func,
-	onChange: PropTypes.func,
-	onBack: PropTypes.func,
-};
-
-/**
- * Renders the first step of the sign up process.
- *
- * @param {Object} props
- * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
- * @param {Object} props.form - Form state object.
- * @param {Object} props.errors - Object containing form validation errors.
- * @param {Function} props.onSubmit - Callback function to handle form submission.
- * @param {Function} props.onChange - Callback function to handle form input changes.
- * @param {Function} props.onBack - Callback function to handle "Back" button click.
- * @returns {JSX.Element}
- */
-
-function StepOne({ isSuperAdmin, form, errors, onSubmit, onChange, onBack }) {
-	const theme = useTheme();
-	const inputRef = useRef(null);
-	const { t } = useTranslation();
-
-	useEffect(() => {
-		if (inputRef.current) {
-			inputRef.current.focus();
-		}
-	}, []);
-
-	return (
-		<>
-			{/* TODO this stack should be a component */}
-			<Stack
-				gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				textAlign="center"
-			>
-				<Box>
-					<Typography component="h1">
-						{isSuperAdmin
-							? t("auth.registration.heading.superAdmin")
-							: t("auth.registration.heading.user")}
-					</Typography>
-					<Typography>{t("auth.registration.subheadings.stepOne")}</Typography>
-				</Box>
-
-				<Box
-					textAlign="left"
-					component="form"
-					noValidate
-					spellCheck={false}
-					onSubmit={onSubmit}
-					display="grid"
-					gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				>
-					<Box
-						display="grid"
-						gap={{ xs: theme.spacing(8), sm: theme.spacing(12) }}
-					>
-						<TextInput
-							id="register-firstname-input"
-							label={t("auth.common.inputs.firstName.label")}
-							isRequired={true}
-							placeholder={t("auth.common.inputs.firstName.placeholder")}
-							autoComplete="given-name"
-							value={form.firstName}
-							onChange={onChange}
-							error={errors.firstName ? true : false}
-							helperText={t(errors.firstName)} // Localization keys are in validation.js
-							ref={inputRef}
-						/>
-						<TextInput
-							id="register-lastname-input"
-							label={t("auth.common.inputs.lastName.label")}
-							isRequired={true}
-							placeholder={t("auth.common.inputs.lastName.placeholder")}
-							autoComplete="family-name"
-							value={form.lastName}
-							onChange={onChange}
-							error={errors.lastName ? true : false}
-							helperText={t(errors.lastName)} // Localization keys are in validation.js
-						/>
-					</Box>
-					<Stack
-						direction="row"
-						justifyContent="space-between"
-					>
-						{/* TODO buttons should be  a component should be a component */}
-						<Button
-							variant="outlined"
-							color="info"
-							onClick={onBack}
-							sx={{
-								px: theme.spacing(5),
-								"& svg.MuiSvgIcon-root": {
-									mr: theme.spacing(3),
-								},
-
-								"&:focus-visible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-								},
-							}}
-						>
-							<ArrowBackRoundedIcon />
-							{t("auth.common.navigation.back")}
-						</Button>
-						<Button
-							variant="contained"
-							color="accent"
-							type="submit"
-							disabled={(errors.firstName || errors.lastName) && true}
-							sx={{
-								width: "30%",
-								"&.Mui-focusVisible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-									boxShadow: `none`,
-								},
-							}}
-						>
-							{t("auth.common.navigation.continue")}
-						</Button>
-					</Stack>
-				</Box>
-			</Stack>
-		</>
-	);
-}
-
-export { StepOne };
diff --git a/client/src/Pages/Auth/Register/StepThree/index.jsx b/client/src/Pages/Auth/Register/StepThree/index.jsx
deleted file mode 100644
index c81ae08a7..000000000
--- a/client/src/Pages/Auth/Register/StepThree/index.jsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import { useEffect, useRef } from "react";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
-import TextInput from "../../../../Components/Inputs/TextInput";
-import Check from "../../../../Components/Check/Check";
-import { useValidatePassword } from "../../hooks/useValidatePassword";
-import { useTranslation } from "react-i18next";
-StepThree.propTypes = {
-	isSuperAdmin: PropTypes.bool,
-	onSubmit: PropTypes.func,
-	onBack: PropTypes.func,
-};
-
-/**
- * Renders the third step of the sign up process.
- *
- * @param {Object} props
- * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
- * @param {Function} props.onSubmit - Callback function to handle form submission.
- * @param {Function} props.onBack - Callback function to handle "Back" button click.
- * @returns {JSX.Element}
- */
-function StepThree({ isSuperAdmin, onSubmit, onBack }) {
-	const theme = useTheme();
-	const inputRef = useRef(null);
-	const { t } = useTranslation();
-
-	useEffect(() => {
-		if (inputRef.current) {
-			inputRef.current.focus();
-		}
-	}, []);
-
-	const { handleChange, feedbacks, form, errors } = useValidatePassword();
-	return (
-		<>
-			<Stack
-				gap={{ xs: theme.spacing(8), sm: theme.spacing(12) }}
-				textAlign="center"
-			>
-				<Box>
-					<Typography component="h1">
-						{isSuperAdmin
-							? t("auth.registration.heading.superAdmin")
-							: t("auth.registration.heading.user")}
-					</Typography>
-					<Typography>{t("auth.registration.subheadings.stepThree")}</Typography>
-				</Box>
-				<Box
-					component="form"
-					noValidate
-					spellCheck={false}
-					onSubmit={onSubmit}
-					textAlign="left"
-					display="grid"
-					gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-					sx={{
-						"& .input-error": {
-							display: "none",
-						},
-					}}
-				>
-					<Box
-						display="grid"
-						gap={{ xs: theme.spacing(8), sm: theme.spacing(12) }}
-					>
-						<TextInput
-							type="password"
-							id="register-password-input"
-							name="password"
-							label={t("auth.common.inputs.password.label")}
-							isRequired={true}
-							placeholder="••••••••••"
-							autoComplete="current-password"
-							value={form.password}
-							onChange={handleChange}
-							error={errors.password && errors.password[0] ? true : false}
-							helperText={
-								errors.password === "auth.common.inputs.password.errors.empty"
-									? t(errors.password)
-									: ""
-							} // Other errors are related to required password conditions and are visualized below the input
-							ref={inputRef}
-						/>
-						<TextInput
-							type="password"
-							id="register-confirm-input"
-							name="confirm"
-							label={t("auth.common.inputs.passwordConfirm.label")}
-							isRequired={true}
-							placeholder={t("auth.common.inputs.passwordConfirm.placeholder")}
-							autoComplete="current-password"
-							value={form.confirm}
-							onChange={handleChange}
-							error={errors.confirm && errors.confirm[0] ? true : false}
-							helperText={t(errors.confirm)} // Localization keys are in validation.js
-						/>
-					</Box>
-					<Stack
-						gap={theme.spacing(4)}
-						mb={{ xs: theme.spacing(6), sm: theme.spacing(8) }}
-					>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.length.beginning")}
-							text={t("auth.common.inputs.password.rules.length.highlighted")}
-							variant={feedbacks.length}
-						/>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.special.beginning")}
-							text={t("auth.common.inputs.password.rules.special.highlighted")}
-							variant={feedbacks.special}
-						/>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.number.beginning")}
-							text={t("auth.common.inputs.password.rules.number.highlighted")}
-							variant={feedbacks.number}
-						/>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.uppercase.beginning")}
-							text={t("auth.common.inputs.password.rules.uppercase.highlighted")}
-							variant={feedbacks.uppercase}
-						/>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.lowercase.beginning")}
-							text={t("auth.common.inputs.password.rules.lowercase.highlighted")}
-							variant={feedbacks.lowercase}
-						/>
-						<Check
-							noHighlightText={t("auth.common.inputs.password.rules.match.beginning")}
-							text={t("auth.common.inputs.password.rules.match.highlighted")}
-							variant={feedbacks.confirm}
-						/>
-					</Stack>
-					<Stack
-						direction="row"
-						justifyContent="space-between"
-					>
-						<Button
-							variant="outlined"
-							color="info"
-							onClick={onBack}
-							sx={{
-								px: theme.spacing(5),
-								"& svg.MuiSvgIcon-root": {
-									mr: theme.spacing(3),
-								},
-								":focus-visible": {
-									outline: `2px solid ${theme.palette.primary.lowContrast}`,
-									outlineOffset: "4px",
-								},
-							}}
-						>
-							<ArrowBackRoundedIcon />
-							{t("auth.common.navigation.back")}
-						</Button>
-						<Button
-							type="submit"
-							variant="contained"
-							color="accent"
-							disabled={
-								form.password.length === 0 ||
-								form.confirm.length === 0 ||
-								Object.keys(errors).length !== 0
-							}
-							sx={{
-								width: "30%",
-								"&.Mui-focusVisible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-									boxShadow: `none`,
-								},
-							}}
-						>
-							{t("auth.common.navigation.continue")}
-						</Button>
-					</Stack>
-				</Box>
-			</Stack>
-		</>
-	);
-}
-
-export { StepThree };
diff --git a/client/src/Pages/Auth/Register/StepTwo/index.jsx b/client/src/Pages/Auth/Register/StepTwo/index.jsx
deleted file mode 100644
index 306a2b750..000000000
--- a/client/src/Pages/Auth/Register/StepTwo/index.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { useEffect, useRef } from "react";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { Box, Button, Stack, Typography } from "@mui/material";
-import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
-import TextInput from "../../../../Components/Inputs/TextInput";
-import { useTranslation } from "react-i18next";
-
-StepTwo.propTypes = {
-	isSuperAdmin: PropTypes.bool,
-	form: PropTypes.object,
-	errors: PropTypes.object,
-	onSubmit: PropTypes.func,
-	onChange: PropTypes.func,
-	onBack: PropTypes.func,
-};
-
-/**
- * Renders the second step of the sign up process.
- *
- * @param {Object} props
- * @param {boolean} props.isSuperAdmin - Whether the user is creating and admin account
- * @param {Object} props.form - Form state object.
- * @param {Object} props.errors - Object containing form validation errors.
- * @param {Function} props.onSubmit - Callback function to handle form submission.
- * @param {Function} props.onChange - Callback function to handle form input changes.
- * @param {Function} props.onBack - Callback function to handle "Back" button click.
- * @returns {JSX.Element}
- */
-function StepTwo({ isSuperAdmin, form, errors, onSubmit, onChange, onBack }) {
-	const theme = useTheme();
-	const inputRef = useRef(null);
-	const { t } = useTranslation();
-
-	useEffect(() => {
-		if (inputRef.current) {
-			inputRef.current.focus();
-		}
-	}, []);
-
-	return (
-		<>
-			<Stack
-				gap={{ xs: theme.spacing(8), sm: theme.spacing(12) }}
-				textAlign="center"
-			>
-				<Box>
-					<Typography component="h1">
-						{isSuperAdmin
-							? t("auth.registration.heading.superAdmin")
-							: t("auth.registration.heading.user")}
-					</Typography>
-					<Typography>{t("auth.registration.subheadings.stepTwo")}</Typography>
-				</Box>
-
-				<Box
-					component="form"
-					textAlign="left"
-					noValidate
-					spellCheck={false}
-					onSubmit={onSubmit}
-					mb={theme.spacing(5)}
-					display="grid"
-					gap={{ xs: theme.spacing(12), sm: theme.spacing(16) }}
-				>
-					<TextInput
-						type="email"
-						id="register-email-input"
-						label={t("auth.common.inputs.email.label")}
-						isRequired={true}
-						placeholder={t("auth.common.inputs.email.placeholder")}
-						autoComplete="email"
-						value={form.email}
-						onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
-						onChange={onChange}
-						error={errors.email ? true : false}
-						helperText={t(errors.email)} // Localization keys are in validation.js
-						ref={inputRef}
-					/>
-					<Stack
-						direction="row"
-						justifyContent="space-between"
-					>
-						<Button
-							variant="outlined"
-							color="info"
-							onClick={onBack}
-							sx={{
-								px: theme.spacing(5),
-								"& svg.MuiSvgIcon-root": {
-									mr: theme.spacing(3),
-								},
-								"&:focus-visible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-								},
-							}}
-						>
-							<ArrowBackRoundedIcon />
-							{t("auth.common.navigation.back")}
-						</Button>
-						<Button
-							variant="contained"
-							color="accent"
-							onClick={onSubmit}
-							disabled={errors.email && true}
-							sx={{
-								width: "30%",
-								"&.Mui-focusVisible": {
-									outline: `2px solid ${theme.palette.primary.main}`,
-									outlineOffset: `2px`,
-									boxShadow: `none`,
-								},
-							}}
-						>
-							{t("auth.common.navigation.continue")}
-						</Button>
-					</Stack>
-				</Box>
-			</Stack>
-		</>
-	);
-}
-
-export { StepTwo };
diff --git a/client/src/Pages/Auth/Register/index.jsx b/client/src/Pages/Auth/Register/index.jsx
new file mode 100644
index 000000000..2dd0951dd
--- /dev/null
+++ b/client/src/Pages/Auth/Register/index.jsx
@@ -0,0 +1,347 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import AuthHeader from "../components/AuthHeader";
+import TextInput from "../../../Components/Inputs/TextInput";
+import Check from "../../../Components/Check/Check";
+import Button from "@mui/material/Button";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import { useTranslation } from "react-i18next";
+import { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { useParams } from "react-router-dom";
+import { networkService } from "../../../main";
+import { newOrChangedCredentials } from "../../../Validation/validation";
+import { register } from "../../../Features/Auth/authSlice";
+import { createToast } from "../../../Utils/toastUtils";
+import PropTypes from "prop-types";
+
+const getFeedbackStatus = (form, errors, field, criteria) => {
+	const fieldErrors = errors?.[field];
+	const isFieldEmpty = form?.[field]?.length === 0;
+	const hasError = fieldErrors?.includes(criteria) || fieldErrors?.includes("empty");
+	const isCorrect = !isFieldEmpty && !hasError;
+
+	if (isCorrect) {
+		return "success";
+	} else if (hasError) {
+		return "error";
+	} else {
+		return "info";
+	}
+};
+
+const Register = ({ superAdminExists }) => {
+	// Local state
+	const [form, setForm] = useState({
+		firstName: "",
+		lastName: "",
+		email: "",
+		password: "",
+		confirm: "",
+		role: [],
+		teamId: "",
+	});
+
+	const [errors, setErrors] = useState({});
+	const [feedback, setFeedback] = useState({});
+
+	// Hooks
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const { token } = useParams();
+	const navigate = useNavigate();
+	const dispatch = useDispatch();
+
+	// Effects
+	useEffect(() => {
+		const fetchInvite = async () => {
+			if (token !== undefined) {
+				try {
+					const res = await networkService.verifyInvitationToken(token);
+					const invite = res.data.data;
+					const { email } = invite;
+					setForm((prevForm) => {
+						if (!prevForm.email) {
+							return { ...prevForm, email };
+						}
+						return prevForm;
+					});
+				} catch (error) {
+					navigate("/register", { replace: true });
+				}
+			}
+		};
+		fetchInvite();
+	}, [form, token, navigate]);
+
+	// Handlers
+	const onChange = (e) => {
+		let { name, value } = e.target;
+		if (name === "email") value = value.toLowerCase();
+		const updatedForm = { ...form, [name]: value };
+
+		const { error } = newOrChangedCredentials.validate(
+			{ [name]: value },
+			{ abortEarly: false, context: { password: form.password } }
+		);
+
+		setErrors((prev) => ({
+			...prev,
+			[name]: error?.details?.[0]?.message || "",
+		}));
+
+		setForm(updatedForm);
+	};
+
+	const onPasswordChange = (e) => {
+		const { name, value } = e.target;
+		const updatedForm = { ...form, [name]: value };
+		setForm(updatedForm);
+		const validateValue = { [name]: value };
+		const validateOptions = { abortEarly: false, context: { password: form.password } };
+		if (name === "password" && form.confirm.length > 0) {
+			validateValue.confirm = form.confirm;
+			validateOptions.context = { password: value };
+		} else if (name === "confirm") {
+			validateValue.password = form.password;
+		}
+		const { error } = newOrChangedCredentials.validate(validateValue, validateOptions);
+
+		const pwdErrors = error?.details.map((error) => ({
+			path: error.path[0],
+			type: error.type,
+		}));
+
+		const errorsByPath =
+			pwdErrors &&
+			pwdErrors.reduce((acc, { path, type }) => {
+				if (!acc[path]) {
+					acc[path] = [];
+				}
+				acc[path].push(type);
+				return acc;
+			}, {});
+
+		const oldErrors = { ...errors };
+		if (name === "password") {
+			oldErrors.password = undefined;
+		} else if (name === "confirm") {
+			oldErrors.confirm = undefined;
+		}
+		const newErrors = { ...oldErrors, ...errorsByPath };
+
+		setErrors(newErrors);
+
+		const newFeedback = {
+			length: getFeedbackStatus(updatedForm, errorsByPath, "password", "string.min"),
+			special: getFeedbackStatus(updatedForm, errorsByPath, "password", "special"),
+			number: getFeedbackStatus(updatedForm, errorsByPath, "password", "number"),
+			uppercase: getFeedbackStatus(updatedForm, errorsByPath, "password", "uppercase"),
+			lowercase: getFeedbackStatus(updatedForm, errorsByPath, "password", "lowercase"),
+			confirm: getFeedbackStatus(updatedForm, errorsByPath, "confirm", "different"),
+		};
+
+		setFeedback(newFeedback);
+	};
+
+	const onSubmit = async (e) => {
+		e.preventDefault();
+		const toSubmit = {
+			...form,
+			role: superAdminExists ? form.role : ["superadmin"],
+			inviteToken: token ? token : "",
+		};
+
+		const { error } = newOrChangedCredentials.validate(toSubmit, {
+			abortEarly: false,
+			context: { password: form.password },
+		});
+
+		if (error) {
+			const formErrors = {};
+			for (const err of error.details) {
+				formErrors[err.path[0]] = err.message;
+			}
+			setErrors(formErrors);
+			return;
+		}
+
+		delete toSubmit.confirm;
+
+		const action = await dispatch(register(toSubmit));
+		if (action.payload.success) {
+			navigate("/uptime");
+			createToast({
+				body: t("auth.registration.toasts.success"),
+			});
+		} else {
+			if (action.payload) {
+				createToast({
+					body: action.payload.msg,
+				});
+			} else {
+				createToast({
+					body: t("common.toasts.unknownError"),
+				});
+			}
+		}
+	};
+
+	return (
+		<Stack
+			gap={theme.spacing(10)}
+			minHeight="100vh"
+		>
+			<AuthHeader />
+			<Stack
+				margin="auto"
+				width="100%"
+				alignItems="center"
+				gap={theme.spacing(10)}
+			>
+				<Stack
+					component="form"
+					width="100%"
+					maxWidth={600}
+					alignSelf="center"
+					justifyContent="center"
+					border={1}
+					borderRadius={theme.spacing(5)}
+					borderColor={theme.palette.primary.lowContrast}
+					backgroundColor={theme.palette.primary.main}
+					padding={theme.spacing(12)}
+					gap={theme.spacing(12)}
+					onSubmit={onSubmit}
+				>
+					<Typography variant="h1">
+						{superAdminExists
+							? t("auth.registration.heading.user")
+							: t("auth.registration.heading.superAdmin")}
+					</Typography>
+					<Typography>
+						{superAdminExists
+							? t("auth.registration.description.user")
+							: t("auth.registration.description.superAdmin")}
+					</Typography>
+					<TextInput
+						type="email"
+						name="email"
+						label={t("auth.common.inputs.email.label")}
+						isRequired={true}
+						placeholder={t("auth.common.inputs.email.placeholder")}
+						autoComplete="email"
+						value={form.email}
+						onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
+						onChange={onChange}
+						error={errors.email ? true : false}
+						helperText={errors.email ? t(errors.email) : ""} // Localization keys are in validation.js
+					/>
+					<TextInput
+						name="firstName"
+						label={t("auth.common.inputs.firstName.label")}
+						isRequired={true}
+						placeholder={t("auth.common.inputs.firstName.placeholder")}
+						autoComplete="given-name"
+						value={form.firstName}
+						onChange={onChange}
+						error={errors.firstName ? true : false}
+						helperText={errors.firstName ? t(errors.firstName) : ""}
+					/>
+					<TextInput
+						name="lastName"
+						label={t("auth.common.inputs.lastName.label")}
+						isRequired={true}
+						placeholder={t("auth.common.inputs.lastName.placeholder")}
+						autoComplete="family-name"
+						value={form.lastName}
+						onChange={onChange}
+						error={errors.lastName ? true : false}
+						helperText={errors.lastName ? t(errors.lastName) : ""} // Localization keys are in validation.js
+					/>
+					<TextInput
+						type="password"
+						id="register-password-input"
+						name="password"
+						label={t("auth.common.inputs.password.label")}
+						isRequired={true}
+						placeholder="••••••••••"
+						autoComplete="current-password"
+						value={form.password}
+						onChange={onPasswordChange}
+						error={errors.password && errors.password[0] ? true : false}
+						helperText={
+							errors.password === "auth.common.inputs.password.errors.empty"
+								? t(errors.password)
+								: ""
+						} // Other errors are related to required password conditions and are visualized below the input
+					/>
+					<TextInput
+						type="password"
+						id="register-confirm-input"
+						name="confirm"
+						label={t("auth.common.inputs.passwordConfirm.label")}
+						isRequired={true}
+						placeholder={t("auth.common.inputs.passwordConfirm.placeholder")}
+						autoComplete="current-password"
+						value={form.confirm}
+						onChange={onPasswordChange}
+						error={errors.confirm && errors.confirm[0] ? true : false}
+					/>
+					<Stack
+						gap={theme.spacing(4)}
+						mb={{ xs: theme.spacing(6), sm: theme.spacing(8) }}
+					>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.length.beginning")}
+							text={t("auth.common.inputs.password.rules.length.highlighted")}
+							variant={feedback.length}
+						/>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.special.beginning")}
+							text={t("auth.common.inputs.password.rules.special.highlighted")}
+							variant={feedback.special}
+						/>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.number.beginning")}
+							text={t("auth.common.inputs.password.rules.number.highlighted")}
+							variant={feedback.number}
+						/>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.uppercase.beginning")}
+							text={t("auth.common.inputs.password.rules.uppercase.highlighted")}
+							variant={feedback.uppercase}
+						/>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.lowercase.beginning")}
+							text={t("auth.common.inputs.password.rules.lowercase.highlighted")}
+							variant={feedback.lowercase}
+						/>
+						<Check
+							noHighlightText={t("auth.common.inputs.password.rules.match.beginning")}
+							text={t("auth.common.inputs.password.rules.match.highlighted")}
+							variant={feedback.confirm}
+						/>
+					</Stack>
+					<Button
+						variant="contained"
+						color="accent"
+						type="submit"
+						sx={{ width: "30%", alignSelf: "flex-end" }}
+					>
+						{t("auth.common.navigation.continue")}
+					</Button>
+				</Stack>
+			</Stack>
+		</Stack>
+	);
+};
+
+Register.propTypes = {
+	superAdminExists: PropTypes.bool,
+};
+
+export default Register;

From c0ad2dfce2d2c5d58af2592a56ea9395da37c2e0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 12:41:58 +0800
Subject: [PATCH 101/319] fix superadmin state

---
 client/src/Components/HOC/withAdminCheck.jsx | 2 +-
 client/src/Routes/index.jsx                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/HOC/withAdminCheck.jsx b/client/src/Components/HOC/withAdminCheck.jsx
index bd6a21d07..458330a1f 100644
--- a/client/src/Components/HOC/withAdminCheck.jsx
+++ b/client/src/Components/HOC/withAdminCheck.jsx
@@ -17,7 +17,7 @@ const withAdminCheck = (WrappedComponent) => {
 					if (response?.data?.data === true) {
 						navigate("/login");
 					} else {
-						setSuperAdminExists(true);
+						setSuperAdminExists(false);
 					}
 				})
 				.catch((error) => {
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 85b8da82c..29daa2942 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -4,7 +4,7 @@ import NotFound from "../Pages/NotFound";
 
 // Auth
 import AuthLogin from "../Pages/Auth/Login";
-import AuthRegister from "../Pages/Auth/Register/Register";
+import AuthRegister from "../Pages/Auth/Register/";
 import AuthForgotPassword from "../Pages/Auth/ForgotPassword";
 import AuthCheckEmail from "../Pages/Auth/CheckEmail";
 import AuthSetNewPassword from "../Pages/Auth/SetNewPassword";

From ec25ebee35bb0abd287e2ce0307ea515321784e7 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 11 Jun 2025 14:11:49 +0530
Subject: [PATCH 102/319] Fix: Node Mailer Settings

---
 server/service/emailService.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/service/emailService.js b/server/service/emailService.js
index 035cc6505..ad0cdac3a 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -109,7 +109,7 @@ class EmailService {
 
 		const baseEmailConfig = {
 			host: systemEmailHost,
-			port: systemEmailPort,
+			port: Number(systemEmailPort),
 			secure: true,
 			auth: {
 				user: systemEmailUser || systemEmailAddress,
@@ -130,10 +130,6 @@ class EmailService {
 				}
 			: baseEmailConfig;
 
-		if (!isSmtps) {
-			delete emailConfig.auth;
-		}
-
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 
 		const buildHtml = async (template, context) => {

From 01ed3d8aaa971b8969bb9b7bfcbf039da5191aac Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 11 Jun 2025 14:42:51 +0530
Subject: [PATCH 103/319] Feat: New Email Settings

---
 client/src/Pages/Settings/SettingsEmail.jsx | 43 +++++++++++++++++++++
 client/src/locales/en.json                  |  4 ++
 2 files changed, 47 insertions(+)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 88f8f98c1..73ba11610 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -12,6 +12,7 @@ import { useTranslation } from "react-i18next";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
 import { createToast } from "../../Utils/toastUtils";
+import { Switch } from "@mui/material";
 
 const SettingsEmail = ({
 	isAdmin,
@@ -53,6 +54,10 @@ const SettingsEmail = ({
 			systemEmailAddress: settingsData?.settings?.systemEmailAddress,
 			systemEmailPassword: password || settingsData?.settings?.systemEmailPassword,
 			systemEmailConnectionHost: settingsData?.settings?.systemEmailConnectionHost,
+			systemEmailTLSServername: settingsData?.settings?.systemEmailTLSServername,
+			systemEmailIgnoreTLS: settingsData?.settings?.systemEmailIgnoreTLS,
+			systemEmailRequireTLS: settingsData?.settings?.systemEmailRequireTLS,
+			systemEmailRejectUnauthorized: settingsData?.settings?.systemEmailRejectUnauthorized,
 		};
 
 		// Basic validation
@@ -155,6 +160,44 @@ const SettingsEmail = ({
 							</Button>
 						</Box>
 					)}
+					<Box>
+						<Typography>
+							{t("settingsEmailTLSServername")}
+						</Typography>
+						<TextInput
+							name="systemEmailTLSServername"
+							placeholder="bluewavelabs.ca"
+							value={settingsData?.settings?.systemEmailTLSServername ?? ""}
+							onChange={handleChange}
+						/>
+					</Box>
+					<Box
+						sx={{
+							display: "flex",
+							flexDirection: "row",
+							alignItems: "center",
+							gap: theme.spacing(4),
+						}}
+					>
+						<Typography>{t("settingsEmailIgnoreTLS")}</Typography>
+						<Switch
+							name="systemEmailIgnoreTLS"
+							checked={settingsData?.settings?.systemEmailIgnoreTLS ?? false}
+							onChange={handleChange}
+						/>
+						<Typography>{t("settingsEmailRequireTLS")}</Typography>
+						<Switch
+							name="systemEmailRequireTLS"
+							checked={settingsData?.settings?.systemEmailRequireTLS ?? false}
+							onChange={handleChange}
+						/>
+						<Typography>{t("settingsEmailRejectUnauthorized")}</Typography>
+						<Switch
+							name="systemEmailRejectUnauthorized"
+							checked={settingsData?.settings?.systemEmailRejectUnauthorized ?? false}
+							onChange={handleChange}
+						/>
+					</Box>
 					<Box>
 						<Typography>{t("settingsEmailConnectionHost")}</Typography>
 						<TextInput
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 83ecf6b55..028f9483c 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -679,6 +679,10 @@
 	"settingsEmailPassword": "Email password - Password for authentication",
 	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
 	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
+	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+	"settingsEmailIgnoreTLS": "Ignore TLS",
+	"settingsEmailRequireTLS": "Require TLS",
+	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",

From 7e1a7066fcefbfa3d2d7b7bf4d3fc5a7783758a6 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 11 Jun 2025 15:11:28 +0530
Subject: [PATCH 104/319] TLS Options Set Up

---
 client/src/Pages/Settings/index.jsx | 8 ++++++--
 client/src/Validation/validation.js | 4 ++++
 server/service/emailService.js      | 9 ++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index b0e3c476b..b51fb0110 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -56,17 +56,21 @@ const Settings = () => {
 
 	// Handlers
 	const handleChange = async (e) => {
-		const { name, value } = e.target;
+		const { name, value, checked } = e.target;
 
 		// Special case for showURL until handled properly in the backend
 		if (name === "showURL") {
 			dispatch(setShowURL(value));
 			return;
 		}
+		let newValue;
+		if (name === "systemEmailIgnoreTLS" || name === "systemEmailRequireTLS" || name === "systemEmailRejectUnauthorized") {
+			newValue = checked;
+		}
 		// Build next state early
 		const newSettingsData = {
 			...settingsData,
-			settings: { ...settingsData.settings, [name]: value },
+			settings: { ...settingsData.settings, [name]: newValue ?? value },
 		};
 
 		// Validate
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 043e88f50..cb2d4e797 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -294,6 +294,10 @@ const settingsValidation = joi.object({
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
 	systemEmailConnectionHost: joi.string().allow(""),
+	systemEmailTLSServername: joi.string().allow(""),
+	systemEmailIgnoreTLS: joi.boolean().optional(),
+	systemEmailRequireTLS: joi.boolean().optional(),
+	systemEmailRejectUnauthorized: joi.boolean().optional(),
 });
 
 const dayjsValidator = (value, helpers) => {
diff --git a/server/service/emailService.js b/server/service/emailService.js
index ad0cdac3a..3b627fb95 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -105,6 +105,10 @@ class EmailService {
 			systemEmailAddress,
 			systemEmailPassword,
 			systemEmailConnectionHost,
+			systemEmailTLSServername,
+			systemEmailIgnoreTLS,
+			systemEmailRequireTLS,
+			systemEmailRejectUnauthorized,
 		} = config;
 
 		const baseEmailConfig = {
@@ -126,7 +130,10 @@ class EmailService {
 					name: systemEmailConnectionHost || "localhost",
 					secure: false,
 					pool: true,
-					tls: { rejectUnauthorized: false },
+					tls: { rejectUnauthorized: systemEmailRejectUnauthorized },
+					ignoreTLS: systemEmailIgnoreTLS,
+					requireTLS: systemEmailRequireTLS,
+					servername: systemEmailTLSServername,
 				}
 			: baseEmailConfig;
 

From 1794429cbeb801c76c728b515a06487e4509d61b Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 11 Jun 2025 15:29:25 +0530
Subject: [PATCH 105/319] Formatting Run

---
 client/src/Pages/Settings/SettingsEmail.jsx | 7 +++----
 client/src/Pages/Settings/index.jsx         | 6 +++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 73ba11610..7d6538734 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -57,7 +57,8 @@ const SettingsEmail = ({
 			systemEmailTLSServername: settingsData?.settings?.systemEmailTLSServername,
 			systemEmailIgnoreTLS: settingsData?.settings?.systemEmailIgnoreTLS,
 			systemEmailRequireTLS: settingsData?.settings?.systemEmailRequireTLS,
-			systemEmailRejectUnauthorized: settingsData?.settings?.systemEmailRejectUnauthorized,
+			systemEmailRejectUnauthorized:
+				settingsData?.settings?.systemEmailRejectUnauthorized,
 		};
 
 		// Basic validation
@@ -161,9 +162,7 @@ const SettingsEmail = ({
 						</Box>
 					)}
 					<Box>
-						<Typography>
-							{t("settingsEmailTLSServername")}
-						</Typography>
+						<Typography>{t("settingsEmailTLSServername")}</Typography>
 						<TextInput
 							name="systemEmailTLSServername"
 							placeholder="bluewavelabs.ca"
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index b51fb0110..4baf6da6a 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -64,7 +64,11 @@ const Settings = () => {
 			return;
 		}
 		let newValue;
-		if (name === "systemEmailIgnoreTLS" || name === "systemEmailRequireTLS" || name === "systemEmailRejectUnauthorized") {
+		if (
+			name === "systemEmailIgnoreTLS" ||
+			name === "systemEmailRequireTLS" ||
+			name === "systemEmailRejectUnauthorized"
+		) {
 			newValue = checked;
 		}
 		// Build next state early

From 0e4b371925f4630096cdebec5e1470b40bf9dde2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Jun 2025 20:12:02 +0800
Subject: [PATCH 106/319] add login header

---
 client/src/Pages/Auth/Login/index.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/Auth/Login/index.jsx b/client/src/Pages/Auth/Login/index.jsx
index 04155a9d6..ec0afd054 100644
--- a/client/src/Pages/Auth/Login/index.jsx
+++ b/client/src/Pages/Auth/Login/index.jsx
@@ -6,6 +6,7 @@ import TextInput from "../../../Components/Inputs/TextInput";
 import { PasswordEndAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import { loginCredentials } from "../../../Validation/validation";
 import TextLink from "../components/TextLink";
+import Typography from "@mui/material/Typography";
 
 // Utils
 import { login } from "../../../Features/Auth/authSlice";
@@ -96,13 +97,14 @@ const Login = () => {
 				alignItems="center"
 				gap={theme.spacing(10)}
 			>
+				<Typography variant="h1">{t("auth.login.heading")}</Typography>
+
 				<Stack
 					component="form"
 					width="100%"
 					maxWidth={600}
 					alignSelf="center"
 					justifyContent="center"
-					border={1}
 					borderRadius={theme.spacing(5)}
 					borderColor={theme.palette.primary.lowContrast}
 					backgroundColor={theme.palette.primary.main}

From de3d38d891007deb318580ba1509a0692301cfb7 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Thu, 12 Jun 2025 00:39:47 +0530
Subject: [PATCH 107/319] Implement remaining email config

---
 client/src/Pages/Settings/SettingsEmail.jsx | 23 ++++++++++++++++++
 client/src/Pages/Settings/index.jsx         |  4 ++-
 client/src/Utils/NetworkService.js          |  6 +++++
 client/src/Validation/validation.js         |  2 ++
 client/src/locales/en.json                  |  2 ++
 server/controllers/settingsController.js    | 12 +++++++++
 server/service/emailService.js              | 27 ++++++++-------------
 server/validation/joi.js                    |  6 +++++
 8 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 7d6538734..113d5bf44 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -50,6 +50,8 @@ const SettingsEmail = ({
 		const emailConfig = {
 			systemEmailHost: settingsData?.settings?.systemEmailHost,
 			systemEmailPort: settingsData?.settings?.systemEmailPort,
+			systemEmailSecure: settingsData?.settings?.systemEmailSecure,
+			systemEmailPool: settingsData?.settings?.systemEmailPool,
 			systemEmailUser: settingsData?.settings?.systemEmailUser,
 			systemEmailAddress: settingsData?.settings?.systemEmailAddress,
 			systemEmailPassword: password || settingsData?.settings?.systemEmailPassword,
@@ -110,6 +112,27 @@ const SettingsEmail = ({
 							onChange={handleChange}
 						/>
 					</Box>
+					<Box
+						sx={{
+							display: "flex",
+							flexDirection: "row",
+							alignItems: "center",
+							gap: theme.spacing(4),
+						}}
+					>
+						<Typography>{t("settingsEmailSecure")}</Typography>
+						<Switch
+							name="systemEmailSecure"
+							checked={settingsData?.settings?.systemEmailSecure ?? false}
+							onChange={handleChange}
+						/>
+						<Typography>{t("settingsEmailPool")}</Typography>
+						<Switch
+							name="systemEmailPool"
+							checked={settingsData?.settings?.systemEmailPool ?? false}
+							onChange={handleChange}
+						/>
+					</Box>
 					<Box>
 						<Typography>{t("settingsEmailUser")}</Typography>
 						<TextInput
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 4baf6da6a..1558eb9ef 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -67,7 +67,9 @@ const Settings = () => {
 		if (
 			name === "systemEmailIgnoreTLS" ||
 			name === "systemEmailRequireTLS" ||
-			name === "systemEmailRejectUnauthorized"
+			name === "systemEmailRejectUnauthorized" ||
+			name === "systemEmailSecure" ||
+			name === "systemEmailPool"
 		) {
 			newValue = checked;
 		}
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 3d124a3e6..dcb21df92 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1014,6 +1014,12 @@ class NetworkService {
 				systemEmailPort: emailConfig.systemEmailPort,
 				systemEmailAddress: emailConfig.systemEmailAddress,
 				systemEmailPassword: emailConfig.systemEmailPassword,
+				systemEmailSecure: emailConfig.systemEmailSecure,
+				systemEmailPool: emailConfig.systemEmailPool,
+				systemEmailIgnoreTLS: emailConfig.systemEmailIgnoreTLS,
+				systemEmailRequireTLS: emailConfig.systemEmailRequireTLS,
+				systemEmailRejectUnauthorized: emailConfig.systemEmailRejectUnauthorized,
+				systemEmailTLSServername: emailConfig.systemEmailTLSServername,
 				// Only include these if they are present
 				...(emailConfig.systemEmailConnectionHost && {
 					systemEmailConnectionHost: emailConfig.systemEmailConnectionHost,
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index cb2d4e797..089722a8d 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -290,6 +290,8 @@ const settingsValidation = joi.object({
 	timezone: joi.string().allow("").optional(),
 	systemEmailHost: joi.string().allow(""),
 	systemEmailPort: joi.number().allow(null, ""),
+	systemEmailSecure: joi.boolean().optional(),
+	systemEmailPool: joi.boolean().optional(),
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 028f9483c..610c56d0e 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -683,6 +683,8 @@
 	"settingsEmailIgnoreTLS": "Ignore TLS",
 	"settingsEmailRequireTLS": "Require TLS",
 	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
+	"settingsEmailSecure": "Secure",
+	"settingsEmailPool": "Pool",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",
diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js
index 58e8ce9f4..d1010c093 100755
--- a/server/controllers/settingsController.js
+++ b/server/controllers/settingsController.js
@@ -74,6 +74,12 @@ class SettingsController {
 				systemEmailPassword,
 				systemEmailUser,
 				systemEmailConnectionHost,
+				systemEmailSecure,
+				systemEmailPool,
+				systemEmailIgnoreTLS,
+				systemEmailRequireTLS,
+				systemEmailRejectUnauthorized,
+				systemEmailTLSServername,
 			} = req.body;
 
 			const subject = this.stringService.testEmailSubject;
@@ -91,6 +97,12 @@ class SettingsController {
 					systemEmailAddress,
 					systemEmailPassword,
 					systemEmailConnectionHost,
+					systemEmailSecure,
+					systemEmailPool,
+					systemEmailIgnoreTLS,
+					systemEmailRequireTLS,
+					systemEmailRejectUnauthorized,
+					systemEmailTLSServername,
 				}
 			);
 
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 3b627fb95..325871fac 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -101,6 +101,8 @@ class EmailService {
 		const {
 			systemEmailHost,
 			systemEmailPort,
+			systemEmailSecure,
+			systemEmailPool,
 			systemEmailUser,
 			systemEmailAddress,
 			systemEmailPassword,
@@ -111,32 +113,23 @@ class EmailService {
 			systemEmailRejectUnauthorized,
 		} = config;
 
-		const baseEmailConfig = {
+		const emailConfig = {
 			host: systemEmailHost,
 			port: Number(systemEmailPort),
-			secure: true,
+			secure: systemEmailSecure,
 			auth: {
 				user: systemEmailUser || systemEmailAddress,
 				pass: systemEmailPassword,
 			},
 			connectionTimeout: 5000,
+			pool: systemEmailPool,
+			tls: { rejectUnauthorized: systemEmailRejectUnauthorized },
+			ignoreTLS: systemEmailIgnoreTLS,
+			requireTLS: systemEmailRequireTLS,
+			servername: systemEmailTLSServername,
+			name: systemEmailConnectionHost || "localhost",
 		};
 
-		const isSmtps = Number(systemEmailPort) === 465;
-
-		const emailConfig = !isSmtps
-			? {
-					...baseEmailConfig,
-					name: systemEmailConnectionHost || "localhost",
-					secure: false,
-					pool: true,
-					tls: { rejectUnauthorized: systemEmailRejectUnauthorized },
-					ignoreTLS: systemEmailIgnoreTLS,
-					requireTLS: systemEmailRequireTLS,
-					servername: systemEmailTLSServername,
-				}
-			: baseEmailConfig;
-
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 
 		const buildHtml = async (template, context) => {
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 271cd2d21..b7858f92d 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -617,10 +617,16 @@ const sendTestEmailBodyValidation = joi.object({
 	to: joi.string().required(),
 	systemEmailHost: joi.string(),
 	systemEmailPort: joi.number(),
+	systemEmailSecure: joi.boolean(),
+	systemEmailPool: joi.boolean(),
 	systemEmailAddress: joi.string(),
 	systemEmailPassword: joi.string(),
 	systemEmailUser: joi.string(),
 	systemEmailConnectionHost: joi.string(),
+	systemEmailIgnoreTLS: joi.boolean(),
+	systemEmailRequireTLS: joi.boolean(),
+	systemEmailRejectUnauthorized: joi.boolean(),
+	systemEmailTLSServername: joi.string(),
 });
 
 export {

From 9242612f30818bbbd19d99bf4b1f77771efe39d4 Mon Sep 17 00:00:00 2001
From: anuragparashar26 <anuragparashar5025@gmail.com>
Date: Thu, 12 Jun 2025 05:01:09 +0530
Subject: [PATCH 108/319] fix: update TextInput border color to match dropdown
 (#2406)

---
 client/src/Utils/Theme/globalTheme.js | 110 ++++++++++++++------------
 1 file changed, 58 insertions(+), 52 deletions(-)

diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 59c26866a..95f277a87 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -302,59 +302,65 @@ const baseTheme = (palette) => ({
 		},
 
 		MuiTextField: {
-			styleOverrides: {
-				root: ({ theme }) => ({
-					"& fieldset": {
-						borderColor: theme.palette.primary.contrastBorder,
-						borderRadius: theme.shape.borderRadius,
-					},
+  			styleOverrides: {
+    			root: ({ theme }) => ({
+      				"& fieldset": {
+        				borderColor: theme.palette.primary.lowContrast,
+        				borderRadius: theme.shape.borderRadius,
+      				},
 
-					"& .MuiInputBase-input": {
-						padding: ".75em",
-						minHeight: "var(--env-var-height-2)",
-						fontSize: "var(--env-var-font-size-medium)",
-						fontWeight: 400,
-						color: palette.primary.contrastTextSecondary,
-						"&.Mui-disabled": {
-							opacity: 0.3,
-							WebkitTextFillColor: "unset",
-						},
-						"& .Mui-focused": {
-							/* color: "#ff0000", */
-							/* borderColor: theme.palette.primary.contrastText, */
-						},
-					},
-					"& .MuiInputBase-input:-webkit-autofill": {
-						transition: "background-color 5000s ease-in-out 0s",
-						WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.primary.main} inset`,
-						WebkitTextFillColor: theme.palette.primary.contrastText,
-					},
-					"& .MuiInputBase-input.MuiOutlinedInput-input": {
-						padding: "0 var(--env-var-spacing-1-minus) !important",
-					},
-					"& .MuiOutlinedInput-root": {
-						color: theme.palette.primary.contrastTextSecondary,
-						borderRadius: 4,
-					},
-					"& .MuiOutlinedInput-notchedOutline": {
-						borderRadius: 4,
-					},
+					 "& .MuiInputBase-input": {
+        				padding: ".75em",
+        				minHeight: "var(--env-var-height-2)",
+        				fontSize: "var(--env-var-font-size-medium)",
+        				fontWeight: 400,
+        				color: palette.primary.contrastTextSecondary,
+        				"&.Mui-disabled": {
+          					opacity: 0.3,
+          					WebkitTextFillColor: "unset",
+        				},
+        				"& .Mui-focused": {
+          					/* color: "#ff0000", */
+          					/* borderColor: theme.palette.primary.contrastText, */
+        				},
+      				},
 
-					"& .MuiFormHelperText-root": {
-						color: palette.error.main,
-						opacity: 0.8,
-						fontSize: "var(--env-var-font-size-medium)",
-						marginLeft: 0,
-					},
-					"& .MuiFormHelperText-root.Mui-error": {
-						opacity: 0.8,
-						fontSize: "var(--env-var-font-size-medium)",
-						color: palette.error.main,
-						whiteSpace: "nowrap",
-					},
-				}),
-			},
+      				"& .MuiInputBase-input:-webkit-autofill": {
+        				transition: "background-color 5000s ease-in-out 0s",
+        				WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.primary.main} inset`,
+        				WebkitTextFillColor: theme.palette.primary.contrastText,
+      				},
+
+      				"& .MuiInputBase-input.MuiOutlinedInput-input": {
+        				padding: "0 var(--env-var-spacing-1-minus) !important",
+      				},
+
+      				"& .MuiOutlinedInput-root": {
+        				color: theme.palette.primary.contrastTextSecondary,
+        				borderRadius: 4,
+      				},
+
+      				"& .MuiOutlinedInput-notchedOutline": {
+        				borderRadius: 4,
+      				},
+
+      				"& .MuiFormHelperText-root": {
+        				color: palette.error.main,
+        				opacity: 0.8,
+        				fontSize: "var(--env-var-font-size-medium)",
+        				marginLeft: 0,
+      				},
+
+      				"& .MuiFormHelperText-root.Mui-error": {
+      					opacity: 0.8,
+      					fontSize: "var(--env-var-font-size-medium)",
+      					color: palette.error.main,
+      					whiteSpace: "nowrap",
+      				},
+      			}),
+      		},
 		},
+
 		MuiOutlinedInput: {
 			styleOverrides: {
 				root: {
@@ -365,12 +371,12 @@ const baseTheme = (palette) => ({
 						borderColor: palette.primary.contrastBorderDisabled,
 					},
 					"&:hover .MuiOutlinedInput-notchedOutline": {
-						borderColor: palette.primary.contrastText, // Adjust hover border color
+						borderColor: palette.primary.lowContrast, // Adjust hover border color
 					},
 					"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
 						borderColor: palette.accent.main, // Adjust focus border color
 					},
-					color: palette.primary.contrastTextTertiary,
+					color: palette.primary.contrastText,
 				},
 			},
 		},

From 6dea8b434b99fbd09740105e95bf156d4e71adaa Mon Sep 17 00:00:00 2001
From: anuragparashar26 <anuragparashar5025@gmail.com>
Date: Thu, 12 Jun 2025 05:20:16 +0530
Subject: [PATCH 109/319] fix: update TextInput border color to match dropdown
 (#2406)

---
 client/src/Utils/Theme/globalTheme.js | 100 +++++++++++++-------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 95f277a87..37526ed73 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -302,63 +302,63 @@ const baseTheme = (palette) => ({
 		},
 
 		MuiTextField: {
-  			styleOverrides: {
-    			root: ({ theme }) => ({
-      				"& fieldset": {
-        				borderColor: theme.palette.primary.lowContrast,
-        				borderRadius: theme.shape.borderRadius,
-      				},
+			styleOverrides: {
+				root: ({ theme }) => ({
+					"& fieldset": {
+						borderColor: theme.palette.primary.lowContrast,
+						borderRadius: theme.shape.borderRadius,
+					},
 
-					 "& .MuiInputBase-input": {
-        				padding: ".75em",
-        				minHeight: "var(--env-var-height-2)",
-        				fontSize: "var(--env-var-font-size-medium)",
-        				fontWeight: 400,
-        				color: palette.primary.contrastTextSecondary,
-        				"&.Mui-disabled": {
-          					opacity: 0.3,
-          					WebkitTextFillColor: "unset",
-        				},
-        				"& .Mui-focused": {
-          					/* color: "#ff0000", */
-          					/* borderColor: theme.palette.primary.contrastText, */
-        				},
-      				},
+					"& .MuiInputBase-input": {
+						padding: ".75em",
+						minHeight: "var(--env-var-height-2)",
+						fontSize: "var(--env-var-font-size-medium)",
+						fontWeight: 400,
+						color: palette.primary.contrastTextSecondary,
+						"&.Mui-disabled": {
+							opacity: 0.3,
+							WebkitTextFillColor: "unset",
+						},
+						"& .Mui-focused": {
+							/* color: "#ff0000", */
+							/* borderColor: theme.palette.primary.contrastText, */
+						},
+					},
 
-      				"& .MuiInputBase-input:-webkit-autofill": {
-        				transition: "background-color 5000s ease-in-out 0s",
-        				WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.primary.main} inset`,
-        				WebkitTextFillColor: theme.palette.primary.contrastText,
-      				},
+					"& .MuiInputBase-input:-webkit-autofill": {
+						transition: "background-color 5000s ease-in-out 0s",
+						WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.primary.main} inset`,
+						WebkitTextFillColor: theme.palette.primary.contrastText,
+					},
 
-      				"& .MuiInputBase-input.MuiOutlinedInput-input": {
-        				padding: "0 var(--env-var-spacing-1-minus) !important",
-      				},
+					"& .MuiInputBase-input.MuiOutlinedInput-input": {
+						padding: "0 var(--env-var-spacing-1-minus) !important",
+					},
 
-      				"& .MuiOutlinedInput-root": {
-        				color: theme.palette.primary.contrastTextSecondary,
-        				borderRadius: 4,
-      				},
+					"& .MuiOutlinedInput-root": {
+						color: theme.palette.primary.contrastTextSecondary,
+						borderRadius: 4,
+					},
 
-      				"& .MuiOutlinedInput-notchedOutline": {
-        				borderRadius: 4,
-      				},
+					"& .MuiOutlinedInput-notchedOutline": {
+						borderRadius: 4,
+					},
 
-      				"& .MuiFormHelperText-root": {
-        				color: palette.error.main,
-        				opacity: 0.8,
-        				fontSize: "var(--env-var-font-size-medium)",
-        				marginLeft: 0,
-      				},
+					"& .MuiFormHelperText-root": {
+						color: palette.error.main,
+						opacity: 0.8,
+						fontSize: "var(--env-var-font-size-medium)",
+						marginLeft: 0,
+					},
 
-      				"& .MuiFormHelperText-root.Mui-error": {
-      					opacity: 0.8,
-      					fontSize: "var(--env-var-font-size-medium)",
-      					color: palette.error.main,
-      					whiteSpace: "nowrap",
-      				},
-      			}),
-      		},
+					"& .MuiFormHelperText-root.Mui-error": {
+						opacity: 0.8,
+						fontSize: "var(--env-var-font-size-medium)",
+						color: palette.error.main,
+						whiteSpace: "nowrap",
+					},
+				}),
+			},
 		},
 
 		MuiOutlinedInput: {

From b58fe4ae74bd18fed1916d687e2b1f3ecfe51b46 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 09:04:19 +0800
Subject: [PATCH 110/319] add loading state

---
 client/src/Pages/Auth/Register/index.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/Auth/Register/index.jsx b/client/src/Pages/Auth/Register/index.jsx
index 2dd0951dd..97b27e5cf 100644
--- a/client/src/Pages/Auth/Register/index.jsx
+++ b/client/src/Pages/Auth/Register/index.jsx
@@ -11,7 +11,7 @@ import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useParams } from "react-router-dom";
 import { networkService } from "../../../main";
 import { newOrChangedCredentials } from "../../../Validation/validation";
@@ -35,6 +35,9 @@ const getFeedbackStatus = (form, errors, field, criteria) => {
 };
 
 const Register = ({ superAdminExists }) => {
+	// Redux
+	const { isLoading } = useSelector((state) => state.auth);
+
 	// Local state
 	const [form, setForm] = useState({
 		firstName: "",
@@ -203,6 +206,8 @@ const Register = ({ superAdminExists }) => {
 				alignItems="center"
 				gap={theme.spacing(10)}
 			>
+				<Typography variant="h1">{t("auth.registration.heading.user")}</Typography>
+
 				<Stack
 					component="form"
 					width="100%"
@@ -327,6 +332,7 @@ const Register = ({ superAdminExists }) => {
 						/>
 					</Stack>
 					<Button
+						disabled={isLoading}
 						variant="contained"
 						color="accent"
 						type="submit"

From 1574624f690031c50efa705bcdccc8657882d2ad Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 09:37:51 +0800
Subject: [PATCH 111/319] add a background component

---
 client/src/App.jsx                            | 16 ++----
 .../Components/Layouts/AppLayout/index.jsx    | 30 ++++++++++++
 client/src/Components/Sidebar/index.jsx       |  1 -
 client/src/Components/StarPrompt/index.jsx    |  1 -
 client/src/Utils/Theme/constants.js           |  7 +++
 client/src/assets/Images/background.svg       | 49 +++++++++++++++++++
 6 files changed, 91 insertions(+), 13 deletions(-)
 create mode 100644 client/src/Components/Layouts/AppLayout/index.jsx
 create mode 100644 client/src/assets/Images/background.svg

diff --git a/client/src/App.jsx b/client/src/App.jsx
index 7fb63ee61..b599890f1 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -10,6 +10,7 @@ import { logger } from "./Utils/Logger"; // Import the logger
 import { networkService } from "./main";
 import { Routes } from "./Routes";
 import WalletProvider from "./Components/WalletProvider";
+import AppLayout from "./Components/Layouts/AppLayout";
 
 function App() {
 	const mode = useSelector((state) => state.ui.mode);
@@ -27,17 +28,10 @@ function App() {
 		<ThemeProvider theme={mode === "light" ? lightTheme : darkTheme}>
 			<WalletProvider>
 				<CssBaseline />
-				<GlobalStyles
-					styles={({ palette }) => {
-						return {
-							body: {
-								backgroundImage: `radial-gradient(circle, ${palette.gradient.color1}, ${palette.gradient.color2}, ${palette.gradient.color3}, ${palette.gradient.color4}, ${palette.gradient.color5})`,
-								color: palette.primary.contrastText,
-							},
-						};
-					}}
-				/>
-				<Routes />
+
+				<AppLayout>
+					<Routes />
+				</AppLayout>
 				<ToastContainer />
 			</WalletProvider>
 		</ThemeProvider>
diff --git a/client/src/Components/Layouts/AppLayout/index.jsx b/client/src/Components/Layouts/AppLayout/index.jsx
new file mode 100644
index 000000000..564012d72
--- /dev/null
+++ b/client/src/Components/Layouts/AppLayout/index.jsx
@@ -0,0 +1,30 @@
+import Box from "@mui/material/Box";
+import PropTypes from "prop-types";
+import { useTheme } from "@emotion/react";
+import BackgroundSVG from "../../../assets/Images/background.svg";
+
+const AppLayout = ({ children }) => {
+	const theme = useTheme();
+
+	return (
+		<Box
+			sx={{
+				minHeight: "100vh",
+				backgroundColor: theme.palette.primaryBackground.main,
+				backgroundImage: `url("${BackgroundSVG}")`,
+				backgroundSize: "100% 100%",
+				backgroundPosition: "center",
+				backgroundRepeat: "no-repeat",
+				color: theme.palette.primary.contrastText,
+			}}
+		>
+			{children}
+		</Box>
+	);
+};
+
+AppLayout.propTypes = {
+	children: PropTypes.node,
+};
+
+export default AppLayout;
diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index 6be67a43d..f487148f5 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -231,7 +231,6 @@ function Sidebar() {
 				borderRight: `1px solid ${theme.palette.primary.lowContrast}`,
 				borderColor: theme.palette.primary.lowContrast,
 				borderRadius: 0,
-				backgroundColor: theme.palette.primary.main,
 				"& :is(p, span, .MuiListSubheader-root)": {
 					/* 
 					Text color for unselected menu items and menu headings
diff --git a/client/src/Components/StarPrompt/index.jsx b/client/src/Components/StarPrompt/index.jsx
index 8bf434085..64fce1d3f 100644
--- a/client/src/Components/StarPrompt/index.jsx
+++ b/client/src/Components/StarPrompt/index.jsx
@@ -33,7 +33,6 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 				borderBottom: `1px solid ${theme.palette.primary.lowContrast}`,
 				borderRadius: 0,
 				gap: theme.spacing(1.5),
-				backgroundColor: theme.palette.primary.main,
 			}}
 		>
 			<Stack
diff --git a/client/src/Utils/Theme/constants.js b/client/src/Utils/Theme/constants.js
index 920a55f69..48dcdfd85 100644
--- a/client/src/Utils/Theme/constants.js
+++ b/client/src/Utils/Theme/constants.js
@@ -85,6 +85,7 @@ const semanticColors = {
 const newColors = {
 	offWhite: "#FEFEFE",
 	offBlack: "#131315",
+	gray10: "#F4F4FF",
 	gray100: "#F3F3F3",
 	gray200: "#EFEFEF",
 	gray500: "#A2A3A3",
@@ -175,6 +176,12 @@ const newSemanticColors = {
 			dark: newColors.blueGray600,
 		},
 	},
+	primaryBackground: {
+		main: {
+			light: newColors.gray10,
+			dark: "#000000",
+		},
+	},
 	secondary: {
 		main: {
 			light: newColors.gray200,
diff --git a/client/src/assets/Images/background.svg b/client/src/assets/Images/background.svg
new file mode 100644
index 000000000..728597e95
--- /dev/null
+++ b/client/src/assets/Images/background.svg
@@ -0,0 +1,49 @@
+<svg width="1440" height="1025" viewBox="0 0 1440 1025" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g filter="url(#filter0_f_563_20635)">
+        <ellipse cx="971.521" cy="1024.07" rx="278.644" ry="273.684" fill="#7054FF" fill-opacity="0.2" />
+    </g>
+    <g filter="url(#filter1_f_563_20635)">
+        <ellipse cx="44.3184" cy="1161.28" rx="513.227" ry="529.699" fill="#7282FF" fill-opacity="0.12" />
+    </g>
+    <g filter="url(#filter2_f_563_20635)">
+        <ellipse cx="1484.89" cy="1016.24" rx="376.575" ry="404.555" fill="#4C7FFF" fill-opacity="0.2" />
+    </g>
+    <g filter="url(#filter3_f_563_20635)">
+        <ellipse cx="505.276" cy="-87.3996" rx="339.168" ry="238.417" fill="#7054FF" fill-opacity="0.2" />
+    </g>
+    <g filter="url(#filter4_f_563_20635)">
+        <ellipse cx="915.714" cy="-111.32" rx="358.17" ry="325.578" fill="#4C7FFF" fill-opacity="0.16" />
+    </g>
+    <defs>
+        <filter id="filter0_f_563_20635" x="212.877" y="270.389" width="1517.29" height="1507.37"
+            filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+            <feGaussianBlur stdDeviation="240" result="effect1_foregroundBlur_563_20635" />
+        </filter>
+        <filter id="filter1_f_563_20635" x="-948.908" y="151.583" width="1986.45" height="2019.4"
+            filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+            <feGaussianBlur stdDeviation="240" result="effect1_foregroundBlur_563_20635" />
+        </filter>
+        <filter id="filter2_f_563_20635" x="628.316" y="131.683" width="1713.15" height="1769.11"
+            filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+            <feGaussianBlur stdDeviation="240" result="effect1_foregroundBlur_563_20635" />
+        </filter>
+        <filter id="filter3_f_563_20635" x="-313.893" y="-805.816" width="1638.34" height="1436.83"
+            filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+            <feGaussianBlur stdDeviation="240" result="effect1_foregroundBlur_563_20635" />
+        </filter>
+        <filter id="filter4_f_563_20635" x="77.5449" y="-916.898" width="1676.34" height="1611.16"
+            filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+            <feGaussianBlur stdDeviation="240" result="effect1_foregroundBlur_563_20635" />
+        </filter>
+    </defs>
+</svg>
\ No newline at end of file

From 948e5e932b824037799a10b35c4349af814bb3f7 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 12:44:35 +0800
Subject: [PATCH 112/319] refactor hooks to common util

---
 .../checkHooks.js}                            |  15 +-
 client/src/Hooks/monitorHooks.js              | 379 ++++++++++++++++++
 .../src/Hooks/useFetchMonitorsWithChecks.js   |  72 ----
 .../src/Hooks/useFetchMonitorsWithSummary.js  |  37 --
 client/src/Hooks/useFetchUptimeMonitorById.js |  35 --
 .../src/Hooks/useFetchUptimeMonitorDetails.js |  35 --
 client/src/Hooks/useMonitorControls.js        |  28 --
 client/src/Hooks/useMonitorUtils.js           |  22 +-
 .../Hooks/useHardwareMonitorsFetch.jsx        |  38 --
 .../Monitors/Hooks/useMonitorFetch.jsx        |  46 ---
 .../Details/Hooks/useMonitorFetch.jsx         |  39 --
 .../Monitors/Hooks/useMonitorsFetch.jsx       |  44 --
 .../Uptime/Details/Hooks/useMonitorFetch.jsx  |  33 --
 .../Monitors/Hooks/useMonitorsFetch.jsx       |  77 ----
 .../Pages/Uptime/Monitors/Hooks/useUtils.jsx  | 110 -----
 15 files changed, 405 insertions(+), 605 deletions(-)
 rename client/src/{Pages/Uptime/Details/Hooks/useChecksFetch.jsx => Hooks/checkHooks.js} (81%)
 create mode 100644 client/src/Hooks/monitorHooks.js
 delete mode 100644 client/src/Hooks/useFetchMonitorsWithChecks.js
 delete mode 100644 client/src/Hooks/useFetchMonitorsWithSummary.js
 delete mode 100644 client/src/Hooks/useFetchUptimeMonitorById.js
 delete mode 100644 client/src/Hooks/useFetchUptimeMonitorDetails.js
 delete mode 100644 client/src/Hooks/useMonitorControls.js
 delete mode 100644 client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
 delete mode 100644 client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
 delete mode 100644 client/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx
 delete mode 100644 client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
 delete mode 100644 client/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx
 delete mode 100644 client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
 delete mode 100644 client/src/Pages/Uptime/Monitors/Hooks/useUtils.jsx

diff --git a/client/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/client/src/Hooks/checkHooks.js
similarity index 81%
rename from client/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx
rename to client/src/Hooks/checkHooks.js
index 586cc8359..cc942b294 100644
--- a/client/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx
+++ b/client/src/Hooks/checkHooks.js
@@ -1,14 +1,9 @@
 import { useState } from "react";
 import { useEffect } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-export const useChecksFetch = ({
-	monitorId,
-	monitorType,
-	dateRange,
-	page,
-	rowsPerPage,
-}) => {
+import { networkService } from "../main";
+import { createToast } from "../Utils/toastUtils";
+
+const useFetchChecks = ({ monitorId, monitorType, dateRange, page, rowsPerPage }) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
 	const [isLoading, setIsLoading] = useState(false);
@@ -47,4 +42,4 @@ export const useChecksFetch = ({
 	return [checks, checksCount, isLoading, networkError];
 };
 
-export default useChecksFetch;
+export { useFetchChecks };
diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
new file mode 100644
index 000000000..a39fd3c5e
--- /dev/null
+++ b/client/src/Hooks/monitorHooks.js
@@ -0,0 +1,379 @@
+import { useEffect, useState } from "react";
+import { networkService } from "../main";
+import { createToast } from "../Utils/toastUtils";
+import { useTheme } from "@emotion/react";
+import { useMonitorUtils } from "./useMonitorUtils";
+import { useNavigate } from "react-router-dom";
+
+const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [monitors, setMonitors] = useState(undefined);
+	const [monitorsSummary, setMonitorsSummary] = useState(undefined);
+	const [networkError, setNetworkError] = useState(false);
+
+	useEffect(() => {
+		const fetchMonitors = async () => {
+			try {
+				setIsLoading(true);
+				const res = await networkService.getMonitorsWithSummaryByTeamId({
+					teamId,
+					types,
+				});
+				const { monitors, summary } = res?.data?.data ?? {};
+				setMonitors(monitors);
+				setMonitorsSummary(summary);
+			} catch (error) {
+				console.error(error);
+				setNetworkError(true);
+				createToast({
+					body: error.message,
+				});
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitors();
+	}, [teamId, types, monitorUpdateTrigger]);
+	return [monitors, monitorsSummary, isLoading, networkError];
+};
+
+const useFetchMonitorsWithChecks = ({
+	teamId,
+	types,
+	limit,
+	page,
+	rowsPerPage,
+	filter,
+	field,
+	order,
+	monitorUpdateTrigger,
+}) => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [count, setCount] = useState(undefined);
+	const [monitors, setMonitors] = useState(undefined);
+	const [networkError, setNetworkError] = useState(false);
+
+	const theme = useTheme();
+	const { getMonitorWithPercentage } = useMonitorUtils();
+	useEffect(() => {
+		const fetchMonitors = async () => {
+			try {
+				setIsLoading(true);
+				const res = await networkService.getMonitorsWithChecksByTeamId({
+					teamId,
+					limit,
+					types,
+					page,
+					rowsPerPage,
+					filter,
+					field,
+					order,
+				});
+				const { count, monitors } = res?.data?.data ?? {};
+				const mappedMonitors = monitors.map((monitor) =>
+					getMonitorWithPercentage(monitor, theme)
+				);
+				setMonitors(mappedMonitors);
+				setCount(count?.monitorsCount ?? 0);
+			} catch (error) {
+				console.error(error);
+				setNetworkError(true);
+				createToast({
+					body: error.message,
+				});
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitors();
+	}, [
+		field,
+		filter,
+		getMonitorWithPercentage,
+		limit,
+		order,
+		page,
+		rowsPerPage,
+		teamId,
+		theme,
+		types,
+		monitorUpdateTrigger,
+	]);
+	return [monitors, count, isLoading, networkError];
+};
+
+const useFetchMonitorsByTeamId = ({
+	teamId,
+	types,
+	limit,
+	page,
+	rowsPerPage,
+	filter,
+	field,
+	order,
+	updateTrigger,
+}) => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [monitors, setMonitors] = useState(undefined);
+	const [summary, setSummary] = useState(undefined);
+	const [networkError, setNetworkError] = useState(false);
+
+	useEffect(() => {
+		const fetchMonitors = async () => {
+			try {
+				setIsLoading(true);
+				const res = await networkService.getMonitorsByTeamId({
+					teamId: teamId,
+					limit,
+					types,
+					page,
+					rowsPerPage,
+					filter,
+					field,
+					order,
+				});
+				if (res?.data?.data?.filteredMonitors) {
+					setMonitors(res.data.data.filteredMonitors);
+					setSummary(res.data.data.summary);
+				}
+			} catch (error) {
+				setNetworkError(true);
+				createToast({
+					body: error.message,
+				});
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitors();
+	}, [teamId, types, limit, page, rowsPerPage, filter, field, order, updateTrigger]);
+	return [monitors, summary, isLoading, networkError];
+};
+
+const useFetchStatsByMonitorId = ({
+	monitorId,
+	sortOrder,
+	limit,
+	dateRange,
+	numToDisplay,
+	normalize,
+}) => {
+	const [monitor, setMonitor] = useState(undefined);
+	const [audits, setAudits] = useState(undefined);
+	const [isLoading, setIsLoading] = useState(true);
+	const [networkError, setNetworkError] = useState(false);
+	useEffect(() => {
+		const fetchMonitor = async () => {
+			try {
+				setIsLoading(true);
+				const res = await networkService.getStatsByMonitorId({
+					monitorId: monitorId,
+					sortOrder,
+					limit,
+					dateRange,
+					numToDisplay,
+					normalize,
+				});
+				setMonitor(res?.data?.data ?? undefined);
+				setAudits(res?.data?.data?.checks?.[0]?.audits ?? undefined);
+			} catch (error) {
+				setNetworkError(true);
+				createToast({ body: error.message });
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitor();
+	}, [monitorId, dateRange, numToDisplay, normalize, sortOrder, limit]);
+	return [monitor, audits, isLoading, networkError];
+};
+
+const useFetchMonitorById = ({ monitorId, setMonitor, updateTrigger }) => {
+	const [isLoading, setIsLoading] = useState(true);
+	useEffect(() => {
+		const fetchMonitor = async () => {
+			try {
+				setIsLoading(true);
+				const res = await networkService.getMonitorById({ monitorId: monitorId });
+				setMonitor(res.data.data);
+			} catch (error) {
+				createToast({ body: error.message });
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitor();
+	}, [monitorId, setMonitor, updateTrigger]);
+	return [isLoading];
+};
+
+const useFetchHardwareMonitorById = ({ monitorId, dateRange }) => {
+	const [isLoading, setIsLoading] = useState(true);
+	const [networkError, setNetworkError] = useState(false);
+	const [monitor, setMonitor] = useState(undefined);
+
+	useEffect(() => {
+		const fetchMonitor = async () => {
+			try {
+				if (!monitorId) {
+					return { monitor: undefined, isLoading: false, networkError: undefined };
+				}
+				const response = await networkService.getHardwareDetailsByMonitorId({
+					monitorId: monitorId,
+					dateRange: dateRange,
+				});
+				setMonitor(response.data.data);
+			} catch (error) {
+				setNetworkError(true);
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitor();
+	}, [monitorId, dateRange]);
+	return [monitor, isLoading, networkError];
+};
+
+const useFetchUptimeMonitorById = ({ monitorId, dateRange, trigger }) => {
+	const [networkError, setNetworkError] = useState(false);
+	const [isLoading, setIsLoading] = useState(true);
+	const [monitor, setMonitor] = useState(undefined);
+	const [monitorStats, setMonitorStats] = useState(undefined);
+	useEffect(() => {
+		const fetchMonitors = async () => {
+			try {
+				const res = await networkService.getUptimeDetailsById({
+					monitorId: monitorId,
+					dateRange: dateRange,
+					normalize: true,
+				});
+				const { monitorData, monitorStats } = res?.data?.data ?? {};
+				setMonitor(monitorData);
+				setMonitorStats(monitorStats);
+			} catch (error) {
+				setNetworkError(true);
+				createToast({ body: error.message });
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchMonitors();
+	}, [dateRange, monitorId, trigger]);
+	return [monitor, monitorStats, isLoading, networkError];
+};
+
+const useCreateMonitor = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const navigate = useNavigate();
+	const createMonitor = async ({ monitor, redirect }) => {
+		try {
+			setIsLoading(true);
+			await networkService.createMonitor({ monitor });
+			createToast({ body: "Monitor created successfully!" });
+			if (redirect) {
+				navigate(redirect);
+			}
+		} catch (error) {
+			createToast({ body: "Failed to create monitor." });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+	return [createMonitor, isLoading];
+};
+
+const useDeleteMonitor = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const navigate = useNavigate();
+	const deleteMonitor = async ({ monitor, redirect }) => {
+		try {
+			setIsLoading(true);
+			await networkService.deleteMonitorById({ monitorId: monitor._id });
+			createToast({ body: "Monitor deleted successfully!" });
+			if (redirect) {
+				navigate(redirect);
+			}
+		} catch (error) {
+			createToast({ body: "Failed to delete monitor." });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+	return [deleteMonitor, isLoading];
+};
+
+const useUpdateMonitor = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const navigate = useNavigate();
+	const updateMonitor = async ({ monitor, redirect }) => {
+		try {
+			setIsLoading(true);
+			const updatedFields = {
+				name: monitor.name,
+				description: monitor.description,
+				interval: monitor.interval,
+				notifications: monitor.notifications,
+				matchMethod: monitor.matchMethod,
+				expectedValue: monitor.expectedValue,
+				ignoreTlsErrors: monitor.ignoreTlsErrors,
+				jsonPath: monitor.jsonPath,
+				...(monitor.type === "port" && { port: monitor.port }),
+				...(monitor.type === "hardware" && {
+					thresholds: monitor.thresholds,
+					secret: monitor.secret,
+				}),
+			};
+			await networkService.updateMonitor({
+				monitorId: monitor._id,
+				updatedFields,
+			});
+
+			createToast({ body: "Monitor updated successfully!" });
+			if (redirect) {
+				navigate(redirect);
+			}
+		} catch (error) {
+			createToast({ body: "Failed to update monitor." });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+	return [updateMonitor, isLoading];
+};
+
+const usePauseMonitor = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(undefined);
+	const pauseMonitor = async ({ monitorId, triggerUpdate }) => {
+		try {
+			setIsLoading(true);
+			const res = await networkService.pauseMonitorById({ monitorId });
+			createToast({
+				body: res.data.data.isActive
+					? "Monitor resumed successfully"
+					: "Monitor paused successfully",
+			});
+			triggerUpdate();
+		} catch (error) {
+			setError(error);
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [pauseMonitor, isLoading, error];
+};
+
+export {
+	useFetchMonitorsWithSummary,
+	useFetchMonitorsWithChecks,
+	useFetchMonitorsByTeamId,
+	useFetchStatsByMonitorId,
+	useFetchMonitorById,
+	useFetchUptimeMonitorById,
+	useFetchHardwareMonitorById,
+	useCreateMonitor,
+	useDeleteMonitor,
+	useUpdateMonitor,
+	usePauseMonitor,
+};
diff --git a/client/src/Hooks/useFetchMonitorsWithChecks.js b/client/src/Hooks/useFetchMonitorsWithChecks.js
deleted file mode 100644
index a6f0437b9..000000000
--- a/client/src/Hooks/useFetchMonitorsWithChecks.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-import { useTheme } from "@emotion/react";
-import { useMonitorUtils } from "./useMonitorUtils";
-
-export const useFetchMonitorsWithChecks = ({
-	teamId,
-	types,
-	limit,
-	page,
-	rowsPerPage,
-	filter,
-	field,
-	order,
-	monitorUpdateTrigger,
-}) => {
-	const [isLoading, setIsLoading] = useState(false);
-	const [count, setCount] = useState(undefined);
-	const [monitors, setMonitors] = useState(undefined);
-	const [networkError, setNetworkError] = useState(false);
-
-	const theme = useTheme();
-	const { getMonitorWithPercentage } = useMonitorUtils();
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				setIsLoading(true);
-				const res = await networkService.getMonitorsWithChecksByTeamId({
-					teamId,
-					limit,
-					types,
-					page,
-					rowsPerPage,
-					filter,
-					field,
-					order,
-				});
-				const { count, monitors } = res?.data?.data ?? {};
-				const mappedMonitors = monitors.map((monitor) =>
-					getMonitorWithPercentage(monitor, theme)
-				);
-				setMonitors(mappedMonitors);
-				setCount(count?.monitorsCount ?? 0);
-			} catch (error) {
-				console.error(error);
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [
-		field,
-		filter,
-		getMonitorWithPercentage,
-		limit,
-		order,
-		page,
-		rowsPerPage,
-		teamId,
-		theme,
-		types,
-		monitorUpdateTrigger,
-	]);
-	return [monitors, count, isLoading, networkError];
-};
-
-export default useFetchMonitorsWithChecks;
diff --git a/client/src/Hooks/useFetchMonitorsWithSummary.js b/client/src/Hooks/useFetchMonitorsWithSummary.js
deleted file mode 100644
index cd21271d4..000000000
--- a/client/src/Hooks/useFetchMonitorsWithSummary.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-
-export const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) => {
-	const [isLoading, setIsLoading] = useState(false);
-	const [monitors, setMonitors] = useState(undefined);
-	const [monitorsSummary, setMonitorsSummary] = useState(undefined);
-	const [networkError, setNetworkError] = useState(false);
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				setIsLoading(true);
-				const res = await networkService.getMonitorsWithSummaryByTeamId({
-					teamId,
-					types,
-				});
-				const { monitors, summary } = res?.data?.data ?? {};
-				setMonitors(monitors);
-				setMonitorsSummary(summary);
-			} catch (error) {
-				console.error(error);
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [teamId, types, monitorUpdateTrigger]);
-	return [monitors, monitorsSummary, isLoading, networkError];
-};
-
-export default useFetchMonitorsWithSummary;
diff --git a/client/src/Hooks/useFetchUptimeMonitorById.js b/client/src/Hooks/useFetchUptimeMonitorById.js
deleted file mode 100644
index cb344569c..000000000
--- a/client/src/Hooks/useFetchUptimeMonitorById.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useState, useEffect } from "react";
-import { useDispatch } from "react-redux";
-import { getUptimeMonitorById } from "../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { useNavigate } from "react-router";
-
-const useFetchUptimeMonitorById = (monitorId, updateTrigger) => {
-	const [isLoading, setIsLoading] = useState(true);
-	const [error, setError] = useState(null);
-	const [monitor, setMonitor] = useState(null);
-	const navigate = useNavigate();
-	const dispatch = useDispatch();
-	useEffect(() => {
-		const fetchMonitor = async () => {
-			try {
-				setIsLoading(true);
-				const action = await dispatch(getUptimeMonitorById({ monitorId }));
-
-				if (getUptimeMonitorById.fulfilled.match(action)) {
-					const monitor = action.payload.data;
-					setMonitor(monitor);
-				} else if (getUptimeMonitorById.rejected.match(action)) {
-					throw new Error(action.error.message);
-				}
-			} catch (error) {
-				navigate("/not-found", { replace: true });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitor();
-	}, [monitorId, dispatch, navigate, updateTrigger]);
-	return [monitor, isLoading, error];
-};
-
-export { useFetchUptimeMonitorById };
diff --git a/client/src/Hooks/useFetchUptimeMonitorDetails.js b/client/src/Hooks/useFetchUptimeMonitorDetails.js
deleted file mode 100644
index 3c0ac7ee6..000000000
--- a/client/src/Hooks/useFetchUptimeMonitorDetails.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../main";
-import { useNavigate } from "react-router-dom";
-import { createToast } from "../Utils/toastUtils";
-
-export const useFetchUptimeMonitorDetails = ({ monitorId, dateRange, trigger }) => {
-	const [networkError, setNetworkError] = useState(false);
-	const [isLoading, setIsLoading] = useState(true);
-	const [monitor, setMonitor] = useState(undefined);
-	const [monitorStats, setMonitorStats] = useState(undefined);
-	const navigate = useNavigate();
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				const res = await networkService.getUptimeDetailsById({
-					monitorId: monitorId,
-					dateRange: dateRange,
-					normalize: true,
-				});
-				const { monitorData, monitorStats } = res?.data?.data ?? {};
-				setMonitor(monitorData);
-				setMonitorStats(monitorStats);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [dateRange, monitorId, navigate, trigger]);
-	return [monitor, monitorStats, isLoading, networkError];
-};
-
-export default useFetchUptimeMonitorDetails;
diff --git a/client/src/Hooks/useMonitorControls.js b/client/src/Hooks/useMonitorControls.js
deleted file mode 100644
index b47603b58..000000000
--- a/client/src/Hooks/useMonitorControls.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useState } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-
-const usePauseMonitor = ({ monitorId, triggerUpdate }) => {
-	const [isLoading, setIsLoading] = useState(false);
-	const [error, setError] = useState(undefined);
-	const pauseMonitor = async () => {
-		try {
-			setIsLoading(true);
-			const res = await networkService.pauseMonitorById({ monitorId });
-			createToast({
-				body: res.data.data.isActive
-					? "Monitor resumed successfully"
-					: "Monitor paused successfully",
-			});
-			triggerUpdate();
-		} catch (error) {
-			setError(error);
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return [pauseMonitor, isLoading, error];
-};
-
-export { usePauseMonitor };
diff --git a/client/src/Hooks/useMonitorUtils.js b/client/src/Hooks/useMonitorUtils.js
index 424112a81..417c6eadd 100644
--- a/client/src/Hooks/useMonitorUtils.js
+++ b/client/src/Hooks/useMonitorUtils.js
@@ -46,7 +46,27 @@ const useMonitorUtils = () => {
 		pending: theme.palette.warning.lowContrast,
 	};
 
-	return { getMonitorWithPercentage, determineState, statusColor };
+	const statusToTheme = {
+		up: "success",
+		down: "error",
+		paused: "warning",
+		pending: "secondary",
+		"cannot resolve": "tertiary",
+	};
+
+	const pagespeedStatusMsg = {
+		up: "Live (collecting data)",
+		down: "Inactive",
+		paused: "Paused",
+	};
+
+	return {
+		getMonitorWithPercentage,
+		determineState,
+		statusColor,
+		statusToTheme,
+		pagespeedStatusMsg,
+	};
 };
 
 export { useMonitorUtils };
diff --git a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx b/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
deleted file mode 100644
index c0b61ef62..000000000
--- a/client/src/Pages/Infrastructure/Details/Hooks/useHardwareMonitorsFetch.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-
-const useHardwareMonitorsFetch = ({ monitorId, dateRange }) => {
-	// Abort early if creating monitor
-
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	const [monitor, setMonitor] = useState(undefined);
-
-	useEffect(() => {
-		const fetchData = async () => {
-			try {
-				if (!monitorId) {
-					return { monitor: undefined, isLoading: false, networkError: undefined };
-				}
-				const response = await networkService.getHardwareDetailsByMonitorId({
-					monitorId: monitorId,
-					dateRange: dateRange,
-				});
-				setMonitor(response.data.data);
-			} catch (error) {
-				setNetworkError(true);
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchData();
-	}, [monitorId, dateRange]);
-
-	return {
-		isLoading,
-		networkError,
-		monitor,
-	};
-};
-
-export { useHardwareMonitorsFetch };
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
deleted file mode 100644
index 883205c77..000000000
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useState, useEffect } from "react";
-import { useSelector } from "react-redux";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-
-const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger }) => {
-	// Redux state
-	const { user } = useSelector((state) => state.auth);
-
-	// Local state
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	const [monitors, setMonitors] = useState(undefined);
-	const [summary, setSummary] = useState(undefined);
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				const response = await networkService.getMonitorsByTeamId({
-					teamId: user.teamId,
-					limit: 1,
-					field: field,
-					filter: filter,
-					types: ["hardware"],
-					page: page,
-					rowsPerPage: rowsPerPage,
-				});
-				setMonitors(response?.data?.data?.filteredMonitors ?? []);
-				setSummary(response?.data?.data?.summary ?? {});
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchMonitors();
-	}, [page, field, filter, rowsPerPage, user.teamId, updateTrigger]);
-
-	return { monitors, summary, isLoading, networkError };
-};
-
-export { useMonitorFetch };
diff --git a/client/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx b/client/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx
deleted file mode 100644
index 18ffd8782..000000000
--- a/client/src/Pages/PageSpeed/Details/Hooks/useMonitorFetch.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-import { useNavigate } from "react-router-dom";
-const useMonitorFetch = ({ monitorId }) => {
-	const navigate = useNavigate();
-
-	const [monitor, setMonitor] = useState(undefined);
-	const [audits, setAudits] = useState(undefined);
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	useEffect(() => {
-		const fetchMonitor = async () => {
-			try {
-				const res = await networkService.getStatsByMonitorId({
-					monitorId: monitorId,
-					sortOrder: "desc",
-					limit: 50,
-					dateRange: "day",
-					numToDisplay: null,
-					normalize: null,
-				});
-				setMonitor(res?.data?.data ?? undefined);
-				setAudits(res?.data?.data?.checks?.[0]?.audits ?? undefined);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchMonitor();
-	}, [monitorId, navigate]);
-
-	return { monitor, audits, isLoading };
-};
-
-export { useMonitorFetch };
diff --git a/client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx b/client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
deleted file mode 100644
index d2f0f4842..000000000
--- a/client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-
-const useMonitorsFetch = ({ teamId }) => {
-	const [isLoading, setIsLoading] = useState(true);
-	const [monitors, setMonitors] = useState([]);
-	const [summary, setSummary] = useState({});
-	const [networkError, setNetworkError] = useState(false);
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				setIsLoading(true);
-				const res = await networkService.getMonitorsByTeamId({
-					teamId: teamId,
-					limit: 10,
-					types: ["pagespeed"],
-					page: null,
-					rowsPerPage: null,
-					filter: null,
-					field: null,
-					order: null,
-				});
-				if (res?.data?.data?.filteredMonitors) {
-					setMonitors(res.data.data.filteredMonitors);
-					setSummary(res.data.data.summary);
-				}
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchMonitors();
-	}, [teamId]);
-	return { isLoading, monitors, summary, networkError };
-};
-
-export default useMonitorsFetch;
diff --git a/client/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx b/client/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx
deleted file mode 100644
index 9491e7cc3..000000000
--- a/client/src/Pages/Uptime/Details/Hooks/useMonitorFetch.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-import { useNavigate } from "react-router-dom";
-import { createToast } from "../../../../Utils/toastUtils";
-
-export const useMonitorFetch = ({ monitorId, dateRange }) => {
-	const [networkError, setNetworkError] = useState(false);
-	const [isLoading, setIsLoading] = useState(true);
-	const [monitor, setMonitor] = useState(undefined);
-	const navigate = useNavigate();
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				const res = await networkService.getUptimeDetailsById({
-					monitorId: monitorId,
-					dateRange: dateRange,
-					normalize: true,
-				});
-				setMonitor(res?.data?.data ?? {});
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [dateRange, monitorId, navigate]);
-	return [monitor, isLoading, networkError];
-};
-
-export default useMonitorFetch;
diff --git a/client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx b/client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
deleted file mode 100644
index 1f1d15212..000000000
--- a/client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { useEffect, useState } from "react";
-import { networkService } from "../../../../main";
-import { createToast } from "../../../../Utils/toastUtils";
-import { useTheme } from "@emotion/react";
-import { useMonitorUtils } from "../../../../Hooks/useMonitorUtils";
-
-export const useMonitorFetch = ({
-	teamId,
-	limit,
-	page,
-	rowsPerPage,
-	filter,
-	field,
-	order,
-	triggerUpdate,
-}) => {
-	const [monitorsAreLoading, setMonitorsAreLoading] = useState(false);
-	const [monitors, setMonitors] = useState(undefined);
-	const [filteredMonitors, setFilteredMonitors] = useState(undefined);
-	const [monitorsSummary, setMonitorsSummary] = useState(undefined);
-	const [networkError, setNetworkError] = useState(false);
-
-	const theme = useTheme();
-	const { getMonitorWithPercentage } = useMonitorUtils();
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				setMonitorsAreLoading(true);
-				const res = await networkService.getMonitorsByTeamId({
-					teamId,
-					limit,
-					types: ["http", "ping", "docker", "port"],
-					page,
-					rowsPerPage,
-					filter,
-					field,
-					order,
-				});
-				const { monitors, filteredMonitors, summary } = res.data.data;
-				const mappedMonitors = filteredMonitors.map((monitor) =>
-					getMonitorWithPercentage(monitor, theme)
-				);
-				setMonitors(monitors);
-				setFilteredMonitors(mappedMonitors);
-				setMonitorsSummary(summary);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setMonitorsAreLoading(false);
-			}
-		};
-		fetchMonitors();
-	}, [
-		teamId,
-		limit,
-		field,
-		filter,
-		order,
-		page,
-		rowsPerPage,
-		theme,
-		triggerUpdate,
-		getMonitorWithPercentage,
-	]);
-	return {
-		monitors,
-		filteredMonitors,
-		monitorsSummary,
-		monitorsAreLoading,
-		networkError,
-	};
-};
-
-export default useMonitorFetch;
diff --git a/client/src/Pages/Uptime/Monitors/Hooks/useUtils.jsx b/client/src/Pages/Uptime/Monitors/Hooks/useUtils.jsx
deleted file mode 100644
index ff3288cdf..000000000
--- a/client/src/Pages/Uptime/Monitors/Hooks/useUtils.jsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { useTheme } from "@mui/material";
-
-const useUtils = () => {
-	const determineState = (monitor) => {
-		if (typeof monitor === "undefined") return "pending";
-		if (monitor.isActive === false) return "paused";
-		if (monitor?.status === undefined) return "pending";
-		return monitor?.status == true ? "up" : "down";
-	};
-
-	/* TODO Refactor: from here on shouldn't live in a custom hook, but on theme, or constants  */
-	const theme = useTheme();
-
-	const statusColor = {
-		up: theme.palette.success.lowContrast,
-		down: theme.palette.error.lowContrast,
-		paused: theme.palette.warning.lowContrast,
-		pending: theme.palette.warning.lowContrast,
-	};
-
-	const statusMsg = {
-		up: "Your site is up.",
-		down: "Your site is down.",
-		paused: "Pending...",
-	};
-
-	const pagespeedStatusMsg = {
-		up: "Live (collecting data)",
-		down: "Inactive",
-		paused: "Paused",
-	};
-
-	/* 
-	TODO 
-	This is used on 
-	1) Details > Gradient card */
-	/* These are rediections. We should do something that maps up to success, down to error, and get the theme by that
-	See Client\src\Components\Label\index.jsx
-	*/
-
-	const statusToTheme = {
-		up: "success",
-		down: "error",
-		paused: "warning",
-		pending: "secondary",
-		"cannot resolve": "tertiary",
-	};
-
-	const getStatusStyles = (status) => {
-		const themeColor = statusToTheme[status];
-
-		return {
-			backgroundColor: theme.palette[themeColor].lowContrast,
-			background: `linear-gradient(340deg, ${theme.palette[themeColor].main} -60%, ${theme.palette[themeColor].lowContrast} 35%)`,
-			borderColor: theme.palette[themeColor].lowContrast,
-			"& h2": {
-				color: theme.palette[themeColor].contrastText,
-				textTransform: "uppercase",
-			},
-			"& p": {
-				color: theme.palette[themeColor].contrastText,
-			},
-		};
-	};
-
-	const statusStyles = {
-		up: {
-			backgroundColor: theme.palette.success.lowContrast,
-			background: `linear-gradient(340deg, ${theme.palette.tertiary.main} -60%, ${theme.palette.success.lowContrast} 35%)`, // CAIO_REVIEW
-			borderColor: theme.palette.success.contrastText,
-			// "& h2": { color: theme.palette.success.contrastText }, // CAIO_REVIEW
-		},
-		down: {
-			backgroundColor: theme.palette.error.lowContrast,
-			background: `linear-gradient(340deg, ${theme.palette.tertiary.main} -60%, ${theme.palette.error.lowContrast} 35%)`, // CAIO_REVIEW
-			borderColor: theme.palette.error.contrastText,
-			"& h2": { color: theme.palette.error.contrastText }, // CAIO_REVIEW
-			"& .MuiTypography-root": { color: theme.palette.error.contrastText }, // CAIO_REVIEW
-		},
-		paused: {
-			backgroundColor: theme.palette.warning.lowContrast,
-			background: `linear-gradient(340deg, ${theme.palette.tertiary.main} -60%, ${theme.palette.warning.lowContrast} 35%)`, // CAIO_REVIEW
-			borderColor: theme.palette.warning.contrastText,
-			"& h2": { color: theme.palette.warning.contrastText }, // CAIO_REVIEW
-			"& .MuiTypography-root": { color: theme.palette.warning.contrastText }, // CAIO_REVIEW
-		},
-		pending: {
-			backgroundColor: theme.palette.warning.lowContrast,
-			background: `linear-gradient(340deg, ${theme.palette.tertiary.main} -60%, ${theme.palette.warning.lowContrast} 35%)`, // CAIO_REVIEW
-			borderColor: theme.palette.warning.contrastText,
-			"& h2": { color: theme.palette.warning.contrastText }, // CAIO_REVIEW
-		},
-	};
-
-	/* These are rediections. We should do something that maps up to success, down to error, and get the theme by that
-	
-	*/
-
-	return {
-		determineState,
-		statusColor,
-		statusMsg,
-		pagespeedStatusMsg,
-		statusStyles,
-		statusToTheme,
-		getStatusStyles,
-	};
-};
-
-export default useUtils;

From 50986d44938243351e98214371cad3b5cff18cbc Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 12:44:46 +0800
Subject: [PATCH 113/319] use hooks

---
 .../src/Components/Inputs/Checkbox/index.jsx  |   2 +-
 .../MonitorDetailsControlHeader/index.jsx     |  13 +-
 .../MonitorDetailsControlHeader/status.jsx    |   5 +-
 .../Components/MonitorStatusHeader/index.jsx  |   4 +-
 client/src/Components/StatBox/index.jsx       |   4 +-
 .../src/Pages/Infrastructure/Create/index.jsx |  37 ++----
 .../Details/Components/StatusBoxes/index.jsx  |   4 +-
 .../Pages/Infrastructure/Details/index.jsx    |   4 +-
 .../Components/MonitorsTable/index.jsx        |   4 +-
 .../Pages/Infrastructure/Monitors/index.jsx   |  12 +-
 .../src/Pages/PageSpeed/Configure/index.jsx   |  91 ++++----------
 client/src/Pages/PageSpeed/Create/index.jsx   |  61 +++------
 client/src/Pages/PageSpeed/Details/index.jsx  |  10 +-
 .../Monitors/Components/Card/index.jsx        |   8 +-
 client/src/Pages/PageSpeed/Monitors/index.jsx |  17 ++-
 .../Status/Components/MonitorsList/index.jsx  |   4 +-
 client/src/Pages/Uptime/Configure/index.jsx   | 116 +++++++++---------
 client/src/Pages/Uptime/Create/index.jsx      |  47 ++++---
 .../Components/UptimeStatusBoxes/index.jsx    |   4 +-
 client/src/Pages/Uptime/Details/index.jsx     |  13 +-
 .../Components/UptimeDataTable/index.jsx      |   4 +-
 client/src/Pages/Uptime/Monitors/index.jsx    |   8 +-
 client/src/locales/en.json                    |   1 +
 23 files changed, 204 insertions(+), 269 deletions(-)

diff --git a/client/src/Components/Inputs/Checkbox/index.jsx b/client/src/Components/Inputs/Checkbox/index.jsx
index 58b83c7c7..1497c44fb 100644
--- a/client/src/Components/Inputs/Checkbox/index.jsx
+++ b/client/src/Components/Inputs/Checkbox/index.jsx
@@ -105,7 +105,7 @@ const Checkbox = ({
 };
 
 Checkbox.propTypes = {
-	id: PropTypes.string.isRequired,
+	id: PropTypes.string,
 	name: PropTypes.string,
 	label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
 	size: PropTypes.oneOf(["small", "medium", "large"]),
diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx
index aa9ef91b9..8c9f845e9 100644
--- a/client/src/Components/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx
@@ -11,10 +11,9 @@ import EmailIcon from "@mui/icons-material/Email";
 import PropTypes from "prop-types";
 import { useNavigate } from "react-router-dom";
 import { useTheme } from "@mui/material/styles";
-import { usePauseMonitor } from "../../Hooks/useMonitorControls";
+import { usePauseMonitor } from "../../Hooks/monitorHooks";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
 import { useTranslation } from "react-i18next";
-
 /**
  * MonitorDetailsControlHeader component displays the control header for monitor details.
  * It includes status display, pause/resume button, and a configure button for admins.
@@ -38,10 +37,7 @@ const MonitorDetailsControlHeader = ({
 	const navigate = useNavigate();
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const [pauseMonitor, isPausing, error] = usePauseMonitor({
-		monitorId: monitor?._id,
-		triggerUpdate,
-	});
+	const [pauseMonitor, isPausing, error] = usePauseMonitor();
 
 	const [isSending, emailError, sendTestEmail] = useSendTestEmail();
 
@@ -88,7 +84,10 @@ const MonitorDetailsControlHeader = ({
 						monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
 					}
 					onClick={() => {
-						pauseMonitor();
+						pauseMonitor({
+							monitorId: monitor?._id,
+							triggerUpdate,
+						});
 					}}
 				>
 					{monitor?.isActive ? "Pause" : "Resume"}
diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 3d6e62c60..fdfb955f4 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -7,8 +7,7 @@ import Dot from "../../Components/Dot";
 import { formatDurationRounded } from "../../Utils/timeUtils";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
-import useUtils from "../../Pages/Uptime/Monitors/Hooks/useUtils";
-
+import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
 /**
  * Status component displays the status information of a monitor.
  * It includes the monitor's name, URL, and check interval.
@@ -23,7 +22,7 @@ import useUtils from "../../Pages/Uptime/Monitors/Hooks/useUtils";
  */
 const Status = ({ monitor }) => {
 	const theme = useTheme();
-	const { statusColor, determineState } = useUtils();
+	const { statusColor, determineState } = useMonitorUtils();
 
 	return (
 		<Stack>
diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
index 7ea95410b..a81131152 100644
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ b/client/src/Components/MonitorStatusHeader/index.jsx
@@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material";
 import PulseDot from "../Animated/PulseDot";
 import Dot from "../Dot";
 import { useTheme } from "@emotion/react";
-import useUtils from "../../Pages/Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
 import { formatDurationRounded } from "../../Utils/timeUtils";
 import ConfigButton from "./ConfigButton";
 import SkeletonLayout from "./skeleton";
@@ -12,7 +12,7 @@ import { useTranslation } from "react-i18next";
 const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const { statusColor, determineState } = useUtils();
+	const { statusColor, determineState } = useMonitorUtils();
 	if (isLoading) {
 		return <SkeletonLayout />;
 	}
diff --git a/client/src/Components/StatBox/index.jsx b/client/src/Components/StatBox/index.jsx
index 673736ea9..93fa46c2b 100644
--- a/client/src/Components/StatBox/index.jsx
+++ b/client/src/Components/StatBox/index.jsx
@@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material";
 import Image from "../Image";
 import { useTheme } from "@mui/material/styles";
 import PropTypes from "prop-types";
-import useUtils from "../../Pages/Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
 
 /**
  * StatBox Component
@@ -41,7 +41,7 @@ const StatBox = ({
 	sx,
 }) => {
 	const theme = useTheme();
-	const { statusToTheme } = useUtils();
+	const { statusToTheme } = useMonitorUtils();
 	const themeColor = statusToTheme[status];
 
 	const statusBoxStyles = gradient
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index 9425b7429..fa63dd4dc 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -1,20 +1,17 @@
 // React, Redux, Router
 import { useTheme } from "@emotion/react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { useState, useEffect } from "react";
-import { useSelector, useDispatch } from "react-redux";
+import { useSelector } from "react-redux";
 
 // Utility and Network
 import { infrastructureMonitorValidation } from "../../../Validation/validation";
-import {
-	createInfrastructureMonitor,
-	updateInfrastructureMonitor,
-} from "../../../Features/InfrastructureMonitors/infrastructureMonitorsSlice";
-import { useHardwareMonitorsFetch } from "../Details/Hooks/useHardwareMonitorsFetch";
+import { useFetchHardwareMonitorById } from "../../../Hooks/monitorHooks";
 import { capitalizeFirstLetter } from "../../../Utils/stringUtils";
 import { useTranslation } from "react-i18next";
 import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 import NotificationsConfig from "../../../Components/NotificationConfig";
+import { useUpdateMonitor, useCreateMonitor } from "../../../Hooks/monitorHooks";
 
 // MUI
 import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
@@ -55,9 +52,6 @@ const getAlertError = (errors) => {
 const CreateInfrastructureMonitor = () => {
 	const theme = useTheme();
 	const { user } = useSelector((state) => state.auth);
-	const monitorState = useSelector((state) => state.infrastructureMonitor);
-	const dispatch = useDispatch();
-	const navigate = useNavigate();
 	const { monitorId } = useParams();
 	const { t } = useTranslation();
 
@@ -65,9 +59,11 @@ const CreateInfrastructureMonitor = () => {
 	const isCreate = typeof monitorId === "undefined";
 
 	// Fetch monitor details if editing
-	const { monitor, isLoading, networkError } = useHardwareMonitorsFetch({ monitorId });
+	const [monitor, isLoading, networkError] = useFetchHardwareMonitorById({ monitorId });
 	const [notifications, notificationsAreLoading, notificationsError] =
 		useGetNotificationsByTeamId();
+	const [updateMonitor, isUpdating] = useUpdateMonitor();
+	const [createMonitor, isCreating] = useCreateMonitor();
 
 	// State
 	const [errors, setErrors] = useState({});
@@ -187,6 +183,7 @@ const CreateInfrastructureMonitor = () => {
 		};
 
 		form = {
+			...(isCreate ? {} : { _id: monitorId }),
 			...rest,
 			description: form.name,
 			teamId: user.teamId,
@@ -197,19 +194,9 @@ const CreateInfrastructureMonitor = () => {
 		};
 
 		// Handle create or update
-		const action = isCreate
-			? await dispatch(createInfrastructureMonitor({ monitor: form }))
-			: await dispatch(updateInfrastructureMonitor({ monitorId, monitor: form }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({
-				body: isCreate
-					? t("infrastructureMonitorCreated")
-					: t("infrastructureMonitorUpdated"),
-			});
-			navigate("/infrastructure");
-		} else {
-			createToast({ body: "Failed to save monitor." });
-		}
+		isCreate
+			? await createMonitor({ monitor: form, redirect: "/infrastructure" })
+			: await updateMonitor({ monitor: form, redirect: "/infrastructure" });
 	};
 
 	const onChange = (event) => {
@@ -448,7 +435,7 @@ const CreateInfrastructureMonitor = () => {
 						type="submit"
 						variant="contained"
 						color="accent"
-						loading={monitorState?.isLoading}
+						loading={isLoading || isUpdating || isCreating || notificationsAreLoading}
 					>
 						{t(isCreate ? "infrastructureCreateMonitor" : "infrastructureEditMonitor")}
 					</Button>
diff --git a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
index 66483d448..6c11e7c82 100644
--- a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes/index.jsx
@@ -4,14 +4,14 @@ import StatusBoxes from "../../../../../Components/StatusBoxes";
 import StatBox from "../../../../../Components/StatBox";
 
 //Utils
-import useUtils from "../../../../../Pages/Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 import { useHardwareUtils } from "../../Hooks/useHardwareUtils";
 import { useTranslation } from "react-i18next";
 
 const InfraStatBoxes = ({ shouldRender, monitor }) => {
 	// Utils
 	const { formatBytes } = useHardwareUtils();
-	const { determineState } = useUtils();
+	const { determineState } = useMonitorUtils();
 	const { t } = useTranslation();
 
 	const { stats } = monitor ?? {};
diff --git a/client/src/Pages/Infrastructure/Details/index.jsx b/client/src/Pages/Infrastructure/Details/index.jsx
index fefb7d2aa..842e0f6d9 100644
--- a/client/src/Pages/Infrastructure/Details/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/index.jsx
@@ -11,7 +11,7 @@ import GenericFallback from "../../../Components/GenericFallback";
 // Utils
 import { useTheme } from "@emotion/react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
-import { useHardwareMonitorsFetch } from "./Hooks/useHardwareMonitorsFetch";
+import { useFetchHardwareMonitorById } from "../../../Hooks/monitorHooks";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
@@ -33,7 +33,7 @@ const InfrastructureDetails = () => {
 	const { t } = useTranslation();
 	const isAdmin = useIsAdmin();
 
-	const { isLoading, networkError, monitor } = useHardwareMonitorsFetch({
+	const [monitor, isLoading, networkError] = useFetchHardwareMonitorById({
 		monitorId,
 		dateRange,
 	});
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 0ec435c60..761ecaa0e 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -10,7 +10,7 @@ import CustomGauge from "../../../../../Components/Charts/CustomGauge";
 
 // Utils
 import { useTheme } from "@emotion/react";
-import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
@@ -19,7 +19,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const { determineState } = useUtils();
+	const { determineState } = useMonitorUtils();
 	const navigate = useNavigate();
 
 	// Handlers
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index bfba843c0..6d49f64a7 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -10,15 +10,20 @@ import Fallback from "../../../Components/Fallback";
 import Filter from "./Components/Filters";
 // Utils
 import { useTheme } from "@emotion/react";
-import { useMonitorFetch } from "./Hooks/useMonitorFetch";
 import { useState } from "react";
+import { useSelector } from "react-redux";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useTranslation } from "react-i18next";
+import { useFetchMonitorsByTeamId } from "../../../Hooks/monitorHooks";
 // Constants
+const TYPES = ["hardware"];
 const BREADCRUMBS = [{ name: `infrastructure`, path: "/infrastructure" }];
 
 const InfrastructureMonitors = () => {
 	// Redux state
+	const { user } = useSelector((state) => state.auth);
+
+	// Local state
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(5);
 	const [updateTrigger, setUpdateTrigger] = useState(false);
@@ -50,7 +55,10 @@ const InfrastructureMonitors = () => {
 
 	const field = toFilterStatus !== undefined ? "status" : undefined;
 
-	const { monitors, summary, isLoading, networkError } = useMonitorFetch({
+	const [monitors, summary, isLoading, networkError] = useFetchMonitorsByTeamId({
+		teamId: user.teamId,
+		limit: 1,
+		types: TYPES,
 		page,
 		field: field,
 		filter: toFilterStatus,
diff --git a/client/src/Pages/PageSpeed/Configure/index.jsx b/client/src/Pages/PageSpeed/Configure/index.jsx
index 487106247..71e1e111e 100644
--- a/client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/client/src/Pages/PageSpeed/Configure/index.jsx
@@ -12,45 +12,43 @@ import NotificationsConfig from "../../../Components/NotificationConfig";
 import Dialog from "../../../Components/Dialog";
 
 // Utils
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useTheme } from "@emotion/react";
-import { useDispatch, useSelector } from "react-redux";
-import { useNavigate, useParams } from "react-router";
-import {
-	deletePageSpeed,
-	getPagespeedMonitorById,
-	getPageSpeedByTeamId,
-	updatePageSpeed,
-	pausePageSpeed,
-} from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
+import { useParams } from "react-router";
 import { monitorValidation } from "../../../Validation/validation";
-import { createToast } from "../../../Utils/toastUtils";
 import { useTranslation } from "react-i18next";
-import useUtils from "../../Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../Hooks/useMonitorUtils";
 import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
-
+import {
+	useFetchMonitorById,
+	useDeleteMonitor,
+	useUpdateMonitor,
+	usePauseMonitor,
+} from "../../../Hooks/monitorHooks";
 const PageSpeedConfigure = () => {
 	// Redux state
-	const { isLoading } = useSelector((state) => state.pageSpeedMonitors);
 
 	// Local state
 	const [monitor, setMonitor] = useState({});
 	const [errors, setErrors] = useState({});
-	const [buttonLoading, setButtonLoading] = useState(false);
 	const [isOpen, setIsOpen] = useState(false);
+	const [updateTrigger, setUpdateTrigger] = useState(false);
 
 	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const navigate = useNavigate();
-	const dispatch = useDispatch();
 	const MS_PER_MINUTE = 60000;
 	const { monitorId } = useParams();
-	const { statusColor, pagespeedStatusMsg, determineState } = useUtils();
+	const { statusColor, pagespeedStatusMsg, determineState } = useMonitorUtils();
 
 	const [notifications, notificationsAreLoading, notificationsError] =
 		useGetNotificationsByTeamId();
 
+	const [isLoading] = useFetchMonitorById({ monitorId, setMonitor, updateTrigger });
+	const [deleteMonitor, isDeleting] = useDeleteMonitor();
+	const [updateMonitor, isUpdating] = useUpdateMonitor();
+	const [pauseMonitor, isPausing] = usePauseMonitor();
+
 	const frequencies = [
 		{ _id: 3, name: "3 minutes" },
 		{ _id: 5, name: "5 minutes" },
@@ -61,24 +59,10 @@ const PageSpeedConfigure = () => {
 		{ _id: 10080, name: "1 week" },
 	];
 
-	useEffect(() => {
-		const fetchMonitor = async () => {
-			try {
-				const action = await dispatch(getPagespeedMonitorById({ monitorId }));
-
-				if (getPagespeedMonitorById.fulfilled.match(action)) {
-					const monitor = action.payload.data;
-					setMonitor(monitor);
-				} else if (getPagespeedMonitorById.rejected.match(action)) {
-					throw new Error(action.error.message);
-				}
-			} catch (error) {
-				logger.error("Error fetching monitor of id: " + monitorId);
-				navigate("/not-found", { replace: true });
-			}
-		};
-		fetchMonitor();
-	}, [dispatch, monitorId, navigate]);
+	// Handlers
+	const triggerUpdate = () => {
+		setUpdateTrigger(!updateTrigger);
+	};
 
 	const onChange = (event) => {
 		let { value, name } = event.target;
@@ -106,42 +90,17 @@ const PageSpeedConfigure = () => {
 	};
 
 	const handlePause = async () => {
-		try {
-			const action = await dispatch(pausePageSpeed({ monitorId }));
-			if (pausePageSpeed.fulfilled.match(action)) {
-				const monitor = action.payload.data;
-				setMonitor(monitor);
-				const state = action?.payload?.data.isActive === false ? "paused" : "resumed";
-				createToast({ body: `Monitor ${state} successfully.` });
-			} else if (pausePageSpeed.rejected.match(action)) {
-				throw new Error(action.error.message);
-			}
-		} catch (error) {
-			createToast({ body: "Failed to pause monitor" });
-		}
+		await pauseMonitor({ monitorId, triggerUpdate });
 	};
 
 	const onSubmit = async (event) => {
 		event.preventDefault();
-		const action = await dispatch(updatePageSpeed({ monitor: monitor }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({ body: "Monitor updated successfully!" });
-			dispatch(getPageSpeedByTeamId());
-		} else {
-			createToast({ body: "Failed to update monitor." });
-		}
+		await updateMonitor({ monitor, redirect: "/pagespeed" });
 	};
 
 	const handleRemove = async (event) => {
 		event.preventDefault();
-		setButtonLoading(true);
-		const action = await dispatch(deletePageSpeed({ monitor }));
-		if (action.meta.requestStatus === "fulfilled") {
-			navigate("/pagespeed");
-		} else {
-			createToast({ body: "Failed to delete monitor." });
-		}
-		setButtonLoading(false);
+		await deleteMonitor({ monitor, redirect: "/pagespeed" });
 	};
 
 	return (
@@ -363,7 +322,7 @@ const PageSpeedConfigure = () => {
 							mt="auto"
 						>
 							<Button
-								loading={isLoading}
+								loading={isLoading || isDeleting || isUpdating || isPausing}
 								type="submit"
 								variant="contained"
 								color="accent"
@@ -383,7 +342,7 @@ const PageSpeedConfigure = () => {
 				onCancel={() => setIsOpen(false)}
 				confirmationButtonLabel={t("delete")}
 				onConfirm={handleRemove}
-				isLoading={buttonLoading}
+				isLoading={isLoading || isDeleting || isUpdating || isPausing}
 			/>
 		</Stack>
 	);
diff --git a/client/src/Pages/PageSpeed/Create/index.jsx b/client/src/Pages/PageSpeed/Create/index.jsx
index 2b3e6e4e4..a138fe0a2 100644
--- a/client/src/Pages/PageSpeed/Create/index.jsx
+++ b/client/src/Pages/PageSpeed/Create/index.jsx
@@ -1,31 +1,28 @@
-// React, Redux, Router
-import { useNavigate } from "react-router-dom";
-import { useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
-// Utility and Network
-import { monitorValidation } from "../../../Validation/validation";
-import {
-	createPageSpeed,
-	checkEndpointResolution,
-} from "../../../Features/PageSpeedMonitor/pageSpeedMonitorSlice";
-import { parseDomainName } from "../../../Utils/monitorUtils";
-import { useTranslation } from "react-i18next";
-import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
-
-// MUI
-import { useTheme } from "@emotion/react";
-import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
-
 //Components
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import ButtonGroup from "@mui/material/ButtonGroup";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import ConfigBox from "../../../Components/ConfigBox";
-import { createToast } from "../../../Utils/toastUtils";
 import Radio from "../../../Components/Inputs/Radio";
 import Select from "../../../Components/Inputs/Select";
 import NotificationsConfig from "../../../Components/NotificationConfig";
 
+// Utils
+import { useState } from "react";
+import { useSelector } from "react-redux";
+import { monitorValidation } from "../../../Validation/validation";
+import { parseDomainName } from "../../../Utils/monitorUtils";
+import { useTranslation } from "react-i18next";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import { useTheme } from "@emotion/react";
+import { createToast } from "../../../Utils/toastUtils";
+import { useCreateMonitor } from "../../../Hooks/monitorHooks";
+
 const MS_PER_MINUTE = 60000;
 
 const CRUMBS = [
@@ -56,13 +53,11 @@ const CreatePageSpeed = () => {
 	const [https, setHttps] = useState(true);
 	const [errors, setErrors] = useState({});
 	const { user } = useSelector((state) => state.auth);
-	const { isLoading } = useSelector((state) => state.pageSpeedMonitors);
 	const [notifications, notificationsAreLoading, error] = useGetNotificationsByTeamId();
 
 	// Setup
-	const dispatch = useDispatch();
-	const navigate = useNavigate();
 	const theme = useTheme();
+	const [createMonitor, isCreating] = useCreateMonitor();
 
 	// Handlers
 	const onSubmit = async (event) => {
@@ -88,18 +83,6 @@ const CreatePageSpeed = () => {
 			return;
 		}
 
-		const checkEndpointAction = await dispatch(
-			checkEndpointResolution({ monitorURL: form.url })
-		);
-
-		if (checkEndpointAction.meta.requestStatus === "rejected") {
-			createToast({
-				body: "The endpoint you entered doesn't resolve. Check the URL again.",
-			});
-			setErrors({ url: "The entered URL is not reachable." });
-			return;
-		}
-
 		form = {
 			...form,
 			description: form.name,
@@ -108,13 +91,7 @@ const CreatePageSpeed = () => {
 			notifications: monitor.notifications,
 		};
 
-		const action = await dispatch(createPageSpeed({ monitor: form }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({ body: "Monitor created successfully!" });
-			navigate("/pagespeed");
-		} else {
-			createToast({ body: "Failed to create monitor." });
-		}
+		await createMonitor({ monitor: form, redirect: "/pagespeed" });
 	};
 
 	const handleChange = (event) => {
@@ -325,7 +302,7 @@ const CreatePageSpeed = () => {
 						variant="contained"
 						color="accent"
 						disabled={!Object.values(errors).every((value) => value === undefined)}
-						loading={isLoading}
+						loading={isCreating}
 					>
 						{t("createMonitor")}
 					</Button>
diff --git a/client/src/Pages/PageSpeed/Details/index.jsx b/client/src/Pages/PageSpeed/Details/index.jsx
index 5724f12a1..e8afcf8c8 100644
--- a/client/src/Pages/PageSpeed/Details/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/index.jsx
@@ -11,8 +11,7 @@ import GenericFallback from "../../../Components/GenericFallback";
 import { useTheme } from "@emotion/react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useParams } from "react-router-dom";
-import { useSelector } from "react-redux";
-import { useMonitorFetch } from "./Hooks/useMonitorFetch";
+import { useFetchStatsByMonitorId } from "../../../Hooks/monitorHooks";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 // Constants
@@ -28,8 +27,13 @@ const PageSpeedDetails = () => {
 	const isAdmin = useIsAdmin();
 	const { monitorId } = useParams();
 
-	const { monitor, audits, isLoading, networkError } = useMonitorFetch({
+	const [monitor, audits, isLoading, networkError] = useFetchStatsByMonitorId({
 		monitorId,
+		sortOrder: "desc",
+		limit: 50,
+		dateRange: "day",
+		numToDisplay: null,
+		normalize: null,
 	});
 
 	const [metrics, setMetrics] = useState({
diff --git a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
index 8c83f102a..2220a4b16 100644
--- a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
@@ -8,7 +8,7 @@ import { useTheme } from "@emotion/react";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
 import { useSelector } from "react-redux";
 import { formatDateWithTz, formatDurationSplit } from "../../../../../Utils/timeUtils";
-import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import IconBox from "../../../../../Components/IconBox";
@@ -118,7 +118,7 @@ const processData = (data) => {
 const PagespeedAreaChart = ({ data, status }) => {
 	const theme = useTheme();
 	const [isHovered, setIsHovered] = useState(false);
-	const { statusToTheme } = useUtils();
+	const { statusToTheme } = useMonitorUtils();
 
 	const themeColor = statusToTheme[status];
 
@@ -206,7 +206,7 @@ PagespeedAreaChart.propTypes = {
  * @returns {JSX.Element} - The rendered card.
  */
 const Card = ({ monitor }) => {
-	const { determineState, pagespeedStatusMsg } = useUtils();
+	const { determineState, pagespeedStatusMsg } = useMonitorUtils();
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const navigate = useNavigate();
@@ -275,7 +275,7 @@ const Card = ({ monitor }) => {
 					sx={{ gridColumnStart: 1, gridColumnEnd: 4 }}
 				>
 					<PagespeedAreaChart
-						data={monitor.checks.slice().reverse()}
+						data={monitor?.checks?.slice().reverse()}
 						status={monitorState}
 					/>
 				</Box>
diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index 808541cee..319b0da21 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -5,17 +5,17 @@ import CreateMonitorHeader from "../../../Components/MonitorCreateHeader";
 import MonitorCountHeader from "../../../Components/MonitorCountHeader";
 import MonitorGrid from "./Components/MonitorGrid";
 import Fallback from "../../../Components/Fallback";
+import GenericFallback from "../../../Components/GenericFallback";
 
 // Utils
 import { useTheme } from "@emotion/react";
 import { useSelector } from "react-redux";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
-import useMonitorsFetch from "./Hooks/useMonitorsFetch";
-import GenericFallback from "../../../Components/GenericFallback";
 import { useTranslation } from "react-i18next";
+import { useFetchMonitorsByTeamId } from "../../../Hooks/monitorHooks";
 // Constants
 const BREADCRUMBS = [{ name: `pagespeed`, path: "/pagespeed" }];
-
+const TYPES = ["pagespeed"];
 const PageSpeed = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -23,8 +23,15 @@ const PageSpeed = () => {
 	const { user } = useSelector((state) => state.auth);
 	const { pagespeedApiKey } = useSelector((state) => state.settings);
 
-	const { isLoading, monitors, summary, networkError } = useMonitorsFetch({
+	const [monitors, monitorsSummary, isLoading, networkError] = useFetchMonitorsByTeamId({
 		teamId: user.teamId,
+		limit: 10,
+		types: TYPES,
+		page: null,
+		rowsPerPage: null,
+		filter: null,
+		field: null,
+		order: null,
 	});
 
 	if (networkError === true) {
@@ -68,7 +75,7 @@ const PageSpeed = () => {
 			/>
 			<MonitorCountHeader
 				shouldRender={!isLoading}
-				monitorCount={summary?.totalMonitors}
+				monitorCount={monitorsSummary?.totalMonitors}
 				sx={{ mb: theme.spacing(8) }}
 			/>
 			<MonitorGrid
diff --git a/client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx b/client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx
index 089ab1384..1097cf1da 100644
--- a/client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx
+++ b/client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx
@@ -6,14 +6,14 @@ import { StatusLabel } from "../../../../../Components/Label";
 
 //Utils
 import { useTheme } from "@mui/material/styles";
-import useUtils from "../../../../Uptime/Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 import PropTypes from "prop-types";
 
 import { useSelector } from "react-redux";
 
 const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] }) => {
 	const theme = useTheme();
-	const { determineState } = useUtils();
+	const { determineState } = useMonitorUtils();
 
 	const { showURL } = useSelector((state) => state.ui);
 
diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 8718a2209..5a380f8e5 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -1,37 +1,37 @@
-import { useNavigate, useParams } from "react-router";
-import { useTheme } from "@emotion/react";
-import { useDispatch, useSelector } from "react-redux";
-import { useState, useEffect } from "react";
-import {
-	Box,
-	Stack,
-	Tooltip,
-	Typography,
-	Button,
-	FormControlLabel,
-	Switch,
-} from "@mui/material";
-import { monitorValidation } from "../../../Validation/validation";
-import { createToast } from "../../../Utils/toastUtils";
-import { useTranslation } from "react-i18next";
+// Components
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Tooltip from "@mui/material/Tooltip";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import FormControlLabel from "@mui/material/FormControlLabel";
+import Switch from "@mui/material/Switch";
 import ConfigBox from "../../../Components/ConfigBox";
-import {
-	updateUptimeMonitor,
-	deleteUptimeMonitor,
-} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
+import Breadcrumbs from "../../../Components/Breadcrumbs";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import Select from "../../../Components/Inputs/Select";
-import Breadcrumbs from "../../../Components/Breadcrumbs";
-import PulseDot from "../../../Components/Animated/PulseDot";
-import "./index.css";
 import Dialog from "../../../Components/Dialog";
-import { usePauseMonitor } from "../../../Hooks/useMonitorControls";
+import PulseDot from "../../../Components/Animated/PulseDot";
+import Checkbox from "../../../Components/Inputs/Checkbox";
+
+// Utils
+import { useParams } from "react-router";
+import { useTheme } from "@emotion/react";
+import { useState } from "react";
+import { monitorValidation } from "../../../Validation/validation";
+import { createToast } from "../../../Utils/toastUtils";
+import { useTranslation } from "react-i18next";
 import PauseOutlinedIcon from "@mui/icons-material/PauseOutlined";
 import PlayArrowOutlinedIcon from "@mui/icons-material/PlayArrowOutlined";
 import { useMonitorUtils } from "../../../Hooks/useMonitorUtils";
-import { useFetchUptimeMonitorById } from "../../../Hooks/useFetchUptimeMonitorById";
 import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import {
+	useDeleteMonitor,
+	useUpdateMonitor,
+	usePauseMonitor,
+	useFetchMonitorById,
+} from "../../../Hooks/monitorHooks";
 import NotificationsConfig from "../../../Components/NotificationConfig";
 
 /**
@@ -76,18 +76,19 @@ const Configure = () => {
 	};
 
 	// Network
-	const [monitor, isLoading, error] = useFetchUptimeMonitorById(monitorId, updateTrigger);
 	const [notifications, notificationsAreLoading, notificationsError] =
 		useGetNotificationsByTeamId();
-	const [pauseMonitor, isPausing, pauseError] = usePauseMonitor({
-		monitorId: monitor?._id,
-		triggerUpdate,
+	const [pauseMonitor, isPausing, pauseError] = usePauseMonitor({});
+	const [deleteMonitor, isDeleting] = useDeleteMonitor();
+	const [updateMonitor, isUpdating] = useUpdateMonitor();
+	const [isLoading] = useFetchMonitorById({
+		monitorId,
+		setMonitor: setForm,
+		updateTrigger,
 	});
 
 	const MS_PER_MINUTE = 60000;
-	const navigate = useNavigate();
 	const theme = useTheme();
-	const dispatch = useDispatch();
 
 	const matchMethodOptions = [
 		{ _id: "equal", name: "Equal" },
@@ -111,7 +112,7 @@ const Configure = () => {
 
 	// Handlers
 	const handlePause = async () => {
-		const res = await pauseMonitor();
+		const res = await pauseMonitor({ monitorId: form?._id, triggerUpdate });
 		if (typeof res !== "undefined") {
 			triggerUpdate();
 		}
@@ -119,12 +120,7 @@ const Configure = () => {
 
 	const handleRemove = async (event) => {
 		event.preventDefault();
-		const action = await dispatch(deleteUptimeMonitor({ monitor }));
-		if (action.meta.requestStatus === "fulfilled") {
-			navigate("/uptime");
-		} else {
-			createToast({ body: "Failed to delete monitor." });
-		}
+		await deleteMonitor({ monitor: form, redirect: "/uptime" });
 	};
 
 	const onChange = (event) => {
@@ -134,6 +130,17 @@ const Configure = () => {
 			value = checked;
 		}
 
+		if (name === "useAdvancedMatching") {
+			setForm((prevForm) => {
+				return {
+					...prevForm,
+					matchMethod: "equal",
+				};
+			});
+			setUseAdvancedMatching(!useAdvancedMatching);
+			return;
+		}
+
 		if (name === "interval") {
 			value = value * MS_PER_MINUTE;
 		}
@@ -146,7 +153,6 @@ const Configure = () => {
 
 		setErrors((prev) => {
 			const updatedErrors = { ...prev };
-
 			if (validation.error) updatedErrors[name] = validation.error.details[0].message;
 			else delete updatedErrors[name];
 			return updatedErrors;
@@ -183,7 +189,7 @@ const Configure = () => {
 
 		if (validation.error) {
 			const newErrors = {};
-			error.details.forEach((err) => {
+			validation.error.details.forEach((err) => {
 				newErrors[err.path[0]] = err.message;
 			});
 			setErrors(newErrors);
@@ -192,27 +198,12 @@ const Configure = () => {
 		}
 
 		toSubmit.notifications = form.notifications;
-		const action = await dispatch(updateUptimeMonitor({ monitor: toSubmit }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({ body: "Monitor updated successfully!" });
-		} else {
-			createToast({ body: "Failed to update monitor." });
-		}
+		console.log(JSON.stringify(toSubmit, null, 2));
+		// await updateMonitor({ monitor: toSubmit, redirect: "/uptime" });
 	};
 
-	// Effects
-	useEffect(() => {
-		if (monitor?.matchMethod) {
-			setUseAdvancedMatching(true);
-		}
-
-		setForm({
-			...monitor,
-		});
-	}, [monitor, notifications]);
-
 	// Parse the URL
-	const parsedUrl = parseUrl(monitor?.url);
+	const parsedUrl = parseUrl(form?.url);
 	const protocol = parsedUrl?.protocol?.replace(":", "") || "";
 
 	const { determineState, statusColor } = useMonitorUtils();
@@ -434,7 +425,13 @@ const Configure = () => {
 							onChange={onChange}
 							items={frequencies}
 						/>
-						{form.type === "http" && (
+						<Checkbox
+							name="useAdvancedMatching"
+							label={t("advancedMatching")}
+							isChecked={useAdvancedMatching}
+							onChange={onChange}
+						/>
+						{form.type === "http" && useAdvancedMatching && (
 							<>
 								<Select
 									name="matchMethod"
@@ -502,6 +499,7 @@ const Configure = () => {
 					mt="auto"
 				>
 					<Button
+						disabled={isDeleting || isUpdating}
 						type="submit"
 						variant="contained"
 						color="accent"
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index c233b2a36..f481e81ac 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -1,34 +1,34 @@
-// React, Redux, Router
-import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
-import { useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import { useTranslation } from "react-i18next";
-
-// Utility and Network
-import { monitorValidation } from "../../../Validation/validation";
-import { createUptimeMonitor } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
-// MUI
-import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material";
-import Switch from "@mui/material/Switch";
-import FormControlLabel from "@mui/material/FormControlLabel";
-
 //Components
 import Breadcrumbs from "../../../Components/Breadcrumbs";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
-import { createToast } from "../../../Utils/toastUtils";
 import Radio from "../../../Components/Inputs/Radio";
 import Select from "../../../Components/Inputs/Select";
 import ConfigBox from "../../../Components/ConfigBox";
-import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 import NotificationsConfig from "../../../Components/NotificationConfig";
+import Button from "@mui/material/Button";
+import ButtonGroup from "@mui/material/ButtonGroup";
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Switch from "@mui/material/Switch";
+import FormControlLabel from "@mui/material/FormControlLabel";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router-dom";
+import { useState } from "react";
+import { useSelector } from "react-redux";
+import { useTranslation } from "react-i18next";
+import { monitorValidation } from "../../../Validation/validation";
+import { createToast } from "../../../Utils/toastUtils";
+import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
+import { useCreateMonitor } from "../../../Hooks/monitorHooks";
 
 const CreateMonitor = () => {
 	// Redux state
 	const { user } = useSelector((state) => state.auth);
 	const { isLoading } = useSelector((state) => state.uptimeMonitors);
-	const dispatch = useDispatch();
 
 	// Local state
 	const [errors, setErrors] = useState({});
@@ -49,6 +49,7 @@ const CreateMonitor = () => {
 	const { t } = useTranslation();
 	const navigate = useNavigate();
 	const [notifications, notificationsAreLoading, error] = useGetNotificationsByTeamId();
+	const [createMonitor, isCreating] = useCreateMonitor();
 
 	const MS_PER_MINUTE = 60000;
 	const SELECT_VALUES = [
@@ -147,13 +148,7 @@ const CreateMonitor = () => {
 			notifications: monitor.notifications,
 		};
 
-		const action = await dispatch(createUptimeMonitor({ monitor: form }));
-		if (action.meta.requestStatus === "fulfilled") {
-			createToast({ body: "Monitor created successfully!" });
-			navigate("/uptime");
-		} else {
-			createToast({ body: "Failed to create monitor." });
-		}
+		await createMonitor({ monitor: form, redirect: "/uptime" });
 	};
 
 	const onChange = (event) => {
@@ -472,7 +467,7 @@ const CreateMonitor = () => {
 						variant="contained"
 						color="accent"
 						disabled={!Object.values(errors).every((value) => value === undefined)}
-						loading={isLoading}
+						loading={isLoading || isCreating}
 					>
 						{t("createMonitor")}
 					</Button>
diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
index ddc7e223b..0e362e187 100644
--- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
+++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 import { getHumanReadableDuration } from "../../../../../Utils/timeUtils";
 import { useTheme } from "@mui/material/styles";
 import { Typography } from "@mui/material";
-import useUtils from "../../../Monitors/Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 
 const UptimeStatusBoxes = ({
 	isLoading = false,
@@ -14,7 +14,7 @@ const UptimeStatusBoxes = ({
 	certificateExpiry,
 }) => {
 	const theme = useTheme();
-	const { determineState } = useUtils();
+	const { determineState } = useMonitorUtils();
 
 	// Determine time since last failure
 	const timeOfLastFailure = monitorStats?.timeOfLastFailure;
diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 570b687d5..8da56f303 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -1,15 +1,14 @@
 // Components
 import Breadcrumbs from "../../../Components/Breadcrumbs";
 import MonitorDetailsControlHeader from "../../../Components/MonitorDetailsControlHeader";
-import MonitorStatusHeader from "../../../Components/MonitorStatusHeader";
 import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
 import ChartBoxes from "./Components/ChartBoxes";
 import ResponseTimeChart from "./Components/Charts/ResponseTimeChart";
 import ResponseTable from "./Components/ResponseTable";
 import UptimeStatusBoxes from "./Components/UptimeStatusBoxes";
 import GenericFallback from "../../../Components/GenericFallback";
-// MUI Components
-import { Stack, Typography } from "@mui/material";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
 
 // Utils
 import { useState } from "react";
@@ -17,9 +16,9 @@ import { useParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useTheme } from "@emotion/react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
-import useFetchUptimeMonitorDetails from "../../../Hooks/useFetchUptimeMonitorDetails";
+import { useFetchUptimeMonitorById } from "../../../Hooks/monitorHooks";
 import useCertificateFetch from "./Hooks/useCertificateFetch";
-import useChecksFetch from "./Hooks/useChecksFetch";
+import { useFetchChecks } from "../../../Hooks/checkHooks";
 import { useTranslation } from "react-i18next";
 
 // Constants
@@ -50,7 +49,7 @@ const UptimeDetails = () => {
 	const { t } = useTranslation();
 
 	const [monitorData, monitorStats, monitorIsLoading, monitorNetworkError] =
-		useFetchUptimeMonitorDetails({
+		useFetchUptimeMonitorById({
 			monitorId,
 			dateRange,
 			trigger,
@@ -66,7 +65,7 @@ const UptimeDetails = () => {
 	});
 
 	const monitorType = monitor?.type;
-	const [checks, checksCount, checksAreLoading, checksNetworkError] = useChecksFetch({
+	const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecks({
 		monitorId,
 		monitorType,
 		dateRange,
diff --git a/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx b/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
index ba4a139e3..63a40f85a 100644
--- a/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
@@ -13,7 +13,7 @@ import TableSkeleton from "../../../../../Components/Table/skeleton";
 
 // Utils
 import { useTheme } from "@emotion/react";
-import useUtils from "../../Hooks/useUtils";
+import { useMonitorUtils } from "../../../../../Hooks/useMonitorUtils";
 import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
@@ -58,7 +58,7 @@ const UptimeDataTable = ({
 }) => {
 	// Utils
 	const navigate = useNavigate();
-	const { determineState } = useUtils();
+	const { determineState } = useMonitorUtils();
 	const theme = useTheme();
 	const { t } = useTranslation();
 
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index 793731190..e313d7deb 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -28,9 +28,12 @@ import { useNavigate } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { setRowsPerPage } from "../../../Features/UI/uiSlice";
 import PropTypes from "prop-types";
-import useFetchMonitorsWithSummary from "../../../Hooks/useFetchMonitorsWithSummary";
-import useFetchMonitorsWithChecks from "../../../Hooks/useFetchMonitorsWithChecks";
+import {
+	useFetchMonitorsWithSummary,
+	useFetchMonitorsWithChecks,
+} from "../../../Hooks/monitorHooks";
 import { useTranslation } from "react-i18next";
+
 const TYPES = ["http", "ping", "docker", "port"];
 const CreateMonitorButton = ({ shouldRender }) => {
 	// Utils
@@ -78,7 +81,6 @@ const UptimeMonitors = () => {
 
 	// Utils
 	const theme = useTheme();
-	const navigate = useNavigate();
 	const isAdmin = useIsAdmin();
 	const dispatch = useDispatch();
 	const { t } = useTranslation();
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 655f427bf..bc6c8bbb9 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -525,6 +525,7 @@
 	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
 	"seperateEmails": "You can separate multiple emails with a comma",
 	"checkFrequency": "Check frequency",
+	"advancedMatching": "Advanced matching",
 	"matchMethod": "Match Method",
 	"expectedValue": "Expected value",
 	"deleteDialogTitle": "Do you really want to delete this monitor?",

From cf84d1fde545b284c7cb1548031c6885f45e99a4 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 15:46:48 +0800
Subject: [PATCH 114/319] use arrow functions to preserve context

---
 client/src/Utils/NetworkService.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 3d124a3e6..6c38688a7 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -587,7 +587,7 @@ class NetworkService {
 	 *
 	 */
 
-	async getChecksByMonitor(config) {
+	getChecksByMonitor = async (config) => {
 		const params = new URLSearchParams();
 		if (config.type) params.append("type", config.type);
 		if (config.sortOrder) params.append("sortOrder", config.sortOrder);
@@ -599,7 +599,7 @@ class NetworkService {
 		if (config.status !== undefined) params.append("status", config.status);
 
 		return this.axiosInstance.get(`/checks/${config.monitorId}?${params.toString()}`);
-	}
+	};
 
 	/**
 	 * ************************************
@@ -618,7 +618,7 @@ class NetworkService {
 	 * @returns {Promise<AxiosResponse>} The response from the axios GET request.
 	 *
 	 */
-	async getChecksByTeam(config) {
+	getChecksByTeam = async (config) => {
 		const params = new URLSearchParams();
 		if (config.sortOrder) params.append("sortOrder", config.sortOrder);
 		if (config.limit) params.append("limit", config.limit);
@@ -628,7 +628,7 @@ class NetworkService {
 		if (config.rowsPerPage) params.append("rowsPerPage", config.rowsPerPage);
 		if (config.status !== undefined) params.append("status", config.status);
 		return this.axiosInstance.get(`/checks/team/${config.teamId}?${params.toString()}`);
-	}
+	};
 
 	/**
 	 * ************************************

From 289aa4fe32dd44d383898b5c200054e70df8762b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 15:47:21 +0800
Subject: [PATCH 115/319] refactor check hooks

---
 client/src/Hooks/checkHooks.js                | 76 ++++++++++++++-----
 .../Pages/Incidents/Hooks/useChecksFetch.jsx  | 66 ----------------
 .../Incidents/Hooks/useMonitorsFetch.jsx      | 54 -------------
 3 files changed, 58 insertions(+), 138 deletions(-)
 delete mode 100644 client/src/Pages/Incidents/Hooks/useChecksFetch.jsx
 delete mode 100644 client/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx

diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooks.js
index cc942b294..dac2be671 100644
--- a/client/src/Hooks/checkHooks.js
+++ b/client/src/Hooks/checkHooks.js
@@ -1,32 +1,60 @@
-import { useState } from "react";
-import { useEffect } from "react";
+import { useState, useEffect } from "react";
 import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 
-const useFetchChecks = ({ monitorId, monitorType, dateRange, page, rowsPerPage }) => {
+const useFetchChecks = ({
+	teamId,
+	monitorId,
+	type,
+	status,
+	sortOrder,
+	limit,
+	dateRange,
+	filter,
+	page,
+	rowsPerPage,
+}) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
 	const [isLoading, setIsLoading] = useState(false);
 	const [networkError, setNetworkError] = useState(false);
 
 	useEffect(() => {
-		if (!monitorType) {
-			return;
-		}
-
 		const fetchChecks = async () => {
+			if (!type && !teamId) {
+				return;
+			}
+
+			const method = monitorId
+				? networkService.getChecksByMonitor
+				: networkService.getChecksByTeam;
+
+			const config = monitorId
+				? {
+						monitorId,
+						type,
+						status,
+						sortOrder,
+						limit,
+						dateRange,
+						filter,
+						page,
+						rowsPerPage,
+					}
+				: {
+						status,
+						teamId,
+						sortOrder,
+						limit,
+						dateRange,
+						filter,
+						page,
+						rowsPerPage,
+					};
+
 			try {
 				setIsLoading(true);
-				const res = await networkService.getChecksByMonitor({
-					monitorId: monitorId,
-					type: monitorType,
-					sortOrder: "desc",
-					limit: null,
-					dateRange: dateRange,
-					filter: null,
-					page: page,
-					rowsPerPage: rowsPerPage,
-				});
+				const res = await method(config);
 				setChecks(res.data.data.checks);
 				setChecksCount(res.data.data.checksCount);
 			} catch (error) {
@@ -36,8 +64,20 @@ const useFetchChecks = ({ monitorId, monitorType, dateRange, page, rowsPerPage }
 				setIsLoading(false);
 			}
 		};
+
 		fetchChecks();
-	}, [monitorId, monitorType, dateRange, page, rowsPerPage]);
+	}, [
+		monitorId,
+		teamId,
+		type,
+		status,
+		sortOrder,
+		limit,
+		dateRange,
+		filter,
+		page,
+		rowsPerPage,
+	]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
diff --git a/client/src/Pages/Incidents/Hooks/useChecksFetch.jsx b/client/src/Pages/Incidents/Hooks/useChecksFetch.jsx
deleted file mode 100644
index a2f2c8211..000000000
--- a/client/src/Pages/Incidents/Hooks/useChecksFetch.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useState, useEffect } from "react";
-import { networkService } from "../../../main";
-import { createToast } from "../../../Utils/toastUtils";
-import { useSelector } from "react-redux";
-const useChecksFetch = ({
-	selectedMonitor,
-	selectedMonitorType,
-	filter,
-	dateRange,
-	page,
-	rowsPerPage,
-}) => {
-	//Redux
-	const { user } = useSelector((state) => state.auth);
-
-	//Local
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-	const [checks, setChecks] = useState(undefined);
-	const [checksCount, setChecksCount] = useState(undefined);
-
-	useEffect(() => {
-		const fetchChecks = async () => {
-			try {
-				setIsLoading(true);
-				let res;
-
-				if (selectedMonitor === "0") {
-					res = await networkService.getChecksByTeam({
-						status: false,
-						teamId: user.teamId,
-						sortOrder: "desc",
-						limit: null,
-						dateRange,
-						filter: filter,
-						page: page,
-						rowsPerPage: rowsPerPage,
-					});
-				} else {
-					res = await networkService.getChecksByMonitor({
-						status: false,
-						monitorId: selectedMonitor,
-						type: selectedMonitorType,
-						sortOrder: "desc",
-						limit: null,
-						dateRange,
-						filter: filter,
-						page,
-						rowsPerPage,
-					});
-				}
-				setChecks(res.data.data.checks);
-				setChecksCount(res.data.data.checksCount);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-		fetchChecks();
-	}, [user, dateRange, page, rowsPerPage, filter, selectedMonitor, selectedMonitorType]);
-	return { isLoading, networkError, checks, checksCount };
-};
-
-export default useChecksFetch;
diff --git a/client/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx b/client/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx
deleted file mode 100644
index 46d187aaf..000000000
--- a/client/src/Pages/Incidents/Hooks/useMonitorsFetch.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useState, useEffect } from "react";
-import { networkService } from "../../../main";
-import { createToast } from "../../../Utils/toastUtils";
-const useMonitorsFetch = ({ teamId }) => {
-	//Local state
-	const [isLoading, setIsLoading] = useState(true);
-	const [networkError, setNetworkError] = useState(false);
-
-	const [monitors, setMonitors] = useState(undefined);
-
-	useEffect(() => {
-		const fetchMonitors = async () => {
-			try {
-				setIsLoading(true);
-				const res = await networkService.getMonitorsByTeamId({
-					teamId,
-					limit: null,
-					types: null,
-					status: null,
-					checkOrder: null,
-					normalize: null,
-					page: null,
-					rowsPerPage: null,
-					filter: null,
-					field: null,
-					order: null,
-				});
-				if (res?.data?.data?.filteredMonitors?.length > 0) {
-					const monitorLookup = res.data.data.filteredMonitors.reduce((acc, monitor) => {
-						acc[monitor._id] = {
-							_id: monitor._id,
-							name: monitor.name,
-							type: monitor.type,
-						};
-						return acc;
-					}, {});
-					setMonitors(monitorLookup);
-				}
-			} catch (error) {
-				setNetworkError(true);
-				createToast({
-					body: error.message,
-				});
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchMonitors();
-	}, [teamId]);
-	return { isLoading, monitors, networkError };
-};
-
-export { useMonitorsFetch };

From d62fe5f4aba45a8b70add2d76443f28a67b900d4 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 15:47:43 +0800
Subject: [PATCH 116/319] add missing dependencies

---
 client/src/Hooks/monitorHooks.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index a39fd3c5e..71f54de59 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -111,6 +111,9 @@ const useFetchMonitorsByTeamId = ({
 	filter,
 	field,
 	order,
+	checkOrder,
+	normalize,
+	status,
 	updateTrigger,
 }) => {
 	const [isLoading, setIsLoading] = useState(false);
@@ -123,7 +126,7 @@ const useFetchMonitorsByTeamId = ({
 			try {
 				setIsLoading(true);
 				const res = await networkService.getMonitorsByTeamId({
-					teamId: teamId,
+					teamId,
 					limit,
 					types,
 					page,
@@ -131,6 +134,9 @@ const useFetchMonitorsByTeamId = ({
 					filter,
 					field,
 					order,
+					checkOrder,
+					status,
+					normalize,
 				});
 				if (res?.data?.data?.filteredMonitors) {
 					setMonitors(res.data.data.filteredMonitors);
@@ -146,7 +152,20 @@ const useFetchMonitorsByTeamId = ({
 			}
 		};
 		fetchMonitors();
-	}, [teamId, types, limit, page, rowsPerPage, filter, field, order, updateTrigger]);
+	}, [
+		teamId,
+		types,
+		limit,
+		page,
+		rowsPerPage,
+		filter,
+		field,
+		order,
+		updateTrigger,
+		checkOrder,
+		normalize,
+		status,
+	]);
 	return [monitors, summary, isLoading, networkError];
 };
 

From a11190396585bba04f9d54f4c92e0e7371d56d6f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 12 Jun 2025 15:47:59 +0800
Subject: [PATCH 117/319] use hooks

---
 .../Components/IncidentTable/index.jsx        | 35 ++++++++++++++-----
 client/src/Pages/Incidents/index.jsx          | 33 +++++++++++------
 client/src/Pages/Uptime/Details/index.jsx     |  6 +++-
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index cc2d212f0..bc4872735 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -10,10 +10,10 @@ import NetworkError from "../../../../Components/GenericFallback/NetworkError";
 //Utils
 import { formatDateWithTz } from "../../../../Utils/timeUtils";
 import { useSelector } from "react-redux";
-import { useState } from "react";
-import useChecksFetch from "../../Hooks/useChecksFetch";
+import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
+import { useFetchChecks } from "../../../../Hooks/checkHooks";
 
 const IncidentTable = ({
 	shouldRender,
@@ -24,19 +24,28 @@ const IncidentTable = ({
 }) => {
 	//Redux state
 	const uiTimezone = useSelector((state) => state.ui.timezone);
+	const { user } = useSelector((state) => state.auth);
 
 	//Local state
+	const [teamId, setTeamId] = useState(undefined);
+	const [monitorId, setMonitorId] = useState(undefined);
+
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const selectedMonitorDetails = monitors?.[selectedMonitor];
 	const selectedMonitorType = selectedMonitorDetails?.type;
-	const { isLoading, networkError, checks, checksCount } = useChecksFetch({
-		selectedMonitor,
-		selectedMonitorType,
-		filter,
+
+	const [checks, checksCount, isLoading, networkError] = useFetchChecks({
+		status: false,
+		monitorId,
+		teamId,
+		type: selectedMonitorType,
+		sortOrder: "desc",
+		limit: null,
 		dateRange,
-		page,
-		rowsPerPage,
+		filter: filter,
+		page: page,
+		rowsPerPage: rowsPerPage,
 	});
 
 	const { t } = useTranslation();
@@ -50,6 +59,16 @@ const IncidentTable = ({
 		setRowsPerPage(event.target.value);
 	};
 
+	useEffect(() => {
+		if (selectedMonitor === "0") {
+			setTeamId(user.teamId);
+			setMonitorId(undefined);
+		} else {
+			setMonitorId(selectedMonitor);
+			setTeamId(undefined);
+		}
+	}, [selectedMonitor, user.teamId]);
+
 	const headers = [
 		{
 			id: "monitorName",
diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
index 16a62a621..d01543f8a 100644
--- a/client/src/Pages/Incidents/index.jsx
+++ b/client/src/Pages/Incidents/index.jsx
@@ -1,19 +1,19 @@
 // Components
 import { Stack } from "@mui/material";
 import Breadcrumbs from "../../Components/Breadcrumbs";
+import GenericFallback from "../../Components/GenericFallback";
+import IncidentTable from "./Components/IncidentTable";
+import OptionsHeader from "./Components/OptionsHeader";
 
 //Utils
 import { useTheme } from "@emotion/react";
-import { useMonitorsFetch } from "./Hooks/useMonitorsFetch";
+import { useFetchMonitorsByTeamId } from "../../Hooks/monitorHooks";
 import { useSelector } from "react-redux";
-import OptionsHeader from "./Components/OptionsHeader";
-import { useState } from "react";
-import IncidentTable from "./Components/IncidentTable";
-import GenericFallback from "../../Components/GenericFallback";
+import { useState, useEffect } from "react";
 import NetworkError from "../../Components/GenericFallback/NetworkError";
 import { useTranslation } from "react-i18next";
-//Constants
 
+//Constants
 const Incidents = () => {
 	// Redux state
 	const { user } = useSelector((state) => state.auth);
@@ -27,13 +27,26 @@ const Incidents = () => {
 	const [selectedMonitor, setSelectedMonitor] = useState("0");
 	const [filter, setFilter] = useState(undefined);
 	const [dateRange, setDateRange] = useState(undefined);
+	const [monitorLookup, setMonitorLookup] = useState(undefined);
+
 	//Utils
 	const theme = useTheme();
-
-	const { monitors, isLoading, networkError } = useMonitorsFetch({
+	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({
 		teamId: user.teamId,
 	});
 
+	useEffect(() => {
+		const monitorLookup = monitors?.reduce((acc, monitor) => {
+			acc[monitor._id] = {
+				_id: monitor._id,
+				name: monitor.name,
+				type: monitor.type,
+			};
+			return acc;
+		}, {});
+		setMonitorLookup(monitorLookup);
+	}, [monitors]);
+
 	if (networkError) {
 		return (
 			<GenericFallback>
@@ -47,7 +60,7 @@ const Incidents = () => {
 			<Breadcrumbs list={BREADCRUMBS} />
 			<OptionsHeader
 				shouldRender={!isLoading}
-				monitors={monitors}
+				monitors={monitorLookup}
 				selectedMonitor={selectedMonitor}
 				setSelectedMonitor={setSelectedMonitor}
 				filter={filter}
@@ -57,7 +70,7 @@ const Incidents = () => {
 			/>
 			<IncidentTable
 				shouldRender={!isLoading}
-				monitors={monitors}
+				monitors={monitorLookup ? monitorLookup : {}}
 				selectedMonitor={selectedMonitor}
 				filter={filter}
 				dateRange={dateRange}
diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 8da56f303..79762e0c3 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -65,10 +65,14 @@ const UptimeDetails = () => {
 	});
 
 	const monitorType = monitor?.type;
+
 	const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecks({
 		monitorId,
-		monitorType,
+		type: monitorType,
+		sortOrder: "desc",
+		limit: null,
 		dateRange,
+		filter: null,
 		page,
 		rowsPerPage,
 	});

From a93edc11316d9cf98de5919db6e4c5b69d2c68dc Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:16:07 +0800
Subject: [PATCH 118/319] remove redux from action menu

---
 client/src/Components/ActionsMenu/index.jsx | 40 +++++++++------------
 client/src/Hooks/useFetchSettings.js        |  3 +-
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/client/src/Components/ActionsMenu/index.jsx b/client/src/Components/ActionsMenu/index.jsx
index 4d5ab7c01..67dd3356b 100644
--- a/client/src/Components/ActionsMenu/index.jsx
+++ b/client/src/Components/ActionsMenu/index.jsx
@@ -1,17 +1,22 @@
+// Components
+import IconButton from "@mui/material/IconButton";
+import Menu from "@mui/material/Menu";
+import MenuItem from "@mui/material/MenuItem";
+import Settings from "../../assets/icons/settings-bold.svg?react";
+import Dialog from "../../Components/Dialog";
+
+// Utils
 import { useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { createToast } from "../../Utils/toastUtils";
-import { logger } from "../../Utils/Logger";
-import { IconButton, Menu, MenuItem } from "@mui/material";
 import {
 	deleteUptimeMonitor,
 	pauseUptimeMonitor,
 } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
-import Settings from "../../assets/icons/settings-bold.svg?react";
 import PropTypes from "prop-types";
-import Dialog from "../../Components/Dialog";
+import { usePauseMonitor, useDeleteMonitor } from "../../Hooks/monitorHooks";
 
 const ActionsMenu = ({
 	monitor,
@@ -23,37 +28,24 @@ const ActionsMenu = ({
 	const [anchorEl, setAnchorEl] = useState(null);
 	const [actions, setActions] = useState({});
 	const [isOpen, setIsOpen] = useState(false);
-	const dispatch = useDispatch();
 	const theme = useTheme();
-	const { isLoading } = useSelector((state) => state.uptimeMonitors);
+	const [pauseMonitor, isPausing, error] = usePauseMonitor();
+	const [deleteMonitor, isDeleting] = useDeleteMonitor();
 
 	const handleRemove = async (event) => {
 		event.preventDefault();
 		event.stopPropagation();
 		let monitor = { _id: actions.id };
-		const action = await dispatch(deleteUptimeMonitor({ monitor }));
-		if (action.meta.requestStatus === "fulfilled") {
-			setIsOpen(false); // close modal
-			updateRowCallback();
-			createToast({ body: "Monitor deleted successfully." });
-		} else {
-			createToast({ body: "Failed to delete monitor." });
-		}
+		await deleteMonitor({ monitor });
+		updateRowCallback();
 	};
 
 	const handlePause = async () => {
 		try {
 			setIsLoading(true);
-			const action = await dispatch(pauseUptimeMonitor({ monitorId: monitor._id }));
-			if (pauseUptimeMonitor.fulfilled.match(action)) {
-				const state = action?.payload?.data.isActive === false ? "resumed" : "paused";
-				createToast({ body: `Monitor ${state} successfully.` });
-				pauseCallback();
-			} else {
-				throw new Error(action?.error?.message ?? "Failed to pause monitor.");
-			}
+			await pauseMonitor({ monitorId: monitor._id });
+			pauseCallback();
 		} catch (error) {
-			logger.error("Error pausing monitor:", monitor._id, error);
 			createToast({ body: "Failed to pause monitor." });
 		}
 	};
@@ -210,7 +202,7 @@ const ActionsMenu = ({
 					e.stopPropagation();
 					handleRemove(e);
 				}}
-				isLoading={isLoading}
+				isLoading={isDeleting}
 				modelTitle="modal-delete-monitor"
 				modelDescription="delete-monitor-confirmation"
 			/>
diff --git a/client/src/Hooks/useFetchSettings.js b/client/src/Hooks/useFetchSettings.js
index f7651e789..7d3ff28fc 100644
--- a/client/src/Hooks/useFetchSettings.js
+++ b/client/src/Hooks/useFetchSettings.js
@@ -33,12 +33,13 @@ const useSaveSettings = () => {
 	const saveSettings = async (settings) => {
 		setIsLoading(true);
 		try {
-			await networkService.updateAppSettings({ settings });
+			const settingsResponse = await networkService.updateAppSettings({ settings });
 			if (settings.checkTTL) {
 				await networkService.updateChecksTTL({
 					ttl: settings.checkTTL,
 				});
 			}
+			console.log({ settingsResponse });
 			createToast({ body: t("settingsSuccessSaved") });
 		} catch (error) {
 			createToast({ body: t("settingsFailedToSave") });

From 9f204b36b07fb7c19de6ba77762f0cdec7cfe535 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:18:45 +0800
Subject: [PATCH 119/319] remove unused redux state from sidebar

---
 client/src/Components/Sidebar/index.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index f487148f5..06a140c54 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -49,7 +49,6 @@ import { useDispatch, useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import { toggleSidebar } from "../../Features/UI/uiSlice";
-import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
 
 const getMenu = (t) => [
 	{ name: t("menu.uptime"), path: "uptime", icon: <Monitors /> },
@@ -197,7 +196,6 @@ function Sidebar() {
 	const logout = async () => {
 		// Clear auth state
 		dispatch(clearAuthState());
-		dispatch(clearUptimeMonitorState());
 		navigate("/login");
 	};
 

From 8d512b47197d8f36fa594c551c1fb495b178834d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:27:29 +0800
Subject: [PATCH 120/319] remove redux

---
 client/src/Pages/Auth/NewPasswordConfirmed.jsx | 2 --
 client/src/Utils/NetworkService.js             | 2 --
 2 files changed, 4 deletions(-)

diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index db03f7de3..945a0d52d 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -3,7 +3,6 @@ import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router";
 import { useDispatch } from "react-redux";
 import { clearAuthState } from "../../Features/Auth/authSlice";
-import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import Background from "../../assets/Images/background-grid.svg?react";
 import ConfirmIcon from "../../assets/icons/check-outlined.svg?react";
 import Logo from "../../assets/icons/checkmate-icon.svg?react";
@@ -19,7 +18,6 @@ const NewPasswordConfirmed = () => {
 
 	const handleNavigate = () => {
 		dispatch(clearAuthState());
-		dispatch(clearUptimeMonitorState());
 		navigate("/login");
 	};
 
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 6c38688a7..f25828c66 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -3,7 +3,6 @@ import i18next from "i18next";
 const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
 const FALLBACK_BASE_URL = "http://localhost:5000/api/v1";
 import { clearAuthState } from "../Features/Auth/authSlice";
-import { clearUptimeMonitorState } from "../Features/UptimeMonitors/uptimeMonitorsSlice";
 class NetworkService {
 	constructor(store, dispatch, navigate) {
 		this.store = store;
@@ -56,7 +55,6 @@ class NetworkService {
 
 				if (error.response && error.response.status === 401) {
 					dispatch(clearAuthState());
-					dispatch(clearUptimeMonitorState());
 					navigate("/login");
 				} else if (error.request && !error.response) {
 					return Promise.reject(error);

From fca39f191498f3ac37c51ca28b4149cc19ce8ae0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:51:26 +0800
Subject: [PATCH 121/319] remove redux from settings

---
 client/src/Hooks/monitorHooks.js          | 56 +++++++++++++++++++++++
 client/src/Hooks/useDeleteMonitorStats.js | 24 ----------
 client/src/Pages/Settings/index.jsx       | 50 ++++++++------------
 3 files changed, 74 insertions(+), 56 deletions(-)
 delete mode 100644 client/src/Hooks/useDeleteMonitorStats.js

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 71f54de59..e5c405ac1 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -4,6 +4,7 @@ import { createToast } from "../Utils/toastUtils";
 import { useTheme } from "@emotion/react";
 import { useMonitorUtils } from "./useMonitorUtils";
 import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
 
 const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) => {
 	const [isLoading, setIsLoading] = useState(false);
@@ -383,6 +384,58 @@ const usePauseMonitor = () => {
 	return [pauseMonitor, isLoading, error];
 };
 
+const useAddDemoMonitors = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const { t } = useTranslation();
+	const addDemoMonitors = async () => {
+		try {
+			setIsLoading(true);
+			await networkService.addDemoMonitors();
+			createToast({ body: t("settingsDemoMonitorsAdded") });
+		} catch (error) {
+			createToast({ body: t("settingsFailedToAddDemoMonitors") });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+	return [addDemoMonitors, isLoading];
+};
+
+const useDeleteAllMonitors = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const { t } = useTranslation();
+	const deleteAllMonitors = async () => {
+		try {
+			setIsLoading(true);
+			await networkService.deleteAllMonitors();
+			createToast({ body: t("settingsMonitorsDeleted") });
+		} catch (error) {
+			createToast({ body: t("settingsFailedToDeleteMonitors") });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+	return [deleteAllMonitors, isLoading];
+};
+
+const UseDeleteMonitorStats = () => {
+	const { t } = useTranslation();
+	const [isLoading, setIsLoading] = useState(false);
+	const deleteMonitorStats = async ({ teamId }) => {
+		setIsLoading(true);
+		try {
+			const res = await networkService.deleteChecksByTeamId({ teamId });
+			createToast({ body: t("settingsStatsCleared") });
+		} catch (error) {
+			createToast({ body: t("settingsFailedToClearStats") });
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [deleteMonitorStats, isLoading];
+};
+
 export {
 	useFetchMonitorsWithSummary,
 	useFetchMonitorsWithChecks,
@@ -395,4 +448,7 @@ export {
 	useDeleteMonitor,
 	useUpdateMonitor,
 	usePauseMonitor,
+	useAddDemoMonitors,
+	useDeleteAllMonitors,
+	UseDeleteMonitorStats,
 };
diff --git a/client/src/Hooks/useDeleteMonitorStats.js b/client/src/Hooks/useDeleteMonitorStats.js
deleted file mode 100644
index 64138929f..000000000
--- a/client/src/Hooks/useDeleteMonitorStats.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useState } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-import { useTranslation } from "react-i18next";
-
-const UseDeleteMonitorStats = () => {
-	const { t } = useTranslation();
-	const [isLoading, setIsLoading] = useState(false);
-	const deleteMonitorStats = async ({ teamId }) => {
-		setIsLoading(true);
-		try {
-			const res = await networkService.deleteChecksByTeamId({ teamId });
-			createToast({ body: t("settingsStatsCleared") });
-		} catch (error) {
-			createToast({ body: t("settingsFailedToClearStats") });
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return [deleteMonitorStats, isLoading];
-};
-
-export { UseDeleteMonitorStats };
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index b0e3c476b..d8bd79551 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -11,22 +11,20 @@ import SettingsEmail from "./SettingsEmail";
 import Button from "@mui/material/Button";
 // Utils
 import { settingsValidation } from "../../Validation/validation";
-import { createToast } from "../../Utils/toastUtils";
 import { useState } from "react";
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
 import { useSelector, useDispatch } from "react-redux";
 import { setTimezone, setMode, setLanguage, setShowURL } from "../../Features/UI/uiSlice";
 import SettingsStats from "./SettingsStats";
-import {
-	deleteMonitorChecksByTeamId,
-	addDemoMonitors,
-	deleteAllMonitors,
-} from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { useFetchSettings, useSaveSettings } from "../../Hooks/useFetchSettings";
-import { UseDeleteMonitorStats } from "../../Hooks/useDeleteMonitorStats";
-import { useIsAdmin } from "../../Hooks/useIsAdmin";
 
+import { useFetchSettings, useSaveSettings } from "../../Hooks/useFetchSettings";
+import { useIsAdmin } from "../../Hooks/useIsAdmin";
+import {
+	useAddDemoMonitors,
+	useDeleteAllMonitors,
+	UseDeleteMonitorStats,
+} from "../../Hooks/monitorHooks";
 // Constants
 const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
 
@@ -43,15 +41,17 @@ const Settings = () => {
 	const [isSettingsLoading, settingsError] = useFetchSettings({
 		setSettingsData,
 	});
+	const [addDemoMonitors, isAddingDemoMonitors] = useAddDemoMonitors();
 
 	const [isSaving, saveError, saveSettings] = useSaveSettings();
+	const [deleteAllMonitors, isDeletingMonitors] = useDeleteAllMonitors();
 	const [deleteMonitorStats, isDeletingMonitorStats] = UseDeleteMonitorStats();
 
 	// Setup
 	const isAdmin = useIsAdmin();
 	const theme = useTheme();
 	const HEADING_SX = { mt: theme.spacing(2), mb: theme.spacing(2) };
-	const { t, i18n } = useTranslation();
+	const { t } = useTranslation();
 	const dispatch = useDispatch();
 
 	// Handlers
@@ -101,30 +101,12 @@ const Settings = () => {
 		}
 
 		if (name === "demo") {
-			try {
-				const action = await dispatch(addDemoMonitors());
-				if (addDemoMonitors.fulfilled.match(action)) {
-					createToast({ body: t("settingsDemoMonitorsAdded") });
-				} else {
-					createToast({ body: t("settingsFailedToAddDemoMonitors") });
-				}
-			} catch (error) {
-				createToast({ body: t("settingsFailedToAddDemoMonitors") });
-			}
+			await addDemoMonitors();
 			return;
 		}
 
 		if (name === "deleteMonitors") {
-			try {
-				const action = await dispatch(deleteAllMonitors());
-				if (deleteAllMonitors.fulfilled.match(action)) {
-					createToast({ body: t("settingsMonitorsDeleted") });
-				} else {
-					createToast({ body: t("settingsFailedToDeleteMonitors") });
-				}
-			} catch (error) {
-				createToast({ body: t("settingsFailedToDeleteMonitors") });
-			}
+			await deleteAllMonitors();
 			return;
 		}
 
@@ -185,7 +167,9 @@ const Settings = () => {
 				isAdmin={isAdmin}
 				HEADER_SX={HEADING_SX}
 				handleChange={handleChange}
-				isLoading={isSettingsLoading || isSaving || isDeletingMonitorStats}
+				isLoading={
+					isSettingsLoading || isSaving || isDeletingMonitorStats || isAddingDemoMonitors
+				}
 			/>
 			<SettingsEmail
 				isAdmin={isAdmin}
@@ -219,7 +203,9 @@ const Settings = () => {
 				}}
 			>
 				<Button
-					loading={isSaving || isDeletingMonitorStats || isSettingsLoading}
+					loading={
+						isSaving || isDeletingMonitorStats || isSettingsLoading || isDeletingMonitors
+					}
 					disabled={Object.keys(errors).length > 0}
 					variant="contained"
 					color="accent"

From 9503f08dd8bdd2c3d9b5cc8c63ae8569df7e0d78 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:56:06 +0800
Subject: [PATCH 122/319] remove uptime monitor reducer

---
 client/src/Components/ActionsMenu/index.jsx   |   6 +-
 .../TabPanels/Account/ProfilePanel.jsx        |   2 -
 .../UptimeMonitors/uptimeMonitorsSlice.js     | 380 ------------------
 client/src/store.js                           |   4 +-
 4 files changed, 2 insertions(+), 390 deletions(-)
 delete mode 100644 client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js

diff --git a/client/src/Components/ActionsMenu/index.jsx b/client/src/Components/ActionsMenu/index.jsx
index 67dd3356b..cdd7ecf7d 100644
--- a/client/src/Components/ActionsMenu/index.jsx
+++ b/client/src/Components/ActionsMenu/index.jsx
@@ -7,14 +7,10 @@ import Dialog from "../../Components/Dialog";
 
 // Utils
 import { useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { createToast } from "../../Utils/toastUtils";
-import {
-	deleteUptimeMonitor,
-	pauseUptimeMonitor,
-} from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
+
 import PropTypes from "prop-types";
 import { usePauseMonitor, useDeleteMonitor } from "../../Hooks/monitorHooks";
 
diff --git a/client/src/Components/TabPanels/Account/ProfilePanel.jsx b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
index ad6d15b98..9b209bf3e 100644
--- a/client/src/Components/TabPanels/Account/ProfilePanel.jsx
+++ b/client/src/Components/TabPanels/Account/ProfilePanel.jsx
@@ -8,7 +8,6 @@ import ImageUpload from "../../Inputs/ImageUpload";
 import { newOrChangedCredentials } from "../../../Validation/validation";
 import { useDispatch, useSelector } from "react-redux";
 import { clearAuthState, deleteUser, update } from "../../../Features/Auth/authSlice";
-import { clearUptimeMonitorState } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import { createToast } from "../../../Utils/toastUtils";
 import { logger } from "../../../Utils/Logger";
 import { GenericDialog } from "../../Dialog/genericDialog";
@@ -162,7 +161,6 @@ const ProfilePanel = () => {
 		const action = await dispatch(deleteUser());
 		if (action.payload.success) {
 			dispatch(clearAuthState());
-			dispatch(clearUptimeMonitorState());
 		} else {
 			if (action.payload) {
 				// dispatch errors
diff --git a/client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
deleted file mode 100644
index 74ad803d3..000000000
--- a/client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
+++ /dev/null
@@ -1,380 +0,0 @@
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { networkService } from "../../main";
-const initialState = {
-	isLoading: false,
-	monitorsSummary: [],
-	success: null,
-	msg: null,
-};
-
-export const createUptimeMonitor = createAsyncThunk(
-	"monitors/createMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.createMonitor({ monitor: monitor });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const checkEndpointResolution = createAsyncThunk(
-	"monitors/checkEndpoint",
-	async (data, thunkApi) => {
-		try {
-			const { monitorURL } = data;
-			const res = await networkService.checkEndpointResolution({
-				monitorURL: monitorURL,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const getUptimeMonitorById = createAsyncThunk(
-	"monitors/getMonitorById",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.getMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const updateUptimeMonitor = createAsyncThunk(
-	"monitors/updateMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const updatedFields = {
-				name: monitor.name,
-				description: monitor.description,
-				interval: monitor.interval,
-				notifications: monitor.notifications,
-				matchMethod: monitor.matchMethod,
-				expectedValue: monitor.expectedValue,
-				ignoreTlsErrors: monitor.ignoreTlsErrors,
-				jsonPath: monitor.jsonPath,
-				...(monitor.type === "port" && { port: monitor.port }),
-			};
-			const res = await networkService.updateMonitor({
-				monitorId: monitor._id,
-				updatedFields,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteUptimeMonitor = createAsyncThunk(
-	"monitors/deleteMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.deleteMonitorById({ monitorId: monitor._id });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const pauseUptimeMonitor = createAsyncThunk(
-	"monitors/pauseMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.pauseMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteMonitorChecksByTeamId = createAsyncThunk(
-	"monitors/deleteChecksByTeamId",
-	async (data, thunkApi) => {
-		try {
-			const { teamId } = data;
-			const res = await networkService.deleteChecksByTeamId({ teamId: teamId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-export const addDemoMonitors = createAsyncThunk(
-	"monitors/addDemoMonitors",
-	async (data, thunkApi) => {
-		try {
-			const res = await networkService.addDemoMonitors();
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteAllMonitors = createAsyncThunk(
-	"monitors/deleteAllMonitors",
-	async (data, thunkApi) => {
-		try {
-			const res = await networkService.deleteAllMonitors();
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-const uptimeMonitorsSlice = createSlice({
-	name: "uptimeMonitors",
-	initialState,
-	reducers: {
-		clearUptimeMonitorState: (state) => {
-			state.isLoading = false;
-			state.monitorsSummary = [];
-			state.success = null;
-			state.msg = null;
-		},
-	},
-	extraReducers: (builder) => {
-		builder
-			// *****************************************************
-			// Create Monitor
-			// *****************************************************
-			.addCase(createUptimeMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(createUptimeMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(createUptimeMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to create uptime monitor";
-			})
-			// *****************************************************
-			// Resolve Endpoint
-			// *****************************************************
-			.addCase(checkEndpointResolution.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(checkEndpointResolution.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(checkEndpointResolution.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to check endpoint resolution";
-			})
-			// *****************************************************
-			// Get Monitor By Id
-			// *****************************************************
-			.addCase(getUptimeMonitorById.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getUptimeMonitorById.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(getUptimeMonitorById.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload ? action.payload.msg : "Failed to get uptime monitor";
-			})
-			// *****************************************************
-			// update Monitor
-			// *****************************************************
-			.addCase(updateUptimeMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(updateUptimeMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(updateUptimeMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to update uptime monitor";
-			})
-
-			// *****************************************************
-			// Delete Monitor
-			// *****************************************************
-			.addCase(deleteUptimeMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteUptimeMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteUptimeMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to delete uptime monitor";
-			})
-			// *****************************************************
-			// Delete Monitor checks by Team ID
-			// *****************************************************
-			.addCase(deleteMonitorChecksByTeamId.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteMonitorChecksByTeamId.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteMonitorChecksByTeamId.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to delete monitor checks";
-			})
-			// *****************************************************
-			// Pause Monitor
-			// *****************************************************
-			.addCase(pauseUptimeMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(pauseUptimeMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(pauseUptimeMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to pause uptime monitor";
-			})
-			// *****************************************************
-			// Add Demo Monitors
-			// *****************************************************
-			.addCase(addDemoMonitors.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(addDemoMonitors.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(addDemoMonitors.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to add demo uptime monitors";
-			})
-			// *****************************************************
-			// Delete all Monitors
-			// *****************************************************
-			.addCase(deleteAllMonitors.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteAllMonitors.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteAllMonitors.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload ? action.payload.msg : "Failed to delete all monitors";
-			});
-	},
-});
-
-export const { setUptimeMonitors, clearUptimeMonitorState } = uptimeMonitorsSlice.actions;
-
-export default uptimeMonitorsSlice.reducer;
diff --git a/client/src/store.js b/client/src/store.js
index 92ddfad00..f7cbdbde1 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,6 +1,5 @@
 import { configureStore, combineReducers } from "@reduxjs/toolkit";
 
-import uptimeMonitorsReducer from "./Features/UptimeMonitors/uptimeMonitorsSlice";
 import infrastructureMonitorsReducer from "./Features/InfrastructureMonitors/infrastructureMonitorsSlice";
 import pageSpeedMonitorReducer from "./Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import authReducer from "./Features/Auth/authSlice";
@@ -23,12 +22,11 @@ const authTransform = createTransform(
 const persistConfig = {
 	key: "root",
 	storage,
-	whitelist: ["auth", "monitors", "pageSpeed", "ui", "settings"],
+	whitelist: ["auth", "pageSpeed", "ui", "settings"],
 	transforms: [authTransform],
 };
 
 const rootReducer = combineReducers({
-	uptimeMonitors: uptimeMonitorsReducer,
 	infrastructureMonitors: infrastructureMonitorsReducer,
 	auth: authReducer,
 	pageSpeedMonitors: pageSpeedMonitorReducer,

From 5e6aaa3caaeea5afa993753bf9df527cd7e8775a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 09:59:01 +0800
Subject: [PATCH 123/319] remove unused reducers

---
 .../infrastructureMonitorsSlice.js            | 389 ------------------
 .../PageSpeedMonitor/pageSpeedMonitorSlice.js | 309 --------------
 client/src/store.js                           |   6 +-
 3 files changed, 1 insertion(+), 703 deletions(-)
 delete mode 100644 client/src/Features/InfrastructureMonitors/infrastructureMonitorsSlice.js
 delete mode 100644 client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js

diff --git a/client/src/Features/InfrastructureMonitors/infrastructureMonitorsSlice.js b/client/src/Features/InfrastructureMonitors/infrastructureMonitorsSlice.js
deleted file mode 100644
index 62bdf4811..000000000
--- a/client/src/Features/InfrastructureMonitors/infrastructureMonitorsSlice.js
+++ /dev/null
@@ -1,389 +0,0 @@
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { networkService } from "../../main";
-const initialState = {
-	isLoading: false,
-	monitorsSummary: [],
-	success: null,
-	msg: null,
-};
-
-export const createInfrastructureMonitor = createAsyncThunk(
-	"infrastructureMonitors/createMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.createMonitor({ monitor: monitor });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const checkInfrastructureEndpointResolution = createAsyncThunk(
-	"infrastructureMonitors/CheckEndpoint",
-	async (data, thunkApi) => {
-		try {
-			const { monitorURL } = data;
-			const res = await networkService.checkEndpointResolution({
-				monitorURL: monitorURL,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const getInfrastructureMonitorById = createAsyncThunk(
-	"infrastructureMonitors/getMonitorById",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.getMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const getInfrastructureMonitorsByTeamId = createAsyncThunk(
-	"infrastructureMonitors/getMonitorsByTeamId",
-	async (_, thunkApi) => {
-		const user = thunkApi.getState().auth.user;
-		try {
-			const res = await networkService.getMonitorsAndSummaryByTeamId({
-				teamId: user.teamId,
-				types: ["hardware"],
-				limit: 1,
-				rowsPerPage: 0,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const updateInfrastructureMonitor = createAsyncThunk(
-	"infrastructureMonitors/updateMonitor",
-	async ({ monitorId, monitor }, thunkApi) => {
-		try {
-			const updatedFields = {
-				name: monitor.name,
-				description: monitor.description,
-				interval: monitor.interval,
-				notifications: monitor.notifications,
-				thresholds: monitor.thresholds,
-				secret: monitor.secret,
-			};
-			const res = await networkService.updateMonitor({
-				monitorId,
-				monitor,
-				updatedFields,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteInfrastructureMonitor = createAsyncThunk(
-	"infrastructureMonitors/deleteMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.deleteMonitorById({ monitorId: monitor._id });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const pauseInfrastructureMonitor = createAsyncThunk(
-	"infrastructureMonitors/pauseMonitor",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.pauseMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteInfrastructureMonitorChecksByTeamId = createAsyncThunk(
-	"infrastructureMonitors/deleteChecksByTeamId",
-	async (data, thunkApi) => {
-		try {
-			const { teamId } = data;
-			const res = await networkService.deleteChecksByTeamId({ teamId: teamId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deleteAllInfrastructureMonitors = createAsyncThunk(
-	"infrastructureMonitors/deleteAllMonitors",
-	async (data, thunkApi) => {
-		try {
-			const res = await networkService.deleteAllMonitors();
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-const infrastructureMonitorsSlice = createSlice({
-	name: "infrastructureMonitors",
-	initialState,
-	reducers: {
-		clearInfrastructureMonitorState: (state) => {
-			state.isLoading = false;
-			state.monitorsSummary = [];
-			state.success = null;
-			state.msg = null;
-		},
-	},
-	extraReducers: (builder) => {
-		builder
-			// *****************************************************
-			// Monitors by teamId
-			// *****************************************************
-
-			.addCase(getInfrastructureMonitorsByTeamId.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getInfrastructureMonitorsByTeamId.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.msg;
-				state.monitorsSummary = action.payload.data;
-			})
-			.addCase(getInfrastructureMonitorsByTeamId.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Getting infrastructure monitors failed";
-			})
-
-			// *****************************************************
-			// Create Monitor
-			// *****************************************************
-			.addCase(createInfrastructureMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(createInfrastructureMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(createInfrastructureMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to create infrastructure monitor";
-			})
-			// *****************************************************
-			// Resolve Endpoint
-			// *****************************************************
-			.addCase(checkInfrastructureEndpointResolution.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(checkInfrastructureEndpointResolution.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(checkInfrastructureEndpointResolution.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to check endpoint resolution";
-			})
-			// *****************************************************
-			// Get Monitor By Id
-			// *****************************************************
-			.addCase(getInfrastructureMonitorById.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getInfrastructureMonitorById.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(getInfrastructureMonitorById.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to get infrastructure monitor";
-			})
-			// *****************************************************
-			// update Monitor
-			// *****************************************************
-			.addCase(updateInfrastructureMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(updateInfrastructureMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(updateInfrastructureMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to update infrastructure monitor";
-			})
-
-			// *****************************************************
-			// Delete Monitor
-			// *****************************************************
-			.addCase(deleteInfrastructureMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteInfrastructureMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteInfrastructureMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to delete infrastructure monitor";
-			})
-			// *****************************************************
-			// Delete Monitor checks by Team ID
-			// *****************************************************
-			.addCase(deleteInfrastructureMonitorChecksByTeamId.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteInfrastructureMonitorChecksByTeamId.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteInfrastructureMonitorChecksByTeamId.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to delete monitor checks";
-			})
-			// *****************************************************
-			// Pause Monitor
-			// *****************************************************
-			.addCase(pauseInfrastructureMonitor.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(pauseInfrastructureMonitor.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(pauseInfrastructureMonitor.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to pause infrastructure monitor";
-			})
-			// *****************************************************
-			// Delete all Monitors
-			// *****************************************************
-			.addCase(deleteAllInfrastructureMonitors.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteAllInfrastructureMonitors.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deleteAllInfrastructureMonitors.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload ? action.payload.msg : "Failed to delete all monitors";
-			});
-	},
-});
-
-export const { setInfrastructureMonitors, clearInfrastructureMonitorState } =
-	infrastructureMonitorsSlice.actions;
-
-export default infrastructureMonitorsSlice.reducer;
diff --git a/client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js b/client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
deleted file mode 100644
index 3ed2da13f..000000000
--- a/client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
+++ /dev/null
@@ -1,309 +0,0 @@
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { networkService } from "../../main";
-const initialState = {
-	isLoading: false,
-	monitorsSummary: [],
-	success: null,
-	msg: null,
-};
-
-export const createPageSpeed = createAsyncThunk(
-	"pageSpeedMonitors/createPageSpeed",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.createMonitor({ monitor: monitor });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const checkEndpointResolution = createAsyncThunk(
-	"monitors/checkEndpoint",
-	async (data, thunkApi) => {
-		try {
-			const { monitorURL } = data;
-			const res = await networkService.checkEndpointResolution({
-				monitorURL: monitorURL,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const getPagespeedMonitorById = createAsyncThunk(
-	"monitors/getMonitorById",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.getMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const getPageSpeedByTeamId = createAsyncThunk(
-	"pageSpeedMonitors/getPageSpeedByTeamId",
-	async (_, thunkApi) => {
-		const user = thunkApi.getState().auth.user;
-		try {
-			const res = await networkService.getMonitorsAndSummaryByTeamId({
-				teamId: user.teamId,
-				types: ["pagespeed"],
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const updatePageSpeed = createAsyncThunk(
-	"pageSpeedMonitors/updatePageSpeed",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const updatedFields = {
-				name: monitor.name,
-				description: monitor.description,
-				interval: monitor.interval,
-				notifications: monitor.notifications,
-			};
-			const res = await networkService.updateMonitor({
-				monitorId: monitor._id,
-				updatedFields: updatedFields,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const deletePageSpeed = createAsyncThunk(
-	"pageSpeedMonitors/deletePageSpeed",
-	async (data, thunkApi) => {
-		try {
-			const { monitor } = data;
-			const res = await networkService.deleteMonitorById({ monitorId: monitor._id });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-export const pausePageSpeed = createAsyncThunk(
-	"pageSpeedMonitors/pausePageSpeed",
-	async (data, thunkApi) => {
-		try {
-			const { monitorId } = data;
-			const res = await networkService.pauseMonitorById({ monitorId: monitorId });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-const pageSpeedMonitorSlice = createSlice({
-	name: "pageSpeedMonitor",
-	initialState,
-	reducers: {
-		clearMonitorState: (state) => {
-			state.isLoading = false;
-			state.monitorsSummary = [];
-			state.success = null;
-			state.msg = null;
-		},
-	},
-	extraReducers: (builder) => {
-		builder
-			// *****************************************************
-			// Monitors by teamId
-			// *****************************************************
-
-			.addCase(getPageSpeedByTeamId.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getPageSpeedByTeamId.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.msg;
-				state.monitorsSummary = action.payload.data;
-			})
-			.addCase(getPageSpeedByTeamId.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Getting page speed monitors failed";
-			})
-
-			// *****************************************************
-			.addCase(getPagespeedMonitorById.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getPagespeedMonitorById.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(getPagespeedMonitorById.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to get pagespeed monitor";
-			})
-
-			// *****************************************************
-			// Create Monitor
-			// *****************************************************
-			.addCase(createPageSpeed.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(createPageSpeed.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(createPageSpeed.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to create page speed monitor";
-			})
-			// *****************************************************
-			// Resolve Endpoint
-			// *****************************************************
-			.addCase(checkEndpointResolution.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(checkEndpointResolution.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(checkEndpointResolution.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to check endpoint resolution";
-			})
-			// *****************************************************
-			// Update Monitor
-			// *****************************************************
-			.addCase(updatePageSpeed.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(updatePageSpeed.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(updatePageSpeed.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to update page speed monitor";
-			})
-
-			// *****************************************************
-			// Delete Monitor
-			// *****************************************************
-			.addCase(deletePageSpeed.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deletePageSpeed.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(deletePageSpeed.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to delete page speed monitor";
-			})
-			// *****************************************************
-			// Pause Monitor
-			// *****************************************************
-			.addCase(pausePageSpeed.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(pausePageSpeed.fulfilled, (state, action) => {
-				state.isLoading = false;
-				state.success = action.payload.success;
-				state.msg = action.payload.msg;
-			})
-			.addCase(pausePageSpeed.rejected, (state, action) => {
-				state.isLoading = false;
-				state.success = false;
-				state.msg = action.payload
-					? action.payload.msg
-					: "Failed to pause page speed monitor";
-			});
-	},
-});
-
-export const { setMonitors, clearMonitorState } = pageSpeedMonitorSlice.actions;
-
-export default pageSpeedMonitorSlice.reducer;
diff --git a/client/src/store.js b/client/src/store.js
index f7cbdbde1..309ba52e2 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,7 +1,5 @@
 import { configureStore, combineReducers } from "@reduxjs/toolkit";
 
-import infrastructureMonitorsReducer from "./Features/InfrastructureMonitors/infrastructureMonitorsSlice";
-import pageSpeedMonitorReducer from "./Features/PageSpeedMonitor/pageSpeedMonitorSlice";
 import authReducer from "./Features/Auth/authSlice";
 import uiReducer from "./Features/UI/uiSlice";
 import settingsReducer from "./Features/Settings/settingsSlice";
@@ -22,14 +20,12 @@ const authTransform = createTransform(
 const persistConfig = {
 	key: "root",
 	storage,
-	whitelist: ["auth", "pageSpeed", "ui", "settings"],
+	whitelist: ["auth", "ui", "settings"],
 	transforms: [authTransform],
 };
 
 const rootReducer = combineReducers({
-	infrastructureMonitors: infrastructureMonitorsReducer,
 	auth: authReducer,
-	pageSpeedMonitors: pageSpeedMonitorReducer,
 	ui: uiReducer,
 	settings: settingsReducer,
 });

From deeb6a030c7dfc10197163fb0c804c6a07915e22 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:00:48 +0800
Subject: [PATCH 124/319] remove settings reducer

---
 client/src/Features/Settings/settingsSlice.js | 100 ------------------
 client/src/store.js                           |   4 +-
 2 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 client/src/Features/Settings/settingsSlice.js

diff --git a/client/src/Features/Settings/settingsSlice.js b/client/src/Features/Settings/settingsSlice.js
deleted file mode 100644
index d0725627a..000000000
--- a/client/src/Features/Settings/settingsSlice.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import { networkService } from "../../main";
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-
-const initialState = {
-	isLoading: false,
-	apiBaseUrl: "",
-	logLevel: "debug",
-	pagespeedApiKey: "",
-};
-
-export const getAppSettings = createAsyncThunk(
-	"settings/getSettings",
-	async (data, thunkApi) => {
-		try {
-			const res = await networkService.getAppSettings();
-			return res.data;
-		} catch (error) {
-			if (error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const updateAppSettings = createAsyncThunk(
-	"settings/updateSettings",
-	async ({ settings }, thunkApi) => {
-		try {
-			const parsedSettings = {
-				language: settings.language,
-				pagespeedApiKey: settings.pagespeedApiKey,
-			};
-			const res = await networkService.updateAppSettings({ settings: parsedSettings });
-			return res.data;
-		} catch (error) {
-			if (error.response && error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-const handleGetSettingsFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-	state.apiBaseUrl = action.payload.data.apiBaseUrl;
-	state.logLevel = action.payload.data.logLevel;
-	state.language = action.payload.data.language;
-	state.pagespeedApiKey = action.payload.data.pagespeedApiKey;
-};
-const handleGetSettingsRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to get settings.";
-};
-const handleUpdateSettingsFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-	state.apiBaseUrl = action.payload.data.apiBaseUrl;
-	state.logLevel = action.payload.data.logLevel;
-};
-const handleUpdateSettingsRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to update settings.";
-};
-
-const settingsSlice = createSlice({
-	name: "settings",
-	initialState,
-	extraReducers: (builder) => {
-		builder
-			.addCase(getAppSettings.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(getAppSettings.fulfilled, handleGetSettingsFulfilled)
-			.addCase(getAppSettings.rejected, handleGetSettingsRejected);
-
-		builder
-			.addCase(updateAppSettings.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(updateAppSettings.fulfilled, handleUpdateSettingsFulfilled)
-			.addCase(updateAppSettings.rejected, handleUpdateSettingsRejected);
-	},
-});
-
-export default settingsSlice.reducer;
diff --git a/client/src/store.js b/client/src/store.js
index 309ba52e2..69aa3d50b 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -2,7 +2,6 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit";
 
 import authReducer from "./Features/Auth/authSlice";
 import uiReducer from "./Features/UI/uiSlice";
-import settingsReducer from "./Features/Settings/settingsSlice";
 import storage from "redux-persist/lib/storage";
 import { persistReducer, persistStore, createTransform } from "redux-persist";
 
@@ -20,14 +19,13 @@ const authTransform = createTransform(
 const persistConfig = {
 	key: "root",
 	storage,
-	whitelist: ["auth", "ui", "settings"],
+	whitelist: ["auth", "ui"],
 	transforms: [authTransform],
 };
 
 const rootReducer = combineReducers({
 	auth: authReducer,
 	ui: uiReducer,
-	settings: settingsReducer,
 });
 
 const persistedReducer = persistReducer(persistConfig, rootReducer);

From a63bcb5b4acf0f943389dc4069fd62eb396eb05f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:05:29 +0800
Subject: [PATCH 125/319] add missing finally block

---
 client/src/Components/ActionsMenu/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/Components/ActionsMenu/index.jsx b/client/src/Components/ActionsMenu/index.jsx
index cdd7ecf7d..1b590a471 100644
--- a/client/src/Components/ActionsMenu/index.jsx
+++ b/client/src/Components/ActionsMenu/index.jsx
@@ -43,6 +43,8 @@ const ActionsMenu = ({
 			pauseCallback();
 		} catch (error) {
 			createToast({ body: "Failed to pause monitor." });
+		} finally {
+			setIsLoading(false);
 		}
 	};
 

From 1542cf01a768ea3c470aa1e330d7f174dcd10c06 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:13:22 +0800
Subject: [PATCH 126/319] comment out pagespeed check, TODO later

---
 client/src/Pages/PageSpeed/Monitors/index.jsx | 3 +--
 client/src/Utils/Logger.js                    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index 319b0da21..dc1772227 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -21,7 +21,6 @@ const PageSpeed = () => {
 	const { t } = useTranslation();
 	const isAdmin = useIsAdmin();
 	const { user } = useSelector((state) => state.auth);
-	const { pagespeedApiKey } = useSelector((state) => state.settings);
 
 	const [monitors, monitorsSummary, isLoading, networkError] = useFetchMonitorsByTeamId({
 		teamId: user.teamId,
@@ -60,7 +59,7 @@ const PageSpeed = () => {
 				]}
 				link="/pagespeed/create"
 				isAdmin={isAdmin}
-				showPageSpeedWarning={isAdmin && !pagespeedApiKey}
+				// showPageSpeedWarning={isAdmin && !pagespeedApiKey}
 			/>
 		);
 	}
diff --git a/client/src/Utils/Logger.js b/client/src/Utils/Logger.js
index b22cc0a22..f132ad408 100644
--- a/client/src/Utils/Logger.js
+++ b/client/src/Utils/Logger.js
@@ -6,8 +6,7 @@ class Logger {
 	constructor() {
 		let logLevel = LOG_LEVEL;
 		this.unsubscribe = store.subscribe(() => {
-			const state = store.getState();
-			logLevel = state.settings.logLevel || "debug";
+			logLevel = "debug";
 			this.updateLogLevel(logLevel);
 		});
 	}

From 134e54773621671c9175002548c135058b536e9f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:18:43 +0800
Subject: [PATCH 127/319] remove redux loading state

---
 .../Monitors/Components/MonitorsTableMenu/index.jsx            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
index bce3020a6..15193da3e 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
@@ -1,7 +1,6 @@
 /* TODO I basically copied and pasted this component from the actionsMenu. Check how we can make it reusable */
 
 import { useRef, useState } from "react";
-import { useSelector } from "react-redux";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { createToast } from "../../../../../Utils/toastUtils";
@@ -30,7 +29,6 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const [isDialogOpen, setIsDialogOpen] = useState(false);
 	const theme = useTheme();
-	const { isLoading } = useSelector((state) => state.uptimeMonitors);
 
 	const openMenu = (e) => {
 		e.stopPropagation();
@@ -117,7 +115,6 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => {
 				onCancel={cancelRemove}
 				confirmationButtonLabel="Delete"
 				onConfirm={handleRemove}
-				isLoading={isLoading}
 				modelTitle="modal-delete-monitor"
 				modelDescription="delete-monitor-confirmation"
 			/>

From d9c2f31f4eb4f6fb9b92f09ab93289a8239cab51 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:38:52 +0800
Subject: [PATCH 128/319] remove teamId from uptime monitor requests

---
 client/src/Hooks/monitorHooks.js              | 11 +---
 .../Maintenance/CreateMaintenance/index.jsx   |  1 -
 .../Create/Hooks/useMonitorsFetch.jsx         |  1 -
 client/src/Pages/Uptime/Monitors/index.jsx    |  5 --
 client/src/Utils/NetworkService.js            | 64 ++++---------------
 5 files changed, 16 insertions(+), 66 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index e5c405ac1..5072b5594 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -6,7 +6,7 @@ import { useMonitorUtils } from "./useMonitorUtils";
 import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
-const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) => {
+const useFetchMonitorsWithSummary = ({ types, monitorUpdateTrigger }) => {
 	const [isLoading, setIsLoading] = useState(false);
 	const [monitors, setMonitors] = useState(undefined);
 	const [monitorsSummary, setMonitorsSummary] = useState(undefined);
@@ -17,7 +17,6 @@ const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) =>
 			try {
 				setIsLoading(true);
 				const res = await networkService.getMonitorsWithSummaryByTeamId({
-					teamId,
 					types,
 				});
 				const { monitors, summary } = res?.data?.data ?? {};
@@ -34,12 +33,11 @@ const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) =>
 			}
 		};
 		fetchMonitors();
-	}, [teamId, types, monitorUpdateTrigger]);
+	}, [types, monitorUpdateTrigger]);
 	return [monitors, monitorsSummary, isLoading, networkError];
 };
 
 const useFetchMonitorsWithChecks = ({
-	teamId,
 	types,
 	limit,
 	page,
@@ -61,7 +59,6 @@ const useFetchMonitorsWithChecks = ({
 			try {
 				setIsLoading(true);
 				const res = await networkService.getMonitorsWithChecksByTeamId({
-					teamId,
 					limit,
 					types,
 					page,
@@ -95,7 +92,6 @@ const useFetchMonitorsWithChecks = ({
 		order,
 		page,
 		rowsPerPage,
-		teamId,
 		theme,
 		types,
 		monitorUpdateTrigger,
@@ -104,7 +100,6 @@ const useFetchMonitorsWithChecks = ({
 };
 
 const useFetchMonitorsByTeamId = ({
-	teamId,
 	types,
 	limit,
 	page,
@@ -127,7 +122,6 @@ const useFetchMonitorsByTeamId = ({
 			try {
 				setIsLoading(true);
 				const res = await networkService.getMonitorsByTeamId({
-					teamId,
 					limit,
 					types,
 					page,
@@ -154,7 +148,6 @@ const useFetchMonitorsByTeamId = ({
 		};
 		fetchMonitors();
 	}, [
-		teamId,
 		types,
 		limit,
 		page,
diff --git a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
index f3754c6b0..e71c7112c 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
@@ -135,7 +135,6 @@ const CreateMaintenance = () => {
 			setIsLoading(true);
 			try {
 				const response = await networkService.getMonitorsByTeamId({
-					teamId: user.teamId,
 					limit: null,
 					types: ["http", "ping", "pagespeed", "port"],
 				});
diff --git a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
index 5c523b635..f380bed9a 100644
--- a/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
+++ b/client/src/Pages/StatusPage/Create/Hooks/useMonitorsFetch.jsx
@@ -13,7 +13,6 @@ const useMonitorsFetch = () => {
 		const fetchMonitors = async () => {
 			try {
 				const response = await networkService.getMonitorsByTeamId({
-					teamId: user.teamId,
 					limit: null, // donot return any checks for the monitors
 					types: ["http", "ping", "port"], // status page is available for uptime, ping, and port monitors
 				});
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index e313d7deb..030ce922c 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -64,7 +64,6 @@ CreateMonitorButton.propTypes = {
 
 const UptimeMonitors = () => {
 	// Redux state
-	const { user } = useSelector((state) => state.auth);
 	const rowsPerPage = useSelector((state) => state.ui.monitors.rowsPerPage);
 
 	// Local state
@@ -106,11 +105,8 @@ const UptimeMonitors = () => {
 		setMonitorUpdateTrigger((prev) => !prev);
 	}, []);
 
-	const teamId = user.teamId;
-
 	const [monitors, monitorsSummary, monitorsWithSummaryIsLoading, networkError] =
 		useFetchMonitorsWithSummary({
-			teamId,
 			types: TYPES,
 			monitorUpdateTrigger,
 		});
@@ -140,7 +136,6 @@ const UptimeMonitors = () => {
 		monitorsWithChecksIsLoading,
 		monitorsWithChecksNetworkError,
 	] = useFetchMonitorsWithChecks({
-		teamId,
 		types: effectiveTypes,
 		limit: 25,
 		page: page,
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index f25828c66..e84596b97 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -135,36 +135,6 @@ class NetworkService {
 		});
 	}
 
-	/**
-	 *
-	 * ************************************
-	 * Gets monitors and summary of stats by TeamID
-	 * ************************************
-	 *
-	 * @async
-	 * @param {Object} config - The configuration object.
-	 * @param {string} config.teamId - Team ID
-	 * @param {Array<string>} config.types - Array of monitor types
-	 * @returns {Promise<AxiosResponse>} The response from the axios POST request.
-	 */
-	async getMonitorsSummaryByTeamId(config) {
-		const params = new URLSearchParams();
-
-		if (config.types) {
-			config.types.forEach((type) => {
-				params.append("type", type);
-			});
-		}
-		return this.axiosInstance.get(
-			`/monitors/team/summary/${config.teamId}?${params.toString()}`,
-			{
-				headers: {
-					"Content-Type": "application/json",
-				},
-			}
-		);
-	}
-
 	/**
 	 * ************************************
 	 * Get all uptime monitors for a Team
@@ -184,7 +154,7 @@ class NetworkService {
 	 */
 
 	async getMonitorsByTeamId(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
+		const { limit, types, page, rowsPerPage, filter, field, order } = config;
 		const params = new URLSearchParams();
 
 		if (limit) params.append("limit", limit);
@@ -199,7 +169,7 @@ class NetworkService {
 		if (field) params.append("field", field);
 		if (order) params.append("order", order);
 
-		return this.axiosInstance.get(`/monitors/team/${teamId}?${params.toString()}`, {
+		return this.axiosInstance.get(`/monitors/team?${params.toString()}`, {
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -949,7 +919,7 @@ class NetworkService {
 	// Fetch monitors with summary by TeamID
 	// ************************************
 	async getMonitorsWithSummaryByTeamId(config) {
-		const { teamId, types } = config;
+		const { types } = config;
 		const params = new URLSearchParams();
 
 		if (types) {
@@ -958,21 +928,18 @@ class NetworkService {
 			});
 		}
 
-		return this.axiosInstance.get(
-			`/monitors/summary/team/${teamId}?${params.toString()}`,
-			{
-				headers: {
-					"Content-Type": "application/json",
-				},
-			}
-		);
+		return this.axiosInstance.get(`/monitors/summary/team?${params.toString()}`, {
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
 	}
 
 	// ************************************
 	// Fetch monitors with checks by TeamID
 	// ************************************
 	async getMonitorsWithChecksByTeamId(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
+		const { limit, types, page, rowsPerPage, filter, field, order } = config;
 		const params = new URLSearchParams();
 
 		if (limit) params.append("limit", limit);
@@ -987,14 +954,11 @@ class NetworkService {
 		if (field) params.append("field", field);
 		if (order) params.append("order", order);
 
-		return this.axiosInstance.get(
-			`/monitors/team/${teamId}/with-checks?${params.toString()}`,
-			{
-				headers: {
-					"Content-Type": "application/json",
-				},
-			}
-		);
+		return this.axiosInstance.get(`/monitors/team/with-checks?${params.toString()}`, {
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
 	}
 
 	// ************************************

From afece4df650667c999313615e88af608bd3613d1 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:46:06 +0800
Subject: [PATCH 129/319] update routes, validation

---
 client/src/Components/Dialog/index.jsx                    | 2 +-
 client/src/Components/StatBox/index.jsx                   | 4 ++--
 .../Monitors/Components/MonitorsTable/index.jsx           | 7 ++++---
 client/src/Pages/Infrastructure/Monitors/index.jsx        | 5 +----
 client/src/Pages/PageSpeed/Monitors/index.jsx             | 3 ---
 server/db/mongo/modules/monitorModule.js                  | 7 ++++---
 server/routes/monitorRoute.js                             | 8 ++++----
 server/validation/joi.js                                  | 4 +---
 8 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/client/src/Components/Dialog/index.jsx b/client/src/Components/Dialog/index.jsx
index e07597df4..678eb8721 100644
--- a/client/src/Components/Dialog/index.jsx
+++ b/client/src/Components/Dialog/index.jsx
@@ -57,7 +57,7 @@ Dialog.propTypes = {
 	onCancel: PropTypes.func.isRequired,
 	confirmationButtonLabel: PropTypes.string.isRequired,
 	onConfirm: PropTypes.func.isRequired,
-	isLoading: PropTypes.bool.isRequired,
+	isLoading: PropTypes.bool,
 };
 
 export default Dialog;
diff --git a/client/src/Components/StatBox/index.jsx b/client/src/Components/StatBox/index.jsx
index 93fa46c2b..7d093de60 100644
--- a/client/src/Components/StatBox/index.jsx
+++ b/client/src/Components/StatBox/index.jsx
@@ -136,8 +136,8 @@ const StatBox = ({
 };
 
 StatBox.propTypes = {
-	heading: PropTypes.string.isRequired,
-	subHeading: PropTypes.node.isRequired,
+	heading: PropTypes.string,
+	subHeading: PropTypes.node,
 	gradient: PropTypes.bool,
 	status: PropTypes.string,
 	sx: PropTypes.object,
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 761ecaa0e..7a5db231f 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -15,7 +15,7 @@ import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 
-const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete }) => {
+const MonitorsTable = ({ isLoading, monitors, isAdmin, handleActionMenuDelete }) => {
 	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -86,6 +86,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 					monitor={row}
 					isAdmin={isAdmin}
 					updateCallback={handleActionMenuDelete}
+					isLoading={isLoading}
 				/>
 			),
 		},
@@ -120,7 +121,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 
 	return (
 		<DataTable
-			shouldRender={shouldRender}
+			shouldRender={!isLoading}
 			headers={headers}
 			data={data}
 			config={{
@@ -140,7 +141,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 };
 
 MonitorsTable.propTypes = {
-	shouldRender: PropTypes.bool,
+	isLoading: PropTypes.bool,
 	monitors: PropTypes.array,
 	isAdmin: PropTypes.bool,
 	handleActionMenuDelete: PropTypes.func,
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 6d49f64a7..6b726309c 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -11,7 +11,6 @@ import Filter from "./Components/Filters";
 // Utils
 import { useTheme } from "@emotion/react";
 import { useState } from "react";
-import { useSelector } from "react-redux";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useTranslation } from "react-i18next";
 import { useFetchMonitorsByTeamId } from "../../../Hooks/monitorHooks";
@@ -21,7 +20,6 @@ const BREADCRUMBS = [{ name: `infrastructure`, path: "/infrastructure" }];
 
 const InfrastructureMonitors = () => {
 	// Redux state
-	const { user } = useSelector((state) => state.auth);
 
 	// Local state
 	const [page, setPage] = useState(0);
@@ -56,7 +54,6 @@ const InfrastructureMonitors = () => {
 	const field = toFilterStatus !== undefined ? "status" : undefined;
 
 	const [monitors, summary, isLoading, networkError] = useFetchMonitorsByTeamId({
-		teamId: user.teamId,
 		limit: 1,
 		types: TYPES,
 		page,
@@ -118,7 +115,7 @@ const InfrastructureMonitors = () => {
 				/>
 			</Stack>
 			<MonitorsTable
-				shouldRender={!isLoading}
+				isLoading={isLoading}
 				monitors={monitors}
 				isAdmin={isAdmin}
 				handleActionMenuDelete={handleActionMenuDelete}
diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index dc1772227..65e43f2ec 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -9,7 +9,6 @@ import GenericFallback from "../../../Components/GenericFallback";
 
 // Utils
 import { useTheme } from "@emotion/react";
-import { useSelector } from "react-redux";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useTranslation } from "react-i18next";
 import { useFetchMonitorsByTeamId } from "../../../Hooks/monitorHooks";
@@ -20,10 +19,8 @@ const PageSpeed = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const isAdmin = useIsAdmin();
-	const { user } = useSelector((state) => state.auth);
 
 	const [monitors, monitorsSummary, isLoading, networkError] = useFetchMonitorsByTeamId({
-		teamId: user.teamId,
 		limit: 10,
 		types: TYPES,
 		page: null,
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 3d9adab39..b6044f2c9 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -519,7 +519,8 @@ const getMonitorsByTeamId = async (req) => {
 		order = "asc";
 	}
 	// Build match stage
-	const matchStage = { teamId: ObjectId.createFromHexString(req.params.teamId) };
+	const teamId = req.user.teamId;
+	const matchStage = { teamId: ObjectId.createFromHexString(teamId) };
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
@@ -560,7 +561,7 @@ const getMonitorsByTeamId = async (req) => {
 const getMonitorsAndSummaryByTeamId = async (req) => {
 	try {
 		const { type } = req.query;
-		const teamId = ObjectId.createFromHexString(req.params.teamId);
+		const teamId = ObjectId.createFromHexString(req.user.teamId);
 		const matchStage = { teamId };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
@@ -594,7 +595,7 @@ const getMonitorsWithChecksByTeamId = async (req) => {
 			field = "name";
 			order = "asc";
 		}
-		const teamId = ObjectId.createFromHexString(req.params.teamId);
+		const teamId = ObjectId.createFromHexString(req.user.teamId);
 		// Build match stage
 		const matchStage = { teamId };
 		if (type !== undefined) {
diff --git a/server/routes/monitorRoute.js b/server/routes/monitorRoute.js
index 6d1db90ad..0dabab407 100755
--- a/server/routes/monitorRoute.js
+++ b/server/routes/monitorRoute.js
@@ -35,17 +35,17 @@ class MonitorRoutes {
 				fetchMonitorCertificate
 			);
 		});
+		this.router.get("/team", this.monitorController.getMonitorsByTeamId);
+
 		this.router.get("/:monitorId", this.monitorController.getMonitorById);
 
-		this.router.get("/team/:teamId", this.monitorController.getMonitorsByTeamId);
-
 		this.router.get(
-			"/summary/team/:teamId",
+			"/summary/team",
 			this.monitorController.getMonitorsAndSummaryByTeamId
 		);
 
 		this.router.get(
-			"/team/:teamId/with-checks",
+			"/team/with-checks",
 			this.monitorController.getMonitorsWithChecksByTeamId
 		);
 
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 271cd2d21..aba7118d1 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -126,9 +126,7 @@ const getMonitorByIdQueryValidation = joi.object({
 	normalize: joi.boolean(),
 });
 
-const getMonitorsByTeamIdParamValidation = joi.object({
-	teamId: joi.string().required(),
-});
+const getMonitorsByTeamIdParamValidation = joi.object({});
 
 const getMonitorsByTeamIdQueryValidation = joi.object({
 	limit: joi.number(),

From 57f4db8d370daac1cf0f5bccad3adc0740fe6a2a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 10:52:05 +0800
Subject: [PATCH 130/319] remove reference to state

---
 client/src/Pages/Uptime/Create/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index f481e81ac..184beffe5 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -28,7 +28,6 @@ import { useCreateMonitor } from "../../../Hooks/monitorHooks";
 const CreateMonitor = () => {
 	// Redux state
 	const { user } = useSelector((state) => state.auth);
-	const { isLoading } = useSelector((state) => state.uptimeMonitors);
 
 	// Local state
 	const [errors, setErrors] = useState({});
@@ -467,7 +466,7 @@ const CreateMonitor = () => {
 						variant="contained"
 						color="accent"
 						disabled={!Object.values(errors).every((value) => value === undefined)}
-						loading={isLoading || isCreating}
+						loading={isCreating}
 					>
 						{t("createMonitor")}
 					</Button>

From e53901f6fd5bf7dafc4b20d21df60dfd5113abd7 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 11:07:37 +0800
Subject: [PATCH 131/319] add a checkbox to enable/disable advanced settings

---
 client/src/Pages/Uptime/Create/index.jsx | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 184beffe5..7d4ff12bf 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -13,10 +13,10 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Switch from "@mui/material/Switch";
 import FormControlLabel from "@mui/material/FormControlLabel";
+import Checkbox from "../../../Components/Inputs/Checkbox";
 
 // Utils
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
 import { useState } from "react";
 import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
@@ -38,6 +38,8 @@ const CreateMonitor = () => {
 		name: "",
 		type: "http",
 		matchMethod: "equal",
+		expectedValue: "",
+		jsonPath: "",
 		notifications: [],
 		interval: 1,
 		ignoreTlsErrors: false,
@@ -46,7 +48,6 @@ const CreateMonitor = () => {
 	// Setup
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const navigate = useNavigate();
 	const [notifications, notificationsAreLoading, error] = useGetNotificationsByTeamId();
 	const [createMonitor, isCreating] = useCreateMonitor();
 
@@ -147,7 +148,8 @@ const CreateMonitor = () => {
 			notifications: monitor.notifications,
 		};
 
-		await createMonitor({ monitor: form, redirect: "/uptime" });
+		console.log(JSON.stringify(form, null, 2));
+		// await createMonitor({ monitor: form, redirect: "/uptime" });
 	};
 
 	const onChange = (event) => {
@@ -156,6 +158,12 @@ const CreateMonitor = () => {
 		if (name === "ignoreTlsErrors") {
 			newValue = checked;
 		}
+
+		if (name === "useAdvancedMatching") {
+			setUseAdvancedMatching(checked);
+			return;
+		}
+
 		const updatedMonitor = {
 			...monitor,
 			[name]: newValue,
@@ -393,7 +401,13 @@ const CreateMonitor = () => {
 							onChange={onChange}
 							items={SELECT_VALUES}
 						/>
-						{monitor.type === "http" && (
+						<Checkbox
+							name="useAdvancedMatching"
+							label={t("advancedMatching")}
+							isChecked={useAdvancedMatching}
+							onChange={onChange}
+						/>
+						{monitor.type === "http" && useAdvancedMatching && (
 							<>
 								<Select
 									name="matchMethod"

From 024096631fd156dc3f3ad8e9172db0233d42c385 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 11:15:42 +0800
Subject: [PATCH 132/319] remove team id from notificaitons

---
 client/src/Hooks/useNotifications.js     | 7 ++-----
 client/src/Pages/Notifications/index.jsx | 1 -
 client/src/Utils/NetworkService.js       | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 54e3d1bd9..b269c5edc 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -37,15 +37,12 @@ const useGetNotificationsByTeamId = (updateTrigger) => {
 	const [notifications, setNotifications] = useState([]);
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState(null);
-	const { user } = useSelector((state) => state.auth);
 	const { t } = useTranslation();
 
 	const getNotifications = useCallback(async () => {
 		try {
 			setIsLoading(true);
-			const response = await networkService.getNotificationsByTeamId({
-				teamId: user.teamId,
-			});
+			const response = await networkService.getNotificationsByTeamId();
 			setNotifications(response?.data?.data ?? []);
 		} catch (error) {
 			setError(error);
@@ -55,7 +52,7 @@ const useGetNotificationsByTeamId = (updateTrigger) => {
 		} finally {
 			setIsLoading(false);
 		}
-	}, [user.teamId]);
+	}, [t]);
 
 	useEffect(() => {
 		getNotifications();
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index 9ad5f1578..ce5cbb547 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -17,7 +17,6 @@ import {
 	useDeleteNotification,
 } from "../../Hooks/useNotifications";
 import { useTranslation } from "react-i18next";
-import { useParams } from "react-router-dom";
 
 const Notifications = () => {
 	const navigate = useNavigate();
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index e84596b97..1ab56d9ad 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -996,8 +996,7 @@ class NetworkService {
 	}
 
 	async getNotificationsByTeamId(config) {
-		const { teamId } = config;
-		return this.axiosInstance.get(`/notifications/team/${teamId}`);
+		return this.axiosInstance.get(`/notifications/team`);
 	}
 
 	async deleteNotificationById(config) {

From 4168c8673471357bf9d421d35199a33702be79d0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 11:47:29 +0800
Subject: [PATCH 133/319] remove team id from monitor controller/db methods,
 standardize parameters

---
 client/src/Hooks/useBulkMonitors.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/Hooks/useBulkMonitors.js b/client/src/Hooks/useBulkMonitors.js
index a834f0140..ba9086dac 100644
--- a/client/src/Hooks/useBulkMonitors.js
+++ b/client/src/Hooks/useBulkMonitors.js
@@ -9,8 +9,6 @@ export const useBulkMonitors = () => {
 
 		const formData = new FormData();
 		formData.append("csvFile", file);
-		formData.append("userId", user._id);
-		formData.append("teamId", user.teamId);
 
 		try {
 			const response = await networkService.createBulkMonitors(formData);

From b9fbfd2a2560a4609783560e8f06de4afc973c1f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 11:49:03 +0800
Subject: [PATCH 134/319] remove team id from monitor controller/db methods,
 standardize parameters

---
 server/controllers/monitorController.js       | 106 ++++++++++++------
 server/controllers/notificationController.js  |   2 +-
 server/db/mongo/modules/diagnosticModule.js   |   3 -
 server/db/mongo/modules/monitorModule.js      |  97 ++++++++++------
 .../db/mongo/modules/monitorModuleQueries.js  |  98 ----------------
 server/routes/notificationRoute.js            |   5 +-
 6 files changed, 138 insertions(+), 173 deletions(-)

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 00b525125..4262b9818 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -78,7 +78,14 @@ class MonitorController {
 
 	getUptimeDetailsById = async (req, res, next) => {
 		try {
-			const data = await this.db.getUptimeDetailsById(req);
+			const { monitorId } = req.params;
+			const { dateRange, normalize } = req.query;
+
+			const data = await this.db.getUptimeDetailsById({
+				monitorId,
+				dateRange,
+				normalize,
+			});
 			return res.success({
 				msg: this.stringService.monitorGetByIdSuccess,
 				data,
@@ -107,7 +114,17 @@ class MonitorController {
 		}
 
 		try {
-			const monitorStats = await this.db.getMonitorStatsById(req);
+			let { limit, sortOrder, dateRange, numToDisplay, normalize } = req.query;
+			const { monitorId } = req.params;
+
+			const monitorStats = await this.db.getMonitorStatsById({
+				monitorId,
+				limit,
+				sortOrder,
+				dateRange,
+				numToDisplay,
+				normalize,
+			});
 			return res.success({
 				msg: this.stringService.monitorStatsById,
 				data: monitorStats,
@@ -135,7 +152,9 @@ class MonitorController {
 			return;
 		}
 		try {
-			const monitor = await this.db.getHardwareDetailsById(req);
+			const { monitorId } = req.params;
+			const { dateRange } = req.query;
+			const monitor = await this.db.getHardwareDetailsById({ monitorId, dateRange });
 			return res.success({
 				msg: this.stringService.monitorGetByIdSuccess,
 				data: monitor,
@@ -219,7 +238,7 @@ class MonitorController {
 		}
 
 		try {
-			const monitor = await this.db.createMonitor(req, res);
+			const monitor = await this.db.createMonitor(req.body);
 
 			// Add monitor to job queue
 			this.jobQueue.addJob(monitor._id, monitor);
@@ -261,10 +280,10 @@ class MonitorController {
 				throw new Error("File is empty");
 			}
 
-			const { userId, teamId } = req.body;
+			const { _id, teamId } = req.user;
 
-			if (!userId || !teamId) {
-				throw new Error("Missing userId or teamId in form data");
+			if (!_id || !teamId) {
+				throw new Error("Missing userId or teamId");
 			}
 
 			// Get file buffer from memory and convert to string
@@ -299,7 +318,7 @@ class MonitorController {
 						}
 
 						const enrichedData = data.map((monitor) => ({
-							userId,
+							userId: _id,
 							teamId,
 							...monitor,
 							description: monitor.description || monitor.name || monitor.url,
@@ -388,7 +407,8 @@ class MonitorController {
 		}
 
 		try {
-			const monitor = await this.db.deleteMonitor(req, res, next);
+			const monitorId = req.params.monitorId;
+			const monitor = await this.db.deleteMonitor({ monitorId });
 			await this.jobQueue.deleteJob(monitor);
 			await this.db.deleteStatusPagesByMonitorId(monitor._id);
 			return res.success({ msg: this.stringService.monitorDelete });
@@ -410,9 +430,7 @@ class MonitorController {
 	 */
 	deleteAllMonitors = async (req, res, next) => {
 		try {
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { teamId } = jwt.verify(token, jwtSecret);
+			const { teamId } = req.user;
 			const { monitors, deletedCount } = await this.db.deleteAllMonitors(teamId);
 			await Promise.all(
 				monitors.map(async (monitor) => {
@@ -494,18 +512,8 @@ class MonitorController {
 		}
 
 		try {
-			const monitor = await Monitor.findOneAndUpdate(
-				{ _id: req.params.monitorId },
-				[
-					{
-						$set: {
-							isActive: { $not: "$isActive" },
-							status: "$$REMOVE",
-						},
-					},
-				],
-				{ new: true }
-			);
+			const monitorId = req.params.monitorId;
+			const monitor = await this.db.pauseMonitor({ monitorId });
 			monitor.isActive === true
 				? await this.jobQueue.resumeJob(monitor._id, monitor)
 				: await this.jobQueue.pauseJob(monitor);
@@ -534,9 +542,7 @@ class MonitorController {
 	 */
 	addDemoMonitors = async (req, res, next) => {
 		try {
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { _id, teamId } = jwt.verify(token, jwtSecret);
+			const { _id, teamId } = req.user;
 			const demoMonitors = await this.db.addDemoMonitors(_id, teamId);
 			await Promise.all(
 				demoMonitors.map((monitor) => this.jobQueue.addJob(monitor._id, monitor))
@@ -603,7 +609,19 @@ class MonitorController {
 		}
 
 		try {
-			const monitors = await this.db.getMonitorsByTeamId(req);
+			let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
+			const teamId = req.user.teamId;
+
+			const monitors = await this.db.getMonitorsByTeamId({
+				limit,
+				type,
+				page,
+				rowsPerPage,
+				filter,
+				field,
+				order,
+				teamId,
+			});
 			return res.success({
 				msg: this.stringService.monitorGetByTeamId,
 				data: monitors,
@@ -622,7 +640,15 @@ class MonitorController {
 		}
 
 		try {
-			const result = await this.db.getMonitorsAndSummaryByTeamId(req);
+			const { explain } = req;
+			const { type } = req.query;
+			const { teamId } = req.user;
+
+			const result = await this.db.getMonitorsAndSummaryByTeamId({
+				type,
+				explain,
+				teamId,
+			});
 			return res.success({
 				msg: "OK", // TODO
 				data: result,
@@ -641,7 +667,21 @@ class MonitorController {
 		}
 
 		try {
-			const result = await this.db.getMonitorsWithChecksByTeamId(req);
+			const { explain } = req;
+			let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
+			const { teamId } = req.user;
+
+			const result = await this.db.getMonitorsWithChecksByTeamId({
+				limit,
+				type,
+				page,
+				rowsPerPage,
+				filter,
+				field,
+				order,
+				teamId,
+				explain,
+			});
 			return res.success({
 				msg: "OK", // TODO
 				data: result,
@@ -653,11 +693,7 @@ class MonitorController {
 
 	seedDb = async (req, res, next) => {
 		try {
-			const { type } = req.body;
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { _id, teamId } = jwt.verify(token, jwtSecret);
-
+			const { _id, teamId } = req.user;
 			await seedDb(_id, teamId);
 			res.success({ msg: "Database seeded" });
 		} catch (error) {
diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 4efcf4988..a9c399901 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -140,7 +140,7 @@ class NotificationController {
 
 	getNotificationsByTeamId = async (req, res, next) => {
 		try {
-			const notifications = await this.db.getNotificationsByTeamId(req.params.teamId);
+			const notifications = await this.db.getNotificationsByTeamId(req.user.teamId);
 			return res.success({
 				msg: "Notifications fetched successfully",
 				data: notifications,
diff --git a/server/db/mongo/modules/diagnosticModule.js b/server/db/mongo/modules/diagnosticModule.js
index af6d83764..7a51ad193 100755
--- a/server/db/mongo/modules/diagnosticModule.js
+++ b/server/db/mongo/modules/diagnosticModule.js
@@ -6,10 +6,7 @@ import {
 	buildMonitorSummaryByTeamIdPipeline,
 	buildMonitorsByTeamIdPipeline,
 	buildFilteredMonitorsByTeamIdPipeline,
-	buildDePINDetailsByDateRange,
-	buildDePINLatestChecks,
 } from "./monitorModuleQueries.js";
-import { getDateRange } from "./monitorModule.js";
 
 const getMonitorsByTeamIdExecutionStats = async (req) => {
 	try {
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index b6044f2c9..700625b73 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -3,7 +3,6 @@ import MonitorStats from "../../models/MonitorStats.js";
 import Check from "../../models/Check.js";
 import PageSpeedCheck from "../../models/PageSpeedCheck.js";
 import HardwareCheck from "../../models/HardwareCheck.js";
-import Notification from "../../models/Notification.js";
 import { NormalizeData, NormalizeDataUptimeDetails } from "../../../utils/dataUtils.js";
 import ServiceRegistry from "../../../service/serviceRegistry.js";
 import StringService from "../../../service/stringService.js";
@@ -15,14 +14,11 @@ import { ObjectId } from "mongodb";
 import {
 	buildUptimeDetailsPipeline,
 	buildHardwareDetailsPipeline,
-	buildMonitorStatsPipeline,
 	buildMonitorSummaryByTeamIdPipeline,
 	buildMonitorsByTeamIdPipeline,
 	buildMonitorsAndSummaryByTeamIdPipeline,
 	buildMonitorsWithChecksByTeamIdPipeline,
 	buildFilteredMonitorsByTeamIdPipeline,
-	buildDePINDetailsByDateRange,
-	buildDePINLatestChecks,
 } from "./monitorModuleQueries.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -335,11 +331,9 @@ const calculateGroupStats = (group) => {
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const getUptimeDetailsById = async (req) => {
+const getUptimeDetailsById = async ({ monitorId, dateRange, normalize }) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	try {
-		const { monitorId } = req.params;
-		const { dateRange, normalize } = req.query;
 		const dates = getDateRange(dateRange);
 		const formatLookup = {
 			recent: "%Y-%m-%dT%H:%M:00Z",
@@ -392,11 +386,16 @@ const getUptimeDetailsById = async (req) => {
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const getMonitorStatsById = async (req) => {
+const getMonitorStatsById = async ({
+	monitorId,
+	limit,
+	sortOrder,
+	dateRange,
+	numToDisplay,
+	normalize,
+}) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	try {
-		const { monitorId } = req.params;
-
 		// Get monitor, if we can't find it, abort with error
 		const monitor = await Monitor.findById(monitorId);
 		if (monitor === null || monitor === undefined) {
@@ -404,7 +403,6 @@ const getMonitorStatsById = async (req) => {
 		}
 
 		// Get query params
-		let { limit, sortOrder, dateRange, numToDisplay, normalize } = req.query;
 		const sort = sortOrder === "asc" ? 1 : -1;
 
 		// Get Checks for monitor in date range requested
@@ -454,10 +452,8 @@ const getMonitorStatsById = async (req) => {
 	}
 };
 
-const getHardwareDetailsById = async (req) => {
+const getHardwareDetailsById = async ({ monitorId, dateRange }) => {
 	try {
-		const { monitorId } = req.params;
-		const { dateRange } = req.query;
 		const monitor = await Monitor.findById(monitorId);
 		const dates = getDateRange(dateRange);
 		const formatLookup = {
@@ -509,8 +505,16 @@ const getMonitorById = async (monitorId) => {
 	}
 };
 
-const getMonitorsByTeamId = async (req) => {
-	let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
+const getMonitorsByTeamId = async ({
+	limit,
+	type,
+	page,
+	rowsPerPage,
+	filter,
+	field,
+	order,
+	teamId,
+}) => {
 	limit = parseInt(limit);
 	page = parseInt(page);
 	rowsPerPage = parseInt(rowsPerPage);
@@ -519,7 +523,6 @@ const getMonitorsByTeamId = async (req) => {
 		order = "asc";
 	}
 	// Build match stage
-	const teamId = req.user.teamId;
 	const matchStage = { teamId: ObjectId.createFromHexString(teamId) };
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
@@ -558,16 +561,15 @@ const getMonitorsByTeamId = async (req) => {
 	return { summary, monitors, filteredMonitors: normalizedFilteredMonitors };
 };
 
-const getMonitorsAndSummaryByTeamId = async (req) => {
+const getMonitorsAndSummaryByTeamId = async ({ type, explain, teamId }) => {
 	try {
-		const { type } = req.query;
-		const teamId = ObjectId.createFromHexString(req.user.teamId);
-		const matchStage = { teamId };
+		const parsedTeamId = ObjectId.createFromHexString(teamId);
+		const matchStage = { teamId: parsedTeamId };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
 		}
 
-		if (req.explain === true) {
+		if (explain === true) {
 			return Monitor.aggregate(
 				buildMonitorsAndSummaryByTeamIdPipeline({ matchStage })
 			).explain("executionStats");
@@ -585,9 +587,18 @@ const getMonitorsAndSummaryByTeamId = async (req) => {
 	}
 };
 
-const getMonitorsWithChecksByTeamId = async (req) => {
+const getMonitorsWithChecksByTeamId = async ({
+	limit,
+	type,
+	page,
+	rowsPerPage,
+	filter,
+	field,
+	order,
+	teamId,
+	explain,
+}) => {
 	try {
-		let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
 		limit = parseInt(limit);
 		page = parseInt(page);
 		rowsPerPage = parseInt(rowsPerPage);
@@ -595,14 +606,14 @@ const getMonitorsWithChecksByTeamId = async (req) => {
 			field = "name";
 			order = "asc";
 		}
-		const teamId = ObjectId.createFromHexString(req.user.teamId);
+		const parsedTeamId = ObjectId.createFromHexString(teamId);
 		// Build match stage
-		const matchStage = { teamId };
+		const matchStage = { teamId: parsedTeamId };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
 		}
 
-		if (req.explain === true) {
+		if (explain === true) {
 			return Monitor.aggregate(
 				buildMonitorsWithChecksByTeamIdPipeline({
 					matchStage,
@@ -654,9 +665,9 @@ const getMonitorsWithChecksByTeamId = async (req) => {
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const createMonitor = async (req, res) => {
+const createMonitor = async (body) => {
 	try {
-		const monitor = new Monitor({ ...req.body });
+		const monitor = new Monitor({ ...body });
 		const saved = await monitor.save();
 		return saved;
 	} catch (error) {
@@ -695,10 +706,8 @@ const createBulkMonitors = async (req) => {
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const deleteMonitor = async (req, res) => {
+const deleteMonitor = async ({ monitorId }) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
-
-	const monitorId = req.params.monitorId;
 	try {
 		const monitor = await Monitor.findByIdAndDelete(monitorId);
 		if (!monitor) {
@@ -789,6 +798,29 @@ const addDemoMonitors = async (userId, teamId) => {
 	}
 };
 
+const pauseMonitor = async ({ monitorId }) => {
+	try {
+		const monitor = await Monitor.findOneAndUpdate(
+			{ _id: monitorId },
+			[
+				{
+					$set: {
+						isActive: { $not: "$isActive" },
+						status: "$$REMOVE",
+					},
+				},
+			],
+			{ new: true }
+		);
+
+		return monitor;
+	} catch (error) {
+		error.service = SERVICE_NAME;
+		error.method = "pauseMonitor";
+		throw error;
+	}
+};
+
 export {
 	getAllMonitors,
 	getAllMonitorsWithUptimeStats,
@@ -806,6 +838,7 @@ export {
 	editMonitor,
 	addDemoMonitors,
 	getHardwareDetailsById,
+	pauseMonitor,
 };
 
 // Helper functions
diff --git a/server/db/mongo/modules/monitorModuleQueries.js b/server/db/mongo/modules/monitorModuleQueries.js
index f17eff2c2..35ddb8478 100755
--- a/server/db/mongo/modules/monitorModuleQueries.js
+++ b/server/db/mongo/modules/monitorModuleQueries.js
@@ -902,102 +902,6 @@ const buildGetMonitorsByTeamIdPipeline = (req) => {
 	];
 };
 
-const buildDePINDetailsByDateRange = (monitor, dates, dateString) => {
-	return [
-		{
-			$match: {
-				monitorId: monitor._id,
-				updatedAt: { $gte: dates.start, $lte: dates.end },
-			},
-		},
-		{
-			$project: {
-				_id: 0,
-				city: 1,
-				updatedAt: 1,
-				"location.lat": 1,
-				"location.lng": 1,
-				responseTime: 1,
-			},
-		},
-		{
-			$facet: {
-				groupedMapChecks: [
-					{
-						$group: {
-							_id: {
-								city: "$city",
-								lat: "$location.lat",
-								lng: "$location.lng",
-							},
-
-							avgResponseTime: {
-								$avg: "$responseTime",
-							},
-						},
-					},
-				],
-				groupedChecks: [
-					{
-						$group: {
-							_id: {
-								date: {
-									$dateToString: {
-										format: dateString,
-										date: "$updatedAt",
-									},
-								},
-							},
-							avgResponseTime: {
-								$avg: "$responseTime",
-							},
-						},
-					},
-					{
-						$sort: {
-							"_id.date": 1,
-						},
-					},
-				],
-			},
-		},
-		{
-			$project: {
-				groupedMapChecks: "$groupedMapChecks",
-				groupedChecks: "$groupedChecks",
-			},
-		},
-	];
-};
-
-const buildDePINLatestChecks = (monitor) => {
-	return [
-		{
-			$match: {
-				monitorId: monitor._id,
-			},
-		},
-		{
-			$sort: { updatedAt: -1 },
-		},
-		{
-			$limit: 5,
-		},
-		{
-			$project: {
-				responseTime: 1,
-				city: 1,
-				countryCode: 1,
-				uptBurnt: {
-					$toString: {
-						$ifNull: ["$uptBurnt", 0],
-					},
-				},
-			},
-		},
-	];
-};
-
 export {
 	buildUptimeDetailsPipeline,
 	buildHardwareDetailsPipeline,
@@ -1008,6 +912,4 @@ export {
 	buildMonitorsAndSummaryByTeamIdPipeline,
 	buildMonitorsWithChecksByTeamIdPipeline,
 	buildFilteredMonitorsByTeamIdPipeline,
-	buildDePINDetailsByDateRange,
-	buildDePINLatestChecks,
 };
diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index 064cd4b5d..ace8bdae1 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -17,10 +17,7 @@ class NotificationRoutes {
 
 		this.router.post("/", this.notificationController.createNotification);
 
-		this.router.get(
-			"/team/:teamId",
-			this.notificationController.getNotificationsByTeamId
-		);
+		this.router.get("/team", this.notificationController.getNotificationsByTeamId);
 
 		this.router.delete("/:id", this.notificationController.deleteNotification);
 

From cedd660fd99ccf0afbecb8c9414531eb1fa758de Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 11:52:10 +0800
Subject: [PATCH 135/319] get teamID from req.user

---
 server/controllers/maintenanceWindowController.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/server/controllers/maintenanceWindowController.js b/server/controllers/maintenanceWindowController.js
index a11f957ed..20077cc65 100755
--- a/server/controllers/maintenanceWindowController.js
+++ b/server/controllers/maintenanceWindowController.js
@@ -7,8 +7,6 @@ import {
 	getMaintenanceWindowsByTeamIdQueryValidation,
 	deleteMaintenanceWindowByIdParamValidation,
 } from "../validation/joi.js";
-import jwt from "jsonwebtoken";
-import { getTokenFromHeaders } from "../utils/utils.js";
 import { handleValidationError, handleError } from "./controllerUtils.js";
 
 const SERVICE_NAME = "maintenanceWindowController";
@@ -28,9 +26,7 @@ class MaintenanceWindowController {
 			return;
 		}
 		try {
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { teamId } = jwt.verify(token, jwtSecret);
+			const { teamId } = req.user;
 			const monitorIds = req.body.monitors;
 			const dbTransactions = monitorIds.map((monitorId) => {
 				return this.db.createMaintenanceWindow({
@@ -81,9 +77,7 @@ class MaintenanceWindowController {
 		}
 
 		try {
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { teamId } = jwt.verify(token, jwtSecret);
+			const { teamId } = req.user;
 			const maintenanceWindows = await this.db.getMaintenanceWindowsByTeamId(
 				teamId,
 				req.query

From 9da3d3ef552c74a86834ca09bd6234fe8f42bd08 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 12:03:32 +0800
Subject: [PATCH 136/319] remove teamId from checks

---
 client/src/Utils/NetworkService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 1ab56d9ad..f7ebdc3f4 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -272,7 +272,7 @@ class NetworkService {
 	 * @returns {Promise<AxiosResponse>} The response from the axios DELETE request.
 	 */
 	async deleteChecksByTeamId(config) {
-		return this.axiosInstance.delete(`/checks/team/${config.teamId}`, {
+		return this.axiosInstance.delete(`/checks/team`, {
 			headers: {
 				"Content-Type": "application/json",
 			},
@@ -595,7 +595,7 @@ class NetworkService {
 		if (config.page) params.append("page", config.page);
 		if (config.rowsPerPage) params.append("rowsPerPage", config.rowsPerPage);
 		if (config.status !== undefined) params.append("status", config.status);
-		return this.axiosInstance.get(`/checks/team/${config.teamId}?${params.toString()}`);
+		return this.axiosInstance.get(`/checks/team?${params.toString()}`);
 	};
 
 	/**

From d2233d2e3eb89e469854db82d16f73e6958e0181 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 12:04:39 +0800
Subject: [PATCH 137/319] remove teamId from checks

---
 server/controllers/checkController.js  | 31 +++++++++++++++++++++-----
 server/db/mongo/modules/checkModule.js | 24 +++++++++++++++-----
 server/routes/checkRoute.js            | 16 ++++++-------
 server/validation/joi.js               |  8 ++-----
 4 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/server/controllers/checkController.js b/server/controllers/checkController.js
index 2addd7359..387839beb 100755
--- a/server/controllers/checkController.js
+++ b/server/controllers/checkController.js
@@ -54,7 +54,18 @@ class CheckController {
 		}
 
 		try {
-			const result = await this.db.getChecksByMonitor(req);
+			const { monitorId } = req.params;
+			let { type, sortOrder, dateRange, filter, page, rowsPerPage, status } = req.query;
+			const result = await this.db.getChecksByMonitor({
+				monitorId,
+				type,
+				sortOrder,
+				dateRange,
+				filter,
+				page,
+				rowsPerPage,
+				status,
+			});
 
 			return res.success({
 				msg: this.stringService.checkGet,
@@ -74,8 +85,17 @@ class CheckController {
 			return;
 		}
 		try {
-			const checkData = await this.db.getChecksByTeam(req);
+			let { sortOrder, dateRange, filter, page, rowsPerPage } = req.query;
+			const { teamId } = req.user;
 
+			const checkData = await this.db.getChecksByTeam({
+				sortOrder,
+				dateRange,
+				filter,
+				page,
+				rowsPerPage,
+				teamId,
+			});
 			return res.success({
 				msg: this.stringService.checkGet,
 				data: checkData,
@@ -114,7 +134,8 @@ class CheckController {
 		}
 
 		try {
-			const deletedCount = await this.db.deleteChecksByTeamId(req.params.teamId);
+			const { teamId } = req.user;
+			const deletedCount = await this.db.deleteChecksByTeamId(teamId);
 
 			return res.success({
 				msg: this.stringService.checkDelete,
@@ -137,9 +158,7 @@ class CheckController {
 
 		try {
 			// Get user's teamId
-			const token = getTokenFromHeaders(req.headers);
-			const { jwtSecret } = this.settingsService.getSettings();
-			const { teamId } = jwt.verify(token, jwtSecret);
+			const { teamId } = req.user;
 			const ttl = parseInt(req.body.ttl, 10) * SECONDS_PER_DAY;
 			await this.db.updateChecksTTL(teamId, ttl);
 
diff --git a/server/db/mongo/modules/checkModule.js b/server/db/mongo/modules/checkModule.js
index 8e71dd6eb..f409fd3d2 100755
--- a/server/db/mongo/modules/checkModule.js
+++ b/server/db/mongo/modules/checkModule.js
@@ -57,10 +57,17 @@ const createChecks = async (checks) => {
  * @returns {Promise<Array<Check>>}
  * @throws {Error}
  */
-const getChecksByMonitor = async (req) => {
+const getChecksByMonitor = async ({
+	monitorId,
+	type,
+	sortOrder,
+	dateRange,
+	filter,
+	page,
+	rowsPerPage,
+	status,
+}) => {
 	try {
-		const { monitorId } = req.params;
-		let { type, sortOrder, dateRange, filter, page, rowsPerPage, status } = req.query;
 		status = typeof status !== "undefined" ? false : undefined;
 		page = parseInt(page);
 		rowsPerPage = parseInt(rowsPerPage);
@@ -142,12 +149,17 @@ const getChecksByMonitor = async (req) => {
 	}
 };
 
-const getChecksByTeam = async (req) => {
+const getChecksByTeam = async ({
+	sortOrder,
+	dateRange,
+	filter,
+	page,
+	rowsPerPage,
+	teamId,
+}) => {
 	try {
-		let { sortOrder, dateRange, filter, page, rowsPerPage } = req.query;
 		page = parseInt(page);
 		rowsPerPage = parseInt(rowsPerPage);
-		const { teamId } = req.params;
 		const matchStage = {
 			teamId: ObjectId.createFromHexString(teamId),
 			status: false,
diff --git a/server/routes/checkRoute.js b/server/routes/checkRoute.js
index bab45e4d4..aedca991a 100755
--- a/server/routes/checkRoute.js
+++ b/server/routes/checkRoute.js
@@ -11,7 +11,15 @@ class CheckRoutes {
 	}
 
 	initRoutes() {
+		this.router.get("/team", this.checkController.getChecksByTeam);
+		this.router.delete(
+			"/team",
+			isAllowed(["admin", "superadmin"]),
+			this.checkController.deleteChecksByTeamId
+		);
+
 		this.router.get("/:monitorId", this.checkController.getChecksByMonitor);
+
 		this.router.post(
 			"/:monitorId",
 			verifyOwnership(Monitor, "monitorId"),
@@ -23,14 +31,6 @@ class CheckRoutes {
 			this.checkController.deleteChecks
 		);
 
-		this.router.get("/team/:teamId", this.checkController.getChecksByTeam);
-
-		this.router.delete(
-			"/team/:teamId",
-			isAllowed(["admin", "superadmin"]),
-			this.checkController.deleteChecksByTeamId
-		);
-
 		this.router.put(
 			"/team/ttl",
 			isAllowed(["admin", "superadmin"]),
diff --git a/server/validation/joi.js b/server/validation/joi.js
index aba7118d1..2d1f10d29 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -301,9 +301,7 @@ const getChecksQueryValidation = joi.object({
 	status: joi.boolean(),
 });
 
-const getTeamChecksParamValidation = joi.object({
-	teamId: joi.string().required(),
-});
+const getTeamChecksParamValidation = joi.object({});
 
 const getTeamChecksQueryValidation = joi.object({
 	sortOrder: joi.string().valid("asc", "desc"),
@@ -319,9 +317,7 @@ const deleteChecksParamValidation = joi.object({
 	monitorId: joi.string().required(),
 });
 
-const deleteChecksByTeamIdParamValidation = joi.object({
-	teamId: joi.string().required(),
-});
+const deleteChecksByTeamIdParamValidation = joi.object({});
 
 const updateChecksTTLBodyValidation = joi.object({
 	ttl: joi.number().required(),

From c32cde61894b10b77d915dc6a1a887a6f1acb7c0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 12:08:59 +0800
Subject: [PATCH 138/319] fix incidents page

---
 .../src/Pages/Incidents/Components/IncidentTable/index.jsx  | 5 ++---
 client/src/Pages/Incidents/index.jsx                        | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index bc4872735..cf6fbb49d 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -24,7 +24,6 @@ const IncidentTable = ({
 }) => {
 	//Redux state
 	const uiTimezone = useSelector((state) => state.ui.timezone);
-	const { user } = useSelector((state) => state.auth);
 
 	//Local state
 	const [teamId, setTeamId] = useState(undefined);
@@ -61,13 +60,13 @@ const IncidentTable = ({
 
 	useEffect(() => {
 		if (selectedMonitor === "0") {
-			setTeamId(user.teamId);
+			setTeamId("placeholder"); // TODO this isn't needed any longer, fix hook
 			setMonitorId(undefined);
 		} else {
 			setMonitorId(selectedMonitor);
 			setTeamId(undefined);
 		}
-	}, [selectedMonitor, user.teamId]);
+	}, [selectedMonitor]);
 
 	const headers = [
 		{
diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
index d01543f8a..80a7db702 100644
--- a/client/src/Pages/Incidents/index.jsx
+++ b/client/src/Pages/Incidents/index.jsx
@@ -8,7 +8,6 @@ import OptionsHeader from "./Components/OptionsHeader";
 //Utils
 import { useTheme } from "@emotion/react";
 import { useFetchMonitorsByTeamId } from "../../Hooks/monitorHooks";
-import { useSelector } from "react-redux";
 import { useState, useEffect } from "react";
 import NetworkError from "../../Components/GenericFallback/NetworkError";
 import { useTranslation } from "react-i18next";
@@ -16,7 +15,6 @@ import { useTranslation } from "react-i18next";
 //Constants
 const Incidents = () => {
 	// Redux state
-	const { user } = useSelector((state) => state.auth);
 	const { t } = useTranslation();
 
 	const BREADCRUMBS = [
@@ -31,9 +29,7 @@ const Incidents = () => {
 
 	//Utils
 	const theme = useTheme();
-	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({
-		teamId: user.teamId,
-	});
+	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId();
 
 	useEffect(() => {
 		const monitorLookup = monitors?.reduce((acc, monitor) => {

From 5e23a2b79c73334ab6ab4dfbcde5e833d19de8c4 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 12:16:52 +0800
Subject: [PATCH 139/319] Remove team and user id

---
 client/src/Hooks/monitorHooks.js                 | 4 ++--
 client/src/Pages/Infrastructure/Create/index.jsx | 2 --
 client/src/Pages/Notifications/create/index.jsx  | 2 --
 client/src/Pages/PageSpeed/Create/index.jsx      | 2 --
 client/src/Pages/Settings/index.jsx              | 2 +-
 client/src/Pages/Uptime/Create/index.jsx         | 2 --
 server/controllers/monitorController.js          | 7 ++++++-
 server/db/mongo/modules/monitorModule.js         | 4 ++--
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 5072b5594..8df0faa3b 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -414,10 +414,10 @@ const useDeleteAllMonitors = () => {
 const UseDeleteMonitorStats = () => {
 	const { t } = useTranslation();
 	const [isLoading, setIsLoading] = useState(false);
-	const deleteMonitorStats = async ({ teamId }) => {
+	const deleteMonitorStats = async () => {
 		setIsLoading(true);
 		try {
-			const res = await networkService.deleteChecksByTeamId({ teamId });
+			await networkService.deleteChecksByTeamId();
 			createToast({ body: t("settingsStatsCleared") });
 		} catch (error) {
 			createToast({ body: t("settingsFailedToClearStats") });
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index fa63dd4dc..bcdf09785 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -186,8 +186,6 @@ const CreateInfrastructureMonitor = () => {
 			...(isCreate ? {} : { _id: monitorId }),
 			...rest,
 			description: form.name,
-			teamId: user.teamId,
-			userId: user._id,
 			type: "hardware",
 			notifications: infrastructureMonitor.notifications,
 			thresholds,
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index 19335c790..3c17c113c 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -48,8 +48,6 @@ const CreateNotifications = () => {
 
 	// local state
 	const [notification, setNotification] = useState({
-		userId: user._id,
-		teamId: user.teamId,
 		notificationName: "",
 		address: "",
 		type: NOTIFICATION_TYPES[0]._id,
diff --git a/client/src/Pages/PageSpeed/Create/index.jsx b/client/src/Pages/PageSpeed/Create/index.jsx
index a138fe0a2..5cc4a1a54 100644
--- a/client/src/Pages/PageSpeed/Create/index.jsx
+++ b/client/src/Pages/PageSpeed/Create/index.jsx
@@ -86,8 +86,6 @@ const CreatePageSpeed = () => {
 		form = {
 			...form,
 			description: form.name,
-			teamId: user.teamId,
-			userId: user._id,
 			notifications: monitor.notifications,
 		};
 
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index d8bd79551..11e432e17 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -96,7 +96,7 @@ const Settings = () => {
 		}
 
 		if (name === "deleteStats") {
-			await deleteMonitorStats({ teamId: user.teamId });
+			await deleteMonitorStats();
 			return;
 		}
 
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 184beffe5..c800e295c 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -142,8 +142,6 @@ const CreateMonitor = () => {
 		form = {
 			...form,
 			description: monitor.name || monitor.url,
-			teamId: user.teamId,
-			userId: user._id,
 			notifications: monitor.notifications,
 		};
 
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 4262b9818..228eabbb0 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -238,7 +238,12 @@ class MonitorController {
 		}
 
 		try {
-			const monitor = await this.db.createMonitor(req.body);
+			const { _id, teamId } = req.user;
+			const monitor = await this.db.createMonitor({
+				body: req.body,
+				teamId,
+				userId: _id,
+			});
 
 			// Add monitor to job queue
 			this.jobQueue.addJob(monitor._id, monitor);
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 700625b73..6c03dcd4c 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -665,9 +665,9 @@ const getMonitorsWithChecksByTeamId = async ({
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const createMonitor = async (body) => {
+const createMonitor = async ({ body, teamId, userId }) => {
 	try {
-		const monitor = new Monitor({ ...body });
+		const monitor = new Monitor({ ...body, teamId, userId });
 		const saved = await monitor.save();
 		return saved;
 	} catch (error) {

From 42372ab111e231edc2e4ff1da893e439e8bf1e7e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:10:56 +0800
Subject: [PATCH 140/319] remove userID and teamID from status page

---
 client/src/Utils/NetworkService.js          | 4 +---
 server/controllers/statusPageController.js  | 8 +++++++-
 server/db/mongo/modules/statusPageModule.js | 9 ++++++---
 server/validation/joi.js                    | 2 --
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index f7ebdc3f4..03225c440 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -847,11 +847,9 @@ class NetworkService {
 	}
 
 	async createStatusPage(config) {
-		const { user, form, isCreate } = config;
+		const { form, isCreate } = config;
 
 		const fd = new FormData();
-		fd.append("teamId", user.teamId);
-		fd.append("userId", user._id);
 		fd.append("type", form.type);
 		form.isPublished !== undefined && fd.append("isPublished", form.isPublished);
 		form.companyName && fd.append("companyName", form.companyName);
diff --git a/server/controllers/statusPageController.js b/server/controllers/statusPageController.js
index eb3e69484..842eb657a 100755
--- a/server/controllers/statusPageController.js
+++ b/server/controllers/statusPageController.js
@@ -24,7 +24,13 @@ class StatusPageController {
 		}
 
 		try {
-			const statusPage = await this.db.createStatusPage(req.body, req.file);
+			const { _id, teamId } = req.user;
+			const statusPage = await this.db.createStatusPage({
+				statusPageData: req.body,
+				image: req.file,
+				userId: _id,
+				teamId,
+			});
 			return res.success({
 				msg: this.stringService.statusPageCreate,
 				data: statusPage,
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index cd985588a..b2f7ef7d6 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -1,16 +1,19 @@
 import StatusPage from "../../models/StatusPage.js";
-import Monitor from "../../models/Monitor.js";
 import { NormalizeData } from "../../../utils/dataUtils.js";
 import ServiceRegistry from "../../../service/serviceRegistry.js";
 import StringService from "../../../service/stringService.js";
 
 const SERVICE_NAME = "statusPageModule";
 
-const createStatusPage = async (statusPageData, image) => {
+const createStatusPage = async ({ statusPageData, image, userId, teamId }) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 
 	try {
-		const statusPage = new StatusPage({ ...statusPageData });
+		const statusPage = new StatusPage({
+			...statusPageData,
+			userId,
+			teamId,
+		});
 		if (image) {
 			statusPage.logo = {
 				data: image.buffer,
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 2d1f10d29..e43f6233f 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -424,8 +424,6 @@ const getStatusPageQueryValidation = joi.object({
 });
 
 const createStatusPageBodyValidation = joi.object({
-	userId: joi.string().required(),
-	teamId: joi.string().required(),
 	type: joi.string().valid("uptime").required(),
 	companyName: joi.string().required(),
 	url: joi

From 18ea55111807c18656e9a3d3152e71f2b5765cc2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:11:58 +0800
Subject: [PATCH 141/319] remove user

---
 .../Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx b/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
index 8407955a6..a2ac5f55d 100644
--- a/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
+++ b/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
@@ -1,17 +1,14 @@
 import { useState } from "react";
 import { networkService } from "../../../../main";
-import { useSelector } from "react-redux";
 import { createToast } from "../../../../Utils/toastUtils";
 
 const useCreateStatusPage = (isCreate, url) => {
-	const { user } = useSelector((state) => state.auth);
-
 	const [isLoading, setIsLoading] = useState(false);
 	const [networkError, setNetworkError] = useState(false);
 	const createStatusPage = async ({ form }) => {
 		setIsLoading(true);
 		try {
-			await networkService.createStatusPage({ user, form, isCreate, url });
+			await networkService.createStatusPage({ form, isCreate, url });
 			return true;
 		} catch (error) {
 			setNetworkError(true);

From b499b2879cbd4e024c3555eb4712b0a09f986942 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:29:03 +0800
Subject: [PATCH 142/319] remove teamId from status pages

---
 client/src/Pages/Incidents/index.jsx                        | 2 +-
 .../StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx    | 4 +---
 client/src/Utils/NetworkService.js                          | 3 +--
 server/controllers/statusPageController.js                  | 2 +-
 server/routes/statusPageRoute.js                            | 6 +-----
 server/validation/joi.js                                    | 2 --
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
index 80a7db702..011961503 100644
--- a/client/src/Pages/Incidents/index.jsx
+++ b/client/src/Pages/Incidents/index.jsx
@@ -29,7 +29,7 @@ const Incidents = () => {
 
 	//Utils
 	const theme = useTheme();
-	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId();
+	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({});
 
 	useEffect(() => {
 		const monitorLookup = monitors?.reduce((acc, monitor) => {
diff --git a/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx b/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx
index db7a33396..b236368c8 100644
--- a/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx
+++ b/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx
@@ -13,9 +13,7 @@ const useStatusPagesFetch = () => {
 	useEffect(() => {
 		const fetchStatusPages = async () => {
 			try {
-				const res = await networkService.getStatusPagesByTeamId({
-					teamId: user.teamId,
-				});
+				const res = await networkService.getStatusPagesByTeamId();
 				setStatusPages(res?.data?.data);
 			} catch (error) {
 				setNetworkError(true);
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 03225c440..ecde44a9e 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -838,8 +838,7 @@ class NetworkService {
 	}
 
 	async getStatusPagesByTeamId(config) {
-		const { teamId } = config;
-		return this.axiosInstance.get(`/status-page/team/${teamId}`, {
+		return this.axiosInstance.get(`/status-page/team`, {
 			headers: {
 				"Content-Type": "application/json",
 			},
diff --git a/server/controllers/statusPageController.js b/server/controllers/statusPageController.js
index 842eb657a..577cf4997 100755
--- a/server/controllers/statusPageController.js
+++ b/server/controllers/statusPageController.js
@@ -99,7 +99,7 @@ class StatusPageController {
 
 	getStatusPagesByTeamId = async (req, res, next) => {
 		try {
-			const teamId = req.params.teamId;
+			const teamId = req.user.teamId;
 			const statusPages = await this.db.getStatusPagesByTeamId(teamId);
 
 			return res.success({
diff --git a/server/routes/statusPageRoute.js b/server/routes/statusPageRoute.js
index 4e6a4d248..98b3a3433 100755
--- a/server/routes/statusPageRoute.js
+++ b/server/routes/statusPageRoute.js
@@ -12,11 +12,7 @@ class StatusPageRoutes {
 
 	initRoutes() {
 		this.router.get("/", this.statusPageController.getStatusPage);
-		this.router.get(
-			"/team/:teamId",
-			verifyJWT,
-			this.statusPageController.getStatusPagesByTeamId
-		);
+		this.router.get("/team", verifyJWT, this.statusPageController.getStatusPagesByTeamId);
 		this.router.get("/:url", this.statusPageController.getStatusPageByUrl);
 
 		this.router.post(
diff --git a/server/validation/joi.js b/server/validation/joi.js
index e43f6233f..60f462280 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -165,8 +165,6 @@ const getCertificateParamValidation = joi.object({
 
 const createMonitorBodyValidation = joi.object({
 	_id: joi.string(),
-	userId: joi.string().required(),
-	teamId: joi.string().required(),
 	name: joi.string().required(),
 	description: joi.string().required(),
 	type: joi.string().required(),

From ab3f867b5bd7e06652b519031728997720502c3e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:32:55 +0800
Subject: [PATCH 143/319] remove unused redux state

---
 client/src/Hooks/useNotifications.js     | 1 -
 client/src/Pages/Uptime/Create/index.jsx | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index b269c5edc..f19b76dde 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -2,7 +2,6 @@ import { useState, useEffect, useCallback } from "react";
 import { createToast } from "../Utils/toastUtils";
 import { networkService } from "../main";
 import { useNavigate } from "react-router-dom";
-import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { NOTIFICATION_TYPES } from "../Pages/Notifications/utils";
 
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index c800e295c..0dce03889 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -18,7 +18,6 @@ import FormControlLabel from "@mui/material/FormControlLabel";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { useState } from "react";
-import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { monitorValidation } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
@@ -26,9 +25,6 @@ import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 import { useCreateMonitor } from "../../../Hooks/monitorHooks";
 
 const CreateMonitor = () => {
-	// Redux state
-	const { user } = useSelector((state) => state.auth);
-
 	// Local state
 	const [errors, setErrors] = useState({});
 	const [https, setHttps] = useState(true);

From 985ca3334da1ce631a53a779136d7a1e47039f8f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:49:54 +0800
Subject: [PATCH 144/319] move style to global theme

---
 client/src/Components/Inputs/Search/index.jsx | 22 +--------------
 client/src/Utils/Theme/globalTheme.js         | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx
index 86ce57779..e5654faeb 100644
--- a/client/src/Components/Inputs/Search/index.jsx
+++ b/client/src/Components/Inputs/Search/index.jsx
@@ -102,27 +102,7 @@ const Search = ({
 								...(endAdornment && { endAdornment: endAdornment }),
 							},
 						}}
-						sx={{
-							"& fieldset": {
-								borderColor: theme.palette.primary.lowContrast,
-								borderRadius: theme.shape.borderRadius,
-							},
-							"& .MuiOutlinedInput-root:hover:not(:has(input:focus)):not(:has(textarea:focus)) fieldset":
-								{
-									borderColor: theme.palette.primary.lowContrast,
-								},
-							"& .MuiOutlinedInput-root": {
-								paddingY: 0,
-							},
-							"& .MuiAutocomplete-tag": {
-								// CAIO_REVIEW
-								color: theme.palette.primary.contrastText,
-								backgroundColor: theme.palette.primary.lowContrast,
-							},
-							"& .MuiChip-deleteIcon": {
-								color: theme.palette.primary.contrastText, // CAIO_REVIEW
-							},
-						}}
+						sx={{}}
 					/>
 					{error && (
 						<Typography
diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 37526ed73..58d9943be 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -380,6 +380,33 @@ const baseTheme = (palette) => ({
 				},
 			},
 		},
+
+		MuiAutocomplete: {
+			styleOverrides: {
+				root: ({ theme }) => ({
+					"& .MuiOutlinedInput-root": {
+						paddingTop: 0,
+						paddingBottom: 0,
+					},
+					"& fieldset": {
+						borderColor: theme.palette.primary.lowContrast,
+						borderRadius: theme.shape.borderRadius,
+					},
+					"& .MuiOutlinedInput-root:hover:not(:has(input:focus)):not(:has(textarea:focus)) fieldset":
+						{
+							borderColor: theme.palette.primary.lowContrast,
+						},
+
+					"& .MuiAutocomplete-tag": {
+						color: theme.palette.primary.contrastText,
+						backgroundColor: theme.palette.primary.lowContrast,
+					},
+					"& .MuiChip-deleteIcon": {
+						color: theme.palette.primary.contrastText, // CAIO_REVIEW
+					},
+				}),
+			},
+		},
 		MuiTab: {
 			styleOverrides: {
 				root: ({ theme }) => ({

From cc8949538f4e0036eadecb630f18e3bcb75bc563 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 14:04:08 +0800
Subject: [PATCH 145/319] move bulk monitors hook to monitorHooks

---
 client/src/Hooks/monitorHooks.js             | 28 ++++++++++++++++++--
 client/src/Hooks/useBulkMonitors.js          | 25 -----------------
 client/src/Pages/Settings/index.jsx          |  4 +--
 client/src/Pages/Uptime/BulkImport/index.jsx |  4 +--
 server/validation/joi.js                     |  7 ++++-
 5 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 client/src/Hooks/useBulkMonitors.js

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 8df0faa3b..d88132dae 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -411,7 +411,7 @@ const useDeleteAllMonitors = () => {
 	return [deleteAllMonitors, isLoading];
 };
 
-const UseDeleteMonitorStats = () => {
+const useDeleteMonitorStats = () => {
 	const { t } = useTranslation();
 	const [isLoading, setIsLoading] = useState(false);
 	const deleteMonitorStats = async () => {
@@ -429,6 +429,29 @@ const UseDeleteMonitorStats = () => {
 	return [deleteMonitorStats, isLoading];
 };
 
+const useCreateBulkMonitors = () => {
+	const [isLoading, setIsLoading] = useState(false);
+
+	const createBulkMonitors = async (file, user) => {
+		setIsLoading(true);
+
+		const formData = new FormData();
+		formData.append("csvFile", file);
+
+		try {
+			const response = await networkService.createBulkMonitors(formData);
+			return [true, response.data, null]; // [success, data, error]
+		} catch (err) {
+			const errorMessage = err?.response?.data?.msg || err.message;
+			return [false, null, errorMessage];
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [createBulkMonitors, isLoading];
+};
+
 export {
 	useFetchMonitorsWithSummary,
 	useFetchMonitorsWithChecks,
@@ -443,5 +466,6 @@ export {
 	usePauseMonitor,
 	useAddDemoMonitors,
 	useDeleteAllMonitors,
-	UseDeleteMonitorStats,
+	useDeleteMonitorStats,
+	useCreateBulkMonitors,
 };
diff --git a/client/src/Hooks/useBulkMonitors.js b/client/src/Hooks/useBulkMonitors.js
deleted file mode 100644
index ba9086dac..000000000
--- a/client/src/Hooks/useBulkMonitors.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useState } from "react";
-import { networkService } from "../main";
-
-export const useBulkMonitors = () => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const createBulkMonitors = async (file, user) => {
-		setIsLoading(true);
-
-		const formData = new FormData();
-		formData.append("csvFile", file);
-
-		try {
-			const response = await networkService.createBulkMonitors(formData);
-			return [true, response.data, null]; // [success, data, error]
-		} catch (err) {
-			const errorMessage = err?.response?.data?.msg || err.message;
-			return [false, null, errorMessage];
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return [createBulkMonitors, isLoading];
-};
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 11e432e17..e7a50e321 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -23,7 +23,7 @@ import { useIsAdmin } from "../../Hooks/useIsAdmin";
 import {
 	useAddDemoMonitors,
 	useDeleteAllMonitors,
-	UseDeleteMonitorStats,
+	useDeleteMonitorStats,
 } from "../../Hooks/monitorHooks";
 // Constants
 const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
@@ -45,7 +45,7 @@ const Settings = () => {
 
 	const [isSaving, saveError, saveSettings] = useSaveSettings();
 	const [deleteAllMonitors, isDeletingMonitors] = useDeleteAllMonitors();
-	const [deleteMonitorStats, isDeletingMonitorStats] = UseDeleteMonitorStats();
+	const [deleteMonitorStats, isDeletingMonitorStats] = useDeleteMonitorStats();
 
 	// Setup
 	const isAdmin = useIsAdmin();
diff --git a/client/src/Pages/Uptime/BulkImport/index.jsx b/client/src/Pages/Uptime/BulkImport/index.jsx
index 99a6d51d8..e7fa75665 100644
--- a/client/src/Pages/Uptime/BulkImport/index.jsx
+++ b/client/src/Pages/Uptime/BulkImport/index.jsx
@@ -12,7 +12,7 @@ import UploadFile from "./Upload";
 import { useSelector } from "react-redux";
 import { useNavigate } from "react-router";
 import { Trans, useTranslation } from "react-i18next";
-import { useBulkMonitors } from "../../../Hooks/useBulkMonitors";
+import { useCreateBulkMonitors } from "../../../Hooks/monitorHooks";
 
 const BulkImport = () => {
 	const theme = useTheme();
@@ -26,7 +26,7 @@ const BulkImport = () => {
 		{ name: t("bulkImport.title"), path: `/uptime/bulk-import` },
 	];
 
-	const [createBulkMonitors, hookLoading] = useBulkMonitors();
+	const [createBulkMonitors, hookLoading] = useCreateBulkMonitors();
 
 	const handleSubmit = async () => {
 		if (!selectedFile) {
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 60f462280..622cb9148 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -186,7 +186,12 @@ const createMonitorBodyValidation = joi.object({
 	matchMethod: joi.string(),
 });
 
-const createMonitorsBodyValidation = joi.array().items(createMonitorBodyValidation);
+const createMonitorsBodyValidation = joi.array().items(
+	createMonitorBodyValidation.keys({
+		userId: joi.string().required(),
+		teamId: joi.string().required(),
+	})
+);
 
 const editMonitorBodyValidation = joi.object({
 	name: joi.string(),

From 38a1d5e7a1660b0cf4cb3d8b51bb1cb92017fcad Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 13 Jun 2025 12:22:28 +0530
Subject: [PATCH 146/319] Implement PR Comments

---
 client/src/Pages/Settings/SettingsEmail.jsx | 76 +++++++++++++--------
 client/src/Utils/NetworkService.js          |  4 --
 client/src/Validation/validation.js         |  8 +--
 client/src/locales/en.json                  | 10 +--
 server/db/models/AppSettings.js             | 23 +++++++
 server/service/emailService.js              | 12 ++--
 server/validation/joi.js                    | 12 +++-
 7 files changed, 96 insertions(+), 49 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 113d5bf44..50f90c38f 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -26,6 +26,21 @@ const SettingsEmail = ({
 	const { t } = useTranslation();
 	const theme = useTheme();
 
+	// Destructure settings with default values
+	const {
+		systemEmailHost = "",
+		systemEmailPort = "",
+		systemEmailSecure = false,
+		systemEmailPool = false,
+		systemEmailUser = "",
+		systemEmailAddress = "",
+		systemEmailPassword = "",
+		systemEmailTLSServername = "",
+		systemEmailConnectionHost = "localhost",
+		systemEmailIgnoreTLS = false,
+		systemEmailRequireTLS = false,
+		systemEmailRejectUnauthorized = true,
+	} = settingsData?.settings || {};
 	// Local state
 	const [password, setPassword] = useState("");
 	const [hasBeenReset, setHasBeenReset] = useState(false);
@@ -48,25 +63,31 @@ const SettingsEmail = ({
 	const handleSendTestEmail = () => {
 		// Collect current form values
 		const emailConfig = {
-			systemEmailHost: settingsData?.settings?.systemEmailHost,
-			systemEmailPort: settingsData?.settings?.systemEmailPort,
-			systemEmailSecure: settingsData?.settings?.systemEmailSecure,
-			systemEmailPool: settingsData?.settings?.systemEmailPool,
-			systemEmailUser: settingsData?.settings?.systemEmailUser,
-			systemEmailAddress: settingsData?.settings?.systemEmailAddress,
-			systemEmailPassword: password || settingsData?.settings?.systemEmailPassword,
-			systemEmailConnectionHost: settingsData?.settings?.systemEmailConnectionHost,
-			systemEmailTLSServername: settingsData?.settings?.systemEmailTLSServername,
-			systemEmailIgnoreTLS: settingsData?.settings?.systemEmailIgnoreTLS,
-			systemEmailRequireTLS: settingsData?.settings?.systemEmailRequireTLS,
-			systemEmailRejectUnauthorized:
-				settingsData?.settings?.systemEmailRejectUnauthorized,
+			systemEmailHost,
+			systemEmailPort,
+			systemEmailSecure,
+			systemEmailPool,
+			systemEmailUser,
+			systemEmailAddress,
+			systemEmailPassword: password || systemEmailPassword,
+			systemEmailTLSServername,
+			systemEmailConnectionHost,
+			systemEmailIgnoreTLS,
+			systemEmailRequireTLS,
+			systemEmailRejectUnauthorized,
 		};
 
 		// Basic validation
-		if (!emailConfig.systemEmailHost || !emailConfig.systemEmailPort) {
+		if (
+			!emailConfig.systemEmailHost ||
+			!emailConfig.systemEmailPort ||
+			!emailConfig.systemEmailAddress
+		) {
 			createToast({
-				body: t("settingsEmailRequiredFields", "Email host and port are required"),
+				body: t(
+					"settingsEmailRequiredFields",
+					"Email address, host and port are required"
+				),
 				variant: "error",
 			});
 			return;
@@ -98,7 +119,7 @@ const SettingsEmail = ({
 						<TextInput
 							name="systemEmailHost"
 							placeholder="smtp.gmail.com"
-							value={settingsData?.settings?.systemEmailHost ?? ""}
+							value={systemEmailHost}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -108,7 +129,7 @@ const SettingsEmail = ({
 							name="systemEmailPort"
 							placeholder="425"
 							type="number"
-							value={settingsData?.settings?.systemEmailPort ?? ""}
+							value={systemEmailPort}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -123,13 +144,13 @@ const SettingsEmail = ({
 						<Typography>{t("settingsEmailSecure")}</Typography>
 						<Switch
 							name="systemEmailSecure"
-							checked={settingsData?.settings?.systemEmailSecure ?? false}
+							checked={systemEmailSecure}
 							onChange={handleChange}
 						/>
 						<Typography>{t("settingsEmailPool")}</Typography>
 						<Switch
 							name="systemEmailPool"
-							checked={settingsData?.settings?.systemEmailPool ?? false}
+							checked={systemEmailPool}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -138,7 +159,7 @@ const SettingsEmail = ({
 						<TextInput
 							name="systemEmailUser"
 							placeholder="Leave empty if not required"
-							value={settingsData?.settings?.systemEmailUser ?? ""}
+							value={systemEmailUser}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -147,7 +168,7 @@ const SettingsEmail = ({
 						<TextInput
 							name="systemEmailAddress"
 							placeholder="uptime@bluewavelabs.ca"
-							value={settingsData?.settings?.systemEmailAddress ?? ""}
+							value={systemEmailAddress}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -189,34 +210,33 @@ const SettingsEmail = ({
 						<TextInput
 							name="systemEmailTLSServername"
 							placeholder="bluewavelabs.ca"
-							value={settingsData?.settings?.systemEmailTLSServername ?? ""}
+							value={systemEmailTLSServername}
 							onChange={handleChange}
 						/>
 					</Box>
 					<Box
 						sx={{
 							display: "flex",
-							flexDirection: "row",
-							alignItems: "center",
+							flexDirection: "column",
 							gap: theme.spacing(4),
 						}}
 					>
 						<Typography>{t("settingsEmailIgnoreTLS")}</Typography>
 						<Switch
 							name="systemEmailIgnoreTLS"
-							checked={settingsData?.settings?.systemEmailIgnoreTLS ?? false}
+							checked={systemEmailIgnoreTLS}
 							onChange={handleChange}
 						/>
 						<Typography>{t("settingsEmailRequireTLS")}</Typography>
 						<Switch
 							name="systemEmailRequireTLS"
-							checked={settingsData?.settings?.systemEmailRequireTLS ?? false}
+							checked={systemEmailRequireTLS}
 							onChange={handleChange}
 						/>
 						<Typography>{t("settingsEmailRejectUnauthorized")}</Typography>
 						<Switch
 							name="systemEmailRejectUnauthorized"
-							checked={settingsData?.settings?.systemEmailRejectUnauthorized ?? false}
+							checked={systemEmailRejectUnauthorized}
 							onChange={handleChange}
 						/>
 					</Box>
@@ -225,7 +245,7 @@ const SettingsEmail = ({
 						<TextInput
 							name="systemEmailConnectionHost"
 							placeholder="bluewavelabs.ca"
-							value={settingsData?.settings?.systemEmailConnectionHost ?? ""}
+							value={systemEmailConnectionHost}
 							onChange={handleChange}
 						/>
 					</Box>
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index dcb21df92..3e0ac6103 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1020,10 +1020,6 @@ class NetworkService {
 				systemEmailRequireTLS: emailConfig.systemEmailRequireTLS,
 				systemEmailRejectUnauthorized: emailConfig.systemEmailRejectUnauthorized,
 				systemEmailTLSServername: emailConfig.systemEmailTLSServername,
-				// Only include these if they are present
-				...(emailConfig.systemEmailConnectionHost && {
-					systemEmailConnectionHost: emailConfig.systemEmailConnectionHost,
-				}),
 				...(emailConfig.systemEmailUser && {
 					systemEmailUser: emailConfig.systemEmailUser,
 				}),
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 089722a8d..f1811a124 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -295,11 +295,11 @@ const settingsValidation = joi.object({
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
-	systemEmailConnectionHost: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow("").optional(),
 	systemEmailTLSServername: joi.string().allow(""),
-	systemEmailIgnoreTLS: joi.boolean().optional(),
-	systemEmailRequireTLS: joi.boolean().optional(),
-	systemEmailRejectUnauthorized: joi.boolean().optional(),
+	systemEmailIgnoreTLS: joi.boolean(),
+	systemEmailRequireTLS: joi.boolean(),
+	systemEmailRejectUnauthorized: joi.boolean(),
 });
 
 const dayjsValidator = (value, helpers) => {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 610c56d0e..ca3f9dcd6 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -673,17 +673,17 @@
 	},
 	"settingsEmail": "Email",
 	"settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.",
-	"settingsEmailHost": "Email host - Hostname or IP address of the SMTP server",
+	"settingsEmailHost": "Email host - Hostname or IP address to connect to",
 	"settingsEmailPort": "Email port - Port to connect to",
 	"settingsEmailAddress": "Email address - Used for authentication",
 	"settingsEmailPassword": "Email password - Password for authentication",
 	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
 	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
 	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS",
-	"settingsEmailRequireTLS": "Require TLS",
+	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
+	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
 	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure",
+	"settingsEmailSecure": "Secure - Use SSL",
 	"settingsEmailPool": "Pool",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
@@ -714,7 +714,7 @@
 	"settingsTestEmailFailed": "Failed to send test email",
 	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
 	"settingsTestEmailUnknownError": "Unknown error",
-	"settingsEmailRequiredFields": "Email host and port are required",
+	"settingsEmailRequiredFields": "Email address, host and port are required",
 	"statusMsg": {
 		"paused": "Monitoring is paused.",
 		"up": "Your site is up.",
diff --git a/server/db/models/AppSettings.js b/server/db/models/AppSettings.js
index c47de06fa..cd63118e9 100755
--- a/server/db/models/AppSettings.js
+++ b/server/db/models/AppSettings.js
@@ -32,6 +32,29 @@ const AppSettingsSchema = mongoose.Schema(
 			type: String,
 			default: "localhost",
 		},
+		systemEmailTLSServername: {
+			type: String,
+		},
+		systemEmailSecure: {
+			type: Boolean,
+			default: false,
+		},
+		systemEmailPool: {
+			type: Boolean,
+			default: false,
+		},
+		systemEmailIgnoreTLS: {
+			type: Boolean,
+			default: false,
+		},
+		systemEmailRequireTLS: {
+			type: Boolean,
+			default: false,
+		},
+		systemEmailRejectUnauthorized: {
+			type: Boolean,
+			default: true,
+		},
 		singleton: {
 			type: Boolean,
 			required: true,
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 325871fac..09123ef93 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -121,13 +121,15 @@ class EmailService {
 				user: systemEmailUser || systemEmailAddress,
 				pass: systemEmailPassword,
 			},
+			name: systemEmailConnectionHost || "localhost",
 			connectionTimeout: 5000,
 			pool: systemEmailPool,
-			tls: { rejectUnauthorized: systemEmailRejectUnauthorized },
-			ignoreTLS: systemEmailIgnoreTLS,
-			requireTLS: systemEmailRequireTLS,
-			servername: systemEmailTLSServername,
-			name: systemEmailConnectionHost || "localhost",
+			tls: {
+				rejectUnauthorized: systemEmailRejectUnauthorized,
+				ignoreTLS: systemEmailIgnoreTLS,
+				requireTLS: systemEmailRequireTLS,
+				servername: systemEmailTLSServername,
+			},
 		};
 
 		this.transporter = this.nodemailer.createTransport(emailConfig);
diff --git a/server/validation/joi.js b/server/validation/joi.js
index b7858f92d..f9a7d7322 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -413,7 +413,13 @@ const updateAppSettingsBodyValidation = joi.object({
 	systemEmailAddress: joi.string().allow(""),
 	systemEmailPassword: joi.string().allow(""),
 	systemEmailUser: joi.string().allow(""),
-	systemEmailConnectionHost: joi.string().allow(""),
+	systemEmailConnectionHost: joi.string().allow("").optional(),
+	systemEmailTLSServername: joi.string().allow("").optional(),
+	systemEmailSecure: joi.boolean(),
+	systemEmailPool: joi.boolean(),
+	systemEmailIgnoreTLS: joi.boolean(),
+	systemEmailRequireTLS: joi.boolean(),
+	systemEmailRejectUnauthorized: joi.boolean(),
 });
 
 //****************************************
@@ -622,11 +628,11 @@ const sendTestEmailBodyValidation = joi.object({
 	systemEmailAddress: joi.string(),
 	systemEmailPassword: joi.string(),
 	systemEmailUser: joi.string(),
-	systemEmailConnectionHost: joi.string(),
+	systemEmailConnectionHost: joi.string().allow("").optional(),
 	systemEmailIgnoreTLS: joi.boolean(),
 	systemEmailRequireTLS: joi.boolean(),
 	systemEmailRejectUnauthorized: joi.boolean(),
-	systemEmailTLSServername: joi.string(),
+	systemEmailTLSServername: joi.string().allow("").optional(),
 });
 
 export {

From 4b621a228f217f49c6e70db4efb15b41b40bdaf8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 14:54:59 +0800
Subject: [PATCH 147/319] remove monitors from status page on delete

---
 client/src/Components/Fallback/index.jsx      |  2 +-
 .../TextLink/index.jsx}                       |  0
 .../{useFetchSettings.js => settingsHooks.js} |  0
 client/src/Pages/Auth/Login/index.jsx         |  2 +-
 client/src/Pages/Settings/index.jsx           |  2 +-
 client/src/Pages/StatusPage/Status/index.jsx  | 22 +++++++++++++++++++
 client/src/Pages/Uptime/Create/index.jsx      |  3 +--
 server/db/models/Monitor.js                   |  4 ++++
 server/db/mongo/modules/monitorModule.js      |  2 ++
 server/db/mongo/modules/statusPageModule.js   | 19 ++++++++++++----
 10 files changed, 47 insertions(+), 9 deletions(-)
 rename client/src/{Pages/Auth/components/TextLink.jsx => Components/TextLink/index.jsx} (100%)
 rename client/src/Hooks/{useFetchSettings.js => settingsHooks.js} (100%)

diff --git a/client/src/Components/Fallback/index.jsx b/client/src/Components/Fallback/index.jsx
index b00ddbecc..47497ba02 100644
--- a/client/src/Components/Fallback/index.jsx
+++ b/client/src/Components/Fallback/index.jsx
@@ -11,7 +11,7 @@ import { useSelector } from "react-redux";
 import Alert from "../Alert";
 import { useTranslation } from "react-i18next";
 import "./index.css";
-import { useFetchSettings } from "../../Hooks/useFetchSettings";
+import { useFetchSettings } from "../../Hooks/settingsHooks";
 import { useState } from "react";
 /**
  * Fallback component to display a fallback UI with a title, a list of checks, and a navigation button.
diff --git a/client/src/Pages/Auth/components/TextLink.jsx b/client/src/Components/TextLink/index.jsx
similarity index 100%
rename from client/src/Pages/Auth/components/TextLink.jsx
rename to client/src/Components/TextLink/index.jsx
diff --git a/client/src/Hooks/useFetchSettings.js b/client/src/Hooks/settingsHooks.js
similarity index 100%
rename from client/src/Hooks/useFetchSettings.js
rename to client/src/Hooks/settingsHooks.js
diff --git a/client/src/Pages/Auth/Login/index.jsx b/client/src/Pages/Auth/Login/index.jsx
index a969706e7..098fbbf08 100644
--- a/client/src/Pages/Auth/Login/index.jsx
+++ b/client/src/Pages/Auth/Login/index.jsx
@@ -5,7 +5,7 @@ import Button from "@mui/material/Button";
 import TextInput from "../../../Components/Inputs/TextInput";
 import { PasswordEndAdornment } from "../../../Components/Inputs/TextInput/Adornments";
 import { loginCredentials } from "../../../Validation/validation";
-import TextLink from "../components/TextLink";
+import TextLink from "../../../Components/TextLink";
 import Typography from "@mui/material/Typography";
 
 // Utils
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index e7a50e321..a3cd88fca 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -18,7 +18,7 @@ import { useSelector, useDispatch } from "react-redux";
 import { setTimezone, setMode, setLanguage, setShowURL } from "../../Features/UI/uiSlice";
 import SettingsStats from "./SettingsStats";
 
-import { useFetchSettings, useSaveSettings } from "../../Hooks/useFetchSettings";
+import { useFetchSettings, useSaveSettings } from "../../Hooks/settingsHooks";
 import { useIsAdmin } from "../../Hooks/useIsAdmin";
 import {
 	useAddDemoMonitors,
diff --git a/client/src/Pages/StatusPage/Status/index.jsx b/client/src/Pages/StatusPage/Status/index.jsx
index ee1ec436c..727daeeb1 100644
--- a/client/src/Pages/StatusPage/Status/index.jsx
+++ b/client/src/Pages/StatusPage/Status/index.jsx
@@ -8,6 +8,7 @@ import StatusBar from "./Components/StatusBar";
 import MonitorsList from "./Components/MonitorsList";
 import Dialog from "../../../Components/Dialog";
 import Breadcrumbs from "../../../Components/Breadcrumbs/index.jsx";
+import TextLink from "../../../Components/TextLink";
 
 // Utils
 import { useStatusPageFetch } from "./Hooks/useStatusPageFetch";
@@ -30,6 +31,7 @@ const PublicStatus = () => {
 	const { t } = useTranslation();
 	const location = useLocation();
 	const navigate = useNavigate();
+	const isAdmin = useIsAdmin();
 
 	const [statusPage, monitors, isLoading, networkError, fetchStatusPage] =
 		useStatusPageFetch(false, url);
@@ -60,6 +62,26 @@ const PublicStatus = () => {
 		return <SkeletonLayout />;
 	}
 
+	if (monitors.length === 0) {
+		return (
+			<GenericFallback>
+				<Typography
+					variant="h1"
+					marginY={theme.spacing(4)}
+					color={theme.palette.primary.contrastTextTertiary}
+				>
+					{"Theres nothing here yet"}
+				</Typography>
+				{isAdmin && (
+					<TextLink
+						linkText={"Add a monitor to get started"}
+						href={`/status/uptime/configure/${url}`}
+					/>
+				)}
+			</GenericFallback>
+		);
+	}
+
 	// Error fetching data
 	if (networkError === true) {
 		return (
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index e2d51153c..6527334ab 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -142,8 +142,7 @@ const CreateMonitor = () => {
 			notifications: monitor.notifications,
 		};
 
-		console.log(JSON.stringify(form, null, 2));
-		// await createMonitor({ monitor: form, redirect: "/uptime" });
+		await createMonitor({ monitor: form, redirect: "/uptime" });
 	};
 
 	const onChange = (event) => {
diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 26a79b815..7bb38f520 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -3,6 +3,7 @@ import HardwareCheck from "./HardwareCheck.js";
 import PageSpeedCheck from "./PageSpeedCheck.js";
 import Check from "./Check.js";
 import MonitorStats from "./MonitorStats.js";
+import StatusPage from "./StatusPage.js";
 
 const MonitorSchema = mongoose.Schema(
 	{
@@ -105,6 +106,9 @@ MonitorSchema.pre("findOneAndDelete", async function (next) {
 			await Check.deleteMany({ monitorId: doc._id });
 		}
 
+		// Deal with status pages
+		await StatusPage.updateMany({ monitors: doc._id }, { $pull: { monitors: doc._id } });
+
 		await MonitorStats.deleteMany({ monitorId: doc._id.toString() });
 		next();
 	} catch (error) {
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 6c03dcd4c..32ed8b146 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -710,9 +710,11 @@ const deleteMonitor = async ({ monitorId }) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	try {
 		const monitor = await Monitor.findByIdAndDelete(monitorId);
+
 		if (!monitor) {
 			throw new Error(stringService.getDbFindMonitorById(monitorId));
 		}
+
 		return monitor;
 	} catch (error) {
 		error.service = SERVICE_NAME;
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index b2f7ef7d6..d6331fcf8 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -106,7 +106,10 @@ const getStatusPage = async (url) => {
 				},
 			},
 			{
-				$unwind: "$monitors",
+				$unwind: {
+					path: "$monitors",
+					preserveNullAndEmptyArrays: true,
+				},
 			},
 			{
 				$lookup: {
@@ -153,9 +156,17 @@ const getStatusPage = async (url) => {
 						url: 1,
 					},
 					monitors: {
-						$sortArray: {
-							input: "$monitors",
-							sortBy: { orderIndex: 1 },
+						$filter: {
+							input: {
+								$sortArray: {
+									input: "$monitors",
+									sortBy: { orderIndex: 1 },
+								},
+							},
+							as: "monitor",
+							cond: {
+								$ne: ["$$monitor.orderIndex", -1],
+							},
 						},
 					},
 				},

From d19bbf2b8e195c0bb658794e1f5788a4c1f17f26 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 13 Jun 2025 14:15:37 +0530
Subject: [PATCH 148/319] Hide send email button until validation is complete

---
 client/src/Pages/Settings/SettingsEmail.jsx | 21 +++++++++++----------
 client/src/locales/en.json                  |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 50f90c38f..81de64392 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -136,8 +136,7 @@ const SettingsEmail = ({
 					<Box
 						sx={{
 							display: "flex",
-							flexDirection: "row",
-							alignItems: "center",
+							flexDirection: "column",
 							gap: theme.spacing(4),
 						}}
 					>
@@ -250,14 +249,16 @@ const SettingsEmail = ({
 						/>
 					</Box>
 					<Box>
-						<Button
-							variant="contained"
-							color="accent"
-							loading={isSending}
-							onClick={handleSendTestEmail}
-						>
-							{t("settingsTestEmail", "Send test e-mail")}
-						</Button>
+						{systemEmailHost && systemEmailPort && systemEmailAddress && (
+							<Button
+								variant="contained"
+								color="accent"
+								loading={isSending}
+								onClick={handleSendTestEmail}
+							>
+								{t("settingsTestEmail", "Send test e-mail")}
+							</Button>
+						)}
 					</Box>
 				</Stack>
 			</Box>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index ca3f9dcd6..86d7a8169 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -684,7 +684,7 @@
 	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
 	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
 	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool",
+	"settingsEmailPool": "Pool - Enable connection pooling",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",

From 2d839285f28528d8174fd0bdf5c20e8478dc1377 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 13 Jun 2025 20:40:01 +0530
Subject: [PATCH 149/319] Switch Buttons Position

---
 client/src/Pages/Settings/SettingsEmail.jsx | 50 +++++++++------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 81de64392..b6ccaf344 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -133,26 +133,6 @@ const SettingsEmail = ({
 							onChange={handleChange}
 						/>
 					</Box>
-					<Box
-						sx={{
-							display: "flex",
-							flexDirection: "column",
-							gap: theme.spacing(4),
-						}}
-					>
-						<Typography>{t("settingsEmailSecure")}</Typography>
-						<Switch
-							name="systemEmailSecure"
-							checked={systemEmailSecure}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailPool")}</Typography>
-						<Switch
-							name="systemEmailPool"
-							checked={systemEmailPool}
-							onChange={handleChange}
-						/>
-					</Box>
 					<Box>
 						<Typography>{t("settingsEmailUser")}</Typography>
 						<TextInput
@@ -213,6 +193,15 @@ const SettingsEmail = ({
 							onChange={handleChange}
 						/>
 					</Box>
+					<Box>
+						<Typography>{t("settingsEmailConnectionHost")}</Typography>
+						<TextInput
+							name="systemEmailConnectionHost"
+							placeholder="bluewavelabs.ca"
+							value={systemEmailConnectionHost}
+							onChange={handleChange}
+						/>
+					</Box>
 					<Box
 						sx={{
 							display: "flex",
@@ -220,6 +209,18 @@ const SettingsEmail = ({
 							gap: theme.spacing(4),
 						}}
 					>
+						<Typography>{t("settingsEmailSecure")}</Typography>
+						<Switch
+							name="systemEmailSecure"
+							checked={systemEmailSecure}
+							onChange={handleChange}
+						/>
+						<Typography>{t("settingsEmailPool")}</Typography>
+						<Switch
+							name="systemEmailPool"
+							checked={systemEmailPool}
+							onChange={handleChange}
+						/>
 						<Typography>{t("settingsEmailIgnoreTLS")}</Typography>
 						<Switch
 							name="systemEmailIgnoreTLS"
@@ -239,15 +240,6 @@ const SettingsEmail = ({
 							onChange={handleChange}
 						/>
 					</Box>
-					<Box>
-						<Typography>{t("settingsEmailConnectionHost")}</Typography>
-						<TextInput
-							name="systemEmailConnectionHost"
-							placeholder="bluewavelabs.ca"
-							value={systemEmailConnectionHost}
-							onChange={handleChange}
-						/>
-					</Box>
 					<Box>
 						{systemEmailHost && systemEmailPort && systemEmailAddress && (
 							<Button

From 91694ff072ce0ce2900df9153c7dd740b853100f Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Sat, 14 Jun 2025 11:01:47 +0530
Subject: [PATCH 150/319] Password Validation Check

---
 client/src/Pages/Settings/SettingsEmail.jsx | 28 ++++++++++++---------
 client/src/locales/en.json                  |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index b6ccaf344..e7ae88154 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -81,12 +81,13 @@ const SettingsEmail = ({
 		if (
 			!emailConfig.systemEmailHost ||
 			!emailConfig.systemEmailPort ||
-			!emailConfig.systemEmailAddress
+			!emailConfig.systemEmailAddress ||
+			!emailConfig.systemEmailPassword
 		) {
 			createToast({
 				body: t(
 					"settingsEmailRequiredFields",
-					"Email address, host and port are required"
+					"Email address, host, port and password are required"
 				),
 				variant: "error",
 			});
@@ -241,16 +242,19 @@ const SettingsEmail = ({
 						/>
 					</Box>
 					<Box>
-						{systemEmailHost && systemEmailPort && systemEmailAddress && (
-							<Button
-								variant="contained"
-								color="accent"
-								loading={isSending}
-								onClick={handleSendTestEmail}
-							>
-								{t("settingsTestEmail", "Send test e-mail")}
-							</Button>
-						)}
+						{systemEmailHost &&
+							systemEmailPort &&
+							systemEmailAddress &&
+							systemEmailPassword && (
+								<Button
+									variant="contained"
+									color="accent"
+									loading={isSending}
+									onClick={handleSendTestEmail}
+								>
+									{t("settingsTestEmail", "Send test e-mail")}
+								</Button>
+							)}
 					</Box>
 				</Stack>
 			</Box>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 86d7a8169..387b06a9f 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -714,7 +714,7 @@
 	"settingsTestEmailFailed": "Failed to send test email",
 	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
 	"settingsTestEmailUnknownError": "Unknown error",
-	"settingsEmailRequiredFields": "Email address, host and port are required",
+	"settingsEmailRequiredFields": "Email address, host, port and password are required",
 	"statusMsg": {
 		"paused": "Monitoring is paused.",
 		"up": "Your site is up.",

From 7189c19d55057eb38f704d87e419198626d271ea Mon Sep 17 00:00:00 2001
From: Amol <meamolvyas@gmail.com>
Date: Sat, 14 Jun 2025 16:16:49 +0530
Subject: [PATCH 151/319] feat: add search functionality to infrastructure
 moniter

---
 .../Components/LoadingSpinner/index.jsx       | 46 +++++++++++++++++
 .../Components/MonitorsTable/index.jsx        | 40 ++++++++-------
 .../Components/SearchComponent/index.jsx      | 49 +++++++++++++++++++
 .../Monitors/Hooks/useDebounce.jsx            | 18 +++++++
 .../Monitors/Hooks/useMonitorFetch.jsx        |  5 +-
 .../Pages/Infrastructure/Monitors/index.jsx   | 11 +++++
 client/src/Utils/NetworkService.js            |  4 +-
 server/db/mongo/modules/monitorModule.js      |  5 +-
 server/validation/joi.js                      |  1 +
 9 files changed, 158 insertions(+), 21 deletions(-)
 create mode 100644 client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
 create mode 100644 client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
 create mode 100644 client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx

diff --git a/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
new file mode 100644
index 000000000..a649473af
--- /dev/null
+++ b/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
@@ -0,0 +1,46 @@
+import { CircularProgress, Box } from "@mui/material";
+import { useTheme } from "@emotion/react";
+import PropTypes from "prop-types";
+const LoadingSpinner = ({ shouldRender }) => {
+	const theme = useTheme();
+	if (shouldRender === false) {
+		return;
+	}
+
+	return (
+		<>
+			<Box
+				width="100%"
+				height="100%"
+				position="absolute"
+				sx={{
+					backgroundColor: theme.palette.primary.main,
+					opacity: 0.8,
+					zIndex: 100,
+				}}
+			/>
+			<Box
+				height="100%"
+				position="absolute"
+				top="50%"
+				left="50%"
+				sx={{
+					transform: "translateX(-50%)",
+					zIndex: 101,
+				}}
+			>
+				<CircularProgress
+					sx={{
+						color: theme.palette.accent.main,
+					}}
+				/>
+			</Box>
+		</>
+	);
+};
+
+LoadingSpinner.propTypes = {
+	shouldRender: PropTypes.bool,
+};
+
+export default LoadingSpinner;
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 0ec435c60..02c32cc8c 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -1,9 +1,11 @@
 // Components
+import { Box } from "@mui/material";
 import DataTable from "../../../../../Components/Table";
 import Host from "../../../../../Components/Host";
 import { StatusLabel } from "../../../../../Components/Label";
 import { Stack } from "@mui/material";
 import { InfrastructureMenu } from "../MonitorsTableMenu";
+import LoadingSpinner from "../LoadingSpinner";
 // Assets
 import CPUChipIcon from "../../../../../assets/icons/cpu-chip.svg?react";
 import CustomGauge from "../../../../../Components/Charts/CustomGauge";
@@ -15,7 +17,7 @@ import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 
-const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete }) => {
+const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete, isSearching }) => {
 	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -119,23 +121,26 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 	});
 
 	return (
-		<DataTable
-			shouldRender={shouldRender}
-			headers={headers}
-			data={data}
-			config={{
-				/* TODO this behavior seems to be repeated. Put it on the root table? */
-				rowSX: {
-					cursor: "pointer",
-					"&:hover td": {
-						backgroundColor: theme.palette.tertiary.main,
-						transition: "background-color .3s ease",
+		<Box position="relative">
+			<LoadingSpinner shouldRender={isSearching} />
+			<DataTable
+				shouldRender={shouldRender}
+				headers={headers}
+				data={data}
+				config={{
+					/* TODO this behavior seems to be repeated. Put it on the root table? */
+					rowSX: {
+						cursor: "pointer",
+						"&:hover td": {
+							backgroundColor: theme.palette.tertiary.main,
+							transition: "background-color .3s ease",
+						},
 					},
-				},
-				onRowClick: (row) => openDetails(row.id),
-				emptyView: "No monitors found",
-			}}
-		/>
+					onRowClick: (row) => openDetails(row.id),
+					emptyView: "No monitors found",
+				}}
+			/>
+		</Box>
 	);
 };
 
@@ -144,6 +149,7 @@ MonitorsTable.propTypes = {
 	monitors: PropTypes.array,
 	isAdmin: PropTypes.bool,
 	handleActionMenuDelete: PropTypes.func,
+	isSearching: PropTypes.bool,
 };
 
 export default MonitorsTable;
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
new file mode 100644
index 000000000..0c6eec854
--- /dev/null
+++ b/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
@@ -0,0 +1,49 @@
+import { useState } from "react";
+import Search from "../../../../../Components/Inputs/Search";
+import { Box } from "@mui/material";
+import useDebounce from "../../Hooks/useDebounce";
+import { useEffect, useRef } from "react";
+import PropTypes from "prop-types";
+
+const SearchComponent = ({ monitors = [], onSearchChange, setIsSearching }) => {
+	const isFirstRender = useRef(true);
+	const [localSearch, setLocalSearch] = useState("");
+	const debouncedSearch = useDebounce(localSearch, 500);
+	useEffect(() => {
+		if (isFirstRender.current === true) {
+			isFirstRender.current = false;
+			return;
+		}
+		onSearchChange(debouncedSearch);
+		setIsSearching(false);
+	}, [debouncedSearch, onSearchChange, setIsSearching]);
+
+	const handleSearch = (value) => {
+		setLocalSearch(value);
+		setIsSearching(true);
+	};
+
+	return (
+		<Box
+			width="25%"
+			minWidth={150}
+			ml="auto"
+			mt={2}
+		>
+			<Search
+				options={monitors}
+				filteredBy="name"
+				inputValue={localSearch}
+				handleInputChange={handleSearch}
+			/>
+		</Box>
+	);
+};
+
+SearchComponent.propTypes = {
+	monitors: PropTypes.array,
+	onSearchChange: PropTypes.func,
+	setIsSearching: PropTypes.func,
+};
+
+export default SearchComponent;
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
new file mode 100644
index 000000000..fad002e48
--- /dev/null
+++ b/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
@@ -0,0 +1,18 @@
+import { useState, useEffect } from "react";
+
+const useDebounce = (value, delay) => {
+    const [debouncedValue, setDebouncedValue] = useState(value);
+
+    useEffect(() => {
+        const handler = setTimeout(() => {
+            setDebouncedValue(value);
+        }, delay);
+
+        return () => {
+            clearTimeout(handler);
+        };
+    }, [value, delay]);
+    return debouncedValue;
+};
+
+export default useDebounce;
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
index 883205c77..2ef725ffd 100644
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
@@ -3,7 +3,7 @@ import { useSelector } from "react-redux";
 import { networkService } from "../../../../main";
 import { createToast } from "../../../../Utils/toastUtils";
 
-const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger }) => {
+const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger, search }) => {
 	// Redux state
 	const { user } = useSelector((state) => state.auth);
 
@@ -24,6 +24,7 @@ const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger }) =>
 					types: ["hardware"],
 					page: page,
 					rowsPerPage: rowsPerPage,
+					search: search
 				});
 				setMonitors(response?.data?.data?.filteredMonitors ?? []);
 				setSummary(response?.data?.data?.summary ?? {});
@@ -38,7 +39,7 @@ const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger }) =>
 		};
 
 		fetchMonitors();
-	}, [page, field, filter, rowsPerPage, user.teamId, updateTrigger]);
+	}, [page, field, filter, rowsPerPage, user.teamId, updateTrigger, search]);
 
 	return { monitors, summary, isLoading, networkError };
 };
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index bfba843c0..7af0be373 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -8,6 +8,7 @@ import Pagination from "../../..//Components/Table/TablePagination";
 import GenericFallback from "../../../Components/GenericFallback";
 import Fallback from "../../../Components/Fallback";
 import Filter from "./Components/Filters";
+import SearchComponent from "./Components/SearchComponent";
 // Utils
 import { useTheme } from "@emotion/react";
 import { useMonitorFetch } from "./Hooks/useMonitorFetch";
@@ -24,6 +25,8 @@ const InfrastructureMonitors = () => {
 	const [updateTrigger, setUpdateTrigger] = useState(false);
 	const [selectedStatus, setSelectedStatus] = useState(undefined);
 	const [toFilterStatus, setToFilterStatus] = useState(undefined);
+	const [search, setSearch] = useState(undefined);
+	const [isSearching, setIsSearching] = useState(false);
 
 	// Utils
 	const theme = useTheme();
@@ -56,6 +59,7 @@ const InfrastructureMonitors = () => {
 		filter: toFilterStatus,
 		rowsPerPage,
 		updateTrigger,
+		search
 	});
 
 	if (networkError === true) {
@@ -108,12 +112,19 @@ const InfrastructureMonitors = () => {
 					setToFilterStatus={setToFilterStatus}
 					handleReset={handleReset}
 				/>
+				<SearchComponent
+					monitors={monitors}
+					onSearchChange={setSearch}
+					setIsSearching={setIsSearching}
+				/>
 			</Stack>
+
 			<MonitorsTable
 				shouldRender={!isLoading}
 				monitors={monitors}
 				isAdmin={isAdmin}
 				handleActionMenuDelete={handleActionMenuDelete}
+				isSearching={isSearching}
 			/>
 			<Pagination
 				itemCount={summary?.totalMonitors}
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 3d124a3e6..a8b7833da 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -182,11 +182,12 @@ class NetworkService {
 	 * @param {string} [config.filter] - The filter to apply to the monitors.
 	 * @param {string} [config.field] - The field to sort by.
 	 * @param {string} [config.order] - The order in which to sort the field.
+	 * @param {string} [config.search] - The search term to filter monitors by name.
 	 * @returns {Promise<AxiosResponse>} The response from the axios GET request.
 	 */
 
 	async getMonitorsByTeamId(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
+		const { teamId, limit, types, page, rowsPerPage, filter, field, order, search } = config;
 		const params = new URLSearchParams();
 
 		if (limit) params.append("limit", limit);
@@ -200,6 +201,7 @@ class NetworkService {
 		if (filter) params.append("filter", filter);
 		if (field) params.append("field", field);
 		if (order) params.append("order", order);
+		if (search) params.append("search", search);
 
 		return this.axiosInstance.get(`/monitors/team/${teamId}?${params.toString()}`, {
 			headers: {
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 3d9adab39..0e90c9c7f 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -510,7 +510,7 @@ const getMonitorById = async (monitorId) => {
 };
 
 const getMonitorsByTeamId = async (req) => {
-	let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
+	let { limit, type, page, rowsPerPage, filter, field, order, search } = req.query;
 	limit = parseInt(limit);
 	page = parseInt(page);
 	rowsPerPage = parseInt(rowsPerPage);
@@ -523,6 +523,9 @@ const getMonitorsByTeamId = async (req) => {
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
+	if (search) {
+		matchStage.name = { $regex: search, $options: "i" };
+	}
 
 	const summaryResult = await Monitor.aggregate(
 		buildMonitorSummaryByTeamIdPipeline({ matchStage })
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 271cd2d21..40acc35c2 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -147,6 +147,7 @@ const getMonitorsByTeamIdQueryValidation = joi.object({
 	filter: joi.string(),
 	field: joi.string(),
 	order: joi.string().valid("asc", "desc"),
+	search: joi.string()
 });
 
 const getMonitorStatsByIdParamValidation = joi.object({

From 800fd4792d1bbe1484b3e93d52e99eb56de69eeb Mon Sep 17 00:00:00 2001
From: Amol <meamolvyas@gmail.com>
Date: Sat, 14 Jun 2025 16:23:05 +0530
Subject: [PATCH 152/319] fix: running formatting script on both client and
 server directories

---
 .../Components/MonitorsTable/index.jsx        |  8 +++++++-
 .../Monitors/Hooks/useDebounce.jsx            | 20 +++++++++----------
 .../Monitors/Hooks/useMonitorFetch.jsx        |  2 +-
 .../Pages/Infrastructure/Monitors/index.jsx   |  2 +-
 client/src/Utils/NetworkService.js            |  3 ++-
 server/validation/joi.js                      |  2 +-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 02c32cc8c..b19853b1e 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -17,7 +17,13 @@ import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 
-const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete, isSearching }) => {
+const MonitorsTable = ({
+	shouldRender,
+	monitors,
+	isAdmin,
+	handleActionMenuDelete,
+	isSearching,
+}) => {
 	// Utils
 	const theme = useTheme();
 	const { t } = useTranslation();
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
index fad002e48..11d639f14 100644
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
@@ -1,18 +1,18 @@
 import { useState, useEffect } from "react";
 
 const useDebounce = (value, delay) => {
-    const [debouncedValue, setDebouncedValue] = useState(value);
+	const [debouncedValue, setDebouncedValue] = useState(value);
 
-    useEffect(() => {
-        const handler = setTimeout(() => {
-            setDebouncedValue(value);
-        }, delay);
+	useEffect(() => {
+		const handler = setTimeout(() => {
+			setDebouncedValue(value);
+		}, delay);
 
-        return () => {
-            clearTimeout(handler);
-        };
-    }, [value, delay]);
-    return debouncedValue;
+		return () => {
+			clearTimeout(handler);
+		};
+	}, [value, delay]);
+	return debouncedValue;
 };
 
 export default useDebounce;
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
index 2ef725ffd..3d091dc64 100644
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
@@ -24,7 +24,7 @@ const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger, sear
 					types: ["hardware"],
 					page: page,
 					rowsPerPage: rowsPerPage,
-					search: search
+					search: search,
 				});
 				setMonitors(response?.data?.data?.filteredMonitors ?? []);
 				setSummary(response?.data?.data?.summary ?? {});
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 7af0be373..e9ac4c4eb 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -59,7 +59,7 @@ const InfrastructureMonitors = () => {
 		filter: toFilterStatus,
 		rowsPerPage,
 		updateTrigger,
-		search
+		search,
 	});
 
 	if (networkError === true) {
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index a8b7833da..1b4ffba0f 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -187,7 +187,8 @@ class NetworkService {
 	 */
 
 	async getMonitorsByTeamId(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order, search } = config;
+		const { teamId, limit, types, page, rowsPerPage, filter, field, order, search } =
+			config;
 		const params = new URLSearchParams();
 
 		if (limit) params.append("limit", limit);
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 40acc35c2..6d8e97cf1 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -147,7 +147,7 @@ const getMonitorsByTeamIdQueryValidation = joi.object({
 	filter: joi.string(),
 	field: joi.string(),
 	order: joi.string().valid("asc", "desc"),
-	search: joi.string()
+	search: joi.string(),
 });
 
 const getMonitorStatsByIdParamValidation = joi.object({

From 216e53166d9e3d725b9449bc20a1ae0d61303c27 Mon Sep 17 00:00:00 2001
From: Kaotic3 <80522225+Kaotic3@users.noreply.github.com>
Date: Sat, 14 Jun 2025 17:13:55 +0100
Subject: [PATCH 153/319] Persist infrastructure monitors rows per page

---
 client/src/Features/UI/uiSlice.js                  |  3 +++
 client/src/Pages/Infrastructure/Monitors/index.jsx | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/src/Features/UI/uiSlice.js b/client/src/Features/UI/uiSlice.js
index 3addfbb7a..45ba267b0 100644
--- a/client/src/Features/UI/uiSlice.js
+++ b/client/src/Features/UI/uiSlice.js
@@ -16,6 +16,9 @@ const initialState = {
 	maintenance: {
 		rowsPerPage: 5,
 	},
+	infrastructure: {
+		rowsPerPage: 5,
+	},
 	sidebar: {
 		collapsed: false,
 	},
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 6b726309c..6ecf8e54d 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -14,16 +14,19 @@ import { useState } from "react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useTranslation } from "react-i18next";
 import { useFetchMonitorsByTeamId } from "../../../Hooks/monitorHooks";
+import { useDispatch, useSelector } from "react-redux";
+import { setRowsPerPage } from "../../../Features/UI/uiSlice";
 // Constants
 const TYPES = ["hardware"];
 const BREADCRUMBS = [{ name: `infrastructure`, path: "/infrastructure" }];
 
 const InfrastructureMonitors = () => {
 	// Redux state
+	const rowsPerPage = useSelector((state) => state.ui.infrastructure.rowsPerPage);
+	const dispatch = useDispatch();
 
 	// Local state
 	const [page, setPage] = useState(0);
-	const [rowsPerPage, setRowsPerPage] = useState(5);
 	const [updateTrigger, setUpdateTrigger] = useState(false);
 	const [selectedStatus, setSelectedStatus] = useState(undefined);
 	const [toFilterStatus, setToFilterStatus] = useState(undefined);
@@ -43,7 +46,13 @@ const InfrastructureMonitors = () => {
 	};
 
 	const handleChangeRowsPerPage = (event) => {
-		setRowsPerPage(event.target.value);
+		dispatch(
+			setRowsPerPage({
+				value: parseInt(event.target.value, 10),
+				table: "infrastructure",
+			})
+		);
+		setPage(0);
 	};
 
 	const handleReset = () => {

From b105626f0b77bde89a55ba8dab03cc6d553dbcce Mon Sep 17 00:00:00 2001
From: Steven Kennedy <Steven.Kennedy@consilio.com>
Date: Sat, 14 Jun 2025 17:40:46 +0100
Subject: [PATCH 154/319] Persist rowsPerPage setting in local storage


From e366741aa9ff3f37a2f0727c948316ad129c25a6 Mon Sep 17 00:00:00 2001
From: Amol <meamolvyas@gmail.com>
Date: Sat, 14 Jun 2025 23:49:39 +0530
Subject: [PATCH 155/319] fix: updating code to the coding standards & changing
 the search param

---
 .../Components/LoadingSpinner/index.jsx       | 46 -----------------
 .../Components/MonitorsTable/index.jsx        |  2 +-
 .../Components/SearchComponent/index.jsx      | 49 -------------------
 .../Monitors/Hooks/useDebounce.jsx            | 18 -------
 .../Monitors/Hooks/useMonitorFetch.jsx        |  5 +-
 .../Pages/Infrastructure/Monitors/index.jsx   |  5 +-
 client/src/Utils/NetworkService.js            |  4 +-
 server/db/mongo/modules/monitorModule.js      |  6 +--
 server/validation/joi.js                      |  1 -
 9 files changed, 9 insertions(+), 127 deletions(-)
 delete mode 100644 client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
 delete mode 100644 client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
 delete mode 100644 client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx

diff --git a/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
deleted file mode 100644
index a649473af..000000000
--- a/client/src/Pages/Infrastructure/Monitors/Components/LoadingSpinner/index.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { CircularProgress, Box } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import PropTypes from "prop-types";
-const LoadingSpinner = ({ shouldRender }) => {
-	const theme = useTheme();
-	if (shouldRender === false) {
-		return;
-	}
-
-	return (
-		<>
-			<Box
-				width="100%"
-				height="100%"
-				position="absolute"
-				sx={{
-					backgroundColor: theme.palette.primary.main,
-					opacity: 0.8,
-					zIndex: 100,
-				}}
-			/>
-			<Box
-				height="100%"
-				position="absolute"
-				top="50%"
-				left="50%"
-				sx={{
-					transform: "translateX(-50%)",
-					zIndex: 101,
-				}}
-			>
-				<CircularProgress
-					sx={{
-						color: theme.palette.accent.main,
-					}}
-				/>
-			</Box>
-		</>
-	);
-};
-
-LoadingSpinner.propTypes = {
-	shouldRender: PropTypes.bool,
-};
-
-export default LoadingSpinner;
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index b19853b1e..9ab128c5e 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -5,7 +5,7 @@ import Host from "../../../../../Components/Host";
 import { StatusLabel } from "../../../../../Components/Label";
 import { Stack } from "@mui/material";
 import { InfrastructureMenu } from "../MonitorsTableMenu";
-import LoadingSpinner from "../LoadingSpinner";
+import LoadingSpinner from "../../../../Uptime/Monitors/Components/LoadingSpinner";
 // Assets
 import CPUChipIcon from "../../../../../assets/icons/cpu-chip.svg?react";
 import CustomGauge from "../../../../../Components/Charts/CustomGauge";
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
deleted file mode 100644
index 0c6eec854..000000000
--- a/client/src/Pages/Infrastructure/Monitors/Components/SearchComponent/index.jsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useState } from "react";
-import Search from "../../../../../Components/Inputs/Search";
-import { Box } from "@mui/material";
-import useDebounce from "../../Hooks/useDebounce";
-import { useEffect, useRef } from "react";
-import PropTypes from "prop-types";
-
-const SearchComponent = ({ monitors = [], onSearchChange, setIsSearching }) => {
-	const isFirstRender = useRef(true);
-	const [localSearch, setLocalSearch] = useState("");
-	const debouncedSearch = useDebounce(localSearch, 500);
-	useEffect(() => {
-		if (isFirstRender.current === true) {
-			isFirstRender.current = false;
-			return;
-		}
-		onSearchChange(debouncedSearch);
-		setIsSearching(false);
-	}, [debouncedSearch, onSearchChange, setIsSearching]);
-
-	const handleSearch = (value) => {
-		setLocalSearch(value);
-		setIsSearching(true);
-	};
-
-	return (
-		<Box
-			width="25%"
-			minWidth={150}
-			ml="auto"
-			mt={2}
-		>
-			<Search
-				options={monitors}
-				filteredBy="name"
-				inputValue={localSearch}
-				handleInputChange={handleSearch}
-			/>
-		</Box>
-	);
-};
-
-SearchComponent.propTypes = {
-	monitors: PropTypes.array,
-	onSearchChange: PropTypes.func,
-	setIsSearching: PropTypes.func,
-};
-
-export default SearchComponent;
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
deleted file mode 100644
index 11d639f14..000000000
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useDebounce.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useState, useEffect } from "react";
-
-const useDebounce = (value, delay) => {
-	const [debouncedValue, setDebouncedValue] = useState(value);
-
-	useEffect(() => {
-		const handler = setTimeout(() => {
-			setDebouncedValue(value);
-		}, delay);
-
-		return () => {
-			clearTimeout(handler);
-		};
-	}, [value, delay]);
-	return debouncedValue;
-};
-
-export default useDebounce;
diff --git a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
index 3d091dc64..883205c77 100644
--- a/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Hooks/useMonitorFetch.jsx
@@ -3,7 +3,7 @@ import { useSelector } from "react-redux";
 import { networkService } from "../../../../main";
 import { createToast } from "../../../../Utils/toastUtils";
 
-const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger, search }) => {
+const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger }) => {
 	// Redux state
 	const { user } = useSelector((state) => state.auth);
 
@@ -24,7 +24,6 @@ const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger, sear
 					types: ["hardware"],
 					page: page,
 					rowsPerPage: rowsPerPage,
-					search: search,
 				});
 				setMonitors(response?.data?.data?.filteredMonitors ?? []);
 				setSummary(response?.data?.data?.summary ?? {});
@@ -39,7 +38,7 @@ const useMonitorFetch = ({ page, field, filter, rowsPerPage, updateTrigger, sear
 		};
 
 		fetchMonitors();
-	}, [page, field, filter, rowsPerPage, user.teamId, updateTrigger, search]);
+	}, [page, field, filter, rowsPerPage, user.teamId, updateTrigger]);
 
 	return { monitors, summary, isLoading, networkError };
 };
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index e9ac4c4eb..2f146f2de 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -8,7 +8,7 @@ import Pagination from "../../..//Components/Table/TablePagination";
 import GenericFallback from "../../../Components/GenericFallback";
 import Fallback from "../../../Components/Fallback";
 import Filter from "./Components/Filters";
-import SearchComponent from "./Components/SearchComponent";
+import SearchComponent from "../../Uptime/Monitors/Components/SearchComponent";
 // Utils
 import { useTheme } from "@emotion/react";
 import { useMonitorFetch } from "./Hooks/useMonitorFetch";
@@ -56,10 +56,9 @@ const InfrastructureMonitors = () => {
 	const { monitors, summary, isLoading, networkError } = useMonitorFetch({
 		page,
 		field: field,
-		filter: toFilterStatus,
+		filter: toFilterStatus || search,
 		rowsPerPage,
 		updateTrigger,
-		search,
 	});
 
 	if (networkError === true) {
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 1b4ffba0f..27964a5ef 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -187,8 +187,7 @@ class NetworkService {
 	 */
 
 	async getMonitorsByTeamId(config) {
-		const { teamId, limit, types, page, rowsPerPage, filter, field, order, search } =
-			config;
+		const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
 		const params = new URLSearchParams();
 
 		if (limit) params.append("limit", limit);
@@ -202,7 +201,6 @@ class NetworkService {
 		if (filter) params.append("filter", filter);
 		if (field) params.append("field", field);
 		if (order) params.append("order", order);
-		if (search) params.append("search", search);
 
 		return this.axiosInstance.get(`/monitors/team/${teamId}?${params.toString()}`, {
 			headers: {
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 0e90c9c7f..735cb6cc5 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -510,7 +510,7 @@ const getMonitorById = async (monitorId) => {
 };
 
 const getMonitorsByTeamId = async (req) => {
-	let { limit, type, page, rowsPerPage, filter, field, order, search } = req.query;
+	let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
 	limit = parseInt(limit);
 	page = parseInt(page);
 	rowsPerPage = parseInt(rowsPerPage);
@@ -523,8 +523,8 @@ const getMonitorsByTeamId = async (req) => {
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
-	if (search) {
-		matchStage.name = { $regex: search, $options: "i" };
+	if (field === undefined) {
+		matchStage.name = { $regex: filter, $options: "i" };
 	}
 
 	const summaryResult = await Monitor.aggregate(
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 6d8e97cf1..271cd2d21 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -147,7 +147,6 @@ const getMonitorsByTeamIdQueryValidation = joi.object({
 	filter: joi.string(),
 	field: joi.string(),
 	order: joi.string().valid("asc", "desc"),
-	search: joi.string(),
 });
 
 const getMonitorStatsByIdParamValidation = joi.object({

From 91741c2ae51341b3076b5144d3a70150ab664d48 Mon Sep 17 00:00:00 2001
From: Amol <meamolvyas@gmail.com>
Date: Sun, 15 Jun 2025 03:17:22 +0530
Subject: [PATCH 156/319] fix: removing unused code blocks and better handling
 for filter param

---
 client/src/Pages/Infrastructure/Monitors/index.jsx | 2 +-
 client/src/Utils/NetworkService.js                 | 1 -
 server/db/mongo/modules/monitorModule.js           | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 2f146f2de..445ba8105 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -56,7 +56,7 @@ const InfrastructureMonitors = () => {
 	const { monitors, summary, isLoading, networkError } = useMonitorFetch({
 		page,
 		field: field,
-		filter: toFilterStatus || search,
+		filter: toFilterStatus ?? search,
 		rowsPerPage,
 		updateTrigger,
 	});
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 27964a5ef..3d124a3e6 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -182,7 +182,6 @@ class NetworkService {
 	 * @param {string} [config.filter] - The filter to apply to the monitors.
 	 * @param {string} [config.field] - The field to sort by.
 	 * @param {string} [config.order] - The order in which to sort the field.
-	 * @param {string} [config.search] - The search term to filter monitors by name.
 	 * @returns {Promise<AxiosResponse>} The response from the axios GET request.
 	 */
 
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 735cb6cc5..3d9adab39 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -523,9 +523,6 @@ const getMonitorsByTeamId = async (req) => {
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
-	if (field === undefined) {
-		matchStage.name = { $regex: filter, $options: "i" };
-	}
 
 	const summaryResult = await Monitor.aggregate(
 		buildMonitorSummaryByTeamIdPipeline({ matchStage })

From 738925d5ecdc3286f3cafd3736d105d167d3d361 Mon Sep 17 00:00:00 2001
From: Amol <meamolvyas@gmail.com>
Date: Sun, 15 Jun 2025 15:29:48 +0530
Subject: [PATCH 157/319] fix: remove shouldRender prop as it is now managed by
 isLoading

---
 .../Monitors/Components/MonitorsTable/index.jsx               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 639753638..7ee603ef7 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -18,7 +18,7 @@ import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 
 const MonitorsTable = ({
-	shouldRender,
+	isLoading,
 	monitors,
 	isAdmin,
 	handleActionMenuDelete,
@@ -131,7 +131,7 @@ const MonitorsTable = ({
 		<Box position="relative">
 			<LoadingSpinner shouldRender={isSearching} />
 			<DataTable
-				shouldRender={shouldRender}
+				shouldRender={!isLoading}
 				headers={headers}
 				data={data}
 				config={{

From 20e32fad047e9fd183b2ce478ac9c89910d68891 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 09:44:21 +0800
Subject: [PATCH 158/319] safe rowsPerPage access

---
 client/src/Pages/Infrastructure/Monitors/index.jsx      | 2 +-
 client/src/Pages/Maintenance/MaintenanceTable/index.jsx | 2 +-
 client/src/Pages/Maintenance/index.jsx                  | 2 +-
 client/src/Pages/Uptime/Monitors/index.jsx              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index f5527f3be..3d8d78128 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -23,7 +23,7 @@ const BREADCRUMBS = [{ name: `infrastructure`, path: "/infrastructure" }];
 
 const InfrastructureMonitors = () => {
 	// Redux state
-	const rowsPerPage = useSelector((state) => state.ui.infrastructure.rowsPerPage);
+	const rowsPerPage = useSelector((state) => state.ui?.infrastructure?.rowsPerPage ?? 5);
 	const dispatch = useDispatch();
 
 	// Local state
diff --git a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
index 0cd8ada17..a798838cb 100644
--- a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
+++ b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
@@ -34,7 +34,7 @@ const MaintenanceTable = ({
 	maintenanceWindowCount,
 	updateCallback,
 }) => {
-	const { rowsPerPage } = useSelector((state) => state.ui.maintenance);
+	const rowsPerPage = useSelector((state) => state?.ui?.maintenance?.rowsPerPage ?? 5);
 	const dispatch = useDispatch();
 
 	const handleChangePage = (event, newPage) => {
diff --git a/client/src/Pages/Maintenance/index.jsx b/client/src/Pages/Maintenance/index.jsx
index f155680a5..66b80f87d 100644
--- a/client/src/Pages/Maintenance/index.jsx
+++ b/client/src/Pages/Maintenance/index.jsx
@@ -17,7 +17,7 @@ const Maintenance = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const navigate = useNavigate();
-	const { rowsPerPage } = useSelector((state) => state.ui.maintenance);
+	const rowsPerPage = useSelector((state) => state?.ui?.maintenance?.rowsPerPage ?? 5);
 	const isAdmin = useIsAdmin();
 	const [maintenanceWindows, setMaintenanceWindows] = useState([]);
 	const [maintenanceWindowCount, setMaintenanceWindowCount] = useState(0);
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index 030ce922c..164a77378 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -64,7 +64,7 @@ CreateMonitorButton.propTypes = {
 
 const UptimeMonitors = () => {
 	// Redux state
-	const rowsPerPage = useSelector((state) => state.ui.monitors.rowsPerPage);
+	const rowsPerPage = useSelector((state) => state.ui?.monitors?.rowsPerPage ?? 10);
 
 	// Local state
 	const [search, setSearch] = useState(undefined);

From f6be4317cd4fb3ed669afadc27f47a6733dd9543 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:36:20 +0800
Subject: [PATCH 159/319] remove user and teamid from validation

---
 server/validation/joi.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/server/validation/joi.js b/server/validation/joi.js
index 5eb24e758..725fcf218 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -558,14 +558,6 @@ const triggerNotificationBodyValidation = joi.object({
 });
 
 const createNotificationBodyValidation = joi.object({
-	userId: joi.string().required().messages({
-		"number.empty": "User ID is required",
-		"any.required": "User ID is required",
-	}),
-	teamId: joi.string().required().messages({
-		"string.empty": "Team ID is required",
-		"any.required": "Team ID is required",
-	}),
 	notificationName: joi.string().required().messages({
 		"string.empty": "Notification name is required",
 		"any.required": "Notification name is required",

From 22f8a37f1f93927a2d60c10e5808fedf2297d45f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:36:34 +0800
Subject: [PATCH 160/319] add discord type

---
 server/db/models/Notification.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index 34afa1f31..751324131 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -7,7 +7,7 @@ const configSchema = mongoose.Schema(
 		chatId: { type: String },
 		platform: {
 			type: String,
-			enum: ["slack", "pager_duty", "webhook"],
+			enum: ["slack", "pager_duty", "webhook", "discord"],
 		},
 		routingKey: { type: String },
 	},

From bfae00b69b56e369c250d35c75158174a69ecbf8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:36:45 +0800
Subject: [PATCH 161/319] add strings

---
 client/src/locales/en.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 2791dd3e7..31db9325b 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -298,6 +298,12 @@
 			"description": "Configure your webhook here",
 			"webhookLabel": "Webhook URL",
 			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"discordSettings": {
+			"title": "Discord",
+			"description": "Configure your Discord webhook here",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
 		}
 	},
 

From 5aae16486560bdccba425adc77f8eb8bf551bb90 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:37:04 +0800
Subject: [PATCH 162/319] extrat userId and teamId from req.uesr

---
 server/controllers/notificationController.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index a9c399901..82e2a23ab 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -102,6 +102,7 @@ class NotificationController {
 				success =
 					await this.notificationService.sendTestPagerDutyNotification(notification);
 			}
+
 			if (!success) {
 				return res.error({
 					msg: "Sending notification failed",
@@ -128,7 +129,11 @@ class NotificationController {
 		}
 
 		try {
-			const notification = await this.db.createNotification(req.body);
+			const body = req.body;
+			const { _id, teamId } = req.user;
+			body.userId = _id;
+			body.teamId = teamId;
+			const notification = await this.db.createNotification(body);
 			return res.success({
 				msg: "Notification created successfully",
 				data: notification,

From bea23a94bb6a042faaea8ee3b6ce1b883f5a17ce Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:38:05 +0800
Subject: [PATCH 163/319] handle discord webhooks

---
 .../src/Pages/Notifications/create/index.jsx  | 72 ++++++++++++++-----
 client/src/Pages/Notifications/utils.js       |  3 +-
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index 3c17c113c..8b5512ca8 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -10,7 +10,6 @@ import TextInput from "../../../Components/Inputs/TextInput";
 
 // Utils
 import { useState } from "react";
-import { useSelector } from "react-redux";
 import { useTheme } from "@emotion/react";
 import {
 	useCreateNotification,
@@ -44,7 +43,6 @@ const CreateNotifications = () => {
 	];
 
 	// Redux state
-	const { user } = useSelector((state) => state.auth);
 
 	// local state
 	const [notification, setNotification] = useState({
@@ -73,7 +71,7 @@ const CreateNotifications = () => {
 			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
 		};
 
-		if (notification.type === 2) {
+		if (form.type === "slack" || form.type === "discord") {
 			form.type = "webhook";
 		}
 
@@ -128,27 +126,33 @@ const CreateNotifications = () => {
 
 		// Handle config/platform initialization if type is webhook
 
-		if (newNotification.type === 1) {
+		const type = NOTIFICATION_TYPES.find(
+			(type) => type._id === newNotification.type
+		).value;
+
+		if (newNotification.type === "email") {
 			newNotification.config = null;
-		} else if (newNotification.type === 2) {
+		} else if (type === "slack" || type === "webhook" || type === "discord") {
 			newNotification.address = "";
 			newNotification.config = newNotification.config || {};
 			if (name === "config") {
 				newNotification.config = value;
 			}
-			newNotification.config.platform = "slack";
-		} else if (newNotification.type === 3) {
+			if (type === "webhook") {
+				newNotification.config.platform = "webhook";
+			}
+			if (type === "slack") {
+				newNotification.config.platform = "slack";
+			}
+			if (type === "discord") {
+				newNotification.config.platform = "discord";
+			}
+		} else if (type === "pager_duty") {
 			newNotification.config = newNotification.config || {};
 			if (name === "config") {
 				newNotification.config = value;
 			}
 			newNotification.config.platform = "pager_duty";
-		} else if (newNotification.type === 4) {
-			newNotification.config = newNotification.config || {};
-			if (name === "config") {
-				newNotification.config = value;
-			}
-			newNotification.config.platform = "webhook";
 		}
 
 		// Field-level validation
@@ -159,12 +163,15 @@ const CreateNotifications = () => {
 			fieldError = error?.message;
 		}
 
-		if (newNotification.type === 1 && name === "address") {
+		if (type === "email" && name === "address") {
 			const { error } = notificationEmailValidation.extract(name).validate(value);
 			fieldError = error?.message;
 		}
 
-		if (newNotification.type === 2 && name === "config") {
+		if (
+			(type === "slack" || type === "webhook" || type === "discord") &&
+			name === "config"
+		) {
 			// Validate only webhookUrl inside config
 			const { error } = notificationWebhookValidation.extract("config").validate(value);
 			fieldError = error?.message;
@@ -185,7 +192,7 @@ const CreateNotifications = () => {
 			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
 		};
 
-		if (notification.type === 2) {
+		if (form.type === "slack" || form.type === "discord") {
 			form.type = "webhook";
 		}
 
@@ -405,6 +412,39 @@ const CreateNotifications = () => {
 						</Stack>
 					</ConfigBox>
 				)}
+				{notification.type === 5 && (
+					<ConfigBox>
+						<Box>
+							<Typography component="h2">
+								{t("createNotifications.discordSettings.title")}
+							</Typography>
+							<Typography component="p">
+								{t("createNotifications.discordSettings.description")}
+							</Typography>
+						</Box>
+						<Stack gap={theme.spacing(12)}>
+							<TextInput
+								label={t("createNotifications.discordSettings.webhookLabel")}
+								value={notification.config.webhookUrl || ""}
+								error={Boolean(errors.config)}
+								helperText={errors["config"]}
+								onChange={(e) => {
+									const updatedConfig = {
+										...notification.config,
+										webhookUrl: e.target.value,
+									};
+
+									onChange({
+										target: {
+											name: "config",
+											value: updatedConfig,
+										},
+									});
+								}}
+							/>
+						</Stack>
+					</ConfigBox>
+				)}
 				<Stack
 					direction="row"
 					justifyContent="flex-end"
diff --git a/client/src/Pages/Notifications/utils.js b/client/src/Pages/Notifications/utils.js
index 7135e5c63..545791246 100644
--- a/client/src/Pages/Notifications/utils.js
+++ b/client/src/Pages/Notifications/utils.js
@@ -1,6 +1,7 @@
 export const NOTIFICATION_TYPES = [
 	{ _id: 1, name: "E-mail", value: "email" },
-	{ _id: 2, name: "Slack", value: "webhook" },
+	{ _id: 2, name: "Slack", value: "slack" },
 	{ _id: 3, name: "PagerDuty", value: "pager_duty" },
 	{ _id: 4, name: "Webhook", value: "webhook" },
+	{ _id: 5, name: "Discord", value: "discord" },
 ];

From 9de6b4e2bcfd0441bd3e066b46902d43fd871ca9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 10:45:13 +0800
Subject: [PATCH 164/319] fix uptime config

---
 client/src/Pages/Uptime/Configure/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/Pages/Uptime/Configure/index.jsx b/client/src/Pages/Uptime/Configure/index.jsx
index 5a380f8e5..2dacc26ab 100644
--- a/client/src/Pages/Uptime/Configure/index.jsx
+++ b/client/src/Pages/Uptime/Configure/index.jsx
@@ -198,8 +198,7 @@ const Configure = () => {
 		}
 
 		toSubmit.notifications = form.notifications;
-		console.log(JSON.stringify(toSubmit, null, 2));
-		// await updateMonitor({ monitor: toSubmit, redirect: "/uptime" });
+		await updateMonitor({ monitor: toSubmit, redirect: "/uptime" });
 	};
 
 	// Parse the URL

From 1a198c28ee2a3e350c5754e07a49ede8d185df3e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:13:28 +0800
Subject: [PATCH 165/319] use universal details header in PageSpeed page

---
 client/src/Pages/PageSpeed/Details/index.jsx | 30 +++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/client/src/Pages/PageSpeed/Details/index.jsx b/client/src/Pages/PageSpeed/Details/index.jsx
index e8afcf8c8..8fa7872db 100644
--- a/client/src/Pages/PageSpeed/Details/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/index.jsx
@@ -4,6 +4,7 @@ import Breadcrumbs from "../../../Components/Breadcrumbs";
 import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
 import MonitorStatusHeader from "../../../Components/MonitorStatusHeader";
 import PageSpeedStatusBoxes from "./Components/PageSpeedStatusBoxes";
+import MonitorDetailsControlHeader from "../../../Components/MonitorDetailsControlHeader";
 import PageSpeedAreaChart from "./Components/PageSpeedAreaChart";
 import PerformanceReport from "./Components/PerformanceReport";
 import GenericFallback from "../../../Components/GenericFallback";
@@ -27,6 +28,15 @@ const PageSpeedDetails = () => {
 	const isAdmin = useIsAdmin();
 	const { monitorId } = useParams();
 
+	// Local state
+	const [metrics, setMetrics] = useState({
+		accessibility: true,
+		bestPractices: true,
+		performance: true,
+		seo: true,
+	});
+	const [trigger, setTrigger] = useState(false);
+	// Network
 	const [monitor, audits, isLoading, networkError] = useFetchStatsByMonitorId({
 		monitorId,
 		sortOrder: "desc",
@@ -34,13 +44,7 @@ const PageSpeedDetails = () => {
 		dateRange: "day",
 		numToDisplay: null,
 		normalize: null,
-	});
-
-	const [metrics, setMetrics] = useState({
-		accessibility: true,
-		bestPractices: true,
-		performance: true,
-		seo: true,
+		updateTrigger: trigger,
 	});
 
 	// Handlers
@@ -48,6 +52,9 @@ const PageSpeedDetails = () => {
 		setMetrics((prev) => ({ ...prev, [id]: !prev[id] }));
 	};
 
+	const triggerUpdate = () => {
+		setTrigger(!trigger);
+	};
 	if (networkError === true) {
 		return (
 			<GenericFallback>
@@ -68,10 +75,12 @@ const PageSpeedDetails = () => {
 		return (
 			<Stack gap={theme.spacing(10)}>
 				<Breadcrumbs list={BREADCRUMBS} />
-				<MonitorStatusHeader
+				<MonitorDetailsControlHeader
 					path={"pagespeed"}
+					isLoading={isLoading}
 					isAdmin={isAdmin}
 					monitor={monitor}
+					triggerUpdate={triggerUpdate}
 				/>
 				<GenericFallback>
 					<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
@@ -83,11 +92,12 @@ const PageSpeedDetails = () => {
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />
-			<MonitorStatusHeader
+			<MonitorDetailsControlHeader
 				path={"pagespeed"}
+				isLoading={isLoading}
 				isAdmin={isAdmin}
-				shouldRender={!isLoading}
 				monitor={monitor}
+				triggerUpdate={triggerUpdate}
 			/>
 			<PageSpeedStatusBoxes
 				shouldRender={!isLoading}

From 90a5fe946ad48514868752db1fa5ce93cd2898e2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:13:45 +0800
Subject: [PATCH 166/319] add update trigger prop

---
 client/src/Hooks/monitorHooks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index d88132dae..751899b9a 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -170,6 +170,7 @@ const useFetchStatsByMonitorId = ({
 	dateRange,
 	numToDisplay,
 	normalize,
+	updateTrigger,
 }) => {
 	const [monitor, setMonitor] = useState(undefined);
 	const [audits, setAudits] = useState(undefined);
@@ -197,7 +198,7 @@ const useFetchStatsByMonitorId = ({
 			}
 		};
 		fetchMonitor();
-	}, [monitorId, dateRange, numToDisplay, normalize, sortOrder, limit]);
+	}, [monitorId, dateRange, numToDisplay, normalize, sortOrder, limit, updateTrigger]);
 	return [monitor, audits, isLoading, networkError];
 };
 

From f30529e8a21f55661f34a93811ea63394c69f6b6 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:17:09 +0800
Subject: [PATCH 167/319] add universal header to infra details

---
 client/src/Hooks/monitorHooks.js              |  4 ++--
 .../Pages/Infrastructure/Details/index.jsx    | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index d88132dae..1aa650cf2 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -220,7 +220,7 @@ const useFetchMonitorById = ({ monitorId, setMonitor, updateTrigger }) => {
 	return [isLoading];
 };
 
-const useFetchHardwareMonitorById = ({ monitorId, dateRange }) => {
+const useFetchHardwareMonitorById = ({ monitorId, dateRange, updateTrigger }) => {
 	const [isLoading, setIsLoading] = useState(true);
 	const [networkError, setNetworkError] = useState(false);
 	const [monitor, setMonitor] = useState(undefined);
@@ -243,7 +243,7 @@ const useFetchHardwareMonitorById = ({ monitorId, dateRange }) => {
 			}
 		};
 		fetchMonitor();
-	}, [monitorId, dateRange]);
+	}, [monitorId, dateRange, updateTrigger]);
 	return [monitor, isLoading, networkError];
 };
 
diff --git a/client/src/Pages/Infrastructure/Details/index.jsx b/client/src/Pages/Infrastructure/Details/index.jsx
index 842e0f6d9..b57e0b91e 100644
--- a/client/src/Pages/Infrastructure/Details/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/index.jsx
@@ -1,7 +1,7 @@
 // Components
 import { Stack, Typography } from "@mui/material";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
-import MonitorStatusHeader from "../../../Components/MonitorStatusHeader";
+import MonitorDetailsControlHeader from "../../../Components/MonitorDetailsControlHeader";
 import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
 import StatusBoxes from "./Components/StatusBoxes";
 import GaugeBoxes from "./Components/GaugeBoxes";
@@ -26,6 +26,7 @@ const InfrastructureDetails = () => {
 
 	// Local state
 	const [dateRange, setDateRange] = useState("recent");
+	const [trigger, setTrigger] = useState(false);
 
 	// Utils
 	const theme = useTheme();
@@ -36,8 +37,13 @@ const InfrastructureDetails = () => {
 	const [monitor, isLoading, networkError] = useFetchHardwareMonitorById({
 		monitorId,
 		dateRange,
+		updateTrigger: trigger,
 	});
 
+	const triggerUpdate = () => {
+		setTrigger(!trigger);
+	};
+
 	if (networkError === true) {
 		return (
 			<GenericFallback>
@@ -57,11 +63,12 @@ const InfrastructureDetails = () => {
 		return (
 			<Stack gap={theme.spacing(10)}>
 				<Breadcrumbs list={BREADCRUMBS} />
-				<MonitorStatusHeader
+				<MonitorDetailsControlHeader
 					path={"infrastructure"}
-					isAdmin={false}
-					shouldRender={!isLoading}
+					isLoading={isLoading}
+					isAdmin={isAdmin}
 					monitor={monitor}
+					triggerUpdate={triggerUpdate}
 				/>
 				<GenericFallback>
 					<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
@@ -73,11 +80,12 @@ const InfrastructureDetails = () => {
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />
-			<MonitorStatusHeader
+			<MonitorDetailsControlHeader
 				path={"infrastructure"}
+				isLoading={isLoading}
 				isAdmin={isAdmin}
-				shouldRender={!isLoading}
 				monitor={monitor}
+				triggerUpdate={triggerUpdate}
 			/>
 			<StatusBoxes
 				shouldRender={!isLoading}

From 1490e9171db619c061501c99fa469f1c41422d12 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:21:28 +0800
Subject: [PATCH 168/319] load monitor from params if present

---
 client/src/Pages/Incidents/index.jsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
index 011961503..09d4f0e25 100644
--- a/client/src/Pages/Incidents/index.jsx
+++ b/client/src/Pages/Incidents/index.jsx
@@ -11,6 +11,7 @@ import { useFetchMonitorsByTeamId } from "../../Hooks/monitorHooks";
 import { useState, useEffect } from "react";
 import NetworkError from "../../Components/GenericFallback/NetworkError";
 import { useTranslation } from "react-i18next";
+import { useParams } from "react-router-dom";
 
 //Constants
 const Incidents = () => {
@@ -30,6 +31,13 @@ const Incidents = () => {
 	//Utils
 	const theme = useTheme();
 	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({});
+	const { monitorId } = useParams();
+
+	useEffect(() => {
+		if (monitorId) {
+			setSelectedMonitor(monitorId);
+		}
+	}, [monitorId]);
 
 	useEffect(() => {
 		const monitorLookup = monitors?.reduce((acc, monitor) => {

From e173269acdf6f562abbeb83d4fbf7f5738035186 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:34:25 +0800
Subject: [PATCH 169/319] remove unused depedencies

---
 client/package-lock.json | 517 +--------------------------------------
 client/package.json      |   7 -
 2 files changed, 1 insertion(+), 523 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index e12e76f97..4050adfbb 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -10,13 +10,11 @@
 			"dependencies": {
 				"@emotion/react": "^11.13.3",
 				"@emotion/styled": "^11.13.0",
-				"@fontsource/roboto": "^5.0.13",
 				"@hello-pangea/dnd": "^18.0.0",
 				"@mui/icons-material": "6.4.11",
 				"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
 				"@mui/material": "6.4.11",
 				"@mui/x-charts": "^7.5.1",
-				"@mui/x-data-grid": "7.29.0",
 				"@mui/x-date-pickers": "7.29.0",
 				"@reduxjs/toolkit": "2.7.0",
 				"axios": "^1.7.4",
@@ -24,14 +22,9 @@
 				"flag-icons": "7.3.2",
 				"html2canvas": "^1.4.1",
 				"i18next": "^24.2.2",
-				"immutability-helper": "^3.1.1",
 				"joi": "17.13.3",
-				"jwt-decode": "^4.0.0",
-				"maplibre-gl": "5.3.1",
 				"mui-color-input": "^6.0.0",
 				"react": "18.3.1",
-				"react-dnd": "^16.0.1",
-				"react-dnd-html5-backend": "^16.0.1",
 				"react-dom": "^18.2.0",
 				"react-i18next": "^15.4.0",
 				"react-icons": "5.5.0",
@@ -983,15 +976,6 @@
 			"integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
 			"license": "MIT"
 		},
-		"node_modules/@fontsource/roboto": {
-			"version": "5.2.5",
-			"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.2.5.tgz",
-			"integrity": "sha512-70r2UZ0raqLn5W+sPeKhqlf8wGvUXFWlofaDlcbt/S3d06+17gXKr3VNqDODB0I1ASme3dGT5OJj9NABt7OTZQ==",
-			"license": "OFL-1.1",
-			"funding": {
-				"url": "https://github.com/sponsors/ayuhito"
-			}
-		},
 		"node_modules/@hapi/hoek": {
 			"version": "9.3.0",
 			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -1110,83 +1094,6 @@
 				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
-		"node_modules/@mapbox/geojson-rewind": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
-			"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
-			"license": "ISC",
-			"dependencies": {
-				"get-stream": "^6.0.1",
-				"minimist": "^1.2.6"
-			},
-			"bin": {
-				"geojson-rewind": "geojson-rewind"
-			}
-		},
-		"node_modules/@mapbox/jsonlint-lines-primitives": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
-			"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/@mapbox/point-geometry": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
-			"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==",
-			"license": "ISC"
-		},
-		"node_modules/@mapbox/tiny-sdf": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz",
-			"integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==",
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/@mapbox/unitbezier": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
-			"integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==",
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/@mapbox/vector-tile": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
-			"integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@mapbox/point-geometry": "~0.1.0"
-			}
-		},
-		"node_modules/@mapbox/whoots-js": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
-			"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@maplibre/maplibre-gl-style-spec": {
-			"version": "23.3.0",
-			"resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.3.0.tgz",
-			"integrity": "sha512-IGJtuBbaGzOUgODdBRg66p8stnwj9iDXkgbYKoYcNiiQmaez5WVRfXm4b03MCDwmZyX93csbfHFWEJJYHnn5oA==",
-			"license": "ISC",
-			"dependencies": {
-				"@mapbox/jsonlint-lines-primitives": "~2.0.2",
-				"@mapbox/unitbezier": "^0.0.1",
-				"json-stringify-pretty-compact": "^4.0.0",
-				"minimist": "^1.2.8",
-				"quickselect": "^3.0.0",
-				"rw": "^1.3.3",
-				"tinyqueue": "^3.0.0"
-			},
-			"bin": {
-				"gl-style-format": "dist/gl-style-format.mjs",
-				"gl-style-migrate": "dist/gl-style-migrate.mjs",
-				"gl-style-validate": "dist/gl-style-validate.mjs"
-			}
-		},
 		"node_modules/@mui/base": {
 			"version": "5.0.0-beta.42",
 			"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.42.tgz",
@@ -1861,44 +1768,6 @@
 				"robust-predicates": "^3.0.2"
 			}
 		},
-		"node_modules/@mui/x-data-grid": {
-			"version": "7.29.0",
-			"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.29.0.tgz",
-			"integrity": "sha512-v3HiwcT/oqgv6xkynOd3oxH26IS0OvspgmfHtfPF9WeRsnUHcTTZ7E1EoAKjT9/Ms2f3oKKJAR6rZBZ5ymik1g==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.25.7",
-				"@mui/utils": "^5.16.6 || ^6.0.0 || ^7.0.0",
-				"@mui/x-internals": "7.29.0",
-				"clsx": "^2.1.1",
-				"prop-types": "^15.8.1",
-				"reselect": "^5.1.1",
-				"use-sync-external-store": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/mui-org"
-			},
-			"peerDependencies": {
-				"@emotion/react": "^11.9.0",
-				"@emotion/styled": "^11.8.1",
-				"@mui/material": "^5.15.14 || ^6.0.0 || ^7.0.0",
-				"@mui/system": "^5.15.14 || ^6.0.0 || ^7.0.0",
-				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@emotion/react": {
-					"optional": true
-				},
-				"@emotion/styled": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/@mui/x-date-pickers": {
 			"version": "7.29.0",
 			"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.29.0.tgz",
@@ -2033,24 +1902,6 @@
 				"url": "https://opencollective.com/popperjs"
 			}
 		},
-		"node_modules/@react-dnd/asap": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz",
-			"integrity": "sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==",
-			"license": "MIT"
-		},
-		"node_modules/@react-dnd/invariant": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz",
-			"integrity": "sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==",
-			"license": "MIT"
-		},
-		"node_modules/@react-dnd/shallowequal": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz",
-			"integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==",
-			"license": "MIT"
-		},
 		"node_modules/@react-spring/animated": {
 			"version": "9.7.5",
 			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.5.tgz",
@@ -2832,50 +2683,12 @@
 			"integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
 			"license": "MIT"
 		},
-		"node_modules/@types/geojson": {
-			"version": "7946.0.16",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
-			"integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-			"license": "MIT"
-		},
-		"node_modules/@types/geojson-vt": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson-vt/-/geojson-vt-3.2.5.tgz",
-			"integrity": "sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==",
-			"license": "MIT",
-			"dependencies": {
-				"@types/geojson": "*"
-			}
-		},
-		"node_modules/@types/mapbox__point-geometry": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz",
-			"integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==",
-			"license": "MIT"
-		},
-		"node_modules/@types/mapbox__vector-tile": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz",
-			"integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==",
-			"license": "MIT",
-			"dependencies": {
-				"@types/geojson": "*",
-				"@types/mapbox__point-geometry": "*",
-				"@types/pbf": "*"
-			}
-		},
 		"node_modules/@types/parse-json": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
 			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
 			"license": "MIT"
 		},
-		"node_modules/@types/pbf": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz",
-			"integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==",
-			"license": "MIT"
-		},
 		"node_modules/@types/prop-types": {
 			"version": "15.7.14",
 			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
@@ -2911,15 +2724,6 @@
 				"@types/react": "*"
 			}
 		},
-		"node_modules/@types/supercluster": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",
-			"integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",
-			"license": "MIT",
-			"dependencies": {
-				"@types/geojson": "*"
-			}
-		},
 		"node_modules/@types/use-sync-external-store": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
@@ -3771,26 +3575,6 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/dnd-core": {
-			"version": "16.0.1",
-			"resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz",
-			"integrity": "sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==",
-			"license": "MIT",
-			"dependencies": {
-				"@react-dnd/asap": "^5.0.1",
-				"@react-dnd/invariant": "^4.0.1",
-				"redux": "^4.2.0"
-			}
-		},
-		"node_modules/dnd-core/node_modules/redux": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.9.2"
-			}
-		},
 		"node_modules/doctrine": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -3838,12 +3622,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/earcut": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.1.tgz",
-			"integrity": "sha512-0l1/0gOjESMeQyYaK5IDiPNvFeu93Z/cO0TjZh9eZ1vyCtZnA7KMZ8rQggpsJHIbGSdrqYq9OhuveadOVHCshw==",
-			"license": "ISC"
-		},
 		"node_modules/electron-to-chromium": {
 			"version": "1.5.155",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
@@ -4370,6 +4148,7 @@
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-equals": {
@@ -4590,12 +4369,6 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/geojson-vt": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-4.0.2.tgz",
-			"integrity": "sha512-AV9ROqlNqoZEIJGfm1ncNjEXfkz2hdFlZf0qkVfmkwdKa8vj7H16YUOT81rJw1rdFhyEDlN2Tds91p/glzbl5A==",
-			"license": "ISC"
-		},
 		"node_modules/get-intrinsic": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -4633,18 +4406,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/get-symbol-description": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
@@ -4663,12 +4424,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/gl-matrix": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
-			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==",
-			"license": "MIT"
-		},
 		"node_modules/glob": {
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -4704,44 +4459,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/global-prefix": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-4.0.0.tgz",
-			"integrity": "sha512-w0Uf9Y9/nyHinEk5vMJKRie+wa4kR5hmDbEhGGds/kG1PwGLLHKRoNMeJOyCQjjBkANlnScqgzcFwGHgmgLkVA==",
-			"license": "MIT",
-			"dependencies": {
-				"ini": "^4.1.3",
-				"kind-of": "^6.0.3",
-				"which": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/global-prefix/node_modules/isexe": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-			"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/global-prefix/node_modules/which": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-			"integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-			"license": "ISC",
-			"dependencies": {
-				"isexe": "^3.1.1"
-			},
-			"bin": {
-				"node-which": "bin/which.js"
-			},
-			"engines": {
-				"node": "^16.13.0 || >=18.0.0"
-			}
-		},
 		"node_modules/globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -4946,26 +4663,6 @@
 				}
 			}
 		},
-		"node_modules/ieee754": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4986,12 +4683,6 @@
 				"url": "https://opencollective.com/immer"
 			}
 		},
-		"node_modules/immutability-helper": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.1.1.tgz",
-			"integrity": "sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ==",
-			"license": "MIT"
-		},
 		"node_modules/import-fresh": {
 			"version": "3.3.1",
 			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -5037,15 +4728,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/ini": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
-			"integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
-			"license": "ISC",
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
 		"node_modules/internal-slot": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -5555,12 +5237,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/json-stringify-pretty-compact": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz",
-			"integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==",
-			"license": "MIT"
-		},
 		"node_modules/json5": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -5589,21 +5265,6 @@
 				"node": ">=4.0"
 			}
 		},
-		"node_modules/jwt-decode": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
-			"integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/kdbush": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
-			"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==",
-			"license": "ISC"
-		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -5614,15 +5275,6 @@
 				"json-buffer": "3.0.1"
 			}
 		},
-		"node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -5702,47 +5354,6 @@
 				"yallist": "^3.0.2"
 			}
 		},
-		"node_modules/maplibre-gl": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.3.1.tgz",
-			"integrity": "sha512-Ihx+oUUSsZkjMou1Cw5J6silE+5OtFFQSPslWF9+7v4yFC/XDHrpsORYO9lWE4KZI0djCEUpZQJpkpnMArAbeA==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@mapbox/geojson-rewind": "^0.5.2",
-				"@mapbox/jsonlint-lines-primitives": "^2.0.2",
-				"@mapbox/point-geometry": "^0.1.0",
-				"@mapbox/tiny-sdf": "^2.0.6",
-				"@mapbox/unitbezier": "^0.0.1",
-				"@mapbox/vector-tile": "^1.3.1",
-				"@mapbox/whoots-js": "^3.1.0",
-				"@maplibre/maplibre-gl-style-spec": "^23.1.0",
-				"@types/geojson": "^7946.0.16",
-				"@types/geojson-vt": "3.2.5",
-				"@types/mapbox__point-geometry": "^0.1.4",
-				"@types/mapbox__vector-tile": "^1.3.4",
-				"@types/pbf": "^3.0.5",
-				"@types/supercluster": "^7.1.3",
-				"earcut": "^3.0.1",
-				"geojson-vt": "^4.0.2",
-				"gl-matrix": "^3.4.3",
-				"global-prefix": "^4.0.0",
-				"kdbush": "^4.0.2",
-				"murmurhash-js": "^1.0.0",
-				"pbf": "^3.3.0",
-				"potpack": "^2.0.0",
-				"quickselect": "^3.0.0",
-				"supercluster": "^8.0.1",
-				"tinyqueue": "^3.0.0",
-				"vt-pbf": "^3.1.3"
-			},
-			"engines": {
-				"node": ">=16.14.0",
-				"npm": ">=8.1.0"
-			},
-			"funding": {
-				"url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1"
-			}
-		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -5786,15 +5397,6 @@
 				"node": "*"
 			}
 		},
-		"node_modules/minimist": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/ms": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -5823,12 +5425,6 @@
 				}
 			}
 		},
-		"node_modules/murmurhash-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
-			"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==",
-			"license": "MIT"
-		},
 		"node_modules/nanoid": {
 			"version": "3.3.11",
 			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -6130,19 +5726,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/pbf": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.3.0.tgz",
-			"integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"ieee754": "^1.1.12",
-				"resolve-protobuf-schema": "^2.1.0"
-			},
-			"bin": {
-				"pbf": "bin/pbf"
-			}
-		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -6199,12 +5782,6 @@
 				"node": "^10 || ^12 || >=14"
 			}
 		},
-		"node_modules/potpack": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
-			"integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==",
-			"license": "ISC"
-		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -6248,12 +5825,6 @@
 			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
 			"license": "MIT"
 		},
-		"node_modules/protocol-buffers-schema": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-			"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
-			"license": "MIT"
-		},
 		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -6291,12 +5862,6 @@
 			],
 			"license": "MIT"
 		},
-		"node_modules/quickselect": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
-			"integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
-			"license": "ISC"
-		},
 		"node_modules/raf-schd": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -6315,45 +5880,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/react-dnd": {
-			"version": "16.0.1",
-			"resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz",
-			"integrity": "sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==",
-			"license": "MIT",
-			"dependencies": {
-				"@react-dnd/invariant": "^4.0.1",
-				"@react-dnd/shallowequal": "^4.0.1",
-				"dnd-core": "^16.0.1",
-				"fast-deep-equal": "^3.1.3",
-				"hoist-non-react-statics": "^3.3.2"
-			},
-			"peerDependencies": {
-				"@types/hoist-non-react-statics": ">= 3.3.1",
-				"@types/node": ">= 12",
-				"@types/react": ">= 16",
-				"react": ">= 16.14"
-			},
-			"peerDependenciesMeta": {
-				"@types/hoist-non-react-statics": {
-					"optional": true
-				},
-				"@types/node": {
-					"optional": true
-				},
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/react-dnd-html5-backend": {
-			"version": "16.0.1",
-			"resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz",
-			"integrity": "sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==",
-			"license": "MIT",
-			"dependencies": {
-				"dnd-core": "^16.0.1"
-			}
-		},
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -6658,15 +6184,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/resolve-protobuf-schema": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
-			"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
-			"license": "MIT",
-			"dependencies": {
-				"protocol-buffers-schema": "^3.3.1"
-			}
-		},
 		"node_modules/reusify": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -6764,12 +6281,6 @@
 				"queue-microtask": "^1.2.2"
 			}
 		},
-		"node_modules/rw": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-			"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/safe-array-concat": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
@@ -7149,15 +6660,6 @@
 			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
 			"license": "MIT"
 		},
-		"node_modules/supercluster": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
-			"integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
-			"license": "ISC",
-			"dependencies": {
-				"kdbush": "^4.0.2"
-			}
-		},
 		"node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7211,12 +6713,6 @@
 			"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
 			"license": "MIT"
 		},
-		"node_modules/tinyqueue": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-3.0.0.tgz",
-			"integrity": "sha512-gRa9gwYU3ECmQYv3lslts5hxuIa90veaEcxDYuu3QGOIAEM2mOZkVHp48ANJuu1CURtRdHKUBY5Lm1tHV+sD4g==",
-			"license": "ISC"
-		},
 		"node_modules/tslib": {
 			"version": "2.8.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -7508,17 +7004,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/vt-pbf": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
-			"integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
-			"license": "MIT",
-			"dependencies": {
-				"@mapbox/point-geometry": "0.1.0",
-				"@mapbox/vector-tile": "^1.3.1",
-				"pbf": "^3.2.1"
-			}
-		},
 		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/client/package.json b/client/package.json
index 238ced4ac..83dfe8407 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,13 +15,11 @@
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
 		"@emotion/styled": "^11.13.0",
-		"@fontsource/roboto": "^5.0.13",
 		"@hello-pangea/dnd": "^18.0.0",
 		"@mui/icons-material": "6.4.11",
 		"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
 		"@mui/material": "6.4.11",
 		"@mui/x-charts": "^7.5.1",
-		"@mui/x-data-grid": "7.29.0",
 		"@mui/x-date-pickers": "7.29.0",
 		"@reduxjs/toolkit": "2.7.0",
 		"axios": "^1.7.4",
@@ -29,14 +27,9 @@
 		"flag-icons": "7.3.2",
 		"html2canvas": "^1.4.1",
 		"i18next": "^24.2.2",
-		"immutability-helper": "^3.1.1",
 		"joi": "17.13.3",
-		"jwt-decode": "^4.0.0",
-		"maplibre-gl": "5.3.1",
 		"mui-color-input": "^6.0.0",
 		"react": "18.3.1",
-		"react-dnd": "^16.0.1",
-		"react-dnd-html5-backend": "^16.0.1",
 		"react-dom": "^18.2.0",
 		"react-i18next": "^15.4.0",
 		"react-icons": "5.5.0",

From 30a610511c15b4ddeca931bdab5a14cf102bd67b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 11:34:41 +0800
Subject: [PATCH 170/319] remove unused component/imports

---
 .../Components/MonitorCountHeader/index.jsx   |  6 +-
 .../ConfigButton/index.jsx                    | 41 ----------
 .../Components/MonitorStatusHeader/index.jsx  | 76 -------------------
 .../MonitorStatusHeader/skeleton.jsx          | 23 ------
 .../Pages/Infrastructure/Monitors/index.jsx   |  2 +-
 client/src/Pages/PageSpeed/Details/index.jsx  |  1 -
 client/src/Pages/PageSpeed/Monitors/index.jsx |  2 +-
 client/src/Pages/Uptime/Monitors/index.jsx    |  4 +-
 8 files changed, 7 insertions(+), 148 deletions(-)
 delete mode 100644 client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
 delete mode 100644 client/src/Components/MonitorStatusHeader/index.jsx
 delete mode 100644 client/src/Components/MonitorStatusHeader/skeleton.jsx

diff --git a/client/src/Components/MonitorCountHeader/index.jsx b/client/src/Components/MonitorCountHeader/index.jsx
index 0b3478df5..7610a9d5c 100644
--- a/client/src/Components/MonitorCountHeader/index.jsx
+++ b/client/src/Components/MonitorCountHeader/index.jsx
@@ -4,14 +4,14 @@ import { useTheme } from "@emotion/react";
 import SkeletonLayout from "./skeleton";
 
 const MonitorCountHeader = ({
-	shouldRender = true,
+	isLoading = false,
 	monitorCount,
 	heading = "monitors",
 	sx,
 	children,
 }) => {
 	const theme = useTheme();
-	if (!shouldRender) return <SkeletonLayout />;
+	if (isLoading) return <SkeletonLayout />;
 
 	if (monitorCount === 1) {
 		heading = "monitor";
@@ -42,7 +42,7 @@ const MonitorCountHeader = ({
 };
 
 MonitorCountHeader.propTypes = {
-	shouldRender: PropTypes.bool,
+	isLoading: PropTypes.bool,
 	monitorCount: PropTypes.number,
 	heading: PropTypes.string,
 	children: PropTypes.node,
diff --git a/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx b/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
deleted file mode 100644
index 7ad6ae9af..000000000
--- a/client/src/Components/MonitorStatusHeader/ConfigButton/index.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Button, Box } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
-import SettingsIcon from "../../../assets/icons/settings-bold.svg?react";
-import PropTypes from "prop-types";
-const ConfigButton = ({ shouldRender = true, monitorId, path }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-
-	if (!shouldRender) return null;
-
-	return (
-		<Box alignSelf="flex-end">
-			<Button
-				variant="contained"
-				color="secondary"
-				onClick={() => navigate(`/${path}/configure/${monitorId}`)}
-				sx={{
-					px: theme.spacing(5),
-					"& svg": {
-						mr: theme.spacing(3),
-						"& path": {
-							/* Should always be contrastText for the button color */
-							stroke: theme.palette.secondary.contrastText,
-						},
-					},
-				}}
-			>
-				<SettingsIcon /> Configure
-			</Button>
-		</Box>
-	);
-};
-
-ConfigButton.propTypes = {
-	shouldRender: PropTypes.bool,
-	monitorId: PropTypes.string,
-	path: PropTypes.string,
-};
-
-export default ConfigButton;
diff --git a/client/src/Components/MonitorStatusHeader/index.jsx b/client/src/Components/MonitorStatusHeader/index.jsx
deleted file mode 100644
index a81131152..000000000
--- a/client/src/Components/MonitorStatusHeader/index.jsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Stack, Typography } from "@mui/material";
-import PulseDot from "../Animated/PulseDot";
-import Dot from "../Dot";
-import { useTheme } from "@emotion/react";
-import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
-import { formatDurationRounded } from "../../Utils/timeUtils";
-import ConfigButton from "./ConfigButton";
-import SkeletonLayout from "./skeleton";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-
-const MonitorStatusHeader = ({ path, isLoading = false, isAdmin, monitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const { statusColor, determineState } = useMonitorUtils();
-	if (isLoading) {
-		return <SkeletonLayout />;
-	}
-
-	const intervalText = t("monitorStatus.checkingEvery", {
-		interval: formatDurationRounded(monitor?.interval),
-	});
-
-	const captureVersion = monitor?.stats?.aggregateData?.latestCheck?.capture?.version;
-
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Stack>
-				<Typography variant="monitorName">{monitor?.name}</Typography>
-				<Stack
-					direction="row"
-					alignItems={"center"}
-					gap={theme.spacing(4)}
-				>
-					<PulseDot color={statusColor[determineState(monitor)]} />
-					<Typography
-						component="h2"
-						variant="monitorUrl"
-					>
-						{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
-					</Typography>
-					<Dot />
-					<Typography>
-						{intervalText}
-						{captureVersion && (
-							<>
-								{" "}
-								{t("monitorStatus.withCaptureAgent", {
-									version: captureVersion,
-								})}
-							</>
-						)}
-						.
-					</Typography>
-				</Stack>
-			</Stack>
-			<ConfigButton
-				path={path}
-				shouldRender={isAdmin}
-				monitorId={monitor?._id}
-			/>
-		</Stack>
-	);
-};
-
-MonitorStatusHeader.propTypes = {
-	path: PropTypes.string.isRequired,
-	isLoading: PropTypes.bool,
-	isAdmin: PropTypes.bool,
-	monitor: PropTypes.object,
-};
-
-export default MonitorStatusHeader;
diff --git a/client/src/Components/MonitorStatusHeader/skeleton.jsx b/client/src/Components/MonitorStatusHeader/skeleton.jsx
deleted file mode 100644
index 64dc0547f..000000000
--- a/client/src/Components/MonitorStatusHeader/skeleton.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Stack, Skeleton } from "@mui/material";
-
-const SkeletonLayout = () => {
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Skeleton
-				height={40}
-				variant="rounded"
-				width="15%"
-			/>
-			<Skeleton
-				height={40}
-				variant="rounded"
-				width="15%"
-			/>
-		</Stack>
-	);
-};
-
-export default SkeletonLayout;
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index 3d8d78128..e0f5c642b 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -116,7 +116,7 @@ const InfrastructureMonitors = () => {
 			/>
 			<Stack direction={"row"}>
 				<MonitorCountHeader
-					shouldRender={!isLoading}
+					isLoading={isLoading}
 					monitorCount={summary?.totalMonitors ?? 0}
 				/>
 				<Filter
diff --git a/client/src/Pages/PageSpeed/Details/index.jsx b/client/src/Pages/PageSpeed/Details/index.jsx
index 8fa7872db..cfc799b36 100644
--- a/client/src/Pages/PageSpeed/Details/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/index.jsx
@@ -2,7 +2,6 @@
 import { Stack, Typography } from "@mui/material";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
 import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
-import MonitorStatusHeader from "../../../Components/MonitorStatusHeader";
 import PageSpeedStatusBoxes from "./Components/PageSpeedStatusBoxes";
 import MonitorDetailsControlHeader from "../../../Components/MonitorDetailsControlHeader";
 import PageSpeedAreaChart from "./Components/PageSpeedAreaChart";
diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index 65e43f2ec..fabc0859f 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -70,7 +70,7 @@ const PageSpeed = () => {
 				path="/pagespeed/create"
 			/>
 			<MonitorCountHeader
-				shouldRender={!isLoading}
+				isLoading={isLoading}
 				monitorCount={monitorsSummary?.totalMonitors}
 				sx={{ mb: theme.spacing(8) }}
 			/>
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index 164a77378..f3342e101 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -201,9 +201,9 @@ const UptimeMonitors = () => {
 
 			<Stack direction={"row"}>
 				<MonitorCountHeader
-					shouldRender={monitors?.length > 0 && !monitorsWithSummaryIsLoading}
+					isLoading={monitorsWithSummaryIsLoading}
 					monitorCount={monitorsSummary?.totalMonitors}
-				></MonitorCountHeader>
+				/>
 				<Filter
 					selectedTypes={selectedTypes}
 					setSelectedTypes={setSelectedTypes}

From 6f133ed7a02b9c7d4c985888c467d4b9a21e2eb8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:15:07 +0800
Subject: [PATCH 171/319] add test all hook

---
 client/src/Hooks/useNotifications.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index f19b76dde..303453655 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -174,6 +174,30 @@ const useTestNotification = () => {
 	return [testNotification, isLoading, error];
 };
 
+const useTestAllNotifications = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(undefined);
+	const { t } = useTranslation();
+	const testAllNotifications = async ({ monitorId }) => {
+		try {
+			setIsLoading(true);
+			await networkService.testAllNotifications({ monitorId });
+			createToast({
+				body: t("notifications.test.success"),
+			});
+		} catch (error) {
+			createToast({
+				body: error.response?.data?.msg || error.message,
+			});
+			setError(error);
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [testAllNotifications, isLoading, error];
+};
+
 export {
 	useCreateNotification,
 	useGetNotificationsByTeamId,
@@ -181,4 +205,5 @@ export {
 	useGetNotificationById,
 	useEditNotification,
 	useTestNotification,
+	useTestAllNotifications,
 };

From 9bba8440caef7be1e2d15164e85409ddc16c4fcd Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:15:29 +0800
Subject: [PATCH 172/319] update monitor details header

---
 .../Components/MonitorDetailsControlHeader/index.jsx   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx
index 8c9f845e9..d569ec840 100644
--- a/client/src/Components/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx
@@ -14,6 +14,7 @@ import { useTheme } from "@mui/material/styles";
 import { usePauseMonitor } from "../../Hooks/monitorHooks";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
 import { useTranslation } from "react-i18next";
+import { useTestAllNotifications } from "../../Hooks/useNotifications";
 /**
  * MonitorDetailsControlHeader component displays the control header for monitor details.
  * It includes status display, pause/resume button, and a configure button for admins.
@@ -39,7 +40,10 @@ const MonitorDetailsControlHeader = ({
 	const { t } = useTranslation();
 	const [pauseMonitor, isPausing, error] = usePauseMonitor();
 
-	const [isSending, emailError, sendTestEmail] = useSendTestEmail();
+	// const [isSending, emailError, sendTestEmail] = useSendTestEmail();
+
+	const [testAllNotifications, isSending, errorAllNotifications] =
+		useTestAllNotifications();
 
 	if (isLoading) {
 		return <Skeleton />;
@@ -62,10 +66,10 @@ const MonitorDetailsControlHeader = ({
 					loading={isSending}
 					startIcon={<EmailIcon />}
 					onClick={() => {
-						sendTestEmail();
+						testAllNotifications({ monitorId: monitor?._id });
 					}}
 				>
-					{t("sendTestEmail")}
+					{t("sendTestNotifications")}
 				</Button>
 				<Button
 					variant="contained"

From 13741d0f0aa407f5a6f44fe6142ec1cbe6f7f446 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:15:54 +0800
Subject: [PATCH 173/319] add test all notifications method

---
 client/src/Utils/NetworkService.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 3059462f9..eee795268 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -678,6 +678,16 @@ class NetworkService {
 		});
 	}
 
+	async testAllNotifications(config) {
+		const { monitorId } = config;
+		return this.axiosInstance.post("/notifications/test/all", {
+			monitorId,
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
+	}
+
 	/**
 	 * ************************************
 	 * Creates a maintenance window

From bc3801edc0ced02b3b59e8701c0b825109233853 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:16:08 +0800
Subject: [PATCH 174/319] add strings'

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 2791dd3e7..783cdb179 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -714,7 +714,7 @@
 		"saving": "Saving..."
 	},
 	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
-	"sendTestEmail": "Send test email",
+	"sendTestNotifications": "Send test notifications",
 	"emailSent": "Email sent successfully",
 	"failedToSendEmail": "Failed to send email",
 	"settingsTestEmail": "Send test e-mail",

From 3cdc21f1beffbb86307683d63812b829e2ed9fea Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:16:52 +0800
Subject: [PATCH 175/319] add controller method

---
 server/controllers/monitorController.js      |  3 ---
 server/controllers/notificationController.js | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 228eabbb0..6c6136fb5 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -1,4 +1,3 @@
-import Monitor from "../db/models/Monitor.js";
 import {
 	getMonitorByIdParamValidation,
 	getMonitorByIdQueryValidation,
@@ -16,8 +15,6 @@ import {
 	getHardwareDetailsByIdQueryValidation,
 } from "../validation/joi.js";
 import sslChecker from "ssl-checker";
-import jwt from "jsonwebtoken";
-import { getTokenFromHeaders } from "../utils/utils.js";
 import logger from "../utils/logger.js";
 import { handleError, handleValidationError } from "./controllerUtils.js";
 import axios from "axios";
diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index a9c399901..c9da011f0 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -193,6 +193,22 @@ class NotificationController {
 			next(handleError(error, SERVICE_NAME, "editNotification"));
 		}
 	};
+
+	testAllNotifications = async (req, res, next) => {
+		try {
+			const { monitorId } = req.body;
+			const monitor = await this.db.getMonitorById(monitorId);
+			const notifications = monitor.notifications;
+			if (notifications.length === 0) throw new Error("No notifications");
+			const result = await this.notificationService.testAllNotifications(notifications);
+			if (!result) throw new Error("Failed to send all notifications");
+			return res.success({
+				msg: "All notifications sent successfully",
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "testAllNotifications"));
+		}
+	};
 }
 
 export default NotificationController;

From 959f265617a681bd1b3e431be89935c1220844a3 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:17:22 +0800
Subject: [PATCH 176/319] add route

---
 server/routes/notificationRoute.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index ace8bdae1..a937975c5 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -14,6 +14,7 @@ class NotificationRoutes {
 		this.router.post("/trigger", this.notificationController.triggerNotification);
 
 		this.router.post("/test", this.notificationController.testNotification);
+		this.router.post("/test/all", this.notificationController.testAllNotifications);
 
 		this.router.post("/", this.notificationController.createNotification);
 

From ca4da6d485ca3838dbf5bc0bb0772cf42e99a194 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 12:17:43 +0800
Subject: [PATCH 177/319] add testAll

---
 server/service/notificationService.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 6e12722c2..668efc86a 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -418,6 +418,29 @@ class NotificationService {
 			});
 		}
 	}
+
+	async testAllNotifications(notificationIDs) {
+		const notifications = await this.db.getNotificationsByIds(notificationIDs);
+
+		// Map each notification to a test promise
+		const testPromises = notifications.map(async (notification) => {
+			try {
+				if (notification.type === "email") {
+					await this.sendTestEmail(notification);
+				} else if (notification.type === "webhook") {
+					await this.sendTestWebhookNotification(notification);
+				} else if (notification.type === "pager_duty") {
+					await this.sendTestPagerDutyNotification(notification);
+				}
+				return true;
+			} catch (err) {
+				return false;
+			}
+		});
+
+		const results = await Promise.all(testPromises);
+		return results.every((r) => r === true);
+	}
 }
 
 export default NotificationService;

From 4fd2a29ab3ba41b3927a938766c1d1a68cda16f2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 13:30:27 +0800
Subject: [PATCH 178/319] fix email type

---
 client/src/Pages/Notifications/create/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index 8b5512ca8..2fd83e4e1 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -130,7 +130,7 @@ const CreateNotifications = () => {
 			(type) => type._id === newNotification.type
 		).value;
 
-		if (newNotification.type === "email") {
+		if (type === "email") {
 			newNotification.config = null;
 		} else if (type === "slack" || type === "webhook" || type === "discord") {
 			newNotification.address = "";

From 3df6b451e7074e8ed05ba183eb35c0613a8e8943 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 16 Jun 2025 13:53:08 +0800
Subject: [PATCH 179/319] fix hardware notifications

---
 server/service/notificationService.js | 88 ++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 23 deletions(-)

diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 6e12722c2..a8dfa4729 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -95,6 +95,19 @@ class NotificationService {
 		return MESSAGE_FORMATTERS[platform](messageText, chatId);
 	}
 
+	formatHardwareNotificationMessage = (
+		monitor,
+		status,
+		platform,
+		chatId,
+		code,
+		timestamp,
+		alerts
+	) => {
+		const messageText = alerts.map((alert) => alert).join("\n");
+		return MESSAGE_FORMATTERS[platform](messageText, chatId);
+	};
+
 	sendTestWebhookNotification = async (notification) => {
 		const config = notification.config;
 		const response = await this.networkService.requestWebhook(
@@ -121,7 +134,7 @@ class NotificationService {
 	 * @returns {Promise<boolean>} A promise that resolves to true if the notification was sent successfully, otherwise false.
 	 */
 
-	async sendWebhookNotification(networkResponse, notification) {
+	async sendWebhookNotification(networkResponse, notification, alerts = []) {
 		const { monitor, status, code } = networkResponse;
 		const { webhookUrl, platform, botToken, chatId } = notification.config;
 
@@ -152,14 +165,27 @@ class NotificationService {
 			url = `${TELEGRAM_API_BASE_URL}${botToken}/sendMessage`;
 		}
 
-		const message = this.formatNotificationMessage(
-			monitor,
-			status,
-			platform,
-			chatId,
-			code, // Pass the code field directly
-			networkResponse.timestamp
-		);
+		let message;
+		if (monitor.type === "hardware") {
+			message = this.formatHardwareNotificationMessage(
+				monitor,
+				status,
+				platform,
+				chatId,
+				code,
+				networkResponse.timestamp,
+				alerts
+			);
+		} else {
+			message = this.formatNotificationMessage(
+				monitor,
+				status,
+				platform,
+				chatId,
+				code, // Pass the code field directly
+				networkResponse.timestamp
+			);
+		}
 
 		try {
 			const response = await this.networkService.requestWebhook(platform, url, message);
@@ -247,19 +273,31 @@ class NotificationService {
 
 		return response;
 	}
-	async sendPagerDutyNotification(networkResponse, notification) {
+	async sendPagerDutyNotification(networkResponse, notification, alerts = []) {
 		const { monitor, status, code } = networkResponse;
 		const { routingKey, platform } = notification.config;
 
-		const message = this.formatNotificationMessage(
-			monitor,
-			status,
-			platform,
-			null,
-			code, // Pass the code field directly
-			networkResponse.timestamp
-		);
-
+		let message;
+		if (monitor.type === "hardware") {
+			message = this.formatHardwareNotificationMessage(
+				monitor,
+				status,
+				platform,
+				null,
+				code,
+				networkResponse.timestamp,
+				alerts
+			);
+		} else {
+			message = this.formatNotificationMessage(
+				monitor,
+				status,
+				platform,
+				null,
+				code, // Pass the code field directly
+				networkResponse.timestamp
+			);
+		}
 		try {
 			const response = await this.networkService.requestPagerDuty({
 				message,
@@ -350,9 +388,9 @@ class NotificationService {
 				) ?? false,
 		};
 
-		const notifications = await this.db.getNotificationsByMonitorId(
-			networkResponse.monitorId
-		);
+		const notificationIDs = networkResponse.monitor?.notifications ?? [];
+		const notifications = await this.db.getNotificationsByIds(notificationIDs);
+
 		for (const notification of notifications) {
 			const alertsToSend = [];
 			const alertTypes = ["cpu", "memory", "disk"];
@@ -388,7 +426,11 @@ class NotificationService {
 			if (alertsToSend.length === 0) continue; // No alerts to send, we're done
 
 			if (notification.type === "email") {
-				this.sendHardwareEmail(networkResponse, notification.address, alertsToSend);
+				await this.sendHardwareEmail(networkResponse, notification.address, alertsToSend);
+			} else if (notification.type === "webhook") {
+				await this.sendWebhookNotification(networkResponse, notification, alertsToSend);
+			} else if (notification.type === "pager_duty") {
+				await this.sendPagerDutyNotification(networkResponse, notification, alertsToSend);
 			}
 		}
 		return true;

From f47d3c2cd6acabad48b414ad2750f97f8812a144 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 16 Jun 2025 12:56:08 +0530
Subject: [PATCH 180/319] Feat: useFetchChecksByMonitor

---
 client/src/Hooks/checkHooksMonitor.js | 58 +++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 client/src/Hooks/checkHooksMonitor.js

diff --git a/client/src/Hooks/checkHooksMonitor.js b/client/src/Hooks/checkHooksMonitor.js
new file mode 100644
index 000000000..00f1c9671
--- /dev/null
+++ b/client/src/Hooks/checkHooksMonitor.js
@@ -0,0 +1,58 @@
+import { useState, useEffect } from "react";
+import { networkService } from "../main";
+import { createToast } from "../Utils/toastUtils";
+
+const useFetchChecksByMonitor = ({
+	monitorId,
+	type,
+	status,
+	sortOrder,
+	limit,
+	dateRange,
+	filter,
+	page,
+	rowsPerPage,
+}) => {
+    const [checks, setChecks] = useState(undefined);
+	const [checksCount, setChecksCount] = useState(undefined);
+	const [isLoading, setIsLoading] = useState(false);
+	const [networkError, setNetworkError] = useState(false);
+
+    useEffect(() => {
+        const fetchChecks = async () => {
+            if (!type) {
+                return;
+            }
+
+            const config = {
+                monitorId,
+                type,
+                status,
+                sortOrder,
+                limit,
+                dateRange,
+                filter,
+                page,
+                rowsPerPage,
+            }
+
+            try {
+                setIsLoading(true);
+                const res = await networkService.getChecksByMonitor(config);
+                setChecks(res.data.data.checks);
+                setChecksCount(res.data.data.checksCount);
+            } catch (error) {
+                setNetworkError(true);
+                createToast({ body: error.message });
+            } finally {
+                setIsLoading(false);
+            }
+        };
+
+        fetchChecks();
+    }, [monitorId, type, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+
+    return [checks, checksCount, isLoading, networkError];
+};
+
+export { useFetchChecksByMonitor };
\ No newline at end of file

From bebbe5896d395cb91090be5de5e991b059d8fd43 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 16 Jun 2025 12:57:00 +0530
Subject: [PATCH 181/319] Uptime useFetchChecksByMonitor Integration

---
 client/src/Pages/Uptime/Details/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 79762e0c3..8c1dbe562 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -18,7 +18,7 @@ import { useTheme } from "@emotion/react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useFetchUptimeMonitorById } from "../../../Hooks/monitorHooks";
 import useCertificateFetch from "./Hooks/useCertificateFetch";
-import { useFetchChecks } from "../../../Hooks/checkHooks";
+import { useFetchChecksByMonitor } from "../../../Hooks/checkHooksMonitor";
 import { useTranslation } from "react-i18next";
 
 // Constants
@@ -66,7 +66,7 @@ const UptimeDetails = () => {
 
 	const monitorType = monitor?.type;
 
-	const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecks({
+	const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecksByMonitor({
 		monitorId,
 		type: monitorType,
 		sortOrder: "desc",

From 37406484fcb86419a6496fc4a95049cee742c43a Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 16 Jun 2025 13:00:23 +0530
Subject: [PATCH 182/319] useFetchChecksTeam Hook

---
 .../{checkHooks.js => checkHooksTeam.js}      | 48 ++++++-------------
 .../Components/IncidentTable/index.jsx        |  4 +-
 2 files changed, 16 insertions(+), 36 deletions(-)
 rename client/src/Hooks/{checkHooks.js => checkHooksTeam.js} (62%)

diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooksTeam.js
similarity index 62%
rename from client/src/Hooks/checkHooks.js
rename to client/src/Hooks/checkHooksTeam.js
index dac2be671..fedd88d52 100644
--- a/client/src/Hooks/checkHooks.js
+++ b/client/src/Hooks/checkHooksTeam.js
@@ -2,10 +2,8 @@ import { useState, useEffect } from "react";
 import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 
-const useFetchChecks = ({
+const useFetchChecksTeam = ({
 	teamId,
-	monitorId,
-	type,
 	status,
 	sortOrder,
 	limit,
@@ -21,40 +19,24 @@ const useFetchChecks = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!type && !teamId) {
+			if (!teamId) {
 				return;
 			}
 
-			const method = monitorId
-				? networkService.getChecksByMonitor
-				: networkService.getChecksByTeam;
-
-			const config = monitorId
-				? {
-						monitorId,
-						type,
-						status,
-						sortOrder,
-						limit,
-						dateRange,
-						filter,
-						page,
-						rowsPerPage,
-					}
-				: {
-						status,
-						teamId,
-						sortOrder,
-						limit,
-						dateRange,
-						filter,
-						page,
-						rowsPerPage,
-					};
+			const config = {
+				status,
+				teamId,
+				sortOrder,
+				limit,
+				dateRange,
+				filter,
+				page,
+				rowsPerPage,
+			};
 
 			try {
 				setIsLoading(true);
-				const res = await method(config);
+				const res = await networkService.getChecksByTeam(config);
 				setChecks(res.data.data.checks);
 				setChecksCount(res.data.data.checksCount);
 			} catch (error) {
@@ -67,9 +49,7 @@ const useFetchChecks = ({
 
 		fetchChecks();
 	}, [
-		monitorId,
 		teamId,
-		type,
 		status,
 		sortOrder,
 		limit,
@@ -82,4 +62,4 @@ const useFetchChecks = ({
 	return [checks, checksCount, isLoading, networkError];
 };
 
-export { useFetchChecks };
+export { useFetchChecksTeam };
diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index cf6fbb49d..98f0c3d8f 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -13,7 +13,7 @@ import { useSelector } from "react-redux";
 import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { useFetchChecks } from "../../../../Hooks/checkHooks";
+import { useFetchChecksTeam } from "../../../../Hooks/checkHooksTeam";
 
 const IncidentTable = ({
 	shouldRender,
@@ -34,7 +34,7 @@ const IncidentTable = ({
 	const selectedMonitorDetails = monitors?.[selectedMonitor];
 	const selectedMonitorType = selectedMonitorDetails?.type;
 
-	const [checks, checksCount, isLoading, networkError] = useFetchChecks({
+	const [checks, checksCount, isLoading, networkError] = useFetchChecksTeam({
 		status: false,
 		monitorId,
 		teamId,

From 638fcb3b9bc43351f7e250f27656ddf3868026a5 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 16 Jun 2025 13:08:39 +0530
Subject: [PATCH 183/319] Incidents useFetchChecksMonitor Integration

---
 .../Pages/Incidents/Components/IncidentTable/index.jsx    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index 98f0c3d8f..05c776367 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -13,7 +13,7 @@ import { useSelector } from "react-redux";
 import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { useFetchChecksTeam } from "../../../../Hooks/checkHooksTeam";
+import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooksMonitor";
 
 const IncidentTable = ({
 	shouldRender,
@@ -26,7 +26,6 @@ const IncidentTable = ({
 	const uiTimezone = useSelector((state) => state.ui.timezone);
 
 	//Local state
-	const [teamId, setTeamId] = useState(undefined);
 	const [monitorId, setMonitorId] = useState(undefined);
 
 	const [page, setPage] = useState(0);
@@ -34,10 +33,9 @@ const IncidentTable = ({
 	const selectedMonitorDetails = monitors?.[selectedMonitor];
 	const selectedMonitorType = selectedMonitorDetails?.type;
 
-	const [checks, checksCount, isLoading, networkError] = useFetchChecksTeam({
+	const [checks, checksCount, isLoading, networkError] = useFetchChecksByMonitor({
 		status: false,
 		monitorId,
-		teamId,
 		type: selectedMonitorType,
 		sortOrder: "desc",
 		limit: null,
@@ -60,11 +58,9 @@ const IncidentTable = ({
 
 	useEffect(() => {
 		if (selectedMonitor === "0") {
-			setTeamId("placeholder"); // TODO this isn't needed any longer, fix hook
 			setMonitorId(undefined);
 		} else {
 			setMonitorId(selectedMonitor);
-			setTeamId(undefined);
 		}
 	}, [selectedMonitor]);
 

From c981b25ef91da0c418eb9ef456d67197ba157e10 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Mon, 16 Jun 2025 13:51:15 +0530
Subject: [PATCH 184/319] Hooks integration in Incidents Table

---
 client/src/Hooks/checkHooksMonitor.js         | 66 +++++++++----------
 client/src/Hooks/checkHooksTeam.js            | 11 +---
 .../Components/IncidentTable/index.jsx        | 53 ++++++++-------
 client/src/Pages/Uptime/Details/index.jsx     | 21 +++---
 4 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/client/src/Hooks/checkHooksMonitor.js b/client/src/Hooks/checkHooksMonitor.js
index 00f1c9671..e46adfa98 100644
--- a/client/src/Hooks/checkHooksMonitor.js
+++ b/client/src/Hooks/checkHooksMonitor.js
@@ -13,46 +13,46 @@ const useFetchChecksByMonitor = ({
 	page,
 	rowsPerPage,
 }) => {
-    const [checks, setChecks] = useState(undefined);
+	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
 	const [isLoading, setIsLoading] = useState(false);
 	const [networkError, setNetworkError] = useState(false);
 
-    useEffect(() => {
-        const fetchChecks = async () => {
-            if (!type) {
-                return;
-            }
+	useEffect(() => {
+		const fetchChecks = async () => {
+			if (!type) {
+				return;
+			}
 
-            const config = {
-                monitorId,
-                type,
-                status,
-                sortOrder,
-                limit,
-                dateRange,
-                filter,
-                page,
-                rowsPerPage,
-            }
+			const config = {
+				monitorId,
+				type,
+				status,
+				sortOrder,
+				limit,
+				dateRange,
+				filter,
+				page,
+				rowsPerPage,
+			};
 
-            try {
-                setIsLoading(true);
-                const res = await networkService.getChecksByMonitor(config);
-                setChecks(res.data.data.checks);
-                setChecksCount(res.data.data.checksCount);
-            } catch (error) {
-                setNetworkError(true);
-                createToast({ body: error.message });
-            } finally {
-                setIsLoading(false);
-            }
-        };
+			try {
+				setIsLoading(true);
+				const res = await networkService.getChecksByMonitor(config);
+				setChecks(res.data.data.checks);
+				setChecksCount(res.data.data.checksCount);
+			} catch (error) {
+				setNetworkError(true);
+				createToast({ body: error.message });
+			} finally {
+				setIsLoading(false);
+			}
+		};
 
-        fetchChecks();
-    }, [monitorId, type, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+		fetchChecks();
+	}, [monitorId, type, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
 
-    return [checks, checksCount, isLoading, networkError];
+	return [checks, checksCount, isLoading, networkError];
 };
 
-export { useFetchChecksByMonitor };
\ No newline at end of file
+export { useFetchChecksByMonitor };
diff --git a/client/src/Hooks/checkHooksTeam.js b/client/src/Hooks/checkHooksTeam.js
index fedd88d52..05f8b67e5 100644
--- a/client/src/Hooks/checkHooksTeam.js
+++ b/client/src/Hooks/checkHooksTeam.js
@@ -48,16 +48,7 @@ const useFetchChecksTeam = ({
 		};
 
 		fetchChecks();
-	}, [
-		teamId,
-		status,
-		sortOrder,
-		limit,
-		dateRange,
-		filter,
-		page,
-		rowsPerPage,
-	]);
+	}, [teamId, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index 05c776367..97a006884 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -10,9 +10,10 @@ import NetworkError from "../../../../Components/GenericFallback/NetworkError";
 //Utils
 import { formatDateWithTz } from "../../../../Utils/timeUtils";
 import { useSelector } from "react-redux";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
+import { useFetchChecksTeam } from "../../../../Hooks/checkHooksTeam";
 import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooksMonitor";
 
 const IncidentTable = ({
@@ -26,24 +27,40 @@ const IncidentTable = ({
 	const uiTimezone = useSelector((state) => state.ui.timezone);
 
 	//Local state
-	const [monitorId, setMonitorId] = useState(undefined);
-
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const selectedMonitorDetails = monitors?.[selectedMonitor];
 	const selectedMonitorType = selectedMonitorDetails?.type;
 
-	const [checks, checksCount, isLoading, networkError] = useFetchChecksByMonitor({
-		status: false,
-		monitorId,
-		type: selectedMonitorType,
-		sortOrder: "desc",
-		limit: null,
-		dateRange,
-		filter: filter,
-		page: page,
-		rowsPerPage: rowsPerPage,
-	});
+	const [checksMonitor, checksCountMonitor, isLoadingMonitor, networkErrorMonitor] =
+		useFetchChecksByMonitor({
+			monitorId: selectedMonitor === "0" ? undefined : selectedMonitor,
+			type: selectedMonitorType,
+			status: false,
+			sortOrder: "desc",
+			limit: null,
+			dateRange,
+			filter: filter,
+			page: page,
+			rowsPerPage: rowsPerPage,
+		});
+
+	const [checksTeam, checksCountTeam, isLoadingTeam, networkErrorTeam] =
+		useFetchChecksTeam({
+			teamId: "placeholder",
+			status: false,
+			sortOrder: "desc",
+			limit: null,
+			dateRange,
+			filter: filter,
+			page: page,
+			rowsPerPage: rowsPerPage,
+		});
+
+	const checks = selectedMonitor === "0" ? checksTeam : checksMonitor;
+	const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor;
+	const isLoading = selectedMonitor === "0" ? isLoadingTeam : isLoadingMonitor;
+	const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor;
 
 	const { t } = useTranslation();
 
@@ -56,14 +73,6 @@ const IncidentTable = ({
 		setRowsPerPage(event.target.value);
 	};
 
-	useEffect(() => {
-		if (selectedMonitor === "0") {
-			setMonitorId(undefined);
-		} else {
-			setMonitorId(selectedMonitor);
-		}
-	}, [selectedMonitor]);
-
 	const headers = [
 		{
 			id: "monitorName",
diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 8c1dbe562..1d6b9c392 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -66,16 +66,17 @@ const UptimeDetails = () => {
 
 	const monitorType = monitor?.type;
 
-	const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecksByMonitor({
-		monitorId,
-		type: monitorType,
-		sortOrder: "desc",
-		limit: null,
-		dateRange,
-		filter: null,
-		page,
-		rowsPerPage,
-	});
+	const [checks, checksCount, checksAreLoading, checksNetworkError] =
+		useFetchChecksByMonitor({
+			monitorId,
+			type: monitorType,
+			sortOrder: "desc",
+			limit: null,
+			dateRange,
+			filter: null,
+			page,
+			rowsPerPage,
+		});
 
 	// Handlers
 	const triggerUpdate = () => {

From 75eb9f8560dc3c8daccaa6d271cf46542b3fa3d8 Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Mon, 16 Jun 2025 09:43:59 -0400
Subject: [PATCH 185/319] Add ToC

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 4361711ec..12c4a40dd 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,22 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 We **love** what we are building here, and we continuously learn a few things about Reactjs, Nodejs, MongoDB, and Docker while building Checkmate.
 
+## 📚 Table of contents
+
+- [📦 Demo](#-demo)  
+- [🔗 User's guide](#-users-guide)  
+- [🛠️ Installation](#️-installation)  
+- [🏁 Translations](#-translations)  
+- [🚀 Performance](#-performance)  
+- [💚 Questions & Ideas](#-questions--ideas)  
+- [🧩 Features](#-features)  
+- [🏗️ Screenshots](#-screenshots)  
+- [🏗️ Tech stack](#-tech-stack)  
+- [🔗 A few links](#a-few-links)  
+- [🤝 Contributing](#-contributing)  
+- [💰 Our sponsors](#-our-sponsors)
+
+
 ## 📦 Demo
 
 You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is uptimedemo@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).

From 36d8e8c0cff9115c2b99bf0570c25857ca7c1e3b Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Mon, 16 Jun 2025 09:46:50 -0400
Subject: [PATCH 186/319] Better screnshots

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12c4a40dd..a57f9b270 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ If you have any questions, suggestions or comments, please use our [Discord chan
 ## 🏗️ Screenshots
 
 <p>
-<img width="1628" alt="image" src="https://github.com/user-attachments/assets/25f32197-1473-415d-9dd7-963bb07a71af" />
+<img width="1628" alt="image" src="https://github.com/user-attachments/assets/2eff6464-0738-4a32-9312-26e1e8e86275" />
 </p>
 <p>
   <img width="1656" alt="image" src="https://github.com/user-attachments/assets/616c3563-c2a7-4ee4-af6c-7e6068955d1a" />

From df42932e0cf1683e81e93e59ab91b676efb0cf07 Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Mon, 16 Jun 2025 20:40:19 +0530
Subject: [PATCH 187/319] fix(ui): shorten URL label and resize notification
 button (#2470)

---
 .../MonitorDetailsControlHeader/index.jsx     | 83 ++++++++++---------
 .../MonitorDetailsControlHeader/status.jsx    | 42 +++++-----
 2 files changed, 66 insertions(+), 59 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx
index d569ec840..9db38c0cf 100644
--- a/client/src/Components/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx
@@ -56,46 +56,49 @@ const MonitorDetailsControlHeader = ({
 		>
 			<Status monitor={monitor} />
 
-			<Stack
-				direction="row"
-				gap={theme.spacing(2)}
-			>
-				<Button
-					variant="contained"
-					color="secondary"
-					loading={isSending}
-					startIcon={<EmailIcon />}
-					onClick={() => {
-						testAllNotifications({ monitorId: monitor?._id });
-					}}
-				>
-					{t("sendTestNotifications")}
-				</Button>
-				<Button
-					variant="contained"
-					color="secondary"
-					onClick={(e) => {
-						navigate(`/incidents/${monitor?._id}`);
-					}}
-				>
-					{t("menu.incidents")}
-				</Button>
-				<Button
-					variant="contained"
-					color="secondary"
-					loading={isPausing}
-					startIcon={
-						monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
-					}
-					onClick={() => {
-						pauseMonitor({
-							monitorId: monitor?._id,
-							triggerUpdate,
-						});
-					}}
-				>
-					{monitor?.isActive ? "Pause" : "Resume"}
-				</Button>
+      <Stack
+        direction="row"
+        gap={theme.spacing(2)}
+      >
+        <Button
+          variant="contained"
+          color="secondary"
+          loading={isSending}
+          startIcon={<EmailIcon />}
+          onClick={() => {
+            testAllNotifications({ monitorId: monitor?._id });
+          }}
+          sx={{
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {t("sendTestNotifications")}
+        </Button>
+        <Button
+          variant="contained"
+          color="secondary"
+          onClick={(e) => {
+            navigate(`/incidents/${monitor?._id}`);
+          }}
+        >
+          {t("menu.incidents")}
+        </Button>
+        <Button
+          variant="contained"
+          color="secondary"
+          loading={isPausing}
+          startIcon={
+            monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
+          }
+          onClick={() => {
+            pauseMonitor({
+              monitorId: monitor?._id,
+              triggerUpdate,
+            });
+          }}
+        >
+          {monitor?.isActive ? "Pause" : "Resume"}
+        </Button>
 
 				{isAdmin && (
 					<Button
diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index fdfb955f4..f5c9aa597 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -24,25 +24,29 @@ const Status = ({ monitor }) => {
 	const theme = useTheme();
 	const { statusColor, determineState } = useMonitorUtils();
 
-	return (
-		<Stack>
-			<Typography variant="monitorName">{monitor?.name}</Typography>
-			<Stack
-				direction="row"
-				alignItems={"center"}
-				gap={theme.spacing(4)}
-			>
-				<PulseDot color={statusColor[determineState(monitor)]} />
-				<Typography variant="monitorUrl">
-					{monitor?.url?.replace(/^https?:\/\//, "") || "..."}
-				</Typography>
-				<Dot />
-				<Typography>
-					Checking every {formatDurationRounded(monitor?.interval)}.
-				</Typography>
-			</Stack>
-		</Stack>
-	);
+  return (
+    <Stack>
+      <Typography variant="monitorName">{monitor?.name}</Typography>
+      <Stack
+        direction="row"
+        alignItems={"center"}
+        gap={theme.spacing(4)}
+      >
+        <PulseDot color={statusColor[determineState(monitor)]} />
+        <Typography variant="monitorUrl" noWrap>
+          {monitor?.url ? (
+            monitor.url?.length > 55
+              ? `${monitor.url.replace(/^https?:\/\//, "")?.slice(0, 55)}…`
+              : monitor.url.replace(/^https?:\/\//, "")
+          ) : "…"}
+        </Typography>
+        <Dot />
+        <Typography>
+          Checking every {formatDurationRounded(monitor?.interval)}.
+        </Typography>
+      </Stack>
+    </Stack>
+  );
 };
 
 Status.propTypes = {

From e9e509ab0458d01637c91b423c3345a296ba21cb Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Tue, 17 Jun 2025 00:11:33 +0530
Subject: [PATCH 188/319] Addition of export.

---
 .../Components/MonitorCreateHeader/index.jsx  | 33 ++++++++++++------
 client/src/Hooks/monitorHooks.js              | 34 +++++++++++++++++++
 client/src/Utils/NetworkService.js            |  7 ++++
 client/src/locales/en.json                    |  7 +++-
 server/controllers/monitorController.js       | 27 +++++++++++++++
 server/routes/monitorRoute.js                 |  5 +++
 6 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/client/src/Components/MonitorCreateHeader/index.jsx b/client/src/Components/MonitorCreateHeader/index.jsx
index b630cb259..7a4d75226 100644
--- a/client/src/Components/MonitorCreateHeader/index.jsx
+++ b/client/src/Components/MonitorCreateHeader/index.jsx
@@ -3,11 +3,13 @@ import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@emotion/react";
+import { useExportMonitors } from "../../Hooks/monitorHooks";
 
 const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath }) => {
 	const navigate = useNavigate();
 	const { t } = useTranslation();
 	const theme = useTheme();
+	const [exportMonitors, isExporting] = useExportMonitors()
 
 	// Use the provided label or fall back to the translated default
 
@@ -29,16 +31,27 @@ const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath
 				{label || t("createNew")}
 			</Button>
 			{bulkPath && (
-				<Button
-					loading={isLoading}
-					variant="contained"
-					color="accent"
-					onClick={() => {
-						navigate(`${bulkPath}`);
-					}}
-				>
-					{t("bulkImport.title")}
-				</Button>
+				<>
+					<Button
+						loading={isLoading}
+						variant="contained"
+						color="accent"
+						onClick={() => {
+							navigate(`${bulkPath}`);
+						}}
+					>
+						{t("bulkImport.title")}
+					</Button>
+
+					<Button
+						loading={isExporting}
+						variant="contained"
+						color="accent"
+						onClick={exportMonitors}
+					>
+						{t("export.title")}
+					</Button>
+				</>
 			)}
 		</Stack>
 	);
diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 7e46438e0..b3e4a9478 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -453,6 +453,39 @@ const useCreateBulkMonitors = () => {
 	return [createBulkMonitors, isLoading];
 };
 
+const useExportMonitors = () => {
+    const [isLoading, setIsLoading] = useState(false);
+    const { t } = useTranslation();
+
+    const exportMonitors = async () => {
+        setIsLoading(true);
+        try {
+            const blob = await networkService.exportMonitors();
+            
+            // Create a download link
+            const url = window.URL.createObjectURL(blob);
+            const link = document.createElement('a');
+            link.href = url;
+            link.setAttribute('download', 'monitors.csv');
+            document.body.appendChild(link);
+            link.click();
+            link.remove();
+            window.URL.revokeObjectURL(url);
+            
+            createToast({ body: t('export.success') });
+            return [true, null];
+        } catch (err) {
+            const errorMessage = err?.response?.data?.msg || err.message;
+            createToast({ body: errorMessage || t('export.failed') });
+            return [false, errorMessage];
+        } finally {
+            setIsLoading(false);
+        }
+    };
+
+    return [exportMonitors, isLoading];
+};
+
 export {
 	useFetchMonitorsWithSummary,
 	useFetchMonitorsWithChecks,
@@ -469,4 +502,5 @@ export {
 	useDeleteAllMonitors,
 	useDeleteMonitorStats,
 	useCreateBulkMonitors,
+	useExportMonitors,
 };
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index eee795268..6451f93e8 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1022,6 +1022,13 @@ class NetworkService {
 		const { id, notification } = config;
 		return this.axiosInstance.put(`/notifications/${id}`, notification);
 	}
+
+	async exportMonitors() {
+		const response = await this.axiosInstance.get("/monitors/export", {
+			responseType: "blob",
+		});
+		return response.data;
+	}
 }
 
 export default NetworkService;
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 783cdb179..d71cf3212 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -739,5 +739,10 @@
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	}
+	},
+	"export": {
+        "title": "Export Monitors",
+        "success": "Monitors exported successfully!",
+        "failed": "Failed to export monitors"
+    }
 }
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 6c6136fb5..5d71f9cb6 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -702,6 +702,33 @@ class MonitorController {
 			next(handleError(error, SERVICE_NAME, "seedDb"));
 		}
 	};
+
+	exportMonitorsToCSV = async (req, res, next) => {
+		try {
+			const { teamId } = req.user;
+
+			const monitors = await this.db.getMonitorsByTeamId({ teamId });
+			const csvData = monitors?.filteredMonitors?.map((monitor) => ({
+				name: monitor.name,
+				description: monitor.description,
+				type: monitor.type,
+				url: monitor.url,
+				interval: monitor.interval,
+				port: monitor.port,
+				ignoreTlsErrors: monitor.ignoreTlsErrors,
+				isActive: monitor.isActive,
+			}));
+
+			const csv = pkg.unparse(csvData);
+
+			res.setHeader("Content-Type", "text/csv");
+			res.setHeader("Content-Disposition", "attachment; filename=monitors.csv");
+
+			res.send(csv);
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "exportMonitorsToCSV"));
+		}
+	};
 }
 
 export default MonitorController;
diff --git a/server/routes/monitorRoute.js b/server/routes/monitorRoute.js
index 0dabab407..2c6ae870e 100755
--- a/server/routes/monitorRoute.js
+++ b/server/routes/monitorRoute.js
@@ -17,6 +17,11 @@ class MonitorRoutes {
 	initRoutes() {
 		this.router.get("/", this.monitorController.getAllMonitors);
 		this.router.get("/uptime", this.monitorController.getAllMonitorsWithUptimeStats);
+		this.router.get(
+			"/export",
+			isAllowed(["admin", "superadmin"]),
+			this.monitorController.exportMonitorsToCSV
+		);
 		this.router.get("/stats/:monitorId", this.monitorController.getMonitorStatsById);
 		this.router.get(
 			"/hardware/details/:monitorId",

From 11212c73717e431c62c8138a7d9d9932a270dba9 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Tue, 17 Jun 2025 00:17:46 +0530
Subject: [PATCH 189/319] Formatting was done.

---
 .../Components/MonitorCreateHeader/index.jsx  |  2 +-
 client/src/Hooks/monitorHooks.js              | 56 +++++++++----------
 client/src/locales/en.json                    |  8 +--
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/client/src/Components/MonitorCreateHeader/index.jsx b/client/src/Components/MonitorCreateHeader/index.jsx
index 7a4d75226..a62123531 100644
--- a/client/src/Components/MonitorCreateHeader/index.jsx
+++ b/client/src/Components/MonitorCreateHeader/index.jsx
@@ -9,7 +9,7 @@ const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath
 	const navigate = useNavigate();
 	const { t } = useTranslation();
 	const theme = useTheme();
-	const [exportMonitors, isExporting] = useExportMonitors()
+	const [exportMonitors, isExporting] = useExportMonitors();
 
 	// Use the provided label or fall back to the translated default
 
diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index b3e4a9478..d7c8e4287 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -454,36 +454,36 @@ const useCreateBulkMonitors = () => {
 };
 
 const useExportMonitors = () => {
-    const [isLoading, setIsLoading] = useState(false);
-    const { t } = useTranslation();
+	const [isLoading, setIsLoading] = useState(false);
+	const { t } = useTranslation();
 
-    const exportMonitors = async () => {
-        setIsLoading(true);
-        try {
-            const blob = await networkService.exportMonitors();
-            
-            // Create a download link
-            const url = window.URL.createObjectURL(blob);
-            const link = document.createElement('a');
-            link.href = url;
-            link.setAttribute('download', 'monitors.csv');
-            document.body.appendChild(link);
-            link.click();
-            link.remove();
-            window.URL.revokeObjectURL(url);
-            
-            createToast({ body: t('export.success') });
-            return [true, null];
-        } catch (err) {
-            const errorMessage = err?.response?.data?.msg || err.message;
-            createToast({ body: errorMessage || t('export.failed') });
-            return [false, errorMessage];
-        } finally {
-            setIsLoading(false);
-        }
-    };
+	const exportMonitors = async () => {
+		setIsLoading(true);
+		try {
+			const blob = await networkService.exportMonitors();
 
-    return [exportMonitors, isLoading];
+			// Create a download link
+			const url = window.URL.createObjectURL(blob);
+			const link = document.createElement("a");
+			link.href = url;
+			link.setAttribute("download", "monitors.csv");
+			document.body.appendChild(link);
+			link.click();
+			link.remove();
+			window.URL.revokeObjectURL(url);
+
+			createToast({ body: t("export.success") });
+			return [true, null];
+		} catch (err) {
+			const errorMessage = err?.response?.data?.msg || err.message;
+			createToast({ body: errorMessage || t("export.failed") });
+			return [false, errorMessage];
+		} finally {
+			setIsLoading(false);
+		}
+	};
+
+	return [exportMonitors, isLoading];
 };
 
 export {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d71cf3212..d13d44f7f 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -741,8 +741,8 @@
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
 	},
 	"export": {
-        "title": "Export Monitors",
-        "success": "Monitors exported successfully!",
-        "failed": "Failed to export monitors"
-    }
+		"title": "Export Monitors",
+		"success": "Monitors exported successfully!",
+		"failed": "Failed to export monitors"
+	}
 }

From 7d333c6d93607d76bd38d34b3358c107db0de1f5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 17 Jun 2025 10:58:30 +0800
Subject: [PATCH 190/319] return updated settings

---
 server/controllers/settingsController.js  | 18 ++++++++++++------
 server/db/mongo/modules/settingsModule.js |  6 ++++--
 server/service/settingsService.js         | 14 ++++++--------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js
index d1010c093..dd5c1b6d7 100755
--- a/server/controllers/settingsController.js
+++ b/server/controllers/settingsController.js
@@ -11,8 +11,7 @@ class SettingsController {
 		this.emailService = emailService;
 	}
 
-	getAppSettings = async (req, res, next) => {
-		const dbSettings = await this.settingsService.getDBSettings();
+	buildAppSettings = (dbSettings) => {
 		const sanitizedSettings = { ...dbSettings };
 		delete sanitizedSettings.version;
 
@@ -30,6 +29,14 @@ class SettingsController {
 			delete sanitizedSettings.systemEmailPassword;
 		}
 		returnSettings.settings = sanitizedSettings;
+		return returnSettings;
+	};
+
+	getAppSettings = async (req, res, next) => {
+		const dbSettings = await this.settingsService.getDBSettings();
+
+		const returnSettings = this.buildAppSettings(dbSettings);
+		console.log(returnSettings);
 		return res.success({
 			msg: this.stringService.getAppSettings,
 			data: returnSettings,
@@ -45,12 +52,11 @@ class SettingsController {
 		}
 
 		try {
-			await this.db.updateAppSettings(req.body);
-			const updatedSettings = { ...(await this.settingsService.reloadSettings()) };
-			delete updatedSettings.jwtSecret;
+			const updatedSettings = await this.db.updateAppSettings(req.body);
+			const returnSettings = this.buildAppSettings(updatedSettings);
 			return res.success({
 				msg: this.stringService.updateAppSettings,
-				data: updatedSettings,
+				data: returnSettings,
 			});
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "updateAppSettings"));
diff --git a/server/db/mongo/modules/settingsModule.js b/server/db/mongo/modules/settingsModule.js
index d3568ad32..4fd0d1634 100755
--- a/server/db/mongo/modules/settingsModule.js
+++ b/server/db/mongo/modules/settingsModule.js
@@ -26,10 +26,12 @@ const updateAppSettings = async (newSettings) => {
 			delete update.$set.systemEmailPassword;
 		}
 
-		const settings = await AppSettings.findOneAndUpdate({}, update, {
-			new: true,
+		await AppSettings.findOneAndUpdate({}, update, {
 			upsert: true,
 		});
+		const settings = await AppSettings.findOne()
+			.select("-__v -_id -createdAt -updatedAt -singleton")
+			.lean();
 		return settings;
 	} catch (error) {
 		error.service = SERVICE_NAME;
diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index bc314abff..de035922c 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -28,8 +28,8 @@ class SettingsService {
 	 * Constructs a new SettingsService
 	 * @constructor
 	 * @throws {Error}
-	 */ constructor(appSettings) {
-		this.appSettings = appSettings;
+	 */ constructor(AppSettings) {
+		this.AppSettings = AppSettings;
 		this.settings = { ...envConfig };
 	}
 	/**
@@ -60,16 +60,14 @@ class SettingsService {
 
 	async getDBSettings() {
 		// Remove any old settings
-		await this.appSettings.deleteMany({ version: { $exists: false } });
+		await this.AppSettings.deleteMany({ version: { $exists: false } });
 
-		let settings = await this.appSettings
-			.findOne({ singleton: true })
+		let settings = await this.AppSettings.findOne({ singleton: true })
 			.select("-__v -_id -createdAt -updatedAt -singleton")
 			.lean();
 		if (settings === null) {
-			await this.appSettings.create({});
-			settings = await this.appSettings
-				.findOne({ singleton: true })
+			await this.AppSettings.create({});
+			settings = await this.AppSettings.findOne({ singleton: true })
 				.select("-__v -_id -createdAt -updatedAt -singleton")
 				.lean();
 		}

From 456798ca1519cd56289f61eccca657152c49a05a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 17 Jun 2025 10:58:41 +0800
Subject: [PATCH 191/319] move state to parent

---
 client/src/Hooks/settingsHooks.js             | 24 ++++++++++++++---
 client/src/Pages/Settings/SettingsEmail.jsx   | 14 +++++-----
 .../src/Pages/Settings/SettingsPagespeed.jsx  | 12 ++++++---
 client/src/Pages/Settings/index.jsx           | 26 +++++++++++++++----
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/client/src/Hooks/settingsHooks.js b/client/src/Hooks/settingsHooks.js
index 7d3ff28fc..98a21c1fa 100644
--- a/client/src/Hooks/settingsHooks.js
+++ b/client/src/Hooks/settingsHooks.js
@@ -3,7 +3,7 @@ import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 import { useTranslation } from "react-i18next";
 
-const useFetchSettings = ({ setSettingsData }) => {
+const useFetchSettings = ({ setSettingsData, setIsApiKeySet, setIsEmailPasswordSet }) => {
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState(undefined);
 	useEffect(() => {
@@ -12,6 +12,8 @@ const useFetchSettings = ({ setSettingsData }) => {
 			try {
 				const response = await networkService.getAppSettings();
 				setSettingsData(response?.data?.data);
+				setIsApiKeySet(response?.data?.data?.pagespeedKeySet);
+				setIsEmailPasswordSet(response?.data?.data?.emailPasswordSet);
 			} catch (error) {
 				createToast({ body: "Failed to fetch settings" });
 				setError(error);
@@ -20,12 +22,18 @@ const useFetchSettings = ({ setSettingsData }) => {
 			}
 		};
 		fetchSettings();
-	}, []);
+	}, [setSettingsData]);
 
 	return [isLoading, error];
 };
 
-const useSaveSettings = () => {
+const useSaveSettings = ({
+	setSettingsData,
+	setIsApiKeySet,
+	setApiKeyHasBeenReset,
+	setIsEmailPasswordSet,
+	setEmailPasswordHasBeenReset,
+}) => {
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState(undefined);
 	const { t } = useTranslation();
@@ -39,7 +47,15 @@ const useSaveSettings = () => {
 					ttl: settings.checkTTL,
 				});
 			}
-			console.log({ settingsResponse });
+			setIsApiKeySet(settingsResponse.data.data.pagespeedKeySet);
+			setIsEmailPasswordSet(settingsResponse.data.data.emailPasswordSet);
+			if (settingsResponse.data.data.pagespeedKeySet === true) {
+				setApiKeyHasBeenReset(false);
+			}
+			if (settingsResponse.data.data.emailPasswordSet === true) {
+				setEmailPasswordHasBeenReset(false);
+			}
+			setSettingsData(settingsResponse.data.data);
 			createToast({ body: t("settingsSuccessSaved") });
 		} catch (error) {
 			createToast({ body: t("settingsFailedToSave") });
diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index e7ae88154..4bd6ff3ad 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -7,7 +7,7 @@ import Stack from "@mui/material/Stack";
 // Utils
 import { useTheme } from "@emotion/react";
 import { PropTypes } from "prop-types";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
@@ -20,7 +20,9 @@ const SettingsEmail = ({
 	handleChange,
 	settingsData,
 	setSettingsData,
-	isPasswordSet,
+	isEmailPasswordSet,
+	emailPasswordHasBeenReset,
+	setEmailPasswordHasBeenReset,
 }) => {
 	// Setup
 	const { t } = useTranslation();
@@ -43,7 +45,6 @@ const SettingsEmail = ({
 	} = settingsData?.settings || {};
 	// Local state
 	const [password, setPassword] = useState("");
-	const [hasBeenReset, setHasBeenReset] = useState(false);
 
 	// Network
 	const [isSending, , sendTestEmail] = useSendTestEmail(); // Using empty placeholder for unused error variable
@@ -152,7 +153,7 @@ const SettingsEmail = ({
 							onChange={handleChange}
 						/>
 					</Box>
-					{(isPasswordSet === false || hasBeenReset === true) && (
+					{(isEmailPasswordSet === false || emailPasswordHasBeenReset === true) && (
 						<Box>
 							<Typography>{t("settingsEmailPassword")}</Typography>
 							<TextInput
@@ -165,7 +166,8 @@ const SettingsEmail = ({
 							/>
 						</Box>
 					)}
-					{isPasswordSet === true && hasBeenReset === false && (
+
+					{isEmailPasswordSet === true && emailPasswordHasBeenReset === false && (
 						<Box>
 							<Typography>{t("settingsEmailFieldResetLabel")}</Typography>
 							<Button
@@ -175,7 +177,7 @@ const SettingsEmail = ({
 										...settingsData,
 										settings: { ...settingsData.settings, systemEmailPassword: "" },
 									});
-									setHasBeenReset(true);
+									setEmailPasswordHasBeenReset(true);
 								}}
 								variant="contained"
 								color="error"
diff --git a/client/src/Pages/Settings/SettingsPagespeed.jsx b/client/src/Pages/Settings/SettingsPagespeed.jsx
index c7007b5bd..7d7cf0216 100644
--- a/client/src/Pages/Settings/SettingsPagespeed.jsx
+++ b/client/src/Pages/Settings/SettingsPagespeed.jsx
@@ -17,13 +17,14 @@ const SettingsPagespeed = ({
 	settingsData,
 	setSettingsData,
 	isApiKeySet,
+	apiKeyHasBeenReset,
+	setApiKeyHasBeenReset,
 }) => {
 	const { t } = useTranslation();
 	const theme = useTheme();
 
 	// Local state
 	const [apiKey, setApiKey] = useState("");
-	const [hasBeenReset, setHasBeenReset] = useState(false);
 
 	// Handler
 	const handleChange = (e) => {
@@ -50,7 +51,7 @@ const SettingsPagespeed = ({
 				<Typography sx={HEADING_SX}>{t("pageSpeedApiKeyFieldDescription")}</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
-				{(isApiKeySet === false || hasBeenReset === true) && (
+				{(isApiKeySet === false || apiKeyHasBeenReset === true) && (
 					<TextInput
 						name="pagespeedApiKey"
 						label={t("pageSpeedApiKeyFieldLabel")}
@@ -62,7 +63,7 @@ const SettingsPagespeed = ({
 					/>
 				)}
 
-				{isApiKeySet === true && hasBeenReset === false && (
+				{isApiKeySet === true && apiKeyHasBeenReset === false && (
 					<Box>
 						<Typography>{t("pageSpeedApiKeyFieldResetLabel")}</Typography>
 						<Button
@@ -72,7 +73,7 @@ const SettingsPagespeed = ({
 									...settingsData,
 									settings: { ...settingsData.settings, pagespeedApiKey: "" },
 								});
-								setHasBeenReset(true);
+								setApiKeyHasBeenReset(true);
 							}}
 							variant="contained"
 							color="error"
@@ -93,6 +94,9 @@ SettingsPagespeed.propTypes = {
 	settingsData: PropTypes.object,
 	setSettingsData: PropTypes.func,
 	isApiKeySet: PropTypes.bool,
+	setIsApiKeySet: PropTypes.func,
+	apiKeyHasBeenReset: PropTypes.bool,
+	setApiKeyHasBeenReset: PropTypes.func,
 };
 
 export default SettingsPagespeed;
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 804ca48c7..7368f0e32 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -31,19 +31,32 @@ const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
 const Settings = () => {
 	// Redux state
 	const { mode, language, timezone, showURL } = useSelector((state) => state.ui);
-	const { user } = useSelector((state) => state.auth);
 
 	// Local state
 	const [settingsData, setSettingsData] = useState({});
 	const [errors, setErrors] = useState({});
+	const [isApiKeySet, setIsApiKeySet] = useState(settingsData?.pagespeedKeySet ?? false);
+	const [apiKeyHasBeenReset, setApiKeyHasBeenReset] = useState(false);
+	const [isEmailPasswordSet, setIsEmailPasswordSet] = useState(
+		settingsData?.emailPasswordSet ?? false
+	);
+	const [emailPasswordHasBeenReset, setEmailPasswordHasBeenReset] = useState(false);
 
 	// Network
 	const [isSettingsLoading, settingsError] = useFetchSettings({
 		setSettingsData,
+		setIsApiKeySet,
+		setIsEmailPasswordSet,
 	});
 	const [addDemoMonitors, isAddingDemoMonitors] = useAddDemoMonitors();
 
-	const [isSaving, saveError, saveSettings] = useSaveSettings();
+	const [isSaving, saveError, saveSettings] = useSaveSettings({
+		setSettingsData,
+		setIsApiKeySet,
+		setApiKeyHasBeenReset,
+		setIsEmailPasswordSet,
+		setEmailPasswordHasBeenReset,
+	});
 	const [deleteAllMonitors, isDeletingMonitors] = useDeleteAllMonitors();
 	const [deleteMonitorStats, isDeletingMonitorStats] = useDeleteMonitorStats();
 
@@ -53,7 +66,6 @@ const Settings = () => {
 	const HEADING_SX = { mt: theme.spacing(2), mb: theme.spacing(2) };
 	const { t } = useTranslation();
 	const dispatch = useDispatch();
-
 	// Handlers
 	const handleChange = async (e) => {
 		const { name, value, checked } = e.target;
@@ -159,7 +171,9 @@ const Settings = () => {
 				HEADING_SX={HEADING_SX}
 				settingsData={settingsData}
 				setSettingsData={setSettingsData}
-				isApiKeySet={settingsData?.pagespeedKeySet ?? false}
+				isApiKeySet={isApiKeySet}
+				apiKeyHasBeenReset={apiKeyHasBeenReset}
+				setApiKeyHasBeenReset={setApiKeyHasBeenReset}
 			/>
 			<SettingsURL
 				HEADING_SX={HEADING_SX}
@@ -187,7 +201,9 @@ const Settings = () => {
 				handleChange={handleChange}
 				settingsData={settingsData}
 				setSettingsData={setSettingsData}
-				isPasswordSet={settingsData?.emailPasswordSet ?? false}
+				isEmailPasswordSet={isEmailPasswordSet}
+				emailPasswordHasBeenReset={emailPasswordHasBeenReset}
+				setEmailPasswordHasBeenReset={setEmailPasswordHasBeenReset}
 			/>
 			<SettingsAbout />
 			<Stack

From 791c62b5832b8f04d45bbd12bbbe396b841ed84c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 17 Jun 2025 11:13:37 +0800
Subject: [PATCH 192/319] remove console log

---
 server/controllers/settingsController.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js
index dd5c1b6d7..b9faa1c32 100755
--- a/server/controllers/settingsController.js
+++ b/server/controllers/settingsController.js
@@ -36,7 +36,6 @@ class SettingsController {
 		const dbSettings = await this.settingsService.getDBSettings();
 
 		const returnSettings = this.buildAppSettings(dbSettings);
-		console.log(returnSettings);
 		return res.success({
 			msg: this.stringService.getAppSettings,
 			data: returnSettings,

From 64e4a3278a1c9949438b70eac3a667b33091a4f5 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 Jun 2025 03:15:12 +0000
Subject: [PATCH 193/319] feat: translations updated from POEditor

---
 client/src/locales/ar.json    | 744 ++++++++++++++++++++++++++++++++++
 client/src/locales/cs.json    | 505 +++++++++++++----------
 client/src/locales/de.json    | 492 ++++++++++++----------
 client/src/locales/en.json    | 531 ++++++++++++------------
 client/src/locales/es.json    | 482 +++++++++++++---------
 client/src/locales/fi.json    | 482 +++++++++++++---------
 client/src/locales/fr.json    | 482 +++++++++++++---------
 client/src/locales/pt-BR.json | 481 +++++++++++++---------
 client/src/locales/ru.json    | 477 +++++++++++++---------
 client/src/locales/tr.json    | 482 +++++++++++++---------
 client/src/locales/zh-TW.json | 492 ++++++++++++----------
 11 files changed, 3568 insertions(+), 2082 deletions(-)
 create mode 100644 client/src/locales/ar.json

diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
new file mode 100644
index 000000000..fd4d925a9
--- /dev/null
+++ b/client/src/locales/ar.json
@@ -0,0 +1,744 @@
+{
+	"submit": "",
+	"title": "",
+	"distributedStatusHeaderText": "",
+	"distributedStatusSubHeaderText": "",
+	"settingsGeneralSettings": "",
+	"settingsDisplayTimezone": "",
+	"settingsDisplayTimezoneDescription": "",
+	"settingsAppearance": "",
+	"settingsAppearanceDescription": "",
+	"settingsThemeMode": "",
+	"settingsLanguage": "",
+	"settingsEnabled": "",
+	"settingsDisabled": "",
+	"settingsHistoryAndMonitoring": "",
+	"settingsHistoryAndMonitoringDescription": "",
+	"settingsTTLLabel": "",
+	"settingsTTLOptionalLabel": "",
+	"settingsClearAllStats": "",
+	"settingsClearAllStatsButton": "",
+	"settingsClearAllStatsDialogTitle": "",
+	"settingsClearAllStatsDialogDescription": "",
+	"settingsClearAllStatsDialogConfirm": "",
+	"settingsDemoMonitors": "",
+	"settingsDemoMonitorsDescription": "",
+	"settingsAddDemoMonitors": "",
+	"settingsAddDemoMonitorsButton": "",
+	"settingsRemoveAllMonitors": "",
+	"settingsRemoveAllMonitorsButton": "",
+	"settingsRemoveAllMonitorsDialogTitle": "",
+	"settingsRemoveAllMonitorsDialogConfirm": "",
+	"settingsAbout": "",
+	"settingsDevelopedBy": "",
+	"settingsSave": "",
+	"settingsSuccessSaved": "",
+	"settingsFailedToSave": "",
+	"settingsStatsCleared": "",
+	"settingsFailedToClearStats": "",
+	"settingsDemoMonitorsAdded": "",
+	"settingsFailedToAddDemoMonitors": "",
+	"settingsMonitorsDeleted": "",
+	"settingsFailedToDeleteMonitors": "",
+	"starPromptTitle": "",
+	"starPromptDescription": "",
+	"https": "",
+	"http": "",
+	"monitor": "",
+	"aboutus": "",
+	"now": "",
+	"delete": "",
+	"configure": "",
+	"responseTime": "",
+	"ms": "",
+	"bar": "",
+	"area": "",
+	"country": "",
+	"city": "",
+	"response": "",
+	"monitorStatusUp": "",
+	"monitorStatusDown": "",
+	"webhookSendSuccess": "",
+	"webhookSendError": "",
+	"webhookUnsupportedPlatform": "",
+	"distributedRightCategoryTitle": "",
+	"distributedStatusServerMonitors": "",
+	"distributedStatusServerMonitorsDescription": "",
+	"distributedUptimeCreateSelectURL": "",
+	"distributedUptimeCreateChecks": "",
+	"distributedUptimeCreateChecksDescription": "",
+	"distributedUptimeCreateIncidentNotification": "",
+	"distributedUptimeCreateIncidentDescription": "",
+	"distributedUptimeCreateAdvancedSettings": "",
+	"distributedUptimeDetailsNoMonitorHistory": "",
+	"distributedUptimeDetailsStatusHeaderUptime": "",
+	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
+	"notifications": {
+		"enableNotifications": "",
+		"testNotification": "",
+		"addOrEditNotifications": "",
+		"slack": {
+			"label": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": "",
+			"webhookRequired": ""
+		},
+		"discord": {
+			"label": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": "",
+			"webhookRequired": ""
+		},
+		"telegram": {
+			"label": "",
+			"description": "",
+			"tokenLabel": "",
+			"tokenPlaceholder": "",
+			"chatIdLabel": "",
+			"chatIdPlaceholder": "",
+			"fieldsRequired": ""
+		},
+		"webhook": {
+			"label": "",
+			"description": "",
+			"urlLabel": "",
+			"urlPlaceholder": "",
+			"urlRequired": ""
+		},
+		"testNotificationDevelop": "",
+		"integrationButton": "",
+		"testSuccess": "",
+		"testFailed": "",
+		"unsupportedType": "",
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
+	},
+	"testLocale": "",
+	"add": "",
+	"monitors": "",
+	"distributedUptimeStatusCreateStatusPage": "",
+	"distributedUptimeStatusCreateStatusPageAccess": "",
+	"distributedUptimeStatusCreateStatusPageReady": "",
+	"distributedUptimeStatusBasicInfoHeader": "",
+	"distributedUptimeStatusBasicInfoDescription": "",
+	"distributedUptimeStatusLogoHeader": "",
+	"distributedUptimeStatusLogoDescription": "",
+	"distributedUptimeStatusLogoUploadButton": "",
+	"distributedUptimeStatusStandardMonitorsHeader": "",
+	"distributedUptimeStatusStandardMonitorsDescription": "",
+	"distributedUptimeStatusCreateYour": "",
+	"distributedUptimeStatusEditYour": "",
+	"distributedUptimeStatusPublishedLabel": "",
+	"distributedUptimeStatusCompanyNameLabel": "",
+	"distributedUptimeStatusPageAddressLabel": "",
+	"distributedUptimeStatus30Days": "",
+	"distributedUptimeStatus60Days": "",
+	"distributedUptimeStatus90Days": "",
+	"distributedUptimeStatusPageNotSetUp": "",
+	"distributedUptimeStatusContactAdmin": "",
+	"distributedUptimeStatusPageNotPublic": "",
+	"distributedUptimeStatusPageDeleteDialog": "",
+	"distributedUptimeStatusPageDeleteConfirm": "",
+	"distributedUptimeStatusPageDeleteDescription": "",
+	"distributedUptimeStatusDevices": "",
+	"distributedUptimeStatusUpt": "",
+	"distributedUptimeStatusUptBurned": "",
+	"distributedUptimeStatusUptLogo": "",
+	"incidentsTableNoIncidents": "",
+	"incidentsTablePaginationLabel": "",
+	"incidentsTableMonitorName": "",
+	"incidentsTableStatus": "",
+	"incidentsTableDateTime": "",
+	"incidentsTableStatusCode": "",
+	"incidentsTableMessage": "",
+	"incidentsOptionsHeader": "",
+	"incidentsOptionsHeaderFilterBy": "",
+	"incidentsOptionsHeaderFilterAll": "",
+	"incidentsOptionsHeaderFilterDown": "",
+	"incidentsOptionsHeaderFilterCannotResolve": "",
+	"incidentsOptionsHeaderShow": "",
+	"incidentsOptionsHeaderLastHour": "",
+	"incidentsOptionsHeaderLastDay": "",
+	"incidentsOptionsHeaderLastWeek": "",
+	"incidentsOptionsPlaceholderAllServers": "",
+	"infrastructureCreateYour": "",
+	"infrastructureCreateGeneralSettingsDescription": "",
+	"infrastructureServerRequirement": "",
+	"infrastructureCustomizeAlerts": "",
+	"infrastructureAlertNotificationDescription": "",
+	"infrastructureCreateMonitor": "",
+	"infrastructureProtocol": "",
+	"infrastructureServerUrlLabel": "",
+	"infrastructureDisplayNameLabel": "",
+	"infrastructureAuthorizationSecretLabel": "",
+	"gb": "",
+	"mb": "",
+	"mem": "",
+	"memoryUsage": "",
+	"cpu": "",
+	"cpuUsage": "",
+	"cpuTemperature": "",
+	"diskUsage": "",
+	"used": "",
+	"total": "",
+	"cores": "",
+	"frequency": "",
+	"status": "",
+	"cpuPhysical": "",
+	"cpuLogical": "",
+	"cpuFrequency": "",
+	"avgCpuTemperature": "",
+	"memory": "",
+	"disk": "",
+	"uptime": "",
+	"os": "",
+	"host": "",
+	"actions": "",
+	"integrations": "",
+	"integrationsPrism": "",
+	"integrationsSlack": "",
+	"integrationsSlackInfo": "",
+	"integrationsDiscord": "",
+	"integrationsDiscordInfo": "",
+	"integrationsZapier": "",
+	"integrationsZapierInfo": "",
+	"commonSave": "",
+	"createYour": "",
+	"createMonitor": "",
+	"pause": "",
+	"resume": "",
+	"editing": "",
+	"url": "",
+	"access": "",
+	"timezone": "",
+	"features": "",
+	"administrator": "",
+	"loginHere": "",
+	"displayName": "",
+	"urlMonitor": "",
+	"portToMonitor": "",
+	"websiteMonitoring": "",
+	"websiteMonitoringDescription": "",
+	"pingMonitoring": "",
+	"pingMonitoringDescription": "",
+	"dockerContainerMonitoring": "",
+	"dockerContainerMonitoringDescription": "",
+	"portMonitoring": "",
+	"portMonitoringDescription": "",
+	"createMaintenanceWindow": "",
+	"createMaintenance": "",
+	"editMaintenance": "",
+	"maintenanceWindowName": "",
+	"friendlyNameInput": "",
+	"friendlyNamePlaceholder": "",
+	"maintenanceRepeat": "",
+	"maintenance": "",
+	"duration": "",
+	"addMonitors": "",
+	"window": "",
+	"cancel": "",
+	"message": "",
+	"low": "",
+	"high": "",
+	"statusCode": "",
+	"date&Time": "",
+	"type": "",
+	"statusPageName": "",
+	"publicURL": "",
+	"repeat": "",
+	"edit": "",
+	"createA": "",
+	"remove": "",
+	"maintenanceWindowDescription": "",
+	"startTime": "",
+	"timeZoneInfo": "",
+	"monitorsToApply": "",
+	"nextWindow": "",
+	"notFoundButton": "",
+	"pageSpeedConfigureSettingsDescription": "",
+	"monitorDisplayName": "",
+	"whenNewIncident": "",
+	"notifySMS": "",
+	"notifyEmails": "",
+	"seperateEmails": "",
+	"checkFrequency": "",
+	"matchMethod": "",
+	"expectedValue": "",
+	"deleteDialogTitle": "",
+	"deleteDialogDescription": "",
+	"pageSpeedMonitor": "",
+	"shown": "",
+	"ago": "",
+	"companyName": "",
+	"pageSpeedDetailsPerformanceReport": "",
+	"pageSpeedDetailsPerformanceReportCalculator": "",
+	"checkingEvery": "",
+	"statusPageCreateSettings": "",
+	"basicInformation": "",
+	"statusPageCreateBasicInfoDescription": "",
+	"statusPageCreateSelectTimeZoneDescription": "",
+	"statusPageCreateAppearanceDescription": "",
+	"statusPageCreateSettingsCheckboxLabel": "",
+	"statusPageCreateBasicInfoStatusPageAddress": "",
+	"statusPageCreateTabsContent": "",
+	"statusPageCreateTabsContentDescription": "",
+	"statusPageCreateTabsContentFeaturesDescription": "",
+	"showCharts": "",
+	"showUptimePercentage": "",
+	"removeLogo": "",
+	"statusPageStatus": "",
+	"statusPageStatusContactAdmin": "",
+	"statusPageStatusNotPublic": "",
+	"statusPageStatusNoPage": "",
+	"statusPageStatusServiceStatus": "",
+	"deleteStatusPage": "",
+	"deleteStatusPageConfirm": "",
+	"deleteStatusPageDescription": "",
+	"uptimeCreate": "",
+	"uptimeCreateJsonPath": "",
+	"uptimeCreateJsonPathQuery": "",
+	"maintenanceTableActionMenuDialogTitle": "",
+	"infrastructureEditYour": "",
+	"infrastructureEditMonitor": "",
+	"infrastructureMonitorCreated": "",
+	"infrastructureMonitorUpdated": "",
+	"errorInvalidTypeId": "",
+	"errorInvalidFieldId": "",
+	"inviteNoTokenFound": "",
+	"pageSpeedWarning": "",
+	"pageSpeedLearnMoreLink": "",
+	"pageSpeedAddApiKey": "",
+	"update": "",
+	"invalidFileFormat": "",
+	"invalidFileSize": "",
+	"ClickUpload": "",
+	"DragandDrop": "",
+	"MaxSize": "",
+	"SupportedFormats": "",
+	"FirstName": "",
+	"LastName": "",
+	"EmailDescriptionText": "",
+	"YourPhoto": "",
+	"PhotoDescriptionText": "",
+	"save": "",
+	"DeleteDescriptionText": "",
+	"DeleteAccountWarning": "",
+	"DeleteWarningTitle": "",
+	"bulkImport": {
+		"title": "",
+		"selectFileTips": "",
+		"selectFileDescription": "",
+		"selectFile": "",
+		"parsingFailed": "",
+		"uploadSuccess": "",
+		"validationFailed": "",
+		"noFileSelected": "",
+		"fallbackPage": ""
+	},
+	"settingsSystemReset": "",
+	"settingsSystemResetDescription": "",
+	"DeleteAccountTitle": "",
+	"DeleteAccountButton": "",
+	"publicLink": "",
+	"maskedPageSpeedKeyPlaceholder": "",
+	"pageSpeedApiKeyFieldTitle": "",
+	"pageSpeedApiKeyFieldLabel": "",
+	"pageSpeedApiKeyFieldDescription": "",
+	"pageSpeedApiKeyFieldResetLabel": "",
+	"reset": "",
+	"ignoreTLSError": "",
+	"tlsErrorIgnored": "",
+	"ignoreTLSErrorDescription": "",
+	"createNew": "",
+	"greeting": {
+		"prepend": "",
+		"append": "",
+		"overview": ""
+	},
+	"roles": {
+		"superAdmin": "",
+		"admin": "",
+		"teamMember": "",
+		"demoUser": ""
+	},
+	"teamPanel": {
+		"teamMembers": "",
+		"filter": {
+			"all": "",
+			"member": ""
+		},
+		"inviteTeamMember": "",
+		"inviteNewTeamMember": "",
+		"inviteDescription": "",
+		"email": "",
+		"selectRole": "",
+		"inviteLink": "",
+		"cancel": "",
+		"noMembers": "",
+		"getToken": "",
+		"emailToken": "",
+		"table": {
+			"name": "",
+			"email": "",
+			"role": "",
+			"created": ""
+		}
+	},
+	"monitorState": {
+		"paused": "",
+		"resumed": "",
+		"active": ""
+	},
+	"menu": {
+		"uptime": "",
+		"pagespeed": "",
+		"infrastructure": "",
+		"incidents": "",
+		"statusPages": "",
+		"maintenance": "",
+		"integrations": "",
+		"settings": "",
+		"support": "",
+		"discussions": "",
+		"docs": "",
+		"changelog": "",
+		"profile": "",
+		"password": "",
+		"team": "",
+		"logOut": "",
+		"notifications": ""
+	},
+	"settingsEmail": "",
+	"settingsEmailDescription": "",
+	"settingsEmailHost": "",
+	"settingsEmailPort": "",
+	"settingsEmailAddress": "",
+	"settingsEmailPassword": "",
+	"settingsEmailUser": "",
+	"settingsEmailFieldResetLabel": "",
+	"state": "",
+	"statusBreadCrumbsStatusPages": "",
+	"statusBreadCrumbsDetails": "",
+	"settingsThemeModeLight": "",
+	"settingsThemeModeDark": "",
+	"settingsClearAllStatsDialogCancel": "",
+	"commonSaving": "",
+	"navControls": "",
+	"incidentsPageTitle": "",
+	"passwordPanel": {
+		"passwordChangedSuccess": "",
+		"passwordInputIncorrect": "",
+		"currentPassword": "",
+		"enterCurrentPassword": "",
+		"newPassword": "",
+		"enterNewPassword": "",
+		"confirmNewPassword": "",
+		"passwordRequirements": "",
+		"saving": ""
+	},
+	"settingsEmailConnectionHost": "",
+	"emailSent": "",
+	"failedToSendEmail": "",
+	"settingsTestEmail": "",
+	"settingsTestEmailSuccess": "",
+	"settingsTestEmailFailed": "",
+	"settingsTestEmailFailedWithReason": "",
+	"settingsTestEmailUnknownError": "",
+	"settingsEmailRequiredFields": "",
+	"statusMsg": {
+		"paused": "",
+		"up": "",
+		"down": "",
+		"pending": ""
+	},
+	"settingsURLTitle": "",
+	"settingsURLDescription": "",
+	"settingsURLSelectTitle": "",
+	"settingsURLEnabled": "",
+	"settingURLDisabled": "",
+	"uptimeGeneralInstructions": {
+		"http": "",
+		"ping": "",
+		"docker": "",
+		"port": ""
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
+}
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 60bc510f0..66b2993d2 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -1,203 +1,18 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": "Přepnout mezi světlým a tmavým motivem"
-		},
-		"toasts": {
-			"networkError": "Chyba připojení k síti",
-			"checkConnection": "Zkontrolujte prosím své připojení k síti",
-			"unknownError": "Nastala neznámá chyba"
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Pokračovat",
-				"back": "Zpět"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-mail",
-					"placeholder": "jan.novak@domena.cz",
-					"errors": {
-						"empty": "Zadejte prosím e-mailovou adresu",
-						"invalid": "Překontrolujte si prosím správnost zadané e-mailové adresy"
-					}
-				},
-				"password": {
-					"label": "Heslo",
-					"rules": {
-						"length": {
-							"beginning": "Heslo musí být dlouhé alespoň",
-							"highlighted": "8 znaků"
-						},
-						"special": {
-							"beginning": "Heslo musí obsahovat alespoň",
-							"highlighted": "1 speciální znak"
-						},
-						"number": {
-							"beginning": "Heslo musí obsahovat alespoň",
-							"highlighted": "1 číslo"
-						},
-						"uppercase": {
-							"beginning": "Heslo musí obsahovat alespoň",
-							"highlighted": "1 velké písmeno"
-						},
-						"lowercase": {
-							"beginning": "Heslo musí obsahovat alespoň",
-							"highlighted": "1 malé písmeno"
-						},
-						"match": {
-							"beginning": "Obě hesla se",
-							"highlighted": "musí shodovat"
-						}
-					},
-					"errors": {
-						"empty": "Zadejte prosím heslo",
-						"length": "Heslo musí být dlouhé alespoň 8 znaků",
-						"uppercase": "Heslo musí obsahovat alespoň 1 velké písmeno",
-						"lowercase": "Heslo musí obsahovat alespoň 1 malé písmeno",
-						"number": "Heslo musí obsahovat alespoň 1 číslo",
-						"special": "Heslo musí obsahovat alespoň 1 speciální znak",
-						"incorrect": "Zadané heslo neodpovídá tomu, co bylo nastaveno"
-					}
-				},
-				"passwordConfirm": {
-					"label": "Potvrzení hesla",
-					"placeholder": "Pro ověření správnosti zadejte heslo ještě jednou",
-					"errors": {
-						"empty": "Zadejte prosím své heslo ještě jednou, aby mohla být potvrzena jeho správnost (odhalí překlepy)",
-						"different": "Zadaná hesla se liší, takže je nejspíše jedno z nich špatně zapsané"
-					}
-				},
-				"firstName": {
-					"label": "Jméno",
-					"placeholder": "Jan",
-					"errors": {
-						"empty": "Zadejte prosím své křestní jméno",
-						"length": "Jméno se musí vejít do 50 znaků",
-						"pattern": "Součástí jména mohou být pouze písmena, mezery apostrofy nebo spojovníky"
-					}
-				},
-				"lastName": {
-					"label": "Příjmení",
-					"placeholder": "Novák",
-					"errors": {
-						"empty": "Zadejte prosím své příjmení",
-						"length": "Příjmení se musí vejít do 50 znaků",
-						"pattern": "Součástí příjmení mohou být pouze písmena, mezery apostrofy nebo spojovníky"
-					}
-				}
-			},
-			"errors": {
-				"validation": "Nastala chyba při ověřování dat."
-			}
-		},
-		"login": {
-			"heading": "Přihlášení",
-			"subheadings": {
-				"stepOne": "Zadejte svůj e-mail",
-				"stepTwo": "Zadejte své heslo"
-			},
-			"links": {
-				"forgotPassword": "Zapomněli jste heslo? <a>Obnovte si ho</a>",
-				"register": "Ještě nemáte účet? <a>Zaregistrujte se</a>"
-			},
-			"toasts": {
-				"success": "Vítejte zpět",
-				"incorrectPassword": "Nesprávné heslo"
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "Vytvoření superadministrátora",
-				"user": "Registrace"
-			},
-			"subheadings": {
-				"stepOne": "Zadejte své osobní údaje",
-				"stepTwo": "Zadejte svůj e-mail",
-				"stepThree": "Nastavte si heslo"
-			},
-			"description": {
-				"superAdmin": "Pro začátek vytvořte účet superadministrátora",
-				"user": "Zaregistrujte se jako uživatel a požádejte svého superadministrátora, aby vám přidělil oprávnění k hlídačům"
-			},
-			"gettingStartedButton": {
-				"superAdmin": "Vytvořit účet superadministrátora",
-				"user": "Zaregistrovat se jako běžný uživatel"
-			},
-			"termsAndPolicies": "Vytvořením účtu souhlasíte s našimi <a1>Podmínkami použití</a1> (anglicky) a <a2>Podmínkami zpracování osobních údajů</a2> (anglicky).",
-			"links": {
-				"login": "Máte již vytvořený účet? <a>Přihlašte se</a>"
-			},
-			"toasts": {
-				"success": "Vítejte! Váš účet byl úspěšně vytvořen."
-			}
-		},
-		"forgotPassword": {
-			"heading": "Zapomenuté heslo",
-			"subheadings": {
-				"stepOne": "Nebojte se, zašleme vám pokyny pro obnovení hesla.",
-				"stepTwo": "Odkaz pro obnovení hesla byl odeslán na <email/>",
-				"stepThree": "Nové heslo se musí lišit od těch, které jste již použili.",
-				"stepFour": "Heslo bylo úspěšně obnoveno. Klepněte na tlačítko a dojde k čarovnému přihlášení."
-			},
-			"buttons": {
-				"openEmail": "Otevřít e-mailovou aplikaci",
-				"resetPassword": "Obnovit heslo"
-			},
-			"imageAlts": {
-				"passwordKey": "Ikonka přístupového klíče",
-				"email": "Ikonka e-mailu",
-				"lock": "Ikonka zámku",
-				"passwordConfirm": "Ikonka potvrzeného hesla"
-			},
-			"links": {
-				"login": "Vrátit se k <a>Přihlášení</a>",
-				"resend": "Nedorazil vám e-mail? <a>Klepněte pro opětovné zaslání</a>"
-			},
-			"toasts": {
-				"sent": "Instrukce vám dorazí na <email/>.",
-				"emailNotFound": "Nepodařilo se nalézt e-mailovou adresu.",
-				"redirect": "Přesměrování proběhne za <seconds/>...",
-				"success": "Heslo bylo úspěšně obnoveno.",
-				"error": "Obnova hesla se nepodařila. Zkuste to prosím znovu nebo kontaktujte podporu."
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Podařilo se úspěšně obnovit spojení se serverem",
-				"stillUnreachable": "Server je stále nedosažitelný. Zkuste to prosím později."
-			},
-			"alertBox": "Chyba připojení k serveru",
-			"description": "Nepodařilo se připojit k serveru. Zkontrolujte si prosím internetové připojení a pokud problém přetrvává, ověřte konfiguraci aplikace Checkmate.",
-			"retryButton": {
-				"default": "Zkusit se znovu připojit",
-				"processing": "Probíhá připojování…"
-			}
-		}
-	},
-	"submit": "",
+	"submit": "Odeslat",
 	"title": "",
-	"createPassword": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "",
+	"settingsGeneralSettings": "Obecná nastavení",
 	"settingsDisplayTimezone": "",
 	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "",
+	"settingsAppearance": "Vzhled",
 	"settingsAppearanceDescription": "",
 	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
-	"settingsEnabled": "",
-	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
+	"settingsLanguage": "Jazyk",
+	"settingsEnabled": "Zapnuto",
+	"settingsDisabled": "Vypnuto",
+	"settingsHistoryAndMonitoring": "Historie a monitorování",
 	"settingsHistoryAndMonitoringDescription": "",
 	"settingsTTLLabel": "",
 	"settingsTTLOptionalLabel": "",
@@ -214,13 +29,11 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
 	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
-	"settingsSuccessSaved": "",
-	"settingsFailedToSave": "",
+	"settingsDevelopedBy": "Vyvinuto společností Bluewave Labs.",
+	"settingsSave": "Uložit",
+	"settingsSuccessSaved": "Nastavení bylo úspěšně uloženo",
+	"settingsFailedToSave": "Nepodařilo se uložit nastavení",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
 	"settingsDemoMonitorsAdded": "",
@@ -258,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "",
 	"distributedUptimeCreateAdvancedSettings": "",
 	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
@@ -303,7 +112,33 @@
 		"testSuccess": "",
 		"testFailed": "",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "",
@@ -547,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "",
@@ -590,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -603,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "",
+		"notifications": ""
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
@@ -634,7 +464,6 @@
 		"saving": ""
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -659,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Přepnout mezi světlým a tmavým motivem"
+		},
+		"toasts": {
+			"networkError": "Chyba připojení k síti",
+			"checkConnection": "Zkontrolujte prosím své připojení k síti",
+			"unknownError": "Nastala neznámá chyba"
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Pokračovat",
+				"back": "Zpět"
+			},
+			"inputs": {
+				"email": {
+					"label": "E-mail",
+					"placeholder": "jan.novak@domena.cz",
+					"errors": {
+						"empty": "Zadejte prosím e-mailovou adresu",
+						"invalid": "Překontrolujte si prosím správnost zadané e-mailové adresy"
+					}
+				},
+				"password": {
+					"label": "Heslo",
+					"rules": {
+						"length": {
+							"beginning": "Heslo musí být dlouhé alespoň",
+							"highlighted": "8 znaků"
+						},
+						"special": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 speciální znak"
+						},
+						"number": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 číslo"
+						},
+						"uppercase": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 velké písmeno"
+						},
+						"lowercase": {
+							"beginning": "Heslo musí obsahovat alespoň",
+							"highlighted": "1 malé písmeno"
+						},
+						"match": {
+							"beginning": "Obě hesla se",
+							"highlighted": "musí shodovat"
+						}
+					},
+					"errors": {
+						"empty": "Zadejte prosím heslo",
+						"length": "Heslo musí být dlouhé alespoň 8 znaků",
+						"uppercase": "Heslo musí obsahovat alespoň 1 velké písmeno",
+						"lowercase": "Heslo musí obsahovat alespoň 1 malé písmeno",
+						"number": "Heslo musí obsahovat alespoň 1 číslo",
+						"special": "Heslo musí obsahovat alespoň 1 speciální znak",
+						"incorrect": "Zadané heslo neodpovídá tomu, co bylo nastaveno"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Potvrzení hesla",
+					"placeholder": "Pro ověření správnosti zadejte heslo ještě jednou",
+					"errors": {
+						"empty": "Zadejte prosím své heslo ještě jednou, aby mohla být potvrzena jeho správnost (odhalí překlepy)",
+						"different": "Zadaná hesla se liší, takže je nejspíše jedno z nich špatně zapsané"
+					}
+				},
+				"firstName": {
+					"label": "Jméno",
+					"placeholder": "Jan",
+					"errors": {
+						"empty": "Zadejte prosím své křestní jméno",
+						"length": "Jméno se musí vejít do 50 znaků",
+						"pattern": "Součástí jména mohou být pouze písmena, mezery apostrofy nebo spojovníky"
+					}
+				},
+				"lastName": {
+					"label": "Příjmení",
+					"placeholder": "Novák",
+					"errors": {
+						"empty": "Zadejte prosím své příjmení",
+						"length": "Příjmení se musí vejít do 50 znaků",
+						"pattern": "Součástí příjmení mohou být pouze písmena, mezery apostrofy nebo spojovníky"
+					}
+				}
+			},
+			"errors": {
+				"validation": "Nastala chyba při ověřování dat."
+			}
+		},
+		"login": {
+			"heading": "Přihlášení",
+			"subheadings": {
+				"stepOne": "Zadejte svůj e-mail",
+				"stepTwo": "Zadejte své heslo"
+			},
+			"links": {
+				"forgotPassword": "Zapomněli jste heslo? <a>Obnovte si ho</a>",
+				"register": "Ještě nemáte účet? <a>Zaregistrujte se</a>",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "Vítejte zpět",
+				"incorrectPassword": "Nesprávné heslo"
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "Vytvoření superadministrátora",
+				"user": "Registrace"
+			},
+			"subheadings": {
+				"stepOne": "Zadejte své osobní údaje",
+				"stepTwo": "Zadejte svůj e-mail",
+				"stepThree": "Nastavte si heslo"
+			},
+			"description": {
+				"superAdmin": "Pro začátek vytvořte účet superadministrátora",
+				"user": "Zaregistrujte se jako uživatel a požádejte svého superadministrátora, aby vám přidělil oprávnění k hlídačům"
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Vytvořit účet superadministrátora",
+				"user": "Zaregistrovat se jako běžný uživatel"
+			},
+			"termsAndPolicies": "Vytvořením účtu souhlasíte s našimi <a1>Podmínkami použití</a1> (anglicky) a <a2>Podmínkami zpracování osobních údajů</a2> (anglicky).",
+			"links": {
+				"login": "Máte již vytvořený účet? <a>Přihlašte se</a>"
+			},
+			"toasts": {
+				"success": "Vítejte! Váš účet byl úspěšně vytvořen."
+			}
+		},
+		"forgotPassword": {
+			"heading": "Zapomenuté heslo",
+			"subheadings": {
+				"stepOne": "Nebojte se, zašleme vám pokyny pro obnovení hesla.",
+				"stepTwo": "Odkaz pro obnovení hesla byl odeslán na <email/>",
+				"stepThree": "Nové heslo se musí lišit od těch, které jste již použili.",
+				"stepFour": "Heslo bylo úspěšně obnoveno. Klepněte na tlačítko a dojde k čarovnému přihlášení."
+			},
+			"buttons": {
+				"openEmail": "Otevřít e-mailovou aplikaci",
+				"resetPassword": "Obnovit heslo"
+			},
+			"imageAlts": {
+				"passwordKey": "Ikonka přístupového klíče",
+				"email": "Ikonka e-mailu",
+				"lock": "Ikonka zámku",
+				"passwordConfirm": "Ikonka potvrzeného hesla"
+			},
+			"links": {
+				"login": "Vrátit se k <a>Přihlášení</a>",
+				"resend": "Nedorazil vám e-mail? <a>Klepněte pro opětovné zaslání</a>"
+			},
+			"toasts": {
+				"sent": "Instrukce vám dorazí na <email/>.",
+				"emailNotFound": "Nepodařilo se nalézt e-mailovou adresu.",
+				"redirect": "Přesměrování proběhne za <seconds/>...",
+				"success": "Heslo bylo úspěšně obnoveno.",
+				"error": "Obnova hesla se nepodařila. Zkuste to prosím znovu nebo kontaktujte podporu."
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Podařilo se úspěšně obnovit spojení se serverem",
+				"stillUnreachable": "Server je stále nedosažitelný. Zkuste to prosím později."
+			},
+			"alertBox": "Chyba připojení k serveru",
+			"description": "Nepodařilo se připojit k serveru. Zkontrolujte si prosím internetové připojení a pokud problém přetrvává, ověřte konfiguraci aplikace Checkmate.",
+			"retryButton": {
+				"default": "Zkusit se znovu připojit",
+				"processing": "Probíhá připojování…"
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 8aa520e29..6d5c5a4d8 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -1,200 +1,16 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "",
-			"checkConnection": "",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Weiter",
-				"back": "Zurück"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-Mail",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"invalid": ""
-					}
-				},
-				"password": {
-					"label": "Passwort",
-					"rules": {
-						"length": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"special": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"number": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"uppercase": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"lowercase": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"match": {
-							"beginning": "",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Anmelden",
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "Geben Sie Ihr Passwort ein"
-			},
-			"links": {
-				"forgotPassword": "Passwort vergessen? <a>Passwort zurücksetzen</a>",
-				"register": ""
-			},
-			"toasts": {
-				"success": "",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Registrieren"
-			},
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "",
-				"stepThree": "Erstelle dein Passwort"
-			},
-			"description": {
-				"superAdmin": "",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "",
-				"user": ""
-			},
-			"termsAndPolicies": "",
-			"links": {
-				"login": ""
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Passwort zurücksetzen",
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "",
-				"stepThree": "",
-				"stepFour": ""
-			},
-			"buttons": {
-				"openEmail": "",
-				"resetPassword": ""
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "",
-				"resend": ""
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "",
-				"stillUnreachable": ""
-			},
-			"alertBox": "",
-			"description": "",
-			"retryButton": {
-				"default": "",
-				"processing": ""
-			}
-		}
-	},
 	"submit": "Absenden",
 	"title": "Titel",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "",
-	"settingsDisplayTimezone": "",
+	"settingsGeneralSettings": "Einstellungen",
+	"settingsDisplayTimezone": "Zeitzone anzeigen",
 	"settingsDisplayTimezoneDescription": "",
 	"settingsAppearance": "",
 	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
-	"settingsEnabled": "",
+	"settingsThemeMode": "Theme modus",
+	"settingsLanguage": "Sprache",
+	"settingsEnabled": "Aktiv",
 	"settingsDisabled": "",
 	"settingsHistoryAndMonitoring": "",
 	"settingsHistoryAndMonitoringDescription": "",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
 	"settingsAbout": "",
 	"settingsDevelopedBy": "",
 	"settingsSave": "",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "",
 	"distributedUptimeCreateAdvancedSettings": "",
 	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "",
 		"testFailed": "",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "",
@@ -546,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -602,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "",
+		"notifications": ""
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
@@ -633,7 +464,6 @@
 		"saving": ""
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 6cea94957..7d2cdbfa7 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,193 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": "Toggles light & dark"
-		},
-		"toasts": {
-			"networkError": "Network error",
-			"checkConnection": "Please check your connection",
-			"unknownError": "Unknown error"
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Continue",
-				"back": "Back"
-			},
-			"inputs": {
-				"email": {
-					"label": "Email",
-					"placeholder": "jordan.ellis@domain.com",
-					"errors": {
-						"empty": "To continue, please enter your email address",
-						"invalid": "Please recheck validity of entered email address"
-					}
-				},
-				"password": {
-					"label": "Password",
-					"rules": {
-						"length": {
-							"beginning": "Must be at least",
-							"highlighted": "8 characters long"
-						},
-						"special": {
-							"beginning": "Must contain at least",
-							"highlighted": "one special character"
-						},
-						"number": {
-							"beginning": "Must contain at least",
-							"highlighted": "one number"
-						},
-						"uppercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one upper character"
-						},
-						"lowercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one lower character"
-						},
-						"match": {
-							"beginning": "Confirm password and password",
-							"highlighted": "must match"
-						}
-					},
-					"errors": {
-						"empty": "Please enter your password",
-						"length": "Password must be at least 8 characters long",
-						"uppercase": "Password must contain at least 1 uppercase letter",
-						"lowercase": "Password must contain at least 1 lowercase letter",
-						"number": "Password must contain at least 1 number",
-						"special": "Password must contain at least 1 special character",
-						"incorrect": "The password you provided does not match our records"
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirm password",
-					"placeholder": "Re-enter password to confirm",
-					"errors": {
-						"empty": "Please enter your password again for confirmation (helps with typos)",
-						"different": "Entered passwords don't match, so one of them is probably mistyped"
-					}
-				},
-				"firstName": {
-					"label": "Name",
-					"placeholder": "Jordan",
-					"errors": {
-						"empty": "Please enter your name",
-						"length": "Name must be less than 50 characters",
-						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				},
-				"lastName": {
-					"label": "Surname",
-					"placeholder": "Ellis",
-					"errors": {
-						"empty": "Please enter your surname",
-						"length": "Surname must be less than 50 characters",
-						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				}
-			},
-			"errors": {
-				"validation": "Error validating data."
-			}
-		},
-		"login": {
-			"heading": "Log In",
-			"subheadings": {
-				"stepOne": "Enter your email",
-				"stepTwo": "Enter your password"
-			},
-			"links": {
-				"forgotPassword": "Forgot password?",
-				"forgotPasswordLink": "Reset password",
-				"register": "Do not have an account?",
-				"registerLink": "Register here"
-			},
-			"toasts": {
-				"success": "Welcome back! You're successfully logged in.",
-				"incorrectPassword": "Incorrect password"
-			},
-			"errors": {
-				"password": {
-					"incorrect": "The password you provided does not match our records"
-				}
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "Create super admin",
-				"user": "Sign Up"
-			},
-			"subheadings": {
-				"stepOne": "Enter your personal details",
-				"stepTwo": "Enter your email",
-				"stepThree": "Create your password"
-			},
-			"description": {
-				"superAdmin": "Create your super admin account to get started",
-				"user": "Sign up as a user and ask super admin for access to your monitors"
-			},
-			"gettingStartedButton": {
-				"superAdmin": "Create super admin account",
-				"user": "Sign up regular user"
-			},
-			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
-			"links": {
-				"login": "Already have an account? <a>Log In</a>"
-			},
-			"toasts": {
-				"success": "Welcome! Your account was created successfully."
-			}
-		},
-		"forgotPassword": {
-			"heading": "Forgot password?",
-			"subheadings": {
-				"stepOne": "No worries, we'll send you reset instructions.",
-				"stepTwo": "We sent a password reset link to <email/>",
-				"stepThree": "Your new password must be different from previously used passwords.",
-				"stepFour": "Your password has been successfully reset. Click below to log in magically."
-			},
-			"buttons": {
-				"openEmail": "Open email app",
-				"resetPassword": "Reset password"
-			},
-			"imageAlts": {
-				"passwordKey": "Password key icon",
-				"email": "Email icon",
-				"lock": "Lock icon",
-				"passwordConfirm": "Password confirm icon"
-			},
-			"links": {
-				"login": "Go back to <a>Log In</a>",
-				"resend": "Didn't receive the email? <a>Click to resend</a>"
-			},
-			"toasts": {
-				"sent": "Instructions sent to <email/>.",
-				"emailNotFound": "Email not found.",
-				"redirect": "Redirecting in <seconds/>...",
-				"success": "Your password was reset successfully.",
-				"error": "Unable to reset password. Please try again later or contact support."
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Successfully reconnected to the server.",
-				"stillUnreachable": "Server is still unreachable. Please try again later."
-			},
-			"alertBox": "Server Connection Error",
-			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
-			"retryButton": {
-				"default": "Retry connection",
-				"processing": "Connecting..."
-			}
-		}
-	},
 	"submit": "Submit",
 	"title": "Title",
 	"distributedStatusHeaderText": "Real-time, real-device coverage",
@@ -262,66 +73,7 @@
 	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
 	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
-	"createNotifications": {
-		"title": "Create notification channel",
-		"nameSettings": {
-			"title": "Name",
-			"description": "A descriptive name for your integration.",
-			"nameLabel": "Name",
-			"namePlaceholder": "e.g. Slack notifications"
-		},
-		"typeSettings": {
-			"title": "Type",
-			"description": "Select the type of notification channel you want to create.",
-			"typeLabel": "Type"
-		},
-		"emailSettings": {
-			"title": "Email",
-			"description": "Destination email addresses.",
-			"emailLabel": "Email address",
-			"emailPlaceholder": "e.g. john@example.com"
-		},
-		"slackSettings": {
-			"title": "Slack",
-			"description": "Configure your Slack webhook here",
-			"webhookLabel": "Slack webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/..."
-		},
-		"pagerdutySettings": {
-			"title": "PagerDuty",
-			"description": "Configure your PagerDuty integration here",
-			"integrationKeyLabel": "Integration key",
-			"integrationKeyPlaceholder": "1234567890"
-		},
-		"genericWebhookSettings": {
-			"title": "Webhook",
-			"description": "Configure your webhook here",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		},
-		"discordSettings": {
-			"title": "Discord",
-			"description": "Configure your Discord webhook here",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		}
-	},
-
-	"notificationConfig": {
-		"title": "Notifications",
-		"description": "Select the notifications channels you want to use"
-	},
 	"notifications": {
-		"fallback": {
-			"title": "notification channel",
-			"checks": [
-				"Alert teams about downtime or performance issues",
-				"Let engineers know when incidents happen",
-				"Keep administrators informed of system changes"
-			]
-		},
-		"createButton": "Create notification channel",
-		"createTitle": "Notification channel",
 		"enableNotifications": "Enable {{platform}} notifications",
 		"testNotification": "Test notification",
 		"addOrEditNotifications": "Add or edit notifications",
@@ -361,6 +113,16 @@
 		"testFailed": "Failed to send test notification",
 		"unsupportedType": "Unsupported notification type",
 		"networkError": "Network error occurred",
+		"fallback": {
+			"title": "notification channel",
+			"checks": [
+				"Alert teams about downtime or performance issues",
+				"Let engineers know when incidents happen",
+				"Keep administrators informed of system changes"
+			]
+		},
+		"createButton": "Create notification channel",
+		"createTitle": "Notification channel",
 		"create": {
 			"success": "Notification created successfully",
 			"failed": "Failed to create notification"
@@ -531,7 +293,6 @@
 	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
 	"seperateEmails": "You can separate multiple emails with a comma",
 	"checkFrequency": "Check frequency",
-	"advancedMatching": "Advanced matching",
 	"matchMethod": "Match Method",
 	"expectedValue": "Expected value",
 	"deleteDialogTitle": "Do you really want to delete this monitor?",
@@ -625,13 +386,6 @@
 		"append": "The afternoon is your playground—let's make it epic!",
 		"overview": "Here's an overview of your {{type}} monitors."
 	},
-	"monitorStatus": {
-		"up": "up",
-		"down": "down",
-		"paused": "paused",
-		"checkingEvery": "Checking every {{interval}}",
-		"withCaptureAgent": "with Capture agent {{version}}"
-	},
 	"roles": {
 		"superAdmin": "Super admin",
 		"admin": "Admin",
@@ -669,7 +423,6 @@
 	"menu": {
 		"uptime": "Uptime",
 		"pagespeed": "Pagespeed",
-		"notifications": "Notifications",
 		"infrastructure": "Infrastructure",
 		"incidents": "Incidents",
 		"statusPages": "Status pages",
@@ -683,7 +436,8 @@
 		"profile": "Profile",
 		"password": "Password",
 		"team": "Team",
-		"logOut": "Log out"
+		"logOut": "Log out",
+		"notifications": "Notifications"
 	},
 	"settingsEmail": "Email",
 	"settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.",
@@ -693,12 +447,6 @@
 	"settingsEmailPassword": "Email password - Password for authentication",
 	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
 	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
-	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
-	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
-	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool - Enable connection pooling",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",
@@ -720,7 +468,6 @@
 		"saving": "Saving..."
 	},
 	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
-	"sendTestNotifications": "Send test notifications",
 	"emailSent": "Email sent successfully",
 	"failedToSendEmail": "Failed to send email",
 	"settingsTestEmail": "Send test e-mail",
@@ -745,5 +492,257 @@
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	}
+	},
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		},
+		"toasts": {
+			"networkError": "Network error",
+			"checkConnection": "Please check your connection",
+			"unknownError": "Unknown error"
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continue",
+				"back": "Back"
+			},
+			"inputs": {
+				"email": {
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com",
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					}
+				},
+				"password": {
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						}
+					},
+					"errors": {
+						"empty": "Please enter your password",
+						"length": "Password must be at least 8 characters long",
+						"uppercase": "Password must contain at least 1 uppercase letter",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"incorrect": "The password you provided does not match our records"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm",
+					"errors": {
+						"empty": "Please enter your password again for confirmation (helps with typos)",
+						"different": "Entered passwords don't match, so one of them is probably mistyped"
+					}
+				},
+				"firstName": {
+					"label": "Name",
+					"placeholder": "Jordan",
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				},
+				"lastName": {
+					"label": "Surname",
+					"placeholder": "Ellis",
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				}
+			},
+			"errors": {
+				"validation": "Error validating data."
+			}
+		},
+		"login": {
+			"heading": "Log In",
+			"subheadings": {
+				"stepOne": "Enter your email",
+				"stepTwo": "Enter your password"
+			},
+			"links": {
+				"forgotPassword": "Forgot password?",
+				"register": "Do not have an account?",
+				"forgotPasswordLink": "Reset password",
+				"registerLink": "Register here"
+			},
+			"toasts": {
+				"success": "Welcome back! You're successfully logged in.",
+				"incorrectPassword": "Incorrect password"
+			},
+			"errors": {
+				"password": {
+					"incorrect": "The password you provided does not match our records"
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepTwo": "Enter your email",
+				"stepThree": "Create your password"
+			},
+			"description": {
+				"superAdmin": "Create your super admin account to get started",
+				"user": "Sign up as a user and ask super admin for access to your monitors"
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Create super admin account",
+				"user": "Sign up regular user"
+			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+			"links": {
+				"login": "Already have an account? <a>Log In</a>"
+			},
+			"toasts": {
+				"success": "Welcome! Your account was created successfully."
+			}
+		},
+		"forgotPassword": {
+			"heading": "Forgot password?",
+			"subheadings": {
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepTwo": "We sent a password reset link to <email/>",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepFour": "Your password has been successfully reset. Click below to log in magically."
+			},
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"imageAlts": {
+				"passwordKey": "Password key icon",
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"toasts": {
+				"sent": "Instructions sent to <email/>.",
+				"emailNotFound": "Email not found.",
+				"redirect": "Redirecting in <seconds/>...",
+				"success": "Your password was reset successfully.",
+				"error": "Unable to reset password. Please try again later or contact support."
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
+			},
+			"alertBox": "Server Connection Error",
+			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
+			"retryButton": {
+				"default": "Retry connection",
+				"processing": "Connecting..."
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "Create notification channel",
+		"nameSettings": {
+			"title": "Name",
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications"
+		},
+		"typeSettings": {
+			"title": "Type",
+			"description": "Select the type of notification channel you want to create.",
+			"typeLabel": "Type"
+		},
+		"emailSettings": {
+			"title": "Email",
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com"
+		},
+		"slackSettings": {
+			"title": "Slack",
+			"description": "Configure your Slack webhook here",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"pagerdutySettings": {
+			"title": "PagerDuty",
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890"
+		},
+		"genericWebhookSettings": {
+			"title": "Webhook",
+			"description": "Configure your webhook here",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"discordSettings": {
+			"title": "Discord",
+			"description": "Configure your Discord webhook here",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		}
+	},
+	"notificationConfig": {
+		"title": "Notifications",
+		"description": "Select the notifications channels you want to use"
+	},
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"withCaptureAgent": "with Capture agent {{version}}",
+		"up": "up",
+		"down": "down",
+		"paused": "paused"
+	},
+	"advancedMatching": "Advanced matching",
+	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
+	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
+	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
+	"settingsEmailSecure": "Secure - Use SSL",
+	"settingsEmailPool": "Pool - Enable connection pooling",
+	"sendTestNotifications": "Send test notifications"
 }
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 0abc46c8c..fb8207e48 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "",
-			"checkConnection": "",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Continuar",
-				"back": "Atras"
-			},
-			"inputs": {
-				"email": {
-					"label": "Correo electronico",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"invalid": ""
-					}
-				},
-				"password": {
-					"label": "Contraseña",
-					"rules": {
-						"length": {
-							"beginning": "",
-							"highlighted": "8 caracteres de longitud"
-						},
-						"special": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"number": {
-							"beginning": "",
-							"highlighted": "un numero"
-						},
-						"uppercase": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"lowercase": {
-							"beginning": "",
-							"highlighted": ""
-						},
-						"match": {
-							"beginning": "",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirmar contraseña",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Inicio de session",
-			"subheadings": {
-				"stepOne": "Introduce tu correo electronico",
-				"stepTwo": "Introduce tu contraseña"
-			},
-			"links": {
-				"forgotPassword": "¿Has olvidado tu contraseña? <a>Restablecer contraseña</a>",
-				"register": ""
-			},
-			"toasts": {
-				"success": "",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Registrarse"
-			},
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "Introduce tu correo electronico",
-				"stepThree": "Crear contraseña"
-			},
-			"description": {
-				"superAdmin": "",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "",
-				"user": ""
-			},
-			"termsAndPolicies": "",
-			"links": {
-				"login": ""
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "¿Has olvidado tu contraseña?",
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "Hemos enviado un link para reiniciar la contraseña a <email/>",
-				"stepThree": "",
-				"stepFour": ""
-			},
-			"buttons": {
-				"openEmail": "",
-				"resetPassword": "Restablecer contraseña"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Volver a <a>Inicio de session</a>",
-				"resend": "No has recibido el correo electronico? <a>Presiona para reenviar</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "",
-				"stillUnreachable": ""
-			},
-			"alertBox": "",
-			"description": "",
-			"retryButton": {
-				"default": "",
-				"processing": ""
-			}
-		}
-	},
 	"submit": "Enviar",
 	"title": "Titulo",
 	"distributedStatusHeaderText": "",
@@ -192,8 +10,6 @@
 	"settingsAppearanceDescription": "",
 	"settingsThemeMode": "",
 	"settingsLanguage": "",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
 	"settingsEnabled": "",
 	"settingsDisabled": "",
 	"settingsHistoryAndMonitoring": "",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
 	"settingsAbout": "",
 	"settingsDevelopedBy": "",
 	"settingsSave": "",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "",
 	"distributedUptimeCreateAdvancedSettings": "",
 	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "",
 		"testFailed": "",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "",
@@ -546,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -602,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "",
+		"notifications": ""
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
@@ -633,7 +464,6 @@
 		"saving": ""
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index bd6f9a81f..f085b5857 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "Verkkovirhe",
-			"checkConnection": "Tarkista yhteytesi",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Jatka",
-				"back": "Takaisin"
-			},
-			"inputs": {
-				"email": {
-					"label": "Sähköposti",
-					"placeholder": "",
-					"errors": {
-						"empty": "Syötä sähköpostiosoitteesi jatkaaksesi",
-						"invalid": "Kirjoita kelvollinen sähköpostiosoite"
-					}
-				},
-				"password": {
-					"label": "Salasana",
-					"rules": {
-						"length": {
-							"beginning": "Vähintään",
-							"highlighted": "8 merkkiä pitkä"
-						},
-						"special": {
-							"beginning": "Tulee sisältää vähintään",
-							"highlighted": "yksi erikoismerkki"
-						},
-						"number": {
-							"beginning": "Tulee sisältää vähintään",
-							"highlighted": "yksi numero"
-						},
-						"uppercase": {
-							"beginning": "Tulee sisältää vähintään",
-							"highlighted": "yksi pieni kirjain"
-						},
-						"lowercase": {
-							"beginning": "Tulee sisältää vähintään",
-							"highlighted": "yksi iso kirjain"
-						},
-						"match": {
-							"beginning": "Vahvista salasana ja salasana",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Vahvista salasana",
-					"placeholder": "Syötä salasana uudelleen",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "Nimi",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "Sukunimi",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Kirjaudu",
-			"subheadings": {
-				"stepOne": "Syötä salasanasi",
-				"stepTwo": "Syötä salasanasi"
-			},
-			"links": {
-				"forgotPassword": "Unohditko salasanasi? <a>Nollaa salasana</a>",
-				"register": "Onko sinulla tili? <a>Rekisteröidy tästä</a>"
-			},
-			"toasts": {
-				"success": "Tervetuloa takaisin! Olet kirjautunut sisään.",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Rekisteröidy"
-			},
-			"subheadings": {
-				"stepOne": "Syötä henkilökohtaiset tietosi",
-				"stepTwo": "Syötä salasanasi",
-				"stepThree": "Luo salasanasi"
-			},
-			"description": {
-				"superAdmin": "Luo pääkäyttäjän tili aloittaaksesi",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "Luo pääkäyttäjän tili",
-				"user": ""
-			},
-			"termsAndPolicies": "Luomalla tilin hyväksyt <a1>Käyttöehdot</a1> ja <a2>Tietosuojakäytännön</a2>.",
-			"links": {
-				"login": "Onko sinulla jo tili? <a>Kirjaudu</a>"
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Unohditko salasanasi?",
-			"subheadings": {
-				"stepOne": "Ei hätää, lähetämme sinulle ohjeet salasanan palauttamiseen.",
-				"stepTwo": "Lähetimme salasanan nollauslinkin osoitteeseen <email/>",
-				"stepThree": "Uuden salasanan pitää olla eri kuin aiemmin käyttämäsi.",
-				"stepFour": "Salasanasi on onnistuneesti nollattu. Klikkaa alta kirjautuaksesi taianomaisesti."
-			},
-			"buttons": {
-				"openEmail": "Avaa sähköpostisovellus",
-				"resetPassword": "Nollaa salasana"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Palaa edelliseen <a>Kirjaudu</a>",
-				"resend": "Etkö saanut sähköpostia? <a>Klikkaa lähettääksesi uudelleen</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "",
-				"stillUnreachable": ""
-			},
-			"alertBox": "",
-			"description": "",
-			"retryButton": {
-				"default": "",
-				"processing": "Yhdistetään..."
-			}
-		}
-	},
 	"submit": "Lähetä",
 	"title": "Otsikko",
 	"distributedStatusHeaderText": "Reaaliaikainen kattavuus oikeilla laitteilla",
@@ -192,8 +10,6 @@
 	"settingsAppearanceDescription": "Vaihda teema vaaleaksi tai tummaksi tai vaihda käyttöliittymän kieli",
 	"settingsThemeMode": "Teematila",
 	"settingsLanguage": "Kieli",
-	"settingsDistributedUptime": "Hajautettu käyttöaika",
-	"settingsDistributedUptimeDescription": "Ota käyttöön tai poista käytöstä hajautettu käyttöaikavalvonta.",
 	"settingsEnabled": "Käytössä",
 	"settingsDisabled": "Poistettu käytöstä",
 	"settingsHistoryAndMonitoring": "Valvonnan historia",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "Lompakko",
-	"settingsWalletDescription": "",
 	"settingsAbout": "Tietoja",
 	"settingsDevelopedBy": "Kehittänyt Bluewave Labs.",
 	"settingsSave": "Tallenna",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "Jos ilmenee häiriö, ilmoita käyttäjille.",
 	"distributedUptimeCreateAdvancedSettings": "Lisäasetukset",
 	"distributedUptimeDetailsNoMonitorHistory": "Tälle valvontakohteelle ei ole vielä tarkistushistoriaa.",
-	"distributedUptimeDetailsFooterHeading": "Tehty ❤️:lla UpRockin ja Bluewave Labsin toimesta",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "Solana",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Viimeksi päivitetty",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "Testi ilmoituksen lähetys onnistui!",
 		"testFailed": "Testi ilmoituksen lähetys epäonnistui",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "Lisää",
@@ -546,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "Ylös",
-		"down": "Alas",
-		"paused": "Tauko"
-	},
 	"roles": {
 		"superAdmin": "Pääylläpitäjä",
 		"admin": "Ylläpitäjä",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "Infrastruktuuri",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "Tilasivut",
 		"maintenance": "Huolto",
@@ -602,7 +432,8 @@
 		"profile": "Profiili",
 		"password": "Salasana",
 		"team": "Tiimi",
-		"logOut": "Kirjaudu ulos"
+		"logOut": "Kirjaudu ulos",
+		"notifications": ""
 	},
 	"settingsEmail": "Sähköpostiasetukset",
 	"settingsEmailDescription": "Määritä sähköpostiasetukset",
@@ -633,7 +464,6 @@
 		"saving": "Tallennetaan..."
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "Lähetä testi sähköposti",
 	"emailSent": "Sähköpostin lähetys onnistui",
 	"failedToSendEmail": "Sähköpostin lähetys epäonnistui",
 	"settingsTestEmail": "Lähetä testi sähköposti",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index a4c31b5c6..48834602e 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "",
-			"checkConnection": "Vérifiez votre connexion",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Continuer",
-				"back": "Retour"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-mail",
-					"placeholder": "",
-					"errors": {
-						"empty": "Pour continuer, veuillez saisir votre adresse e-mail",
-						"invalid": "Veuillez saisir une adresse e-mail valide"
-					}
-				},
-				"password": {
-					"label": "Mot de passe",
-					"rules": {
-						"length": {
-							"beginning": "Doit faire au moins",
-							"highlighted": "8 caractères"
-						},
-						"special": {
-							"beginning": "Doit contenir au moins",
-							"highlighted": "un caractère spécial"
-						},
-						"number": {
-							"beginning": "Doit contenir au moins",
-							"highlighted": "un nombre"
-						},
-						"uppercase": {
-							"beginning": "Doit contenir au moins",
-							"highlighted": "une lettre majuscule"
-						},
-						"lowercase": {
-							"beginning": "Doit contenir au moins",
-							"highlighted": "une lettre minuscule"
-						},
-						"match": {
-							"beginning": "Confirmer le mot de passe",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirmer le mot de passe",
-					"placeholder": "Confirmez votre mot de passe",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "Prénom",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "Nom",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Se connecter",
-			"subheadings": {
-				"stepOne": "Entrez votre e-mail",
-				"stepTwo": "Entrez votre mot de passe"
-			},
-			"links": {
-				"forgotPassword": "Mot de passe oublié ? <a>Réinitialiser le mot de passe</a>",
-				"register": ""
-			},
-			"toasts": {
-				"success": "Bienvenue ! Vous êtes connecté avec succès.",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "S'inscrire"
-			},
-			"subheadings": {
-				"stepOne": "Saisissez vos infos",
-				"stepTwo": "Entrez votre e-mail",
-				"stepThree": "Créez votre mot de passe"
-			},
-			"description": {
-				"superAdmin": "Créez votre compte Super admin pour commencer",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "S'inscrire avec E-mail",
-				"user": ""
-			},
-			"termsAndPolicies": "En vous inscrivant, vous acceptez nos",
-			"links": {
-				"login": "Vous avez un compte ? <a>Se connecter</a>"
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Mot de passe oublié ?",
-			"subheadings": {
-				"stepOne": "Nous vous enverrons des instructions de réinitialisation.",
-				"stepTwo": "Nous avons envoyé un lien de réinitialisation à <email/>",
-				"stepThree": "Votre nouveau mot de passe doit être différent des anciens mots de passes utilisés.",
-				"stepFour": "Votre mot de passe a été réinitialisé avec succès. Cliquez ci-dessous pour vous connecter."
-			},
-			"buttons": {
-				"openEmail": "Ouvrir l'appli mail",
-				"resetPassword": "Réinitialiser le mot de passe"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Retourner à <a>Se connecter</a>",
-				"resend": "Vous n'avez pas reçu l'e-mail ? <a>Cliquez pour renvoyer</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Reconnexion au serveur réussie.",
-				"stillUnreachable": "Le serveur est toujours inaccessible. Veuillez réessayer plus tard."
-			},
-			"alertBox": "Erreur de connexion au serveur",
-			"description": "",
-			"retryButton": {
-				"default": "",
-				"processing": ""
-			}
-		}
-	},
 	"submit": "Envoyer",
 	"title": "Titre",
 	"distributedStatusHeaderText": "",
@@ -192,8 +10,6 @@
 	"settingsAppearanceDescription": "",
 	"settingsThemeMode": "",
 	"settingsLanguage": "Langue",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
 	"settingsEnabled": "Activé",
 	"settingsDisabled": "Désactivé",
 	"settingsHistoryAndMonitoring": "",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
 	"settingsAbout": "",
 	"settingsDevelopedBy": "",
 	"settingsSave": "",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "",
 	"distributedUptimeCreateAdvancedSettings": "Paramètres avancés",
 	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "La notification de test a été envoyée avec succès !",
 		"testFailed": "Échec de l'envoi de la notification de test",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "Ajouter",
@@ -546,11 +382,6 @@
 		"append": "L'après-midi est votre libre, rendons-le épique !",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "Admin",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -602,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": "Déconnexion"
+		"logOut": "Déconnexion",
+		"notifications": ""
 	},
 	"settingsEmail": "Email",
 	"settingsEmailDescription": "",
@@ -633,7 +464,6 @@
 		"saving": "Sauvegarde..."
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index e90c89a62..a783a820c 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "Erro de rede",
-			"checkConnection": "Verifique sua conexão",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Continuar",
-				"back": "Voltar"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-mail",
-					"placeholder": "",
-					"errors": {
-						"empty": "Para continuar, insira seu endereço de e-mail",
-						"invalid": "Por favor, insira um endereço de e-mail válido"
-					}
-				},
-				"password": {
-					"label": "Senha",
-					"rules": {
-						"length": {
-							"beginning": "Deve ser pelo menos",
-							"highlighted": "8 caracteres de comprimento"
-						},
-						"special": {
-							"beginning": "Deve conter pelo menos",
-							"highlighted": "um caractere especial"
-						},
-						"number": {
-							"beginning": "Deve conter pelo menos",
-							"highlighted": "um número"
-						},
-						"uppercase": {
-							"beginning": "Deve conter pelo menos",
-							"highlighted": "um caractere maiúsculo"
-						},
-						"lowercase": {
-							"beginning": "Deve conter pelo menos",
-							"highlighted": "um caractere minúsculo"
-						},
-						"match": {
-							"beginning": "Confirme a senha",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirme sua senha",
-					"placeholder": "Digite a senha novamente para confirmar",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "Nome",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "Sobrenome",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Login",
-			"subheadings": {
-				"stepOne": "Insira seu e-mail",
-				"stepTwo": "Digite sua senha"
-			},
-			"links": {
-				"forgotPassword": "Esqueceu a senha? <a>Redefinir a senha</a>",
-				"register": "Ainda não tem uma conta? <a>Registre-se aqui</a>"
-			},
-			"toasts": {
-				"success": "Bem-vindo de volta! Você fez login com sucesso.",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Inscreva-se"
-			},
-			"subheadings": {
-				"stepOne": "Insira seus dados pessoais",
-				"stepTwo": "Insira seu e-mail",
-				"stepThree": "Criar sua senha"
-			},
-			"description": {
-				"superAdmin": "Crie sua conta de super admin para começar",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "Criar conta de super admin",
-				"user": ""
-			},
-			"termsAndPolicies": "Ao criar uma conta, você concorda com nossos <a1>Termos de Serviço</a1> e <a2>Política de Privacidade</a2>.",
-			"links": {
-				"login": "Já possui uma conta? <a>Login</a>"
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Esqueceu a senha?",
-			"subheadings": {
-				"stepOne": "Não se preocupe, enviaremos instruções de redefinição.",
-				"stepTwo": "Enviamos um link para redefinir a senha para <email/>",
-				"stepThree": "Sua nova senha deve ser diferente das senhas usadas anteriormente.",
-				"stepFour": "Sua senha foi redefinida com sucesso. Clique abaixo para fazer login magicamente."
-			},
-			"buttons": {
-				"openEmail": "Abra o aplicativo de e-mail",
-				"resetPassword": "Redefinir senha"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Volte para <a>Login</a>",
-				"resend": "Não recebeu o e-mail? <a>Clique para reenviar</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Reconectado ao servidor com sucesso.",
-				"stillUnreachable": "O servidor ainda está inacessível. Tente novamente mais tarde."
-			},
-			"alertBox": "Erro de conexão com o servidor",
-			"description": "Não conseguimos conectar ao servidor. Verifique sua conexão com a internet ou sua configuração de implantação se o problema persistir.",
-			"retryButton": {
-				"default": "Reconectar",
-				"processing": "Conectando..."
-			}
-		}
-	},
 	"submit": "Enviar",
 	"title": "Título",
 	"distributedStatusHeaderText": "Cobertura em tempo real e em dispositivos reais",
@@ -192,8 +10,6 @@
 	"settingsAppearanceDescription": "Alterne entre o modo claro e escuro ou altere o idioma da interface do usuário",
 	"settingsThemeMode": "Tema",
 	"settingsLanguage": "Linguagem",
-	"settingsDistributedUptime": "Disponibilidade distribuída",
-	"settingsDistributedUptimeDescription": "Habilitar/desabilitar o monitoramento de tempo de disponibilidade distribuído.",
 	"settingsEnabled": "Habilitado",
 	"settingsDisabled": "Desabilitado",
 	"settingsHistoryAndMonitoring": "Histórico de monitoramento",
@@ -213,7 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "Remover todos os monitores",
 	"settingsRemoveAllMonitorsDialogTitle": "Você deseja remover todos os monitores?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Sim, remova todos os monitores",
-	"settingsWallet": "Carteira",
 	"settingsAbout": "Sobre",
 	"settingsDevelopedBy": "Desenvolvido pela Bluewave Labs.",
 	"settingsSave": "Salvar",
@@ -256,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "Quando ocorrer um incidente, notifique os usuários.",
 	"distributedUptimeCreateAdvancedSettings": "Configurações avançadas",
 	"distributedUptimeDetailsNoMonitorHistory": "Ainda não há histórico de verificações para este monitor.",
-	"distributedUptimeDetailsFooterHeading": "Feito com ❤️ por UpRock e Bluewave Labs",
-	"distributedUptimeDetailsFooterBuilt": "Construído com",
-	"distributedUptimeDetailsFooterSolana": "Solana",
-	"distributedUptimeDetailsMonitorHeader": "Monitoramento de Uptime distribuído com tecnologia DePIN",
 	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Última atualização",
 	"notifications": {
@@ -301,7 +112,33 @@
 		"testSuccess": "Notificação de teste enviada com sucesso!",
 		"testFailed": "Falha ao enviar notificação de teste",
 		"unsupportedType": "Tipo de notificação não suportado",
-		"networkError": "Ocorreu um erro de rede"
+		"networkError": "Ocorreu um erro de rede",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "testLocale",
 	"add": "Adicionar",
@@ -545,11 +382,6 @@
 		"append": "A tarde é seu playground — vamos torná-la épica!",
 		"overview": "Aqui está uma visão geral dos seus monitores {{type}}."
 	},
-	"monitorStatus": {
-		"up": "Online",
-		"down": "Offline",
-		"paused": "pausado"
-	},
 	"roles": {
 		"superAdmin": "Super Admin",
 		"admin": "Admin",
@@ -588,7 +420,6 @@
 		"uptime": "Uptime",
 		"pagespeed": "Pagespeed",
 		"infrastructure": "Infraestrutura",
-		"distributedUptime": "Uptime distribuído",
 		"incidents": "Incidentes",
 		"statusPages": "Pagina de status",
 		"maintenance": "Manutenção",
@@ -601,7 +432,8 @@
 		"profile": "Perfil",
 		"password": "Senha",
 		"team": "Equipe",
-		"logOut": "Sair"
+		"logOut": "Sair",
+		"notifications": ""
 	},
 	"settingsEmail": "E-mail",
 	"settingsEmailDescription": "Configurações de e-mail do seu sistema. Elas são usadas para enviar notificações e alertas.",
@@ -632,7 +464,6 @@
 		"saving": "Salvando..."
 	},
 	"settingsEmailConnectionHost": "Host de conexão de e-mail - Nome do host a ser usado na saudação HELO/EHLO",
-	"sendTestEmail": "Enviar e-mail de teste",
 	"emailSent": "E-mail enviado com sucesso",
 	"failedToSendEmail": "Falha ao enviar e-mail",
 	"settingsTestEmail": "Enviar e-mail de teste",
@@ -657,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 9c74921a1..539bb2d51 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "Ошибка сети",
-			"checkConnection": "Пожалуйста, проверьте ваше соединение",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Продолжить",
-				"back": "Назад"
-			},
-			"inputs": {
-				"email": {
-					"label": "Почта",
-					"placeholder": "",
-					"errors": {
-						"empty": "Чтобы продолжить, пожалуйста, введите свой адрес электронной почты",
-						"invalid": "Пожалуйста, введите действительный адрес электронной почты"
-					}
-				},
-				"password": {
-					"label": "пароль",
-					"rules": {
-						"length": {
-							"beginning": "Должно быть как минимум",
-							"highlighted": "длиной 8 символов"
-						},
-						"special": {
-							"beginning": "Должен содержать как минимум",
-							"highlighted": "один специальный символ"
-						},
-						"number": {
-							"beginning": "Должен содержать как минимум",
-							"highlighted": "одно число"
-						},
-						"uppercase": {
-							"beginning": "Должен содержать как минимум",
-							"highlighted": "один верхний символ"
-						},
-						"lowercase": {
-							"beginning": "Должен содержать как минимум",
-							"highlighted": "один нижний символ"
-						},
-						"match": {
-							"beginning": "Подтвердите пароль и пароль",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Подтвердите пароль",
-					"placeholder": "Подтвердите ваш пароль",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "Имя",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "Фамилия",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Войти",
-			"subheadings": {
-				"stepOne": "Введите свой email",
-				"stepTwo": "Введите свой пароль"
-			},
-			"links": {
-				"forgotPassword": "Забыли пароль? <a>Сбросить пароль</a>",
-				"register": "У вас нет учетной записи? <a>Зарегистрируйтесь здесь</a>"
-			},
-			"toasts": {
-				"success": "Добро пожаловать обратно! Вы успешно вошли в систему.",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Зарегистрироваться"
-			},
-			"subheadings": {
-				"stepOne": "Введите свои личные данные",
-				"stepTwo": "Введите свой email",
-				"stepThree": "Создайте свой пароль"
-			},
-			"description": {
-				"superAdmin": "Создайте учетную запись суперадминистратора, чтобы начать работу",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "Зарегистрироваться по электронной почте",
-				"user": ""
-			},
-			"termsAndPolicies": "Регистрируясь, вы соглашаетесь с нашими",
-			"links": {
-				"login": "Уже есть аккаунт? <a>Войти</a>"
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Забыли пароль?",
-			"subheadings": {
-				"stepOne": "Не беспокойтесь, мы вышлем вам инструкции по сбросу настроек.",
-				"stepTwo": "Мы отправили ссылку для сброса пароля <email/>",
-				"stepThree": "Ваш новый пароль должен отличаться от ранее использованных паролей.",
-				"stepFour": "Ваш пароль успешно сброшен. Нажмите ниже, чтобы войти в систему магическим образом."
-			},
-			"buttons": {
-				"openEmail": "Откройте приложение почты",
-				"resetPassword": "Сбросить пароль"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Назад к <a>Войти</a>",
-				"resend": "Не получили письмо? <a>Нажмите, чтобы отправить повторно</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Успешно подключен к серверу.",
-				"stillUnreachable": "Сервер по-прежнему недоступен. Пожалуйста, повторите попытку позже."
-			},
-			"alertBox": "Ошибка подключения к серверу",
-			"description": "Нам не удается подключиться к серверу. Пожалуйста, проверьте подключение к Интернету или конфигурацию вашего развертывания, если проблема не устранена.",
-			"retryButton": {
-				"default": "Повторите попытку подключения",
-				"processing": "Подключение..."
-			}
-		}
-	},
 	"submit": "Подтвердить",
 	"title": "Название",
 	"distributedStatusHeaderText": "Охват реального времени и реального устройства",
@@ -253,9 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "В случае возникновения инцидента сообщите об этом пользователям.",
 	"distributedUptimeCreateAdvancedSettings": "Расширенные настройки",
 	"distributedUptimeDetailsNoMonitorHistory": "Для этого монитора пока нет истории проверок.",
-	"distributedUptimeDetailsFooterHeading": "Made with ❤️ by UpRock & Bluewave Labs",
-	"distributedUptimeDetailsFooterBuilt": "Built on",
-	"distributedUptimeDetailsFooterSolana": "Solana",
 	"distributedUptimeDetailsStatusHeaderUptime": "Аптайм:",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Последнее обновление",
 	"notifications": {
@@ -297,7 +112,33 @@
 		"testSuccess": "Уведомление о тестировании отправлено успешно!",
 		"testFailed": "Не удалось отправить тестовое уведомление",
 		"unsupportedType": "Неподдерживаемый тип уведомления",
-		"networkError": "Произошла сетевая ошибка"
+		"networkError": "Произошла сетевая ошибка",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "testLocale",
 	"add": "Добавить",
@@ -541,11 +382,6 @@
 		"append": "Вторая половина дня — это ваша игровая площадка - давайте сделаем ее эпичной!",
 		"overview": "Вот обзор ваших мониторов {{type}}."
 	},
-	"monitorStatus": {
-		"up": "доступен",
-		"down": "недоступен",
-		"paused": "остановлен"
-	},
 	"roles": {
 		"superAdmin": "Главный админ",
 		"admin": "Админ",
@@ -584,7 +420,6 @@
 		"uptime": "Аптайм",
 		"pagespeed": "Pagespeed",
 		"infrastructure": "Инфраструктура",
-		"distributedUptime": "Распределенный Аптайм",
 		"incidents": "Инциденты",
 		"statusPages": "Страницы статуса",
 		"maintenance": "Обслуживание",
@@ -597,7 +432,8 @@
 		"profile": "Профиль",
 		"password": "Пароль",
 		"team": "Команда",
-		"logOut": "Выйти"
+		"logOut": "Выйти",
+		"notifications": ""
 	},
 	"settingsEmail": "Настройки Email",
 	"settingsEmailDescription": "Настройка параметров email",
@@ -628,7 +464,6 @@
 		"saving": "Сохранение..."
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -653,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 28b9bd346..1d86de06c 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -1,186 +1,4 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "Ağ hatası",
-			"checkConnection": "Lütfen bağlantınızı kontrol edin",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "Devam Et",
-				"back": "Geri"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-posta",
-					"placeholder": "",
-					"errors": {
-						"empty": "Devam etmek için lütfen e-posta adresinizi girin",
-						"invalid": "Lütfen geçerli bir eposta hesabı girin"
-					}
-				},
-				"password": {
-					"label": "Parola",
-					"rules": {
-						"length": {
-							"beginning": "En az",
-							"highlighted": "8 karakter uzunluğunda olmalı"
-						},
-						"special": {
-							"beginning": "En az içermeli",
-							"highlighted": "bir özel karakter"
-						},
-						"number": {
-							"beginning": "En az içermeli",
-							"highlighted": "bir rakam"
-						},
-						"uppercase": {
-							"beginning": "En az içermeli",
-							"highlighted": "bir büyük harf"
-						},
-						"lowercase": {
-							"beginning": "En az içermeli",
-							"highlighted": "bir küçük harf"
-						},
-						"match": {
-							"beginning": "Onay şifresi ve şifre",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "Parolayı onayla",
-					"placeholder": "Parolanızı onaylayın",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "İsim",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "Soyisim",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "Giriş Yap",
-			"subheadings": {
-				"stepOne": "E-posta adresinizi girin",
-				"stepTwo": "Parolanızı girin"
-			},
-			"links": {
-				"forgotPassword": "Parolanızı mı unuttunuz? <a>Parola sıfırla</a>",
-				"register": "Bir hesabınız yok mu? <a>Buradan kayıt olun</a>"
-			},
-			"toasts": {
-				"success": "Tekrar hoş geldiniz! Başarıyla giriş yaptınız.",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "Kayıt Ol"
-			},
-			"subheadings": {
-				"stepOne": "Kişisel bilgilerinizi girin",
-				"stepTwo": "E-posta adresinizi girin",
-				"stepThree": "Parolanızı oluşturun"
-			},
-			"description": {
-				"superAdmin": "Super admin hesabınızı oluşturmak için devam edin",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "E-posta ile kayıt ol",
-				"user": ""
-			},
-			"termsAndPolicies": "",
-			"links": {
-				"login": "Zaten hesabınız var mı? <a>Giriş yap</a>"
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "Parolanızı mı unuttunuz?",
-			"subheadings": {
-				"stepOne": "Endişelenmeyin, size sıfırlama talimatlarını göndereceğiz.",
-				"stepTwo": "<email/> adresine şifre sıfırlama bağlantısı gönderdik",
-				"stepThree": "Yeni şifreniz daha önce kullanılan şifrelerden farklı olmalıdır.",
-				"stepFour": "Parolanız başarıyla sıfırlandı. Otomatik olarak giriş yapmak için aşağıya tıklayın."
-			},
-			"buttons": {
-				"openEmail": "Eposta uygulamasını aç",
-				"resetPassword": "Parola sıfırla"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "Geri dön <a>Giriş Yap</a>",
-				"resend": "E-posta almadınız mı? <a>Yeniden göndermek için tıklayın</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Sunucuya başarıyla yeniden bağlanıldı.",
-				"stillUnreachable": "Sunucuya hala ulaşılamıyor. Lütfen daha sonra tekrar deneyin."
-			},
-			"alertBox": "Sunucu bağlantı hatası",
-			"description": "Sunucuya bağlanamıyoruz. Lütfen internet bağlantınızı kontrol edin veya sorun devam ederse dağıtım yapılandırmanızı doğrulayın.",
-			"retryButton": {
-				"default": "Bağlantıyı yeniden deneyin",
-				"processing": "Bağlanıyor..."
-			}
-		}
-	},
 	"submit": "Gönder",
 	"title": "Başlık",
 	"distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
@@ -192,8 +10,6 @@
 	"settingsAppearanceDescription": "Açık ve koyu mod arasında geçiş yapın veya kullanıcı arayüzü dilini değiştirin",
 	"settingsThemeMode": "Tema",
 	"settingsLanguage": "Dil",
-	"settingsDistributedUptime": "Dağıtılmış çalışma süresi",
-	"settingsDistributedUptimeDescription": "Dağıtılmış çalışma süresi izlemeyi etkinleştirin/devre dışı bırakın.",
 	"settingsEnabled": "Etkin",
 	"settingsDisabled": "Devre dışı",
 	"settingsHistoryAndMonitoring": "Geçmiş ve izleme",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "Tüm monitörleri kaldır",
 	"settingsRemoveAllMonitorsDialogTitle": "Tüm monitörleri kaldırmak istiyor musunuz?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Evet, tüm monitörleri temizle",
-	"settingsWallet": "Cüzdan",
-	"settingsWalletDescription": "Cüzdanınızı buradan bağlayın. Bu, Dağıtılmış Çalışma Süresi monitörünün küresel olarak birden çok düğüme bağlanması için gereklidir.",
 	"settingsAbout": "Hakkında",
 	"settingsDevelopedBy": "Bluewave Labs tarafından geliştirilmiştir.",
 	"settingsSave": "Kaydet",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "Bir olay olduğunda kullanıcıları bilgilendir.",
 	"distributedUptimeCreateAdvancedSettings": "Gelişmiş ayarlar",
 	"distributedUptimeDetailsNoMonitorHistory": "Bu monitör için henüz bir denetim günlüğü oluşturulmadı.",
-	"distributedUptimeDetailsFooterHeading": "UpRock & Bluewave Labs tarafından geliştirildi",
-	"distributedUptimeDetailsFooterBuilt": "Altyapı",
-	"distributedUptimeDetailsFooterSolana": "Solana",
-	"distributedUptimeDetailsMonitorHeader": "Depin Destekli Dağıtık Kesintisizlik İzleme",
 	"distributedUptimeDetailsStatusHeaderUptime": "Erişilebilirlik",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "Son güncelleme",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "Test bildirimi başarıyla gönderildi",
 		"testFailed": "Test bildirimi gönderilemedi",
 		"unsupportedType": "Desteklenmeyen bildirim türü",
-		"networkError": "Ağ hatası oluştu"
+		"networkError": "Ağ hatası oluştu",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "TEST13 UPLOAD",
 	"add": "Ekle",
@@ -546,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -602,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": "Çıkış yap"
+		"logOut": "Çıkış yap",
+		"notifications": ""
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
@@ -633,7 +464,6 @@
 		"saving": "Kaydediliyor..."
 	},
 	"settingsEmailConnectionHost": "E-posta bağlantı ana bilgisayarı - HELO/EHLO selamlamasında kullanılacak ana bilgisayar adı",
-	"sendTestEmail": "Test maili gönder",
 	"emailSent": "E-posta başarı ile gönderildi.",
 	"failedToSendEmail": "E-posta gönderimi başarısız.",
 	"settingsTestEmail": "Test  E-postası gönder.",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 2f4668548..6e864b7ee 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -1,188 +1,6 @@
 {
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": ""
-		},
-		"toasts": {
-			"networkError": "",
-			"checkConnection": "",
-			"unknownError": ""
-		}
-	},
-	"auth": {
-		"common": {
-			"navigation": {
-				"continue": "繼續",
-				"back": "回去"
-			},
-			"inputs": {
-				"email": {
-					"label": "E-mail",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"invalid": ""
-					}
-				},
-				"password": {
-					"label": "密碼",
-					"rules": {
-						"length": {
-							"beginning": "必須至少",
-							"highlighted": "8 個字符長"
-						},
-						"special": {
-							"beginning": "必須至少包含",
-							"highlighted": "一個特殊字符"
-						},
-						"number": {
-							"beginning": "必須至少包含",
-							"highlighted": "一個數字"
-						},
-						"uppercase": {
-							"beginning": "必須至少包含",
-							"highlighted": "一個大寫字母"
-						},
-						"lowercase": {
-							"beginning": "必須至少包含",
-							"highlighted": "一個小寫字母"
-						},
-						"match": {
-							"beginning": "確認密碼",
-							"highlighted": ""
-						}
-					},
-					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
-					}
-				},
-				"passwordConfirm": {
-					"label": "確認密碼",
-					"placeholder": "確認您的密碼",
-					"errors": {
-						"empty": "",
-						"different": ""
-					}
-				},
-				"firstName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				},
-				"lastName": {
-					"label": "",
-					"placeholder": "",
-					"errors": {
-						"empty": "",
-						"length": "",
-						"pattern": ""
-					}
-				}
-			},
-			"errors": {
-				"validation": ""
-			}
-		},
-		"login": {
-			"heading": "登入",
-			"subheadings": {
-				"stepOne": "輸入您的 E-mail",
-				"stepTwo": "輸入您的密碼"
-			},
-			"links": {
-				"forgotPassword": "",
-				"register": ""
-			},
-			"toasts": {
-				"success": "",
-				"incorrectPassword": ""
-			}
-		},
-		"registration": {
-			"heading": {
-				"superAdmin": "",
-				"user": "註冊"
-			},
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "輸入您的 E-mail",
-				"stepThree": ""
-			},
-			"description": {
-				"superAdmin": "建立您的超級管理員帳號開始使用",
-				"user": ""
-			},
-			"gettingStartedButton": {
-				"superAdmin": "用 E-mail 註冊",
-				"user": ""
-			},
-			"termsAndPolicies": "註冊即表示您同意我們的",
-			"links": {
-				"login": ""
-			},
-			"toasts": {
-				"success": ""
-			}
-		},
-		"forgotPassword": {
-			"heading": "忘記密碼？",
-			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "我們已將密碼重設連結發送至 <email/>",
-				"stepThree": "您的新密碼必須與之前使用過的密碼不同。",
-				"stepFour": ""
-			},
-			"buttons": {
-				"openEmail": "",
-				"resetPassword": "重設密碼"
-			},
-			"imageAlts": {
-				"passwordKey": "",
-				"email": "",
-				"lock": "",
-				"passwordConfirm": ""
-			},
-			"links": {
-				"login": "回去 <a>登入</a>",
-				"resend": "沒有受到 E-mail？ <a>點擊</a>"
-			},
-			"toasts": {
-				"sent": "",
-				"emailNotFound": "",
-				"redirect": "",
-				"success": "",
-				"error": ""
-			}
-		}
-	},
-	"errorPages": {
-		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "",
-				"stillUnreachable": ""
-			},
-			"alertBox": "",
-			"description": "",
-			"retryButton": {
-				"default": "",
-				"processing": ""
-			}
-		}
-	},
-	"submit": "",
-	"title": "",
+	"submit": "提交",
+	"title": "名稱",
 	"distributedStatusHeaderText": "實時、真實設備覆蓋",
 	"distributedStatusSubHeaderText": "由全球數百萬個設備提供支持，您可以按全球區域、國家或城市查看系統效能",
 	"settingsGeneralSettings": "一般設定",
@@ -190,11 +8,9 @@
 	"settingsDisplayTimezoneDescription": "您公開顯示的儀表板的時區。",
 	"settingsAppearance": "外觀",
 	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsDistributedUptime": "",
-	"settingsDistributedUptimeDescription": "",
-	"settingsEnabled": "",
+	"settingsThemeMode": "主題",
+	"settingsLanguage": "語言",
+	"settingsEnabled": "啟動",
 	"settingsDisabled": "",
 	"settingsHistoryAndMonitoring": "",
 	"settingsHistoryAndMonitoringDescription": "",
@@ -213,8 +29,6 @@
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsWallet": "",
-	"settingsWalletDescription": "",
 	"settingsAbout": "",
 	"settingsDevelopedBy": "",
 	"settingsSave": "",
@@ -257,10 +71,6 @@
 	"distributedUptimeCreateIncidentDescription": "",
 	"distributedUptimeCreateAdvancedSettings": "",
 	"distributedUptimeDetailsNoMonitorHistory": "",
-	"distributedUptimeDetailsFooterHeading": "",
-	"distributedUptimeDetailsFooterBuilt": "",
-	"distributedUptimeDetailsFooterSolana": "",
-	"distributedUptimeDetailsMonitorHeader": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
 	"notifications": {
@@ -302,7 +112,33 @@
 		"testSuccess": "",
 		"testFailed": "",
 		"unsupportedType": "",
-		"networkError": ""
+		"networkError": "",
+		"fallback": {
+			"title": "",
+			"checks": [""]
+		},
+		"createButton": "",
+		"createTitle": "",
+		"create": {
+			"success": "",
+			"failed": ""
+		},
+		"fetch": {
+			"success": "",
+			"failed": ""
+		},
+		"delete": {
+			"success": "",
+			"failed": ""
+		},
+		"edit": {
+			"success": "",
+			"failed": ""
+		},
+		"test": {
+			"success": "",
+			"failed": ""
+		}
 	},
 	"testLocale": "",
 	"add": "",
@@ -546,11 +382,6 @@
 		"append": "",
 		"overview": ""
 	},
-	"monitorStatus": {
-		"up": "",
-		"down": "",
-		"paused": ""
-	},
 	"roles": {
 		"superAdmin": "",
 		"admin": "",
@@ -589,7 +420,6 @@
 		"uptime": "",
 		"pagespeed": "",
 		"infrastructure": "",
-		"distributedUptime": "",
 		"incidents": "",
 		"statusPages": "",
 		"maintenance": "",
@@ -602,7 +432,8 @@
 		"profile": "",
 		"password": "",
 		"team": "",
-		"logOut": ""
+		"logOut": "",
+		"notifications": ""
 	},
 	"settingsEmail": "",
 	"settingsEmailDescription": "",
@@ -633,7 +464,6 @@
 		"saving": ""
 	},
 	"settingsEmailConnectionHost": "",
-	"sendTestEmail": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
 	"settingsTestEmail": "",
@@ -658,5 +488,257 @@
 		"ping": "",
 		"docker": "",
 		"port": ""
-	}
+	},
+	"common": {
+		"appName": "",
+		"monitoringAgentName": "",
+		"buttons": {
+			"toggleTheme": ""
+		},
+		"toasts": {
+			"networkError": "",
+			"checkConnection": "",
+			"unknownError": ""
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "",
+				"back": ""
+			},
+			"inputs": {
+				"email": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"invalid": ""
+					}
+				},
+				"password": {
+					"label": "",
+					"rules": {
+						"length": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"special": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"number": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"uppercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"lowercase": {
+							"beginning": "",
+							"highlighted": ""
+						},
+						"match": {
+							"beginning": "",
+							"highlighted": ""
+						}
+					},
+					"errors": {
+						"empty": "",
+						"length": "",
+						"uppercase": "",
+						"lowercase": "",
+						"number": "",
+						"special": "",
+						"incorrect": ""
+					}
+				},
+				"passwordConfirm": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"different": ""
+					}
+				},
+				"firstName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				},
+				"lastName": {
+					"label": "",
+					"placeholder": "",
+					"errors": {
+						"empty": "",
+						"length": "",
+						"pattern": ""
+					}
+				}
+			},
+			"errors": {
+				"validation": ""
+			}
+		},
+		"login": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": ""
+			},
+			"links": {
+				"forgotPassword": "",
+				"register": "",
+				"forgotPasswordLink": "",
+				"registerLink": ""
+			},
+			"toasts": {
+				"success": "",
+				"incorrectPassword": ""
+			},
+			"errors": {
+				"password": {
+					"incorrect": ""
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": ""
+			},
+			"description": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"gettingStartedButton": {
+				"superAdmin": "",
+				"user": ""
+			},
+			"termsAndPolicies": "",
+			"links": {
+				"login": ""
+			},
+			"toasts": {
+				"success": ""
+			}
+		},
+		"forgotPassword": {
+			"heading": "",
+			"subheadings": {
+				"stepOne": "",
+				"stepTwo": "",
+				"stepThree": "",
+				"stepFour": ""
+			},
+			"buttons": {
+				"openEmail": "",
+				"resetPassword": ""
+			},
+			"imageAlts": {
+				"passwordKey": "",
+				"email": "",
+				"lock": "",
+				"passwordConfirm": ""
+			},
+			"links": {
+				"login": "",
+				"resend": ""
+			},
+			"toasts": {
+				"sent": "",
+				"emailNotFound": "",
+				"redirect": "",
+				"success": "",
+				"error": ""
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "",
+				"stillUnreachable": ""
+			},
+			"alertBox": "",
+			"description": "",
+			"retryButton": {
+				"default": "",
+				"processing": ""
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "",
+		"nameSettings": {
+			"title": "",
+			"description": "",
+			"nameLabel": "",
+			"namePlaceholder": ""
+		},
+		"typeSettings": {
+			"title": "",
+			"description": "",
+			"typeLabel": ""
+		},
+		"emailSettings": {
+			"title": "",
+			"description": "",
+			"emailLabel": "",
+			"emailPlaceholder": ""
+		},
+		"slackSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"pagerdutySettings": {
+			"title": "",
+			"description": "",
+			"integrationKeyLabel": "",
+			"integrationKeyPlaceholder": ""
+		},
+		"genericWebhookSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		},
+		"discordSettings": {
+			"title": "",
+			"description": "",
+			"webhookLabel": "",
+			"webhookPlaceholder": ""
+		}
+	},
+	"notificationConfig": {
+		"title": "",
+		"description": ""
+	},
+	"monitorStatus": {
+		"checkingEvery": "",
+		"withCaptureAgent": "",
+		"up": "",
+		"down": "",
+		"paused": ""
+	},
+	"advancedMatching": "",
+	"settingsEmailTLSServername": "",
+	"settingsEmailIgnoreTLS": "",
+	"settingsEmailRequireTLS": "",
+	"settingsEmailRejectUnauthorized": "",
+	"settingsEmailSecure": "",
+	"settingsEmailPool": "",
+	"sendTestNotifications": ""
 }

From 1298b2384495c4da32094396f0359c5a276e5175 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 17 Jun 2025 11:32:35 +0800
Subject: [PATCH 194/319] update time format function

---
 .../Components/UptimeStatusBoxes/index.jsx    |  2 +-
 client/src/Utils/timeUtils.js                 | 43 ++++++++++++-------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
index 0e362e187..3778e4c6d 100644
--- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
+++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
@@ -80,7 +80,7 @@ const UptimeStatusBoxes = ({
 };
 
 UptimeStatusBoxes.propTypes = {
-	shouldRender: PropTypes.bool,
+	isLoading: PropTypes.bool,
 	monitor: PropTypes.object,
 	monitorStats: PropTypes.object,
 	certificateExpiry: PropTypes.string,
diff --git a/client/src/Utils/timeUtils.js b/client/src/Utils/timeUtils.js
index 3a84dfcf4..e03f0b5b7 100644
--- a/client/src/Utils/timeUtils.js
+++ b/client/src/Utils/timeUtils.js
@@ -79,22 +79,35 @@ export const formatDurationSplit = (ms) => {
 
 export const getHumanReadableDuration = (ms) => {
 	const durationObj = dayjs.duration(ms);
-	if (durationObj.asDays() >= 1) {
-		const days = Math.floor(durationObj.asDays());
-		return { time: days, units: days === 1 ? "day" : "days" };
-	} else if (durationObj.asHours() >= 1) {
-		const hoursRounded = Math.round(durationObj.asHours() * 10) / 10;
-		const hours = Number.isInteger(hoursRounded)
-			? Math.floor(hoursRounded)
-			: hoursRounded;
-		return { time: hours, units: hours <= 1 ? "hour" : "hours" };
-	} else if (durationObj.asMinutes() >= 1) {
-		const minutes = Math.floor(durationObj.asMinutes());
-		return { time: minutes, units: minutes === 1 ? "minute" : "minutes" };
-	} else {
-		const seconds = Math.floor(durationObj.asSeconds());
-		return { time: seconds, units: seconds === 1 ? "second" : "seconds" };
+
+	const parts = {
+		days: Math.floor(durationObj.asDays()),
+		hours: durationObj.hours(),
+		minutes: durationObj.minutes(),
+		seconds: durationObj.seconds(),
+	};
+
+	const result = [];
+
+	if (parts.days > 0) {
+		result.push(`${parts.days}d`);
 	}
+	if (parts.hours > 0) {
+		result.push(`${parts.hours}h`);
+	}
+	if (result.length < 2 && parts.minutes > 0) {
+		result.push(`${parts.minutes}m`);
+	}
+	if (result.length < 2 && parts.seconds > 0) {
+		result.push(`${parts.seconds}s`);
+	}
+
+	if (result.length === 0) {
+		// fallback for durations < 1s
+		return { time: 0, units: "seconds" };
+	}
+
+	return { time: result.join(" "), units: null };
 };
 
 export const formatDate = (date, customOptions) => {

From 34ca3a65d6389a484c14e6ca3164eeb3d30253ea Mon Sep 17 00:00:00 2001
From: unknown <virenjadhav5143@gmail.com>
Date: Tue, 17 Jun 2025 10:13:58 +0530
Subject: [PATCH 195/319] Add bulk selection for status page servers

---
 client/src/Components/Inputs/Search/index.jsx | 88 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx
index e5654faeb..618ae327f 100644
--- a/client/src/Components/Inputs/Search/index.jsx
+++ b/client/src/Components/Inputs/Search/index.jsx
@@ -1,7 +1,16 @@
 import PropTypes from "prop-types";
-import { Box, ListItem, Autocomplete, TextField, Stack, Typography } from "@mui/material";
+import {
+	Box,
+	ListItem,
+	Autocomplete,
+	TextField,
+	Stack,
+	Typography,
+	Checkbox,
+} from "@mui/material";
 import { useTheme } from "@emotion/react";
 import SearchIcon from "../../../assets/icons/search.svg?react";
+import React, { useEffect } from "react";
 
 /**
  * Search component using Material UI's Autocomplete.
@@ -60,18 +69,67 @@ const Search = ({
 	onBlur,
 }) => {
 	const theme = useTheme();
+	const [selectAll, setSelectAll] = React.useState(false);
+	useEffect(() => {
+		setSelectAll(
+			multiple &&
+				isAdorned &&
+				Array.isArray(value) &&
+				Array.isArray(options) &&
+				options.length > 0 &&
+				value.length === options.length
+		);
+	}, [multiple, isAdorned, options, value]);
+	const [open, setOpen] = React.useState(false);
+	const enhancedOptions = React.useMemo(() => {
+		return multiple && isAdorned
+			? [{ [filteredBy]: "Select All", isSelectAll: true, _id: "select_all" }, ...options]
+			: options;
+	}, [multiple, isAdorned, options, filteredBy]);
+	const isOptionSelected = (option) => {
+		if (!multiple && !isAdorned) return false;
+		if (Array.isArray(value)) {
+			return value.some((item) => item._id === option._id);
+		}
+		return false;
+	};
+	const handleSelectAll = (isSelectAll) => {
+		const newValue = isSelectAll ? [...options] : [];
+		handleChange(newValue);
+		setSelectAll(isSelectAll);
+		setOpen(!isSelectAll);
+	};
 	return (
 		<Autocomplete
 			onBlur={onBlur}
 			multiple={multiple}
 			id={id}
 			value={value}
+			open={open}
+			onOpen={() => setOpen(true)}
+			onClose={(event, reason) => {
+				if (reason === "blur" || reason === "escape") {
+					setOpen(false);
+				}
+			}}
 			inputValue={inputValue}
 			onInputChange={(_, newValue) => {
 				handleInputChange(newValue);
 			}}
 			onChange={(_, newValue) => {
-				handleChange(newValue);
+				if (multiple && isAdorned) {
+					const hasSelectAllSelected =
+						Array.isArray(newValue) && newValue.some((item) => item.isSelectAll);
+					if (hasSelectAllSelected) {
+						handleSelectAll(!selectAll);
+					} else {
+						handleChange(newValue);
+						setSelectAll(Array.isArray(newValue) && newValue.length === options.length);
+					}
+				} else {
+					handleChange(newValue);
+					setOpen(false);
+				}
 			}}
 			fullWidth
 			freeSolo
@@ -120,6 +178,9 @@ const Search = ({
 				</Stack>
 			)}
 			filterOptions={(options, { inputValue }) => {
+				if (inputValue.trim() === "" && multiple && isAdorned) {
+					return enhancedOptions;
+				}
 				const filtered = options.filter((option) =>
 					option[filteredBy].toLowerCase().includes(inputValue.toLowerCase())
 				);
@@ -136,6 +197,7 @@ const Search = ({
 				const { key, ...optionProps } = props;
 				const hasSecondaryLabel = secondaryLabel && option[secondaryLabel] !== undefined;
 				const port = option["port"];
+				const selected = isOptionSelected(option);
 				return (
 					<ListItem
 						key={key}
@@ -146,9 +208,29 @@ const Search = ({
 										pointerEvents: "none",
 										backgroundColor: theme.palette.primary.main,
 									}
-								: {}
+								: option.isSelectAll
+									? {
+											fontWeight: "bold",
+											backgroundColor: theme.palette.primary.light,
+											"&:hover": {
+												backgroundColor: theme.palette.primary.light,
+											},
+										}
+									: {}
 						}
 					>
+						{multiple && isAdorned && (
+							<Checkbox
+								checked={option.isSelectAll ? selectAll : selected}
+								sx={{
+									color: theme.palette.primary.contrastTextSecondary,
+									"&.Mui-checked": {
+										color: theme.palette.secondary.main,
+									},
+									padding: 0,
+								}}
+							/>
+						)}
 						{option[filteredBy] +
 							(hasSecondaryLabel
 								? ` (${option[secondaryLabel]}${port ? `: ${port}` : ""})`

From e818f1cd610a56a4cd3fd6c4e5ff606f70ad13a1 Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Tue, 17 Jun 2025 10:57:30 +0530
Subject: [PATCH 196/319] chore: fix formatting

---
 .../MonitorDetailsControlHeader/index.jsx     | 86 +++++++++----------
 .../MonitorDetailsControlHeader/status.jsx    | 50 ++++++-----
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx
index 9db38c0cf..5ad665069 100644
--- a/client/src/Components/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx
@@ -56,49 +56,49 @@ const MonitorDetailsControlHeader = ({
 		>
 			<Status monitor={monitor} />
 
-      <Stack
-        direction="row"
-        gap={theme.spacing(2)}
-      >
-        <Button
-          variant="contained"
-          color="secondary"
-          loading={isSending}
-          startIcon={<EmailIcon />}
-          onClick={() => {
-            testAllNotifications({ monitorId: monitor?._id });
-          }}
-          sx={{
-            whiteSpace: 'nowrap',
-          }}
-        >
-          {t("sendTestNotifications")}
-        </Button>
-        <Button
-          variant="contained"
-          color="secondary"
-          onClick={(e) => {
-            navigate(`/incidents/${monitor?._id}`);
-          }}
-        >
-          {t("menu.incidents")}
-        </Button>
-        <Button
-          variant="contained"
-          color="secondary"
-          loading={isPausing}
-          startIcon={
-            monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
-          }
-          onClick={() => {
-            pauseMonitor({
-              monitorId: monitor?._id,
-              triggerUpdate,
-            });
-          }}
-        >
-          {monitor?.isActive ? "Pause" : "Resume"}
-        </Button>
+			<Stack
+				direction="row"
+				gap={theme.spacing(2)}
+			>
+				<Button
+					variant="contained"
+					color="secondary"
+					loading={isSending}
+					startIcon={<EmailIcon />}
+					onClick={() => {
+						testAllNotifications({ monitorId: monitor?._id });
+					}}
+					sx={{
+						whiteSpace: "nowrap",
+					}}
+				>
+					{t("sendTestNotifications")}
+				</Button>
+				<Button
+					variant="contained"
+					color="secondary"
+					onClick={(e) => {
+						navigate(`/incidents/${monitor?._id}`);
+					}}
+				>
+					{t("menu.incidents")}
+				</Button>
+				<Button
+					variant="contained"
+					color="secondary"
+					loading={isPausing}
+					startIcon={
+						monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
+					}
+					onClick={() => {
+						pauseMonitor({
+							monitorId: monitor?._id,
+							triggerUpdate,
+						});
+					}}
+				>
+					{monitor?.isActive ? "Pause" : "Resume"}
+				</Button>
 
 				{isAdmin && (
 					<Button
diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index f5c9aa597..5371fe445 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -23,30 +23,34 @@ import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
 const Status = ({ monitor }) => {
 	const theme = useTheme();
 	const { statusColor, determineState } = useMonitorUtils();
+	const URL_TRUNCATION_LENGTH = 55;
 
-  return (
-    <Stack>
-      <Typography variant="monitorName">{monitor?.name}</Typography>
-      <Stack
-        direction="row"
-        alignItems={"center"}
-        gap={theme.spacing(4)}
-      >
-        <PulseDot color={statusColor[determineState(monitor)]} />
-        <Typography variant="monitorUrl" noWrap>
-          {monitor?.url ? (
-            monitor.url?.length > 55
-              ? `${monitor.url.replace(/^https?:\/\//, "")?.slice(0, 55)}…`
-              : monitor.url.replace(/^https?:\/\//, "")
-          ) : "…"}
-        </Typography>
-        <Dot />
-        <Typography>
-          Checking every {formatDurationRounded(monitor?.interval)}.
-        </Typography>
-      </Stack>
-    </Stack>
-  );
+	return (
+		<Stack>
+			<Typography variant="monitorName">{monitor?.name}</Typography>
+			<Stack
+				direction="row"
+				alignItems={"center"}
+				gap={theme.spacing(4)}
+			>
+				<PulseDot color={statusColor[determineState(monitor)]} />
+				<Typography
+					variant="monitorUrl"
+					noWrap
+				>
+					{monitor?.url
+						? monitor.url?.length > URL_TRUNCATION_LENGTH
+							? `${monitor.url.replace(/^https?:\/\//, "")?.slice(0, URL_TRUNCATION_LENGTH)}…`
+							: monitor.url.replace(/^https?:\/\//, "")
+						: "…"}
+				</Typography>
+				<Dot />
+				<Typography>
+					Checking every {formatDurationRounded(monitor?.interval)}.
+				</Typography>
+			</Stack>
+		</Stack>
+	);
 };
 
 Status.propTypes = {

From 9c400213182a8cc60114b02ad882a8ec01961ad0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 17 Jun 2025 13:41:25 +0800
Subject: [PATCH 197/319] return time string

---
 .../Components/PageSpeedStatusBoxes/index.jsx      | 13 +++----------
 .../Details/Components/UptimeStatusBoxes/index.jsx | 14 +++-----------
 client/src/Utils/timeUtils.js                      |  4 ++--
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/client/src/Pages/PageSpeed/Details/Components/PageSpeedStatusBoxes/index.jsx b/client/src/Pages/PageSpeed/Details/Components/PageSpeedStatusBoxes/index.jsx
index d3c597c3d..cb79198e9 100644
--- a/client/src/Pages/PageSpeed/Details/Components/PageSpeedStatusBoxes/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/Components/PageSpeedStatusBoxes/index.jsx
@@ -5,13 +5,8 @@ import { getHumanReadableDuration } from "../../../../../Utils/timeUtils";
 import { useTranslation } from "react-i18next";
 
 const PageSpeedStatusBoxes = ({ shouldRender, monitor }) => {
-	const { time: uptimeDuration, units: uptimeUnits } = getHumanReadableDuration(
-		monitor?.uptimeDuration
-	);
-
-	const { time: lastCheckTime, units: lastCheckUnits } = getHumanReadableDuration(
-		monitor?.lastChecked
-	);
+	const uptimeDuration = getHumanReadableDuration(monitor?.uptimeDuration);
+	const time = getHumanReadableDuration(monitor?.lastChecked);
 
 	const { t } = useTranslation();
 
@@ -22,7 +17,6 @@ const PageSpeedStatusBoxes = ({ shouldRender, monitor }) => {
 				subHeading={
 					<>
 						{uptimeDuration}
-						<Typography component="span">{uptimeUnits}</Typography>
 						<Typography component="span">{t("ago")}</Typography>
 					</>
 				}
@@ -31,8 +25,7 @@ const PageSpeedStatusBoxes = ({ shouldRender, monitor }) => {
 				heading="last check"
 				subHeading={
 					<>
-						{lastCheckTime}
-						<Typography component="span">{lastCheckUnits}</Typography>
+						{time}
 						<Typography component="span">{t("ago")}</Typography>
 					</>
 				}
diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
index 3778e4c6d..abeb251fe 100644
--- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
+++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
@@ -24,30 +24,22 @@ const UptimeStatusBoxes = ({
 	const timeOfLastCheck = monitorStats?.lastCheckTimestamp;
 	const timeSinceLastCheck = Date.now() - timeOfLastCheck;
 
-	const { time: streakTime, units: streakUnits } =
-		getHumanReadableDuration(timeSinceLastFailure);
+	const streakTime = getHumanReadableDuration(timeSinceLastFailure);
 
-	const { time: lastCheckTime, units: lastCheckUnits } =
-		getHumanReadableDuration(timeSinceLastCheck);
+	const lastCheckTime = getHumanReadableDuration(timeSinceLastCheck);
 	return (
 		<StatusBoxes shouldRender={!isLoading}>
 			<StatBox
 				gradient={true}
 				status={determineState(monitor)}
 				heading={"active for"}
-				subHeading={
-					<>
-						{streakTime}
-						<Typography component="span">{streakUnits}</Typography>
-					</>
-				}
+				subHeading={streakTime}
 			/>
 			<StatBox
 				heading="last check"
 				subHeading={
 					<>
 						{lastCheckTime}
-						<Typography component="span">{lastCheckUnits}</Typography>
 						<Typography component="span">{"ago"}</Typography>
 					</>
 				}
diff --git a/client/src/Utils/timeUtils.js b/client/src/Utils/timeUtils.js
index e03f0b5b7..568b77b14 100644
--- a/client/src/Utils/timeUtils.js
+++ b/client/src/Utils/timeUtils.js
@@ -104,10 +104,10 @@ export const getHumanReadableDuration = (ms) => {
 
 	if (result.length === 0) {
 		// fallback for durations < 1s
-		return { time: 0, units: "seconds" };
+		return "0s";
 	}
 
-	return { time: result.join(" "), units: null };
+	return result.join(" ");
 };
 
 export const formatDate = (date, customOptions) => {

From bcf883223b4bd9369b038ce060b34ee658a3e30e Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Tue, 17 Jun 2025 13:13:21 +0530
Subject: [PATCH 198/319] Exporting Hooks from One File

---
 .../{checkHooksMonitor.js => checkHooks.js}   | 53 +++++++++++++++++-
 client/src/Hooks/checkHooksTeam.js            | 56 -------------------
 .../Components/IncidentTable/index.jsx        | 12 ++--
 client/src/Pages/Uptime/Details/index.jsx     |  2 +-
 4 files changed, 59 insertions(+), 64 deletions(-)
 rename client/src/Hooks/{checkHooksMonitor.js => checkHooks.js} (52%)
 delete mode 100644 client/src/Hooks/checkHooksTeam.js

diff --git a/client/src/Hooks/checkHooksMonitor.js b/client/src/Hooks/checkHooks.js
similarity index 52%
rename from client/src/Hooks/checkHooksMonitor.js
rename to client/src/Hooks/checkHooks.js
index e46adfa98..ed4cffe3f 100644
--- a/client/src/Hooks/checkHooksMonitor.js
+++ b/client/src/Hooks/checkHooks.js
@@ -2,6 +2,57 @@ import { useState, useEffect } from "react";
 import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 
+const useFetchChecksTeam = ({
+	teamId,
+	status,
+	sortOrder,
+	limit,
+	dateRange,
+	filter,
+	page,
+	rowsPerPage,
+}) => {
+	const [checks, setChecks] = useState(undefined);
+	const [checksCount, setChecksCount] = useState(undefined);
+	const [isLoading, setIsLoading] = useState(false);
+	const [networkError, setNetworkError] = useState(false);
+
+	useEffect(() => {
+		const fetchChecks = async () => {
+			if (!teamId) {
+				return;
+			}
+
+			const config = {
+				status,
+				teamId,
+				sortOrder,
+				limit,
+				dateRange,
+				filter,
+				page,
+				rowsPerPage,
+			};
+
+			try {
+				setIsLoading(true);
+				const res = await networkService.getChecksByTeam(config);
+				setChecks(res.data.data.checks);
+				setChecksCount(res.data.data.checksCount);
+			} catch (error) {
+				setNetworkError(true);
+				createToast({ body: error.message });
+			} finally {
+				setIsLoading(false);
+			}
+		};
+
+		fetchChecks();
+	}, [teamId, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+
+	return [checks, checksCount, isLoading, networkError];
+};
+
 const useFetchChecksByMonitor = ({
 	monitorId,
 	type,
@@ -55,4 +106,4 @@ const useFetchChecksByMonitor = ({
 	return [checks, checksCount, isLoading, networkError];
 };
 
-export { useFetchChecksByMonitor };
+export { useFetchChecksByMonitor, useFetchChecksTeam };
diff --git a/client/src/Hooks/checkHooksTeam.js b/client/src/Hooks/checkHooksTeam.js
deleted file mode 100644
index 05f8b67e5..000000000
--- a/client/src/Hooks/checkHooksTeam.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useState, useEffect } from "react";
-import { networkService } from "../main";
-import { createToast } from "../Utils/toastUtils";
-
-const useFetchChecksTeam = ({
-	teamId,
-	status,
-	sortOrder,
-	limit,
-	dateRange,
-	filter,
-	page,
-	rowsPerPage,
-}) => {
-	const [checks, setChecks] = useState(undefined);
-	const [checksCount, setChecksCount] = useState(undefined);
-	const [isLoading, setIsLoading] = useState(false);
-	const [networkError, setNetworkError] = useState(false);
-
-	useEffect(() => {
-		const fetchChecks = async () => {
-			if (!teamId) {
-				return;
-			}
-
-			const config = {
-				status,
-				teamId,
-				sortOrder,
-				limit,
-				dateRange,
-				filter,
-				page,
-				rowsPerPage,
-			};
-
-			try {
-				setIsLoading(true);
-				const res = await networkService.getChecksByTeam(config);
-				setChecks(res.data.data.checks);
-				setChecksCount(res.data.data.checksCount);
-			} catch (error) {
-				setNetworkError(true);
-				createToast({ body: error.message });
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchChecks();
-	}, [teamId, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
-
-	return [checks, checksCount, isLoading, networkError];
-};
-
-export { useFetchChecksTeam };
diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index 97a006884..b36abad70 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -13,8 +13,8 @@ import { useSelector } from "react-redux";
 import { useState } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { useFetchChecksTeam } from "../../../../Hooks/checkHooksTeam";
-import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooksMonitor";
+import { useFetchChecksTeam } from "../../../../Hooks/checkHooks";
+import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooks";
 
 const IncidentTable = ({
 	shouldRender,
@@ -57,10 +57,10 @@ const IncidentTable = ({
 			rowsPerPage: rowsPerPage,
 		});
 
-	const checks = selectedMonitor === "0" ? checksTeam : checksMonitor;
-	const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor;
-	const isLoading = selectedMonitor === "0" ? isLoadingTeam : isLoadingMonitor;
-	const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor;
+	const checks = checksTeam || checksMonitor;
+	const checksCount = checksCountTeam || checksCountMonitor;
+	const isLoading = isLoadingTeam || isLoadingMonitor;
+	const networkError = networkErrorTeam || networkErrorMonitor;
 
 	const { t } = useTranslation();
 
diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 1d6b9c392..5f36ee7e5 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -18,7 +18,7 @@ import { useTheme } from "@emotion/react";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import { useFetchUptimeMonitorById } from "../../../Hooks/monitorHooks";
 import useCertificateFetch from "./Hooks/useCertificateFetch";
-import { useFetchChecksByMonitor } from "../../../Hooks/checkHooksMonitor";
+import { useFetchChecksByMonitor } from "../../../Hooks/checkHooks";
 import { useTranslation } from "react-i18next";
 
 // Constants

From 287ea3e5a6638bbd3b677abe77eb3989213b2962 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Tue, 17 Jun 2025 13:27:51 +0530
Subject: [PATCH 199/319] Updated params

---
 client/src/Hooks/checkHooks.js                | 23 ++++++++++++++-----
 .../Components/IncidentTable/index.jsx        | 11 +++++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooks.js
index ed4cffe3f..2f05d3538 100644
--- a/client/src/Hooks/checkHooks.js
+++ b/client/src/Hooks/checkHooks.js
@@ -3,7 +3,6 @@ import { networkService } from "../main";
 import { createToast } from "../Utils/toastUtils";
 
 const useFetchChecksTeam = ({
-	teamId,
 	status,
 	sortOrder,
 	limit,
@@ -11,6 +10,7 @@ const useFetchChecksTeam = ({
 	filter,
 	page,
 	rowsPerPage,
+	enabled = true,
 }) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
@@ -19,13 +19,12 @@ const useFetchChecksTeam = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!teamId) {
+			if (!enabled) {
 				return;
 			}
 
 			const config = {
 				status,
-				teamId,
 				sortOrder,
 				limit,
 				dateRange,
@@ -48,7 +47,7 @@ const useFetchChecksTeam = ({
 		};
 
 		fetchChecks();
-	}, [teamId, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+	}, [status, sortOrder, limit, dateRange, filter, page, rowsPerPage, enabled]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
@@ -63,6 +62,7 @@ const useFetchChecksByMonitor = ({
 	filter,
 	page,
 	rowsPerPage,
+	enabled = true,
 }) => {
 	const [checks, setChecks] = useState(undefined);
 	const [checksCount, setChecksCount] = useState(undefined);
@@ -71,7 +71,7 @@ const useFetchChecksByMonitor = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!type) {
+			if (!enabled) {
 				return;
 			}
 
@@ -101,7 +101,18 @@ const useFetchChecksByMonitor = ({
 		};
 
 		fetchChecks();
-	}, [monitorId, type, status, sortOrder, limit, dateRange, filter, page, rowsPerPage]);
+	}, [
+		monitorId,
+		type,
+		status,
+		sortOrder,
+		limit,
+		dateRange,
+		filter,
+		page,
+		rowsPerPage,
+		enabled,
+	]);
 
 	return [checks, checksCount, isLoading, networkError];
 };
diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index b36abad70..71abf842c 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -43,11 +43,11 @@ const IncidentTable = ({
 			filter: filter,
 			page: page,
 			rowsPerPage: rowsPerPage,
+			enabled: selectedMonitor !== "0",
 		});
 
 	const [checksTeam, checksCountTeam, isLoadingTeam, networkErrorTeam] =
 		useFetchChecksTeam({
-			teamId: "placeholder",
 			status: false,
 			sortOrder: "desc",
 			limit: null,
@@ -55,12 +55,13 @@ const IncidentTable = ({
 			filter: filter,
 			page: page,
 			rowsPerPage: rowsPerPage,
+			enabled: selectedMonitor === "0",
 		});
 
-	const checks = checksTeam || checksMonitor;
-	const checksCount = checksCountTeam || checksCountMonitor;
-	const isLoading = isLoadingTeam || isLoadingMonitor;
-	const networkError = networkErrorTeam || networkErrorMonitor;
+	const checks = selectedMonitor === "0" ? checksTeam : checksMonitor;
+	const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor;
+	const isLoading = selectedMonitor === "0" ? isLoadingTeam : isLoadingMonitor;
+	const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor;
 
 	const { t } = useTranslation();
 

From f474d63e882f3be93c93bbb9de95b7785b9a94b1 Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Tue, 17 Jun 2025 17:30:11 +0530
Subject: [PATCH 200/319] chore: extract monitor URL formatting to utils

---
 .../src/Components/MonitorDetailsControlHeader/status.jsx | 8 ++------
 client/src/Utils/utils.js                                 | 8 ++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 5371fe445..4c828a520 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -8,6 +8,7 @@ import { formatDurationRounded } from "../../Utils/timeUtils";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
+import { formatMonitorUrl } from "../../Utils/utils";
 /**
  * Status component displays the status information of a monitor.
  * It includes the monitor's name, URL, and check interval.
@@ -23,7 +24,6 @@ import { useMonitorUtils } from "../../Hooks/useMonitorUtils";
 const Status = ({ monitor }) => {
 	const theme = useTheme();
 	const { statusColor, determineState } = useMonitorUtils();
-	const URL_TRUNCATION_LENGTH = 55;
 
 	return (
 		<Stack>
@@ -38,11 +38,7 @@ const Status = ({ monitor }) => {
 					variant="monitorUrl"
 					noWrap
 				>
-					{monitor?.url
-						? monitor.url?.length > URL_TRUNCATION_LENGTH
-							? `${monitor.url.replace(/^https?:\/\//, "")?.slice(0, URL_TRUNCATION_LENGTH)}…`
-							: monitor.url.replace(/^https?:\/\//, "")
-						: "…"}
+					{formatMonitorUrl(monitor?.url)}
 				</Typography>
 				<Dot />
 				<Typography>
diff --git a/client/src/Utils/utils.js b/client/src/Utils/utils.js
index 8bd9c9019..639a43da0 100644
--- a/client/src/Utils/utils.js
+++ b/client/src/Utils/utils.js
@@ -5,3 +5,11 @@ export const safelyParseFloat = (value) => {
 	}
 	return parsedValue;
 };
+
+export const formatMonitorUrl = (url, maxLength = 50) => {
+	if (!url) return "";
+	const strippedUrl = url.replace(/^https?:\/\//, "");
+	return strippedUrl.length > maxLength
+		? `${strippedUrl.slice(0, maxLength)}…`
+		: strippedUrl;
+};

From e3b6ed27bafd0c4291227ff9df46d6b06f4c801a Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Tue, 17 Jun 2025 17:33:21 +0530
Subject: [PATCH 201/319] chore: remove nowrap as already exists in monitorUrl
 varient

---
 .../src/Components/MonitorDetailsControlHeader/status.jsx  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 4c828a520..65671a609 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -34,12 +34,7 @@ const Status = ({ monitor }) => {
 				gap={theme.spacing(4)}
 			>
 				<PulseDot color={statusColor[determineState(monitor)]} />
-				<Typography
-					variant="monitorUrl"
-					noWrap
-				>
-					{formatMonitorUrl(monitor?.url)}
-				</Typography>
+				<Typography variant="monitorUrl">{formatMonitorUrl(monitor?.url)}</Typography>
 				<Dot />
 				<Typography>
 					Checking every {formatDurationRounded(monitor?.interval)}.

From 75309fc53c1ff7e98cfba50169ad2e570f8691ee Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Tue, 17 Jun 2025 17:36:06 +0530
Subject: [PATCH 202/319] chore: add URL_TRUNCATE_LENGTH

---
 client/src/Components/MonitorDetailsControlHeader/status.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 65671a609..717cf31d9 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -24,6 +24,7 @@ import { formatMonitorUrl } from "../../Utils/utils";
 const Status = ({ monitor }) => {
 	const theme = useTheme();
 	const { statusColor, determineState } = useMonitorUtils();
+	const URL_TRUNCATION_LENGTH = 55;
 
 	return (
 		<Stack>
@@ -34,7 +35,9 @@ const Status = ({ monitor }) => {
 				gap={theme.spacing(4)}
 			>
 				<PulseDot color={statusColor[determineState(monitor)]} />
-				<Typography variant="monitorUrl">{formatMonitorUrl(monitor?.url)}</Typography>
+				<Typography variant="monitorUrl">
+					{formatMonitorUrl(monitor?.url, URL_TRUNCATION_LENGTH)}
+				</Typography>
 				<Dot />
 				<Typography>
 					Checking every {formatDurationRounded(monitor?.interval)}.

From 1e5c8612b8f63c0e842f2308a0a790a9a2e41037 Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Tue, 17 Jun 2025 14:59:38 -0400
Subject: [PATCH 203/319] Sponsor a feature link added

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a57f9b270..4c02d650a 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Checkmate also has an agent, called [Capture](https://github.com/bluewave-labs/c
 
 Checkmate has been stress-tested with 1000+ active monitors without any particular issues or performance bottlenecks.
 
-We **love** what we are building here, and we continuously learn a few things about Reactjs, Nodejs, MongoDB, and Docker while building Checkmate.
+If you would like to sponsor a feature, [see this link](https://checkmate.so/sponsored-features).
 
 ## 📚 Table of contents
 
@@ -148,11 +148,13 @@ Here's how you can contribute:
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
 </a>
 
+[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
+
 ## 💰 Our sponsors
 
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
-[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
+If you would like to sponsor a feature, [see this page](https://checkmate.so/sponsored-features).
 
 Also check other developer and contributor-friendly projects of BlueWave:
 

From e71e2ef42cebeee6c8b5962f4e1023b5d5355d94 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Wed, 18 Jun 2025 01:07:22 +0530
Subject: [PATCH 204/319] Addressed all the comments in pr.

---
 .../src/Components/MonitorActions/index.jsx   | 116 ++++++++++++++++++
 .../Components/MonitorCreateHeader/index.jsx  |  27 +---
 client/src/Hooks/monitorHooks.js              |   4 +-
 client/src/Utils/NetworkService.js            |   2 +-
 client/src/locales/en.json                    |   5 +
 server/controllers/monitorController.js       |  20 ++-
 server/middleware/responseHandler.js          |   7 +-
 7 files changed, 147 insertions(+), 34 deletions(-)
 create mode 100644 client/src/Components/MonitorActions/index.jsx

diff --git a/client/src/Components/MonitorActions/index.jsx b/client/src/Components/MonitorActions/index.jsx
new file mode 100644
index 000000000..7086cb307
--- /dev/null
+++ b/client/src/Components/MonitorActions/index.jsx
@@ -0,0 +1,116 @@
+import * as React from "react";
+import Button from "@mui/material/Button";
+import ButtonGroup from "@mui/material/ButtonGroup";
+import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
+import ClickAwayListener from "@mui/material/ClickAwayListener";
+import Grow from "@mui/material/Grow";
+import Paper from "@mui/material/Paper";
+import Popper from "@mui/material/Popper";
+import MenuItem from "@mui/material/MenuItem";
+import MenuList from "@mui/material/MenuList";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { createToast } from "../../Utils/toastUtils";
+import { useExportMonitors } from "../../Hooks/monitorHooks";
+
+const options = ["Import Monitors", "Export Monitors"];
+
+const MonitorActions = ({ isLoading }) => {
+	const [open, setOpen] = React.useState(false);
+	const anchorRef = React.useRef(null);
+	const [selectedIndex, setSelectedIndex] = React.useState(0);
+	const navigate = useNavigate();
+	const { t } = useTranslation();
+	const [exportMonitors, isExporting] = useExportMonitors();
+
+	const handleClick = async () => {
+		if (selectedIndex === 0) {
+			// Import
+			navigate("/uptime/bulk-import");
+		} else {
+			// Export
+			const [success, error] = await exportMonitors();
+			if (!success) {
+				createToast({ body: error || t("export.failed") });
+			}
+		}
+	};
+
+	const handleMenuItemClick = (event, index) => {
+		setSelectedIndex(index);
+		setOpen(false);
+	};
+
+	const handleToggle = () => {
+		setOpen((prevOpen) => !prevOpen);
+	};
+
+	const handleClose = (event) => {
+		if (anchorRef.current && anchorRef.current.contains(event.target)) {
+			return;
+		}
+		setOpen(false);
+	};
+
+	return (
+		<React.Fragment>
+			<ButtonGroup
+				variant="contained"
+				color="accent"
+				ref={anchorRef}
+				aria-label="Monitor actions"
+				disabled={isLoading || isExporting}
+			>
+				<Button onClick={handleClick}>{options[selectedIndex]}</Button>
+				<Button
+					size="small"
+					aria-controls={open ? "split-button-menu" : undefined}
+					aria-expanded={open ? "true" : undefined}
+					aria-label="select monitor action"
+					aria-haspopup="menu"
+					onClick={handleToggle}
+				>
+					<ArrowDropDownIcon />
+				</Button>
+			</ButtonGroup>
+			<Popper
+				sx={{ zIndex: 1 }}
+				open={open}
+				anchorEl={anchorRef.current}
+				role={undefined}
+				transition
+				disablePortal
+			>
+				{({ TransitionProps, placement }) => (
+					<Grow
+						{...TransitionProps}
+						style={{
+							transformOrigin: placement === "bottom" ? "center top" : "center bottom",
+						}}
+					>
+						<Paper>
+							<ClickAwayListener onClickAway={handleClose}>
+								<MenuList
+									id="split-button-menu"
+									autoFocusItem
+								>
+									{options.map((option, index) => (
+										<MenuItem
+											key={option}
+											selected={index === selectedIndex}
+											onClick={(event) => handleMenuItemClick(event, index)}
+										>
+											{option}
+										</MenuItem>
+									))}
+								</MenuList>
+							</ClickAwayListener>
+						</Paper>
+					</Grow>
+				)}
+			</Popper>
+		</React.Fragment>
+	);
+};
+
+export default MonitorActions;
diff --git a/client/src/Components/MonitorCreateHeader/index.jsx b/client/src/Components/MonitorCreateHeader/index.jsx
index a62123531..f2b6bbce4 100644
--- a/client/src/Components/MonitorCreateHeader/index.jsx
+++ b/client/src/Components/MonitorCreateHeader/index.jsx
@@ -3,13 +3,12 @@ import { useNavigate } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@emotion/react";
-import { useExportMonitors } from "../../Hooks/monitorHooks";
+import MonitorActions from "../MonitorActions";
 
 const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath }) => {
 	const navigate = useNavigate();
 	const { t } = useTranslation();
 	const theme = useTheme();
-	const [exportMonitors, isExporting] = useExportMonitors();
 
 	// Use the provided label or fall back to the translated default
 
@@ -30,29 +29,7 @@ const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath
 			>
 				{label || t("createNew")}
 			</Button>
-			{bulkPath && (
-				<>
-					<Button
-						loading={isLoading}
-						variant="contained"
-						color="accent"
-						onClick={() => {
-							navigate(`${bulkPath}`);
-						}}
-					>
-						{t("bulkImport.title")}
-					</Button>
-
-					<Button
-						loading={isExporting}
-						variant="contained"
-						color="accent"
-						onClick={exportMonitors}
-					>
-						{t("export.title")}
-					</Button>
-				</>
-			)}
+			{bulkPath && <MonitorActions isLoading={isLoading} />}
 		</Stack>
 	);
 };
diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index d7c8e4287..5f303d26a 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -460,10 +460,10 @@ const useExportMonitors = () => {
 	const exportMonitors = async () => {
 		setIsLoading(true);
 		try {
-			const blob = await networkService.exportMonitors();
+			const response = await networkService.exportMonitors();
 
 			// Create a download link
-			const url = window.URL.createObjectURL(blob);
+			const url = window.URL.createObjectURL(response);
 			const link = document.createElement("a");
 			link.href = url;
 			link.setAttribute("download", "monitors.csv");
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 6451f93e8..1a6b2a516 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1027,7 +1027,7 @@ class NetworkService {
 		const response = await this.axiosInstance.get("/monitors/export", {
 			responseType: "blob",
 		});
-		return response.data;
+		return response;
 	}
 }
 
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d13d44f7f..9fde3e9dd 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -744,5 +744,10 @@
 		"title": "Export Monitors",
 		"success": "Monitors exported successfully!",
 		"failed": "Failed to export monitors"
+	},
+	"monitorActions": {
+		"title": "Export/Import",
+		"import": "Import Monitors",
+		"export": "Export Monitors"
 	}
 }
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 5d71f9cb6..612fc328f 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -685,7 +685,7 @@ class MonitorController {
 				explain,
 			});
 			return res.success({
-				msg: "OK", // TODO
+				msg: "OK",
 				data: result,
 			});
 		} catch (error) {
@@ -708,6 +708,12 @@ class MonitorController {
 			const { teamId } = req.user;
 
 			const monitors = await this.db.getMonitorsByTeamId({ teamId });
+			if (!monitors || monitors.length === 0) {
+				return res.success({
+					msg: this.stringService.noMonitorsFound,
+					data: null,
+				});
+			}
 			const csvData = monitors?.filteredMonitors?.map((monitor) => ({
 				name: monitor.name,
 				description: monitor.description,
@@ -721,10 +727,14 @@ class MonitorController {
 
 			const csv = pkg.unparse(csvData);
 
-			res.setHeader("Content-Type", "text/csv");
-			res.setHeader("Content-Disposition", "attachment; filename=monitors.csv");
-
-			res.send(csv);
+			return res.success({
+				msg: this.stringService.monitorsExported,
+				data: csv,
+				headers: {
+					"Content-Type": "text/csv",
+					"Content-Disposition": "attachment; filename=monitors.csv",
+				},
+			});
 		} catch (error) {
 			next(handleError(error, SERVICE_NAME, "exportMonitorsToCSV"));
 		}
diff --git a/server/middleware/responseHandler.js b/server/middleware/responseHandler.js
index a58e2e845..e051e3fa5 100755
--- a/server/middleware/responseHandler.js
+++ b/server/middleware/responseHandler.js
@@ -16,7 +16,12 @@ const responseHandler = (req, res, next) => {
 	 * @param {*} [options.data=null] - Response data payload
 	 * @returns {Object} Express response object
 	 */
-	res.success = ({ status = 200, msg = "OK", data = null }) => {
+	res.success = ({ status = 200, msg = "OK", data = null, headers = {} }) => {
+		// Set custom headers if provided
+		Object.entries(headers).forEach(([key, value]) => {
+			res.set(key, value);
+		});
+
 		return res.status(status).json({
 			success: true,
 			msg: msg,

From df4f55b4100f7533404381dacbb31a23e8e5c79f Mon Sep 17 00:00:00 2001
From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com>
Date: Tue, 17 Jun 2025 19:38:08 -0400
Subject: [PATCH 205/319] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4c02d650a..c9c9073ad 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Checkmate also has an agent, called [Capture](https://github.com/bluewave-labs/c
 
 Checkmate has been stress-tested with 1000+ active monitors without any particular issues or performance bottlenecks.
 
-If you would like to sponsor a feature, [see this link](https://checkmate.so/sponsored-features).
+**If you would like to sponsor a feature, [see this link](https://checkmate.so/sponsored-features).**
 
 ## 📚 Table of contents
 
@@ -130,7 +130,7 @@ If you have any questions, suggestions or comments, please use our [Discord chan
 
 We are [Alex](http://github.com/ajhollid) (team lead), [Vishnu](http://github.com/vishnusn77), [Mohadeseh](http://github.com/mohicody), [Gorkem](http://github.com/gorkem-bwl/), [Owaise](http://github.com/Owaiseimdad), [Aryaman](https://github.com/Br0wnHammer) and [Mert](https://github.com/mertssmnoglu) helping individuals and businesses monitor their infra and servers.
 
-We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 5800+ stars and attracted 70+ contributors from around the globe.
+We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 6000+ stars and attracted 80+ contributors from around the globe.
 
 Our repo is starred by employees from **Google, Microsoft, Intel, Cisco, Tencent, Electronic Arts, ByteDance, JP Morgan Chase, Deloitte, Accenture, Foxconn, Broadcom, China Telecom, Barclays, Capgemini, Wipro, Cloudflare, Dassault Systèmes and NEC**, so don’t hold back — jump in, contribute and learn with us!
 

From b5752024e700db3dbc8b3090d08204233d82653b Mon Sep 17 00:00:00 2001
From: Mohammad Al-Ahdal <mo@mohammad.dev>
Date: Tue, 17 Jun 2025 18:29:09 -0600
Subject: [PATCH 206/319] fix: name validation now takes into account
 additional special chars

---
 client/src/Validation/validation.js | 4 ++--
 server/validation/joi.js            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index f1811a124..02d957063 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -7,7 +7,7 @@ const nameSchema = joi
 	.string()
 	.max(50)
 	.trim()
-	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
+	.pattern(/^[\p{L}\p{M}''()\-\. ]+$/u)
 	.messages({
 		"string.empty": "auth.common.inputs.firstName.errors.empty",
 		"string.max": "auth.common.inputs.firstName.errors.length",
@@ -18,7 +18,7 @@ const lastnameSchema = joi
 	.string()
 	.max(50)
 	.trim()
-	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
+	.pattern(/^[\p{L}\p{M}''()\-\. ]+$/u)
 	.messages({
 		"string.empty": "auth.common.inputs.lastName.errors.empty",
 		"string.max": "auth.common.inputs.lastName.errors.length",
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 725fcf218..904f06b97 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -29,12 +29,12 @@ const nameValidation = joi
 	.string()
 	.trim()
 	.max(50)
-	.pattern(/^(?=.*[\p{L}\p{Sc}])[\p{L}\p{Sc}\s']+$/u)
+	.pattern(/^(?=.*[\p{L}\p{Sc}])[\p{L}\p{Sc}\s'\-().]+$/u)
 	.messages({
 		"string.empty": "Name is required",
 		"string.max": "Name must be less than 50 characters",
 		"string.pattern.base":
-			"Name must contain at least 1 letter or currency symbol and only allow letters, spaces, apostrophes, and currency symbols",
+			"Names must contain at least 1 letter and may only include the following characters: a-z, A-Z, and any of the following symbols: -'.()",
 	});
 
 const registrationBodyValidation = joi.object({

From c9359cc4e1323e3263066f7129c1c1cb96ea904e Mon Sep 17 00:00:00 2001
From: Mohammad Al-Ahdal <mo@mohammad.dev>
Date: Tue, 17 Jun 2025 18:40:51 -0600
Subject: [PATCH 207/319] implement server-validation wording feedback

---
 server/validation/joi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/validation/joi.js b/server/validation/joi.js
index 904f06b97..e684cefa2 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -34,7 +34,7 @@ const nameValidation = joi
 		"string.empty": "Name is required",
 		"string.max": "Name must be less than 50 characters",
 		"string.pattern.base":
-			"Names must contain at least 1 letter and may only include the following characters: a-z, A-Z, and any of the following symbols: -'.()",
+			"Names must contain at least 1 letter and may only include letters, currency symbols, spaces, apostrophes, hyphens (-), periods (.), and parentheses ().",
 	});
 
 const registrationBodyValidation = joi.object({

From fc2676c33ed610037f357d15372df8b57b20486d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 09:43:41 +0800
Subject: [PATCH 208/319] deal with redux before validation

---
 client/src/Pages/Settings/index.jsx | 31 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 7368f0e32..76eaccd6c 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -91,30 +91,19 @@ const Settings = () => {
 			settings: { ...settingsData.settings, [name]: newValue ?? value },
 		};
 
-		// Validate
-		const { error } = settingsValidation.validate(newSettingsData.settings, {
-			abortEarly: false,
-		});
-		if (!error || error.details.length === 0) {
-			setErrors({});
-		} else {
-			const newErrors = {};
-			error.details.forEach((err) => {
-				newErrors[err.path[0]] = err.message;
-			});
-			setErrors(newErrors);
-		}
-
 		if (name === "timezone") {
 			dispatch(setTimezone({ timezone: value }));
+			return;
 		}
 
 		if (name === "mode") {
 			dispatch(setMode(value));
+			return;
 		}
 
 		if (name === "language") {
 			dispatch(setLanguage(value));
+			return;
 		}
 
 		if (name === "deleteStats") {
@@ -132,6 +121,20 @@ const Settings = () => {
 			return;
 		}
 
+		// Validate
+		const { error } = settingsValidation.validate(newSettingsData.settings, {
+			abortEarly: false,
+		});
+		if (!error || error.details.length === 0) {
+			setErrors({});
+		} else {
+			const newErrors = {};
+			error.details.forEach((err) => {
+				newErrors[err.path[0]] = err.message;
+			});
+			setErrors(newErrors);
+		}
+
 		setSettingsData(newSettingsData);
 	};
 

From 76a5a79482b433864f9bddc9b920fd8032122c8d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 10:05:04 +0800
Subject: [PATCH 209/319] fix ping monitoring

---
 server/service/networkService.js | 161 ++++++++++++++++---------------
 1 file changed, 84 insertions(+), 77 deletions(-)

diff --git a/server/service/networkService.js b/server/service/networkService.js
index e04d69c41..5ad28e594 100755
--- a/server/service/networkService.js
+++ b/server/service/networkService.js
@@ -60,30 +60,30 @@ class NetworkService {
 	}
 
 	/**
-	 * Sends a ping request to the specified URL and returns the response.
-	 *
-	 * @param {Object} job - The job object containing the data for the ping request.
-	 * @param {Object} job.data - The data object within the job.
-	 * @param {string} job.data.url - The URL to ping.
-	 * @param {string} job.data._id - The monitor ID for the ping request.
-	 * @returns {Promise<Object>} An object containing the ping response details.
-	 * @property {string} monitorId - The monitor ID for the ping request.
-	 * @property {string} type - The type of request, which is "ping".
-	 * @property {number} responseTime - The time taken for the ping request to complete, in milliseconds.
-	 * @property {Object} payload - The response payload from the ping request.
-	 * @property {boolean} status - The status of the ping request (true if successful, false otherwise).
-	 * @property {number} code - The response code (200 if successful, error code otherwise).
-	 * @property {string} message - The message indicating the result of the ping request.
+	 * Performs a ping check to a specified host to verify its availability.
+	 * @async
+	 * @param {Object} monitor - The monitor configuration object
+	 * @param {string} monitor.url - The host URL to ping
+	 * @param {string} monitor._id - The unique identifier of the monitor
+	 * @returns {Promise<Object>} A promise that resolves to a ping response object
+	 * @returns {string} pingResponse.monitorId - The ID of the monitor
+	 * @returns {string} pingResponse.type - The type of monitor (always "ping")
+	 * @returns {number} pingResponse.responseTime - The time taken for the ping
+	 * @returns {Object} pingResponse.payload - The raw ping response data
+	 * @returns {boolean} pingResponse.status - Whether the host is alive (true) or not (false)
+	 * @returns {number} pingResponse.code - Status code (200 for success, PING_ERROR for failure)
+	 * @returns {string} pingResponse.message - Success or failure message
+	 * @throws {Error} If there's an error during the ping operation
 	 */
-	async requestPing(job) {
+	async requestPing(monitor) {
 		try {
-			const url = job.data.url;
+			const url = monitor.url;
 			const { response, responseTime, error } = await this.timeRequest(() =>
 				this.ping.promise.probe(url)
 			);
 
 			const pingResponse = {
-				monitorId: job.data._id,
+				monitorId: monitor._id,
 				type: "ping",
 				responseTime,
 				payload: response,
@@ -107,21 +107,29 @@ class NetworkService {
 	}
 
 	/**
-	 * Sends an HTTP GET request to the specified URL and returns the response.
-	 *
-	 * @param {Object} job - The job object containing the data for the HTTP request.
-	 * @param {Object} job.data - The data object within the job.
-	 * @param {string} job.data.url - The URL to send the HTTP GET request to.
-	 * @param {string} job.data._id - The monitor ID for the HTTP request.
-	 * @param {string} [job.data.secret] - Secret for authorization if provided.
-	 * @returns {Promise<Object>} An object containing the HTTP response details.
-	 * @property {string} monitorId - The monitor ID for the HTTP request.
-	 * @property {string} type - The type of request, which is "http".
-	 * @property {number} responseTime - The time taken for the HTTP request to complete, in milliseconds.
-	 * @property {Object} payload - The response payload from the HTTP request.
-	 * @property {boolean} status - The status of the HTTP request (true if successful, false otherwise).
-	 * @property {number} code - The response code (200 if successful, error code otherwise).
-	 * @property {string} message - The message indicating the result of the HTTP request.
+	 * Performs an HTTP GET request to a specified URL with optional validation of response data.
+	 * @async
+	 * @param {Object} monitor - The monitor configuration object
+	 * @param {string} monitor.url - The URL to make the HTTP request to
+	 * @param {string} [monitor.secret] - Optional Bearer token for authentication
+	 * @param {string} monitor._id - The unique identifier of the monitor
+	 * @param {string} monitor.name - The name of the monitor
+	 * @param {string} monitor.teamId - The team ID associated with the monitor
+	 * @param {string} monitor.type - The type of monitor
+	 * @param {boolean} [monitor.ignoreTlsErrors] - Whether to ignore TLS certificate errors
+	 * @param {string} [monitor.jsonPath] - Optional JMESPath expression to extract data from JSON response
+	 * @param {string} [monitor.matchMethod] - Method to match response data ('include', 'regex', or exact match)
+	 * @param {string} [monitor.expectedValue] - Expected value to match against response data
+	 * @returns {Promise<Object>} A promise that resolves to an HTTP response object
+	 * @returns {string} httpResponse.monitorId - The ID of the monitor
+	 * @returns {string} httpResponse.teamId - The team ID
+	 * @returns {string} httpResponse.type - The type of monitor
+	 * @returns {number} httpResponse.responseTime - The time taken for the request
+	 * @returns {Object} httpResponse.payload - The response data
+	 * @returns {boolean} httpResponse.status - Whether the request was successful and matched expected value (if specified)
+	 * @returns {number} httpResponse.code - HTTP status code or NETWORK_ERROR
+	 * @returns {string} httpResponse.message - Success or failure message
+	 * @throws {Error} If there's an error during the HTTP request or data validation
 	 */
 	async requestHttp(monitor) {
 		try {
@@ -231,20 +239,19 @@ class NetworkService {
 	}
 
 	/**
-	 * Sends a request to the Google PageSpeed Insights API for the specified URL and returns the response.
-	 *
-	 * @param {Object} job - The job object containing the data for the PageSpeed request.
-	 * @param {Object} job.data - The data object within the job.
-	 * @param {string} job.data.url - The URL to analyze with PageSpeed Insights.
-	 * @param {string} job.data._id - The monitor ID for the PageSpeed request.
-	 * @returns {Promise<Object>} An object containing the PageSpeed response details.
-	 * @property {string} monitorId - The monitor ID for the PageSpeed request.
-	 * @property {string} type - The type of request, which is "pagespeed".
-	 * @property {number} responseTime - The time taken for the PageSpeed request to complete, in milliseconds.
-	 * @property {Object} payload - The response payload from the PageSpeed request.
-	 * @property {boolean} status - The status of the PageSpeed request (true if successful, false otherwise).
-	 * @property {number} code - The response code (200 if successful, error code otherwise).
-	 * @property {string} message - The message indicating the result of the PageSpeed request.
+	 * Checks the performance of a webpage using Google's PageSpeed Insights API.
+	 * @async
+	 * @param {Object} monitor - The monitor configuration object
+	 * @param {string} monitor.url - The URL of the webpage to analyze
+	 * @returns {Promise<Object|undefined>} A promise that resolves to a pagespeed response object or undefined if API key is missing
+	 * @returns {string} response.monitorId - The ID of the monitor
+	 * @returns {string} response.type - The type of monitor
+	 * @returns {number} response.responseTime - The time taken for the analysis
+	 * @returns {boolean} response.status - Whether the analysis was successful
+	 * @returns {number} response.code - HTTP status code from the PageSpeed API
+	 * @returns {string} response.message - Success or failure message
+	 * @returns {Object} response.payload - The PageSpeed analysis results
+	 * @throws {Error} If there's an error during the PageSpeed analysis
 	 */
 	async requestPagespeed(monitor) {
 		try {
@@ -273,23 +280,6 @@ class NetworkService {
 		}
 	}
 
-	/**
-	 * Sends an HTTP request to check hardware status and returns the response.
-	 *
-	 * @param {Object} job - The job object containing the data for the hardware request.
-	 * @param {Object} job.data - The data object within the job.
-	 * @param {string} job.data.url - The URL to send the hardware status request to.
-	 * @param {string} job.data._id - The monitor ID for the hardware request.
-	 * @param {string} job.data.type - The type of request, which is "hardware".
-	 * @returns {Promise<Object>} An object containing the hardware status response details.
-	 * @property {string} monitorId - The monitor ID for the hardware request.
-	 * @property {string} type - The type of request ("hardware").
-	 * @property {number} responseTime - The time taken for the request to complete, in milliseconds.
-	 * @property {Object} payload - The response payload from the hardware status request.
-	 * @property {boolean} status - The status of the request (true if successful, false otherwise).
-	 * @property {number} code - The response code (200 if successful, error code otherwise).
-	 * @property {string} message - The message indicating the result of the hardware status request.
-	 */
 	async requestHardware(monitor) {
 		try {
 			return await this.requestHttp(monitor);
@@ -301,20 +291,20 @@ class NetworkService {
 	}
 
 	/**
-	 * Sends a request to inspect a Docker container and returns its status.
-	 *
-	 * @param {Object} job - The job object containing the data for the Docker request.
-	 * @param {Object} job.data - The data object within the job.
-	 * @param {string} job.data.url - The container ID or name to inspect.
-	 * @param {string} job.data._id - The monitor ID for the Docker request.
-	 * @param {string} job.data.type - The type of request, which is "docker".
-	 * @returns {Promise<Object>} An object containing the Docker container status details.
-	 * @property {string} monitorId - The monitor ID for the Docker request.
-	 * @property {string} type - The type of request ("docker").
-	 * @property {number} responseTime - The time taken for the Docker inspection to complete, in milliseconds.
-	 * @property {boolean} status - The status of the container (true if running, false otherwise).
-	 * @property {number} code - The response code (200 if successful, error code otherwise).
-	 * @property {string} message - The message indicating the result of the Docker inspection.
+	 * Checks the status of a Docker container by its ID.
+	 * @async
+	 * @param {Object} monitor - The monitor configuration object
+	 * @param {string} monitor.url - The Docker container ID to check
+	 * @param {string} monitor._id - The unique identifier of the monitor
+	 * @param {string} monitor.type - The type of monitor
+	 * @returns {Promise<Object>} A promise that resolves to a docker response object
+	 * @returns {string} dockerResponse.monitorId - The ID of the monitor
+	 * @returns {string} dockerResponse.type - The type of monitor
+	 * @returns {number} dockerResponse.responseTime - The time taken for the container inspection
+	 * @returns {boolean} dockerResponse.status - Whether the container is running (true) or not (false)
+	 * @returns {number} dockerResponse.code - HTTP-like status code (200 for success, NETWORK_ERROR for failure)
+	 * @returns {string} dockerResponse.message - Success or failure message
+	 * @throws {Error} If the container is not found or if there's an error inspecting the container
 	 */
 	async requestDocker(monitor) {
 		try {
@@ -358,6 +348,23 @@ class NetworkService {
 		}
 	}
 
+	/**
+	 * Attempts to establish a TCP connection to a specified host and port.
+	 * @async
+	 * @param {Object} monitor - The monitor configuration object
+	 * @param {string} monitor.url - The host URL to connect to
+	 * @param {number} monitor.port - The port number to connect to
+	 * @param {string} monitor._id - The unique identifier of the monitor
+	 * @param {string} monitor.type - The type of monitor
+	 * @returns {Promise<Object>} A promise that resolves to a port response object
+	 * @returns {string} portResponse.monitorId - The ID of the monitor
+	 * @returns {string} portResponse.type - The type of monitor
+	 * @returns {number} portResponse.responseTime - The time taken for the connection attempt
+	 * @returns {boolean} portResponse.status - Whether the connection was successful
+	 * @returns {number} portResponse.code - HTTP-like status code (200 for success, NETWORK_ERROR for failure)
+	 * @returns {string} portResponse.message - Success or failure message
+	 * @throws {Error} If the connection times out or encounters an error
+	 */
 	async requestPort(monitor) {
 		try {
 			const { url, port } = monitor;

From c78f43e32e08a0c0c91b902fbd9e3dda2ebe0573 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 10:10:14 +0800
Subject: [PATCH 210/319] add name prop to radio component

---
 client/src/Components/Inputs/Radio/index.jsx | 34 ++++++++++++--------
 client/src/Pages/Uptime/Create/index.jsx     |  1 +
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/client/src/Components/Inputs/Radio/index.jsx b/client/src/Components/Inputs/Radio/index.jsx
index 8c1c06b38..646b38e93 100644
--- a/client/src/Components/Inputs/Radio/index.jsx
+++ b/client/src/Components/Inputs/Radio/index.jsx
@@ -16,26 +16,27 @@ import "./index.css";
  *   size="small"
  * />
  *
- * @param {Object} props - The component props.
- * @param {string} props.id - The id of the radio button.
- * @param {string} props.title - The title of the radio button.
- * @param {string} [props.desc] - The description of the radio button.
- * @param {string} [props.size="small"] - The size of the radio button.
+ * @param {Object} props - The component
+ * @param {string} id - The id of the radio button.
+ * @param {string} title - The title of the radio button.
+ * @param {string} [desc] - The description of the radio button.
+ * @param {string} [size="small"] - The size of the radio button.
  * @returns {JSX.Element} - The rendered Radio component.
  */
 
-const Radio = (props) => {
+const Radio = ({ name, checked, value, id, size, title, desc, onChange }) => {
 	const theme = useTheme();
 
 	return (
 		<FormControlLabel
 			className="custom-radio-button"
-			checked={props.checked}
-			value={props.value}
+			name={name}
+			checked={checked}
+			value={value}
 			control={
 				<MUIRadio
-					id={props.id}
-					size={props.size}
+					id={id}
+					size={size}
 					checkedIcon={<RadioChecked />}
 					sx={{
 						color: "transparent",
@@ -49,16 +50,16 @@ const Radio = (props) => {
 					}}
 				/>
 			}
-			onChange={props.onChange}
+			onChange={onChange}
 			label={
 				<>
-					<Typography component="p">{props.title}</Typography>
+					<Typography component="p">{title}</Typography>
 					<Typography
 						component="h6"
 						mt={theme.spacing(1)}
 						color={theme.palette.primary.contrastTextSecondary}
 					>
-						{props.desc}
+						{desc}
 					</Typography>
 				</>
 			}
@@ -81,9 +82,14 @@ const Radio = (props) => {
 };
 
 Radio.propTypes = {
-	title: PropTypes.string.isRequired,
+	title: PropTypes.string,
 	desc: PropTypes.string,
 	size: PropTypes.string,
+	name: PropTypes.string,
+	checked: PropTypes.bool,
+	value: PropTypes.string,
+	id: PropTypes.string,
+	onChange: PropTypes.func,
 };
 
 export default Radio;
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 6527334ab..3db73481a 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -147,6 +147,7 @@ const CreateMonitor = () => {
 
 	const onChange = (event) => {
 		const { name, value, checked } = event.target;
+
 		let newValue = value;
 		if (name === "ignoreTlsErrors") {
 			newValue = checked;

From 47131633d04d7ec708f78602f7991896f90621c5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 10:44:59 +0800
Subject: [PATCH 211/319] refactor build and send

---
 server/controllers/authController.js     | 52 ++++++++-------
 server/controllers/inviteController.js   | 35 +++++-----
 server/controllers/monitorController.js  |  8 +--
 server/controllers/settingsController.js | 35 +++++-----
 server/service/emailService.js           | 81 ++++++++++--------------
 server/service/notificationService.js    | 46 ++++++++++----
 6 files changed, 132 insertions(+), 125 deletions(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index b05a9635a..a1a35e616 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -96,21 +96,28 @@ class AuthController {
 
 			const token = this.issueToken(userForToken, appSettings);
 
-			this.emailService
-				.buildAndSendEmail(
-					"welcomeEmailTemplate",
-					{ name: newUser.firstName },
-					newUser.email,
-					"Welcome to Uptime Monitor"
-				)
-				.catch((error) => {
-					logger.error({
-						message: error.message,
-						service: SERVICE_NAME,
-						method: "registerUser",
-						stack: error.stack,
-					});
+			try {
+				const html = await this.emailService.buildEmail("welcomeEmailTemplate", {
+					name: newUser.firstName,
 				});
+				this.emailService
+					.sendEmail(newUser.email, "Welcome to Uptime Monitor", html)
+					.catch((error) => {
+						this.logger.warn({
+							message: error.message,
+							service: SERVICE_NAME,
+							method: "registerUser",
+							stack: error.stack,
+						});
+					});
+			} catch (error) {
+				logger.warn({
+					message: error.message,
+					service: SERVICE_NAME,
+					method: "registerUser",
+					stack: error.stack,
+				});
+			}
 
 			res.success({
 				msg: this.stringService.authCreateUser,
@@ -300,15 +307,16 @@ class AuthController {
 			const name = user.firstName;
 			const { clientHost } = this.settingsService.getSettings();
 			const url = `${clientHost}/set-new-password/${recoveryToken.token}`;
-			const msgId = await this.emailService.buildAndSendEmail(
-				"passwordResetTemplate",
-				{
-					name,
-					email,
-					url,
-				},
+
+			const html = await this.emailService.buildEmail("passwordResetTemplate", {
+				name,
 				email,
-				"Checkmate Password Reset"
+				url,
+			});
+			const msgId = await this.emailService.sendEmail(
+				email,
+				"Checkmate Password Reset",
+				html
 			);
 
 			return res.success({
diff --git a/server/controllers/inviteController.js b/server/controllers/inviteController.js
index bce40dfa1..3b2212769 100755
--- a/server/controllers/inviteController.js
+++ b/server/controllers/inviteController.js
@@ -71,24 +71,25 @@ class InviteController {
 
 			const inviteToken = await this.db.requestInviteToken({ ...req.body });
 			const { clientHost } = this.settingsService.getSettings();
-			this.emailService
-				.buildAndSendEmail(
-					"employeeActivationTemplate",
-					{
-						name: firstname,
-						link: `${clientHost}/register/${inviteToken.token}`,
-					},
-					req.body.email,
-					"Welcome to Uptime Monitor"
-				)
-				.catch((error) => {
-					logger.error({
-						message: error.message,
-						service: SERVICE_NAME,
-						method: "issueInvitation",
-						stack: error.stack,
-					});
+
+			try {
+				const html = await this.emailService.buildEmail("employeeActivationTemplate", {
+					name: firstname,
+					link: `${clientHost}/register/${inviteToken.token}`,
 				});
+				await this.emailService.sendEmail(
+					req.body.email,
+					"Welcome to Uptime Monitor",
+					html
+				);
+			} catch (error) {
+				logger.warn({
+					message: error.message,
+					service: SERVICE_NAME,
+					method: "sendInviteEmail",
+					stack: error.stack,
+				});
+			}
 
 			return res.success({
 				msg: this.stringService.inviteIssued,
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 6c6136fb5..e1d087c74 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -580,12 +580,8 @@ class MonitorController {
 			const subject = this.stringService.testEmailSubject;
 			const context = { testName: "Monitoring System" };
 
-			const messageId = await this.emailService.buildAndSendEmail(
-				"testEmailTemplate",
-				context,
-				to,
-				subject
-			);
+			const html = await this.emailService.buildEmail("testEmailTemplate", context);
+			const messageId = await this.emailService.sendEmail(to, subject, html);
 
 			if (!messageId) {
 				return res.error({
diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js
index b9faa1c32..cbdd73adf 100755
--- a/server/controllers/settingsController.js
+++ b/server/controllers/settingsController.js
@@ -90,26 +90,21 @@ class SettingsController {
 			const subject = this.stringService.testEmailSubject;
 			const context = { testName: "Monitoring System" };
 
-			const messageId = await this.emailService.buildAndSendEmail(
-				"testEmailTemplate",
-				context,
-				to,
-				subject,
-				{
-					systemEmailHost,
-					systemEmailPort,
-					systemEmailUser,
-					systemEmailAddress,
-					systemEmailPassword,
-					systemEmailConnectionHost,
-					systemEmailSecure,
-					systemEmailPool,
-					systemEmailIgnoreTLS,
-					systemEmailRequireTLS,
-					systemEmailRejectUnauthorized,
-					systemEmailTLSServername,
-				}
-			);
+			const html = await this.emailService.buildEmail("testEmailTemplate", context);
+			const messageId = await this.emailService.sendEmail(to, subject, html, {
+				systemEmailHost,
+				systemEmailPort,
+				systemEmailUser,
+				systemEmailAddress,
+				systemEmailPassword,
+				systemEmailConnectionHost,
+				systemEmailSecure,
+				systemEmailPool,
+				systemEmailIgnoreTLS,
+				systemEmailRequireTLS,
+				systemEmailRejectUnauthorized,
+				systemEmailTLSServername,
+			});
 
 			if (!messageId) {
 				return res.error({
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 09123ef93..89bd4d50f 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -80,24 +80,28 @@ class EmailService {
 		 */
 	};
 
-	/**
-	 * Asynchronously builds and sends an email using a specified template and context.
-	 *
-	 * @param {string} template - The name of the template to use for the email body.
-	 * @param {Object} context - The data context to render the template with.
-	 * @param {string} to - The recipient's email address.
-	 * @param {string} subject - The subject of the email.
-	 * @returns {Promise<string>} A promise that resolves to the messageId of the sent email.
-	 */
-	buildAndSendEmail = async (template, context, to, subject, transportConfig) => {
-		// TODO - Consider an update transporter method so this only needs to be recreated when smtp settings change
+	buildEmail = async (template, context) => {
+		try {
+			const mjml = this.templateLookup[template](context);
+			const html = await this.mjml2html(mjml);
+			return html.html;
+		} catch (error) {
+			this.logger.error({
+				message: error.message,
+				service: SERVICE_NAME,
+				method: "buildEmail",
+				stack: error.stack,
+			});
+		}
+	};
+
+	sendEmail = async (to, subject, html, transportConfig) => {
 		let config;
 		if (typeof transportConfig !== "undefined") {
 			config = transportConfig;
 		} else {
 			config = await this.settingsService.getDBSettings();
 		}
-
 		const {
 			systemEmailHost,
 			systemEmailPort,
@@ -131,45 +135,24 @@ class EmailService {
 				servername: systemEmailTLSServername,
 			},
 		};
-
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 
-		const buildHtml = async (template, context) => {
-			try {
-				const mjml = this.templateLookup[template](context);
-				const html = await this.mjml2html(mjml);
-				return html.html;
-			} catch (error) {
-				this.logger.error({
-					message: error.message,
-					service: SERVICE_NAME,
-					method: "buildAndSendEmail",
-					stack: error.stack,
-				});
-			}
-		};
-
-		const sendEmail = async (to, subject, html) => {
-			try {
-				const info = await this.transporter.sendMail({
-					to: to,
-					from: systemEmailAddress,
-					subject: subject,
-					html: html,
-				});
-				return info;
-			} catch (error) {
-				this.logger.error({
-					message: error.message,
-					service: SERVICE_NAME,
-					method: "sendEmail",
-					stack: error.stack,
-				});
-			}
-		};
-		const html = await buildHtml(template, context);
-		const info = await sendEmail(to, subject, html);
-		return info?.messageId;
+		try {
+			const info = await this.transporter.sendMail({
+				to: to,
+				from: systemEmailAddress,
+				subject: subject,
+				html: html,
+			});
+			return info?.messageId;
+		} catch (error) {
+			this.logger.error({
+				message: error.message,
+				service: SERVICE_NAME,
+				method: "sendEmail",
+				stack: error.stack,
+			});
+		}
 	};
 }
 
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 77bd31aee..dcd629d53 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -218,7 +218,16 @@ class NotificationService {
 		const template = "hardwareIncidentTemplate";
 		const context = { monitor: monitor.name, url: monitor.url, alerts };
 		const subject = `Monitor ${monitor.name} infrastructure alerts`;
-		this.emailService.buildAndSendEmail(template, context, address, subject);
+		const html = await this.emailService.buildEmail(template, context);
+		this.emailService.sendEmail(address, subject, html).catch((error) => {
+			this.logger.warn({
+				message: error.message,
+				service: this.SERVICE_NAME,
+				method: "sendHardwareEmail",
+				stack: error.stack,
+			});
+		});
+
 		return true;
 	}
 
@@ -231,17 +240,22 @@ class NotificationService {
 		const subject = this.stringService.testEmailSubject;
 		const context = { testName: "Monitoring System" };
 
-		const messageId = await this.emailService.buildAndSendEmail(
-			"testEmailTemplate",
-			context,
-			to,
-			subject
-		);
+		try {
+			const html = await this.emailService.buildEmail("testEmailTemplate", context);
+			const messageId = await this.emailService.sendEmail(to, subject, html);
 
-		if (messageId) {
-			return true;
+			if (messageId) {
+				return true;
+			}
+		} catch (error) {
+			this.logger.warn({
+				message: error.message,
+				service: this.SERVICE_NAME,
+				method: "sendTestEmail",
+				stack: error.stack,
+			});
+			return false;
 		}
-		return false;
 	};
 
 	/**
@@ -259,7 +273,17 @@ class NotificationService {
 		const template = prevStatus === false ? "serverIsUpTemplate" : "serverIsDownTemplate";
 		const context = { monitor: monitor.name, url: monitor.url };
 		const subject = `Monitor ${monitor.name} is ${status === true ? "up" : "down"}`;
-		this.emailService.buildAndSendEmail(template, context, address, subject);
+
+		const html = await this.emailService.buildEmail(template, context);
+		this.emailService.sendEmail(address, subject, html).catch((error) => {
+			this.logger.warn({
+				message: error.message,
+				service: this.SERVICE_NAME,
+				method: "sendEmail",
+				stack: error.stack,
+			});
+		});
+
 		return true;
 	}
 

From d558cdd49f881f0f8960c31151c5f2a0a325d562 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 10:52:11 +0800
Subject: [PATCH 212/319] fix react router import

---
 client/src/Components/Breadcrumbs/index.jsx                   | 2 +-
 client/src/Pages/Account/index.jsx                            | 2 +-
 client/src/Pages/Auth/CheckEmail.jsx                          | 2 +-
 client/src/Pages/Auth/NewPasswordConfirmed.jsx                | 2 +-
 client/src/Pages/NotFound/index.jsx                           | 3 +--
 client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx | 2 +-
 client/src/Pages/ServerUnreachable.jsx                        | 2 +-
 client/src/Pages/Uptime/BulkImport/index.jsx                  | 2 +-
 client/src/Utils/NetworkServiceProvider.jsx                   | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/src/Components/Breadcrumbs/index.jsx b/client/src/Components/Breadcrumbs/index.jsx
index 0ebd8dab1..bf04afa2e 100644
--- a/client/src/Components/Breadcrumbs/index.jsx
+++ b/client/src/Components/Breadcrumbs/index.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { Box, Breadcrumbs as MUIBreadcrumbs } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import ArrowRight from "../../assets/icons/right-arrow.svg?react";
 
 import "./index.css";
diff --git a/client/src/Pages/Account/index.jsx b/client/src/Pages/Account/index.jsx
index 9ba57eb06..d8672f51c 100644
--- a/client/src/Pages/Account/index.jsx
+++ b/client/src/Pages/Account/index.jsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import PropTypes from "prop-types";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { Box, Tab, useTheme } from "@mui/material";
 import CustomTabList from "../../Components/Tab";
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index d85fa0c2f..e1f5e43ed 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -2,7 +2,7 @@ import { Box, Button, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 import { useTheme } from "@emotion/react";
 import { useDispatch } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { createToast } from "../../Utils/toastUtils";
 import { forgotPassword } from "../../Features/Auth/authSlice";
 import { Trans, useTranslation } from "react-i18next";
diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index 945a0d52d..7ace77abc 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -1,6 +1,6 @@
 import { Box, Button, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useDispatch } from "react-redux";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import Background from "../../assets/Images/background-grid.svg?react";
diff --git a/client/src/Pages/NotFound/index.jsx b/client/src/Pages/NotFound/index.jsx
index f9dfe8ec1..fdae92cb5 100644
--- a/client/src/Pages/NotFound/index.jsx
+++ b/client/src/Pages/NotFound/index.jsx
@@ -1,8 +1,7 @@
-import React from "react";
 import PropTypes from "prop-types";
 import NotFoundSvg from "../../../src/assets/Images/sushi_404.svg";
 import { Button, Stack, Typography } from "@mui/material";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
 
diff --git a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
index 2220a4b16..94d6b137b 100644
--- a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import PageSpeedIcon from "../../../../../assets/icons/page-speed.svg?react";
 import { StatusLabel } from "../../../../../Components/Label";
 import { Box, Grid, Stack, Typography } from "@mui/material";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { useTheme } from "@emotion/react";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
 import { useSelector } from "react-redux";
diff --git a/client/src/Pages/ServerUnreachable.jsx b/client/src/Pages/ServerUnreachable.jsx
index 7ab96dd96..466633144 100644
--- a/client/src/Pages/ServerUnreachable.jsx
+++ b/client/src/Pages/ServerUnreachable.jsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Box, Typography, Button, Stack } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { networkService } from "../Utils/NetworkService";
 import Alert from "../Components/Alert";
 import { createToast } from "../Utils/toastUtils";
diff --git a/client/src/Pages/Uptime/BulkImport/index.jsx b/client/src/Pages/Uptime/BulkImport/index.jsx
index e7fa75665..9490b4eab 100644
--- a/client/src/Pages/Uptime/BulkImport/index.jsx
+++ b/client/src/Pages/Uptime/BulkImport/index.jsx
@@ -10,7 +10,7 @@ import Breadcrumbs from "../../../Components/Breadcrumbs";
 import ConfigBox from "../../../Components/ConfigBox";
 import UploadFile from "./Upload";
 import { useSelector } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { Trans, useTranslation } from "react-i18next";
 import { useCreateBulkMonitors } from "../../../Hooks/monitorHooks";
 
diff --git a/client/src/Utils/NetworkServiceProvider.jsx b/client/src/Utils/NetworkServiceProvider.jsx
index 684152e69..73c3a2f94 100644
--- a/client/src/Utils/NetworkServiceProvider.jsx
+++ b/client/src/Utils/NetworkServiceProvider.jsx
@@ -1,5 +1,5 @@
 import { useDispatch } from "react-redux";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { setNetworkService } from "./NetworkService";
 import NetworkService, { networkService } from "./NetworkService";
 import { store } from "../store";

From cb4fda937fc4ce0e4813fd7e5163ca2f31201200 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 13:20:08 +0800
Subject: [PATCH 213/319] add empty functions

---
 client/src/Components/Fallback/index.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/Components/Fallback/index.jsx b/client/src/Components/Fallback/index.jsx
index 47497ba02..b77432d58 100644
--- a/client/src/Components/Fallback/index.jsx
+++ b/client/src/Components/Fallback/index.jsx
@@ -39,7 +39,11 @@ const Fallback = ({
 	const { t } = useTranslation();
 	const [settingsData, setSettingsData] = useState(undefined);
 
-	const [isLoading, error] = useFetchSettings({ setSettingsData });
+	const [isLoading, error] = useFetchSettings({
+		setSettingsData,
+		setIsApiKeySet: () => {},
+		setIsEmailPasswordSet: () => {},
+	});
 	// Custom warning message with clickable link
 	const renderWarningMessage = () => {
 		return (

From 6b3773ed76f304e4412ce779a0dfae153dab9d04 Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshusaini2711@gmail.com>
Date: Wed, 18 Jun 2025 11:09:23 +0530
Subject: [PATCH 214/319] chore: remove URL_TRUNCATE_LENGTH from component

---
 client/src/Components/MonitorDetailsControlHeader/status.jsx | 5 +----
 client/src/Utils/utils.js                                    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/client/src/Components/MonitorDetailsControlHeader/status.jsx b/client/src/Components/MonitorDetailsControlHeader/status.jsx
index 717cf31d9..65671a609 100644
--- a/client/src/Components/MonitorDetailsControlHeader/status.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/status.jsx
@@ -24,7 +24,6 @@ import { formatMonitorUrl } from "../../Utils/utils";
 const Status = ({ monitor }) => {
 	const theme = useTheme();
 	const { statusColor, determineState } = useMonitorUtils();
-	const URL_TRUNCATION_LENGTH = 55;
 
 	return (
 		<Stack>
@@ -35,9 +34,7 @@ const Status = ({ monitor }) => {
 				gap={theme.spacing(4)}
 			>
 				<PulseDot color={statusColor[determineState(monitor)]} />
-				<Typography variant="monitorUrl">
-					{formatMonitorUrl(monitor?.url, URL_TRUNCATION_LENGTH)}
-				</Typography>
+				<Typography variant="monitorUrl">{formatMonitorUrl(monitor?.url)}</Typography>
 				<Dot />
 				<Typography>
 					Checking every {formatDurationRounded(monitor?.interval)}.
diff --git a/client/src/Utils/utils.js b/client/src/Utils/utils.js
index 639a43da0..81ec44b06 100644
--- a/client/src/Utils/utils.js
+++ b/client/src/Utils/utils.js
@@ -6,7 +6,7 @@ export const safelyParseFloat = (value) => {
 	return parsedValue;
 };
 
-export const formatMonitorUrl = (url, maxLength = 50) => {
+export const formatMonitorUrl = (url, maxLength = 55) => {
 	if (!url) return "";
 	const strippedUrl = url.replace(/^https?:\/\//, "");
 	return strippedUrl.length > maxLength

From acd5dc982eecb144aa4bf361ddaf4762e3ba40c8 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 18 Jun 2025 11:13:42 +0530
Subject: [PATCH 215/319] Fix: Type Check in useFetchChecksMonitor

---
 client/src/Hooks/checkHooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Hooks/checkHooks.js b/client/src/Hooks/checkHooks.js
index 2f05d3538..683b89b20 100644
--- a/client/src/Hooks/checkHooks.js
+++ b/client/src/Hooks/checkHooks.js
@@ -71,7 +71,7 @@ const useFetchChecksByMonitor = ({
 
 	useEffect(() => {
 		const fetchChecks = async () => {
-			if (!enabled) {
+			if (!enabled || !type) {
 				return;
 			}
 

From a091bf23b701b3b201571e25541dc1206363f9ee Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 18 Jun 2025 11:32:33 +0530
Subject: [PATCH 216/319] isLoading Check

---
 client/src/Pages/Incidents/Components/IncidentTable/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
index 71abf842c..3b2e07238 100644
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -60,7 +60,7 @@ const IncidentTable = ({
 
 	const checks = selectedMonitor === "0" ? checksTeam : checksMonitor;
 	const checksCount = selectedMonitor === "0" ? checksCountTeam : checksCountMonitor;
-	const isLoading = selectedMonitor === "0" ? isLoadingTeam : isLoadingMonitor;
+	const isLoading = isLoadingTeam || isLoadingMonitor;
 	const networkError = selectedMonitor === "0" ? networkErrorTeam : networkErrorMonitor;
 
 	const { t } = useTranslation();

From a86bc59e09b0beaae2308000f68ed1194823aafd Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 14:42:00 +0800
Subject: [PATCH 217/319] remove unsued params from hook

---
 client/src/Hooks/useNotifications.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 303453655..69e03fd5e 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -98,12 +98,9 @@ const useGetNotificationById = (id, setNotification) => {
 			const notification = response?.data?.data ?? null;
 
 			const notificationData = {
-				userId: notification?.userId,
-				teamId: notification?.teamId,
 				address: notification?.address,
 				notificationName: notification?.notificationName,
 				type: NOTIFICATION_TYPES.find((type) => type.value === notification?.type)?._id,
-				config: notification?.config,
 			};
 
 			setNotification(notificationData);

From 440ce8a12bdca1c6e0df1c6613fd5087a6b71468 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 14:42:26 +0800
Subject: [PATCH 218/319] simplify creatign notifications

---
 .../src/Pages/Notifications/create/index.jsx  | 311 ++----------------
 client/src/Pages/Notifications/index.jsx      |  18 +-
 client/src/Pages/Notifications/utils.js       |  32 ++
 client/src/locales/en.json                    |   4 +-
 4 files changed, 67 insertions(+), 298 deletions(-)

diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index 2fd83e4e1..fba30185f 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -17,15 +17,17 @@ import {
 	useEditNotification,
 	useTestNotification,
 } from "../../../Hooks/useNotifications";
-import {
-	notificationEmailValidation,
-	notificationWebhookValidation,
-	notificationPagerDutyValidation,
-} from "../../../Validation/validation";
+import { notificationValidation } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
-import { NOTIFICATION_TYPES } from "../utils";
+import {
+	NOTIFICATION_TYPES,
+	TITLE_MAP,
+	DESCRIPTION_MAP,
+	LABEL_MAP,
+	PLACEHOLDER_MAP,
+} from "../utils";
 
 // Setup
 
@@ -49,11 +51,6 @@ const CreateNotifications = () => {
 		notificationName: "",
 		address: "",
 		type: NOTIFICATION_TYPES[0]._id,
-		config: {
-			webhookUrl: "",
-			platform: "",
-			routingKey: "",
-		},
 	});
 	const [errors, setErrors] = useState({});
 	const { t } = useTranslation();
@@ -71,42 +68,17 @@ const CreateNotifications = () => {
 			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
 		};
 
-		if (form.type === "slack" || form.type === "discord") {
-			form.type = "webhook";
-		}
-
 		let error = null;
 
-		if (form.type === "email") {
-			error = notificationEmailValidation.validate(
-				{ notificationName: form.notificationName, address: form.address },
-				{ abortEarly: false }
-			).error;
-		} else if (form.type === "webhook") {
-			form.config = {
-				platform: form.config.platform,
-				webhookUrl: form.config.webhookUrl,
-			};
-			error = notificationWebhookValidation.validate(
-				{ notificationName: form.notificationName, config: form.config },
-				{ abortEarly: false }
-			).error;
-		} else if (form.type === "pager_duty") {
-			form.config = {
-				platform: form.config.platform,
-				routingKey: form.config.routingKey,
-			};
-			error = notificationPagerDutyValidation.validate(
-				{ notificationName: form.notificationName, config: form.config },
-				{ abortEarly: false }
-			).error;
-		}
+		error = notificationValidation.validate(form, { abortEarly: false }).error;
 
 		if (error) {
 			const newErrors = {};
 			error.details.forEach((err) => {
 				newErrors[err.path[0]] = err.message;
 			});
+			console.log(JSON.stringify(newErrors));
+			console.log(JSON.stringify(form, null, 2));
 			createToast({ body: "Please check the form for errors." });
 			setErrors(newErrors);
 			return;
@@ -124,63 +96,10 @@ const CreateNotifications = () => {
 
 		const newNotification = { ...notification, [name]: value };
 
-		// Handle config/platform initialization if type is webhook
-
-		const type = NOTIFICATION_TYPES.find(
-			(type) => type._id === newNotification.type
-		).value;
-
-		if (type === "email") {
-			newNotification.config = null;
-		} else if (type === "slack" || type === "webhook" || type === "discord") {
-			newNotification.address = "";
-			newNotification.config = newNotification.config || {};
-			if (name === "config") {
-				newNotification.config = value;
-			}
-			if (type === "webhook") {
-				newNotification.config.platform = "webhook";
-			}
-			if (type === "slack") {
-				newNotification.config.platform = "slack";
-			}
-			if (type === "discord") {
-				newNotification.config.platform = "discord";
-			}
-		} else if (type === "pager_duty") {
-			newNotification.config = newNotification.config || {};
-			if (name === "config") {
-				newNotification.config = value;
-			}
-			newNotification.config.platform = "pager_duty";
-		}
-
-		// Field-level validation
-		let fieldError;
-
-		if (name === "notificationName") {
-			const { error } = notificationEmailValidation.extract(name).validate(value);
-			fieldError = error?.message;
-		}
-
-		if (type === "email" && name === "address") {
-			const { error } = notificationEmailValidation.extract(name).validate(value);
-			fieldError = error?.message;
-		}
-
-		if (
-			(type === "slack" || type === "webhook" || type === "discord") &&
-			name === "config"
-		) {
-			// Validate only webhookUrl inside config
-			const { error } = notificationWebhookValidation.extract("config").validate(value);
-			fieldError = error?.message;
-		}
-
-		// Set field-level error
+		const { error } = notificationValidation.extract(name).validate(value);
 		setErrors((prev) => ({
 			...prev,
-			[name]: fieldError,
+			[name]: error?.message,
 		}));
 
 		setNotification(newNotification);
@@ -192,36 +111,9 @@ const CreateNotifications = () => {
 			type: NOTIFICATION_TYPES.find((type) => type._id === notification.type).value,
 		};
 
-		if (form.type === "slack" || form.type === "discord") {
-			form.type = "webhook";
-		}
-
 		let error = null;
 
-		if (form.type === "email") {
-			error = notificationEmailValidation.validate(
-				{ notificationName: form.notificationName, address: form.address },
-				{ abortEarly: false }
-			).error;
-		} else if (form.type === "webhook") {
-			form.config = {
-				platform: form.config.platform,
-				webhookUrl: form.config.webhookUrl,
-			};
-			error = notificationWebhookValidation.validate(
-				{ notificationName: form.notificationName, config: form.config },
-				{ abortEarly: false }
-			).error;
-		} else if (form.type === "pager_duty") {
-			form.config = {
-				platform: form.config.platform,
-				routingKey: form.config.routingKey,
-			};
-			error = notificationPagerDutyValidation.validate(
-				{ notificationName: form.notificationName, config: form.config },
-				{ abortEarly: false }
-			).error;
-		}
+		error = notificationValidation.validate(form, { abortEarly: false }).error;
 
 		if (error) {
 			const newErrors = {};
@@ -236,6 +128,7 @@ const CreateNotifications = () => {
 		testNotification(form);
 	};
 
+	const type = NOTIFICATION_TYPES.find((type) => type._id === notification.type).value;
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />
@@ -287,164 +180,24 @@ const CreateNotifications = () => {
 						/>
 					</Stack>
 				</ConfigBox>
-				{notification.type === 1 && (
-					<ConfigBox>
-						<Box>
-							<Typography component="h2">
-								{t("createNotifications.emailSettings.title")}
-							</Typography>
-							<Typography component="p">
-								{t("createNotifications.emailSettings.description")}
-							</Typography>
-						</Box>
-						<Stack gap={theme.spacing(12)}>
-							<TextInput
-								label={t("createNotifications.emailSettings.emailLabel")}
-								name="address"
-								placeholder={t("createNotifications.emailSettings.emailPlaceholder")}
-								value={notification.address}
-								onChange={onChange}
-								error={Boolean(errors.address)}
-								helperText={errors["address"]}
-							/>
-						</Stack>
-					</ConfigBox>
-				)}
-				{notification.type === 2 && (
-					<ConfigBox>
-						<Box>
-							<Typography component="h2">
-								{t("createNotifications.slackSettings.title")}
-							</Typography>
-							<Typography component="p">
-								{t("createNotifications.slackSettings.description")}
-							</Typography>
-						</Box>
-						<Stack gap={theme.spacing(12)}>
-							<TextInput
-								label={t("createNotifications.slackSettings.webhookLabel")}
-								value={notification.config.webhookUrl || ""}
-								error={Boolean(errors.config)}
-								helperText={errors["config"]}
-								onChange={(e) => {
-									const updatedConfig = {
-										...notification.config,
-										webhookUrl: e.target.value,
-									};
+				<ConfigBox>
+					<Box>
+						<Typography component="h2">{t(TITLE_MAP[type])}</Typography>
+						<Typography component="p">{t(DESCRIPTION_MAP[type])}</Typography>
+					</Box>
+					<Stack gap={theme.spacing(12)}>
+						<TextInput
+							label={t(LABEL_MAP[type])}
+							name="address"
+							placeholder={t(PLACEHOLDER_MAP[type])}
+							value={notification.address}
+							onChange={onChange}
+							error={Boolean(errors.address)}
+							helperText={errors["address"]}
+						/>
+					</Stack>
+				</ConfigBox>
 
-									onChange({
-										target: {
-											name: "config",
-											value: updatedConfig,
-										},
-									});
-								}}
-							/>
-						</Stack>
-					</ConfigBox>
-				)}
-				{notification.type === 3 && (
-					<ConfigBox>
-						<Box>
-							<Typography component="h2">
-								{t("createNotifications.pagerdutySettings.title")}
-							</Typography>
-							<Typography component="p">
-								{t("createNotifications.pagerdutySettings.description")}
-							</Typography>
-						</Box>
-						<Stack gap={theme.spacing(12)}>
-							<TextInput
-								label={t("createNotifications.pagerdutySettings.integrationKeyLabel")}
-								placeholder={t(
-									"createNotifications.pagerdutySettings.integrationKeyPlaceholder"
-								)}
-								value={notification.config.routingKey || ""}
-								error={Boolean(errors.config)}
-								helperText={errors["config"]}
-								onChange={(e) => {
-									const updatedConfig = {
-										...notification.config,
-										routingKey: e.target.value,
-									};
-
-									onChange({
-										target: {
-											name: "config",
-											value: updatedConfig,
-										},
-									});
-								}}
-							/>
-						</Stack>
-					</ConfigBox>
-				)}
-				{notification.type === 4 && (
-					<ConfigBox>
-						<Box>
-							<Typography component="h2">
-								{t("createNotifications.genericWebhookSettings.title")}
-							</Typography>
-							<Typography component="p">
-								{t("createNotifications.genericWebhookSettings.description")}
-							</Typography>
-						</Box>
-						<Stack gap={theme.spacing(12)}>
-							<TextInput
-								label={t("createNotifications.genericWebhookSettings.webhookLabel")}
-								value={notification.config.webhookUrl || ""}
-								error={Boolean(errors.config)}
-								helperText={errors["config"]}
-								onChange={(e) => {
-									const updatedConfig = {
-										...notification.config,
-										webhookUrl: e.target.value,
-									};
-
-									onChange({
-										target: {
-											name: "config",
-											value: updatedConfig,
-										},
-									});
-								}}
-							/>
-						</Stack>
-					</ConfigBox>
-				)}
-				{notification.type === 5 && (
-					<ConfigBox>
-						<Box>
-							<Typography component="h2">
-								{t("createNotifications.discordSettings.title")}
-							</Typography>
-							<Typography component="p">
-								{t("createNotifications.discordSettings.description")}
-							</Typography>
-						</Box>
-						<Stack gap={theme.spacing(12)}>
-							<TextInput
-								label={t("createNotifications.discordSettings.webhookLabel")}
-								value={notification.config.webhookUrl || ""}
-								error={Boolean(errors.config)}
-								helperText={errors["config"]}
-								onChange={(e) => {
-									const updatedConfig = {
-										...notification.config,
-										webhookUrl: e.target.value,
-									};
-
-									onChange({
-										target: {
-											name: "config",
-											value: updatedConfig,
-										},
-									});
-								}}
-							/>
-						</Stack>
-					</ConfigBox>
-				)}
 				<Stack
 					direction="row"
 					justifyContent="flex-end"
diff --git a/client/src/Pages/Notifications/index.jsx b/client/src/Pages/Notifications/index.jsx
index ce5cbb547..f744d31e8 100644
--- a/client/src/Pages/Notifications/index.jsx
+++ b/client/src/Pages/Notifications/index.jsx
@@ -44,27 +44,11 @@ const Notifications = () => {
 				return row.notificationName;
 			},
 		},
-		{
-			id: "type",
-			content: "Type",
-			render: (row) => {
-				return row.type;
-			},
-		},
 		{
 			id: "target",
 			content: "Target",
 			render: (row) => {
-				const type = row.type;
-				if (type === "email") {
-					return row.address;
-				}
-				if (type === "webhook") {
-					return row.config?.webhookUrl;
-				}
-				if (type === "pager_duty") {
-					return row.config?.routingKey;
-				}
+				return row.address;
 			},
 		},
 		{
diff --git a/client/src/Pages/Notifications/utils.js b/client/src/Pages/Notifications/utils.js
index 545791246..7ef6e5a60 100644
--- a/client/src/Pages/Notifications/utils.js
+++ b/client/src/Pages/Notifications/utils.js
@@ -5,3 +5,35 @@ export const NOTIFICATION_TYPES = [
 	{ _id: 4, name: "Webhook", value: "webhook" },
 	{ _id: 5, name: "Discord", value: "discord" },
 ];
+
+export const TITLE_MAP = {
+	email: "createNotifications.emailSettings.title",
+	slack: "createNotifications.slackSettings.title",
+	pager_duty: "createNotifications.pagerDutySettings.title",
+	webhook: "createNotifications.webhookSettings.title",
+	discord: "createNotifications.discordSettings.title",
+};
+
+export const DESCRIPTION_MAP = {
+	email: "createNotifications.emailSettings.description",
+	slack: "createNotifications.slackSettings.description",
+	pager_duty: "createNotifications.pagerDutySettings.description",
+	webhook: "createNotifications.webhookSettings.description",
+	discord: "createNotifications.discordSettings.description",
+};
+
+export const LABEL_MAP = {
+	email: "createNotifications.emailSettings.emailLabel",
+	slack: "createNotifications.slackSettings.webhookLabel",
+	pager_duty: "createNotifications.pagerDutySettings.integrationKeyLabel",
+	webhook: "createNotifications.webhookSettings.webhookLabel",
+	discord: "createNotifications.discordSettings.webhookLabel",
+};
+
+export const PLACEHOLDER_MAP = {
+	email: "createNotifications.emailSettings.emailPlaceholder",
+	slack: "createNotifications.slackSettings.webhookPlaceholder",
+	pager_duty: "createNotifications.pagerDutySettings.integrationKeyPlaceholder",
+	webhook: "createNotifications.webhookSettings.webhookPlaceholder",
+	discord: "createNotifications.discordSettings.webhookPlaceholder",
+};
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 7d2cdbfa7..5649f3de7 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -707,13 +707,13 @@
 			"webhookLabel": "Slack webhook URL",
 			"webhookPlaceholder": "https://hooks.slack.com/services/..."
 		},
-		"pagerdutySettings": {
+		"pagerDutySettings": {
 			"title": "PagerDuty",
 			"description": "Configure your PagerDuty integration here",
 			"integrationKeyLabel": "Integration key",
 			"integrationKeyPlaceholder": "1234567890"
 		},
-		"genericWebhookSettings": {
+		"webhookSettings": {
 			"title": "Webhook",
 			"description": "Configure your webhook here",
 			"webhookLabel": "Webhook URL",

From bb921690bf87a8591b75316ac6df6c6339e5605c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 14:42:39 +0800
Subject: [PATCH 219/319] Update validation

---
 client/src/Validation/validation.js | 58 +++++------------------------
 1 file changed, 9 insertions(+), 49 deletions(-)

diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 02d957063..4e6a806c8 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -404,57 +404,19 @@ const infrastructureMonitorValidation = joi.object({
 	notifications: joi.array().items(joi.string()),
 });
 
-const notificationEmailValidation = joi.object({
+const notificationValidation = joi.object({
 	notificationName: joi.string().required().messages({
 		"string.empty": "Notification name is required",
 		"any.required": "Notification name is required",
 	}),
-	address: joi
-		.string()
-		.email({ tlds: { allow: false } })
-		.required()
-		.messages({
-			"string.empty": "E-mail address cannot be empty",
-
-			"string.email": "Please enter a valid e-mail address",
-			"string.base": "E-mail address must be a string",
-			"any.required": "E-mail address is required",
-		}),
-});
-const notificationWebhookValidation = joi.object({
-	notificationName: joi.string().required().messages({
-		"string.empty": "Notification name is required",
-		"any.required": "Notification name is required",
+	address: joi.string().required().messages({
+		"string.empty": "This field cannot be empty",
+		"string.base": "This field must be a string",
+		"any.required": "This field is required",
 	}),
-	config: joi
-		.object({
-			webhookUrl: joi.string().uri().required().messages({
-				"string.empty": "Webhook URL is required",
-				"string.uri": "Webhook URL must be a valid URI",
-				"any.required": "Webhook URL is required",
-			}),
-			platform: joi.string().required().messages({
-				"string.base": "Platform must be a string",
-				"any.required": "Platform is required",
-			}),
-		})
-		.unknown(true),
-});
-
-const notificationPagerDutyValidation = joi.object({
-	notificationName: joi.string().required().messages({
-		"string.empty": "Notification name is required",
-		"any.required": "Notification name is required",
-	}),
-	config: joi.object({
-		platform: joi.string().required().messages({
-			"string.base": "Platform must be a string",
-			"any.required": "Platform is required",
-		}),
-		routingKey: joi.string().required().messages({
-			"string.empty": "Routing key is required",
-			"any.required": "Routing key is required",
-		}),
+	type: joi.string().required().messages({
+		"string.empty": "This field is required",
+		"any.required": "This field is required",
 	}),
 });
 
@@ -469,7 +431,5 @@ export {
 	infrastructureMonitorValidation,
 	statusPageValidation,
 	logoImageValidation,
-	notificationEmailValidation,
-	notificationWebhookValidation,
-	notificationPagerDutyValidation,
+	notificationValidation,
 };

From 7bca60269cc79eb8f56b6139e4877716cdd928e0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 18 Jun 2025 14:42:59 +0800
Subject: [PATCH 220/319] update schema and validation

---
 server/db/models/Notification.js | 23 +----------------------
 server/validation/joi.js         | 25 ++++++++-----------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index 751324131..fe314fc74 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -1,19 +1,5 @@
 import mongoose from "mongoose";
 
-const configSchema = mongoose.Schema(
-	{
-		webhookUrl: { type: String },
-		botToken: { type: String },
-		chatId: { type: String },
-		platform: {
-			type: String,
-			enum: ["slack", "pager_duty", "webhook", "discord"],
-		},
-		routingKey: { type: String },
-	},
-	{ _id: false }
-);
-
 const NotificationSchema = mongoose.Schema(
 	{
 		userId: {
@@ -30,14 +16,7 @@ const NotificationSchema = mongoose.Schema(
 		},
 		type: {
 			type: String,
-			enum: ["email", "sms", "webhook", "pager_duty"],
-		},
-		platform: {
-			type: String,
-		},
-		config: {
-			type: configSchema,
-			default: () => ({}),
+			enum: ["email", "slack", "discord", "webhook", "pager_duty"],
 		},
 		notificationName: {
 			type: String,
diff --git a/server/validation/joi.js b/server/validation/joi.js
index e684cefa2..448a844f1 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -570,24 +570,15 @@ const createNotificationBodyValidation = joi.object({
 			"string.email": "Please enter a valid e-mail address",
 		}),
 	}),
-	type: joi.string().valid("email", "webhook", "pager_duty").required().messages({
-		"string.empty": "Notification type is required",
-		"any.required": "Notification type is required",
-		"any.only": "Notification type must be email, webhook, or pager_duty",
-	}),
-	config: joi.when("type", {
-		is: "webhook",
-		then: joi.object({
-			webhookUrl: joi.string().uri().required().messages({
-				"string.uri": "Webhook URL must be a valid URI",
-				"any.required": "Webhook URL is required",
-			}),
-			platform: joi.string().required().messages({
-				"string.empty": "Platform is required",
-				"any.required": "Platform is required",
-			}),
+	type: joi
+		.string()
+		.valid("email", "webhook", "slack", "discord", "pager_duty")
+		.required()
+		.messages({
+			"string.empty": "Notification type is required",
+			"any.required": "Notification type is required",
+			"any.only": "Notification type must be email, webhook, or pager_duty",
 		}),
-	}),
 });
 
 //****************************************

From 3cacda687c44fe36d14d33ad83bba9e0214fbd82 Mon Sep 17 00:00:00 2001
From: myusername <Virendra.Jadhav@dpind.com>
Date: Wed, 18 Jun 2025 19:05:04 +0530
Subject: [PATCH 221/319] fix more changes for bulk selection on status page
 server

---
 client/src/Components/Inputs/Search/index.jsx |  29 +-
 client/src/locales/en.json                    | 257 ++++++++++++++++++
 2 files changed, 285 insertions(+), 1 deletion(-)

diff --git a/client/src/Components/Inputs/Search/index.jsx b/client/src/Components/Inputs/Search/index.jsx
index 618ae327f..9689e38c1 100644
--- a/client/src/Components/Inputs/Search/index.jsx
+++ b/client/src/Components/Inputs/Search/index.jsx
@@ -11,6 +11,10 @@ import {
 import { useTheme } from "@emotion/react";
 import SearchIcon from "../../../assets/icons/search.svg?react";
 import React, { useEffect } from "react";
+<<<<<<< Updated upstream
+=======
+import { useTranslation } from "react-i18next";
+>>>>>>> Stashed changes
 
 /**
  * Search component using Material UI's Autocomplete.
@@ -70,6 +74,7 @@ const Search = ({
 }) => {
 	const theme = useTheme();
 	const [selectAll, setSelectAll] = React.useState(false);
+<<<<<<< Updated upstream
 	useEffect(() => {
 		setSelectAll(
 			multiple &&
@@ -84,6 +89,21 @@ const Search = ({
 	const enhancedOptions = React.useMemo(() => {
 		return multiple && isAdorned
 			? [{ [filteredBy]: "Select All", isSelectAll: true, _id: "select_all" }, ...options]
+=======
+	const { t } = useTranslation();
+	useEffect(() => {
+		const allSelected =
+			Array.isArray(value) && Array.isArray(options) && value.length === options.length;
+		if (selectAll !== allSelected) setSelectAll(allSelected);
+	}, [value, options]);
+	const [open, setOpen] = React.useState(false);
+	const enhancedOptions = React.useMemo(() => {
+		return multiple && isAdorned
+			? [
+					{ [filteredBy]: t("selectAll"), isSelectAll: true, _id: "select_all" },
+					...options,
+				]
+>>>>>>> Stashed changes
 			: options;
 	}, [multiple, isAdorned, options, filteredBy]);
 	const isOptionSelected = (option) => {
@@ -97,7 +117,10 @@ const Search = ({
 		const newValue = isSelectAll ? [...options] : [];
 		handleChange(newValue);
 		setSelectAll(isSelectAll);
+<<<<<<< Updated upstream
 		setOpen(!isSelectAll);
+=======
+>>>>>>> Stashed changes
 	};
 	return (
 		<Autocomplete
@@ -135,7 +158,7 @@ const Search = ({
 			freeSolo
 			disabled={disabled}
 			disableClearable
-			options={options}
+			options={enhancedOptions}
 			getOptionLabel={(option) => option[filteredBy]}
 			isOptionEqualToValue={(option, value) => option._id === value._id} // Compare by unique identifier
 			renderInput={(params) => (
@@ -219,7 +242,11 @@ const Search = ({
 									: {}
 						}
 					>
+<<<<<<< Updated upstream
 						{multiple && isAdorned && (
+=======
+						{multiple && isAdorned && !option.noOptions && (
+>>>>>>> Stashed changes
 							<Checkbox
 								checked={option.isSelectAll ? selectAll : selected}
 								sx={{
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 783cdb179..03bf1726a 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -739,5 +739,262 @@
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+<<<<<<< Updated upstream
 	}
+=======
+	},
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		},
+		"toasts": {
+			"networkError": "Network error",
+			"checkConnection": "Please check your connection",
+			"unknownError": "Unknown error"
+		}
+	},
+	"auth": {
+		"common": {
+			"navigation": {
+				"continue": "Continue",
+				"back": "Back"
+			},
+			"inputs": {
+				"email": {
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com",
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					}
+				},
+				"password": {
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						}
+					},
+					"errors": {
+						"empty": "Please enter your password",
+						"length": "Password must be at least 8 characters long",
+						"uppercase": "Password must contain at least 1 uppercase letter",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"incorrect": "The password you provided does not match our records"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm",
+					"errors": {
+						"empty": "Please enter your password again for confirmation (helps with typos)",
+						"different": "Entered passwords don't match, so one of them is probably mistyped"
+					}
+				},
+				"firstName": {
+					"label": "Name",
+					"placeholder": "Jordan",
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				},
+				"lastName": {
+					"label": "Surname",
+					"placeholder": "Ellis",
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				}
+			},
+			"errors": {
+				"validation": "Error validating data."
+			}
+		},
+		"login": {
+			"heading": "Log In",
+			"subheadings": {
+				"stepOne": "Enter your email",
+				"stepTwo": "Enter your password"
+			},
+			"links": {
+				"forgotPassword": "Forgot password?",
+				"register": "Do not have an account?",
+				"forgotPasswordLink": "Reset password",
+				"registerLink": "Register here"
+			},
+			"toasts": {
+				"success": "Welcome back! You're successfully logged in.",
+				"incorrectPassword": "Incorrect password"
+			},
+			"errors": {
+				"password": {
+					"incorrect": "The password you provided does not match our records"
+				}
+			}
+		},
+		"registration": {
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepTwo": "Enter your email",
+				"stepThree": "Create your password"
+			},
+			"description": {
+				"superAdmin": "Create your super admin account to get started",
+				"user": "Sign up as a user and ask super admin for access to your monitors"
+			},
+			"gettingStartedButton": {
+				"superAdmin": "Create super admin account",
+				"user": "Sign up regular user"
+			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+			"links": {
+				"login": "Already have an account? <a>Log In</a>"
+			},
+			"toasts": {
+				"success": "Welcome! Your account was created successfully."
+			}
+		},
+		"forgotPassword": {
+			"heading": "Forgot password?",
+			"subheadings": {
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepTwo": "We sent a password reset link to <email/>",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepFour": "Your password has been successfully reset. Click below to log in magically."
+			},
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"imageAlts": {
+				"passwordKey": "Password key icon",
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"toasts": {
+				"sent": "Instructions sent to <email/>.",
+				"emailNotFound": "Email not found.",
+				"redirect": "Redirecting in <seconds/>...",
+				"success": "Your password was reset successfully.",
+				"error": "Unable to reset password. Please try again later or contact support."
+			}
+		}
+	},
+	"errorPages": {
+		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
+			},
+			"alertBox": "Server Connection Error",
+			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
+			"retryButton": {
+				"default": "Retry connection",
+				"processing": "Connecting..."
+			}
+		}
+	},
+	"createNotifications": {
+		"title": "Create notification channel",
+		"nameSettings": {
+			"title": "Name",
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications"
+		},
+		"typeSettings": {
+			"title": "Type",
+			"description": "Select the type of notification channel you want to create.",
+			"typeLabel": "Type"
+		},
+		"emailSettings": {
+			"title": "Email",
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com"
+		},
+		"slackSettings": {
+			"title": "Slack",
+			"description": "Configure your Slack webhook here",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"pagerdutySettings": {
+			"title": "PagerDuty",
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890"
+		},
+		"genericWebhookSettings": {
+			"title": "Webhook",
+			"description": "Configure your webhook here",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"discordSettings": {
+			"title": "Discord",
+			"description": "Configure your Discord webhook here",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		}
+	},
+	"notificationConfig": {
+		"title": "Notifications",
+		"description": "Select the notifications channels you want to use"
+	},
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"withCaptureAgent": "with Capture agent {{version}}",
+		"up": "up",
+		"down": "down",
+		"paused": "paused"
+	},
+	"advancedMatching": "Advanced matching",
+	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
+	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
+	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
+	"settingsEmailSecure": "Secure - Use SSL",
+	"settingsEmailPool": "Pool - Enable connection pooling",
+	"sendTestNotifications": "Send test notifications",
+	"selectAll": "Select all"
+>>>>>>> Stashed changes
 }

From 81d830d99e30de8deb18390e1b29de8e078b7e88 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Wed, 18 Jun 2025 22:24:43 +0530
Subject: [PATCH 222/319] Miss with respect to blob type.

---
 client/src/Hooks/monitorHooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 5f303d26a..013e7fc25 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -463,7 +463,7 @@ const useExportMonitors = () => {
 			const response = await networkService.exportMonitors();
 
 			// Create a download link
-			const url = window.URL.createObjectURL(response);
+			const url = window.URL.createObjectURL(response.data);
 			const link = document.createElement("a");
 			link.href = url;
 			link.setAttribute("download", "monitors.csv");

From e6b9b5df3c85fcf407556417b98502798f004e70 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Wed, 18 Jun 2025 22:31:48 +0530
Subject: [PATCH 223/319] Translation and localisation.

---
 client/src/Components/MonitorActions/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/MonitorActions/index.jsx b/client/src/Components/MonitorActions/index.jsx
index 7086cb307..d28822227 100644
--- a/client/src/Components/MonitorActions/index.jsx
+++ b/client/src/Components/MonitorActions/index.jsx
@@ -13,8 +13,6 @@ import { useTranslation } from "react-i18next";
 import { createToast } from "../../Utils/toastUtils";
 import { useExportMonitors } from "../../Hooks/monitorHooks";
 
-const options = ["Import Monitors", "Export Monitors"];
-
 const MonitorActions = ({ isLoading }) => {
 	const [open, setOpen] = React.useState(false);
 	const anchorRef = React.useRef(null);
@@ -23,6 +21,8 @@ const MonitorActions = ({ isLoading }) => {
 	const { t } = useTranslation();
 	const [exportMonitors, isExporting] = useExportMonitors();
 
+	const options = [t('monitorActions.import'), t('monitorActions.export')];
+
 	const handleClick = async () => {
 		if (selectedIndex === 0) {
 			// Import

From 0f298d6450dce5a9552af9c5fb2e96eb52fbac51 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Wed, 18 Jun 2025 23:23:24 +0530
Subject: [PATCH 224/319] Code for network db settings.

---
 server/db/models/NetworkCheck.js              | 46 +++++++++++++++++
 server/db/mongo/modules/networkCheckModule.js | 49 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 server/db/models/NetworkCheck.js
 create mode 100644 server/db/mongo/modules/networkCheckModule.js

diff --git a/server/db/models/NetworkCheck.js b/server/db/models/NetworkCheck.js
new file mode 100644
index 000000000..a6f204b12
--- /dev/null
+++ b/server/db/models/NetworkCheck.js
@@ -0,0 +1,46 @@
+import mongoose from "mongoose";
+import { BaseCheckSchema } from "./Check.js";
+
+const networkInterfaceSchema = mongoose.Schema({
+    name: { type: String, required: true },
+    bytes_sent: { type: Number, default: 0 },
+    bytes_recv: { type: Number, default: 0 },
+    packets_sent: { type: Number, default: 0 },
+    packets_recv: { type: Number, default: 0 },
+    err_in: { type: Number, default: 0 },
+    err_out: { type: Number, default: 0 },
+    drop_in: { type: Number, default: 0 },
+    drop_out: { type: Number, default: 0 },
+    fifo_in: { type: Number, default: 0 },
+    fifo_out: { type: Number, default: 0 }
+});
+
+const captureSchema = mongoose.Schema({
+    version: { type: String, default: "" },
+    mode: { type: String, default: "" }
+});
+
+const NetworkCheckSchema = mongoose.Schema(
+    {
+        ...BaseCheckSchema.obj,
+        data: {
+            type: [networkInterfaceSchema],
+            default: () => []
+        },
+        capture: {
+            type: captureSchema,
+            default: () => ({})
+        },
+        errors: {
+            type: mongoose.Schema.Types.Mixed,
+            default: null
+        }
+    },
+    { timestamps: true }
+);
+
+NetworkCheckSchema.index({ createdAt: 1 });
+NetworkCheckSchema.index({ monitorId: 1, createdAt: 1 });
+NetworkCheckSchema.index({ monitorId: 1, createdAt: -1 });
+
+export default mongoose.model("NetworkCheck", NetworkCheckSchema);
\ No newline at end of file
diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
new file mode 100644
index 000000000..9aa860302
--- /dev/null
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -0,0 +1,49 @@
+import NetworkCheck from "../../models/NetworkCheck.js";
+import logger from "../../../utils/logger.js";
+
+const SERVICE_NAME = "networkCheckModule";
+
+const createNetworkCheck = async (networkCheckData) => {
+    try {
+        const { monitorId, status } = networkCheckData;
+        const n = (await NetworkCheck.countDocuments({ monitorId })) + 1;
+
+        const networkCheck = await new NetworkCheck({
+            ...networkCheckData,
+            n,
+        });
+
+        await networkCheck.save();
+        return networkCheck;
+    } catch (error) {
+        logger.error({
+            message: error.message,
+            service: SERVICE_NAME,
+            method: "createNetworkCheck",
+            stack: error.stack,
+        });
+        throw error;
+    }
+};
+
+const getNetworkChecksByMonitorId = async (monitorId, limit = 100) => {
+    try {
+        const networkChecks = await NetworkCheck.find({ monitorId })
+            .sort({ createdAt: -1 })
+            .limit(limit);
+        return networkChecks;
+    } catch (error) {
+        logger.error({
+            message: error.message,
+            service: SERVICE_NAME,
+            method: "getNetworkChecksByMonitorId",
+            stack: error.stack,
+        });
+        throw error;
+    }
+};
+
+export {
+    createNetworkCheck,
+    getNetworkChecksByMonitorId,
+};
\ No newline at end of file

From 8fe3ed9bd1cfad8e58c2c3c90b3bd170d133f74c Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Wed, 18 Jun 2025 23:30:39 +0530
Subject: [PATCH 225/319] Added formating.

---
 server/db/models/NetworkCheck.js              | 60 ++++++++--------
 server/db/mongo/modules/networkCheckModule.js | 69 +++++++++----------
 2 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/server/db/models/NetworkCheck.js b/server/db/models/NetworkCheck.js
index a6f204b12..eca69eef9 100644
--- a/server/db/models/NetworkCheck.js
+++ b/server/db/models/NetworkCheck.js
@@ -2,45 +2,45 @@ import mongoose from "mongoose";
 import { BaseCheckSchema } from "./Check.js";
 
 const networkInterfaceSchema = mongoose.Schema({
-    name: { type: String, required: true },
-    bytes_sent: { type: Number, default: 0 },
-    bytes_recv: { type: Number, default: 0 },
-    packets_sent: { type: Number, default: 0 },
-    packets_recv: { type: Number, default: 0 },
-    err_in: { type: Number, default: 0 },
-    err_out: { type: Number, default: 0 },
-    drop_in: { type: Number, default: 0 },
-    drop_out: { type: Number, default: 0 },
-    fifo_in: { type: Number, default: 0 },
-    fifo_out: { type: Number, default: 0 }
+	name: { type: String, required: true },
+	bytes_sent: { type: Number, default: 0 },
+	bytes_recv: { type: Number, default: 0 },
+	packets_sent: { type: Number, default: 0 },
+	packets_recv: { type: Number, default: 0 },
+	err_in: { type: Number, default: 0 },
+	err_out: { type: Number, default: 0 },
+	drop_in: { type: Number, default: 0 },
+	drop_out: { type: Number, default: 0 },
+	fifo_in: { type: Number, default: 0 },
+	fifo_out: { type: Number, default: 0 },
 });
 
 const captureSchema = mongoose.Schema({
-    version: { type: String, default: "" },
-    mode: { type: String, default: "" }
+	version: { type: String, default: "" },
+	mode: { type: String, default: "" },
 });
 
 const NetworkCheckSchema = mongoose.Schema(
-    {
-        ...BaseCheckSchema.obj,
-        data: {
-            type: [networkInterfaceSchema],
-            default: () => []
-        },
-        capture: {
-            type: captureSchema,
-            default: () => ({})
-        },
-        errors: {
-            type: mongoose.Schema.Types.Mixed,
-            default: null
-        }
-    },
-    { timestamps: true }
+	{
+		...BaseCheckSchema.obj,
+		data: {
+			type: [networkInterfaceSchema],
+			default: () => [],
+		},
+		capture: {
+			type: captureSchema,
+			default: () => ({}),
+		},
+		errors: {
+			type: mongoose.Schema.Types.Mixed,
+			default: null,
+		},
+	},
+	{ timestamps: true }
 );
 
 NetworkCheckSchema.index({ createdAt: 1 });
 NetworkCheckSchema.index({ monitorId: 1, createdAt: 1 });
 NetworkCheckSchema.index({ monitorId: 1, createdAt: -1 });
 
-export default mongoose.model("NetworkCheck", NetworkCheckSchema);
\ No newline at end of file
+export default mongoose.model("NetworkCheck", NetworkCheckSchema);
diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
index 9aa860302..14c5824b8 100644
--- a/server/db/mongo/modules/networkCheckModule.js
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -4,46 +4,43 @@ import logger from "../../../utils/logger.js";
 const SERVICE_NAME = "networkCheckModule";
 
 const createNetworkCheck = async (networkCheckData) => {
-    try {
-        const { monitorId, status } = networkCheckData;
-        const n = (await NetworkCheck.countDocuments({ monitorId })) + 1;
+	try {
+		const { monitorId, status } = networkCheckData;
+		const n = (await NetworkCheck.countDocuments({ monitorId })) + 1;
 
-        const networkCheck = await new NetworkCheck({
-            ...networkCheckData,
-            n,
-        });
+		const networkCheck = await new NetworkCheck({
+			...networkCheckData,
+			n,
+		});
 
-        await networkCheck.save();
-        return networkCheck;
-    } catch (error) {
-        logger.error({
-            message: error.message,
-            service: SERVICE_NAME,
-            method: "createNetworkCheck",
-            stack: error.stack,
-        });
-        throw error;
-    }
+		await networkCheck.save();
+		return networkCheck;
+	} catch (error) {
+		logger.error({
+			message: error.message,
+			service: SERVICE_NAME,
+			method: "createNetworkCheck",
+			stack: error.stack,
+		});
+		throw error;
+	}
 };
 
 const getNetworkChecksByMonitorId = async (monitorId, limit = 100) => {
-    try {
-        const networkChecks = await NetworkCheck.find({ monitorId })
-            .sort({ createdAt: -1 })
-            .limit(limit);
-        return networkChecks;
-    } catch (error) {
-        logger.error({
-            message: error.message,
-            service: SERVICE_NAME,
-            method: "getNetworkChecksByMonitorId",
-            stack: error.stack,
-        });
-        throw error;
-    }
+	try {
+		const networkChecks = await NetworkCheck.find({ monitorId })
+			.sort({ createdAt: -1 })
+			.limit(limit);
+		return networkChecks;
+	} catch (error) {
+		logger.error({
+			message: error.message,
+			service: SERVICE_NAME,
+			method: "getNetworkChecksByMonitorId",
+			stack: error.stack,
+		});
+		throw error;
+	}
 };
 
-export {
-    createNetworkCheck,
-    getNetworkChecksByMonitorId,
-};
\ No newline at end of file
+export { createNetworkCheck, getNetworkChecksByMonitorId };

From 196757d36f5a4ddf2c613a2a30b0d04c11bf60f5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 09:44:24 +0800
Subject: [PATCH 226/319] inject logger

---
 server/controllers/authController.js |  4 ++--
 server/index.js                      | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index a1a35e616..df4034aef 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -7,7 +7,6 @@ import {
 	recoveryTokenValidation,
 	newPasswordValidation,
 } from "../validation/joi.js";
-import logger from "../utils/logger.js";
 import jwt from "jsonwebtoken";
 import { getTokenFromHeaders } from "../utils/utils.js";
 import crypto from "crypto";
@@ -15,12 +14,13 @@ import { handleValidationError, handleError } from "./controllerUtils.js";
 const SERVICE_NAME = "authController";
 
 class AuthController {
-	constructor(db, settingsService, emailService, jobQueue, stringService) {
+	constructor({ db, settingsService, emailService, jobQueue, stringService, logger }) {
 		this.db = db;
 		this.settingsService = settingsService;
 		this.emailService = emailService;
 		this.jobQueue = jobQueue;
 		this.stringService = stringService;
+		this.logger = logger;
 	}
 
 	/**
diff --git a/server/index.js b/server/index.js
index b520e6171..0753af995 100755
--- a/server/index.js
+++ b/server/index.js
@@ -239,13 +239,14 @@ const startApp = async () => {
 	process.on("SIGTERM", shutdown);
 
 	//Create controllers
-	const authController = new AuthController(
-		ServiceRegistry.get(MongoDB.SERVICE_NAME),
-		ServiceRegistry.get(SettingsService.SERVICE_NAME),
-		ServiceRegistry.get(EmailService.SERVICE_NAME),
-		ServiceRegistry.get(JobQueue.SERVICE_NAME),
-		ServiceRegistry.get(StringService.SERVICE_NAME)
-	);
+	const authController = new AuthController({
+		db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
+		settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
+		emailService: ServiceRegistry.get(EmailService.SERVICE_NAME),
+		jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME),
+		stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
+		logger: logger,
+	});
 
 	const monitorController = new MonitorController(
 		ServiceRegistry.get(MongoDB.SERVICE_NAME),

From 7ed92427a3ccc5c9400688587434f64c2a209dc2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 10:33:00 +0800
Subject: [PATCH 227/319] fix error handling

---
 server/controllers/settingsController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/controllers/settingsController.js b/server/controllers/settingsController.js
index cbdd73adf..ef1d689d6 100755
--- a/server/controllers/settingsController.js
+++ b/server/controllers/settingsController.js
@@ -117,7 +117,7 @@ class SettingsController {
 				data: { messageId },
 			});
 		} catch (error) {
-			next(handleValidationError(error, SERVICE_NAME));
+			next(handleError(error, SERVICE_NAME));
 			return;
 		}
 	};

From 7e5521eb1351f5bf397415362288ecb896758899 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:10:07 +0800
Subject: [PATCH 228/319] Move thresholds from Notification to Monitor

---
 server/db/models/Monitor.js      | 69 ++++++++++++++++++++++++++++----
 server/db/models/Notification.js | 28 -------------
 2 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 7bb38f520..38aeff0c3 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -69,6 +69,15 @@ const MonitorSchema = mongoose.Schema(
 			type: Number,
 			default: undefined,
 		},
+		notifications: [
+			{
+				type: mongoose.Schema.Types.ObjectId,
+				ref: "Notification",
+			},
+		],
+		secret: {
+			type: String,
+		},
 		thresholds: {
 			type: {
 				usage_cpu: { type: Number },
@@ -78,14 +87,33 @@ const MonitorSchema = mongoose.Schema(
 			},
 			_id: false,
 		},
-		notifications: [
-			{
-				type: mongoose.Schema.Types.ObjectId,
-				ref: "Notification",
+		alertThreshold: {
+			type: Number,
+			default: 5,
+		},
+		cpuAlertThreshold: {
+			type: Number,
+			default: function () {
+				return this.alertThreshold;
+			},
+		},
+		memoryAlertThreshold: {
+			type: Number,
+			default: function () {
+				return this.alertThreshold;
+			},
+		},
+		diskAlertThreshold: {
+			type: Number,
+			default: function () {
+				return this.alertThreshold;
+			},
+		},
+		tempAlertThreshold: {
+			type: Number,
+			default: function () {
+				return this.alertThreshold;
 			},
-		],
-		secret: {
-			type: String,
 		},
 	},
 	{
@@ -132,6 +160,33 @@ MonitorSchema.pre("deleteMany", async function (next) {
 	next();
 });
 
+MonitorSchema.pre("save", function (next) {
+	if (!this.cpuAlertThreshold || this.isModified("alertThreshold")) {
+		this.cpuAlertThreshold = this.alertThreshold;
+	}
+	if (!this.memoryAlertThreshold || this.isModified("alertThreshold")) {
+		this.memoryAlertThreshold = this.alertThreshold;
+	}
+	if (!this.diskAlertThreshold || this.isModified("alertThreshold")) {
+		this.diskAlertThreshold = this.alertThreshold;
+	}
+	if (!this.tempAlertThreshold || this.isModified("alertThreshold")) {
+		this.tempAlertThreshold = this.alertThreshold;
+	}
+	next();
+});
+
+MonitorSchema.pre("findOneAndUpdate", function (next) {
+	const update = this.getUpdate();
+	if (update.alertThreshold) {
+		update.cpuAlertThreshold = update.alertThreshold;
+		update.memoryAlertThreshold = update.alertThreshold;
+		update.diskAlertThreshold = update.alertThreshold;
+		update.tempAlertThreshold = update.alertThreshold;
+	}
+	next();
+});
+
 MonitorSchema.index({ teamId: 1, type: 1 });
 
 export default mongoose.model("Monitor", MonitorSchema);
diff --git a/server/db/models/Notification.js b/server/db/models/Notification.js
index fe314fc74..a6a3c7c09 100755
--- a/server/db/models/Notification.js
+++ b/server/db/models/Notification.js
@@ -28,34 +28,6 @@ const NotificationSchema = mongoose.Schema(
 		phone: {
 			type: String,
 		},
-		alertThreshold: {
-			type: Number,
-			default: 5,
-		},
-		cpuAlertThreshold: {
-			type: Number,
-			default: function () {
-				return this.alertThreshold;
-			},
-		},
-		memoryAlertThreshold: {
-			type: Number,
-			default: function () {
-				return this.alertThreshold;
-			},
-		},
-		diskAlertThreshold: {
-			type: Number,
-			default: function () {
-				return this.alertThreshold;
-			},
-		},
-		tempAlertThreshold: {
-			type: Number,
-			default: function () {
-				return this.alertThreshold;
-			},
-		},
 	},
 	{
 		timestamps: true,

From dbbe008e23a1f4bf74e46d49b3440fca3ffa494e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:10:29 +0800
Subject: [PATCH 229/319] remove unused controller methods

---
 server/controllers/notificationController.js | 74 +-------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/server/controllers/notificationController.js b/server/controllers/notificationController.js
index 9fee7803e..e7e2a1f2a 100755
--- a/server/controllers/notificationController.js
+++ b/server/controllers/notificationController.js
@@ -23,85 +23,13 @@ class NotificationController {
 		this.stringService = stringService;
 		this.statusService = statusService;
 		this.db = db;
-		this.triggerNotification = this.triggerNotification.bind(this);
-	}
-
-	async triggerNotification(req, res, next) {
-		try {
-			await triggerNotificationBodyValidation.validateAsync(req.body, {
-				abortEarly: false,
-				stripUnknown: true,
-			});
-		} catch (error) {
-			next(handleValidationError(error, SERVICE_NAME));
-			return;
-		}
-
-		try {
-			const { monitorId, type, platform, config, status = false } = req.body;
-
-			// Create a simplified networkResponse similar to what would come from monitoring
-			const networkResponse = {
-				monitorId,
-				status,
-			};
-
-			// Use the statusService to get monitor details and handle status change logic
-			// This returns { monitor, statusChanged, prevStatus } exactly like your job queue uses
-			const statusResult = await this.statusService.updateStatus(networkResponse);
-
-			if (type === NOTIFICATION_TYPES.WEBHOOK) {
-				const notification = {
-					type,
-					platform,
-					config,
-				};
-
-				await this.notificationService.sendWebhookNotification(
-					statusResult, // Contains monitor, statusChanged, and prevStatus
-					notification
-				);
-			}
-
-			return res.success({
-				msg: this.stringService.webhookSendSuccess,
-			});
-		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "triggerNotification"));
-		}
-	}
-
-	createTestNetworkResponse() {
-		return {
-			monitor: {
-				_id: "test-monitor-id",
-				name: "Test Monitor",
-				url: "https://example.com",
-			},
-			status: true,
-			statusChanged: true,
-			prevStatus: false,
-		};
 	}
 
 	testNotification = async (req, res, next) => {
 		try {
 			const notification = req.body;
-			let success;
 
-			if (notification?.type === "email") {
-				success = await this.notificationService.sendTestEmail(notification);
-			}
-
-			if (notification?.type === "webhook") {
-				success =
-					await this.notificationService.sendTestWebhookNotification(notification);
-			}
-
-			if (notification?.type === "pager_duty") {
-				success =
-					await this.notificationService.sendTestPagerDutyNotification(notification);
-			}
+			const success = await this.notificationService.sendTestNotification(notification);
 
 			if (!success) {
 				return res.error({

From 68aa9a6b2da9a96470278ce7dbcbc16b33abbe0d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:10:44 +0800
Subject: [PATCH 230/319] remove unused route

---
 server/routes/notificationRoute.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index a937975c5..164c0afcc 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -11,8 +11,6 @@ class NotificationRoutes {
 	initializeRoutes() {
 		this.router.use(verifyJWT);
 
-		this.router.post("/trigger", this.notificationController.triggerNotification);
-
 		this.router.post("/test", this.notificationController.testNotification);
 		this.router.post("/test/all", this.notificationController.testAllNotifications);
 

From 8ea2053d3731a4aa397db82eb42d86b8f2e343f5 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:11:11 +0800
Subject: [PATCH 231/319] add a utils file for notifications

---
 server/service/notificationUtils.js | 146 ++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 server/service/notificationUtils.js

diff --git a/server/service/notificationUtils.js b/server/service/notificationUtils.js
new file mode 100644
index 000000000..61c3ec36a
--- /dev/null
+++ b/server/service/notificationUtils.js
@@ -0,0 +1,146 @@
+class NotificationUtils {
+	constructor({ stringService, emailService }) {
+		this.stringService = stringService;
+		this.emailService = emailService;
+	}
+
+	buildTestEmail = async () => {
+		const context = { testName: "Monitoring System" };
+		const html = await this.emailService.buildEmail("testEmailTemplate", context);
+		return html;
+	};
+
+	buildStatusEmail = async (networkResponse) => {
+		const { monitor, status, prevStatus } = networkResponse;
+		const template = prevStatus === false ? "serverIsUpTemplate" : "serverIsDownTemplate";
+		const context = { monitor: monitor.name, url: monitor.url };
+		const subject = `Monitor ${monitor.name} is ${status === true ? "up" : "down"}`;
+		const html = await this.emailService.buildEmail(template, context);
+		return { subject, html };
+	};
+
+	buildWebhookMessage = (networkResponse) => {
+		const { monitor, status, code, timestamp } = networkResponse;
+		// Format timestamp using the local system timezone
+		const formatTime = (timestamp) => {
+			const date = new Date(timestamp);
+
+			// Get timezone abbreviation and format the date
+			const timeZoneAbbr = date
+				.toLocaleTimeString("en-US", { timeZoneName: "short" })
+				.split(" ")
+				.pop();
+
+			// Format the date with readable format
+			return (
+				date
+					.toLocaleString("en-US", {
+						year: "numeric",
+						month: "2-digit",
+						day: "2-digit",
+						hour: "2-digit",
+						minute: "2-digit",
+						second: "2-digit",
+						hour12: false,
+					})
+					.replace(/(\d+)\/(\d+)\/(\d+),\s/, "$3-$1-$2 ") +
+				" " +
+				timeZoneAbbr
+			);
+		};
+
+		// Get formatted time
+		const formattedTime = timestamp
+			? formatTime(timestamp)
+			: formatTime(new Date().getTime());
+
+		// Create different messages based on status with extra spacing
+		let messageText;
+		if (status === true) {
+			messageText = this.stringService.monitorUpAlert
+				.replace("{monitorName}", monitor.name)
+				.replace("{time}", formattedTime)
+				.replace("{code}", code || "Unknown");
+		} else {
+			messageText = this.stringService.monitorDownAlert
+				.replace("{monitorName}", monitor.name)
+				.replace("{time}", formattedTime)
+				.replace("{code}", code || "Unknown");
+		}
+		return messageText;
+	};
+
+	buildHardwareAlerts = async (networkResponse) => {
+		const monitor = networkResponse?.monitor;
+		const thresholds = networkResponse?.monitor?.thresholds;
+		const {
+			usage_cpu: cpuThreshold = -1,
+			usage_memory: memoryThreshold = -1,
+			usage_disk: diskThreshold = -1,
+		} = thresholds;
+
+		const metrics = networkResponse?.payload?.data;
+		const {
+			cpu: { usage_percent: cpuUsage = -1 } = {},
+			memory: { usage_percent: memoryUsage = -1 } = {},
+			disk = [],
+		} = metrics;
+
+		const alerts = {
+			cpu: cpuThreshold !== -1 && cpuUsage > cpuThreshold ? true : false,
+			memory: memoryThreshold !== -1 && memoryUsage > memoryThreshold ? true : false,
+			disk:
+				disk?.some(
+					(d) =>
+						diskThreshold !== -1 &&
+						typeof d?.usage_percent === "number" &&
+						d?.usage_percent > diskThreshold
+				) ?? false,
+		};
+
+		const alertsToSend = [];
+		const alertTypes = ["cpu", "memory", "disk"];
+		for (const type of alertTypes) {
+			// Iterate over each alert type to see if any need to be decremented
+			if (alerts[type] === true) {
+				monitor[`${type}AlertThreshold`]--; // Decrement threshold if an alert is triggered
+
+				if (monitor[`${type}AlertThreshold`] <= 0) {
+					// If threshold drops below 0, reset and send notification
+					monitor[`${type}AlertThreshold`] = monitor.alertThreshold;
+
+					const formatAlert = {
+						cpu: () =>
+							`Your current CPU usage (${(cpuUsage * 100).toFixed(0)}%) is above your threshold (${(cpuThreshold * 100).toFixed(0)}%)`,
+						memory: () =>
+							`Your current memory usage (${(memoryUsage * 100).toFixed(0)}%) is above your threshold (${(memoryThreshold * 100).toFixed(0)}%)`,
+						disk: () =>
+							`Your current disk usage: ${disk
+								.map((d, idx) => `(Disk${idx}: ${(d.usage_percent * 100).toFixed(0)}%)`)
+								.join(
+									", "
+								)} is above your threshold (${(diskThreshold * 100).toFixed(0)}%)`,
+					};
+					alertsToSend.push(formatAlert[type]());
+				}
+			}
+		}
+		await monitor.save();
+		return alertsToSend;
+	};
+
+	buildHardwareEmail = async (networkResponse, alerts) => {
+		const { monitor } = networkResponse;
+		const template = "hardwareIncidentTemplate";
+		const context = { monitor: monitor.name, url: monitor.url, alerts };
+		const subject = `Monitor ${monitor.name} infrastructure alerts`;
+		const html = await this.emailService.buildEmail(template, context);
+		return { subject, html };
+	};
+
+	buildHardwareNotificationMessage = (alerts) => {
+		return alerts.map((alert) => alert).join("\n");
+	};
+}
+
+export default NotificationUtils;

From d4b8eebd647a3f042de4e04f150d2f1cf8e5e84e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:11:43 +0800
Subject: [PATCH 232/319] cleanup

---
 server/service/networkService.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/server/service/networkService.js b/server/service/networkService.js
index 5ad28e594..08b2f065e 100755
--- a/server/service/networkService.js
+++ b/server/service/networkService.js
@@ -432,9 +432,9 @@ class NetworkService {
 		throw err;
 	}
 
-	async requestWebhook(platform, url, message) {
+	async requestWebhook(type, url, body) {
 		try {
-			const response = await this.axios.post(url, message, {
+			const response = await this.axios.post(url, body, {
 				headers: {
 					"Content-Type": "application/json",
 				},
@@ -444,7 +444,7 @@ class NetworkService {
 				type: "webhook",
 				status: true,
 				code: response.status,
-				message: `Successfully sent ${platform} notification`,
+				message: `Successfully sent ${type} notification`,
 				payload: response.data,
 			};
 		} catch (error) {
@@ -452,19 +452,13 @@ class NetworkService {
 				message: error.message,
 				service: this.SERVICE_NAME,
 				method: "requestWebhook",
-				url,
-				platform,
-				error: error.message,
-				statusCode: error.response?.status,
-				responseData: error.response?.data,
-				requestPayload: message,
 			});
 
 			return {
 				type: "webhook",
 				status: false,
 				code: error.response?.status || this.NETWORK_ERROR,
-				message: `Failed to send ${platform} notification`,
+				message: `Failed to send ${type} notification`,
 				payload: error.response?.data,
 			};
 		}

From 30a7de5333ef61afff5c4beb64d54732fbef203c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:12:09 +0800
Subject: [PATCH 233/319] remove unused import

---
 server/service/PulseQueue/PulseQueue.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index fd420400f..0452985a0 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -1,5 +1,4 @@
 import { Pulse } from "@pulsecron/pulse";
-import { ObjectId } from "mongodb";
 
 const SERVICE_NAME = "PulseQueue";
 class PulseQueue {

From 1b4b66e36de3d22ddbca2090f29ac95ff2dad3b2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:12:34 +0800
Subject: [PATCH 234/319] inject notification utils

---
 server/index.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/index.js b/server/index.js
index 0753af995..99be6de7a 100755
--- a/server/index.js
+++ b/server/index.js
@@ -73,6 +73,7 @@ import StatusService from "./service/statusService.js";
 
 // Notification Service and dependencies
 import NotificationService from "./service/notificationService.js";
+import NotificationUtils from "./service/notificationUtils.js";
 
 // Buffer Service and dependencies
 import BufferService from "./service/bufferService.js";
@@ -173,13 +174,19 @@ const startApp = async () => {
 	);
 	const bufferService = new BufferService({ db, logger });
 	const statusService = new StatusService({ db, logger, buffer: bufferService });
-	const notificationService = new NotificationService(
+	const notificationUtils = new NotificationUtils({
+		stringService,
+		emailService,
+	});
+
+	const notificationService = new NotificationService({
 		emailService,
 		db,
 		logger,
 		networkService,
-		stringService
-	);
+		stringService,
+		notificationUtils,
+	});
 
 	const redisService = new RedisService({ Redis: IORedis, logger });
 

From 48b25e0838939319e6561a21454d0c8f3dc1c792 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:12:55 +0800
Subject: [PATCH 235/319] refactor notification service

---
 server/service/notificationService.js | 555 ++++----------------------
 1 file changed, 83 insertions(+), 472 deletions(-)
 mode change 100755 => 100644 server/service/notificationService.js

diff --git a/server/service/notificationService.js b/server/service/notificationService.js
old mode 100755
new mode 100644
index dcd629d53..a2453faa9
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -1,512 +1,123 @@
-const SERVICE_NAME = "NotificationService";
-const TELEGRAM_API_BASE_URL = "https://api.telegram.org/bot";
-const PLATFORM_TYPES = ["telegram", "slack", "discord", "webhook"];
-
-const MESSAGE_FORMATTERS = {
-	telegram: (messageText, chatId) => ({ chat_id: chatId, text: messageText }),
-	slack: (messageText) => ({ text: messageText }),
-	discord: (messageText) => ({ content: messageText }),
-	webhook: (messageText) => ({ text: messageText }),
-};
-
 class NotificationService {
-	static SERVICE_NAME = SERVICE_NAME;
-	/**
-	 * Creates an instance of NotificationService.
-	 *
-	 * @param {Object} emailService - The email service used for sending notifications.
-	 * @param {Object} db - The database instance for storing notification data.
-	 * @param {Object} logger - The logger instance for logging activities.
-	 * @param {Object} networkService - The network service for sending webhook notifications.
-	 */
-	constructor(emailService, db, logger, networkService, stringService) {
-		this.SERVICE_NAME = SERVICE_NAME;
+	constructor({
+		emailService,
+		db,
+		logger,
+		networkService,
+		stringService,
+		notificationUtils,
+	}) {
 		this.emailService = emailService;
 		this.db = db;
 		this.logger = logger;
 		this.networkService = networkService;
 		this.stringService = stringService;
+		this.notificationUtils = notificationUtils;
 	}
 
-	/**
-	 * Formats a notification message based on the monitor status and platform.
-	 *
-	 * @param {Object} monitor - The monitor object.
-	 * @param {string} monitor.name - The name of the monitor.
-	 * @param {string} monitor.url - The URL of the monitor.
-	 * @param {boolean} status - The current status of the monitor (true for up, false for down).
-	 * @param {string} platform - The notification platform (e.g., "telegram", "slack", "discord").
-	 * @param {string} [chatId] - The chat ID for platforms that require it (e.g., Telegram).
-	 * @returns {Object|null} The formatted message object for the specified platform, or null if the platform is unsupported.
-	 */
+	sendNotification = async ({ notification, subject, content, html }) => {
+		const { type, address } = notification;
 
-	formatNotificationMessage(monitor, status, platform, chatId, code, timestamp) {
-		// Format timestamp using the local system timezone
-		const formatTime = (timestamp) => {
-			const date = new Date(timestamp);
-
-			// Get timezone abbreviation and format the date
-			const timeZoneAbbr = date
-				.toLocaleTimeString("en-US", { timeZoneName: "short" })
-				.split(" ")
-				.pop();
-
-			// Format the date with readable format
-			return (
-				date
-					.toLocaleString("en-US", {
-						year: "numeric",
-						month: "2-digit",
-						day: "2-digit",
-						hour: "2-digit",
-						minute: "2-digit",
-						second: "2-digit",
-						hour12: false,
-					})
-					.replace(/(\d+)\/(\d+)\/(\d+),\s/, "$3-$1-$2 ") +
-				" " +
-				timeZoneAbbr
-			);
-		};
-
-		// Get formatted time
-		const formattedTime = timestamp
-			? formatTime(timestamp)
-			: formatTime(new Date().getTime());
-
-		// Create different messages based on status with extra spacing
-		let messageText;
-		if (status === true) {
-			messageText = this.stringService.monitorUpAlert
-				.replace("{monitorName}", monitor.name)
-				.replace("{time}", formattedTime)
-				.replace("{code}", code || "Unknown");
-		} else {
-			messageText = this.stringService.monitorDownAlert
-				.replace("{monitorName}", monitor.name)
-				.replace("{time}", formattedTime)
-				.replace("{code}", code || "Unknown");
-		}
-
-		if (!PLATFORM_TYPES.includes(platform)) {
-			return undefined;
-		}
-
-		return MESSAGE_FORMATTERS[platform](messageText, chatId);
-	}
-
-	formatHardwareNotificationMessage = (
-		monitor,
-		status,
-		platform,
-		chatId,
-		code,
-		timestamp,
-		alerts
-	) => {
-		const messageText = alerts.map((alert) => alert).join("\n");
-		return MESSAGE_FORMATTERS[platform](messageText, chatId);
-	};
-
-	sendTestWebhookNotification = async (notification) => {
-		const config = notification.config;
-		const response = await this.networkService.requestWebhook(
-			config.platform,
-			config.webhookUrl,
-			"This is a test notification"
-		);
-
-		return response.status;
-	};
-
-	/**
-	 * Sends a webhook notification to a specified platform.
-	 *
-	 * @param {Object} networkResponse - The response object from the network.
-	 * @param {Object} networkResponse.monitor - The monitor object.
-	 * @param {boolean} networkResponse.status - The monitor's status (true for up, false for down).
-	 * @param {Object} notification - The notification settings.
-	 * @param {string} notification.platform - The target platform ("telegram", "slack", "discord").
-	 * @param {Object} notification.config - The configuration object for the webhook.
-	 * @param {string} notification.config.webhookUrl - The webhook URL for the platform.
-	 * @param {string} [notification.config.botToken] - The bot token for Telegram notifications.
-	 * @param {string} [notification.config.chatId] - The chat ID for Telegram notifications.
-	 * @returns {Promise<boolean>} A promise that resolves to true if the notification was sent successfully, otherwise false.
-	 */
-
-	async sendWebhookNotification(networkResponse, notification, alerts = []) {
-		const { monitor, status, code } = networkResponse;
-		const { webhookUrl, platform, botToken, chatId } = notification.config;
-
-		// Early return if platform is not supported
-		if (!PLATFORM_TYPES.includes(platform)) {
-			this.logger.warn({
-				message: this.stringService.getWebhookUnsupportedPlatform(platform),
-				service: this.SERVICE_NAME,
-				method: "sendWebhookNotification",
-				details: { platform },
-			});
-			return false;
-		}
-
-		// Early return for telegram if required fields are missing
-		if (platform === "telegram" && (!botToken || !chatId)) {
-			this.logger.warn({
-				message: "Missing required fields for Telegram notification",
-				service: this.SERVICE_NAME,
-				method: "sendWebhookNotification",
-				details: { platform },
-			});
-			return false;
-		}
-
-		let url = webhookUrl;
-		if (platform === "telegram") {
-			url = `${TELEGRAM_API_BASE_URL}${botToken}/sendMessage`;
-		}
-
-		let message;
-		if (monitor.type === "hardware") {
-			message = this.formatHardwareNotificationMessage(
-				monitor,
-				status,
-				platform,
-				chatId,
-				code,
-				networkResponse.timestamp,
-				alerts
-			);
-		} else {
-			message = this.formatNotificationMessage(
-				monitor,
-				status,
-				platform,
-				chatId,
-				code, // Pass the code field directly
-				networkResponse.timestamp
-			);
-		}
-
-		try {
-			const response = await this.networkService.requestWebhook(platform, url, message);
-			return response.status;
-		} catch (error) {
-			this.logger.error({
-				message: this.stringService.getWebhookSendError(platform),
-				service: this.SERVICE_NAME,
-				method: "sendWebhookNotification",
-				stack: error.stack,
-			});
-			return false;
-		}
-	}
-
-	/**
-	 * Sends an email notification for hardware infrastructure alerts
-	 *
-	 * @async
-	 * @function sendHardwareEmail
-	 * @param {Object} networkResponse - Response object containing monitor information
-	 * @param {string} address - Email address to send the notification to
-	 * @param {Array} [alerts=[]] - List of hardware alerts to include in the email
-	 * @returns {Promise<boolean>} - Indicates whether email was sent successfully
-	 * @throws {Error}
-	 */
-	async sendHardwareEmail(networkResponse, address, alerts = []) {
-		if (alerts.length === 0) return false;
-		const { monitor, status, prevStatus } = networkResponse;
-		const template = "hardwareIncidentTemplate";
-		const context = { monitor: monitor.name, url: monitor.url, alerts };
-		const subject = `Monitor ${monitor.name} infrastructure alerts`;
-		const html = await this.emailService.buildEmail(template, context);
-		this.emailService.sendEmail(address, subject, html).catch((error) => {
-			this.logger.warn({
-				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "sendHardwareEmail",
-				stack: error.stack,
-			});
-		});
-
-		return true;
-	}
-
-	sendTestEmail = async (notification) => {
-		const to = notification?.address;
-		if (!to || typeof to !== "string") {
-			throw new Error(this.stringService.errorForValidEmailAddress);
-		}
-
-		const subject = this.stringService.testEmailSubject;
-		const context = { testName: "Monitoring System" };
-
-		try {
-			const html = await this.emailService.buildEmail("testEmailTemplate", context);
-			const messageId = await this.emailService.sendEmail(to, subject, html);
-
-			if (messageId) {
-				return true;
-			}
-		} catch (error) {
-			this.logger.warn({
-				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "sendTestEmail",
-				stack: error.stack,
-			});
-			return false;
-		}
-	};
-
-	/**
-	 * Sends an email notification about monitor status change
-	 *
-	 * @async
-	 * @function sendEmail
-	 * @param {Object} networkResponse - Response object containing monitor status information
-	 * @param {string} address - Email address to send the notification to
-	 * @returns {Promise<boolean>} - Indicates email was sent successfully
-	 */
-
-	async sendEmail(networkResponse, address) {
-		const { monitor, status, prevStatus } = networkResponse;
-		const template = prevStatus === false ? "serverIsUpTemplate" : "serverIsDownTemplate";
-		const context = { monitor: monitor.name, url: monitor.url };
-		const subject = `Monitor ${monitor.name} is ${status === true ? "up" : "down"}`;
-
-		const html = await this.emailService.buildEmail(template, context);
-		this.emailService.sendEmail(address, subject, html).catch((error) => {
-			this.logger.warn({
-				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "sendEmail",
-				stack: error.stack,
-			});
-		});
-
-		return true;
-	}
-
-	async sendTestPagerDutyNotification(notification) {
-		const { routingKey } = notification.config;
-		const response = await this.networkService.requestPagerDuty({
-			message: "This is a test notification",
-			monitorUrl: "Test notification",
-			routingKey,
-		});
-
-		return response;
-	}
-	async sendPagerDutyNotification(networkResponse, notification, alerts = []) {
-		const { monitor, status, code } = networkResponse;
-		const { routingKey, platform } = notification.config;
-
-		let message;
-		if (monitor.type === "hardware") {
-			message = this.formatHardwareNotificationMessage(
-				monitor,
-				status,
-				platform,
-				null,
-				code,
-				networkResponse.timestamp,
-				alerts
-			);
-		} else {
-			message = this.formatNotificationMessage(
-				monitor,
-				status,
-				platform,
-				null,
-				code, // Pass the code field directly
-				networkResponse.timestamp
-			);
-		}
-		try {
-			const response = await this.networkService.requestPagerDuty({
-				message,
-				routingKey,
-				monitorUrl: monitor.url,
-			});
-			return response;
-		} catch (error) {
-			this.logger.error({
-				message: "Failed to send PagerDuty notification",
-				details: error.details,
-				service: error.service || this.SERVICE_NAME,
-				method: error.method || "sendPagerDutyNotification",
-				stack: error.stack,
-			});
-			return false;
-		}
-	}
-
-	async handleStatusNotifications(networkResponse) {
-		try {
-			// If status hasn't changed, we're done
-			if (networkResponse.statusChanged === false) return false;
-			// if prevStatus is undefined, monitor is resuming, we're done
-			if (networkResponse.prevStatus === undefined) return false;
-
-			const notificationIDs = networkResponse.monitor?.notifications ?? [];
-			const notifications = await this.db.getNotificationsByIds(notificationIDs);
-
-			for (const notification of notifications) {
-				if (notification.type === "email") {
-					await this.sendEmail(networkResponse, notification.address);
-				} else if (notification.type === "webhook") {
-					await this.sendWebhookNotification(networkResponse, notification);
-				} else if (notification.type === "pager_duty") {
-					await this.sendPagerDutyNotification(networkResponse, notification);
-				}
-			}
+		if (type === "email") {
+			const messageId = await this.emailService.sendEmail(address, subject, html);
+			if (!messageId) return false;
 			return true;
-		} catch (error) {
-			this.logger.error({
-				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "handleNotifications",
-				stack: error.stack,
-			});
 		}
-	}
-	/**
-	 * Handles status change notifications for a monitor
-	 *
-	 * @async
-	 * @function handleStatusNotifications
-	 * @param {Object} networkResponse - Response object containing monitor status information
-	 * @returns {Promise<boolean>} - Indicates whether notifications were processed
-	 * @throws {Error}
-	 */
-	async handleHardwareNotifications(networkResponse) {
-		const thresholds = networkResponse?.monitor?.thresholds;
-		if (thresholds === undefined) return false; // No thresholds set, we're done
 
-		// Get thresholds from monitor
-		const {
-			usage_cpu: cpuThreshold = -1,
-			usage_memory: memoryThreshold = -1,
-			usage_disk: diskThreshold = -1,
-		} = thresholds;
+		// Create a body for webhooks
+		let body = { text: content };
+		if (type === "discord") {
+			body = { content };
+		}
 
-		// Get metrics from response
-		const metrics = networkResponse?.payload?.data ?? null;
-		if (metrics === null) return false;
+		if (type === "slack" || type === "discord" || type === "webhook") {
+			const response = await this.networkService.requestWebhook(type, address, body);
+			return response.status;
+		}
+		if (type === "pager_duty") {
+			const response = await this.networkService.requestPagerDuty({
+				message: content,
+				monitorUrl: subject,
+				routingKey: address,
+			});
 
-		const {
-			cpu: { usage_percent: cpuUsage = -1 } = {},
-			memory: { usage_percent: memoryUsage = -1 } = {},
-			disk = [],
-		} = metrics;
+			return response;
+		}
+	};
 
-		const alerts = {
-			cpu: cpuThreshold !== -1 && cpuUsage > cpuThreshold ? true : false,
-			memory: memoryThreshold !== -1 && memoryUsage > memoryThreshold ? true : false,
-			disk:
-				disk?.some(
-					(d) =>
-						diskThreshold !== -1 &&
-						typeof d?.usage_percent === "number" &&
-						d?.usage_percent > diskThreshold
-				) ?? false,
-		};
+	async handleNotifications(networkResponse) {
+		const { monitor, statusChanged, prevStatus } = networkResponse;
+		const { type } = monitor;
+		if (type !== "hardware" && statusChanged === false) return false;
+		// if prevStatus is undefined, monitor is resuming, we're done
+		if (type !== "hardware" && prevStatus === undefined) return false;
 
 		const notificationIDs = networkResponse.monitor?.notifications ?? [];
-		const notifications = await this.db.getNotificationsByIds(notificationIDs);
+		if (notificationIDs.length === 0) return false;
 
-		for (const notification of notifications) {
-			const alertsToSend = [];
-			const alertTypes = ["cpu", "memory", "disk"];
+		if (networkResponse.monitor.type === "hardware") {
+			const thresholds = networkResponse?.monitor?.thresholds;
 
-			for (const type of alertTypes) {
-				// Iterate over each alert type to see if any need to be decremented
-				if (alerts[type] === true) {
-					notification[`${type}AlertThreshold`]--; // Decrement threshold if an alert is triggered
+			if (thresholds === undefined) return false; // No thresholds set, we're done
+			const metrics = networkResponse?.payload?.data ?? null;
+			if (metrics === null) return false; // No metrics, we're done
 
-					if (notification[`${type}AlertThreshold`] <= 0) {
-						// If threshold drops below 0, reset and send notification
-						notification[`${type}AlertThreshold`] = notification.alertThreshold;
+			const alerts = await this.notificationUtils.buildHardwareAlerts(networkResponse);
+			if (alerts.length === 0) return false;
 
-						const formatAlert = {
-							cpu: () =>
-								`Your current CPU usage (${(cpuUsage * 100).toFixed(0)}%) is above your threshold (${(cpuThreshold * 100).toFixed(0)}%)`,
-							memory: () =>
-								`Your current memory usage (${(memoryUsage * 100).toFixed(0)}%) is above your threshold (${(memoryThreshold * 100).toFixed(0)}%)`,
-							disk: () =>
-								`Your current disk usage: ${disk
-									.map((d, idx) => `(Disk${idx}: ${(d.usage_percent * 100).toFixed(0)}%)`)
-									.join(
-										", "
-									)} is above your threshold (${(diskThreshold * 100).toFixed(0)}%)`,
-						};
-						alertsToSend.push(formatAlert[type]());
-					}
-				}
-			}
+			const { subject, html } = await this.notificationUtils.buildHardwareEmail(
+				networkResponse,
+				alerts
+			);
+			const content =
+				await this.notificationUtils.buildHardwareNotificationMessage(alerts);
 
-			await notification.save();
-
-			if (alertsToSend.length === 0) continue; // No alerts to send, we're done
-
-			if (notification.type === "email") {
-				await this.sendHardwareEmail(networkResponse, notification.address, alertsToSend);
-			} else if (notification.type === "webhook") {
-				await this.sendWebhookNotification(networkResponse, notification, alertsToSend);
-			} else if (notification.type === "pager_duty") {
-				await this.sendPagerDutyNotification(networkResponse, notification, alertsToSend);
-			}
+			const success = await this.notifyAll({ notificationIDs, subject, html, content });
+			return success;
 		}
-		return true;
+
+		// Status monitors
+		const { subject, html } =
+			await this.notificationUtils.buildStatusEmail(networkResponse);
+		const content = await this.notificationUtils.buildWebhookMessage(networkResponse);
+		const success = this.notifyAll({ notificationIDs, subject, html, content });
+		return success;
 	}
 
-	/**
-	 * Handles notifications for different monitor types
-	 *
-	 * @async
-	 * @function handleNotifications
-	 * @param {Object} networkResponse - Response object containing monitor information
-	 * @returns {Promise<boolean>} - Indicates whether notifications were processed successfully
-	 */
-	async handleNotifications(networkResponse) {
-		try {
-			if (networkResponse.monitor.type === "hardware") {
-				this.handleHardwareNotifications(networkResponse);
-			}
-			this.handleStatusNotifications(networkResponse);
-			return true;
-		} catch (error) {
-			this.logger.error({
-				message: error.message,
-				service: this.SERVICE_NAME,
-				method: "handleNotifications",
-				stack: error.stack,
-			});
-		}
-	}
-
-	async testAllNotifications(notificationIDs) {
+	async notifyAll({ notificationIDs, subject, html, content }) {
 		const notifications = await this.db.getNotificationsByIds(notificationIDs);
 
 		// Map each notification to a test promise
-		const testPromises = notifications.map(async (notification) => {
+		const promises = notifications.map(async (notification) => {
 			try {
-				if (notification.type === "email") {
-					await this.sendTestEmail(notification);
-				} else if (notification.type === "webhook") {
-					await this.sendTestWebhookNotification(notification);
-				} else if (notification.type === "pager_duty") {
-					await this.sendTestPagerDutyNotification(notification);
-				}
+				await this.sendNotification({ notification, subject, content, html });
 				return true;
 			} catch (err) {
 				return false;
 			}
 		});
 
-		const results = await Promise.all(testPromises);
+		const results = await Promise.all(promises);
 		return results.every((r) => r === true);
 	}
+
+	async getTestNotification() {
+		const html = await this.notificationUtils.buildTestEmail();
+		const content = "This is a test notification";
+		const subject = "Test Notification";
+		return { subject, html, content };
+	}
+
+	async testAllNotifications(notificationIDs) {
+		const { subject, html, content } = await this.getTestNotification();
+		return this.notifyAll({ notificationIDs, subject, html, content });
+	}
+
+	async sendTestNotification(notification) {
+		const { subject, html, content } = await this.getTestNotification();
+		const success = await this.sendNotification({ notification, subject, content, html });
+		return success;
+	}
 }
 
 export default NotificationService;

From 2b48a72f35b29e2008ced092bdbd01881f5a84eb Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 19 Jun 2025 12:17:00 +0800
Subject: [PATCH 236/319] formatting

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 3ae8c3d75..a7d9fe069 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -746,4 +746,4 @@
 	"settingsEmailPool": "Pool - Enable connection pooling",
 	"sendTestNotifications": "Send test notifications",
 	"selectAll": "Select all"
-}
\ No newline at end of file
+}

From a1c11fbb3cccaf8dc91ffde0e81a2555fdb71374 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Thu, 19 Jun 2025 22:23:10 +0530
Subject: [PATCH 237/319] Added a new method for file download and correct csv
 is getting added.

---
 server/controllers/monitorController.js |  3 +--
 server/middleware/responseHandler.js    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
index 612fc328f..024a18a27 100755
--- a/server/controllers/monitorController.js
+++ b/server/controllers/monitorController.js
@@ -727,8 +727,7 @@ class MonitorController {
 
 			const csv = pkg.unparse(csvData);
 
-			return res.success({
-				msg: this.stringService.monitorsExported,
+			return res.file({
 				data: csv,
 				headers: {
 					"Content-Type": "text/csv",
diff --git a/server/middleware/responseHandler.js b/server/middleware/responseHandler.js
index e051e3fa5..5169e7160 100755
--- a/server/middleware/responseHandler.js
+++ b/server/middleware/responseHandler.js
@@ -45,6 +45,21 @@ const responseHandler = (req, res, next) => {
 			data,
 		});
 	};
+
+	/**
+	 * Sends a raw file response (for CSV, PDF, etc.)
+	 * @param {Object} options
+	 * @param {Buffer|string} options.data - The file content
+	 * @param {Object} options.headers - Headers to set (e.g. Content-Type, Content-Disposition)
+	 * @param {number} [options.status=200] - HTTP status code
+	 */
+	res.file = ({ data, headers = {}, status = 200 }) => {
+		Object.entries(headers).forEach(([key, value]) => {
+			res.setHeader(key, value);
+		});
+		return res.status(status).send(data);
+	};
+
 	next();
 };
 

From 9f88fbbcf20fa7f09941515fb5b186c74adad601 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Thu, 19 Jun 2025 22:32:53 +0530
Subject: [PATCH 238/319] Formatting issues.

---
 client/src/Components/MonitorActions/index.jsx | 2 +-
 client/src/locales/en.json                     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/Components/MonitorActions/index.jsx b/client/src/Components/MonitorActions/index.jsx
index d28822227..ac5d89a47 100644
--- a/client/src/Components/MonitorActions/index.jsx
+++ b/client/src/Components/MonitorActions/index.jsx
@@ -21,7 +21,7 @@ const MonitorActions = ({ isLoading }) => {
 	const { t } = useTranslation();
 	const [exportMonitors, isExporting] = useExportMonitors();
 
-	const options = [t('monitorActions.import'), t('monitorActions.export')];
+	const options = [t("monitorActions.import"), t("monitorActions.export")];
 
 	const handleClick = async () => {
 		if (selectedIndex === 0) {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 2fc2f1bb3..a22e8123d 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -745,9 +745,7 @@
 	"settingsEmailSecure": "Secure - Use SSL",
 	"settingsEmailPool": "Pool - Enable connection pooling",
 	"sendTestNotifications": "Send test notifications",
-	"selectAll": "Select all"
-}
-	},
+	"selectAll": "Select all",
 	"export": {
 		"title": "Export Monitors",
 		"success": "Monitors exported successfully!",

From 223203737ff4313b80dcb6088079f2817649a2a4 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Thu, 19 Jun 2025 22:42:07 +0530
Subject: [PATCH 239/319] Logging error only once as middleware takes care of
 it.

---
 server/db/mongo/modules/networkCheckModule.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
index 14c5824b8..b515ba5af 100644
--- a/server/db/mongo/modules/networkCheckModule.js
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -16,12 +16,8 @@ const createNetworkCheck = async (networkCheckData) => {
 		await networkCheck.save();
 		return networkCheck;
 	} catch (error) {
-		logger.error({
-			message: error.message,
-			service: SERVICE_NAME,
-			method: "createNetworkCheck",
-			stack: error.stack,
-		});
+		error.service = SERVICE_NAME;
+		error.method = "createNetworkCheck";
 		throw error;
 	}
 };
@@ -33,12 +29,8 @@ const getNetworkChecksByMonitorId = async (monitorId, limit = 100) => {
 			.limit(limit);
 		return networkChecks;
 	} catch (error) {
-		logger.error({
-			message: error.message,
-			service: SERVICE_NAME,
-			method: "getNetworkChecksByMonitorId",
-			stack: error.stack,
-		});
+		error.service = SERVICE_NAME;
+		error.method = "getNetworkChecksByMonitorId";
 		throw error;
 	}
 };

From 4cf38048988ee2665a1dff945b26a02d1b5a6ffb Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Thu, 19 Jun 2025 22:45:04 +0530
Subject: [PATCH 240/319] Formatting issues.

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index ff878c3da..fd89d31f5 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -746,4 +746,4 @@
 	"settingsEmailPool": "Pool - Enable connection pooling",
 	"sendTestNotifications": "Send test notifications",
 	"selectAll": "Select all"
-}
\ No newline at end of file
+}

From 1187f9d4cc9628354648b8dd983e7aa1f24cb66c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 10:08:13 +0800
Subject: [PATCH 241/319] add fix button loading state

---
 client/src/Hooks/useNotifications.js            | 2 +-
 client/src/Pages/Notifications/create/index.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 69e03fd5e..cc6c3e875 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -161,7 +161,7 @@ const useTestNotification = () => {
 		} catch (error) {
 			setError(error);
 			createToast({
-				body: t("notifications.test.failed"),
+				body: error?.response?.data?.msg || t("notifications.test.failed"),
 			});
 		} finally {
 			setIsLoading(false);
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index fba30185f..0fb6cce08 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -204,7 +204,7 @@ const CreateNotifications = () => {
 					spacing={theme.spacing(2)}
 				>
 					<Button
-						loading={isCreating || isEditing || notificationIsLoading}
+						loading={isTesting}
 						variant="contained"
 						color="secondary"
 						onClick={onTestNotification}

From 61a66644daab4a5163c099a5997f5a63f3a1fff3 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 10:58:29 +0800
Subject: [PATCH 242/319] disable job on addition if monitor is paused

---
 server/service/PulseQueue/PulseQueue.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index 0452985a0..f4a1b38a1 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -57,6 +57,9 @@ class PulseQueue {
 		job.unique({ "data.monitor._id": monitor._id });
 		job.attrs.jobId = monitorId.toString();
 		job.repeatEvery(`${intervalInSeconds} seconds`);
+		if (monitor.isActive === false) {
+			job.disable();
+		}
 		await job.save();
 	};
 

From 0a0c84b7f4b949b47ccd16f436a8e917d754103c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:26:59 +0800
Subject: [PATCH 243/319] update link component to allow for internal links

---
 client/src/Components/Link/index.jsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/Components/Link/index.jsx b/client/src/Components/Link/index.jsx
index 7a623a3b0..987c56f37 100644
--- a/client/src/Components/Link/index.jsx
+++ b/client/src/Components/Link/index.jsx
@@ -1,4 +1,6 @@
 import { Link as MuiLink, useTheme } from "@mui/material";
+import { Link as RouterLink } from "react-router-dom";
+
 import PropTypes from "prop-types";
 
 /**
@@ -10,7 +12,7 @@ import PropTypes from "prop-types";
  * @returns {JSX.Element}
  */
 
-const Link = ({ level, label, url }) => {
+const Link = ({ level, label, url, external = true }) => {
 	const theme = useTheme();
 
 	const levelConfig = {
@@ -49,11 +51,12 @@ const Link = ({ level, label, url }) => {
 	const { sx, color } = levelConfig[level];
 	return (
 		<MuiLink
-			href={url}
+			component={external ? "a" : RouterLink}
+			to={external ? undefined : url}
+			href={external ? url : undefined}
 			sx={{ width: "fit-content", ...sx }}
 			color={color}
-			target="_blank"
-			rel="noreferrer"
+			{...(external && { target: "_blank", rel: "noreferrer" })}
 		>
 			{label}
 		</MuiLink>
@@ -64,6 +67,7 @@ Link.propTypes = {
 	url: PropTypes.string.isRequired,
 	level: PropTypes.oneOf(["primary", "secondary", "tertiary", "error"]),
 	label: PropTypes.string.isRequired,
+	external: PropTypes.bool,
 };
 
 export default Link;

From d8573be7ac135fcfd8072a59df4c727a92c3b0aa Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:27:22 +0800
Subject: [PATCH 244/319] add util methods

---
 client/src/Utils/NetworkService.js | 12 ++++++++++++
 client/src/Utils/monitorUtils.js   |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index eee795268..85feafbe6 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1022,6 +1022,18 @@ class NetworkService {
 		const { id, notification } = config;
 		return this.axiosInstance.put(`/notifications/${id}`, notification);
 	}
+
+	async getQueueData() {
+		return this.axiosInstance.get(`/queue/all-metrics`, {
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
+	}
+
+	async flushQueue() {
+		return this.axiosInstance.post(`/queue/flush`);
+	}
 }
 
 export default NetworkService;
diff --git a/client/src/Utils/monitorUtils.js b/client/src/Utils/monitorUtils.js
index cc92a86ae..e3645b0d0 100644
--- a/client/src/Utils/monitorUtils.js
+++ b/client/src/Utils/monitorUtils.js
@@ -36,3 +36,12 @@ export const parseDomainName = (url) => {
 
 	return url;
 };
+
+export const TypeToPathMap = {
+	http: "uptime",
+	port: "uptime",
+	docker: "uptime",
+	ping: "uptime",
+	hardware: "infrastructure",
+	pagespeed: "pagespeed",
+};

From e610acb9c7ee7709002762eb0c75cb758963b307 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:27:50 +0800
Subject: [PATCH 245/319] Add Queue page and components

---
 .../Queue/components/FailedJobTable/index.jsx |  82 +++++++++
 .../Pages/Queue/components/JobTable/index.jsx | 168 ++++++++++++++++++
 .../Queue/components/MetricsTable/index.jsx   |  60 +++++++
 client/src/Pages/Queue/index.jsx              |  69 +++++++
 4 files changed, 379 insertions(+)
 create mode 100644 client/src/Pages/Queue/components/FailedJobTable/index.jsx
 create mode 100644 client/src/Pages/Queue/components/JobTable/index.jsx
 create mode 100644 client/src/Pages/Queue/components/MetricsTable/index.jsx
 create mode 100644 client/src/Pages/Queue/index.jsx

diff --git a/client/src/Pages/Queue/components/FailedJobTable/index.jsx b/client/src/Pages/Queue/components/FailedJobTable/index.jsx
new file mode 100644
index 000000000..d7284f9da
--- /dev/null
+++ b/client/src/Pages/Queue/components/FailedJobTable/index.jsx
@@ -0,0 +1,82 @@
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import DataTable from "../../../../Components/Table";
+
+import { useNavigate } from "react-router-dom";
+import { useTheme } from "@emotion/react";
+import { TypeToPathMap } from "../../../../Utils/monitorUtils";
+import PropTypes from "prop-types";
+import { useTranslation } from "react-i18next";
+
+const FailedJobTable = ({ metrics = {} }) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+	const jobsWithFailures = metrics?.jobsWithFailures;
+	const navigate = useNavigate();
+
+	const headers = [
+		{
+			id: "monitorId",
+			content: t("queuePage.failedJobTable.monitorIdHeader"),
+			render: (row) => {
+				return row.monitorId;
+			},
+		},
+		{
+			id: "monitorUrl",
+			content: t("queuePage.failedJobTable.monitorUrlHeader"),
+			render: (row) => {
+				return row.monitorUrl;
+			},
+		},
+		{
+			id: "failCount",
+			content: t("queuePage.failedJobTable.failCountHeader"),
+			render: (row) => {
+				return row.failCount;
+			},
+		},
+		{
+			id: "failedAt",
+			content: t("queuePage.failedJobTable.failedAtHeader"),
+			render: (row) => {
+				return row.failedAt;
+			},
+		},
+		{
+			id: "failReason",
+			content: t("queuePage.failedJobTable.failReasonHeader"),
+			render: (row) => {
+				return row.failReason;
+			},
+		},
+	];
+	return (
+		<Stack gap={theme.spacing(2)}>
+			<Typography variant="h2">{t("queuePage.failedJobTable.title")}</Typography>
+			<DataTable
+				headers={headers}
+				data={jobsWithFailures}
+				config={{
+					onRowClick: (row) => {
+						const path = TypeToPathMap[row.monitorType];
+						navigate(`/${path}/${row.monitorId}`);
+					},
+					rowSX: {
+						cursor: "pointer",
+						"&:hover td": {
+							backgroundColor: theme.palette.tertiary.main,
+							transition: "background-color .3s ease",
+						},
+					},
+				}}
+			/>
+		</Stack>
+	);
+};
+
+FailedJobTable.propTypes = {
+	metrics: PropTypes.object,
+};
+
+export default FailedJobTable;
diff --git a/client/src/Pages/Queue/components/JobTable/index.jsx b/client/src/Pages/Queue/components/JobTable/index.jsx
new file mode 100644
index 000000000..3bce34fff
--- /dev/null
+++ b/client/src/Pages/Queue/components/JobTable/index.jsx
@@ -0,0 +1,168 @@
+import Stack from "@mui/material/Stack";
+import DataTable from "../../../../Components/Table";
+import Typography from "@mui/material/Typography";
+// Utils
+import PropTypes from "prop-types";
+import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router-dom";
+import { TypeToPathMap } from "../../../../Utils/monitorUtils";
+import { useTranslation } from "react-i18next";
+
+const JobTable = ({ jobs = [] }) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const navigate = useNavigate();
+	const buildSx = (row) => {
+		if (row.lockedAt) {
+			return {
+				color: `${theme.palette.success.main} !important`,
+			};
+		}
+		if (!row.active) {
+			return {
+				color: `${theme.palette.warning.main} !important`,
+			};
+		}
+
+		if (row.failCount > 0 && row.lastFailedAt >= row.lastFinishedAt) {
+			return {
+				color: `${theme.palette.error.main} !important`,
+			};
+		}
+
+		return {};
+	};
+
+	const headers = [
+		{
+			id: "id",
+			content: t("queuePage.jobTable.idHeader"),
+			render: (row) => {
+				return row.monitorId;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "url",
+			content: t("queuePage.jobTable.urlHeader"),
+			render: (row) => {
+				return row.monitorUrl;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "type",
+			content: t("queuePage.jobTable.typeHeader"),
+			render: (row) => {
+				return row.monitorType;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "active",
+			content: t("queuePage.jobTable.activeHeader"),
+			render: (row) => {
+				return row.active.toString();
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "runCount",
+			content: t("queuePage.jobTable.runCountHeader"),
+			render: (row) => {
+				return row.runCount;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "failCount",
+			content: t("queuePage.jobTable.failCountHeader"),
+			render: (row) => {
+				return row.failCount;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "lastRun",
+			content: t("queuePage.jobTable.lastRunHeader"),
+			render: (row) => {
+				return row.lastRunAt || "-";
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "lockedAt",
+			content: t("queuePage.jobTable.lockedAtHeader"),
+			render: (row) => {
+				return row.lockedAt || "-";
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "lastFinish",
+			content: t("queuePage.jobTable.lastFinishedAtHeader"),
+			render: (row) => {
+				return row.lastFinishedAt || "-";
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+		{
+			id: "lastRunTook",
+			content: t("queuePage.jobTable.lastRunTookHeader"),
+			render: (row) => {
+				const value = row.lastRunTook ? row.lastRunTook + " ms" : "-";
+				return value;
+			},
+			getCellSx: (row) => {
+				return buildSx(row);
+			},
+		},
+	];
+
+	return (
+		<Stack gap={theme.spacing(2)}>
+			<Typography variant="h2">{t("queuePage.jobTable.title")}</Typography>
+			<DataTable
+				headers={headers}
+				data={jobs}
+				config={{
+					onRowClick: (row) => {
+						const path = TypeToPathMap[row.monitorType];
+						navigate(`/${path}/${row.monitorId}`);
+					},
+					rowSX: {
+						cursor: "pointer",
+						"&:hover td": {
+							backgroundColor: theme.palette.tertiary.main,
+							transition: "background-color .3s ease",
+						},
+					},
+				}}
+			/>
+		</Stack>
+	);
+};
+
+JobTable.propTypes = {
+	jobs: PropTypes.array,
+};
+
+export default JobTable;
diff --git a/client/src/Pages/Queue/components/MetricsTable/index.jsx b/client/src/Pages/Queue/components/MetricsTable/index.jsx
new file mode 100644
index 000000000..818b4e543
--- /dev/null
+++ b/client/src/Pages/Queue/components/MetricsTable/index.jsx
@@ -0,0 +1,60 @@
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import DataTable from "../../../../Components/Table";
+
+// Utils
+import { useTranslation } from "react-i18next";
+import { useTheme } from "@emotion/react";
+import PropTypes from "prop-types";
+
+const camelToTitle = (str) => {
+	return str
+		.replace(/([A-Z])/g, " $1")
+		.toLowerCase()
+		.replace(/^./, (m) => m.toUpperCase());
+};
+
+const Metrics = ({ metrics = {} }) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+	const keys = Object.keys(metrics);
+
+	const headers = [
+		{
+			id: "metric",
+			content: t("queuePage.metricsTable.metricHeader"),
+			render: (row) => {
+				return <Typography>{row.key}</Typography>;
+			},
+		},
+		{
+			id: "value",
+			content: t("queuePage.metricsTable.valueHeader"),
+			render: (row) => {
+				return <Typography>{row.value}</Typography>;
+			},
+		},
+	];
+
+	const data = keys
+		.filter((key) => key !== "jobsWithFailures")
+		.map((key) => {
+			return { key: camelToTitle(key), value: metrics[key] };
+		});
+
+	return (
+		<Stack gap={theme.spacing(2)}>
+			<Typography variant="h2">{t("queuePage.metricsTable.title")}</Typography>
+			<DataTable
+				headers={headers}
+				data={data}
+			/>
+		</Stack>
+	);
+};
+
+Metrics.propTypes = {
+	metrics: PropTypes.object,
+};
+
+export default Metrics;
diff --git a/client/src/Pages/Queue/index.jsx b/client/src/Pages/Queue/index.jsx
new file mode 100644
index 000000000..eb732560c
--- /dev/null
+++ b/client/src/Pages/Queue/index.jsx
@@ -0,0 +1,69 @@
+// Components
+import Stack from "@mui/material/Stack";
+import Breadcrumbs from "../../Components/Breadcrumbs";
+import JobTable from "./components/JobTable";
+import MetricsTable from "./components/MetricsTable";
+import FailedJobTable from "./components/FailedJobTable";
+import ButtonGroup from "@mui/material/ButtonGroup";
+import Button from "@mui/material/Button";
+
+// Utils
+import { useState } from "react";
+import { useFetchQueueData, useFlushQueue } from "../../Hooks/queueHooks";
+import { useTranslation } from "react-i18next";
+import { useTheme } from "@emotion/react";
+
+const QueueDetails = () => {
+	// Local state
+	const [trigger, setTrigger] = useState(false);
+
+	// Hooks
+	const { t } = useTranslation();
+	const theme = useTheme();
+	const [jobs, metrics, isLoading, error] = useFetchQueueData(trigger);
+	const [flushQueue, isFlushing, flushError] = useFlushQueue();
+
+	const BREADCRUMBS = [{ name: t("queuePage.title"), path: "/queue" }];
+	if (isLoading) return <div>Loading...</div>;
+	if (error || flushError) return <div>Error: {error.message}</div>;
+
+	return (
+		<Stack gap={theme.spacing(20)}>
+			<Breadcrumbs list={BREADCRUMBS} />
+			<JobTable jobs={jobs} />
+			<MetricsTable metrics={metrics} />
+			<FailedJobTable metrics={metrics} />
+
+			<ButtonGroup
+				variant="contained"
+				color="accent"
+				sx={{
+					position: "sticky",
+					bottom: 0,
+					zIndex: 1000,
+					backgroundColor: theme.palette.primary.main,
+					p: theme.spacing(4),
+					border: `1px solid ${theme.palette.primary.lowContrast}`,
+					borderRadius: theme.spacing(2),
+				}}
+			>
+				<Button
+					onClick={() => {
+						setTrigger(!trigger);
+					}}
+					loading={isLoading}
+				>
+					{t("queuePage.refreshButton")}
+				</Button>
+				<Button
+					onClick={() => flushQueue(trigger, setTrigger)}
+					loading={isFlushing}
+				>
+					{t("queuePage.flushButton")}
+				</Button>
+			</ButtonGroup>
+		</Stack>
+	);
+};
+
+export default QueueDetails;

From 6c51fc91b48c6a73de7badd6760b6e4bdab53567 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:28:20 +0800
Subject: [PATCH 246/319] add dev settings

---
 client/src/Pages/Settings/SettingsDev.jsx | 37 +++++++++++++++++++++++
 client/src/Pages/Settings/index.jsx       |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 client/src/Pages/Settings/SettingsDev.jsx

diff --git a/client/src/Pages/Settings/SettingsDev.jsx b/client/src/Pages/Settings/SettingsDev.jsx
new file mode 100644
index 000000000..1e7c3ea89
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsDev.jsx
@@ -0,0 +1,37 @@
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import ConfigBox from "../../Components/ConfigBox";
+// Utils
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import Link from "../../Components/Link";
+
+const SettingsDev = (isAdmin, HEADER_SX) => {
+	const { t } = useTranslation();
+
+	if (!isAdmin) return null;
+
+	return (
+		<ConfigBox>
+			<Box>
+				<Typography
+					component="h1"
+					variant="h2"
+				>
+					{t("settingsDev")}
+				</Typography>
+				<Typography sx={HEADER_SX}>{t("settingsDevDescription")}</Typography>
+			</Box>
+			<Box>
+				<Link
+					level="secondary"
+					label={t("settingsDevViewJobQueueDetails")}
+					url="/queue"
+					external={false}
+				/>
+			</Box>
+		</ConfigBox>
+	);
+};
+
+export default SettingsDev;
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 76eaccd6c..ef57a16c7 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -8,6 +8,7 @@ import SettingsPagespeed from "./SettingsPagespeed";
 import SettingsDemoMonitors from "./SettingsDemoMonitors";
 import SettingsAbout from "./SettingsAbout";
 import SettingsEmail from "./SettingsEmail";
+import SettingsDev from "./SettingsDev";
 import Button from "@mui/material/Button";
 // Utils
 import { settingsValidation } from "../../Validation/validation";
@@ -208,6 +209,10 @@ const Settings = () => {
 				emailPasswordHasBeenReset={emailPasswordHasBeenReset}
 				setEmailPasswordHasBeenReset={setEmailPasswordHasBeenReset}
 			/>
+			<SettingsDev
+				isAdmin={isAdmin}
+				HEADER_SX={HEADING_SX}
+			/>
 			<SettingsAbout />
 			<Stack
 				direction="row"

From c804f8b873e154503993f9af73b29a0f519ffae9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:28:33 +0800
Subject: [PATCH 247/319] add routes and localisation

---
 client/src/Routes/index.jsx |  5 +++++
 client/src/locales/en.json  | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 29daa2942..ba27482ff 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -51,6 +51,7 @@ import ProtectedRoute from "../Components/ProtectedRoute";
 import CreateNewMaintenanceWindow from "../Pages/Maintenance/CreateMaintenance";
 import withAdminCheck from "../Components/HOC/withAdminCheck";
 import BulkImport from "../Pages/Uptime/BulkImport";
+import Queue from "../Pages/Queue";
 
 const Routes = () => {
 	const AdminCheckedRegister = withAdminCheck(AuthRegister);
@@ -186,6 +187,10 @@ const Routes = () => {
 					path="account/team"
 					element={<Account open={"team"} />}
 				/>
+				<Route
+					path="queue"
+					element={<Queue />}
+				/>
 			</Route>
 
 			<Route
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index a7d9fe069..e55acb530 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -30,6 +30,9 @@
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
 	"settingsAbout": "About",
+	"settingsDev": "Developer",
+	"settingsDevDescription": "Developer settings",
+	"settingsDevViewJobQueueDetails": "View job queue details",
 	"settingsDevelopedBy": "Developed by Bluewave Labs.",
 	"settingsSave": "Save",
 	"settingsSuccessSaved": "Settings saved successfully",
@@ -745,5 +748,36 @@
 	"settingsEmailSecure": "Secure - Use SSL",
 	"settingsEmailPool": "Pool - Enable connection pooling",
 	"sendTestNotifications": "Send test notifications",
-	"selectAll": "Select all"
+	"selectAll": "Select all",
+	"queuePage": {
+		"title": "Queue",
+		"refreshButton": "Refresh",
+		"flushButton": "Flush queue",
+		"jobTable": {
+			"title": "Jobs currently in queue",
+			"idHeader": "Monitor ID",
+			"urlHeader": "URL",
+			"typeHeader": "Type",
+			"activeHeader": "Active",
+			"lockedAtHeader": "Locked at",
+			"runCountHeader": "Run count",
+			"failCountHeader": "Fail count",
+			"lastRunHeader": "Last run at",
+			"lastFinishedAtHeader": "Last finished at",
+			"lastRunTookHeader": "Last run took"
+		},
+		"metricsTable": {
+			"title": "Queue metrics",
+			"metricHeader": "Metric",
+			"valueHeader": "Value"
+		},
+		"failedJobTable": {
+			"title": "Failed jobs",
+			"monitorIdHeader": "Monitor ID",
+			"monitorUrlHeader": "Monitor URL",
+			"failCountHeader": "Fail count",
+			"failedAtHeader": "Last failed at",
+			"failReasonHeader": "Fail reason"
+		}
+	}
 }

From c23e941ecedd879f277f2cbadd82a3b9bc191c7e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:28:43 +0800
Subject: [PATCH 248/319] Add queue hooks

---
 client/src/Hooks/queueHooks.js | 57 ++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 client/src/Hooks/queueHooks.js

diff --git a/client/src/Hooks/queueHooks.js b/client/src/Hooks/queueHooks.js
new file mode 100644
index 000000000..f7a25b3d3
--- /dev/null
+++ b/client/src/Hooks/queueHooks.js
@@ -0,0 +1,57 @@
+import { useState, useEffect } from "react";
+import { networkService } from "../main";
+import { createToast } from "../Utils/toastUtils";
+
+const useFetchQueueData = (trigger) => {
+	const [jobs, setJobs] = useState(undefined);
+	const [metrics, setMetrics] = useState(undefined);
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(undefined);
+
+	useEffect(() => {
+		const fetchJobs = async () => {
+			try {
+				setIsLoading(true);
+				const response = await networkService.getQueueData();
+				if (response.status === 200) {
+					setJobs(response.data.data.jobs);
+					setMetrics(response.data.data.metrics);
+				}
+			} catch (error) {
+				setError(error);
+			} finally {
+				setIsLoading(false);
+			}
+		};
+
+		fetchJobs();
+	}, [trigger]);
+
+	return [jobs, metrics, isLoading, error];
+};
+
+const useFlushQueue = () => {
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(undefined);
+
+	const flushQueue = async (trigger, setTrigger) => {
+		try {
+			setIsLoading(true);
+			await networkService.flushQueue();
+			createToast({
+				body: "Queue flushed",
+			});
+		} catch (error) {
+			setError(error);
+			createToast({
+				body: error.message,
+			});
+		} finally {
+			setIsLoading(false);
+			setTrigger(!trigger);
+		}
+	};
+	return [flushQueue, isLoading, error];
+};
+
+export { useFetchQueueData, useFlushQueue };

From 92d4e9ea12275c1782ec8560bf97b69407eaf962 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:29:08 +0800
Subject: [PATCH 249/319] Add additional metrics

---
 server/service/PulseQueue/PulseQueue.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/server/service/PulseQueue/PulseQueue.js b/server/service/PulseQueue/PulseQueue.js
index f4a1b38a1..50a959559 100644
--- a/server/service/PulseQueue/PulseQueue.js
+++ b/server/service/PulseQueue/PulseQueue.js
@@ -139,6 +139,8 @@ class PulseQueue {
 		const jobs = await this.pulse.jobs();
 		const metrics = jobs.reduce(
 			(acc, job) => {
+				acc.totalRuns += job.attrs.runCount || 0;
+				acc.totalFailures += job.attrs.failCount || 0;
 				acc.jobs++;
 				if (job.attrs.failCount > 0 && job.attrs.failedAt >= job.attrs.lastFinishedAt) {
 					acc.failingJobs++;
@@ -150,13 +152,22 @@ class PulseQueue {
 					acc.jobsWithFailures.push({
 						monitorId: job.attrs.data.monitor._id,
 						monitorUrl: job.attrs.data.monitor.url,
+						monitorType: job.attrs.data.monitor.type,
+						failedAt: job.attrs.failedAt,
 						failCount: job.attrs.failCount,
 						failReason: job.attrs.failReason,
 					});
 				}
 				return acc;
 			},
-			{ jobs: 0, activeJobs: 0, failingJobs: 0, jobsWithFailures: [] }
+			{
+				jobs: 0,
+				activeJobs: 0,
+				failingJobs: 0,
+				jobsWithFailures: [],
+				totalRuns: 0,
+				totalFailures: 0,
+			}
 		);
 		return metrics;
 	};
@@ -167,10 +178,18 @@ class PulseQueue {
 			return {
 				monitorId: job.attrs.data.monitor._id,
 				monitorUrl: job.attrs.data.monitor.url,
+				monitorType: job.attrs.data.monitor.type,
+				active: !job.attrs.disabled,
 				lockedAt: job.attrs.lockedAt,
 				runCount: job.attrs.runCount || 0,
 				failCount: job.attrs.failCount || 0,
 				failReason: job.attrs.failReason,
+				lastRunAt: job.attrs.lastRunAt,
+				lastFinishedAt: job.attrs.lastFinishedAt,
+				lastRunTook: job.attrs.lockedAt
+					? null
+					: job.attrs.lastFinishedAt - job.attrs.lastRunAt,
+				lastFailedAt: job.attrs.failedAt,
 			};
 		});
 	};

From 85a996635ff39a40a17155e66cca22ccfce780ff Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:29:27 +0800
Subject: [PATCH 250/319] add controller method for getting all metrics

---
 server/controllers/queueController.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/controllers/queueController.js b/server/controllers/queueController.js
index b1a7badee..968106a5a 100755
--- a/server/controllers/queueController.js
+++ b/server/controllers/queueController.js
@@ -25,7 +25,7 @@ class JobQueueController {
 		try {
 			const jobs = await this.jobQueue.getJobs();
 			return res.success({
-				msg: this.stringService.queueGetMetrics,
+				msg: this.stringService.queueGetJobs,
 				data: jobs,
 			});
 		} catch (error) {
@@ -34,6 +34,20 @@ class JobQueueController {
 		}
 	};
 
+	getAllMetrics = async (req, res, next) => {
+		try {
+			const jobs = await this.jobQueue.getJobs();
+			const metrics = await this.jobQueue.getMetrics();
+			return res.success({
+				msg: this.stringService.queueGetAllMetrics,
+				data: { jobs, metrics },
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "getAllMetrics"));
+			return;
+		}
+	};
+
 	addJob = async (req, res, next) => {
 		try {
 			await this.jobQueue.addJob(Math.random().toString(36).substring(7));

From a7f795795fb84db132cf0a205347dc7272b7bde9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:29:36 +0800
Subject: [PATCH 251/319] add route

---
 server/routes/queueRoute.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/routes/queueRoute.js b/server/routes/queueRoute.js
index dc9b40917..c40d21528 100755
--- a/server/routes/queueRoute.js
+++ b/server/routes/queueRoute.js
@@ -19,6 +19,12 @@ class QueueRoutes {
 			this.queueController.getJobs
 		);
 
+		this.router.get(
+			"/all-metrics",
+			isAllowed(["admin", "superadmin"]),
+			this.queueController.getAllMetrics
+		);
+
 		this.router.post(
 			"/jobs",
 			isAllowed(["admin", "superadmin"]),

From 2b279af0934cc7eb2fa0de4ab82af59654010347 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:30:17 +0800
Subject: [PATCH 252/319] localization

---
 server/locales/en.json          | 1 +
 server/service/stringService.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/server/locales/en.json b/server/locales/en.json
index a693c6eef..74296d0a5 100755
--- a/server/locales/en.json
+++ b/server/locales/en.json
@@ -123,6 +123,7 @@
 	"monitorCertificate": "Got monitor certificate successfully",
 	"monitorDemoAdded": "Successfully added demo monitors",
 	"queueGetMetrics": "Got metrics successfully",
+	"queueGetJobs": "Got jobs successfully",
 	"queueAddJob": "Job added successfully",
 	"queueObliterate": "Queue obliterated",
 	"jobQueueDeleteJobSuccess": "Job removed successfully",
diff --git a/server/service/stringService.js b/server/service/stringService.js
index b02254255..499aa769f 100755
--- a/server/service/stringService.js
+++ b/server/service/stringService.js
@@ -276,6 +276,10 @@ class StringService {
 		return this.translationService.getTranslation("queueGetMetrics");
 	}
 
+	get queueGetJobs() {
+		return this.translationService.getTranslation("queueGetJobs");
+	}
+
 	get queueAddJob() {
 		return this.translationService.getTranslation("queueAddJob");
 	}

From 3351115e3c8ea011ae4dde05bdbdd2e969a5342f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 20 Jun 2025 14:47:19 +0800
Subject: [PATCH 253/319] fix props

---
 client/src/Pages/Settings/SettingsDev.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsDev.jsx b/client/src/Pages/Settings/SettingsDev.jsx
index 1e7c3ea89..721a17d5c 100644
--- a/client/src/Pages/Settings/SettingsDev.jsx
+++ b/client/src/Pages/Settings/SettingsDev.jsx
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import Link from "../../Components/Link";
 
-const SettingsDev = (isAdmin, HEADER_SX) => {
+const SettingsDev = ({ isAdmin, HEADER_SX }) => {
 	const { t } = useTranslation();
 
 	if (!isAdmin) return null;

From 9700551f41edf53d2d3d86ded9cce5ce5bbae265 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sat, 21 Jun 2025 00:18:09 +0530
Subject: [PATCH 254/319] Removal of n count of document.

---
 server/db/mongo/modules/networkCheckModule.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
index b515ba5af..608113a73 100644
--- a/server/db/mongo/modules/networkCheckModule.js
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -5,14 +5,7 @@ const SERVICE_NAME = "networkCheckModule";
 
 const createNetworkCheck = async (networkCheckData) => {
 	try {
-		const { monitorId, status } = networkCheckData;
-		const n = (await NetworkCheck.countDocuments({ monitorId })) + 1;
-
-		const networkCheck = await new NetworkCheck({
-			...networkCheckData,
-			n,
-		});
-
+		const networkCheck = await new NetworkCheck(networkCheckData);
 		await networkCheck.save();
 		return networkCheck;
 	} catch (error) {

From ba00e9afffe2660da19d3b0c1a299597983e7fb0 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sat, 21 Jun 2025 00:25:30 +0530
Subject: [PATCH 255/319] Added JSDocs in module file.

---
 server/db/mongo/modules/networkCheckModule.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
index 608113a73..8d44af96f 100644
--- a/server/db/mongo/modules/networkCheckModule.js
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -1,8 +1,15 @@
 import NetworkCheck from "../../models/NetworkCheck.js";
-import logger from "../../../utils/logger.js";
 
 const SERVICE_NAME = "networkCheckModule";
 
+/**
+ * Creates and saves a new network check document to the database.
+ * @async
+ * @param {object} networkCheckData - The data for the new network check. This should conform to the NetworkCheckSchema.
+ * @param {string} networkCheckData.monitorId - The ID of the monitor associated with this check.
+ * @returns {Promise<object>} A promise that resolves to the newly created network check document.
+ * @throws {Error} Throws an error if the database operation fails.
+ */
 const createNetworkCheck = async (networkCheckData) => {
 	try {
 		const networkCheck = await new NetworkCheck(networkCheckData);

From ecb1ca4517badd21970b11579e95978d80e231a7 Mon Sep 17 00:00:00 2001
From: Owaise Imdad <owaiseimdad@gmail.com>
Date: Sat, 21 Jun 2025 00:25:57 +0530
Subject: [PATCH 256/319] Missed to add a line in jsdoc.

---
 server/db/mongo/modules/networkCheckModule.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/db/mongo/modules/networkCheckModule.js b/server/db/mongo/modules/networkCheckModule.js
index 8d44af96f..53c55c7e3 100644
--- a/server/db/mongo/modules/networkCheckModule.js
+++ b/server/db/mongo/modules/networkCheckModule.js
@@ -22,6 +22,14 @@ const createNetworkCheck = async (networkCheckData) => {
 	}
 };
 
+/**
+ * Retrieves a list of network checks for a specific monitor, sorted by most recent.
+ * @async
+ * @param {string} monitorId - The ID of the monitor to retrieve checks for.
+ * @param {number} [limit=100] - The maximum number of checks to return. Defaults to 100.
+ * @returns {Promise<Array<object>>} A promise that resolves to an array of network check documents.
+ * @throws {Error} Throws an error if the database operation fails.
+ */
 const getNetworkChecksByMonitorId = async (monitorId, limit = 100) => {
 	try {
 		const networkChecks = await NetworkCheck.find({ monitorId })

From 452d1a2ad5168a8b0022cd3e2e184ec35ba95bfa Mon Sep 17 00:00:00 2001
From: mohadeseh safari <mohadeseh.safari1992@gmail.com>
Date: Fri, 20 Jun 2025 19:58:11 -0400
Subject: [PATCH 257/319] Fix missing password error translation for
 auth.common.fields.password.errors.incorrect

---
 client/src/locales/en.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index a7d9fe069..c374b48e8 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -507,6 +507,13 @@
 	},
 	"auth": {
 		"common": {
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": "The password you provided does not match our records"
+					}
+				}
+			},
 			"navigation": {
 				"continue": "Continue",
 				"back": "Back"

From 105353c9f6e609530399a36cf7aa07ccc02746f8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sat, 21 Jun 2025 16:15:34 +0800
Subject: [PATCH 258/319] add factory utils for creating header function

---
 client/src/Components/Table/TableUtils.js     | 11 +++
 .../Pages/Queue/components/JobTable/index.jsx | 86 +++----------------
 2 files changed, 23 insertions(+), 74 deletions(-)
 create mode 100644 client/src/Components/Table/TableUtils.js

diff --git a/client/src/Components/Table/TableUtils.js b/client/src/Components/Table/TableUtils.js
new file mode 100644
index 000000000..a9f95a5b7
--- /dev/null
+++ b/client/src/Components/Table/TableUtils.js
@@ -0,0 +1,11 @@
+export const createHeaderFactory = (getCellSx = () => {}) => {
+	return ({ id, content, onClick = () => {}, render = () => {} }) => {
+		return {
+			id,
+			content,
+			onClick,
+			getCellSx,
+			render,
+		};
+	};
+};
diff --git a/client/src/Pages/Queue/components/JobTable/index.jsx b/client/src/Pages/Queue/components/JobTable/index.jsx
index 3bce34fff..3b694a991 100644
--- a/client/src/Pages/Queue/components/JobTable/index.jsx
+++ b/client/src/Pages/Queue/components/JobTable/index.jsx
@@ -7,6 +7,7 @@ import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { TypeToPathMap } from "../../../../Utils/monitorUtils";
 import { useTranslation } from "react-i18next";
+import { createHeaderFactory } from "../../../../Components/Table/TableUtils";
 
 const JobTable = ({ jobs = [] }) => {
 	const theme = useTheme();
@@ -33,110 +34,47 @@ const JobTable = ({ jobs = [] }) => {
 		return {};
 	};
 
-	const headers = [
+	const createHeader = createHeaderFactory(buildSx);
+	const headersData = [
 		{
 			id: "id",
 			content: t("queuePage.jobTable.idHeader"),
-			render: (row) => {
-				return row.monitorId;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.monitorId,
 		},
 		{
 			id: "url",
 			content: t("queuePage.jobTable.urlHeader"),
-			render: (row) => {
-				return row.monitorUrl;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.monitorUrl,
 		},
 		{
 			id: "type",
 			content: t("queuePage.jobTable.typeHeader"),
-			render: (row) => {
-				return row.monitorType;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.monitorType,
 		},
 		{
 			id: "active",
 			content: t("queuePage.jobTable.activeHeader"),
-			render: (row) => {
-				return row.active.toString();
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.active.toString(),
 		},
 		{
 			id: "runCount",
 			content: t("queuePage.jobTable.runCountHeader"),
-			render: (row) => {
-				return row.runCount;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.runCount,
 		},
 		{
 			id: "failCount",
 			content: t("queuePage.jobTable.failCountHeader"),
-			render: (row) => {
-				return row.failCount;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.failCount,
 		},
 		{
 			id: "lastRun",
 			content: t("queuePage.jobTable.lastRunHeader"),
-			render: (row) => {
-				return row.lastRunAt || "-";
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
-		},
-		{
-			id: "lockedAt",
-			content: t("queuePage.jobTable.lockedAtHeader"),
-			render: (row) => {
-				return row.lockedAt || "-";
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
-		},
-		{
-			id: "lastFinish",
-			content: t("queuePage.jobTable.lastFinishedAtHeader"),
-			render: (row) => {
-				return row.lastFinishedAt || "-";
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
-		},
-		{
-			id: "lastRunTook",
-			content: t("queuePage.jobTable.lastRunTookHeader"),
-			render: (row) => {
-				const value = row.lastRunTook ? row.lastRunTook + " ms" : "-";
-				return value;
-			},
-			getCellSx: (row) => {
-				return buildSx(row);
-			},
+			render: (row) => row.lastRunAt || "-",
 		},
 	];
 
+	const headers = headersData.map((header) => createHeader(header));
+
 	return (
 		<Stack gap={theme.spacing(2)}>
 			<Typography variant="h2">{t("queuePage.jobTable.title")}</Typography>

From f3072e04475fe1fd1a04a7b0c3c3bf503157709c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sat, 21 Jun 2025 16:20:31 +0800
Subject: [PATCH 259/319] add missing columns

---
 .../Pages/Queue/components/JobTable/index.jsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/client/src/Pages/Queue/components/JobTable/index.jsx b/client/src/Pages/Queue/components/JobTable/index.jsx
index 3b694a991..f4aa0768c 100644
--- a/client/src/Pages/Queue/components/JobTable/index.jsx
+++ b/client/src/Pages/Queue/components/JobTable/index.jsx
@@ -71,6 +71,25 @@ const JobTable = ({ jobs = [] }) => {
 			content: t("queuePage.jobTable.lastRunHeader"),
 			render: (row) => row.lastRunAt || "-",
 		},
+		{
+			id: "lockedAt",
+			content: t("queuePage.jobTable.lockedAtHeader"),
+			render: (row) => row.lockedAt || "-",
+		},
+
+		{
+			id: "lastFinish",
+			content: t("queuePage.jobTable.lastFinishedAtHeader"),
+			render: (row) => row.lastFinishedAt || "-",
+		},
+		{
+			id: "lastRunTook",
+			content: t("queuePage.jobTable.lastRunTookHeader"),
+			render: (row) => {
+				const value = row.lastRunTook ? row.lastRunTook + " ms" : "-";
+				return value;
+			},
+		},
 	];
 
 	const headers = headersData.map((header) => createHeader(header));

From f853a034910fddfc4c2266672208ab3c7ff23d08 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:17:26 +0530
Subject: [PATCH 260/319] refactor(settings): email settings toggle in one row

---
 client/src/Pages/Settings/SettingsEmail.jsx | 58 ++++++++++-----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 4bd6ff3ad..061cf2602 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -212,37 +212,35 @@ const SettingsEmail = ({
 							gap: theme.spacing(4),
 						}}
 					>
-						<Typography>{t("settingsEmailSecure")}</Typography>
-						<Switch
-							name="systemEmailSecure"
-							checked={systemEmailSecure}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailPool")}</Typography>
-						<Switch
-							name="systemEmailPool"
-							checked={systemEmailPool}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailIgnoreTLS")}</Typography>
-						<Switch
-							name="systemEmailIgnoreTLS"
-							checked={systemEmailIgnoreTLS}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailRequireTLS")}</Typography>
-						<Switch
-							name="systemEmailRequireTLS"
-							checked={systemEmailRequireTLS}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailRejectUnauthorized")}</Typography>
-						<Switch
-							name="systemEmailRejectUnauthorized"
-							checked={systemEmailRejectUnauthorized}
-							onChange={handleChange}
-						/>
+						{[
+							["settingsEmailSecure", "systemEmailSecure", systemEmailSecure],
+							["settingsEmailPool", "systemEmailPool", systemEmailPool],
+							["settingsEmailIgnoreTLS", "systemEmailIgnoreTLS", systemEmailIgnoreTLS],
+							["settingsEmailRequireTLS", "systemEmailRequireTLS", systemEmailRequireTLS],
+							[
+								"settingsEmailRejectUnauthorized",
+								"systemEmailRejectUnauthorized",
+								systemEmailRejectUnauthorized,
+							],
+						].map(([labelKey, name, value]) => (
+							<Box
+								key={name}
+								sx={{
+									display: "flex",
+									alignItems: "center",
+									justifyContent: "space-between",
+								}}
+							>
+								<Typography>{t(labelKey)}</Typography>
+								<Switch
+									name={name}
+									checked={value}
+									onChange={handleChange}
+								/>
+							</Box>
+						))}
 					</Box>
+
 					<Box>
 						{systemEmailHost &&
 							systemEmailPort &&

From 9972c3cf9a31b266e238f84020c24285a70b863f Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:35:45 +0530
Subject: [PATCH 261/319] refactor(settings): changed wordings of email
 settings

---
 client/src/locales/en.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d3a274a32..b29c290a9 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -749,11 +749,11 @@
 	},
 	"advancedMatching": "Advanced matching",
 	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
-	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
-	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool - Enable connection pooling",
+	"settingsEmailIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
+	"settingsEmailRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
+	"settingsEmailRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
+	"settingsEmailSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
+	"settingsEmailPool": "Enable connection pooling: Reuse existing connections to improve performance",
 	"sendTestNotifications": "Send test notifications",
 	"selectAll": "Select all",
 	"queuePage": {

From 3a6d3071be4ca68fd225142ff362e721f91c7011 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:39:42 +0530
Subject: [PATCH 262/319] chore: format

---
 client/src/locales/en.json | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index b29c290a9..14317e689 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -785,15 +785,16 @@
 			"failCountHeader": "Fail count",
 			"failedAtHeader": "Last failed at",
 			"failReasonHeader": "Fail reason"
+		},
+		"export": {
+			"title": "Export Monitors",
+			"success": "Monitors exported successfully!",
+			"failed": "Failed to export monitors"
+		},
+		"monitorActions": {
+			"title": "Export/Import",
+			"import": "Import Monitors",
+			"export": "Export Monitors"
 		}
-	"export": {
-		"title": "Export Monitors",
-		"success": "Monitors exported successfully!",
-		"failed": "Failed to export monitors"
-	},
-	"monitorActions": {
-		"title": "Export/Import",
-		"import": "Import Monitors",
-		"export": "Export Monitors"
 	}
 }

From 50e9a6b967ce3f32c4c390a58d1bcf45f8fb22c6 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 19:40:42 +0530
Subject: [PATCH 263/319] chore: formatted NetworkService

---
 client/src/Utils/NetworkService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index d9a3853e1..651f72fe0 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1033,8 +1033,8 @@ class NetworkService {
 
 	async flushQueue() {
 		return this.axiosInstance.post(`/queue/flush`);
-    
-    
+	}
+
 	async exportMonitors() {
 		const response = await this.axiosInstance.get("/monitors/export", {
 			responseType: "blob",

From 31321749b20a963d1d2c2e4d5da4d9972e3a6884 Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Sun, 22 Jun 2025 17:11:01 +0200
Subject: [PATCH 264/319] fix: syntax errors in NetworkService.js and en.json
 causing build failure

---
 client/src/Utils/NetworkService.js | 2 +-
 client/src/locales/en.json         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index d9a3853e1..e7021d585 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1033,7 +1033,7 @@ class NetworkService {
 
 	async flushQueue() {
 		return this.axiosInstance.post(`/queue/flush`);
-    
+	}
     
 	async exportMonitors() {
 		const response = await this.axiosInstance.get("/monitors/export", {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d3a274a32..81a664290 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -786,6 +786,7 @@
 			"failedAtHeader": "Last failed at",
 			"failReasonHeader": "Fail reason"
 		}
+	},
 	"export": {
 		"title": "Export Monitors",
 		"success": "Monitors exported successfully!",

From 7c5516cd7505dc9045d9cad92a8246d4de25fc19 Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Sun, 22 Jun 2025 18:26:20 +0200
Subject: [PATCH 265/319] feat(api): add backend support for toggling admin
 login link visibility on status page

---
 server/db/models/StatusPage.js              | 4 ++++
 server/db/mongo/modules/statusPageModule.js | 1 +
 server/validation/joi.js                    | 1 +
 3 files changed, 6 insertions(+)

diff --git a/server/db/models/StatusPage.js b/server/db/models/StatusPage.js
index e4c81707f..dd64c184a 100755
--- a/server/db/models/StatusPage.js
+++ b/server/db/models/StatusPage.js
@@ -70,6 +70,10 @@ const StatusPageSchema = mongoose.Schema(
 			type: Boolean,
 			default: true,
 		},
+		showAdminLoginLink: {
+			type: Boolean,
+			default: false,
+		}
 	},
 	{ timestamps: true }
 );
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index d6331fcf8..e94ffbd55 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -153,6 +153,7 @@ const getStatusPage = async (url) => {
 						showCharts: 1,
 						showUptimePercentage: 1,
 						timezone: 1,
+						showAdminLoginLink: 1,
 						url: 1,
 					},
 					monitors: {
diff --git a/server/validation/joi.js b/server/validation/joi.js
index 448a844f1..e5c1d6e43 100755
--- a/server/validation/joi.js
+++ b/server/validation/joi.js
@@ -463,6 +463,7 @@ const createStatusPageBodyValidation = joi.object({
 	isPublished: joi.boolean(),
 	showCharts: joi.boolean().optional(),
 	showUptimePercentage: joi.boolean(),
+	showAdminLoginLink: joi.boolean().optional(),
 });
 
 const imageValidation = joi

From e6fd57d0bb4a1649bdd41415d231d7834a57a354 Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Sun, 22 Jun 2025 18:27:56 +0200
Subject: [PATCH 266/319] feat: optionally hide the "Administrator? Login Here"
 on status page

---
 client/src/Pages/StatusPage/Status/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/StatusPage/Status/index.jsx b/client/src/Pages/StatusPage/Status/index.jsx
index 727daeeb1..45822f6c6 100644
--- a/client/src/Pages/StatusPage/Status/index.jsx
+++ b/client/src/Pages/StatusPage/Status/index.jsx
@@ -48,7 +48,7 @@ const PublicStatus = () => {
 	let link = undefined;
 	const isPublic = location.pathname.startsWith("/status/uptime/public");
 	// Public status page
-	if (isPublic) {
+	if (isPublic && statusPage && statusPage.showAdminLoginLink === true) {
 		sx = {
 			paddingTop: theme.spacing(20),
 			paddingLeft: "20vw",

From 4a36bd3157c24ef48cb375457db96187938fa1ad Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Sun, 22 Jun 2025 18:28:17 +0200
Subject: [PATCH 267/319] =?UTF-8?q?feat:=20add=20toggle=20to=20show/hide?=
 =?UTF-8?q?=20=E2=80=9CAdministrator=3F=20Login=20Here=E2=80=9D=20link=20i?=
 =?UTF-8?q?n=20status=20page=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/StatusPage/Create/Components/Tabs/Content.jsx    | 7 +++++++
 client/src/Pages/StatusPage/Create/index.jsx               | 4 +++-
 client/src/Utils/NetworkService.js                         | 3 +++
 client/src/Validation/validation.js                        | 1 +
 client/src/locales/en.json                                 | 1 +
 client/src/locales/pt-BR.json                              | 1 +
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx b/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
index 7423b05bd..327a2fb0a 100644
--- a/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
+++ b/client/src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
@@ -90,6 +90,13 @@ const Content = ({
 							isChecked={form.showUptimePercentage}
 							onChange={handleFormChange}
 						/>
+						<Checkbox
+							id="showAdminLoginLink"
+							name="showAdminLoginLink"
+							label={t("showAdminLoginLink")}
+							isChecked={form.showAdminLoginLink}
+							onChange={handleFormChange}
+						/>
 					</Stack>
 				</ConfigStack>
 			</Stack>
diff --git a/client/src/Pages/StatusPage/Create/index.jsx b/client/src/Pages/StatusPage/Create/index.jsx
index 50535cd90..63c248786 100644
--- a/client/src/Pages/StatusPage/Create/index.jsx
+++ b/client/src/Pages/StatusPage/Create/index.jsx
@@ -20,7 +20,7 @@ const TAB_LIST = ["General settings", "Contents"];
 
 const ERROR_TAB_MAPPING = [
 	["companyName", "url", "timezone", "color", "isPublished", "logo"],
-	["monitors", "showUptimePercentage", "showCharts"],
+	["monitors", "showUptimePercentage", "showCharts", "showAdminLoginLink"],
 ];
 
 const CreateStatusPage = () => {
@@ -39,6 +39,7 @@ const CreateStatusPage = () => {
 		monitors: [],
 		showCharts: true,
 		showUptimePercentage: true,
+		showAdminLoginLink: false,
 	});
 	const [errors, setErrors] = useState({});
 	const [selectedMonitors, setSelectedMonitors] = useState([]);
@@ -195,6 +196,7 @@ const CreateStatusPage = () => {
 				logo: newLogo,
 				showCharts: statusPage?.showCharts ?? true,
 				showUptimePercentage: statusPage?.showUptimePercentage ?? true,
+				showAdminLoginLink: statusPage?.showAdminLoginLink ?? false,
 			};
 		});
 		setSelectedMonitors(statusPageMonitors);
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index e7021d585..20281abf5 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -871,6 +871,9 @@ class NetworkService {
 		if (form.showUptimePercentage !== undefined) {
 			fd.append("showUptimePercentage", String(form.showUptimePercentage));
 		}
+		if (form.showAdminLoginLink !== undefined) {
+			fd.append("showAdminLoginLink", String(form.showAdminLoginLink));
+		}
 		form.monitors &&
 			form.monitors.forEach((monitorId) => {
 				fd.append("monitors[]", monitorId);
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 4e6a806c8..d86bbd556 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -277,6 +277,7 @@ const statusPageValidation = joi.object({
 	logo: logoImageValidation,
 	showUptimePercentage: joi.boolean(),
 	showCharts: joi.boolean(),
+	showAdminLoginLink: joi.boolean(),
 });
 
 const settingsValidation = joi.object({
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 81a664290..818258905 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -319,6 +319,7 @@
 	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
 	"showCharts": "Show charts",
 	"showUptimePercentage": "Show uptime percentage",
+	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
 	"removeLogo": "Remove Logo",
 	"statusPageStatus": "A public status page is not set up.",
 	"statusPageStatusContactAdmin": "Please contact to your administrator",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index a783a820c..7368c360c 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -312,6 +312,7 @@
 	"statusPageCreateTabsContentFeaturesDescription": "Mostrar mais detalhes na página de status",
 	"showCharts": "Mostrar gráficos",
 	"showUptimePercentage": "Mostrar porcentagem de Uptime",
+	"showAdminLoginLink": "Mostrar o link \"Administrador? Efetue login aqui\" na página de status",
 	"removeLogo": "Remover logo",
 	"statusPageStatus": "Uma página de status pública não está configurada.",
 	"statusPageStatusContactAdmin": "Entre em contato com seu administrador",

From 465bdd29457159c650b94a3cb459f81a14acea3b Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Sun, 22 Jun 2025 18:33:58 +0200
Subject: [PATCH 268/319] chore: format

---
 client/src/Utils/NetworkService.js | 2 +-
 server/db/models/StatusPage.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 20281abf5..653ed5c5b 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1037,7 +1037,7 @@ class NetworkService {
 	async flushQueue() {
 		return this.axiosInstance.post(`/queue/flush`);
 	}
-    
+
 	async exportMonitors() {
 		const response = await this.axiosInstance.get("/monitors/export", {
 			responseType: "blob",
diff --git a/server/db/models/StatusPage.js b/server/db/models/StatusPage.js
index dd64c184a..92cbab1cd 100755
--- a/server/db/models/StatusPage.js
+++ b/server/db/models/StatusPage.js
@@ -73,7 +73,7 @@ const StatusPageSchema = mongoose.Schema(
 		showAdminLoginLink: {
 			type: Boolean,
 			default: false,
-		}
+		},
 	},
 	{ timestamps: true }
 );

From 5fcf8ce7ba240fa9f7aa5a62bb57a87b8f176bc3 Mon Sep 17 00:00:00 2001
From: Jeffer Marcelino <jeffersunde72@gmail.com>
Date: Mon, 23 Jun 2025 02:58:51 +0200
Subject: [PATCH 269/319] chore: format

---
 client/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 17907f189..0fe4ceb3d 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -797,5 +797,5 @@
 			"import": "Import Monitors",
 			"export": "Export Monitors"
 		}
-	},
+	}
 }

From ddf9673a35b734fb7a839b9de8afed3675555366 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 09:24:33 +0800
Subject: [PATCH 270/319] remove redis from production docker copose

---
 docker/prod/docker-compose.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml
index 9cc4a82cb..d9bc1109a 100755
--- a/docker/prod/docker-compose.yaml
+++ b/docker/prod/docker-compose.yaml
@@ -29,21 +29,9 @@ services:
     env_file:
       - server.env
     depends_on:
-      - redis
       - mongodb
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-  redis:
-    image: ghcr.io/bluewave-labs/checkmate:redis-demo
-    restart: always
-    volumes:
-      - ./redis/data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate:mongo-demo
     restart: always

From 3faa6194f39e2091bd7a622bb66d20acbc3ccd7c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 10:02:06 +0800
Subject: [PATCH 271/319] display transport settings

---
 client/src/Components/TextLink/index.jsx    |  4 +-
 client/src/Pages/Settings/SettingsEmail.jsx | 44 ++++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/TextLink/index.jsx b/client/src/Components/TextLink/index.jsx
index a10839e84..83ae251a5 100644
--- a/client/src/Components/TextLink/index.jsx
+++ b/client/src/Components/TextLink/index.jsx
@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Link as RouterLink } from "react-router-dom";
 
-const TextLink = ({ text, linkText, href }) => {
+const TextLink = ({ text, linkText, href, target = "_self" }) => {
 	const theme = useTheme();
 
 	return (
@@ -18,6 +18,7 @@ const TextLink = ({ text, linkText, href }) => {
 				color="accent"
 				to={href}
 				component={RouterLink}
+				target={target}
 			>
 				{linkText}
 			</Link>
@@ -29,6 +30,7 @@ TextLink.propTypes = {
 	text: PropTypes.string,
 	linkText: PropTypes.string,
 	href: PropTypes.string,
+	target: PropTypes.string,
 };
 
 export default TextLink;
diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 061cf2602..07ee050bb 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -4,6 +4,8 @@ import ConfigBox from "../../Components/ConfigBox";
 import TextInput from "../../Components/Inputs/TextInput";
 import Button from "@mui/material/Button";
 import Stack from "@mui/material/Stack";
+import { Switch } from "@mui/material";
+import TextLink from "../../Components/TextLink";
 // Utils
 import { useTheme } from "@emotion/react";
 import { PropTypes } from "prop-types";
@@ -12,7 +14,6 @@ import { useTranslation } from "react-i18next";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
 import { createToast } from "../../Utils/toastUtils";
-import { Switch } from "@mui/material";
 
 const SettingsEmail = ({
 	isAdmin,
@@ -239,6 +240,47 @@ const SettingsEmail = ({
 								/>
 							</Box>
 						))}
+
+						<TextLink
+							text="This builds an SMTP transport for NodeMailer"
+							linkText="See specifications here"
+							href="https://nodemailer.com/smtp"
+							target="_blank"
+						/>
+						<Box
+							component={"pre"}
+							sx={{
+								fontFamily: "monospace",
+								p: 2,
+								borderRadius: 1,
+								overflow: "auto",
+							}}
+						>
+							<code>
+								{JSON.stringify(
+									{
+										host: systemEmailHost,
+										port: systemEmailPort,
+										secure: systemEmailSecure,
+										auth: {
+											user: systemEmailUser || systemEmailAddress,
+											pass: "<your_password>",
+										},
+										name: systemEmailConnectionHost || "localhost",
+										pool: systemEmailPool,
+										user: systemEmailUser,
+										tls: {
+											rejectUnauthorized: systemEmailRejectUnauthorized,
+											ignoreTLS: systemEmailIgnoreTLS,
+											requireTLS: systemEmailRequireTLS,
+											servername: systemEmailTLSServername,
+										},
+									},
+									null,
+									2
+								)}
+							</code>
+						</Box>
 					</Box>
 
 					<Box>

From 766c073ec4014ab1f361fb74d8bb0db74d2262c2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 10:05:06 +0800
Subject: [PATCH 272/319] localisation

---
 client/src/Pages/Settings/SettingsEmail.jsx | 4 ++--
 client/src/locales/en.json                  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 07ee050bb..c63b9edf5 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -242,8 +242,8 @@ const SettingsEmail = ({
 						))}
 
 						<TextLink
-							text="This builds an SMTP transport for NodeMailer"
-							linkText="See specifications here"
+							text={t("settingsEmailTransportLinkDescription")}
+							linkText={t("settingsEmailTransportLinkText")}
 							href="https://nodemailer.com/smtp"
 							target="_blank"
 						/>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 14317e689..f677c346c 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -450,6 +450,8 @@
 	"settingsEmailPassword": "Email password - Password for authentication",
 	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
 	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
+	"settingsEmailTransportLinkDescription": "This builds an SMTP transport for NodeMailer",
+	"settingsEmailTransportLinkText": "See specifications here",
 	"state": "State",
 	"statusBreadCrumbsStatusPages": "Status Pages",
 	"statusBreadCrumbsDetails": "Details",

From 34485a0cae285d7c3f83dddc92c878f1365fb3d2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 11:07:12 +0800
Subject: [PATCH 273/319] move queue to logs

---
 client/src/Components/Sidebar/index.jsx       |  3 +-
 client/src/Components/StatusBoxes/index.jsx   |  2 +-
 .../Queue/components/FailedJobTable/index.jsx |  4 +-
 .../Queue/components/JobTable/index.jsx       |  6 +--
 .../Logs/Queue/components/Metrics/index.jsx   | 45 +++++++++++++++++++
 .../Queue/components/MetricsTable/index.jsx   |  2 +-
 client/src/Pages/{ => Logs}/Queue/index.jsx   |  9 ++--
 client/src/Pages/Logs/index.jsx               | 41 +++++++++++++++++
 client/src/Pages/Settings/SettingsDev.jsx     | 37 ---------------
 client/src/Pages/Settings/index.jsx           |  6 +--
 client/src/Routes/index.jsx                   |  7 +--
 client/src/Utils/Theme/globalTheme.js         |  3 ++
 client/src/assets/icons/logs.svg              |  5 +++
 client/src/locales/en.json                    | 11 +++--
 14 files changed, 119 insertions(+), 62 deletions(-)
 rename client/src/Pages/{ => Logs}/Queue/components/FailedJobTable/index.jsx (93%)
 rename client/src/Pages/{ => Logs}/Queue/components/JobTable/index.jsx (93%)
 create mode 100644 client/src/Pages/Logs/Queue/components/Metrics/index.jsx
 rename client/src/Pages/{ => Logs}/Queue/components/MetricsTable/index.jsx (95%)
 rename client/src/Pages/{ => Logs}/Queue/index.jsx (82%)
 create mode 100644 client/src/Pages/Logs/index.jsx
 delete mode 100644 client/src/Pages/Settings/SettingsDev.jsx
 create mode 100644 client/src/assets/icons/logs.svg

diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index 06a140c54..e9f0d3ad7 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -8,7 +8,6 @@ import {
 	ListItemButton,
 	ListItemIcon,
 	ListItemText,
-	ListSubheader,
 	Menu,
 	MenuItem,
 	Stack,
@@ -39,6 +38,7 @@ import Docs from "../../assets/icons/docs.svg?react";
 import StatusPages from "../../assets/icons/status-pages.svg?react";
 import Discussions from "../../assets/icons/discussions.svg?react";
 import Notifications from "../../assets/icons/notifications.svg?react";
+import Logs from "../../assets/icons/logs.svg?react";
 
 import "./index.css";
 
@@ -64,6 +64,7 @@ const getMenu = (t) => [
 
 	{ name: t("menu.statusPages"), path: "status", icon: <StatusPages /> },
 	{ name: t("menu.maintenance"), path: "maintenance", icon: <Maintenance /> },
+	{ name: t("menu.logs"), path: "logs", icon: <Logs /> },
 
 	{
 		name: t("menu.settings"),
diff --git a/client/src/Components/StatusBoxes/index.jsx b/client/src/Components/StatusBoxes/index.jsx
index 40ea2d182..d97bb6211 100644
--- a/client/src/Components/StatusBoxes/index.jsx
+++ b/client/src/Components/StatusBoxes/index.jsx
@@ -4,7 +4,7 @@ import SkeletonLayout from "./skeleton";
 // Utils
 import { useTheme } from "@mui/material/styles";
 import PropTypes from "prop-types";
-const StatusBoxes = ({ shouldRender, flexWrap = "nowrap", children }) => {
+const StatusBoxes = ({ shouldRender = true, flexWrap = "nowrap", children }) => {
 	const theme = useTheme();
 	if (!shouldRender) {
 		return (
diff --git a/client/src/Pages/Queue/components/FailedJobTable/index.jsx b/client/src/Pages/Logs/Queue/components/FailedJobTable/index.jsx
similarity index 93%
rename from client/src/Pages/Queue/components/FailedJobTable/index.jsx
rename to client/src/Pages/Logs/Queue/components/FailedJobTable/index.jsx
index d7284f9da..94fc2f5c3 100644
--- a/client/src/Pages/Queue/components/FailedJobTable/index.jsx
+++ b/client/src/Pages/Logs/Queue/components/FailedJobTable/index.jsx
@@ -1,10 +1,10 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import DataTable from "../../../../Components/Table";
+import DataTable from "../../../../../Components/Table";
 
 import { useNavigate } from "react-router-dom";
 import { useTheme } from "@emotion/react";
-import { TypeToPathMap } from "../../../../Utils/monitorUtils";
+import { TypeToPathMap } from "../../../../../Utils/monitorUtils";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 
diff --git a/client/src/Pages/Queue/components/JobTable/index.jsx b/client/src/Pages/Logs/Queue/components/JobTable/index.jsx
similarity index 93%
rename from client/src/Pages/Queue/components/JobTable/index.jsx
rename to client/src/Pages/Logs/Queue/components/JobTable/index.jsx
index f4aa0768c..e27dd103f 100644
--- a/client/src/Pages/Queue/components/JobTable/index.jsx
+++ b/client/src/Pages/Logs/Queue/components/JobTable/index.jsx
@@ -1,13 +1,13 @@
 import Stack from "@mui/material/Stack";
-import DataTable from "../../../../Components/Table";
+import DataTable from "../../../../../Components/Table";
 import Typography from "@mui/material/Typography";
 // Utils
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
-import { TypeToPathMap } from "../../../../Utils/monitorUtils";
+import { TypeToPathMap } from "../../../../../Utils/monitorUtils";
 import { useTranslation } from "react-i18next";
-import { createHeaderFactory } from "../../../../Components/Table/TableUtils";
+import { createHeaderFactory } from "../../../../../Components/Table/TableUtils";
 
 const JobTable = ({ jobs = [] }) => {
 	const theme = useTheme();
diff --git a/client/src/Pages/Logs/Queue/components/Metrics/index.jsx b/client/src/Pages/Logs/Queue/components/Metrics/index.jsx
new file mode 100644
index 000000000..52117cd3b
--- /dev/null
+++ b/client/src/Pages/Logs/Queue/components/Metrics/index.jsx
@@ -0,0 +1,45 @@
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import StatBox from "../../../../../Components/StatBox";
+import StatusBoxes from "../../../../../Components/StatusBoxes";
+
+import { useTranslation } from "react-i18next";
+import { useTheme } from "@emotion/react";
+
+const camelToTitle = (str) => {
+	return str
+		.replace(/([A-Z])/g, " $1")
+		.toLowerCase()
+		.replace(/^./, (m) => m.toUpperCase());
+};
+
+const Metrics = ({ metrics = {} }) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+
+	const data = Object.keys(metrics)
+		.filter((key) => key !== "jobsWithFailures")
+		.map((key) => {
+			return { key, title: camelToTitle(key), value: metrics[key] };
+		});
+
+	console.log(JSON.stringify(data, null, 2));
+
+	return (
+		<Stack gap={theme.spacing(2)}>
+			<Typography variant="h2">{t("queuePage.metricsTable.title")}</Typography>
+			<StatusBoxes flexWrap="wrap">
+				{data.map((metric) => {
+					return (
+						<StatBox
+							key={metric.key}
+							heading={metric.title}
+							subHeading={metric.value}
+						/>
+					);
+				})}
+			</StatusBoxes>
+		</Stack>
+	);
+};
+export default Metrics;
diff --git a/client/src/Pages/Queue/components/MetricsTable/index.jsx b/client/src/Pages/Logs/Queue/components/MetricsTable/index.jsx
similarity index 95%
rename from client/src/Pages/Queue/components/MetricsTable/index.jsx
rename to client/src/Pages/Logs/Queue/components/MetricsTable/index.jsx
index 818b4e543..204b90035 100644
--- a/client/src/Pages/Queue/components/MetricsTable/index.jsx
+++ b/client/src/Pages/Logs/Queue/components/MetricsTable/index.jsx
@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import DataTable from "../../../../Components/Table";
+import DataTable from "../../../../../Components/Table";
 
 // Utils
 import { useTranslation } from "react-i18next";
diff --git a/client/src/Pages/Queue/index.jsx b/client/src/Pages/Logs/Queue/index.jsx
similarity index 82%
rename from client/src/Pages/Queue/index.jsx
rename to client/src/Pages/Logs/Queue/index.jsx
index eb732560c..729f87fe3 100644
--- a/client/src/Pages/Queue/index.jsx
+++ b/client/src/Pages/Logs/Queue/index.jsx
@@ -1,15 +1,14 @@
 // Components
 import Stack from "@mui/material/Stack";
-import Breadcrumbs from "../../Components/Breadcrumbs";
 import JobTable from "./components/JobTable";
-import MetricsTable from "./components/MetricsTable";
+import Metrics from "./components/Metrics";
 import FailedJobTable from "./components/FailedJobTable";
 import ButtonGroup from "@mui/material/ButtonGroup";
 import Button from "@mui/material/Button";
 
 // Utils
 import { useState } from "react";
-import { useFetchQueueData, useFlushQueue } from "../../Hooks/queueHooks";
+import { useFetchQueueData, useFlushQueue } from "../../../Hooks/queueHooks";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@emotion/react";
 
@@ -23,15 +22,13 @@ const QueueDetails = () => {
 	const [jobs, metrics, isLoading, error] = useFetchQueueData(trigger);
 	const [flushQueue, isFlushing, flushError] = useFlushQueue();
 
-	const BREADCRUMBS = [{ name: t("queuePage.title"), path: "/queue" }];
 	if (isLoading) return <div>Loading...</div>;
 	if (error || flushError) return <div>Error: {error.message}</div>;
 
 	return (
 		<Stack gap={theme.spacing(20)}>
-			<Breadcrumbs list={BREADCRUMBS} />
+			<Metrics metrics={metrics} />
 			<JobTable jobs={jobs} />
-			<MetricsTable metrics={metrics} />
 			<FailedJobTable metrics={metrics} />
 
 			<ButtonGroup
diff --git a/client/src/Pages/Logs/index.jsx b/client/src/Pages/Logs/index.jsx
new file mode 100644
index 000000000..0f1f0f18f
--- /dev/null
+++ b/client/src/Pages/Logs/index.jsx
@@ -0,0 +1,41 @@
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Breadcrumbs from "../../Components/Breadcrumbs";
+import Tabs from "@mui/material/Tabs";
+import Tab from "@mui/material/Tab";
+import Queue from "./Queue";
+
+import { useTheme } from "@emotion/react";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+
+const Logs = () => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+
+	// Local state
+	const [value, setValue] = useState(0);
+
+	// Handlers
+	const handleChange = (event, newValue) => {
+		setValue(newValue);
+	};
+
+	const BREADCRUMBS = [{ name: t("logsPage.title"), path: "/logs" }];
+	return (
+		<Stack gap={theme.spacing(20)}>
+			<Breadcrumbs list={BREADCRUMBS} />
+			<Tabs
+				value={value}
+				onChange={handleChange}
+			>
+				<Tab label={t("logsPage.tabs.queue")} />
+				<Tab label={t("logsPage.tabs.logs")} />
+			</Tabs>
+			{value === 0 && <Queue />}
+			{value === 1 && <div>Not yet</div>}
+		</Stack>
+	);
+};
+
+export default Logs;
diff --git a/client/src/Pages/Settings/SettingsDev.jsx b/client/src/Pages/Settings/SettingsDev.jsx
deleted file mode 100644
index 721a17d5c..000000000
--- a/client/src/Pages/Settings/SettingsDev.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import Box from "@mui/material/Box";
-import Typography from "@mui/material/Typography";
-import ConfigBox from "../../Components/ConfigBox";
-// Utils
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import Link from "../../Components/Link";
-
-const SettingsDev = ({ isAdmin, HEADER_SX }) => {
-	const { t } = useTranslation();
-
-	if (!isAdmin) return null;
-
-	return (
-		<ConfigBox>
-			<Box>
-				<Typography
-					component="h1"
-					variant="h2"
-				>
-					{t("settingsDev")}
-				</Typography>
-				<Typography sx={HEADER_SX}>{t("settingsDevDescription")}</Typography>
-			</Box>
-			<Box>
-				<Link
-					level="secondary"
-					label={t("settingsDevViewJobQueueDetails")}
-					url="/queue"
-					external={false}
-				/>
-			</Box>
-		</ConfigBox>
-	);
-};
-
-export default SettingsDev;
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index ef57a16c7..0cd954e52 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -8,7 +8,6 @@ import SettingsPagespeed from "./SettingsPagespeed";
 import SettingsDemoMonitors from "./SettingsDemoMonitors";
 import SettingsAbout from "./SettingsAbout";
 import SettingsEmail from "./SettingsEmail";
-import SettingsDev from "./SettingsDev";
 import Button from "@mui/material/Button";
 // Utils
 import { settingsValidation } from "../../Validation/validation";
@@ -209,10 +208,7 @@ const Settings = () => {
 				emailPasswordHasBeenReset={emailPasswordHasBeenReset}
 				setEmailPasswordHasBeenReset={setEmailPasswordHasBeenReset}
 			/>
-			<SettingsDev
-				isAdmin={isAdmin}
-				HEADER_SX={HEADING_SX}
-			/>
+
 			<SettingsAbout />
 			<Stack
 				direction="row"
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index ba27482ff..60df27211 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -51,7 +51,7 @@ import ProtectedRoute from "../Components/ProtectedRoute";
 import CreateNewMaintenanceWindow from "../Pages/Maintenance/CreateMaintenance";
 import withAdminCheck from "../Components/HOC/withAdminCheck";
 import BulkImport from "../Pages/Uptime/BulkImport";
-import Queue from "../Pages/Queue";
+import Logs from "../Pages/Logs";
 
 const Routes = () => {
 	const AdminCheckedRegister = withAdminCheck(AuthRegister);
@@ -187,9 +187,10 @@ const Routes = () => {
 					path="account/team"
 					element={<Account open={"team"} />}
 				/>
+
 				<Route
-					path="queue"
-					element={<Queue />}
+					path="logs"
+					element={<Logs />}
 				/>
 			</Route>
 
diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 58d9943be..ae014432d 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -407,6 +407,7 @@ const baseTheme = (palette) => ({
 				}),
 			},
 		},
+
 		MuiTab: {
 			styleOverrides: {
 				root: ({ theme }) => ({
@@ -475,6 +476,8 @@ const baseTheme = (palette) => ({
 		MuiTabs: {
 			styleOverrides: {
 				root: ({ theme }) => ({
+					height: "34px",
+					minHeight: "34px",
 					display: "inline-flex",
 					borderRadius: 0,
 					"& .MuiTabs-indicator": {
diff --git a/client/src/assets/icons/logs.svg b/client/src/assets/icons/logs.svg
new file mode 100644
index 000000000..e1adcb390
--- /dev/null
+++ b/client/src/assets/icons/logs.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M21 5C21 6.65685 16.9706 8 12 8C7.02944 8 3 6.65685 3 5M21 5C21 3.34315 16.9706 2 12 2C7.02944 2 3 3.34315 3 5M21 5V19C21 20.66 17 22 12 22C7 22 3 20.66 3 19V5M21 12C21 13.66 17 15 12 15C7 15 3 13.66 3 12"
+        stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 14317e689..0856592fc 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -30,9 +30,6 @@
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
 	"settingsAbout": "About",
-	"settingsDev": "Developer",
-	"settingsDevDescription": "Developer settings",
-	"settingsDevViewJobQueueDetails": "View job queue details",
 	"settingsDevelopedBy": "Developed by Bluewave Labs.",
 	"settingsSave": "Save",
 	"settingsSuccessSaved": "Settings saved successfully",
@@ -431,6 +428,7 @@
 		"statusPages": "Status pages",
 		"maintenance": "Maintenance",
 		"integrations": "Integrations",
+		"logs": "Logs",
 		"settings": "Settings",
 		"support": "Support",
 		"discussions": "Discussions",
@@ -756,6 +754,13 @@
 	"settingsEmailPool": "Enable connection pooling: Reuse existing connections to improve performance",
 	"sendTestNotifications": "Send test notifications",
 	"selectAll": "Select all",
+	"logsPage": {
+		"title": "Logs",
+		"tabs": {
+			"queue": "Job queue",
+			"logs": "Logs"
+		}
+	},
 	"queuePage": {
 		"title": "Queue",
 		"refreshButton": "Refresh",

From c6075817670ad5b07d750f0311e1c405d36cf090 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Jun 2025 03:11:03 +0000
Subject: [PATCH 274/319] feat: translations updated from POEditor

---
 client/src/locales/ar.json    |  14 +-
 client/src/locales/cs.json    |  14 +-
 client/src/locales/de.json    |  14 +-
 client/src/locales/en.json    |  84 +++--------
 client/src/locales/es.json    |  14 +-
 client/src/locales/fi.json    |  14 +-
 client/src/locales/fr.json    |  14 +-
 client/src/locales/pt-BR.json |  14 +-
 client/src/locales/ru.json    |  14 +-
 client/src/locales/tr.json    | 254 ++++++++++++++++++----------------
 client/src/locales/zh-TW.json |  14 +-
 11 files changed, 250 insertions(+), 214 deletions(-)

diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
index fd4d925a9..06789abb0 100644
--- a/client/src/locales/ar.json
+++ b/client/src/locales/ar.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 66b2993d2..110d9a508 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": "Nastala chyba při ověřování dat."
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 6d5c5a4d8..5561188a0 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 14317e689..b7db06202 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -30,9 +30,6 @@
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
 	"settingsAbout": "About",
-	"settingsDev": "Developer",
-	"settingsDevDescription": "Developer settings",
-	"settingsDevViewJobQueueDetails": "View job queue details",
 	"settingsDevelopedBy": "Developed by Bluewave Labs.",
 	"settingsSave": "Save",
 	"settingsSuccessSaved": "Settings saved successfully",
@@ -510,13 +507,6 @@
 	},
 	"auth": {
 		"common": {
-			"fields": {
-				"password": {
-					"errors": {
-						"incorrect": "The password you provided does not match our records"
-					}
-				}
-			},
 			"navigation": {
 				"continue": "Continue",
 				"back": "Back"
@@ -597,6 +587,13 @@
 			},
 			"errors": {
 				"validation": "Error validating data."
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": "The password you provided does not match our records"
+					}
+				}
 			}
 		},
 		"login": {
@@ -717,23 +714,23 @@
 			"webhookLabel": "Slack webhook URL",
 			"webhookPlaceholder": "https://hooks.slack.com/services/..."
 		},
-		"pagerDutySettings": {
+		"pagerdutySettings": {
 			"title": "PagerDuty",
 			"description": "Configure your PagerDuty integration here",
 			"integrationKeyLabel": "Integration key",
 			"integrationKeyPlaceholder": "1234567890"
 		},
-		"webhookSettings": {
-			"title": "Webhook",
-			"description": "Configure your webhook here",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		},
 		"discordSettings": {
 			"title": "Discord",
 			"description": "Configure your Discord webhook here",
 			"webhookLabel": "Discord Webhook URL",
 			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"webhookSettings": {
+			"title": "Webhook",
+			"description": "Configure your webhook here",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
 		}
 	},
 	"notificationConfig": {
@@ -749,52 +746,11 @@
 	},
 	"advancedMatching": "Advanced matching",
 	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
-	"settingsEmailRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
-	"settingsEmailRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
-	"settingsEmailSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
-	"settingsEmailPool": "Enable connection pooling: Reuse existing connections to improve performance",
+	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
+	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
+	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
+	"settingsEmailSecure": "Secure - Use SSL",
+	"settingsEmailPool": "Pool - Enable connection pooling",
 	"sendTestNotifications": "Send test notifications",
-	"selectAll": "Select all",
-	"queuePage": {
-		"title": "Queue",
-		"refreshButton": "Refresh",
-		"flushButton": "Flush queue",
-		"jobTable": {
-			"title": "Jobs currently in queue",
-			"idHeader": "Monitor ID",
-			"urlHeader": "URL",
-			"typeHeader": "Type",
-			"activeHeader": "Active",
-			"lockedAtHeader": "Locked at",
-			"runCountHeader": "Run count",
-			"failCountHeader": "Fail count",
-			"lastRunHeader": "Last run at",
-			"lastFinishedAtHeader": "Last finished at",
-			"lastRunTookHeader": "Last run took"
-		},
-		"metricsTable": {
-			"title": "Queue metrics",
-			"metricHeader": "Metric",
-			"valueHeader": "Value"
-		},
-		"failedJobTable": {
-			"title": "Failed jobs",
-			"monitorIdHeader": "Monitor ID",
-			"monitorUrlHeader": "Monitor URL",
-			"failCountHeader": "Fail count",
-			"failedAtHeader": "Last failed at",
-			"failReasonHeader": "Fail reason"
-		},
-		"export": {
-			"title": "Export Monitors",
-			"success": "Monitors exported successfully!",
-			"failed": "Failed to export monitors"
-		},
-		"monitorActions": {
-			"title": "Export/Import",
-			"import": "Import Monitors",
-			"export": "Export Monitors"
-		}
-	}
+	"selectAll": "Select all"
 }
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index fb8207e48..b23a57ed3 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index f085b5857..44b56516b 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 48834602e..0f218d1c6 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index a783a820c..74a0b654f 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 539bb2d51..65a4fe4a0 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index 1d86de06c..ed03d7e6c 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -117,11 +117,11 @@
 			"title": "",
 			"checks": [""]
 		},
-		"createButton": "",
-		"createTitle": "",
+		"createButton": "Bildirim kanalı oluştur",
+		"createTitle": "Bildirim kanalı",
 		"create": {
 			"success": "",
-			"failed": ""
+			"failed": "Bildirim kanalı oluşturulamadı"
 		},
 		"fetch": {
 			"success": "",
@@ -136,7 +136,7 @@
 			"failed": ""
 		},
 		"test": {
-			"success": "",
+			"success": "Test bildirimi başarıyla gönderildi",
 			"failed": ""
 		}
 	},
@@ -373,33 +373,33 @@
 	"pageSpeedApiKeyFieldDescription": "Sayfa hızı izlemeyi etkinleştirmek için Google PageSpeed API anahtarınızı girin. Anahtarı güncellemek için Sıfırla'ya tıklayın.",
 	"pageSpeedApiKeyFieldResetLabel": "API anahtarı ayarlandı. Değiştirmek için Sıfırla'ya tıklayın.",
 	"reset": "Sıfırla",
-	"ignoreTLSError": "",
-	"tlsErrorIgnored": "",
+	"ignoreTLSError": "TLS/SSL hatalarını gözardı et",
+	"tlsErrorIgnored": "TLS/SSL hataları gözardı ediliyor",
 	"ignoreTLSErrorDescription": "",
-	"createNew": "",
+	"createNew": "Yeni oluştur",
 	"greeting": {
-		"prepend": "",
+		"prepend": "Merhaba",
 		"append": "",
 		"overview": ""
 	},
 	"roles": {
-		"superAdmin": "",
-		"admin": "",
-		"teamMember": "",
-		"demoUser": ""
+		"superAdmin": "Süper yönetici",
+		"admin": "Yönetici",
+		"teamMember": "Ekip elemanı",
+		"demoUser": "Demo kullanıcısı"
 	},
 	"teamPanel": {
-		"teamMembers": "",
+		"teamMembers": "Ekip elemanları",
 		"filter": {
-			"all": "",
-			"member": ""
+			"all": "Tümü",
+			"member": "Eleman"
 		},
-		"inviteTeamMember": "",
-		"inviteNewTeamMember": "",
+		"inviteTeamMember": "Ekip elemanı davet et",
+		"inviteNewTeamMember": "Yeni ekip elemanı davet et",
 		"inviteDescription": "",
-		"email": "",
-		"selectRole": "",
-		"inviteLink": "",
+		"email": "Eposta",
+		"selectRole": "Rolü seçin",
+		"inviteLink": "Davet linki",
 		"cancel": "",
 		"noMembers": "",
 		"getToken": "",
@@ -422,21 +422,21 @@
 		"infrastructure": "",
 		"incidents": "",
 		"statusPages": "",
-		"maintenance": "",
-		"integrations": "",
-		"settings": "",
-		"support": "",
-		"discussions": "",
-		"docs": "",
-		"changelog": "",
-		"profile": "",
-		"password": "",
-		"team": "",
+		"maintenance": "Bakım",
+		"integrations": "Entegrasyonlar",
+		"settings": "Ayarlar",
+		"support": "Destek",
+		"discussions": "Soru-cevap",
+		"docs": "Dokümanlar",
+		"changelog": "Değişiklik günlüğü",
+		"profile": "Profil",
+		"password": "Parola",
+		"team": "Ekip",
 		"logOut": "Çıkış yap",
-		"notifications": ""
+		"notifications": "Bildirimler"
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
+	"settingsEmail": "Eposta",
+	"settingsEmailDescription": "Sistem için eposta ayarlarını düzenleyin. Bu işlem eposta üzerinden bildirim ve alarm almak için gereklidir.",
 	"settingsEmailHost": "",
 	"settingsEmailPort": "",
 	"settingsEmailAddress": "",
@@ -490,73 +490,73 @@
 		"port": ""
 	},
 	"common": {
-		"appName": "",
+		"appName": "Checkmate",
 		"monitoringAgentName": "",
 		"buttons": {
 			"toggleTheme": ""
 		},
 		"toasts": {
 			"networkError": "",
-			"checkConnection": "",
-			"unknownError": ""
+			"checkConnection": "Lütfen bağlantınızı kontrol edin",
+			"unknownError": "Bilinmeyen hata"
 		}
 	},
 	"auth": {
 		"common": {
 			"navigation": {
-				"continue": "",
-				"back": ""
+				"continue": "Devam et",
+				"back": "Geri"
 			},
 			"inputs": {
 				"email": {
-					"label": "",
+					"label": "Eposta",
 					"placeholder": "",
 					"errors": {
-						"empty": "",
+						"empty": "Devam etmek için eposta adresinizi girin",
 						"invalid": ""
 					}
 				},
 				"password": {
-					"label": "",
+					"label": "Parola",
 					"rules": {
 						"length": {
 							"beginning": "",
-							"highlighted": ""
+							"highlighted": "8 karakter uzunluğunda"
 						},
 						"special": {
-							"beginning": "",
-							"highlighted": ""
+							"beginning": "En az içermelidir: ",
+							"highlighted": "bir özel karakter"
 						},
 						"number": {
-							"beginning": "",
-							"highlighted": ""
+							"beginning": "En az içermelidir: ",
+							"highlighted": "bir sayı"
 						},
 						"uppercase": {
-							"beginning": "",
-							"highlighted": ""
+							"beginning": "En az içermelidir: ",
+							"highlighted": "Bir büyük harf"
 						},
 						"lowercase": {
-							"beginning": "",
-							"highlighted": ""
+							"beginning": "En az içermelidir: ",
+							"highlighted": "Bir küçük harf"
 						},
 						"match": {
 							"beginning": "",
-							"highlighted": ""
+							"highlighted": "eşleşmelidir"
 						}
 					},
 					"errors": {
-						"empty": "",
-						"length": "",
-						"uppercase": "",
-						"lowercase": "",
-						"number": "",
-						"special": "",
-						"incorrect": ""
+						"empty": "Lütfen parolanızı girin",
+						"length": "Parolanız en az 8 karakter uzunluğunda olmalıdır",
+						"uppercase": "Parola en az 1 büyük harf içermelidir",
+						"lowercase": "Parola en az 1 küçük harf içermelidir",
+						"number": "Parola en az 1 sayı içermelidir",
+						"special": "Parola en az 1 özel karakter içermelidir",
+						"incorrect": "Parolanız sistemdeki ile uyuşmuyor"
 					}
 				},
 				"passwordConfirm": {
-					"label": "",
-					"placeholder": "",
+					"label": "Parolayı onayla",
+					"placeholder": "Onaylamak için parolayı yeniden gir",
 					"errors": {
 						"empty": "",
 						"different": ""
@@ -572,78 +572,85 @@
 					}
 				},
 				"lastName": {
-					"label": "",
-					"placeholder": "",
+					"label": "Soyadı",
+					"placeholder": "Ellis",
 					"errors": {
-						"empty": "",
-						"length": "",
+						"empty": "Lütfen soyadınızı girin",
+						"length": "Soyadı en çok 50 karakter olmalıdır",
 						"pattern": ""
 					}
 				}
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
 			"heading": "",
 			"subheadings": {
-				"stepOne": "",
-				"stepTwo": ""
+				"stepOne": "Eposta adresinizi girin",
+				"stepTwo": "Parolanızı girin"
 			},
 			"links": {
-				"forgotPassword": "",
-				"register": "",
-				"forgotPasswordLink": "",
-				"registerLink": ""
+				"forgotPassword": "Parolanızı mı unuttunuz?",
+				"register": "Hesabınız yok mu?",
+				"forgotPasswordLink": "Parolayı sıfırla",
+				"registerLink": "Buradan kayıt olun"
 			},
 			"toasts": {
-				"success": "",
-				"incorrectPassword": ""
+				"success": "Tekrar hoşgeldiniz! Başarıyla sisteme giriş yaptınız.",
+				"incorrectPassword": "Hatalı parola"
 			},
 			"errors": {
 				"password": {
-					"incorrect": ""
+					"incorrect": "Giriş yaptığınız parola sistemdekiyle uyuşmuyor"
 				}
 			}
 		},
 		"registration": {
 			"heading": {
-				"superAdmin": "",
-				"user": ""
+				"superAdmin": "Süper yönetici oluştur",
+				"user": "Kayıt ol"
 			},
 			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "",
-				"stepThree": ""
+				"stepOne": "Kişisel bilgilerinizi girin",
+				"stepTwo": "Eposta adresinizi girin",
+				"stepThree": "Parolanızı oluturun"
 			},
 			"description": {
-				"superAdmin": "",
+				"superAdmin": "Başlamak için süper yönetici hesabı oluşturun",
 				"user": ""
 			},
 			"gettingStartedButton": {
-				"superAdmin": "",
+				"superAdmin": "Süper yönetici hesabı oluşturun",
 				"user": ""
 			},
 			"termsAndPolicies": "",
 			"links": {
-				"login": ""
+				"login": "Bir hesabınız mı var? <a>Giriş yapın</a>"
 			},
 			"toasts": {
-				"success": ""
+				"success": "Hoşgeldiniz! Hesabınız başarıyla oluşturuldu."
 			}
 		},
 		"forgotPassword": {
-			"heading": "",
+			"heading": "Parolanızı mı kaybettiniz?",
 			"subheadings": {
-				"stepOne": "",
-				"stepTwo": "",
+				"stepOne": "Endişelenmeyin, sıfırlamak için gerekli bilgileri göndereceğiz.",
+				"stepTwo": "Parola sıfırlama için gerekli bilgileri <email/> hesabına ilettik.",
 				"stepThree": "",
 				"stepFour": ""
 			},
 			"buttons": {
-				"openEmail": "",
-				"resetPassword": ""
+				"openEmail": "Eposta uygulamasını aç",
+				"resetPassword": "Parolayı sıfırla"
 			},
 			"imageAlts": {
 				"passwordKey": "",
@@ -670,75 +677,76 @@
 				"reconnected": "",
 				"stillUnreachable": ""
 			},
-			"alertBox": "",
+			"alertBox": "Sunucu bağlantı hatası",
 			"description": "",
 			"retryButton": {
-				"default": "",
-				"processing": ""
+				"default": "Bağlantıyı tekrarla",
+				"processing": "Bağlanıyor..."
 			}
 		}
 	},
 	"createNotifications": {
-		"title": "",
+		"title": "Bildirim kanalları oluştur",
 		"nameSettings": {
-			"title": "",
-			"description": "",
-			"nameLabel": "",
-			"namePlaceholder": ""
+			"title": "İsim",
+			"description": "Entegrasyon için açıklama",
+			"nameLabel": "İsim",
+			"namePlaceholder": "örn. Slack bildirimleri"
 		},
 		"typeSettings": {
-			"title": "",
+			"title": "Tür",
 			"description": "",
-			"typeLabel": ""
+			"typeLabel": "Tür"
 		},
 		"emailSettings": {
-			"title": "",
-			"description": "",
-			"emailLabel": "",
-			"emailPlaceholder": ""
+			"title": "Eposta",
+			"description": "Hedef eposta adresi",
+			"emailLabel": "Eposta adresi",
+			"emailPlaceholder": "örn. john@example.com"
 		},
 		"slackSettings": {
-			"title": "",
-			"description": "",
-			"webhookLabel": "",
-			"webhookPlaceholder": ""
+			"title": "Slack",
+			"description": "Slack webhook'u burada tanımlayın",
+			"webhookLabel": "Slack webhook adresi",
+			"webhookPlaceholder": "https://hooks.slack.com/services/...\n"
 		},
 		"pagerdutySettings": {
-			"title": "",
-			"description": "",
-			"integrationKeyLabel": "",
-			"integrationKeyPlaceholder": ""
-		},
-		"genericWebhookSettings": {
-			"title": "",
-			"description": "",
-			"webhookLabel": "",
-			"webhookPlaceholder": ""
+			"title": "PagerDuty",
+			"description": "PagerDuty entegrasyonunu burada yapın",
+			"integrationKeyLabel": "Entegrasyon anahtarı",
+			"integrationKeyPlaceholder": "1234567890"
 		},
 		"discordSettings": {
-			"title": "",
+			"title": "Discord",
+			"description": "Discord webhook'u buradan ayarlayın",
+			"webhookLabel": "Discord Webhook adresi",
+			"webhookPlaceholder": "https://sunucu-adı.com/webhook\n"
+		},
+		"webhookSettings": {
+			"title": "Webhook",
 			"description": "",
 			"webhookLabel": "",
-			"webhookPlaceholder": ""
+			"webhookPlaceholder": "https://sunucu-adı.com/webhook\n"
 		}
 	},
 	"notificationConfig": {
-		"title": "",
+		"title": "Bildirimler",
 		"description": ""
 	},
 	"monitorStatus": {
 		"checkingEvery": "",
 		"withCaptureAgent": "",
-		"up": "",
-		"down": "",
-		"paused": ""
+		"up": "ayakta",
+		"down": "çalışmıyor",
+		"paused": "beklemede"
 	},
 	"advancedMatching": "",
 	"settingsEmailTLSServername": "",
 	"settingsEmailIgnoreTLS": "",
 	"settingsEmailRequireTLS": "",
 	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
+	"settingsEmailSecure": "Güvenli - SSL kullan",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "Bildirimleri dene",
+	"selectAll": "Tümünü seç"
 }
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 6e864b7ee..5f9409f6a 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -583,6 +583,13 @@
 			},
 			"errors": {
 				"validation": ""
+			},
+			"fields": {
+				"password": {
+					"errors": {
+						"incorrect": ""
+					}
+				}
 			}
 		},
 		"login": {
@@ -709,13 +716,13 @@
 			"integrationKeyLabel": "",
 			"integrationKeyPlaceholder": ""
 		},
-		"genericWebhookSettings": {
+		"discordSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
 			"webhookPlaceholder": ""
 		},
-		"discordSettings": {
+		"webhookSettings": {
 			"title": "",
 			"description": "",
 			"webhookLabel": "",
@@ -740,5 +747,6 @@
 	"settingsEmailRejectUnauthorized": "",
 	"settingsEmailSecure": "",
 	"settingsEmailPool": "",
-	"sendTestNotifications": ""
+	"sendTestNotifications": "",
+	"selectAll": ""
 }

From 0b6febbb820c76505e4a188574f93434234a1d01 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 11:25:42 +0800
Subject: [PATCH 275/319] add log cache, routes, and controller

---
 server/controllers/logController.js | 23 ++++++++++++
 server/index.js                     |  7 ++++
 server/routes/logRoutes.js          | 18 ++++++++++
 server/utils/logger.js              | 55 +++++++++++++++++++++++------
 4 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 server/controllers/logController.js
 create mode 100755 server/routes/logRoutes.js

diff --git a/server/controllers/logController.js b/server/controllers/logController.js
new file mode 100644
index 000000000..00cf7bbcb
--- /dev/null
+++ b/server/controllers/logController.js
@@ -0,0 +1,23 @@
+import { handleError } from "./controllerUtils.js";
+
+const SERVICE_NAME = "JobQueueController";
+
+class LogController {
+	constructor(logger) {
+		this.logger = logger;
+	}
+
+	getLogs = async (req, res, next) => {
+		try {
+			const logs = await this.logger.getLogs();
+			res.success({
+				msg: "Logs fetched successfully",
+				data: logs,
+			});
+		} catch (error) {
+			next(handleError(error, SERVICE_NAME, "getMetrics"));
+			return;
+		}
+	};
+}
+export default LogController;
diff --git a/server/index.js b/server/index.js
index 99be6de7a..4b74ef46c 100755
--- a/server/index.js
+++ b/server/index.js
@@ -36,6 +36,9 @@ import StatusPageController from "./controllers/statusPageController.js";
 import QueueRoutes from "./routes/queueRoute.js";
 import QueueController from "./controllers/queueController.js";
 
+import LogRoutes from "./routes/logRoutes.js";
+import LogController from "./controllers/logController.js";
+
 import NotificationRoutes from "./routes/notificationRoute.js";
 import NotificationController from "./controllers/notificationController.js";
 
@@ -294,6 +297,8 @@ const startApp = async () => {
 		ServiceRegistry.get(StringService.SERVICE_NAME)
 	);
 
+	const logController = new LogController(logger);
+
 	const statusPageController = new StatusPageController(
 		ServiceRegistry.get(MongoDB.SERVICE_NAME),
 		ServiceRegistry.get(StringService.SERVICE_NAME)
@@ -320,6 +325,7 @@ const startApp = async () => {
 		maintenanceWindowController
 	);
 	const queueRoutes = new QueueRoutes(queueController);
+	const logRoutes = new LogRoutes(logController);
 	const statusPageRoutes = new StatusPageRoutes(statusPageController);
 
 	const notificationRoutes = new NotificationRoutes(notificationController);
@@ -372,6 +378,7 @@ const startApp = async () => {
 	app.use("/api/v1/checks", verifyJWT, checkRoutes.getRouter());
 	app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRoutes.getRouter());
 	app.use("/api/v1/queue", verifyJWT, queueRoutes.getRouter());
+	app.use("/api/v1/logs", verifyJWT, logRoutes.getRouter());
 	app.use("/api/v1/status-page", statusPageRoutes.getRouter());
 	app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
 	app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
diff --git a/server/routes/logRoutes.js b/server/routes/logRoutes.js
new file mode 100755
index 000000000..867826dde
--- /dev/null
+++ b/server/routes/logRoutes.js
@@ -0,0 +1,18 @@
+import { Router } from "express";
+import { isAllowed } from "../middleware/isAllowed.js";
+class LogRoutes {
+	constructor(logController) {
+		this.router = Router();
+		this.logController = logController;
+		this.initRoutes();
+	}
+	initRoutes() {
+		this.router.get("/", isAllowed(["admin", "superadmin"]), this.logController.getLogs);
+	}
+
+	getRouter() {
+		return this.router;
+	}
+}
+
+export default LogRoutes;
diff --git a/server/utils/logger.js b/server/utils/logger.js
index 155adc957..f19694987 100755
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -4,6 +4,8 @@ dotenv.config();
 
 class Logger {
 	constructor() {
+		this.logCache = [];
+		this.maxCacheSize = 500;
 		const consoleFormat = format.printf(
 			({ level, message, service, method, details, timestamp, stack }) => {
 				if (message instanceof Object) {
@@ -72,11 +74,17 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	info(config) {
-		this.logger.info(config.message, {
+		const logEntry = {
+			level: "info",
+			message: config.message,
 			service: config.service,
 			method: config.method,
 			details: config.details,
-		});
+			timestamp: new Date().toISOString(),
+		};
+
+		this.cacheLog(logEntry);
+		this.logger.info(config.message, logEntry);
 	}
 
 	/**
@@ -88,11 +96,17 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	warn(config) {
-		this.logger.warn(config.message, {
+		const logEntry = {
+			level: "warn",
+			message: config.message,
 			service: config.service,
 			method: config.method,
 			details: config.details,
-		});
+			timestamp: new Date().toISOString(),
+		};
+
+		this.cacheLog(logEntry);
+		this.logger.warn(config.message, logEntry);
 	}
 
 	/**
@@ -104,12 +118,17 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	error(config) {
-		this.logger.error(config.message, {
+		const logEntry = {
+			level: "error",
+			message: config.message,
 			service: config.service,
 			method: config.method,
 			details: config.details,
-			stack: config.stack,
-		});
+			timestamp: new Date().toISOString(),
+		};
+
+		this.cacheLog(logEntry);
+		this.logger.error(config.message, logEntry);
 	}
 	/**
 	 * Logs a debug message.
@@ -120,12 +139,28 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	debug(config) {
-		this.logger.debug(config.message, {
+		const logEntry = {
+			level: "debug",
+			message: config.message,
 			service: config.service,
 			method: config.method,
 			details: config.details,
-			stack: config.stack,
-		});
+			timestamp: new Date().toISOString(),
+		};
+
+		this.cacheLog(logEntry);
+		this.logger.debug(config.message, logEntry);
+	}
+
+	cacheLog(entry) {
+		this.logCache.push(entry);
+		if (this.logCache.length > this.maxCacheSize) {
+			this.logCache.shift();
+		}
+	}
+
+	getLogs() {
+		return this.logCache;
 	}
 }
 

From 365ae081237cc4c7aca94124c3029fdf0db712c8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:09:30 +0800
Subject: [PATCH 276/319] FE log component implementation

---
 client/package-lock.json                      | 399 +++++++++++-------
 client/package.json                           |   2 +-
 client/src/Hooks/logHooks.js                  |  35 ++
 client/src/Pages/Logs/Logs/index.jsx          |  93 ++++
 .../Logs/Queue/components/Metrics/index.jsx   |   2 -
 client/src/Pages/Logs/index.jsx               |   5 +-
 client/src/Utils/NetworkService.js            |   8 +
 client/src/assets/icons/logs.svg              |   2 +-
 client/src/locales/en.json                    |  15 +-
 9 files changed, 401 insertions(+), 160 deletions(-)
 create mode 100644 client/src/Hooks/logHooks.js
 create mode 100644 client/src/Pages/Logs/Logs/index.jsx

diff --git a/client/package-lock.json b/client/package-lock.json
index 4050adfbb..f58f56f44 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -45,7 +45,7 @@
 				"eslint-plugin-react-hooks": "^5.0.0",
 				"eslint-plugin-react-refresh": "^0.4.6",
 				"prettier": "^3.3.3",
-				"vite": "^5.4.19"
+				"vite": "6.3.5"
 			},
 			"optionalDependencies": {
 				"@rollup/rollup-linux-arm64-musl": "4.41.0"
@@ -492,9 +492,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+			"integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
 			"cpu": [
 				"ppc64"
 			],
@@ -504,13 +504,13 @@
 				"aix"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+			"integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
 			"cpu": [
 				"arm"
 			],
@@ -520,13 +520,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+			"integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
 			"cpu": [
 				"arm64"
 			],
@@ -536,13 +536,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/android-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+			"integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
 			"cpu": [
 				"x64"
 			],
@@ -552,13 +552,13 @@
 				"android"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+			"integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -568,13 +568,13 @@
 				"darwin"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+			"integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
 			"cpu": [
 				"x64"
 			],
@@ -584,13 +584,13 @@
 				"darwin"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
 			"cpu": [
 				"arm64"
 			],
@@ -600,13 +600,13 @@
 				"freebsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+			"integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
 			"cpu": [
 				"x64"
 			],
@@ -616,13 +616,13 @@
 				"freebsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-arm": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+			"integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
 			"cpu": [
 				"arm"
 			],
@@ -632,13 +632,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+			"integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
 			"cpu": [
 				"arm64"
 			],
@@ -648,13 +648,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+			"integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
 			"cpu": [
 				"ia32"
 			],
@@ -664,13 +664,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+			"integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
 			"cpu": [
 				"loong64"
 			],
@@ -680,13 +680,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+			"integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
 			"cpu": [
 				"mips64el"
 			],
@@ -696,13 +696,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+			"integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
 			"cpu": [
 				"ppc64"
 			],
@@ -712,13 +712,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+			"integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
 			"cpu": [
 				"riscv64"
 			],
@@ -728,13 +728,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+			"integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
 			"cpu": [
 				"s390x"
 			],
@@ -744,13 +744,13 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/linux-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+			"integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
 			"cpu": [
 				"x64"
 			],
@@ -760,13 +760,29 @@
 				"linux"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/netbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
 			"cpu": [
 				"x64"
 			],
@@ -776,13 +792,29 @@
 				"netbsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
 			"cpu": [
 				"x64"
 			],
@@ -792,13 +824,13 @@
 				"openbsd"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+			"integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
 			"cpu": [
 				"x64"
 			],
@@ -808,13 +840,13 @@
 				"sunos"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+			"integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
 			"cpu": [
 				"arm64"
 			],
@@ -824,13 +856,13 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+			"integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
 			"cpu": [
 				"ia32"
 			],
@@ -840,13 +872,13 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@esbuild/win32-x64": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+			"integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
 			"cpu": [
 				"x64"
 			],
@@ -856,7 +888,7 @@
 				"win32"
 			],
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
@@ -3040,9 +3072,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3172,23 +3204,6 @@
 			],
 			"license": "CC-BY-4.0"
 		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
 		"node_modules/clsx": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -3259,6 +3274,15 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/cosmiconfig/node_modules/yaml": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"license": "ISC",
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -3820,41 +3844,43 @@
 			}
 		},
 		"node_modules/esbuild": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+			"integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
 			"hasInstallScript": true,
 			"license": "MIT",
 			"bin": {
 				"esbuild": "bin/esbuild"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			},
 			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.21.5",
-				"@esbuild/android-arm": "0.21.5",
-				"@esbuild/android-arm64": "0.21.5",
-				"@esbuild/android-x64": "0.21.5",
-				"@esbuild/darwin-arm64": "0.21.5",
-				"@esbuild/darwin-x64": "0.21.5",
-				"@esbuild/freebsd-arm64": "0.21.5",
-				"@esbuild/freebsd-x64": "0.21.5",
-				"@esbuild/linux-arm": "0.21.5",
-				"@esbuild/linux-arm64": "0.21.5",
-				"@esbuild/linux-ia32": "0.21.5",
-				"@esbuild/linux-loong64": "0.21.5",
-				"@esbuild/linux-mips64el": "0.21.5",
-				"@esbuild/linux-ppc64": "0.21.5",
-				"@esbuild/linux-riscv64": "0.21.5",
-				"@esbuild/linux-s390x": "0.21.5",
-				"@esbuild/linux-x64": "0.21.5",
-				"@esbuild/netbsd-x64": "0.21.5",
-				"@esbuild/openbsd-x64": "0.21.5",
-				"@esbuild/sunos-x64": "0.21.5",
-				"@esbuild/win32-arm64": "0.21.5",
-				"@esbuild/win32-ia32": "0.21.5",
-				"@esbuild/win32-x64": "0.21.5"
+				"@esbuild/aix-ppc64": "0.25.5",
+				"@esbuild/android-arm": "0.25.5",
+				"@esbuild/android-arm64": "0.25.5",
+				"@esbuild/android-x64": "0.25.5",
+				"@esbuild/darwin-arm64": "0.25.5",
+				"@esbuild/darwin-x64": "0.25.5",
+				"@esbuild/freebsd-arm64": "0.25.5",
+				"@esbuild/freebsd-x64": "0.25.5",
+				"@esbuild/linux-arm": "0.25.5",
+				"@esbuild/linux-arm64": "0.25.5",
+				"@esbuild/linux-ia32": "0.25.5",
+				"@esbuild/linux-loong64": "0.25.5",
+				"@esbuild/linux-mips64el": "0.25.5",
+				"@esbuild/linux-ppc64": "0.25.5",
+				"@esbuild/linux-riscv64": "0.25.5",
+				"@esbuild/linux-s390x": "0.25.5",
+				"@esbuild/linux-x64": "0.25.5",
+				"@esbuild/netbsd-arm64": "0.25.5",
+				"@esbuild/netbsd-x64": "0.25.5",
+				"@esbuild/openbsd-arm64": "0.25.5",
+				"@esbuild/openbsd-x64": "0.25.5",
+				"@esbuild/sunos-x64": "0.25.5",
+				"@esbuild/win32-arm64": "0.25.5",
+				"@esbuild/win32-ia32": "0.25.5",
+				"@esbuild/win32-x64": "0.25.5"
 			}
 		},
 		"node_modules/escalade": {
@@ -4052,6 +4078,23 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
+		"node_modules/eslint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
 		"node_modules/eslint/node_modules/globals": {
 			"version": "13.24.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
@@ -4184,6 +4227,20 @@
 				"reusify": "^1.0.4"
 			}
 		},
+		"node_modules/fdir": {
+			"version": "6.4.6",
+			"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+			"integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+			"license": "MIT",
+			"peerDependencies": {
+				"picomatch": "^3 || ^4"
+			},
+			"peerDependenciesMeta": {
+				"picomatch": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/file-entry-cache": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -6713,6 +6770,22 @@
 			"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
 			"license": "MIT"
 		},
+		"node_modules/tinyglobby": {
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+			"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+			"license": "MIT",
+			"dependencies": {
+				"fdir": "^6.4.4",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/SuperchupuDev"
+			}
+		},
 		"node_modules/tslib": {
 			"version": "2.8.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -6923,20 +6996,23 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "5.4.19",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
-			"integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
+			"version": "6.3.5",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+			"integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
 			"license": "MIT",
 			"dependencies": {
-				"esbuild": "^0.21.3",
-				"postcss": "^8.4.43",
-				"rollup": "^4.20.0"
+				"esbuild": "^0.25.0",
+				"fdir": "^6.4.4",
+				"picomatch": "^4.0.2",
+				"postcss": "^8.5.3",
+				"rollup": "^4.34.9",
+				"tinyglobby": "^0.2.13"
 			},
 			"bin": {
 				"vite": "bin/vite.js"
 			},
 			"engines": {
-				"node": "^18.0.0 || >=20.0.0"
+				"node": "^18.0.0 || ^20.0.0 || >=22.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/vitejs/vite?sponsor=1"
@@ -6945,19 +7021,25 @@
 				"fsevents": "~2.3.3"
 			},
 			"peerDependencies": {
-				"@types/node": "^18.0.0 || >=20.0.0",
+				"@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+				"jiti": ">=1.21.0",
 				"less": "*",
 				"lightningcss": "^1.21.0",
 				"sass": "*",
 				"sass-embedded": "*",
 				"stylus": "*",
 				"sugarss": "*",
-				"terser": "^5.4.0"
+				"terser": "^5.16.0",
+				"tsx": "^4.8.1",
+				"yaml": "^2.4.2"
 			},
 			"peerDependenciesMeta": {
 				"@types/node": {
 					"optional": true
 				},
+				"jiti": {
+					"optional": true
+				},
 				"less": {
 					"optional": true
 				},
@@ -6978,6 +7060,12 @@
 				},
 				"terser": {
 					"optional": true
+				},
+				"tsx": {
+					"optional": true
+				},
+				"yaml": {
+					"optional": true
 				}
 			}
 		},
@@ -7133,12 +7221,17 @@
 			"license": "ISC"
 		},
 		"node_modules/yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+			"integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
 			"license": "ISC",
+			"optional": true,
+			"peer": true,
+			"bin": {
+				"yaml": "bin.mjs"
+			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">= 14.6"
 			}
 		},
 		"node_modules/yocto-queue": {
diff --git a/client/package.json b/client/package.json
index 83dfe8407..611ba5093 100644
--- a/client/package.json
+++ b/client/package.json
@@ -58,7 +58,7 @@
 		"eslint-plugin-react-hooks": "^5.0.0",
 		"eslint-plugin-react-refresh": "^0.4.6",
 		"prettier": "^3.3.3",
-		"vite": "^5.4.19"
+		"vite": "6.3.5"
 	},
 	"optionalDependencies": {
 		"@rollup/rollup-linux-arm64-musl": "4.41.0"
diff --git a/client/src/Hooks/logHooks.js b/client/src/Hooks/logHooks.js
new file mode 100644
index 000000000..000e4d0f0
--- /dev/null
+++ b/client/src/Hooks/logHooks.js
@@ -0,0 +1,35 @@
+import { useState, useEffect } from "react";
+import { networkService } from "../main";
+import { createToast } from "../Utils/toastUtils";
+import { useTranslation } from "react-i18next";
+
+const useFetchLogs = () => {
+	const { t } = useTranslation();
+	const [logs, setLogs] = useState(undefined);
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState(undefined);
+
+	useEffect(() => {
+		const fetchLogs = async () => {
+			try {
+				setIsLoading(true);
+				const response = await networkService.getLogs();
+				setLogs(response.data.data);
+				createToast({
+					body: t("logsPage.toast.fetchLogsSuccess"),
+				});
+			} catch (error) {
+				setError(error);
+				createToast({
+					message: error.message,
+				});
+			} finally {
+				setIsLoading(false);
+			}
+		};
+		fetchLogs();
+	}, [t]);
+	return [logs, isLoading, error];
+};
+
+export { useFetchLogs };
diff --git a/client/src/Pages/Logs/Logs/index.jsx b/client/src/Pages/Logs/Logs/index.jsx
new file mode 100644
index 000000000..d5b0a8469
--- /dev/null
+++ b/client/src/Pages/Logs/Logs/index.jsx
@@ -0,0 +1,93 @@
+import Stack from "@mui/material/Stack";
+import Box from "@mui/material/Box";
+import Select from "../../../Components/Inputs/Select";
+import Typography from "@mui/material/Typography";
+
+import { useFetchLogs } from "../../../Hooks/logHooks";
+import { useTheme } from "@emotion/react";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+const formatLog = (theme, log, idx) => {
+	const levelColors = {
+		info: theme.palette.success.main,
+		warn: theme.palette.warning.main,
+		error: theme.palette.error.main,
+		debug: theme.palette.accent.main,
+	};
+
+	const color = levelColors[log.level] || theme.palette.primary.contrastText;
+
+	return (
+		<span key={idx}>
+			<span>[{log.timestamp}]</span>{" "}
+			<span style={{ color, fontWeight: "bold" }}>{log.level.toUpperCase()}</span>
+			{": "}
+			{`(${log.service})`}
+			{`(${log.method})`}
+			{": "}
+			{log.message}
+			<br />
+		</span>
+	);
+};
+
+const Logs = () => {
+	// Local state
+	const [logLevel, setLogLevel] = useState("all");
+
+	// Hooks
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const [logs, isLoading, error] = useFetchLogs();
+	// Setup
+	const LOG_LEVELS = [
+		{ _id: "all", name: t("logsPage.logLevelSelect.values.all") },
+		{ _id: "info", name: t("logsPage.logLevelSelect.values.info") },
+		{ _id: "warn", name: t("logsPage.logLevelSelect.values.warn") },
+		{ _id: "error", name: t("logsPage.logLevelSelect.values.error") },
+		{ _id: "debug", name: t("logsPage.logLevelSelect.values.debug") },
+	];
+	return (
+		<Stack>
+			<Stack
+				direction="row"
+				alignItems="center"
+				gap={theme.spacing(4)}
+			>
+				<Typography>{t("logsPage.logLevelSelect.title")}</Typography>
+				<Select
+					items={LOG_LEVELS}
+					value={logLevel}
+					onChange={(e) => {
+						setLogLevel(e.target.value);
+					}}
+				/>
+			</Stack>
+			<Box
+				component="pre"
+				sx={{
+					fontFamily: "monospace",
+					color: theme.palette.primary.contrastText,
+					padding: 2,
+					borderRadius: 1,
+					overflowX: "auto",
+					whiteSpace: "pre-wrap",
+					wordWrap: "break-word",
+				}}
+			>
+				<code>
+					{logs
+						?.filter((log) => {
+							if (logLevel === "all") return true;
+							return log.level === logLevel;
+						})
+						.reverse()
+						.map((log, idx) => formatLog(theme, log, idx))}
+				</code>
+			</Box>
+		</Stack>
+	);
+};
+
+export default Logs;
diff --git a/client/src/Pages/Logs/Queue/components/Metrics/index.jsx b/client/src/Pages/Logs/Queue/components/Metrics/index.jsx
index 52117cd3b..af1cf8010 100644
--- a/client/src/Pages/Logs/Queue/components/Metrics/index.jsx
+++ b/client/src/Pages/Logs/Queue/components/Metrics/index.jsx
@@ -23,8 +23,6 @@ const Metrics = ({ metrics = {} }) => {
 			return { key, title: camelToTitle(key), value: metrics[key] };
 		});
 
-	console.log(JSON.stringify(data, null, 2));
-
 	return (
 		<Stack gap={theme.spacing(2)}>
 			<Typography variant="h2">{t("queuePage.metricsTable.title")}</Typography>
diff --git a/client/src/Pages/Logs/index.jsx b/client/src/Pages/Logs/index.jsx
index 0f1f0f18f..74b3d51d0 100644
--- a/client/src/Pages/Logs/index.jsx
+++ b/client/src/Pages/Logs/index.jsx
@@ -4,6 +4,7 @@ import Breadcrumbs from "../../Components/Breadcrumbs";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
 import Queue from "./Queue";
+import LogsComponent from "./Logs";
 
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +15,7 @@ const Logs = () => {
 	const theme = useTheme();
 
 	// Local state
-	const [value, setValue] = useState(0);
+	const [value, setValue] = useState(1);
 
 	// Handlers
 	const handleChange = (event, newValue) => {
@@ -33,7 +34,7 @@ const Logs = () => {
 				<Tab label={t("logsPage.tabs.logs")} />
 			</Tabs>
 			{value === 0 && <Queue />}
-			{value === 1 && <div>Not yet</div>}
+			{value === 1 && <LogsComponent />}
 		</Stack>
 	);
 };
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 651f72fe0..99e2452fd 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1041,6 +1041,14 @@ class NetworkService {
 		});
 		return response;
 	}
+
+	async getLogs() {
+		return this.axiosInstance.get(`/logs`, {
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
+	}
 }
 
 export default NetworkService;
diff --git a/client/src/assets/icons/logs.svg b/client/src/assets/icons/logs.svg
index e1adcb390..556c3ba33 100644
--- a/client/src/assets/icons/logs.svg
+++ b/client/src/assets/icons/logs.svg
@@ -1,5 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
         d="M21 5C21 6.65685 16.9706 8 12 8C7.02944 8 3 6.65685 3 5M21 5C21 3.34315 16.9706 2 12 2C7.02944 2 3 3.34315 3 5M21 5V19C21 20.66 17 22 12 22C7 22 3 20.66 3 19V5M21 12C21 13.66 17 15 12 15C7 15 3 13.66 3 12"
-        stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+        stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
 </svg>
\ No newline at end of file
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 0856592fc..e441e65d6 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -758,7 +758,20 @@
 		"title": "Logs",
 		"tabs": {
 			"queue": "Job queue",
-			"logs": "Logs"
+			"logs": "Server logs"
+		},
+		"toast": {
+			"fetchLogsSuccess": "Logs fetched successfully"
+		},
+		"logLevelSelect": {
+			"title": "Log level",
+			"values": {
+				"all": "All",
+				"info": "Info",
+				"warn": "Warn",
+				"error": "Error",
+				"debug": "Debug"
+			}
 		}
 	},
 	"queuePage": {

From 961d827a520b0ae7ed474646b461ec56bd4634f8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:19:40 +0800
Subject: [PATCH 277/319] add a description

---
 client/src/Pages/Logs/Logs/index.jsx |  6 +++++-
 client/src/locales/en.json           | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/src/Pages/Logs/Logs/index.jsx b/client/src/Pages/Logs/Logs/index.jsx
index d5b0a8469..6c5e1a301 100644
--- a/client/src/Pages/Logs/Logs/index.jsx
+++ b/client/src/Pages/Logs/Logs/index.jsx
@@ -49,7 +49,10 @@ const Logs = () => {
 		{ _id: "debug", name: t("logsPage.logLevelSelect.values.debug") },
 	];
 	return (
-		<Stack>
+		<Stack gap={theme.spacing(4)}>
+			<Box>
+				<Typography variant="body">{t("logsPage.description")}</Typography>
+			</Box>
 			<Stack
 				direction="row"
 				alignItems="center"
@@ -64,6 +67,7 @@ const Logs = () => {
 					}}
 				/>
 			</Stack>
+
 			<Box
 				component="pre"
 				sx={{
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index e441e65d6..62cc8f772 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -756,6 +756,7 @@
 	"selectAll": "Select all",
 	"logsPage": {
 		"title": "Logs",
+		"description": "This page shows the latest 1000 lines of logs from the Checkmate server",
 		"tabs": {
 			"queue": "Job queue",
 			"logs": "Server logs"
@@ -803,16 +804,16 @@
 			"failCountHeader": "Fail count",
 			"failedAtHeader": "Last failed at",
 			"failReasonHeader": "Fail reason"
-		},
-		"export": {
-			"title": "Export Monitors",
-			"success": "Monitors exported successfully!",
-			"failed": "Failed to export monitors"
-		},
-		"monitorActions": {
-			"title": "Export/Import",
-			"import": "Import Monitors",
-			"export": "Export Monitors"
 		}
+	},
+	"export": {
+		"title": "Export Monitors",
+		"success": "Monitors exported successfully!",
+		"failed": "Failed to export monitors"
+	},
+	"monitorActions": {
+		"title": "Export/Import",
+		"import": "Import Monitors",
+		"export": "Export Monitors"
 	}
 }

From 9d18d55bbfff321f3aa81dd429110329f7acff42 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:19:52 +0800
Subject: [PATCH 278/319] increase log cache size

---
 server/utils/logger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/logger.js b/server/utils/logger.js
index f19694987..c774d1ec7 100755
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -5,7 +5,7 @@ dotenv.config();
 class Logger {
 	constructor() {
 		this.logCache = [];
-		this.maxCacheSize = 500;
+		this.maxCacheSize = 1000;
 		const consoleFormat = format.printf(
 			({ level, message, service, method, details, timestamp, stack }) => {
 				if (message instanceof Object) {

From 176f5769794d4bbc9fdb8372e9a6de71399a996c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:20:33 +0800
Subject: [PATCH 279/319] change page order

---
 client/src/Pages/Logs/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Logs/index.jsx b/client/src/Pages/Logs/index.jsx
index 74b3d51d0..ad1bb2121 100644
--- a/client/src/Pages/Logs/index.jsx
+++ b/client/src/Pages/Logs/index.jsx
@@ -15,7 +15,7 @@ const Logs = () => {
 	const theme = useTheme();
 
 	// Local state
-	const [value, setValue] = useState(1);
+	const [value, setValue] = useState(0);
 
 	// Handlers
 	const handleChange = (event, newValue) => {
@@ -33,8 +33,8 @@ const Logs = () => {
 				<Tab label={t("logsPage.tabs.queue")} />
 				<Tab label={t("logsPage.tabs.logs")} />
 			</Tabs>
-			{value === 0 && <Queue />}
-			{value === 1 && <LogsComponent />}
+			{value === 0 && <LogsComponent />}
+			{value === 1 && <Queue />}
 		</Stack>
 	);
 };

From 5758a84e139725494097c201abfab175e3cdb16a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:21:27 +0800
Subject: [PATCH 280/319] fix tab order

---
 client/src/Pages/Logs/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Logs/index.jsx b/client/src/Pages/Logs/index.jsx
index ad1bb2121..4dd8946ca 100644
--- a/client/src/Pages/Logs/index.jsx
+++ b/client/src/Pages/Logs/index.jsx
@@ -30,8 +30,8 @@ const Logs = () => {
 				value={value}
 				onChange={handleChange}
 			>
-				<Tab label={t("logsPage.tabs.queue")} />
 				<Tab label={t("logsPage.tabs.logs")} />
+				<Tab label={t("logsPage.tabs.queue")} />
 			</Tabs>
 			{value === 0 && <LogsComponent />}
 			{value === 1 && <Queue />}

From 92c2b2d6c1c8f5eaa1d33790de8dfdd4efc597eb Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:26:35 +0800
Subject: [PATCH 281/319] remove unused import

---
 client/src/Pages/Logs/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/Pages/Logs/index.jsx b/client/src/Pages/Logs/index.jsx
index 4dd8946ca..482491ad0 100644
--- a/client/src/Pages/Logs/index.jsx
+++ b/client/src/Pages/Logs/index.jsx
@@ -1,5 +1,4 @@
 import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
 import Breadcrumbs from "../../Components/Breadcrumbs";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";

From 35aa5162cab47ef5c7350e3d488ae8c2f081f6e0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 12:34:30 +0800
Subject: [PATCH 282/319] don't render bg svg on light mode

---
 client/src/Components/Layouts/AppLayout/index.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/Layouts/AppLayout/index.jsx b/client/src/Components/Layouts/AppLayout/index.jsx
index 564012d72..d13f6d879 100644
--- a/client/src/Components/Layouts/AppLayout/index.jsx
+++ b/client/src/Components/Layouts/AppLayout/index.jsx
@@ -2,16 +2,17 @@ import Box from "@mui/material/Box";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import BackgroundSVG from "../../../assets/Images/background.svg";
+import { useSelector } from "react-redux";
 
 const AppLayout = ({ children }) => {
 	const theme = useTheme();
-
+	const ui = useSelector((state) => state.ui);
 	return (
 		<Box
 			sx={{
 				minHeight: "100vh",
 				backgroundColor: theme.palette.primaryBackground.main,
-				backgroundImage: `url("${BackgroundSVG}")`,
+				backgroundImage: ui?.mode === "dark" ? `url("${BackgroundSVG}")` : "none",
 				backgroundSize: "100% 100%",
 				backgroundPosition: "center",
 				backgroundRepeat: "no-repeat",

From 0336170c8d3452eaf437d77e1cdfe159443b8502 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 13:19:18 +0800
Subject: [PATCH 283/319] refactor

---
 server/utils/logger.js | 51 +++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/server/utils/logger.js b/server/utils/logger.js
index c774d1ec7..1c6f99af4 100755
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -74,15 +74,7 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	info(config) {
-		const logEntry = {
-			level: "info",
-			message: config.message,
-			service: config.service,
-			method: config.method,
-			details: config.details,
-			timestamp: new Date().toISOString(),
-		};
-
+		const logEntry = this.buildLogEntry("info", config);
 		this.cacheLog(logEntry);
 		this.logger.info(config.message, logEntry);
 	}
@@ -96,15 +88,7 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	warn(config) {
-		const logEntry = {
-			level: "warn",
-			message: config.message,
-			service: config.service,
-			method: config.method,
-			details: config.details,
-			timestamp: new Date().toISOString(),
-		};
-
+		const logEntry = this.buildLogEntry("warn", config);
 		this.cacheLog(logEntry);
 		this.logger.warn(config.message, logEntry);
 	}
@@ -118,15 +102,7 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	error(config) {
-		const logEntry = {
-			level: "error",
-			message: config.message,
-			service: config.service,
-			method: config.method,
-			details: config.details,
-			timestamp: new Date().toISOString(),
-		};
-
+		const logEntry = this.buildLogEntry("error", config);
 		this.cacheLog(logEntry);
 		this.logger.error(config.message, logEntry);
 	}
@@ -139,15 +115,7 @@ class Logger {
 	 * @param {Object} config.details - Additional details.
 	 */
 	debug(config) {
-		const logEntry = {
-			level: "debug",
-			message: config.message,
-			service: config.service,
-			method: config.method,
-			details: config.details,
-			timestamp: new Date().toISOString(),
-		};
-
+		const logEntry = this.buildLogEntry("debug", config);
 		this.cacheLog(logEntry);
 		this.logger.debug(config.message, logEntry);
 	}
@@ -162,6 +130,17 @@ class Logger {
 	getLogs() {
 		return this.logCache;
 	}
+
+	buildLogEntry(level, config) {
+		return {
+			level,
+			message: config.message,
+			service: config.service,
+			method: config.method,
+			details: config.details,
+			timestamp: new Date().toISOString(),
+		};
+	}
 }
 
 const logger = new Logger();

From 32688ba320de72466c7d394cfdd2458a69dc88ed Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 13:22:53 +0800
Subject: [PATCH 284/319] add missing stack

---
 server/utils/logger.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/utils/logger.js b/server/utils/logger.js
index 1c6f99af4..0864176c5 100755
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -138,6 +138,7 @@ class Logger {
 			service: config.service,
 			method: config.method,
 			details: config.details,
+			stack: config.stack,
 			timestamp: new Date().toISOString(),
 		};
 	}

From bf73a715234f4819e7417980fad588322e401670 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 14:48:45 +0800
Subject: [PATCH 285/319] remove duplicate user

---
 client/src/Pages/Settings/SettingsEmail.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index c63b9edf5..1ae4a1f02 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -268,7 +268,6 @@ const SettingsEmail = ({
 										},
 										name: systemEmailConnectionHost || "localhost",
 										pool: systemEmailPool,
-										user: systemEmailUser,
 										tls: {
 											rejectUnauthorized: systemEmailRejectUnauthorized,
 											ignoreTLS: systemEmailIgnoreTLS,

From 05add10ba8c69b1a9df565d84770f966691ebcfe Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 15:45:24 +0800
Subject: [PATCH 286/319] add middleware for verifying team access

---
 server/middleware/verifyOwnership.js    |  4 +++-
 server/middleware/verifyTeamAccess.js   | 25 +++++++++++++++++++++++++
 server/routes/maintenanceWindowRoute.js | 15 ++++++++++++---
 server/routes/monitorRoute.js           |  6 +++++-
 server/routes/notificationRoute.js      | 16 +++++++++++++---
 5 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 server/middleware/verifyTeamAccess.js

diff --git a/server/middleware/verifyOwnership.js b/server/middleware/verifyOwnership.js
index ca2476f54..754d96204 100755
--- a/server/middleware/verifyOwnership.js
+++ b/server/middleware/verifyOwnership.js
@@ -6,8 +6,10 @@ const SERVICE_NAME = "verifyOwnership";
 const verifyOwnership = (Model, paramName) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	return async (req, res, next) => {
+		console.log(req.params);
 		const userId = req.user._id;
 		const documentId = req.params[paramName];
+
 		try {
 			const doc = await Model.findById(documentId);
 			//If the document is not found, return a 404 error
@@ -35,7 +37,7 @@ const verifyOwnership = (Model, paramName) => {
 
 			// If the userID does not match the document's userID, return a 403 error
 			if (userId.toString() !== doc.userId.toString()) {
-				const error = new Error(stringService.verifyOwnerUnauthorized);
+				const error = new Error("Unauthorized");
 				error.status = 403;
 				throw error;
 			}
diff --git a/server/middleware/verifyTeamAccess.js b/server/middleware/verifyTeamAccess.js
new file mode 100644
index 000000000..463bd4c05
--- /dev/null
+++ b/server/middleware/verifyTeamAccess.js
@@ -0,0 +1,25 @@
+const SERVICE_NAME = "verifyTeamAccess";
+
+const verifyTeamAccess = (Model, paramName) => {
+	return async (req, res, next) => {
+		try {
+			const documentId = req.params[paramName];
+			const doc = await Model.findById(documentId);
+			if (req.user.teamId.toString() === doc.teamId.toString()) {
+				next();
+				return;
+			}
+
+			const error = new Error("Unauthorized");
+			error.status = 403;
+			throw error;
+		} catch (error) {
+			error.service = SERVICE_NAME;
+			error.method = "verifyTeamAccess";
+			next(error);
+			return;
+		}
+	};
+};
+
+export { verifyTeamAccess };
diff --git a/server/routes/maintenanceWindowRoute.js b/server/routes/maintenanceWindowRoute.js
index 2665c2bb8..36f982e25 100755
--- a/server/routes/maintenanceWindowRoute.js
+++ b/server/routes/maintenanceWindowRoute.js
@@ -1,7 +1,8 @@
 import { Router } from "express";
 import { verifyOwnership } from "../middleware/verifyOwnership.js";
+import { verifyTeamAccess } from "../middleware/verifyTeamAccess.js";
 import Monitor from "../db/models/Monitor.js";
-
+import MaintenanceWindow from "../db/models/MaintenanceWindow.js";
 class MaintenanceWindowRoutes {
 	constructor(maintenanceWindowController) {
 		this.router = Router();
@@ -24,9 +25,17 @@ class MaintenanceWindowRoutes {
 
 		this.router.get("/:id", this.maintenanceWindowController.getMaintenanceWindowById);
 
-		this.router.put("/:id", this.maintenanceWindowController.editMaintenanceWindow);
+		this.router.put(
+			"/:id",
+			verifyTeamAccess(MaintenanceWindow, "id"),
+			this.maintenanceWindowController.editMaintenanceWindow
+		);
 
-		this.router.delete("/:id", this.maintenanceWindowController.deleteMaintenanceWindow);
+		this.router.delete(
+			"/:id",
+			verifyTeamAccess(MaintenanceWindow, "id"),
+			this.maintenanceWindowController.deleteMaintenanceWindow
+		);
 	}
 
 	getRouter() {
diff --git a/server/routes/monitorRoute.js b/server/routes/monitorRoute.js
index 2c6ae870e..168f8b88d 100755
--- a/server/routes/monitorRoute.js
+++ b/server/routes/monitorRoute.js
@@ -2,7 +2,9 @@ import { Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
 import multer from "multer";
 import { fetchMonitorCertificate } from "../controllers/controllerUtils.js";
-
+import Monitor from "../db/models/Monitor.js";
+import { verifyOwnership } from "../middleware/verifyOwnership.js";
+import { verifyTeamAccess } from "../middleware/verifyTeamAccess.js";
 const upload = multer({
 	storage: multer.memoryStorage(), // Store file in memory as Buffer
 });
@@ -62,6 +64,7 @@ class MonitorRoutes {
 
 		this.router.delete(
 			"/:monitorId",
+			verifyOwnership(Monitor, "monitorId"),
 			isAllowed(["admin", "superadmin"]),
 			this.monitorController.deleteMonitor
 		);
@@ -74,6 +77,7 @@ class MonitorRoutes {
 
 		this.router.put(
 			"/:monitorId",
+			verifyTeamAccess(Monitor, "monitorId"),
 			isAllowed(["admin", "superadmin"]),
 			this.monitorController.editMonitor
 		);
diff --git a/server/routes/notificationRoute.js b/server/routes/notificationRoute.js
index 164c0afcc..09becd16c 100755
--- a/server/routes/notificationRoute.js
+++ b/server/routes/notificationRoute.js
@@ -1,6 +1,8 @@
 import { Router } from "express";
 import { verifyJWT } from "../middleware/verifyJWT.js";
-
+import { verifyOwnership } from "../middleware/verifyOwnership.js";
+import { verifyTeamAccess } from "../middleware/verifyTeamAccess.js";
+import Notification from "../db/models/Notification.js";
 class NotificationRoutes {
 	constructor(notificationController) {
 		this.router = Router();
@@ -18,10 +20,18 @@ class NotificationRoutes {
 
 		this.router.get("/team", this.notificationController.getNotificationsByTeamId);
 
-		this.router.delete("/:id", this.notificationController.deleteNotification);
+		this.router.delete(
+			"/:id",
+			verifyOwnership(Notification, "id"),
+			this.notificationController.deleteNotification
+		);
 
 		this.router.get("/:id", this.notificationController.getNotificationById);
-		this.router.put("/:id", this.notificationController.editNotification);
+		this.router.put(
+			"/:id",
+			verifyTeamAccess(Notification, "id"),
+			this.notificationController.editNotification
+		);
 	}
 
 	getRouter() {

From 41137c09b2490a73c8f90a7fa79bbecaa42b5db4 Mon Sep 17 00:00:00 2001
From: Tamir Azrab <tamirazrab@gmail.com>
Date: Mon, 23 Jun 2025 15:52:34 +0500
Subject: [PATCH 287/319] chore: remove unnecessary string

---
 client/src/locales/en.json    | 4 ++--
 client/src/locales/pt-BR.json | 4 ++--
 client/src/locales/ru.json    | 4 ++--
 client/src/locales/tr.json    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index a7c7c0a9f..3d06df9b0 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -23,9 +23,9 @@
 	"settingsClearAllStatsDialogConfirm": "Yes, clear all stats",
 	"settingsDemoMonitors": "Demo monitors",
 	"settingsDemoMonitorsDescription": "Add sample monitors for demonstration purposes.",
-	"settingsAddDemoMonitors": "Adding demo monitors",
+	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Add demo monitors",
-	"settingsRemoveAllMonitors": "Removing all monitors",
+	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Remove all monitors",
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 38b08adaf..827351623 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -23,9 +23,9 @@
 	"settingsClearAllStatsDialogConfirm": "Sim, limpar todas as estatísticas",
 	"settingsDemoMonitors": "Monitores de demonstração",
 	"settingsDemoMonitorsDescription": "Adicione monitores de genéricos para fins de demonstração.",
-	"settingsAddDemoMonitors": "Adicionando monitores de demonstração",
+	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Adicionar monitores de demonstração",
-	"settingsRemoveAllMonitors": "Removendo todos os monitores",
+	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Remover todos os monitores",
 	"settingsRemoveAllMonitorsDialogTitle": "Você deseja remover todos os monitores?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Sim, remova todos os monitores",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 65a4fe4a0..c816de918 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -23,9 +23,9 @@
 	"settingsClearAllStatsDialogConfirm": "Да, очистить всю статистику",
 	"settingsDemoMonitors": "Демо мониторы",
 	"settingsDemoMonitorsDescription": "Здесь вы можете добавлять и удалять демонстрационные мониторы.",
-	"settingsAddDemoMonitors": "Добавьте демонстрационные мониторы",
+	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Добавьте демонстрационные мониторы",
-	"settingsRemoveAllMonitors": "Удалить все демонстрационные мониторы",
+	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Удалить все демонстрационные мониторы",
 	"settingsRemoveAllMonitorsDialogTitle": "Хотите удалить все мониторы?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Да, очистить все мониторы",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index ed03d7e6c..ced98cc10 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -23,9 +23,9 @@
 	"settingsClearAllStatsDialogConfirm": "Evet, tüm istatistikleri temizle",
 	"settingsDemoMonitors": "Demo monitörler",
 	"settingsDemoMonitorsDescription": "Burada demo monitörler ekleyebilir ve kaldırabilirsiniz.",
-	"settingsAddDemoMonitors": "Demo monitörler ekle",
+	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Demo monitörler ekle",
-	"settingsRemoveAllMonitors": "Tüm monitörleri kaldır",
+	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Tüm monitörleri kaldır",
 	"settingsRemoveAllMonitorsDialogTitle": "Tüm monitörleri kaldırmak istiyor musunuz?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Evet, tüm monitörleri temizle",

From 7839e4c1973241b98128d6a574562beec9b0a76b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 23 Jun 2025 20:10:10 +0800
Subject: [PATCH 288/319] correct logging

---
 server/controllers/logController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/controllers/logController.js b/server/controllers/logController.js
index 00cf7bbcb..5381fd3fa 100644
--- a/server/controllers/logController.js
+++ b/server/controllers/logController.js
@@ -15,7 +15,7 @@ class LogController {
 				data: logs,
 			});
 		} catch (error) {
-			next(handleError(error, SERVICE_NAME, "getMetrics"));
+			next(handleError(error, SERVICE_NAME, "getLogs"));
 			return;
 		}
 	};

From ac9ff86e68a69e543987dded975085ae8f3ccbcc Mon Sep 17 00:00:00 2001
From: giridhar88 <giridhar99489@gmail.com>
Date: Mon, 23 Jun 2025 19:01:03 +0530
Subject: [PATCH 289/319] Add maintenance row click feature to edit the
 maintenance window

---
 .../Maintenance/MaintenanceTable/index.jsx      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
index a798838cb..bb5842e9f 100644
--- a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
+++ b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
@@ -11,6 +11,8 @@ import { formatDurationRounded } from "../../../Utils/timeUtils";
 import { StatusLabel } from "../../../Components/Label";
 import { setRowsPerPage } from "../../../Features/UI/uiSlice";
 import { useTranslation } from "react-i18next";
+import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router-dom";
 import dayjs from "dayjs";
 /**
  * Component for pagination actions (first, previous, next, last).
@@ -36,7 +38,8 @@ const MaintenanceTable = ({
 }) => {
 	const rowsPerPage = useSelector((state) => state?.ui?.maintenance?.rowsPerPage ?? 5);
 	const dispatch = useDispatch();
-
+	const theme = useTheme();
+	const navigate = useNavigate();
 	const handleChangePage = (event, newPage) => {
 		setPage(newPage);
 	};
@@ -180,6 +183,18 @@ const MaintenanceTable = ({
 	return (
 		<>
 			<DataTable
+				config={{
+					rowSX: {
+						cursor: "pointer",
+						"&:hover td": {
+							backgroundColor: theme.palette.tertiary.main,
+							transition: "background-color .3s ease",
+						},
+					},
+					onRowClick: (row) => {
+						navigate(`/maintenance/create/${row._id}`);
+					},
+				}}
 				headers={headers}
 				data={maintenanceWindows}
 			/>

From c8685c427344fc59bdc86da68cb143f6adf27438 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:00:41 +0800
Subject: [PATCH 290/319] remove console

---
 server/middleware/verifyOwnership.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/middleware/verifyOwnership.js b/server/middleware/verifyOwnership.js
index 754d96204..011b178a4 100755
--- a/server/middleware/verifyOwnership.js
+++ b/server/middleware/verifyOwnership.js
@@ -6,7 +6,6 @@ const SERVICE_NAME = "verifyOwnership";
 const verifyOwnership = (Model, paramName) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	return async (req, res, next) => {
-		console.log(req.params);
 		const userId = req.user._id;
 		const documentId = req.params[paramName];
 

From 40f879f6714ef7486e423798494f6e5058b58a5f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:02:36 +0800
Subject: [PATCH 291/319] user and teamId check

---
 server/middleware/verifyTeamAccess.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/server/middleware/verifyTeamAccess.js b/server/middleware/verifyTeamAccess.js
index 463bd4c05..60647bdc2 100644
--- a/server/middleware/verifyTeamAccess.js
+++ b/server/middleware/verifyTeamAccess.js
@@ -5,6 +5,19 @@ const verifyTeamAccess = (Model, paramName) => {
 		try {
 			const documentId = req.params[paramName];
 			const doc = await Model.findById(documentId);
+
+			if (!doc) {
+				const error = new Error("Document not found");
+				error.status = 404;
+				throw error;
+			}
+
+			if (!req?.user?.teamId || !doc.teamId) {
+				const error = new Error("Missing team information");
+				error.status = 400;
+				throw error;
+			}
+
 			if (req.user.teamId.toString() === doc.teamId.toString()) {
 				next();
 				return;

From dbf9f86105886e24a990e1cd498ef920d48ab163 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:09:07 +0800
Subject: [PATCH 292/319] add entrypoint to prod certbot

---
 docker/prod/docker-compose.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml
index d9bc1109a..980a0e2f5 100755
--- a/docker/prod/docker-compose.yaml
+++ b/docker/prod/docker-compose.yaml
@@ -21,6 +21,8 @@ services:
     volumes:
       - ./certbot/www/:/var/www/certbot/:rw
       - ./certbot/conf/:/etc/letsencrypt/:rw
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew --webroot -w /var/www/certbot; sleep 12h & wait $${!}; done;'"
+
   server:
     image: ghcr.io/bluewave-labs/checkmate:backend-demo
     restart: always

From e7429ecd67ca756346731fd64daf4be77ae05053 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:18:25 +0800
Subject: [PATCH 293/319] add stat boxes and timeframe header

---
 client/src/Pages/Uptime/Details/index.jsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/src/Pages/Uptime/Details/index.jsx b/client/src/Pages/Uptime/Details/index.jsx
index 5f36ee7e5..c72a5756f 100644
--- a/client/src/Pages/Uptime/Details/index.jsx
+++ b/client/src/Pages/Uptime/Details/index.jsx
@@ -111,6 +111,7 @@ const UptimeDetails = () => {
 		return (
 			<Stack gap={theme.spacing(10)}>
 				<Breadcrumbs list={BREADCRUMBS} />
+
 				<MonitorDetailsControlHeader
 					path={"uptime"}
 					isAdmin={isAdmin}
@@ -118,6 +119,19 @@ const UptimeDetails = () => {
 					monitor={monitor}
 					triggerUpdate={triggerUpdate}
 				/>
+				<UptimeStatusBoxes
+					isLoading={monitorIsLoading}
+					monitor={monitor}
+					monitorStats={monitorStats}
+					certificateExpiry={certificateExpiry}
+				/>
+				<MonitorTimeFrameHeader
+					isLoading={monitorIsLoading}
+					hasDateRange={true}
+					dateRange={dateRange}
+					setDateRange={setDateRange}
+				/>
+
 				<GenericFallback>
 					<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
 				</GenericFallback>

From 3bcf3b1ed07198e54497cc33fbf7b266981835f6 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:28:25 +0800
Subject: [PATCH 294/319] update bg color

---
 client/src/Utils/Theme/constants.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/Utils/Theme/constants.js b/client/src/Utils/Theme/constants.js
index 48dcdfd85..1b905bb79 100644
--- a/client/src/Utils/Theme/constants.js
+++ b/client/src/Utils/Theme/constants.js
@@ -85,6 +85,7 @@ const semanticColors = {
 const newColors = {
 	offWhite: "#FEFEFE",
 	offBlack: "#131315",
+	gray0: "#FDFDFD",
 	gray10: "#F4F4FF",
 	gray100: "#F3F3F3",
 	gray200: "#EFEFEF",
@@ -178,7 +179,7 @@ const newSemanticColors = {
 	},
 	primaryBackground: {
 		main: {
-			light: newColors.gray10,
+			light: newColors.gray0,
 			dark: "#000000",
 		},
 	},

From b9a8328a48dce477472e8bf7d550b397a3fbea05 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:44:16 +0800
Subject: [PATCH 295/319] ignore empty strings

---
 client/src/Utils/i18n.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/Utils/i18n.js b/client/src/Utils/i18n.js
index 4468917a2..030091d48 100644
--- a/client/src/Utils/i18n.js
+++ b/client/src/Utils/i18n.js
@@ -24,6 +24,7 @@ i18n.use(initReactI18next).init({
 	interpolation: {
 		escapeValue: false,
 	},
+	returnEmptyString: false,
 });
 
 export default i18n;

From 1ebb6b922b6240bdd9da1d7465719e12d89bccfa Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:52:19 +0800
Subject: [PATCH 296/319] temporarliy comment out import/export

---
 client/src/Components/MonitorCreateHeader/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Components/MonitorCreateHeader/index.jsx b/client/src/Components/MonitorCreateHeader/index.jsx
index f2b6bbce4..b3b50681c 100644
--- a/client/src/Components/MonitorCreateHeader/index.jsx
+++ b/client/src/Components/MonitorCreateHeader/index.jsx
@@ -29,7 +29,7 @@ const CreateMonitorHeader = ({ isAdmin, label, isLoading = true, path, bulkPath
 			>
 				{label || t("createNew")}
 			</Button>
-			{bulkPath && <MonitorActions isLoading={isLoading} />}
+			{/* {bulkPath && <MonitorActions isLoading={isLoading} />} */}
 		</Stack>
 	);
 };

From 536c27cb30b03a5075bb145c30bc2f74a8a7ebcd Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 10:59:01 +0800
Subject: [PATCH 297/319] update docker compose files

---
 docker/dist-arm/docker-compose.yaml  | 11 +----------
 docker/dist-mono/docker-compose.yaml | 12 ------------
 docker/dist/docker-compose.yaml      | 12 ------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index f66640f71..921d3b8c1 100644
--- a/docker/dist-arm/docker-compose.yaml
+++ b/docker/dist-arm/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/bluewave-labs/checkmate:backend-dist-mono-multiarch
+    image: ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
     restart: always
     ports:
       - "52345:52345"
@@ -12,16 +12,7 @@ services:
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
     depends_on:
-      - redis
       - mongodb
-  redis:
-    image: redis:7
-    container_name: checkmate-redis
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis/data:/data
-    restart: unless-stopped
   mongodb:
     image: mongo:4.4.18
     container_name: checkmate-mongodb
diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml
index fd5d54ddc..0dd97aafb 100755
--- a/docker/dist-mono/docker-compose.yaml
+++ b/docker/dist-mono/docker-compose.yaml
@@ -12,19 +12,7 @@ services:
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
     depends_on:
-      - redis
       - mongodb
-  redis:
-    image: ghcr.io/bluewave-labs/checkmate-redis:latest
-    restart: always
-    volumes:
-      - ./redis/data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate-mongo:latest
     restart: always
diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml
index 580f21e97..ff2f1b7ea 100755
--- a/docker/dist/docker-compose.yaml
+++ b/docker/dist/docker-compose.yaml
@@ -16,7 +16,6 @@ services:
     ports:
       - "52345:52345"
     depends_on:
-      - redis
       - mongodb
     environment:
       - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0
@@ -25,17 +24,6 @@ services:
       - JWT_SECRET=my_secret
     # volumes:
     # - /var/run/docker.sock:/var/run/docker.sock:ro
-  redis:
-    image: ghcr.io/bluewave-labs/checkmate-redis:latest
-    restart: always
-    volumes:
-      - ./redis/data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate-mongo:latest
     restart: always

From 2cb40b388503c4b53b51b74bc17b42746dcb6d44 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 11:12:44 +0800
Subject: [PATCH 298/319] update docker ignore

---
 docker/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/.gitignore b/docker/.gitignore
index 81ba730c9..9a6df883a 100755
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -10,4 +10,5 @@ prod/redis/data/*
 dist/docker-compose-test.yaml
 /dist-mono/mongo/data/*
 /dist-mono/redis/data/*
+/dist-arm/mongo/data/*
 *.env

From 2ee2d9b905bdc886a17430ae71298cb24cdca6fa Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 11:15:14 +0800
Subject: [PATCH 299/319] add missing  context

---
 server/controllers/authController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index df4034aef..c7882f726 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -111,7 +111,7 @@ class AuthController {
 						});
 					});
 			} catch (error) {
-				logger.warn({
+				this.logger.warn({
 					message: error.message,
 					service: SERVICE_NAME,
 					method: "registerUser",

From d184f3fd38ba8997d7d978506bc3e081979f0183 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 11:18:13 +0800
Subject: [PATCH 300/319] add missing contenxt

---
 server/controllers/authController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index c7882f726..5538e996d 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -82,7 +82,7 @@ class AuthController {
 			}
 
 			const newUser = await this.db.insertUser({ ...req.body }, req.file);
-			logger.info({
+			this.logger.info({
 				message: this.stringService.authCreateUser,
 				service: SERVICE_NAME,
 				details: newUser._id,

From b282ff988386bd340c59a4ea4656d69939b4b4d6 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 11:45:51 +0800
Subject: [PATCH 301/319] fix delete user

---
 server/controllers/authController.js | 3 +--
 server/middleware/verifyOwnership.js | 7 ++++++-
 server/service/stringService.js      | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index 5538e996d..d517c50d9 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -412,8 +412,7 @@ class AuthController {
 			// 1. Find all the monitors associated with the team ID if superadmin
 
 			const result = await this.db.getMonitorsByTeamId({
-				query: {},
-				params: { teamId: user.teamId.toString() },
+				teamId: user.teamId.toString(),
 			});
 
 			if (user.role.includes("superadmin")) {
diff --git a/server/middleware/verifyOwnership.js b/server/middleware/verifyOwnership.js
index 011b178a4..2040d54ee 100755
--- a/server/middleware/verifyOwnership.js
+++ b/server/middleware/verifyOwnership.js
@@ -1,15 +1,20 @@
 import logger from "../utils/logger.js";
 import ServiceRegistry from "../service/serviceRegistry.js";
 import StringService from "../service/stringService.js";
+import { ObjectId } from "mongodb";
+
 const SERVICE_NAME = "verifyOwnership";
 
 const verifyOwnership = (Model, paramName) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 	return async (req, res, next) => {
 		const userId = req.user._id;
-		const documentId = req.params[paramName];
+		let documentId = req.params[paramName];
 
 		try {
+			if (typeof documentId === "string") {
+				documentId = ObjectId.createFromHexString(documentId);
+			}
 			const doc = await Model.findById(documentId);
 			//If the document is not found, return a 404 error
 			if (!doc) {
diff --git a/server/service/stringService.js b/server/service/stringService.js
index 499aa769f..5ee17a5ef 100755
--- a/server/service/stringService.js
+++ b/server/service/stringService.js
@@ -436,6 +436,14 @@ class StringService {
 	get testEmailSubject() {
 		return this.translationService.getTranslation("testEmailSubject");
 	}
+
+	get verifyOwnerNotFound() {
+		return this.translationService.getTranslation("verifyOwnerNotFound");
+	}
+
+	get verifyOwnerUnauthorized() {
+		return this.translationService.getTranslation("verifyOwnerUnauthorized");
+	}
 }
 
 export default StringService;

From 40f4294caebbfcaca78271525aaefa12177ad618 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 12:07:02 +0800
Subject: [PATCH 302/319] cascade on superuser delete

---
 server/controllers/authController.js |  7 -------
 server/db/models/User.js             | 21 +++++++++++++++++++++
 server/service/stringService.js      |  4 ++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/server/controllers/authController.js b/server/controllers/authController.js
index d517c50d9..1d8c2af0e 100755
--- a/server/controllers/authController.js
+++ b/server/controllers/authController.js
@@ -423,13 +423,6 @@ class AuthController {
 							await this.jobQueue.deleteJob(monitor);
 						})
 					));
-
-				// 3. Delete team
-				await this.db.deleteTeam(user.teamId);
-				// 4. Delete all other team members
-				await this.db.deleteAllOtherUsers();
-				// 5. Delete each monitor
-				await this.db.deleteMonitorsByUserId(user._id);
 			}
 			// 6. Delete the user by id
 			await this.db.deleteUser(user._id);
diff --git a/server/db/models/User.js b/server/db/models/User.js
index 74ee1166e..d978f659b 100755
--- a/server/db/models/User.js
+++ b/server/db/models/User.js
@@ -1,6 +1,9 @@
 import mongoose from "mongoose";
 import bcrypt from "bcryptjs";
 import logger from "../../utils/logger.js";
+import Monitor from "./Monitor.js";
+import Team from "./Team.js";
+import Notification from "./Notification.js";
 
 const UserSchema = mongoose.Schema(
 	{
@@ -74,6 +77,24 @@ UserSchema.pre("findOneAndUpdate", function (next) {
 	next();
 });
 
+UserSchema.pre("findOneAndDelete", async function (next) {
+	try {
+		const userToDelete = await this.model.findOne(this.getFilter());
+		if (userToDelete.role.includes("superadmin")) {
+			await Team.deleteOne({ _id: userToDelete.teamId });
+			await Monitor.deleteMany({ userId: userToDelete._id });
+			await this.model.deleteMany({
+				teamId: userToDelete.teamId,
+				_id: { $ne: userToDelete._id },
+			});
+			await Notification.deleteMany({ teamId: userToDelete.teamId });
+		}
+		next();
+	} catch (error) {
+		next(error);
+	}
+});
+
 UserSchema.methods.comparePassword = async function (submittedPassword) {
 	const res = await bcrypt.compare(submittedPassword, this.password);
 	return res;
diff --git a/server/service/stringService.js b/server/service/stringService.js
index 5ee17a5ef..6f9ad8cd8 100755
--- a/server/service/stringService.js
+++ b/server/service/stringService.js
@@ -444,6 +444,10 @@ class StringService {
 	get verifyOwnerUnauthorized() {
 		return this.translationService.getTranslation("verifyOwnerUnauthorized");
 	}
+
+	get dbUserNotFound() {
+		return this.translationService.getTranslation("dbUserNotFound");
+	}
 }
 
 export default StringService;

From c16d5c424667b04658b5d74aaa381b357ace88d3 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 13:25:10 +0800
Subject: [PATCH 303/319] early return if user not found

---
 server/db/models/User.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/db/models/User.js b/server/db/models/User.js
index d978f659b..f180cfb86 100755
--- a/server/db/models/User.js
+++ b/server/db/models/User.js
@@ -80,6 +80,7 @@ UserSchema.pre("findOneAndUpdate", function (next) {
 UserSchema.pre("findOneAndDelete", async function (next) {
 	try {
 		const userToDelete = await this.model.findOne(this.getFilter());
+		if (!userToDelete) return next();
 		if (userToDelete.role.includes("superadmin")) {
 			await Team.deleteOne({ _id: userToDelete.teamId });
 			await Monitor.deleteMany({ userId: userToDelete._id });

From fe25a5d1702a1bfd42392b93a133c069ceef85cc Mon Sep 17 00:00:00 2001
From: Tamir Azrab <tamirazrab@gmail.com>
Date: Tue, 24 Jun 2025 10:44:35 +0500
Subject: [PATCH 304/319] chore: remove keys entirely

---
 client/src/Pages/Settings/SettingsDemoMonitors.jsx | 2 --
 client/src/locales/ar.json                         | 2 --
 client/src/locales/cs.json                         | 2 --
 client/src/locales/de.json                         | 2 --
 client/src/locales/en.json                         | 2 --
 client/src/locales/es.json                         | 2 --
 client/src/locales/fi.json                         | 2 --
 client/src/locales/fr.json                         | 2 --
 client/src/locales/pt-BR.json                      | 2 --
 client/src/locales/ru.json                         | 2 --
 client/src/locales/tr.json                         | 2 --
 client/src/locales/zh-TW.json                      | 2 --
 12 files changed, 24 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsDemoMonitors.jsx b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
index fbcbc66ab..4c1257efa 100644
--- a/client/src/Pages/Settings/SettingsDemoMonitors.jsx
+++ b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
@@ -32,7 +32,6 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 					<Typography sx={HEADER_SX}>{t("settingsDemoMonitorsDescription")}</Typography>
 				</Box>
 				<Box>
-					<Typography>{t("settingsAddDemoMonitors")}</Typography>
 					<Button
 						variant="contained"
 						color="accent"
@@ -64,7 +63,6 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 					</Typography>
 				</Box>
 				<Box>
-					<Typography>{t("settingsRemoveAllMonitors")}</Typography>
 					<Button
 						variant="contained"
 						color="error"
diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
index 06789abb0..81a2bb05f 100644
--- a/client/src/locales/ar.json
+++ b/client/src/locales/ar.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 110d9a508..4e1170ee7 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 5561188a0..e33adab68 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 3d06df9b0..c18272870 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "Yes, clear all stats",
 	"settingsDemoMonitors": "Demo monitors",
 	"settingsDemoMonitorsDescription": "Add sample monitors for demonstration purposes.",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Add demo monitors",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Remove all monitors",
 	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index b23a57ed3..3579117ae 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index 44b56516b..d92fcf8db 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 0f218d1c6..729296216 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "Oui, effacer les stats",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index 827351623..fa6197bb3 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "Sim, limpar todas as estatísticas",
 	"settingsDemoMonitors": "Monitores de demonstração",
 	"settingsDemoMonitorsDescription": "Adicione monitores de genéricos para fins de demonstração.",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Adicionar monitores de demonstração",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Remover todos os monitores",
 	"settingsRemoveAllMonitorsDialogTitle": "Você deseja remover todos os monitores?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Sim, remova todos os monitores",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index c816de918..908bc73e7 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "Да, очистить всю статистику",
 	"settingsDemoMonitors": "Демо мониторы",
 	"settingsDemoMonitorsDescription": "Здесь вы можете добавлять и удалять демонстрационные мониторы.",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Добавьте демонстрационные мониторы",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Удалить все демонстрационные мониторы",
 	"settingsRemoveAllMonitorsDialogTitle": "Хотите удалить все мониторы?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Да, очистить все мониторы",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index ced98cc10..c9e224d63 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "Evet, tüm istatistikleri temizle",
 	"settingsDemoMonitors": "Demo monitörler",
 	"settingsDemoMonitorsDescription": "Burada demo monitörler ekleyebilir ve kaldırabilirsiniz.",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "Demo monitörler ekle",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "Tüm monitörleri kaldır",
 	"settingsRemoveAllMonitorsDialogTitle": "Tüm monitörleri kaldırmak istiyor musunuz?",
 	"settingsRemoveAllMonitorsDialogConfirm": "Evet, tüm monitörleri temizle",
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 5f9409f6a..9dfd6effb 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -23,9 +23,7 @@
 	"settingsClearAllStatsDialogConfirm": "",
 	"settingsDemoMonitors": "",
 	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitors": "",
 	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitors": "",
 	"settingsRemoveAllMonitorsButton": "",
 	"settingsRemoveAllMonitorsDialogTitle": "",
 	"settingsRemoveAllMonitorsDialogConfirm": "",

From 4d913772590934621c9a1db6cc3f704ed11f3f9a Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 14:30:14 +0800
Subject: [PATCH 305/319] fix settings page strings

---
 client/src/Pages/Settings/SettingsAbout.jsx   |    4 +-
 .../Pages/Settings/SettingsDemoMonitors.jsx   |   20 +-
 client/src/Pages/Settings/SettingsEmail.jsx   |   58 +-
 .../src/Pages/Settings/SettingsPagespeed.jsx  |   12 +-
 client/src/Pages/Settings/SettingsStats.jsx   |   22 +-
 .../src/Pages/Settings/SettingsTimeZone.jsx   |    9 +-
 client/src/Pages/Settings/SettingsUI.jsx      |   10 +-
 client/src/Pages/Settings/SettingsURL.jsx     |   12 +-
 client/src/Pages/Settings/index.jsx           |    4 +-
 client/src/Utils/Theme/globalTheme.js         |    5 +
 client/src/locales/en.json                    | 1514 +++++++++--------
 11 files changed, 861 insertions(+), 809 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsAbout.jsx b/client/src/Pages/Settings/SettingsAbout.jsx
index 6acadd444..861d2f30c 100644
--- a/client/src/Pages/Settings/SettingsAbout.jsx
+++ b/client/src/Pages/Settings/SettingsAbout.jsx
@@ -16,7 +16,7 @@ const SettingsAbout = () => {
 					component="h1"
 					variant="h2"
 				>
-					{t("settingsAbout")}
+					{t("settingsPage.aboutSettings.title")}
 				</Typography>
 			</Box>
 			<Box>
@@ -24,7 +24,7 @@ const SettingsAbout = () => {
 					{t("common.appName")} {2.1}
 				</Typography>
 				<Typography sx={{ mt: theme.spacing(2), mb: theme.spacing(6), opacity: 0.6 }}>
-					{t("settingsDevelopedBy")}
+					{t("settingsPage.aboutSettings.labelDevelopedBy")}
 				</Typography>
 				<Link
 					level="secondary"
diff --git a/client/src/Pages/Settings/SettingsDemoMonitors.jsx b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
index fbcbc66ab..13e93421e 100644
--- a/client/src/Pages/Settings/SettingsDemoMonitors.jsx
+++ b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
@@ -27,12 +27,13 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 						component="h1"
 						variant="h2"
 					>
-						{t("settingsDemoMonitors")}
+						{t("settingsPage.demoMonitorsSettings.title")}
+					</Typography>
+					<Typography sx={HEADER_SX}>
+						{t("settingsPage.demoMonitorsSettings.description")}
 					</Typography>
-					<Typography sx={HEADER_SX}>{t("settingsDemoMonitorsDescription")}</Typography>
 				</Box>
 				<Box>
-					<Typography>{t("settingsAddDemoMonitors")}</Typography>
 					<Button
 						variant="contained"
 						color="accent"
@@ -47,7 +48,7 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 						}}
 						sx={{ mt: theme.spacing(4) }}
 					>
-						{t("settingsAddDemoMonitorsButton")}
+						{t("settingsPage.demoMonitorsSettings.buttonAddMonitors")}
 					</Button>
 				</Box>
 			</ConfigBox>
@@ -57,14 +58,13 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 						component="h1"
 						variant="h2"
 					>
-						{t("settingsSystemReset")}
+						{t("settingsPage.systemResetSettings.title")}
 					</Typography>
 					<Typography sx={{ mt: theme.spacing(2) }}>
-						{t("settingsSystemResetDescription")}
+						{t("settingsPage.systemResetSettings.description")}
 					</Typography>
 				</Box>
 				<Box>
-					<Typography>{t("settingsRemoveAllMonitors")}</Typography>
 					<Button
 						variant="contained"
 						color="error"
@@ -72,15 +72,15 @@ const SettingsDemoMonitors = ({ isAdmin, HEADER_SX, handleChange, isLoading }) =
 						onClick={() => setIsOpen(true)}
 						sx={{ mt: theme.spacing(4) }}
 					>
-						{t("settingsRemoveAllMonitorsButton")}
+						{t("settingsPage.systemResetSettings.buttonRemoveAllMonitors")}
 					</Button>
 				</Box>
 				<Dialog
 					open={isOpen}
 					theme={theme}
-					title={t("settingsRemoveAllMonitorsDialogTitle")}
+					title={t("settingsPage.systemResetSettings.dialogTitle")}
 					onCancel={() => setIsOpen(false)}
-					confirmationButtonLabel={t("settingsRemoveAllMonitorsDialogConfirm")}
+					confirmationButtonLabel={t("settingsPage.systemResetSettings.dialogConfirm")}
 					onConfirm={() => {
 						const syntheticEvent = {
 							target: {
diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 1ae4a1f02..6c527eaec 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -9,7 +9,7 @@ import TextLink from "../../Components/TextLink";
 // Utils
 import { useTheme } from "@emotion/react";
 import { PropTypes } from "prop-types";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
 import { useSendTestEmail } from "../../Hooks/useSendTestEmail";
@@ -111,14 +111,16 @@ const SettingsEmail = ({
 					component="h1"
 					variant="h2"
 				>
-					{t("settingsEmail")}
+					{t("settingsPage.emailSettings.title")}
+				</Typography>
+				<Typography sx={HEADER_SX}>
+					{t("settingsPage.emailSettings.description")}
 				</Typography>
-				<Typography sx={HEADER_SX}>{t("settingsEmailDescription")}</Typography>
 			</Box>
 			<Box>
 				<Stack gap={theme.spacing(10)}>
 					<Box>
-						<Typography>{t("settingsEmailHost")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelHost")}</Typography>
 						<TextInput
 							name="systemEmailHost"
 							placeholder="smtp.gmail.com"
@@ -127,7 +129,7 @@ const SettingsEmail = ({
 						/>
 					</Box>
 					<Box>
-						<Typography>{t("settingsEmailPort")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelPort")}</Typography>
 						<TextInput
 							name="systemEmailPort"
 							placeholder="425"
@@ -137,16 +139,16 @@ const SettingsEmail = ({
 						/>
 					</Box>
 					<Box>
-						<Typography>{t("settingsEmailUser")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelUser")}</Typography>
 						<TextInput
 							name="systemEmailUser"
-							placeholder="Leave empty if not required"
+							placeholder={t("settingsPage.emailSettings.placeholderUser")}
 							value={systemEmailUser}
 							onChange={handleChange}
 						/>
 					</Box>
 					<Box>
-						<Typography>{t("settingsEmailAddress")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelAddress")}</Typography>
 						<TextInput
 							name="systemEmailAddress"
 							placeholder="uptime@bluewavelabs.ca"
@@ -156,7 +158,7 @@ const SettingsEmail = ({
 					</Box>
 					{(isEmailPasswordSet === false || emailPasswordHasBeenReset === true) && (
 						<Box>
-							<Typography>{t("settingsEmailPassword")}</Typography>
+							<Typography>{t("settingsPage.emailSettings.labelPassword")}</Typography>
 							<TextInput
 								name="systemEmailPassword"
 								type="password"
@@ -170,7 +172,7 @@ const SettingsEmail = ({
 
 					{isEmailPasswordSet === true && emailPasswordHasBeenReset === false && (
 						<Box>
-							<Typography>{t("settingsEmailFieldResetLabel")}</Typography>
+							<Typography>{t("settingsPage.emailSettings.labelPasswordSet")}</Typography>
 							<Button
 								onClick={() => {
 									setPassword("");
@@ -189,7 +191,7 @@ const SettingsEmail = ({
 						</Box>
 					)}
 					<Box>
-						<Typography>{t("settingsEmailTLSServername")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelTLSServername")}</Typography>
 						<TextInput
 							name="systemEmailTLSServername"
 							placeholder="bluewavelabs.ca"
@@ -198,7 +200,7 @@ const SettingsEmail = ({
 						/>
 					</Box>
 					<Box>
-						<Typography>{t("settingsEmailConnectionHost")}</Typography>
+						<Typography>{t("settingsPage.emailSettings.labelConnectionHost")}</Typography>
 						<TextInput
 							name="systemEmailConnectionHost"
 							placeholder="bluewavelabs.ca"
@@ -214,12 +216,28 @@ const SettingsEmail = ({
 						}}
 					>
 						{[
-							["settingsEmailSecure", "systemEmailSecure", systemEmailSecure],
-							["settingsEmailPool", "systemEmailPool", systemEmailPool],
-							["settingsEmailIgnoreTLS", "systemEmailIgnoreTLS", systemEmailIgnoreTLS],
-							["settingsEmailRequireTLS", "systemEmailRequireTLS", systemEmailRequireTLS],
 							[
-								"settingsEmailRejectUnauthorized",
+								"settingsPage.emailSettings.labelSecure",
+								"systemEmailSecure",
+								systemEmailSecure,
+							],
+							[
+								"settingsPage.emailSettings.labelPool",
+								"systemEmailPool",
+								systemEmailPool,
+							],
+							[
+								"settingsPage.emailSettings.labelIgnoreTLS",
+								"systemEmailIgnoreTLS",
+								systemEmailIgnoreTLS,
+							],
+							[
+								"settingsPage.emailSettings.labelRequireTLS",
+								"systemEmailRequireTLS",
+								systemEmailRequireTLS,
+							],
+							[
+								"settingsPage.emailSettings.labelRejectUnauthorized",
 								"systemEmailRejectUnauthorized",
 								systemEmailRejectUnauthorized,
 							],
@@ -242,8 +260,8 @@ const SettingsEmail = ({
 						))}
 
 						<TextLink
-							text={t("settingsEmailTransportLinkDescription")}
-							linkText={t("settingsEmailTransportLinkText")}
+							text={t("settingsPage.emailSettings.descriptionTransport")}
+							linkText={t("settingsPage.emailSettings.linkTransport")}
 							href="https://nodemailer.com/smtp"
 							target="_blank"
 						/>
@@ -293,7 +311,7 @@ const SettingsEmail = ({
 									loading={isSending}
 									onClick={handleSendTestEmail}
 								>
-									{t("settingsTestEmail", "Send test e-mail")}
+									{t("settingsPage.emailSettings.buttonSendTestEmail")}
 								</Button>
 							)}
 					</Box>
diff --git a/client/src/Pages/Settings/SettingsPagespeed.jsx b/client/src/Pages/Settings/SettingsPagespeed.jsx
index 7d7cf0216..e9eff79b5 100644
--- a/client/src/Pages/Settings/SettingsPagespeed.jsx
+++ b/client/src/Pages/Settings/SettingsPagespeed.jsx
@@ -8,7 +8,7 @@ import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornmen
 // Utils
 import { useTheme } from "@emotion/react";
 import { PropTypes } from "prop-types";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 const SettingsPagespeed = ({
@@ -46,15 +46,17 @@ const SettingsPagespeed = ({
 					component="h1"
 					variant="h2"
 				>
-					{t("pageSpeedApiKeyFieldTitle")}
+					{t("settingsPage.pageSpeedSettings.title")}
+				</Typography>
+				<Typography sx={HEADING_SX}>
+					{t("settingsPage.pageSpeedSettings.description")}
 				</Typography>
-				<Typography sx={HEADING_SX}>{t("pageSpeedApiKeyFieldDescription")}</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
 				{(isApiKeySet === false || apiKeyHasBeenReset === true) && (
 					<TextInput
 						name="pagespeedApiKey"
-						label={t("pageSpeedApiKeyFieldLabel")}
+						label={t("settingsPage.pageSpeedSettings.labelApiKey")}
 						value={apiKey}
 						type={"password"}
 						onChange={handleChange}
@@ -65,7 +67,7 @@ const SettingsPagespeed = ({
 
 				{isApiKeySet === true && apiKeyHasBeenReset === false && (
 					<Box>
-						<Typography>{t("pageSpeedApiKeyFieldResetLabel")}</Typography>
+						<Typography>{t("settingsPage.pageSpeedSettings.labelAPiKeySet")}</Typography>
 						<Button
 							onClick={() => {
 								setApiKey("");
diff --git a/client/src/Pages/Settings/SettingsStats.jsx b/client/src/Pages/Settings/SettingsStats.jsx
index 333dfd229..740ac3a37 100644
--- a/client/src/Pages/Settings/SettingsStats.jsx
+++ b/client/src/Pages/Settings/SettingsStats.jsx
@@ -29,17 +29,17 @@ const SettingsStats = ({ isAdmin, HEADING_SX, handleChange, settingsData, errors
 					variant="h2"
 					sx={HEADING_SX}
 				>
-					{t("settingsHistoryAndMonitoring")}
+					{t("settingsPage.statsSettings.title")}
 				</Typography>
 				<Typography sx={{ mt: theme.spacing(2) }}>
-					{t("settingsHistoryAndMonitoringDescription")}
+					{t("settingsPage.statsSettings.description")}
 				</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
 				<TextInput
 					name="checkTTL"
-					label={t("settingsTTLLabel")}
-					optionalLabel={t("settingsTTLOptionalLabel")}
+					label={t("settingsPage.statsSettings.labelTTL")}
+					optionalLabel={t("settingsPage.statsSettings.labelTTLOptional")}
 					value={settingsData?.settings?.checkTTL ?? ""}
 					onChange={handleChange}
 					type="number"
@@ -47,24 +47,28 @@ const SettingsStats = ({ isAdmin, HEADING_SX, handleChange, settingsData, errors
 					helperText={errors.checkTTL}
 				/>
 				<Box>
-					<Typography>{t("settingsClearAllStats")}</Typography>
+					<Typography>
+						{t("settingsPage.statsSettings.clearAllStatsDescription")}
+					</Typography>
 					<Button
 						variant="contained"
 						color="error"
 						onClick={() => setIsOpen(true)}
 						sx={{ mt: theme.spacing(4) }}
 					>
-						{t("settingsClearAllStatsButton")}
+						{t("settingsPage.statsSettings.clearAllStatsButton")}
 					</Button>
 				</Box>
 			</Stack>
 			<Dialog
 				open={isOpen}
 				theme={theme}
-				title={t("settingsClearAllStatsDialogTitle")}
-				description={t("settingsClearAllStatsDialogDescription")}
+				title={t("settingsPage.statsSettings.clearAllStatsDialogTitle")}
+				description={t("settingsPage.statsSettings.clearAllStatsDialogDescription")}
 				onCancel={() => setIsOpen(false)}
-				confirmationButtonLabel={t("settingsClearAllStatsDialogConfirm")}
+				confirmationButtonLabel={t(
+					"settingsPage.statsSettings.clearAllStatsDialogConfirm"
+				)}
 				onConfirm={() => {
 					const syntheticEvent = {
 						target: {
diff --git a/client/src/Pages/Settings/SettingsTimeZone.jsx b/client/src/Pages/Settings/SettingsTimeZone.jsx
index 86fc72992..346e4e546 100644
--- a/client/src/Pages/Settings/SettingsTimeZone.jsx
+++ b/client/src/Pages/Settings/SettingsTimeZone.jsx
@@ -19,16 +19,17 @@ const SettingsTimeZone = ({ HEADING_SX, handleChange, timezone }) => {
 					component="h1"
 					variant="h2"
 				>
-					{t("settingsGeneralSettings")}
+					{t("settingsPage.timezoneSettings.title")}
 				</Typography>
 				<Typography sx={HEADING_SX}>
-					<Typography component="span">{t("settingsDisplayTimezone")}</Typography>-{" "}
-					{t("settingsDisplayTimezoneDescription")}
+					<Typography component="span">
+						{t("settingsPage.timezoneSettings.description")}
+					</Typography>
 				</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
 				<Select
-					label={t("settingsDisplayTimezone")}
+					label={t("settingsPage.timezoneSettings.label")}
 					name="timezone"
 					value={timezone}
 					onChange={handleChange}
diff --git a/client/src/Pages/Settings/SettingsUI.jsx b/client/src/Pages/Settings/SettingsUI.jsx
index a6dc6c9e4..aab5f863d 100644
--- a/client/src/Pages/Settings/SettingsUI.jsx
+++ b/client/src/Pages/Settings/SettingsUI.jsx
@@ -20,14 +20,16 @@ const SettingsUI = ({ HEADING_SX, handleChange, mode, language }) => {
 					component="h1"
 					variant="h2"
 				>
-					{t("settingsAppearance")}
+					{t("settingsPage.uiSettings.title")}
+				</Typography>
+				<Typography sx={HEADING_SX}>
+					{t("settingsPage.uiSettings.description")}
 				</Typography>
-				<Typography sx={HEADING_SX}>{t("settingsAppearanceDescription")}</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
 				<Select
 					name="mode"
-					label={t("settingsThemeMode")}
+					label={t("settingsPage.uiSettings.labelTheme")}
 					value={mode}
 					onChange={handleChange}
 					items={[
@@ -37,7 +39,7 @@ const SettingsUI = ({ HEADING_SX, handleChange, mode, language }) => {
 				></Select>
 				<Select
 					name="language"
-					label={t("settingsLanguage")}
+					label={t("settingsPage.uiSettings.labelLanguage")}
 					value={language}
 					onChange={handleChange}
 					items={languages.map((lang) => ({ _id: lang, name: lang.toUpperCase() }))}
diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index 1f0b28bd9..298dfa821 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -15,18 +15,20 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 	return (
 		<ConfigBox>
 			<Box>
-				<Typography component="h1">{t("settingsURLTitle")}</Typography>
-				<Typography sx={HEADING_SX}>{t("settingsURLDescription")}</Typography>
+				<Typography component="h1">{t("settingsPage.urlSettings.title")}</Typography>
+				<Typography sx={HEADING_SX}>
+					{t("settingsPage.urlSettings.description")}
+				</Typography>
 			</Box>
 			<Stack gap={theme.spacing(20)}>
 				<Select
 					name="showURL"
-					label={t("settingsURLSelectTitle")}
+					label={t("settingsPage.urlSettings.label")}
 					value={showURL || ""}
 					onChange={handleChange}
 					items={[
-						{ _id: true, name: t("settingsURLEnabled") },
-						{ _id: false, name: t("settingURLDisabled") },
+						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },
+						{ _id: false, name: t("settingsPage.urlSettings.selectDisabled") },
 					]}
 				></Select>
 			</Stack>
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 0cd954e52..dae6bd680 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -157,7 +157,7 @@ const Settings = () => {
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />
-			<Typography variant="h1">Settings</Typography>
+			<Typography variant="h1">{t("settingsPage.title")}</Typography>
 			<SettingsTimeZone
 				HEADING_SX={HEADING_SX}
 				handleChange={handleChange}
@@ -242,7 +242,7 @@ const Settings = () => {
 					sx={{ px: theme.spacing(12), py: theme.spacing(8) }}
 					onClick={handleSave}
 				>
-					{t("settingsSave")}
+					{t("settingsPage.saveButtonLabel")}
 				</Button>
 			</Stack>
 		</Stack>
diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index ae014432d..eb827a907 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -36,6 +36,11 @@ const baseTheme = (palette) => ({
 			color: palette.primary.contrastTextTertiary,
 			fontWeight: 400,
 		},
+		label: {
+			fontSize: "var(--env-var-font-size-medium)",
+			color: palette.primary.contrastTextSecondary,
+			fontWeight: 500,
+		},
 	},
 	/* TODO change to 4 */
 	spacing: 2,
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index b57bb1e15..72dda4c64 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,594 +1,29 @@
 {
-	"submit": "Submit",
-	"title": "Title",
-	"distributedStatusHeaderText": "Real-time, real-device coverage",
-	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
-	"settingsGeneralSettings": "General settings",
-	"settingsDisplayTimezone": "Display timezone",
-	"settingsDisplayTimezoneDescription": "Select the timezone used to display dates and times throughout the application.",
-	"settingsAppearance": "Appearance",
-	"settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
-	"settingsThemeMode": "Theme Mode",
-	"settingsLanguage": "Language",
-	"settingsEnabled": "Enabled",
-	"settingsDisabled": "Disabled",
-	"settingsHistoryAndMonitoring": "History of monitoring",
-	"settingsHistoryAndMonitoringDescription": "Define how long you want to retain historical data. You can also clear all existing data.",
-	"settingsTTLLabel": "The days you want to keep monitoring history.",
-	"settingsTTLOptionalLabel": "0 for infinite",
-	"settingsClearAllStats": "Clear all stats. This is irreversible.",
-	"settingsClearAllStatsButton": "Clear all stats",
-	"settingsClearAllStatsDialogTitle": "Do you want to clear all stats?",
-	"settingsClearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
-	"settingsClearAllStatsDialogConfirm": "Yes, clear all stats",
-	"settingsDemoMonitors": "Demo monitors",
-	"settingsDemoMonitorsDescription": "Add sample monitors for demonstration purposes.",
-	"settingsAddDemoMonitors": "Adding demo monitors",
-	"settingsAddDemoMonitorsButton": "Add demo monitors",
-	"settingsRemoveAllMonitors": "Removing all monitors",
-	"settingsRemoveAllMonitorsButton": "Remove all monitors",
-	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
-	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
-	"settingsAbout": "About",
-	"settingsDevelopedBy": "Developed by Bluewave Labs.",
-	"settingsSave": "Save",
-	"settingsSuccessSaved": "Settings saved successfully",
-	"settingsFailedToSave": "Failed to save settings",
-	"settingsStatsCleared": "Stats cleared successfully",
-	"settingsFailedToClearStats": "Failed to clear stats",
-	"settingsDemoMonitorsAdded": "Successfully added demo monitors",
-	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
-	"settingsMonitorsDeleted": "Successfully deleted all monitors",
-	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
-	"starPromptTitle": "Star Checkmate",
-	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
-	"https": "HTTPS",
-	"http": "HTTP",
-	"monitor": "monitor",
-	"aboutus": "About Us",
-	"now": "Now",
-	"delete": "Delete",
-	"configure": "Configure",
-	"responseTime": "Response time",
-	"ms": "ms",
-	"bar": "Bar",
-	"area": "Area",
-	"country": "COUNTRY",
-	"city": "CITY",
-	"response": "RESPONSE",
-	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
-	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
-	"webhookSendSuccess": "Webhook notification sent successfully",
-	"webhookSendError": "Error sending webhook notification to {platform}",
-	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
-	"distributedRightCategoryTitle": "Monitor",
-	"distributedStatusServerMonitors": "Server Monitors",
-	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
-	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
-	"distributedUptimeCreateChecks": "Checks to perform",
-	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
-	"distributedUptimeCreateIncidentNotification": "Incident notifications",
-	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
-	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
-	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
-	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
-	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
-	"notifications": {
-		"enableNotifications": "Enable {{platform}} notifications",
-		"testNotification": "Test notification",
-		"addOrEditNotifications": "Add or edit notifications",
-		"slack": {
-			"label": "Slack",
-			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/...",
-			"webhookRequired": "Slack webhook URL is required"
-		},
-		"discord": {
-			"label": "Discord",
-			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
-			"webhookRequired": "Discord webhook URL is required"
-		},
-		"telegram": {
-			"label": "Telegram",
-			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
-			"tokenLabel": "Your bot token",
-			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11",
-			"chatIdLabel": "Your Chat ID",
-			"chatIdPlaceholder": "-1001234567890",
-			"fieldsRequired": "Telegram token and chat ID are required"
-		},
-		"webhook": {
-			"label": "Webhooks",
-			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
-			"urlLabel": "Webhook URL",
-			"urlPlaceholder": "https://your-server.com/webhook",
-			"urlRequired": "Webhook URL is required"
-		},
-		"testNotificationDevelop": "Test notification 2",
-		"integrationButton": "Notification Integration",
-		"testSuccess": "Test notification sent successfully!",
-		"testFailed": "Failed to send test notification",
-		"unsupportedType": "Unsupported notification type",
-		"networkError": "Network error occurred",
-		"fallback": {
-			"title": "notification channel",
-			"checks": [
-				"Alert teams about downtime or performance issues",
-				"Let engineers know when incidents happen",
-				"Keep administrators informed of system changes"
-			]
-		},
-		"createButton": "Create notification channel",
-		"createTitle": "Notification channel",
-		"create": {
-			"success": "Notification created successfully",
-			"failed": "Failed to create notification"
-		},
-		"fetch": {
-			"success": "Notifications fetched successfully",
-			"failed": "Failed to fetch notifications"
-		},
-		"delete": {
-			"success": "Notification deleted successfully",
-			"failed": "Failed to delete notification"
-		},
-		"edit": {
-			"success": "Notification updated successfully",
-			"failed": "Failed to update notification"
-		},
-		"test": {
-			"success": "Test notification sent successfully",
-			"failed": "Failed to send test notification"
-		}
-	},
-	"testLocale": "testLocale",
-	"add": "Add",
-	"monitors": "monitors",
-	"distributedUptimeStatusCreateStatusPage": "status page",
-	"distributedUptimeStatusCreateStatusPageAccess": "Access",
-	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
-	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
-	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"distributedUptimeStatusLogoHeader": "Logo",
-	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
-	"distributedUptimeStatusLogoUploadButton": "Upload logo",
-	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
-	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
-	"distributedUptimeStatusCreateYour": "Create your",
-	"distributedUptimeStatusEditYour": "Edit your",
-	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
-	"distributedUptimeStatusCompanyNameLabel": "Company name",
-	"distributedUptimeStatusPageAddressLabel": "Your status page address",
-	"distributedUptimeStatus30Days": "30 days",
-	"distributedUptimeStatus60Days": "60 days",
-	"distributedUptimeStatus90Days": "90 days",
-	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
-	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
-	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
-	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
-	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
-	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
-	"distributedUptimeStatusDevices": "Devices",
-	"distributedUptimeStatusUpt": "UPT",
-	"distributedUptimeStatusUptBurned": "UPT Burned",
-	"distributedUptimeStatusUptLogo": "Upt Logo",
-	"incidentsTableNoIncidents": "No incidents recorded",
-	"incidentsTablePaginationLabel": "incidents",
-	"incidentsTableMonitorName": "Monitor Name",
-	"incidentsTableStatus": "Status",
-	"incidentsTableDateTime": "Date & Time",
-	"incidentsTableStatusCode": "Status Code",
-	"incidentsTableMessage": "Message",
-	"incidentsOptionsHeader": "Incidents for:",
-	"incidentsOptionsHeaderFilterBy": "Filter by:",
-	"incidentsOptionsHeaderFilterAll": "All",
-	"incidentsOptionsHeaderFilterDown": "Down",
-	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
-	"incidentsOptionsHeaderShow": "Show:",
-	"incidentsOptionsHeaderLastHour": "Last hour",
-	"incidentsOptionsHeaderLastDay": "Last day",
-	"incidentsOptionsHeaderLastWeek": "Last week",
-	"incidentsOptionsPlaceholderAllServers": "All servers",
-	"infrastructureCreateYour": "Create your",
-	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
-	"infrastructureServerRequirement": "The server you are monitoring must be running the",
-	"infrastructureCustomizeAlerts": "Customize alerts",
-	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
-	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
-	"infrastructureProtocol": "Protocol",
-	"infrastructureServerUrlLabel": "Server URL",
-	"infrastructureDisplayNameLabel": "Display name",
-	"infrastructureAuthorizationSecretLabel": "Authorization secret",
-	"gb": "GB",
-	"mb": "MB",
-	"mem": "Mem",
-	"memoryUsage": "Memory usage",
-	"cpu": "CPU",
-	"cpuUsage": "CPU usage",
-	"cpuTemperature": "CPU Temperature",
-	"diskUsage": "Disk Usage",
-	"used": "Used",
-	"total": "Total",
-	"cores": "Cores",
-	"frequency": "Frequency",
-	"status": "Status",
-	"cpuPhysical": "CPU (Physical)",
-	"cpuLogical": "CPU (Logical)",
-	"cpuFrequency": "CPU Frequency",
-	"avgCpuTemperature": "Average CPU Temperature",
-	"memory": "Memory",
-	"disk": "Disk",
-	"uptime": "Uptime",
-	"os": "OS",
-	"host": "Host",
-	"actions": "Actions",
-	"integrations": "Integrations",
-	"integrationsPrism": "Connect Prism to your favorite service.",
-	"integrationsSlack": "Slack",
-	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
-	"integrationsDiscord": "Discord",
-	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
-	"integrationsZapier": "Zapier",
-	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
-	"commonSave": "Save",
-	"createYour": "Create your",
-	"createMonitor": "Create monitor",
-	"pause": "Pause",
-	"resume": "Resume",
-	"editing": "Editing...",
-	"url": "URL",
-	"access": "Access",
-	"timezone": "Timezone",
-	"features": "Features",
-	"administrator": "Administrator?",
-	"loginHere": "Login here",
-	"displayName": "Display name",
-	"urlMonitor": "URL to monitor",
-	"portToMonitor": "Port to monitor",
-	"websiteMonitoring": "Website monitoring",
-	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
-	"pingMonitoring": "Ping monitoring",
-	"pingMonitoringDescription": "Check whether your server is available or not.",
-	"dockerContainerMonitoring": "Docker container monitoring",
-	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
-	"portMonitoring": "Port monitoring",
-	"portMonitoringDescription": "Check whether your port is open or not.",
-	"createMaintenanceWindow": "Create maintenance window",
-	"createMaintenance": "Create maintenance",
-	"editMaintenance": "Edit maintenance",
-	"maintenanceWindowName": "Maintenance Window Name",
-	"friendlyNameInput": "Friendly name",
-	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
-	"maintenanceRepeat": "Maintenance Repeat",
-	"maintenance": "maintenance",
-	"duration": "Duration",
-	"addMonitors": "Add monitors",
-	"window": "window",
-	"cancel": "Cancel",
-	"message": "Message",
-	"low": "low",
-	"high": "high",
-	"statusCode": "Status code",
-	"date&Time": "Date & Time",
-	"type": "Type",
-	"statusPageName": "Status page name",
-	"publicURL": "Public URL",
-	"repeat": "Repeat",
-	"edit": "Edit",
-	"createA": "Create a",
-	"remove": "Remove",
-	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
-	"startTime": "Start time",
-	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
-	"monitorsToApply": "Monitors to apply maintenance window to",
-	"nextWindow": "Next window",
-	"notFoundButton": "Go to the main dashboard",
-	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
-	"monitorDisplayName": "Monitor display name",
-	"whenNewIncident": "When there is a new incident,",
-	"notifySMS": "Notify via SMS (coming soon)",
-	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
-	"seperateEmails": "You can separate multiple emails with a comma",
-	"checkFrequency": "Check frequency",
-	"matchMethod": "Match Method",
-	"expectedValue": "Expected value",
-	"deleteDialogTitle": "Do you really want to delete this monitor?",
-	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
-	"pageSpeedMonitor": "PageSpeed monitor",
-	"shown": "Shown",
-	"ago": "ago",
-	"companyName": "Company name",
-	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
-	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
-	"checkingEvery": "Checking every",
-	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
-	"basicInformation": "Basic Information",
-	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
-	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
-	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
-	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
-	"statusPageCreateTabsContent": "Status page servers",
-	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
-	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
-	"showCharts": "Show charts",
-	"showUptimePercentage": "Show uptime percentage",
-	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
-	"removeLogo": "Remove Logo",
-	"statusPageStatus": "A public status page is not set up.",
-	"statusPageStatusContactAdmin": "Please contact to your administrator",
-	"statusPageStatusNotPublic": "This status page is not public.",
-	"statusPageStatusNoPage": "There's no status page here.",
-	"statusPageStatusServiceStatus": "Service status",
-	"deleteStatusPage": "Do you want to delete this status page?",
-	"deleteStatusPageConfirm": "Yes, delete status page",
-	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
-	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
-	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
-	"uptimeCreateJsonPathQuery": "for query language documentation.",
-	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
-	"infrastructureEditYour": "Edit your",
-	"infrastructureEditMonitor": "Save Infrastructure Monitor",
-	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
-	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
-	"errorInvalidTypeId": "Invalid notification type provided",
-	"errorInvalidFieldId": "Invalid field ID provided",
-	"inviteNoTokenFound": "No invite token found",
-	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
-	"pageSpeedLearnMoreLink": "Click here",
-	"pageSpeedAddApiKey": "to add your API key.",
-	"update": "Update",
-	"invalidFileFormat": "Unsupported file format!",
-	"invalidFileSize": "File size is too large!",
 	"ClickUpload": "Click to upload",
+	"DeleteAccountButton": "Remove account",
+	"DeleteAccountTitle": "Remove account",
+	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
+	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
+	"DeleteWarningTitle": "Really remove this account?",
 	"DragandDrop": "drag and drop",
-	"MaxSize": "Maximum Size",
-	"SupportedFormats": "Supported formats",
+	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
 	"FirstName": "First name",
 	"LastName": "Last name",
-	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
-	"YourPhoto": "Profile photo",
+	"MaxSize": "Maximum Size",
 	"PhotoDescriptionText": "This photo will be displayed in your profile page.",
-	"save": "Save",
-	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
-	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
-	"DeleteWarningTitle": "Really remove this account?",
-	"bulkImport": {
-		"title": "Bulk Import",
-		"selectFileTips": "Select CSV file to upload",
-		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
-		"selectFile": "Select File",
-		"parsingFailed": "Parsing failed",
-		"uploadSuccess": "Monitors created successfully!",
-		"validationFailed": "Validation failed",
-		"noFileSelected": "No file selected",
-		"fallbackPage": "Import a file to upload a list of servers in bulk"
-	},
-	"settingsSystemReset": "System reset",
-	"settingsSystemResetDescription": "Remove all monitors from your system.",
-	"DeleteAccountTitle": "Remove account",
-	"DeleteAccountButton": "Remove account",
-	"publicLink": "Public link",
-	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
-	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
-	"pageSpeedApiKeyFieldDescription": "Enter your Google PageSpeed API key to enable pagespeed monitoring. Click Reset to update the key.",
-	"pageSpeedApiKeyFieldResetLabel": "API key is set. Click Reset to change it.",
-	"reset": "Reset",
-	"ignoreTLSError": "Ignore TLS/SSL error",
-	"tlsErrorIgnored": "TLS/SSL errors ignored",
-	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
-	"createNew": "Create new",
-	"greeting": {
-		"prepend": "Hey there",
-		"append": "The afternoon is your playground—let's make it epic!",
-		"overview": "Here's an overview of your {{type}} monitors."
-	},
-	"roles": {
-		"superAdmin": "Super admin",
-		"admin": "Admin",
-		"teamMember": "Team member",
-		"demoUser": "Demo user"
-	},
-	"teamPanel": {
-		"teamMembers": "Team members",
-		"filter": {
-			"all": "All",
-			"member": "Member"
-		},
-		"inviteTeamMember": "Invite a team member",
-		"inviteNewTeamMember": "Invite new team member",
-		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
-		"email": "Email",
-		"selectRole": "Select role",
-		"inviteLink": "Invite link",
-		"cancel": "Cancel",
-		"noMembers": "There are no team members with this role",
-		"getToken": "Get token",
-		"emailToken": "E-mail token",
-		"table": {
-			"name": "Name",
-			"email": "Email",
-			"role": "Role",
-			"created": "Created"
-		}
-	},
-	"monitorState": {
-		"paused": "Paused",
-		"resumed": "Resumed",
-		"active": "Active"
-	},
-	"menu": {
-		"uptime": "Uptime",
-		"pagespeed": "Pagespeed",
-		"infrastructure": "Infrastructure",
-		"incidents": "Incidents",
-		"statusPages": "Status pages",
-		"maintenance": "Maintenance",
-		"integrations": "Integrations",
-		"logs": "Logs",
-		"settings": "Settings",
-		"support": "Support",
-		"discussions": "Discussions",
-		"docs": "Docs",
-		"changelog": "Changelog",
-		"profile": "Profile",
-		"password": "Password",
-		"team": "Team",
-		"logOut": "Log out",
-		"notifications": "Notifications"
-	},
-	"settingsEmail": "Email",
-	"settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.",
-	"settingsEmailHost": "Email host - Hostname or IP address to connect to",
-	"settingsEmailPort": "Email port - Port to connect to",
-	"settingsEmailAddress": "Email address - Used for authentication",
-	"settingsEmailPassword": "Email password - Password for authentication",
-	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
-	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
-	"settingsEmailTransportLinkDescription": "This builds an SMTP transport for NodeMailer",
-	"settingsEmailTransportLinkText": "See specifications here",
-	"state": "State",
-	"statusBreadCrumbsStatusPages": "Status Pages",
-	"statusBreadCrumbsDetails": "Details",
-	"settingsThemeModeLight": "Light",
-	"settingsThemeModeDark": "Dark",
-	"settingsClearAllStatsDialogCancel": "Cancel",
-	"commonSaving": "Saving...",
-	"navControls": "Controls",
-	"incidentsPageTitle": "Incidents",
-	"passwordPanel": {
-		"passwordChangedSuccess": "Your password was changed successfully.",
-		"passwordInputIncorrect": "Your password input was incorrect.",
-		"currentPassword": "Current password",
-		"enterCurrentPassword": "Enter your current password",
-		"newPassword": "New password",
-		"enterNewPassword": "Enter your new password",
-		"confirmNewPassword": "Confirm new password",
-		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
-		"saving": "Saving..."
-	},
-	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
-	"emailSent": "Email sent successfully",
-	"failedToSendEmail": "Failed to send email",
-	"settingsTestEmail": "Send test e-mail",
-	"settingsTestEmailSuccess": "Test email sent successfully",
-	"settingsTestEmailFailed": "Failed to send test email",
-	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
-	"settingsTestEmailUnknownError": "Unknown error",
-	"settingsEmailRequiredFields": "Email address, host, port and password are required",
-	"statusMsg": {
-		"paused": "Monitoring is paused.",
-		"up": "Your site is up.",
-		"down": "Your site is down.",
-		"pending": "Pending..."
-	},
-	"settingsURLTitle": "Monitor IP/URL on Status Page",
-	"settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
-	"settingsURLSelectTitle": "Display IP/URL on status page",
-	"settingsURLEnabled": "Enabled",
-	"settingURLDisabled": "Disabled",
-	"uptimeGeneralInstructions": {
-		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
-		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	},
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": "Toggles light & dark"
-		},
-		"toasts": {
-			"networkError": "Network error",
-			"checkConnection": "Please check your connection",
-			"unknownError": "Unknown error"
-		}
-	},
+	"SupportedFormats": "Supported formats",
+	"YourPhoto": "Profile photo",
+	"aboutus": "About Us",
+	"access": "Access",
+	"actions": "Actions",
+	"add": "Add",
+	"addMonitors": "Add monitors",
+	"administrator": "Administrator?",
+	"advancedMatching": "Advanced matching",
+	"ago": "ago",
+	"area": "Area",
 	"auth": {
 		"common": {
-			"navigation": {
-				"continue": "Continue",
-				"back": "Back"
-			},
-			"inputs": {
-				"email": {
-					"label": "Email",
-					"placeholder": "jordan.ellis@domain.com",
-					"errors": {
-						"empty": "To continue, please enter your email address",
-						"invalid": "Please recheck validity of entered email address"
-					}
-				},
-				"password": {
-					"label": "Password",
-					"rules": {
-						"length": {
-							"beginning": "Must be at least",
-							"highlighted": "8 characters long"
-						},
-						"special": {
-							"beginning": "Must contain at least",
-							"highlighted": "one special character"
-						},
-						"number": {
-							"beginning": "Must contain at least",
-							"highlighted": "one number"
-						},
-						"uppercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one upper character"
-						},
-						"lowercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one lower character"
-						},
-						"match": {
-							"beginning": "Confirm password and password",
-							"highlighted": "must match"
-						}
-					},
-					"errors": {
-						"empty": "Please enter your password",
-						"length": "Password must be at least 8 characters long",
-						"uppercase": "Password must contain at least 1 uppercase letter",
-						"lowercase": "Password must contain at least 1 lowercase letter",
-						"number": "Password must contain at least 1 number",
-						"special": "Password must contain at least 1 special character",
-						"incorrect": "The password you provided does not match our records"
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirm password",
-					"placeholder": "Re-enter password to confirm",
-					"errors": {
-						"empty": "Please enter your password again for confirmation (helps with typos)",
-						"different": "Entered passwords don't match, so one of them is probably mistyped"
-					}
-				},
-				"firstName": {
-					"label": "Name",
-					"placeholder": "Jordan",
-					"errors": {
-						"empty": "Please enter your name",
-						"length": "Name must be less than 50 characters",
-						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				},
-				"lastName": {
-					"label": "Surname",
-					"placeholder": "Ellis",
-					"errors": {
-						"empty": "Please enter your surname",
-						"length": "Surname must be less than 50 characters",
-						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				}
-			},
 			"errors": {
 				"validation": "Error validating data."
 			},
@@ -598,40 +33,139 @@
 						"incorrect": "The password you provided does not match our records"
 					}
 				}
+			},
+			"inputs": {
+				"email": {
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					},
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com"
+				},
+				"firstName": {
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					},
+					"label": "Name",
+					"placeholder": "Jordan"
+				},
+				"lastName": {
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					},
+					"label": "Surname",
+					"placeholder": "Ellis"
+				},
+				"password": {
+					"errors": {
+						"empty": "Please enter your password",
+						"incorrect": "The password you provided does not match our records",
+						"length": "Password must be at least 8 characters long",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"uppercase": "Password must contain at least 1 uppercase letter"
+					},
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						}
+					}
+				},
+				"passwordConfirm": {
+					"errors": {
+						"different": "Entered passwords don't match, so one of them is probably mistyped",
+						"empty": "Please enter your password again for confirmation (helps with typos)"
+					},
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm"
+				}
+			},
+			"navigation": {
+				"back": "Back",
+				"continue": "Continue"
+			}
+		},
+		"forgotPassword": {
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"heading": "Forgot password?",
+			"imageAlts": {
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon",
+				"passwordKey": "Password key icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"subheadings": {
+				"stepFour": "Your password has been successfully reset. Click below to log in magically.",
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepTwo": "We sent a password reset link to <email/>"
+			},
+			"toasts": {
+				"emailNotFound": "Email not found.",
+				"error": "Unable to reset password. Please try again later or contact support.",
+				"redirect": "Redirecting in <seconds/>...",
+				"sent": "Instructions sent to <email/>.",
+				"success": "Your password was reset successfully."
 			}
 		},
 		"login": {
-			"heading": "Log In",
-			"subheadings": {
-				"stepOne": "Enter your email",
-				"stepTwo": "Enter your password"
-			},
-			"links": {
-				"forgotPassword": "Forgot password?",
-				"register": "Do not have an account?",
-				"forgotPasswordLink": "Reset password",
-				"registerLink": "Register here"
-			},
-			"toasts": {
-				"success": "Welcome back! You're successfully logged in.",
-				"incorrectPassword": "Incorrect password"
-			},
 			"errors": {
 				"password": {
 					"incorrect": "The password you provided does not match our records"
 				}
+			},
+			"heading": "Log In",
+			"links": {
+				"forgotPassword": "Forgot password?",
+				"forgotPasswordLink": "Reset password",
+				"register": "Do not have an account?",
+				"registerLink": "Register here"
+			},
+			"subheadings": {
+				"stepOne": "Enter your email",
+				"stepTwo": "Enter your password"
+			},
+			"toasts": {
+				"incorrectPassword": "Incorrect password",
+				"success": "Welcome back! You're successfully logged in."
 			}
 		},
 		"registration": {
-			"heading": {
-				"superAdmin": "Create super admin",
-				"user": "Sign Up"
-			},
-			"subheadings": {
-				"stepOne": "Enter your personal details",
-				"stepTwo": "Enter your email",
-				"stepThree": "Create your password"
-			},
 			"description": {
 				"superAdmin": "Create your super admin account to get started",
 				"user": "Sign up as a user and ask super admin for access to your monitors"
@@ -640,183 +174,667 @@
 				"superAdmin": "Create super admin account",
 				"user": "Sign up regular user"
 			},
-			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
 			"links": {
 				"login": "Already have an account? <a>Log In</a>"
 			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepThree": "Create your password",
+				"stepTwo": "Enter your email"
+			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
 			"toasts": {
 				"success": "Welcome! Your account was created successfully."
 			}
-		},
-		"forgotPassword": {
-			"heading": "Forgot password?",
-			"subheadings": {
-				"stepOne": "No worries, we'll send you reset instructions.",
-				"stepTwo": "We sent a password reset link to <email/>",
-				"stepThree": "Your new password must be different from previously used passwords.",
-				"stepFour": "Your password has been successfully reset. Click below to log in magically."
-			},
-			"buttons": {
-				"openEmail": "Open email app",
-				"resetPassword": "Reset password"
-			},
-			"imageAlts": {
-				"passwordKey": "Password key icon",
-				"email": "Email icon",
-				"lock": "Lock icon",
-				"passwordConfirm": "Password confirm icon"
-			},
-			"links": {
-				"login": "Go back to <a>Log In</a>",
-				"resend": "Didn't receive the email? <a>Click to resend</a>"
-			},
-			"toasts": {
-				"sent": "Instructions sent to <email/>.",
-				"emailNotFound": "Email not found.",
-				"redirect": "Redirecting in <seconds/>...",
-				"success": "Your password was reset successfully.",
-				"error": "Unable to reset password. Please try again later or contact support."
-			}
 		}
 	},
+	"avgCpuTemperature": "Average CPU Temperature",
+	"bar": "Bar",
+	"basicInformation": "Basic Information",
+	"bulkImport": {
+		"fallbackPage": "Import a file to upload a list of servers in bulk",
+		"noFileSelected": "No file selected",
+		"parsingFailed": "Parsing failed",
+		"selectFile": "Select File",
+		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
+		"selectFileTips": "Select CSV file to upload",
+		"title": "Bulk Import",
+		"uploadSuccess": "Monitors created successfully!",
+		"validationFailed": "Validation failed"
+	},
+	"cancel": "Cancel",
+	"checkFrequency": "Check frequency",
+	"checkingEvery": "Checking every",
+	"city": "CITY",
+	"common": {
+		"appName": "Checkmate",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		},
+		"monitoringAgentName": "Capture",
+		"toasts": {
+			"checkConnection": "Please check your connection",
+			"networkError": "Network error",
+			"unknownError": "Unknown error"
+		}
+	},
+	"commonSave": "Save",
+	"commonSaving": "Saving...",
+	"companyName": "Company name",
+	"configure": "Configure",
+	"cores": "Cores",
+	"country": "COUNTRY",
+	"cpu": "CPU",
+	"cpuFrequency": "CPU Frequency",
+	"cpuLogical": "CPU (Logical)",
+	"cpuPhysical": "CPU (Physical)",
+	"cpuTemperature": "CPU Temperature",
+	"cpuUsage": "CPU usage",
+	"createA": "Create a",
+	"createMaintenance": "Create maintenance",
+	"createMaintenanceWindow": "Create maintenance window",
+	"createMonitor": "Create monitor",
+	"createNew": "Create new",
+	"createNotifications": {
+		"discordSettings": {
+			"description": "Configure your Discord webhook here",
+			"title": "Discord",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"emailSettings": {
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com",
+			"title": "Email"
+		},
+		"nameSettings": {
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications",
+			"title": "Name"
+		},
+		"pagerdutySettings": {
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890",
+			"title": "PagerDuty"
+		},
+		"slackSettings": {
+			"description": "Configure your Slack webhook here",
+			"title": "Slack",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"title": "Create notification channel",
+		"typeSettings": {
+			"description": "Select the type of notification channel you want to create.",
+			"title": "Type",
+			"typeLabel": "Type"
+		},
+		"webhookSettings": {
+			"description": "Configure your webhook here",
+			"title": "Webhook",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		}
+	},
+	"createYour": "Create your",
+	"date&Time": "Date & Time",
+	"delete": "Delete",
+	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
+	"deleteDialogTitle": "Do you really want to delete this monitor?",
+	"deleteStatusPage": "Do you want to delete this status page?",
+	"deleteStatusPageConfirm": "Yes, delete status page",
+	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
+	"disk": "Disk",
+	"diskUsage": "Disk Usage",
+	"displayName": "Display name",
+	"distributedRightCategoryTitle": "Monitor",
+	"distributedStatusHeaderText": "Real-time, real-device coverage",
+	"distributedStatusServerMonitors": "Server Monitors",
+	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
+	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
+	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
+	"distributedUptimeCreateChecks": "Checks to perform",
+	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
+	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
+	"distributedUptimeCreateIncidentNotification": "Incident notifications",
+	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
+	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
+	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
+	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
+	"distributedUptimeStatus30Days": "30 days",
+	"distributedUptimeStatus60Days": "60 days",
+	"distributedUptimeStatus90Days": "90 days",
+	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
+	"distributedUptimeStatusCompanyNameLabel": "Company name",
+	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
+	"distributedUptimeStatusCreateStatusPage": "status page",
+	"distributedUptimeStatusCreateStatusPageAccess": "Access",
+	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
+	"distributedUptimeStatusCreateYour": "Create your",
+	"distributedUptimeStatusDevices": "Devices",
+	"distributedUptimeStatusEditYour": "Edit your",
+	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
+	"distributedUptimeStatusLogoHeader": "Logo",
+	"distributedUptimeStatusLogoUploadButton": "Upload logo",
+	"distributedUptimeStatusPageAddressLabel": "Your status page address",
+	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
+	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
+	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
+	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
+	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
+	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
+	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
+	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
+	"distributedUptimeStatusUpt": "UPT",
+	"distributedUptimeStatusUptBurned": "UPT Burned",
+	"distributedUptimeStatusUptLogo": "Upt Logo",
+	"dockerContainerMonitoring": "Docker container monitoring",
+	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
+	"duration": "Duration",
+	"edit": "Edit",
+	"editMaintenance": "Edit maintenance",
+	"editing": "Editing...",
+	"emailSent": "Email sent successfully",
+	"errorInvalidFieldId": "Invalid field ID provided",
+	"errorInvalidTypeId": "Invalid notification type provided",
 	"errorPages": {
 		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Successfully reconnected to the server.",
-				"stillUnreachable": "Server is still unreachable. Please try again later."
-			},
 			"alertBox": "Server Connection Error",
 			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
 			"retryButton": {
 				"default": "Retry connection",
 				"processing": "Connecting..."
+			},
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
 			}
 		}
 	},
-	"createNotifications": {
-		"title": "Create notification channel",
-		"nameSettings": {
-			"title": "Name",
-			"description": "A descriptive name for your integration.",
-			"nameLabel": "Name",
-			"namePlaceholder": "e.g. Slack notifications"
-		},
-		"typeSettings": {
-			"title": "Type",
-			"description": "Select the type of notification channel you want to create.",
-			"typeLabel": "Type"
-		},
-		"emailSettings": {
-			"title": "Email",
-			"description": "Destination email addresses.",
-			"emailLabel": "Email address",
-			"emailPlaceholder": "e.g. john@example.com"
-		},
-		"slackSettings": {
-			"title": "Slack",
-			"description": "Configure your Slack webhook here",
-			"webhookLabel": "Slack webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/..."
-		},
-		"pagerdutySettings": {
-			"title": "PagerDuty",
-			"description": "Configure your PagerDuty integration here",
-			"integrationKeyLabel": "Integration key",
-			"integrationKeyPlaceholder": "1234567890"
-		},
-		"discordSettings": {
-			"title": "Discord",
-			"description": "Configure your Discord webhook here",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		},
-		"webhookSettings": {
-			"title": "Webhook",
-			"description": "Configure your webhook here",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		}
+	"expectedValue": "Expected value",
+	"export": {
+		"failed": "Failed to export monitors",
+		"success": "Monitors exported successfully!",
+		"title": "Export Monitors"
 	},
-	"notificationConfig": {
-		"title": "Notifications",
-		"description": "Select the notifications channels you want to use"
+	"failedToSendEmail": "Failed to send email",
+	"features": "Features",
+	"frequency": "Frequency",
+	"friendlyNameInput": "Friendly name",
+	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
+	"gb": "GB",
+	"greeting": {
+		"append": "The afternoon is your playground—let's make it epic!",
+		"overview": "Here's an overview of your {{type}} monitors.",
+		"prepend": "Hey there"
 	},
-	"monitorStatus": {
-		"checkingEvery": "Checking every {{interval}}",
-		"withCaptureAgent": "with Capture agent {{version}}",
-		"up": "up",
-		"down": "down",
-		"paused": "paused"
-	},
-	"advancedMatching": "Advanced matching",
-	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
-	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
-	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool - Enable connection pooling",
-	"sendTestNotifications": "Send test notifications",
-	"selectAll": "Select all",
+	"high": "high",
+	"host": "Host",
+	"http": "HTTP",
+	"https": "HTTPS",
+	"ignoreTLSError": "Ignore TLS/SSL error",
+	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
+	"incidentsOptionsHeader": "Incidents for:",
+	"incidentsOptionsHeaderFilterAll": "All",
+	"incidentsOptionsHeaderFilterBy": "Filter by:",
+	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
+	"incidentsOptionsHeaderFilterDown": "Down",
+	"incidentsOptionsHeaderLastDay": "Last day",
+	"incidentsOptionsHeaderLastHour": "Last hour",
+	"incidentsOptionsHeaderLastWeek": "Last week",
+	"incidentsOptionsHeaderShow": "Show:",
+	"incidentsOptionsPlaceholderAllServers": "All servers",
+	"incidentsPageTitle": "Incidents",
+	"incidentsTableDateTime": "Date & Time",
+	"incidentsTableMessage": "Message",
+	"incidentsTableMonitorName": "Monitor Name",
+	"incidentsTableNoIncidents": "No incidents recorded",
+	"incidentsTablePaginationLabel": "incidents",
+	"incidentsTableStatus": "Status",
+	"incidentsTableStatusCode": "Status Code",
+	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
+	"infrastructureAuthorizationSecretLabel": "Authorization secret",
+	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
+	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
+	"infrastructureCreateYour": "Create your",
+	"infrastructureCustomizeAlerts": "Customize alerts",
+	"infrastructureDisplayNameLabel": "Display name",
+	"infrastructureEditMonitor": "Save Infrastructure Monitor",
+	"infrastructureEditYour": "Edit your",
+	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
+	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
+	"infrastructureProtocol": "Protocol",
+	"infrastructureServerRequirement": "The server you are monitoring must be running the",
+	"infrastructureServerUrlLabel": "Server URL",
+	"integrations": "Integrations",
+	"integrationsDiscord": "Discord",
+	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
+	"integrationsPrism": "Connect Prism to your favorite service.",
+	"integrationsSlack": "Slack",
+	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
+	"integrationsZapier": "Zapier",
+	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
+	"invalidFileFormat": "Unsupported file format!",
+	"invalidFileSize": "File size is too large!",
+	"inviteNoTokenFound": "No invite token found",
+	"loginHere": "Login here",
 	"logsPage": {
-		"title": "Logs",
 		"description": "This page shows the latest 1000 lines of logs from the Checkmate server",
-		"tabs": {
-			"queue": "Job queue",
-			"logs": "Server logs"
-		},
-		"toast": {
-			"fetchLogsSuccess": "Logs fetched successfully"
-		},
 		"logLevelSelect": {
 			"title": "Log level",
 			"values": {
 				"all": "All",
-				"info": "Info",
-				"warn": "Warn",
+				"debug": "Debug",
 				"error": "Error",
-				"debug": "Debug"
+				"info": "Info",
+				"warn": "Warn"
 			}
+		},
+		"tabs": {
+			"logs": "Server logs",
+			"queue": "Job queue"
+		},
+		"title": "Logs",
+		"toast": {
+			"fetchLogsSuccess": "Logs fetched successfully"
 		}
 	},
+	"low": "low",
+	"maintenance": "maintenance",
+	"maintenanceRepeat": "Maintenance Repeat",
+	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
+	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
+	"maintenanceWindowName": "Maintenance Window Name",
+	"maskedPageSpeedKeyPlaceholder": "*************************************",
+	"matchMethod": "Match Method",
+	"mb": "MB",
+	"mem": "Mem",
+	"memory": "Memory",
+	"memoryUsage": "Memory usage",
+	"menu": {
+		"changelog": "Changelog",
+		"discussions": "Discussions",
+		"docs": "Docs",
+		"incidents": "Incidents",
+		"infrastructure": "Infrastructure",
+		"integrations": "Integrations",
+		"logOut": "Log out",
+		"logs": "Logs",
+		"maintenance": "Maintenance",
+		"notifications": "Notifications",
+		"pagespeed": "Pagespeed",
+		"password": "Password",
+		"profile": "Profile",
+		"settings": "Settings",
+		"statusPages": "Status pages",
+		"support": "Support",
+		"team": "Team",
+		"uptime": "Uptime"
+	},
+	"message": "Message",
+	"monitor": "monitor",
+	"monitorActions": {
+		"export": "Export Monitors",
+		"import": "Import Monitors",
+		"title": "Export/Import"
+	},
+	"monitorDisplayName": "Monitor display name",
+	"monitorState": {
+		"active": "Active",
+		"paused": "Paused",
+		"resumed": "Resumed"
+	},
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"down": "down",
+		"paused": "paused",
+		"up": "up",
+		"withCaptureAgent": "with Capture agent {{version}}"
+	},
+	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
+	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
+	"monitors": "monitors",
+	"monitorsToApply": "Monitors to apply maintenance window to",
+	"ms": "ms",
+	"navControls": "Controls",
+	"nextWindow": "Next window",
+	"notFoundButton": "Go to the main dashboard",
+	"notificationConfig": {
+		"description": "Select the notifications channels you want to use",
+		"title": "Notifications"
+	},
+	"notifications": {
+		"addOrEditNotifications": "Add or edit notifications",
+		"create": {
+			"failed": "Failed to create notification",
+			"success": "Notification created successfully"
+		},
+		"createButton": "Create notification channel",
+		"createTitle": "Notification channel",
+		"delete": {
+			"failed": "Failed to delete notification",
+			"success": "Notification deleted successfully"
+		},
+		"discord": {
+			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
+			"label": "Discord",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
+			"webhookRequired": "Discord webhook URL is required"
+		},
+		"edit": {
+			"failed": "Failed to update notification",
+			"success": "Notification updated successfully"
+		},
+		"enableNotifications": "Enable {{platform}} notifications",
+		"fallback": {
+			"checks": [
+				"Alert teams about downtime or performance issues",
+				"Let engineers know when incidents happen",
+				"Keep administrators informed of system changes"
+			],
+			"title": "notification channel"
+		},
+		"fetch": {
+			"failed": "Failed to fetch notifications",
+			"success": "Notifications fetched successfully"
+		},
+		"integrationButton": "Notification Integration",
+		"networkError": "Network error occurred",
+		"slack": {
+			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
+			"label": "Slack",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/...",
+			"webhookRequired": "Slack webhook URL is required"
+		},
+		"telegram": {
+			"chatIdLabel": "Your Chat ID",
+			"chatIdPlaceholder": "-1001234567890",
+			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
+			"fieldsRequired": "Telegram token and chat ID are required",
+			"label": "Telegram",
+			"tokenLabel": "Your bot token",
+			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"
+		},
+		"test": {
+			"failed": "Failed to send test notification",
+			"success": "Test notification sent successfully"
+		},
+		"testFailed": "Failed to send test notification",
+		"testNotification": "Test notification",
+		"testNotificationDevelop": "Test notification 2",
+		"testSuccess": "Test notification sent successfully!",
+		"unsupportedType": "Unsupported notification type",
+		"webhook": {
+			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
+			"label": "Webhooks",
+			"urlLabel": "Webhook URL",
+			"urlPlaceholder": "https://your-server.com/webhook",
+			"urlRequired": "Webhook URL is required"
+		}
+	},
+	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
+	"notifySMS": "Notify via SMS (coming soon)",
+	"now": "Now",
+	"os": "OS",
+	"pageSpeedAddApiKey": "to add your API key.",
+	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
+	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
+	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
+	"pageSpeedLearnMoreLink": "Click here",
+	"pageSpeedMonitor": "PageSpeed monitor",
+	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
+	"passwordPanel": {
+		"confirmNewPassword": "Confirm new password",
+		"currentPassword": "Current password",
+		"enterCurrentPassword": "Enter your current password",
+		"enterNewPassword": "Enter your new password",
+		"newPassword": "New password",
+		"passwordChangedSuccess": "Your password was changed successfully.",
+		"passwordInputIncorrect": "Your password input was incorrect.",
+		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
+		"saving": "Saving..."
+	},
+	"pause": "Pause",
+	"pingMonitoring": "Ping monitoring",
+	"pingMonitoringDescription": "Check whether your server is available or not.",
+	"portMonitoring": "Port monitoring",
+	"portMonitoringDescription": "Check whether your port is open or not.",
+	"portToMonitor": "Port to monitor",
+	"publicLink": "Public link",
+	"publicURL": "Public URL",
 	"queuePage": {
-		"title": "Queue",
-		"refreshButton": "Refresh",
-		"flushButton": "Flush queue",
-		"jobTable": {
-			"title": "Jobs currently in queue",
-			"idHeader": "Monitor ID",
-			"urlHeader": "URL",
-			"typeHeader": "Type",
-			"activeHeader": "Active",
-			"lockedAtHeader": "Locked at",
-			"runCountHeader": "Run count",
-			"failCountHeader": "Fail count",
-			"lastRunHeader": "Last run at",
-			"lastFinishedAtHeader": "Last finished at",
-			"lastRunTookHeader": "Last run took"
-		},
-		"metricsTable": {
-			"title": "Queue metrics",
-			"metricHeader": "Metric",
-			"valueHeader": "Value"
-		},
 		"failedJobTable": {
-			"title": "Failed jobs",
+			"failCountHeader": "Fail count",
+			"failReasonHeader": "Fail reason",
+			"failedAtHeader": "Last failed at",
 			"monitorIdHeader": "Monitor ID",
 			"monitorUrlHeader": "Monitor URL",
+			"title": "Failed jobs"
+		},
+		"flushButton": "Flush queue",
+		"jobTable": {
+			"activeHeader": "Active",
 			"failCountHeader": "Fail count",
-			"failedAtHeader": "Last failed at",
-			"failReasonHeader": "Fail reason"
+			"idHeader": "Monitor ID",
+			"lastFinishedAtHeader": "Last finished at",
+			"lastRunHeader": "Last run at",
+			"lastRunTookHeader": "Last run took",
+			"lockedAtHeader": "Locked at",
+			"runCountHeader": "Run count",
+			"title": "Jobs currently in queue",
+			"typeHeader": "Type",
+			"urlHeader": "URL"
+		},
+		"metricsTable": {
+			"metricHeader": "Metric",
+			"title": "Queue metrics",
+			"valueHeader": "Value"
+		},
+		"refreshButton": "Refresh",
+		"title": "Queue"
+	},
+	"remove": "Remove",
+	"removeLogo": "Remove Logo",
+	"repeat": "Repeat",
+	"reset": "Reset",
+	"response": "RESPONSE",
+	"responseTime": "Response time",
+	"resume": "Resume",
+	"roles": {
+		"admin": "Admin",
+		"demoUser": "Demo user",
+		"superAdmin": "Super admin",
+		"teamMember": "Team member"
+	},
+	"save": "Save",
+	"selectAll": "Select all",
+	"sendTestNotifications": "Send test notifications",
+	"seperateEmails": "You can separate multiple emails with a comma",
+
+	"settingsDisabled": "Disabled",
+	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
+	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
+	"settingsFailedToClearStats": "Failed to clear stats",
+	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
+	"settingsFailedToSave": "Failed to save settings",
+	"settingsMonitorsDeleted": "Successfully deleted all monitors",
+	"settingsPage": {
+		"saveButtonLabel": "Save",
+		"timezoneSettings": {
+			"description": "Select the timezone used to display dates and times throughout the application.",
+			"label": "Display timezone",
+			"title": "Display timezone"
+		},
+		"title": "Settings",
+		"uiSettings": {
+			"description": "Switch between light and dark mode, or change user interface language.",
+			"labelLanguage": "Language",
+			"labelTheme": "Theme mode",
+			"title": "Appearance"
+		},
+		"pageSpeedSettings": {
+			"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
+			"labelApiKey": "PageSpeed API key",
+			"labelAPiKeySet": "API key is set. Click Reset to change it.",
+			"title": "Google PageSpeed API key"
+		},
+		"urlSettings": {
+			"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
+			"label": "Display IP/URL on status page",
+			"title": "Monitor IP/URL on Status Page",
+			"selectEnabled": "Enabled",
+			"selectDisabled": "Disabled"
+		},
+		"statsSettings": {
+			"description": "Define how long you want to retain historical data. You can also clear all existing data.",
+			"labelTTL": "The days you want to keep monitoring history.",
+			"title": "Monitor history",
+			"labelTTLOptional": "0 for infinite",
+			"clearAllStatsDescription": "Clear all stats. This is irreversible.",
+			"clearAllStatsButton": "Clear all stats",
+			"clearAllStatsDialogTitle": "Do you want to clear all stats?",
+			"clearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
+			"clearAllStatsDialogConfirm": "Yes, clear all stats"
+		},
+		"demoMonitorsSettings": {
+			"title": "Demo monitors",
+			"description": "Add sample monitors for demonstration purposes.",
+			"buttonAddMonitors": "Add demo monitors"
+		},
+		"systemResetSettings": {
+			"title": "System reset",
+			"description": "Remove all monitors from your system.",
+			"buttonRemoveAllMonitors": "Remove all monitors",
+			"dialogTitle": "Do you want to remove all monitors?",
+			"dialogDescription": "Once removed, the monitors cannot be retrieved.",
+			"dialogConfirm": "Yes, remove all monitors"
+		},
+		"emailSettings": {
+			"title": "Email",
+			"description": "Configure the email settings for your system. This is used to send notifications and alerts.",
+			"labelHost": "Email host - Hostname or IP address to connect to",
+			"labelPort": "Email port - Port to connect to",
+			"labelUser": "Email user - Username for authentication, overrides email address if specified",
+			"placeholderUser": "Leave empty if not required",
+			"labelAddress": "Email address - Used for authentication",
+			"labelPassword": "Email password - Password for authentication",
+			"labelPasswordSet": "Password is set. Click Reset to change it.",
+			"labelTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+			"labelConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
+			"labelSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
+			"labelPool": "Enable connection pooling: Reuse existing connections to improve performance",
+			"labelIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
+			"labelRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
+			"labelRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
+			"descriptionTransport": "This builds an SMTP transport for NodeMailer",
+			"linkTransport": "See specifications here",
+			"buttonSendTestEmail": "Send test e-mail"
+		},
+		"aboutSettings": {
+			"title": "About",
+			"labelVersion": "Version",
+			"labelDevelopedBy": "Developed by Bluewave Labs"
 		}
 	},
-	"export": {
-		"title": "Export Monitors",
-		"success": "Monitors exported successfully!",
-		"failed": "Failed to export monitors"
+	"settingsStatsCleared": "Stats cleared successfully",
+	"settingsSuccessSaved": "Settings saved successfully",
+	"settingsTestEmailFailed": "Failed to send test email",
+	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
+	"settingsTestEmailSuccess": "Test email sent successfully",
+	"settingsTestEmailUnknownError": "Unknown error",
+	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
+	"showCharts": "Show charts",
+	"showUptimePercentage": "Show uptime percentage",
+	"shown": "Shown",
+	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
+	"starPromptTitle": "Star Checkmate",
+	"startTime": "Start time",
+	"state": "State",
+	"status": "Status",
+	"statusBreadCrumbsDetails": "Details",
+	"statusBreadCrumbsStatusPages": "Status Pages",
+	"statusCode": "Status code",
+	"statusMsg": {
+		"down": "Your site is down.",
+		"paused": "Monitoring is paused.",
+		"pending": "Pending...",
+		"up": "Your site is up."
 	},
-	"monitorActions": {
-		"title": "Export/Import",
-		"import": "Import Monitors",
-		"export": "Export Monitors"
-	}
+	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
+	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
+	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
+	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
+	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
+	"statusPageCreateTabsContent": "Status page servers",
+	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
+	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
+	"statusPageName": "Status page name",
+	"statusPageStatus": "A public status page is not set up.",
+	"statusPageStatusContactAdmin": "Please contact to your administrator",
+	"statusPageStatusNoPage": "There's no status page here.",
+	"statusPageStatusNotPublic": "This status page is not public.",
+	"statusPageStatusServiceStatus": "Service status",
+	"submit": "Submit",
+	"teamPanel": {
+		"cancel": "Cancel",
+		"email": "Email",
+		"emailToken": "E-mail token",
+		"filter": {
+			"all": "All",
+			"member": "Member"
+		},
+		"getToken": "Get token",
+		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
+		"inviteLink": "Invite link",
+		"inviteNewTeamMember": "Invite new team member",
+		"inviteTeamMember": "Invite a team member",
+		"noMembers": "There are no team members with this role",
+		"selectRole": "Select role",
+		"table": {
+			"created": "Created",
+			"email": "Email",
+			"name": "Name",
+			"role": "Role"
+		},
+		"teamMembers": "Team members"
+	},
+	"testLocale": "testLocale",
+	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
+	"timezone": "Timezone",
+	"title": "Title",
+	"tlsErrorIgnored": "TLS/SSL errors ignored",
+	"total": "Total",
+	"type": "Type",
+	"update": "Update",
+	"uptime": "Uptime",
+	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
+	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
+	"uptimeCreateJsonPathQuery": "for query language documentation.",
+	"uptimeGeneralInstructions": {
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
+		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
+		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+	},
+	"url": "URL",
+	"urlMonitor": "URL to monitor",
+	"used": "Used",
+	"webhookSendError": "Error sending webhook notification to {platform}",
+	"webhookSendSuccess": "Webhook notification sent successfully",
+	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
+	"websiteMonitoring": "Website monitoring",
+	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
+	"whenNewIncident": "When there is a new incident,",
+	"window": "window"
 }

From 0d01a08304a46f69435e0f73bf99a7c69fe78ba9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 14:32:28 +0800
Subject: [PATCH 306/319] sort

---
 client/src/locales/en.json | 117 ++++++++++++++++++-------------------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 72dda4c64..8324bd5d7 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -660,7 +660,6 @@
 	"selectAll": "Select all",
 	"sendTestNotifications": "Send test notifications",
 	"seperateEmails": "You can separate multiple emails with a comma",
-
 	"settingsDisabled": "Disabled",
 	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
 	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
@@ -669,7 +668,63 @@
 	"settingsFailedToSave": "Failed to save settings",
 	"settingsMonitorsDeleted": "Successfully deleted all monitors",
 	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "Developed by Bluewave Labs",
+			"labelVersion": "Version",
+			"title": "About"
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "Add demo monitors",
+			"description": "Add sample monitors for demonstration purposes.",
+			"title": "Demo monitors"
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "Send test e-mail",
+			"description": "Configure the email settings for your system. This is used to send notifications and alerts.",
+			"descriptionTransport": "This builds an SMTP transport for NodeMailer",
+			"labelAddress": "Email address - Used for authentication",
+			"labelConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
+			"labelHost": "Email host - Hostname or IP address to connect to",
+			"labelIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
+			"labelPassword": "Email password - Password for authentication",
+			"labelPasswordSet": "Password is set. Click Reset to change it.",
+			"labelPool": "Enable connection pooling: Reuse existing connections to improve performance",
+			"labelPort": "Email port - Port to connect to",
+			"labelRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
+			"labelRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
+			"labelSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
+			"labelTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+			"labelUser": "Email user - Username for authentication, overrides email address if specified",
+			"linkTransport": "See specifications here",
+			"placeholderUser": "Leave empty if not required",
+			"title": "Email"
+		},
+		"pageSpeedSettings": {
+			"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
+			"labelAPiKeySet": "API key is set. Click Reset to change it.",
+			"labelApiKey": "PageSpeed API key",
+			"title": "Google PageSpeed API key"
+		},
 		"saveButtonLabel": "Save",
+		"statsSettings": {
+			"clearAllStatsButton": "Clear all stats",
+			"clearAllStatsDescription": "Clear all stats. This is irreversible.",
+			"clearAllStatsDialogConfirm": "Yes, clear all stats",
+			"clearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
+			"clearAllStatsDialogTitle": "Do you want to clear all stats?",
+			"description": "Define how long you want to retain historical data. You can also clear all existing data.",
+			"labelTTL": "The days you want to keep monitoring history.",
+			"labelTTLOptional": "0 for infinite",
+			"title": "Monitor history"
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "Remove all monitors",
+			"description": "Remove all monitors from your system.",
+			"dialogConfirm": "Yes, remove all monitors",
+			"dialogDescription": "Once removed, the monitors cannot be retrieved.",
+			"dialogTitle": "Do you want to remove all monitors?",
+			"title": "System reset"
+		},
 		"timezoneSettings": {
 			"description": "Select the timezone used to display dates and times throughout the application.",
 			"label": "Display timezone",
@@ -682,68 +737,12 @@
 			"labelTheme": "Theme mode",
 			"title": "Appearance"
 		},
-		"pageSpeedSettings": {
-			"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
-			"labelApiKey": "PageSpeed API key",
-			"labelAPiKeySet": "API key is set. Click Reset to change it.",
-			"title": "Google PageSpeed API key"
-		},
 		"urlSettings": {
 			"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
 			"label": "Display IP/URL on status page",
-			"title": "Monitor IP/URL on Status Page",
+			"selectDisabled": "Disabled",
 			"selectEnabled": "Enabled",
-			"selectDisabled": "Disabled"
-		},
-		"statsSettings": {
-			"description": "Define how long you want to retain historical data. You can also clear all existing data.",
-			"labelTTL": "The days you want to keep monitoring history.",
-			"title": "Monitor history",
-			"labelTTLOptional": "0 for infinite",
-			"clearAllStatsDescription": "Clear all stats. This is irreversible.",
-			"clearAllStatsButton": "Clear all stats",
-			"clearAllStatsDialogTitle": "Do you want to clear all stats?",
-			"clearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
-			"clearAllStatsDialogConfirm": "Yes, clear all stats"
-		},
-		"demoMonitorsSettings": {
-			"title": "Demo monitors",
-			"description": "Add sample monitors for demonstration purposes.",
-			"buttonAddMonitors": "Add demo monitors"
-		},
-		"systemResetSettings": {
-			"title": "System reset",
-			"description": "Remove all monitors from your system.",
-			"buttonRemoveAllMonitors": "Remove all monitors",
-			"dialogTitle": "Do you want to remove all monitors?",
-			"dialogDescription": "Once removed, the monitors cannot be retrieved.",
-			"dialogConfirm": "Yes, remove all monitors"
-		},
-		"emailSettings": {
-			"title": "Email",
-			"description": "Configure the email settings for your system. This is used to send notifications and alerts.",
-			"labelHost": "Email host - Hostname or IP address to connect to",
-			"labelPort": "Email port - Port to connect to",
-			"labelUser": "Email user - Username for authentication, overrides email address if specified",
-			"placeholderUser": "Leave empty if not required",
-			"labelAddress": "Email address - Used for authentication",
-			"labelPassword": "Email password - Password for authentication",
-			"labelPasswordSet": "Password is set. Click Reset to change it.",
-			"labelTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-			"labelConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
-			"labelSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
-			"labelPool": "Enable connection pooling: Reuse existing connections to improve performance",
-			"labelIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
-			"labelRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
-			"labelRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
-			"descriptionTransport": "This builds an SMTP transport for NodeMailer",
-			"linkTransport": "See specifications here",
-			"buttonSendTestEmail": "Send test e-mail"
-		},
-		"aboutSettings": {
-			"title": "About",
-			"labelVersion": "Version",
-			"labelDevelopedBy": "Developed by Bluewave Labs"
+			"title": "Monitor IP/URL on Status Page"
 		}
 	},
 	"settingsStatsCleared": "Stats cleared successfully",

From 08b9cc16fc90680d4e45b0fe068f7743152b8bc8 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 14:37:16 +0800
Subject: [PATCH 307/319] sort json

---
 client/src/locales/en.json | 1494 ++++++++++++++++++------------------
 1 file changed, 747 insertions(+), 747 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 3479e9f05..201c54782 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,592 +1,29 @@
 {
-	"submit": "Submit",
-	"title": "Title",
-	"distributedStatusHeaderText": "Real-time, real-device coverage",
-	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
-	"settingsGeneralSettings": "General settings",
-	"settingsDisplayTimezone": "Display timezone",
-	"settingsDisplayTimezoneDescription": "Select the timezone used to display dates and times throughout the application.",
-	"settingsAppearance": "Appearance",
-	"settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
-	"settingsThemeMode": "Theme Mode",
-	"settingsLanguage": "Language",
-	"settingsEnabled": "Enabled",
-	"settingsDisabled": "Disabled",
-	"settingsHistoryAndMonitoring": "History of monitoring",
-	"settingsHistoryAndMonitoringDescription": "Define how long you want to retain historical data. You can also clear all existing data.",
-	"settingsTTLLabel": "The days you want to keep monitoring history.",
-	"settingsTTLOptionalLabel": "0 for infinite",
-	"settingsClearAllStats": "Clear all stats. This is irreversible.",
-	"settingsClearAllStatsButton": "Clear all stats",
-	"settingsClearAllStatsDialogTitle": "Do you want to clear all stats?",
-	"settingsClearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
-	"settingsClearAllStatsDialogConfirm": "Yes, clear all stats",
-	"settingsDemoMonitors": "Demo monitors",
-	"settingsDemoMonitorsDescription": "Add sample monitors for demonstration purposes.",
-	"settingsAddDemoMonitorsButton": "Add demo monitors",
-	"settingsRemoveAllMonitorsButton": "Remove all monitors",
-	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
-	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
-	"settingsAbout": "About",
-	"settingsDevelopedBy": "Developed by Bluewave Labs.",
-	"settingsSave": "Save",
-	"settingsSuccessSaved": "Settings saved successfully",
-	"settingsFailedToSave": "Failed to save settings",
-	"settingsStatsCleared": "Stats cleared successfully",
-	"settingsFailedToClearStats": "Failed to clear stats",
-	"settingsDemoMonitorsAdded": "Successfully added demo monitors",
-	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
-	"settingsMonitorsDeleted": "Successfully deleted all monitors",
-	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
-	"starPromptTitle": "Star Checkmate",
-	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
-	"https": "HTTPS",
-	"http": "HTTP",
-	"monitor": "monitor",
-	"aboutus": "About Us",
-	"now": "Now",
-	"delete": "Delete",
-	"configure": "Configure",
-	"responseTime": "Response time",
-	"ms": "ms",
-	"bar": "Bar",
-	"area": "Area",
-	"country": "COUNTRY",
-	"city": "CITY",
-	"response": "RESPONSE",
-	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
-	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
-	"webhookSendSuccess": "Webhook notification sent successfully",
-	"webhookSendError": "Error sending webhook notification to {platform}",
-	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
-	"distributedRightCategoryTitle": "Monitor",
-	"distributedStatusServerMonitors": "Server Monitors",
-	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
-	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
-	"distributedUptimeCreateChecks": "Checks to perform",
-	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
-	"distributedUptimeCreateIncidentNotification": "Incident notifications",
-	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
-	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
-	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
-	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
-	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
-	"notifications": {
-		"enableNotifications": "Enable {{platform}} notifications",
-		"testNotification": "Test notification",
-		"addOrEditNotifications": "Add or edit notifications",
-		"slack": {
-			"label": "Slack",
-			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/...",
-			"webhookRequired": "Slack webhook URL is required"
-		},
-		"discord": {
-			"label": "Discord",
-			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
-			"webhookRequired": "Discord webhook URL is required"
-		},
-		"telegram": {
-			"label": "Telegram",
-			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
-			"tokenLabel": "Your bot token",
-			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11",
-			"chatIdLabel": "Your Chat ID",
-			"chatIdPlaceholder": "-1001234567890",
-			"fieldsRequired": "Telegram token and chat ID are required"
-		},
-		"webhook": {
-			"label": "Webhooks",
-			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
-			"urlLabel": "Webhook URL",
-			"urlPlaceholder": "https://your-server.com/webhook",
-			"urlRequired": "Webhook URL is required"
-		},
-		"testNotificationDevelop": "Test notification 2",
-		"integrationButton": "Notification Integration",
-		"testSuccess": "Test notification sent successfully!",
-		"testFailed": "Failed to send test notification",
-		"unsupportedType": "Unsupported notification type",
-		"networkError": "Network error occurred",
-		"fallback": {
-			"title": "notification channel",
-			"checks": [
-				"Alert teams about downtime or performance issues",
-				"Let engineers know when incidents happen",
-				"Keep administrators informed of system changes"
-			]
-		},
-		"createButton": "Create notification channel",
-		"createTitle": "Notification channel",
-		"create": {
-			"success": "Notification created successfully",
-			"failed": "Failed to create notification"
-		},
-		"fetch": {
-			"success": "Notifications fetched successfully",
-			"failed": "Failed to fetch notifications"
-		},
-		"delete": {
-			"success": "Notification deleted successfully",
-			"failed": "Failed to delete notification"
-		},
-		"edit": {
-			"success": "Notification updated successfully",
-			"failed": "Failed to update notification"
-		},
-		"test": {
-			"success": "Test notification sent successfully",
-			"failed": "Failed to send test notification"
-		}
-	},
-	"testLocale": "testLocale",
-	"add": "Add",
-	"monitors": "monitors",
-	"distributedUptimeStatusCreateStatusPage": "status page",
-	"distributedUptimeStatusCreateStatusPageAccess": "Access",
-	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
-	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
-	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"distributedUptimeStatusLogoHeader": "Logo",
-	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
-	"distributedUptimeStatusLogoUploadButton": "Upload logo",
-	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
-	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
-	"distributedUptimeStatusCreateYour": "Create your",
-	"distributedUptimeStatusEditYour": "Edit your",
-	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
-	"distributedUptimeStatusCompanyNameLabel": "Company name",
-	"distributedUptimeStatusPageAddressLabel": "Your status page address",
-	"distributedUptimeStatus30Days": "30 days",
-	"distributedUptimeStatus60Days": "60 days",
-	"distributedUptimeStatus90Days": "90 days",
-	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
-	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
-	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
-	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
-	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
-	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
-	"distributedUptimeStatusDevices": "Devices",
-	"distributedUptimeStatusUpt": "UPT",
-	"distributedUptimeStatusUptBurned": "UPT Burned",
-	"distributedUptimeStatusUptLogo": "Upt Logo",
-	"incidentsTableNoIncidents": "No incidents recorded",
-	"incidentsTablePaginationLabel": "incidents",
-	"incidentsTableMonitorName": "Monitor Name",
-	"incidentsTableStatus": "Status",
-	"incidentsTableDateTime": "Date & Time",
-	"incidentsTableStatusCode": "Status Code",
-	"incidentsTableMessage": "Message",
-	"incidentsOptionsHeader": "Incidents for:",
-	"incidentsOptionsHeaderFilterBy": "Filter by:",
-	"incidentsOptionsHeaderFilterAll": "All",
-	"incidentsOptionsHeaderFilterDown": "Down",
-	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
-	"incidentsOptionsHeaderShow": "Show:",
-	"incidentsOptionsHeaderLastHour": "Last hour",
-	"incidentsOptionsHeaderLastDay": "Last day",
-	"incidentsOptionsHeaderLastWeek": "Last week",
-	"incidentsOptionsPlaceholderAllServers": "All servers",
-	"infrastructureCreateYour": "Create your",
-	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
-	"infrastructureServerRequirement": "The server you are monitoring must be running the",
-	"infrastructureCustomizeAlerts": "Customize alerts",
-	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
-	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
-	"infrastructureProtocol": "Protocol",
-	"infrastructureServerUrlLabel": "Server URL",
-	"infrastructureDisplayNameLabel": "Display name",
-	"infrastructureAuthorizationSecretLabel": "Authorization secret",
-	"gb": "GB",
-	"mb": "MB",
-	"mem": "Mem",
-	"memoryUsage": "Memory usage",
-	"cpu": "CPU",
-	"cpuUsage": "CPU usage",
-	"cpuTemperature": "CPU Temperature",
-	"diskUsage": "Disk Usage",
-	"used": "Used",
-	"total": "Total",
-	"cores": "Cores",
-	"frequency": "Frequency",
-	"status": "Status",
-	"cpuPhysical": "CPU (Physical)",
-	"cpuLogical": "CPU (Logical)",
-	"cpuFrequency": "CPU Frequency",
-	"avgCpuTemperature": "Average CPU Temperature",
-	"memory": "Memory",
-	"disk": "Disk",
-	"uptime": "Uptime",
-	"os": "OS",
-	"host": "Host",
-	"actions": "Actions",
-	"integrations": "Integrations",
-	"integrationsPrism": "Connect Prism to your favorite service.",
-	"integrationsSlack": "Slack",
-	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
-	"integrationsDiscord": "Discord",
-	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
-	"integrationsZapier": "Zapier",
-	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
-	"commonSave": "Save",
-	"createYour": "Create your",
-	"createMonitor": "Create monitor",
-	"pause": "Pause",
-	"resume": "Resume",
-	"editing": "Editing...",
-	"url": "URL",
-	"access": "Access",
-	"timezone": "Timezone",
-	"features": "Features",
-	"administrator": "Administrator?",
-	"loginHere": "Login here",
-	"displayName": "Display name",
-	"urlMonitor": "URL to monitor",
-	"portToMonitor": "Port to monitor",
-	"websiteMonitoring": "Website monitoring",
-	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
-	"pingMonitoring": "Ping monitoring",
-	"pingMonitoringDescription": "Check whether your server is available or not.",
-	"dockerContainerMonitoring": "Docker container monitoring",
-	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
-	"portMonitoring": "Port monitoring",
-	"portMonitoringDescription": "Check whether your port is open or not.",
-	"createMaintenanceWindow": "Create maintenance window",
-	"createMaintenance": "Create maintenance",
-	"editMaintenance": "Edit maintenance",
-	"maintenanceWindowName": "Maintenance Window Name",
-	"friendlyNameInput": "Friendly name",
-	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
-	"maintenanceRepeat": "Maintenance Repeat",
-	"maintenance": "maintenance",
-	"duration": "Duration",
-	"addMonitors": "Add monitors",
-	"window": "window",
-	"cancel": "Cancel",
-	"message": "Message",
-	"low": "low",
-	"high": "high",
-	"statusCode": "Status code",
-	"date&Time": "Date & Time",
-	"type": "Type",
-	"statusPageName": "Status page name",
-	"publicURL": "Public URL",
-	"repeat": "Repeat",
-	"edit": "Edit",
-	"createA": "Create a",
-	"remove": "Remove",
-	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
-	"startTime": "Start time",
-	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
-	"monitorsToApply": "Monitors to apply maintenance window to",
-	"nextWindow": "Next window",
-	"notFoundButton": "Go to the main dashboard",
-	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
-	"monitorDisplayName": "Monitor display name",
-	"whenNewIncident": "When there is a new incident,",
-	"notifySMS": "Notify via SMS (coming soon)",
-	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
-	"seperateEmails": "You can separate multiple emails with a comma",
-	"checkFrequency": "Check frequency",
-	"matchMethod": "Match Method",
-	"expectedValue": "Expected value",
-	"deleteDialogTitle": "Do you really want to delete this monitor?",
-	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
-	"pageSpeedMonitor": "PageSpeed monitor",
-	"shown": "Shown",
-	"ago": "ago",
-	"companyName": "Company name",
-	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
-	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
-	"checkingEvery": "Checking every",
-	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
-	"basicInformation": "Basic Information",
-	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
-	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
-	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
-	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
-	"statusPageCreateTabsContent": "Status page servers",
-	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
-	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
-	"showCharts": "Show charts",
-	"showUptimePercentage": "Show uptime percentage",
-	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
-	"removeLogo": "Remove Logo",
-	"statusPageStatus": "A public status page is not set up.",
-	"statusPageStatusContactAdmin": "Please contact to your administrator",
-	"statusPageStatusNotPublic": "This status page is not public.",
-	"statusPageStatusNoPage": "There's no status page here.",
-	"statusPageStatusServiceStatus": "Service status",
-	"deleteStatusPage": "Do you want to delete this status page?",
-	"deleteStatusPageConfirm": "Yes, delete status page",
-	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
-	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
-	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
-	"uptimeCreateJsonPathQuery": "for query language documentation.",
-	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
-	"infrastructureEditYour": "Edit your",
-	"infrastructureEditMonitor": "Save Infrastructure Monitor",
-	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
-	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
-	"errorInvalidTypeId": "Invalid notification type provided",
-	"errorInvalidFieldId": "Invalid field ID provided",
-	"inviteNoTokenFound": "No invite token found",
-	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
-	"pageSpeedLearnMoreLink": "Click here",
-	"pageSpeedAddApiKey": "to add your API key.",
-	"update": "Update",
-	"invalidFileFormat": "Unsupported file format!",
-	"invalidFileSize": "File size is too large!",
 	"ClickUpload": "Click to upload",
+	"DeleteAccountButton": "Remove account",
+	"DeleteAccountTitle": "Remove account",
+	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
+	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
+	"DeleteWarningTitle": "Really remove this account?",
 	"DragandDrop": "drag and drop",
-	"MaxSize": "Maximum Size",
-	"SupportedFormats": "Supported formats",
+	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
 	"FirstName": "First name",
 	"LastName": "Last name",
-	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
-	"YourPhoto": "Profile photo",
+	"MaxSize": "Maximum Size",
 	"PhotoDescriptionText": "This photo will be displayed in your profile page.",
-	"save": "Save",
-	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
-	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
-	"DeleteWarningTitle": "Really remove this account?",
-	"bulkImport": {
-		"title": "Bulk Import",
-		"selectFileTips": "Select CSV file to upload",
-		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
-		"selectFile": "Select File",
-		"parsingFailed": "Parsing failed",
-		"uploadSuccess": "Monitors created successfully!",
-		"validationFailed": "Validation failed",
-		"noFileSelected": "No file selected",
-		"fallbackPage": "Import a file to upload a list of servers in bulk"
-	},
-	"settingsSystemReset": "System reset",
-	"settingsSystemResetDescription": "Remove all monitors from your system.",
-	"DeleteAccountTitle": "Remove account",
-	"DeleteAccountButton": "Remove account",
-	"publicLink": "Public link",
-	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
-	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
-	"pageSpeedApiKeyFieldDescription": "Enter your Google PageSpeed API key to enable pagespeed monitoring. Click Reset to update the key.",
-	"pageSpeedApiKeyFieldResetLabel": "API key is set. Click Reset to change it.",
-	"reset": "Reset",
-	"ignoreTLSError": "Ignore TLS/SSL error",
-	"tlsErrorIgnored": "TLS/SSL errors ignored",
-	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
-	"createNew": "Create new",
-	"greeting": {
-		"prepend": "Hey there",
-		"append": "The afternoon is your playground—let's make it epic!",
-		"overview": "Here's an overview of your {{type}} monitors."
-	},
-	"roles": {
-		"superAdmin": "Super admin",
-		"admin": "Admin",
-		"teamMember": "Team member",
-		"demoUser": "Demo user"
-	},
-	"teamPanel": {
-		"teamMembers": "Team members",
-		"filter": {
-			"all": "All",
-			"member": "Member"
-		},
-		"inviteTeamMember": "Invite a team member",
-		"inviteNewTeamMember": "Invite new team member",
-		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
-		"email": "Email",
-		"selectRole": "Select role",
-		"inviteLink": "Invite link",
-		"cancel": "Cancel",
-		"noMembers": "There are no team members with this role",
-		"getToken": "Get token",
-		"emailToken": "E-mail token",
-		"table": {
-			"name": "Name",
-			"email": "Email",
-			"role": "Role",
-			"created": "Created"
-		}
-	},
-	"monitorState": {
-		"paused": "Paused",
-		"resumed": "Resumed",
-		"active": "Active"
-	},
-	"menu": {
-		"uptime": "Uptime",
-		"pagespeed": "Pagespeed",
-		"infrastructure": "Infrastructure",
-		"incidents": "Incidents",
-		"statusPages": "Status pages",
-		"maintenance": "Maintenance",
-		"integrations": "Integrations",
-		"logs": "Logs",
-		"settings": "Settings",
-		"support": "Support",
-		"discussions": "Discussions",
-		"docs": "Docs",
-		"changelog": "Changelog",
-		"profile": "Profile",
-		"password": "Password",
-		"team": "Team",
-		"logOut": "Log out",
-		"notifications": "Notifications"
-	},
-	"settingsEmail": "Email",
-	"settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.",
-	"settingsEmailHost": "Email host - Hostname or IP address to connect to",
-	"settingsEmailPort": "Email port - Port to connect to",
-	"settingsEmailAddress": "Email address - Used for authentication",
-	"settingsEmailPassword": "Email password - Password for authentication",
-	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
-	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
-	"settingsEmailTransportLinkDescription": "This builds an SMTP transport for NodeMailer",
-	"settingsEmailTransportLinkText": "See specifications here",
-	"state": "State",
-	"statusBreadCrumbsStatusPages": "Status Pages",
-	"statusBreadCrumbsDetails": "Details",
-	"settingsThemeModeLight": "Light",
-	"settingsThemeModeDark": "Dark",
-	"settingsClearAllStatsDialogCancel": "Cancel",
-	"commonSaving": "Saving...",
-	"navControls": "Controls",
-	"incidentsPageTitle": "Incidents",
-	"passwordPanel": {
-		"passwordChangedSuccess": "Your password was changed successfully.",
-		"passwordInputIncorrect": "Your password input was incorrect.",
-		"currentPassword": "Current password",
-		"enterCurrentPassword": "Enter your current password",
-		"newPassword": "New password",
-		"enterNewPassword": "Enter your new password",
-		"confirmNewPassword": "Confirm new password",
-		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
-		"saving": "Saving..."
-	},
-	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
-	"emailSent": "Email sent successfully",
-	"failedToSendEmail": "Failed to send email",
-	"settingsTestEmail": "Send test e-mail",
-	"settingsTestEmailSuccess": "Test email sent successfully",
-	"settingsTestEmailFailed": "Failed to send test email",
-	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
-	"settingsTestEmailUnknownError": "Unknown error",
-	"settingsEmailRequiredFields": "Email address, host, port and password are required",
-	"statusMsg": {
-		"paused": "Monitoring is paused.",
-		"up": "Your site is up.",
-		"down": "Your site is down.",
-		"pending": "Pending..."
-	},
-	"settingsURLTitle": "Monitor IP/URL on Status Page",
-	"settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
-	"settingsURLSelectTitle": "Display IP/URL on status page",
-	"settingsURLEnabled": "Enabled",
-	"settingURLDisabled": "Disabled",
-	"uptimeGeneralInstructions": {
-		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
-		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	},
-	"common": {
-		"appName": "Checkmate",
-		"monitoringAgentName": "Capture",
-		"buttons": {
-			"toggleTheme": "Toggles light & dark"
-		},
-		"toasts": {
-			"networkError": "Network error",
-			"checkConnection": "Please check your connection",
-			"unknownError": "Unknown error"
-		}
-	},
+	"SupportedFormats": "Supported formats",
+	"YourPhoto": "Profile photo",
+	"aboutus": "About Us",
+	"access": "Access",
+	"actions": "Actions",
+	"add": "Add",
+	"addMonitors": "Add monitors",
+	"administrator": "Administrator?",
+	"advancedMatching": "Advanced matching",
+	"ago": "ago",
+	"area": "Area",
 	"auth": {
 		"common": {
-			"navigation": {
-				"continue": "Continue",
-				"back": "Back"
-			},
-			"inputs": {
-				"email": {
-					"label": "Email",
-					"placeholder": "jordan.ellis@domain.com",
-					"errors": {
-						"empty": "To continue, please enter your email address",
-						"invalid": "Please recheck validity of entered email address"
-					}
-				},
-				"password": {
-					"label": "Password",
-					"rules": {
-						"length": {
-							"beginning": "Must be at least",
-							"highlighted": "8 characters long"
-						},
-						"special": {
-							"beginning": "Must contain at least",
-							"highlighted": "one special character"
-						},
-						"number": {
-							"beginning": "Must contain at least",
-							"highlighted": "one number"
-						},
-						"uppercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one upper character"
-						},
-						"lowercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one lower character"
-						},
-						"match": {
-							"beginning": "Confirm password and password",
-							"highlighted": "must match"
-						}
-					},
-					"errors": {
-						"empty": "Please enter your password",
-						"length": "Password must be at least 8 characters long",
-						"uppercase": "Password must contain at least 1 uppercase letter",
-						"lowercase": "Password must contain at least 1 lowercase letter",
-						"number": "Password must contain at least 1 number",
-						"special": "Password must contain at least 1 special character",
-						"incorrect": "The password you provided does not match our records"
-					}
-				},
-				"passwordConfirm": {
-					"label": "Confirm password",
-					"placeholder": "Re-enter password to confirm",
-					"errors": {
-						"empty": "Please enter your password again for confirmation (helps with typos)",
-						"different": "Entered passwords don't match, so one of them is probably mistyped"
-					}
-				},
-				"firstName": {
-					"label": "Name",
-					"placeholder": "Jordan",
-					"errors": {
-						"empty": "Please enter your name",
-						"length": "Name must be less than 50 characters",
-						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				},
-				"lastName": {
-					"label": "Surname",
-					"placeholder": "Ellis",
-					"errors": {
-						"empty": "Please enter your surname",
-						"length": "Surname must be less than 50 characters",
-						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
-					}
-				}
-			},
 			"errors": {
 				"validation": "Error validating data."
 			},
@@ -596,40 +33,139 @@
 						"incorrect": "The password you provided does not match our records"
 					}
 				}
+			},
+			"inputs": {
+				"email": {
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					},
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com"
+				},
+				"firstName": {
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					},
+					"label": "Name",
+					"placeholder": "Jordan"
+				},
+				"lastName": {
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					},
+					"label": "Surname",
+					"placeholder": "Ellis"
+				},
+				"password": {
+					"errors": {
+						"empty": "Please enter your password",
+						"incorrect": "The password you provided does not match our records",
+						"length": "Password must be at least 8 characters long",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"uppercase": "Password must contain at least 1 uppercase letter"
+					},
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						}
+					}
+				},
+				"passwordConfirm": {
+					"errors": {
+						"different": "Entered passwords don't match, so one of them is probably mistyped",
+						"empty": "Please enter your password again for confirmation (helps with typos)"
+					},
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm"
+				}
+			},
+			"navigation": {
+				"back": "Back",
+				"continue": "Continue"
+			}
+		},
+		"forgotPassword": {
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"heading": "Forgot password?",
+			"imageAlts": {
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon",
+				"passwordKey": "Password key icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"subheadings": {
+				"stepFour": "Your password has been successfully reset. Click below to log in magically.",
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepTwo": "We sent a password reset link to <email/>"
+			},
+			"toasts": {
+				"emailNotFound": "Email not found.",
+				"error": "Unable to reset password. Please try again later or contact support.",
+				"redirect": "Redirecting in <seconds/>...",
+				"sent": "Instructions sent to <email/>.",
+				"success": "Your password was reset successfully."
 			}
 		},
 		"login": {
-			"heading": "Log In",
-			"subheadings": {
-				"stepOne": "Enter your email",
-				"stepTwo": "Enter your password"
-			},
-			"links": {
-				"forgotPassword": "Forgot password?",
-				"register": "Do not have an account?",
-				"forgotPasswordLink": "Reset password",
-				"registerLink": "Register here"
-			},
-			"toasts": {
-				"success": "Welcome back! You're successfully logged in.",
-				"incorrectPassword": "Incorrect password"
-			},
 			"errors": {
 				"password": {
 					"incorrect": "The password you provided does not match our records"
 				}
+			},
+			"heading": "Log In",
+			"links": {
+				"forgotPassword": "Forgot password?",
+				"forgotPasswordLink": "Reset password",
+				"register": "Do not have an account?",
+				"registerLink": "Register here"
+			},
+			"subheadings": {
+				"stepOne": "Enter your email",
+				"stepTwo": "Enter your password"
+			},
+			"toasts": {
+				"incorrectPassword": "Incorrect password",
+				"success": "Welcome back! You're successfully logged in."
 			}
 		},
 		"registration": {
-			"heading": {
-				"superAdmin": "Create super admin",
-				"user": "Sign Up"
-			},
-			"subheadings": {
-				"stepOne": "Enter your personal details",
-				"stepTwo": "Enter your email",
-				"stepThree": "Create your password"
-			},
 			"description": {
 				"superAdmin": "Create your super admin account to get started",
 				"user": "Sign up as a user and ask super admin for access to your monitors"
@@ -638,183 +174,647 @@
 				"superAdmin": "Create super admin account",
 				"user": "Sign up regular user"
 			},
-			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
 			"links": {
 				"login": "Already have an account? <a>Log In</a>"
 			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepThree": "Create your password",
+				"stepTwo": "Enter your email"
+			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
 			"toasts": {
 				"success": "Welcome! Your account was created successfully."
 			}
-		},
-		"forgotPassword": {
-			"heading": "Forgot password?",
-			"subheadings": {
-				"stepOne": "No worries, we'll send you reset instructions.",
-				"stepTwo": "We sent a password reset link to <email/>",
-				"stepThree": "Your new password must be different from previously used passwords.",
-				"stepFour": "Your password has been successfully reset. Click below to log in magically."
-			},
-			"buttons": {
-				"openEmail": "Open email app",
-				"resetPassword": "Reset password"
-			},
-			"imageAlts": {
-				"passwordKey": "Password key icon",
-				"email": "Email icon",
-				"lock": "Lock icon",
-				"passwordConfirm": "Password confirm icon"
-			},
-			"links": {
-				"login": "Go back to <a>Log In</a>",
-				"resend": "Didn't receive the email? <a>Click to resend</a>"
-			},
-			"toasts": {
-				"sent": "Instructions sent to <email/>.",
-				"emailNotFound": "Email not found.",
-				"redirect": "Redirecting in <seconds/>...",
-				"success": "Your password was reset successfully.",
-				"error": "Unable to reset password. Please try again later or contact support."
-			}
 		}
 	},
+	"avgCpuTemperature": "Average CPU Temperature",
+	"bar": "Bar",
+	"basicInformation": "Basic Information",
+	"bulkImport": {
+		"fallbackPage": "Import a file to upload a list of servers in bulk",
+		"noFileSelected": "No file selected",
+		"parsingFailed": "Parsing failed",
+		"selectFile": "Select File",
+		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
+		"selectFileTips": "Select CSV file to upload",
+		"title": "Bulk Import",
+		"uploadSuccess": "Monitors created successfully!",
+		"validationFailed": "Validation failed"
+	},
+	"cancel": "Cancel",
+	"checkFrequency": "Check frequency",
+	"checkingEvery": "Checking every",
+	"city": "CITY",
+	"common": {
+		"appName": "Checkmate",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		},
+		"monitoringAgentName": "Capture",
+		"toasts": {
+			"checkConnection": "Please check your connection",
+			"networkError": "Network error",
+			"unknownError": "Unknown error"
+		}
+	},
+	"commonSave": "Save",
+	"commonSaving": "Saving...",
+	"companyName": "Company name",
+	"configure": "Configure",
+	"cores": "Cores",
+	"country": "COUNTRY",
+	"cpu": "CPU",
+	"cpuFrequency": "CPU Frequency",
+	"cpuLogical": "CPU (Logical)",
+	"cpuPhysical": "CPU (Physical)",
+	"cpuTemperature": "CPU Temperature",
+	"cpuUsage": "CPU usage",
+	"createA": "Create a",
+	"createMaintenance": "Create maintenance",
+	"createMaintenanceWindow": "Create maintenance window",
+	"createMonitor": "Create monitor",
+	"createNew": "Create new",
+	"createNotifications": {
+		"discordSettings": {
+			"description": "Configure your Discord webhook here",
+			"title": "Discord",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"emailSettings": {
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com",
+			"title": "Email"
+		},
+		"nameSettings": {
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications",
+			"title": "Name"
+		},
+		"pagerdutySettings": {
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890",
+			"title": "PagerDuty"
+		},
+		"slackSettings": {
+			"description": "Configure your Slack webhook here",
+			"title": "Slack",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"title": "Create notification channel",
+		"typeSettings": {
+			"description": "Select the type of notification channel you want to create.",
+			"title": "Type",
+			"typeLabel": "Type"
+		},
+		"webhookSettings": {
+			"description": "Configure your webhook here",
+			"title": "Webhook",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		}
+	},
+	"createYour": "Create your",
+	"date&Time": "Date & Time",
+	"delete": "Delete",
+	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
+	"deleteDialogTitle": "Do you really want to delete this monitor?",
+	"deleteStatusPage": "Do you want to delete this status page?",
+	"deleteStatusPageConfirm": "Yes, delete status page",
+	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
+	"disk": "Disk",
+	"diskUsage": "Disk Usage",
+	"displayName": "Display name",
+	"distributedRightCategoryTitle": "Monitor",
+	"distributedStatusHeaderText": "Real-time, real-device coverage",
+	"distributedStatusServerMonitors": "Server Monitors",
+	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
+	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
+	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
+	"distributedUptimeCreateChecks": "Checks to perform",
+	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
+	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
+	"distributedUptimeCreateIncidentNotification": "Incident notifications",
+	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
+	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
+	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
+	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
+	"distributedUptimeStatus30Days": "30 days",
+	"distributedUptimeStatus60Days": "60 days",
+	"distributedUptimeStatus90Days": "90 days",
+	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
+	"distributedUptimeStatusCompanyNameLabel": "Company name",
+	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
+	"distributedUptimeStatusCreateStatusPage": "status page",
+	"distributedUptimeStatusCreateStatusPageAccess": "Access",
+	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
+	"distributedUptimeStatusCreateYour": "Create your",
+	"distributedUptimeStatusDevices": "Devices",
+	"distributedUptimeStatusEditYour": "Edit your",
+	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
+	"distributedUptimeStatusLogoHeader": "Logo",
+	"distributedUptimeStatusLogoUploadButton": "Upload logo",
+	"distributedUptimeStatusPageAddressLabel": "Your status page address",
+	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
+	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
+	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
+	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
+	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
+	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
+	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
+	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
+	"distributedUptimeStatusUpt": "UPT",
+	"distributedUptimeStatusUptBurned": "UPT Burned",
+	"distributedUptimeStatusUptLogo": "Upt Logo",
+	"dockerContainerMonitoring": "Docker container monitoring",
+	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
+	"duration": "Duration",
+	"edit": "Edit",
+	"editMaintenance": "Edit maintenance",
+	"editing": "Editing...",
+	"emailSent": "Email sent successfully",
+	"errorInvalidFieldId": "Invalid field ID provided",
+	"errorInvalidTypeId": "Invalid notification type provided",
 	"errorPages": {
 		"serverUnreachable": {
-			"toasts": {
-				"reconnected": "Successfully reconnected to the server.",
-				"stillUnreachable": "Server is still unreachable. Please try again later."
-			},
 			"alertBox": "Server Connection Error",
 			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
 			"retryButton": {
 				"default": "Retry connection",
 				"processing": "Connecting..."
+			},
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
 			}
 		}
 	},
-	"createNotifications": {
-		"title": "Create notification channel",
-		"nameSettings": {
-			"title": "Name",
-			"description": "A descriptive name for your integration.",
-			"nameLabel": "Name",
-			"namePlaceholder": "e.g. Slack notifications"
-		},
-		"typeSettings": {
-			"title": "Type",
-			"description": "Select the type of notification channel you want to create.",
-			"typeLabel": "Type"
-		},
-		"emailSettings": {
-			"title": "Email",
-			"description": "Destination email addresses.",
-			"emailLabel": "Email address",
-			"emailPlaceholder": "e.g. john@example.com"
-		},
-		"slackSettings": {
-			"title": "Slack",
-			"description": "Configure your Slack webhook here",
-			"webhookLabel": "Slack webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/..."
-		},
-		"pagerdutySettings": {
-			"title": "PagerDuty",
-			"description": "Configure your PagerDuty integration here",
-			"integrationKeyLabel": "Integration key",
-			"integrationKeyPlaceholder": "1234567890"
-		},
-		"discordSettings": {
-			"title": "Discord",
-			"description": "Configure your Discord webhook here",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		},
-		"webhookSettings": {
-			"title": "Webhook",
-			"description": "Configure your webhook here",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		}
+	"expectedValue": "Expected value",
+	"export": {
+		"failed": "Failed to export monitors",
+		"success": "Monitors exported successfully!",
+		"title": "Export Monitors"
 	},
-	"notificationConfig": {
-		"title": "Notifications",
-		"description": "Select the notifications channels you want to use"
+	"failedToSendEmail": "Failed to send email",
+	"features": "Features",
+	"frequency": "Frequency",
+	"friendlyNameInput": "Friendly name",
+	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
+	"gb": "GB",
+	"greeting": {
+		"append": "The afternoon is your playground—let's make it epic!",
+		"overview": "Here's an overview of your {{type}} monitors.",
+		"prepend": "Hey there"
 	},
-	"monitorStatus": {
-		"checkingEvery": "Checking every {{interval}}",
-		"withCaptureAgent": "with Capture agent {{version}}",
-		"up": "up",
-		"down": "down",
-		"paused": "paused"
-	},
-	"advancedMatching": "Advanced matching",
-	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
-	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
-	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool - Enable connection pooling",
-	"sendTestNotifications": "Send test notifications",
-	"selectAll": "Select all",
+	"high": "high",
+	"host": "Host",
+	"http": "HTTP",
+	"https": "HTTPS",
+	"ignoreTLSError": "Ignore TLS/SSL error",
+	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
+	"incidentsOptionsHeader": "Incidents for:",
+	"incidentsOptionsHeaderFilterAll": "All",
+	"incidentsOptionsHeaderFilterBy": "Filter by:",
+	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
+	"incidentsOptionsHeaderFilterDown": "Down",
+	"incidentsOptionsHeaderLastDay": "Last day",
+	"incidentsOptionsHeaderLastHour": "Last hour",
+	"incidentsOptionsHeaderLastWeek": "Last week",
+	"incidentsOptionsHeaderShow": "Show:",
+	"incidentsOptionsPlaceholderAllServers": "All servers",
+	"incidentsPageTitle": "Incidents",
+	"incidentsTableDateTime": "Date & Time",
+	"incidentsTableMessage": "Message",
+	"incidentsTableMonitorName": "Monitor Name",
+	"incidentsTableNoIncidents": "No incidents recorded",
+	"incidentsTablePaginationLabel": "incidents",
+	"incidentsTableStatus": "Status",
+	"incidentsTableStatusCode": "Status Code",
+	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
+	"infrastructureAuthorizationSecretLabel": "Authorization secret",
+	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
+	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
+	"infrastructureCreateYour": "Create your",
+	"infrastructureCustomizeAlerts": "Customize alerts",
+	"infrastructureDisplayNameLabel": "Display name",
+	"infrastructureEditMonitor": "Save Infrastructure Monitor",
+	"infrastructureEditYour": "Edit your",
+	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
+	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
+	"infrastructureProtocol": "Protocol",
+	"infrastructureServerRequirement": "The server you are monitoring must be running the",
+	"infrastructureServerUrlLabel": "Server URL",
+	"integrations": "Integrations",
+	"integrationsDiscord": "Discord",
+	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
+	"integrationsPrism": "Connect Prism to your favorite service.",
+	"integrationsSlack": "Slack",
+	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
+	"integrationsZapier": "Zapier",
+	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
+	"invalidFileFormat": "Unsupported file format!",
+	"invalidFileSize": "File size is too large!",
+	"inviteNoTokenFound": "No invite token found",
+	"loginHere": "Login here",
 	"logsPage": {
-		"title": "Logs",
 		"description": "This page shows the latest 1000 lines of logs from the Checkmate server",
-		"tabs": {
-			"queue": "Job queue",
-			"logs": "Server logs"
-		},
-		"toast": {
-			"fetchLogsSuccess": "Logs fetched successfully"
-		},
 		"logLevelSelect": {
 			"title": "Log level",
 			"values": {
 				"all": "All",
-				"info": "Info",
-				"warn": "Warn",
+				"debug": "Debug",
 				"error": "Error",
-				"debug": "Debug"
+				"info": "Info",
+				"warn": "Warn"
 			}
+		},
+		"tabs": {
+			"logs": "Server logs",
+			"queue": "Job queue"
+		},
+		"title": "Logs",
+		"toast": {
+			"fetchLogsSuccess": "Logs fetched successfully"
 		}
 	},
+	"low": "low",
+	"maintenance": "maintenance",
+	"maintenanceRepeat": "Maintenance Repeat",
+	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
+	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
+	"maintenanceWindowName": "Maintenance Window Name",
+	"maskedPageSpeedKeyPlaceholder": "*************************************",
+	"matchMethod": "Match Method",
+	"mb": "MB",
+	"mem": "Mem",
+	"memory": "Memory",
+	"memoryUsage": "Memory usage",
+	"menu": {
+		"changelog": "Changelog",
+		"discussions": "Discussions",
+		"docs": "Docs",
+		"incidents": "Incidents",
+		"infrastructure": "Infrastructure",
+		"integrations": "Integrations",
+		"logOut": "Log out",
+		"logs": "Logs",
+		"maintenance": "Maintenance",
+		"notifications": "Notifications",
+		"pagespeed": "Pagespeed",
+		"password": "Password",
+		"profile": "Profile",
+		"settings": "Settings",
+		"statusPages": "Status pages",
+		"support": "Support",
+		"team": "Team",
+		"uptime": "Uptime"
+	},
+	"message": "Message",
+	"monitor": "monitor",
+	"monitorActions": {
+		"export": "Export Monitors",
+		"import": "Import Monitors",
+		"title": "Export/Import"
+	},
+	"monitorDisplayName": "Monitor display name",
+	"monitorState": {
+		"active": "Active",
+		"paused": "Paused",
+		"resumed": "Resumed"
+	},
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"down": "down",
+		"paused": "paused",
+		"up": "up",
+		"withCaptureAgent": "with Capture agent {{version}}"
+	},
+	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
+	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
+	"monitors": "monitors",
+	"monitorsToApply": "Monitors to apply maintenance window to",
+	"ms": "ms",
+	"navControls": "Controls",
+	"nextWindow": "Next window",
+	"notFoundButton": "Go to the main dashboard",
+	"notificationConfig": {
+		"description": "Select the notifications channels you want to use",
+		"title": "Notifications"
+	},
+	"notifications": {
+		"addOrEditNotifications": "Add or edit notifications",
+		"create": {
+			"failed": "Failed to create notification",
+			"success": "Notification created successfully"
+		},
+		"createButton": "Create notification channel",
+		"createTitle": "Notification channel",
+		"delete": {
+			"failed": "Failed to delete notification",
+			"success": "Notification deleted successfully"
+		},
+		"discord": {
+			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
+			"label": "Discord",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
+			"webhookRequired": "Discord webhook URL is required"
+		},
+		"edit": {
+			"failed": "Failed to update notification",
+			"success": "Notification updated successfully"
+		},
+		"enableNotifications": "Enable {{platform}} notifications",
+		"fallback": {
+			"checks": [
+				"Alert teams about downtime or performance issues",
+				"Let engineers know when incidents happen",
+				"Keep administrators informed of system changes"
+			],
+			"title": "notification channel"
+		},
+		"fetch": {
+			"failed": "Failed to fetch notifications",
+			"success": "Notifications fetched successfully"
+		},
+		"integrationButton": "Notification Integration",
+		"networkError": "Network error occurred",
+		"slack": {
+			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
+			"label": "Slack",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/...",
+			"webhookRequired": "Slack webhook URL is required"
+		},
+		"telegram": {
+			"chatIdLabel": "Your Chat ID",
+			"chatIdPlaceholder": "-1001234567890",
+			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
+			"fieldsRequired": "Telegram token and chat ID are required",
+			"label": "Telegram",
+			"tokenLabel": "Your bot token",
+			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"
+		},
+		"test": {
+			"failed": "Failed to send test notification",
+			"success": "Test notification sent successfully"
+		},
+		"testFailed": "Failed to send test notification",
+		"testNotification": "Test notification",
+		"testNotificationDevelop": "Test notification 2",
+		"testSuccess": "Test notification sent successfully!",
+		"unsupportedType": "Unsupported notification type",
+		"webhook": {
+			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
+			"label": "Webhooks",
+			"urlLabel": "Webhook URL",
+			"urlPlaceholder": "https://your-server.com/webhook",
+			"urlRequired": "Webhook URL is required"
+		}
+	},
+	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
+	"notifySMS": "Notify via SMS (coming soon)",
+	"now": "Now",
+	"os": "OS",
+	"pageSpeedAddApiKey": "to add your API key.",
+	"pageSpeedApiKeyFieldDescription": "Enter your Google PageSpeed API key to enable pagespeed monitoring. Click Reset to update the key.",
+	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
+	"pageSpeedApiKeyFieldResetLabel": "API key is set. Click Reset to change it.",
+	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
+	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
+	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
+	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
+	"pageSpeedLearnMoreLink": "Click here",
+	"pageSpeedMonitor": "PageSpeed monitor",
+	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
+	"passwordPanel": {
+		"confirmNewPassword": "Confirm new password",
+		"currentPassword": "Current password",
+		"enterCurrentPassword": "Enter your current password",
+		"enterNewPassword": "Enter your new password",
+		"newPassword": "New password",
+		"passwordChangedSuccess": "Your password was changed successfully.",
+		"passwordInputIncorrect": "Your password input was incorrect.",
+		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
+		"saving": "Saving..."
+	},
+	"pause": "Pause",
+	"pingMonitoring": "Ping monitoring",
+	"pingMonitoringDescription": "Check whether your server is available or not.",
+	"portMonitoring": "Port monitoring",
+	"portMonitoringDescription": "Check whether your port is open or not.",
+	"portToMonitor": "Port to monitor",
+	"publicLink": "Public link",
+	"publicURL": "Public URL",
 	"queuePage": {
-		"title": "Queue",
-		"refreshButton": "Refresh",
-		"flushButton": "Flush queue",
-		"jobTable": {
-			"title": "Jobs currently in queue",
-			"idHeader": "Monitor ID",
-			"urlHeader": "URL",
-			"typeHeader": "Type",
-			"activeHeader": "Active",
-			"lockedAtHeader": "Locked at",
-			"runCountHeader": "Run count",
-			"failCountHeader": "Fail count",
-			"lastRunHeader": "Last run at",
-			"lastFinishedAtHeader": "Last finished at",
-			"lastRunTookHeader": "Last run took"
-		},
-		"metricsTable": {
-			"title": "Queue metrics",
-			"metricHeader": "Metric",
-			"valueHeader": "Value"
-		},
 		"failedJobTable": {
-			"title": "Failed jobs",
+			"failCountHeader": "Fail count",
+			"failReasonHeader": "Fail reason",
+			"failedAtHeader": "Last failed at",
 			"monitorIdHeader": "Monitor ID",
 			"monitorUrlHeader": "Monitor URL",
+			"title": "Failed jobs"
+		},
+		"flushButton": "Flush queue",
+		"jobTable": {
+			"activeHeader": "Active",
 			"failCountHeader": "Fail count",
-			"failedAtHeader": "Last failed at",
-			"failReasonHeader": "Fail reason"
-		}
+			"idHeader": "Monitor ID",
+			"lastFinishedAtHeader": "Last finished at",
+			"lastRunHeader": "Last run at",
+			"lastRunTookHeader": "Last run took",
+			"lockedAtHeader": "Locked at",
+			"runCountHeader": "Run count",
+			"title": "Jobs currently in queue",
+			"typeHeader": "Type",
+			"urlHeader": "URL"
+		},
+		"metricsTable": {
+			"metricHeader": "Metric",
+			"title": "Queue metrics",
+			"valueHeader": "Value"
+		},
+		"refreshButton": "Refresh",
+		"title": "Queue"
 	},
-	"export": {
-		"title": "Export Monitors",
-		"success": "Monitors exported successfully!",
-		"failed": "Failed to export monitors"
+	"remove": "Remove",
+	"removeLogo": "Remove Logo",
+	"repeat": "Repeat",
+	"reset": "Reset",
+	"response": "RESPONSE",
+	"responseTime": "Response time",
+	"resume": "Resume",
+	"roles": {
+		"admin": "Admin",
+		"demoUser": "Demo user",
+		"superAdmin": "Super admin",
+		"teamMember": "Team member"
 	},
-	"monitorActions": {
-		"title": "Export/Import",
-		"import": "Import Monitors",
-		"export": "Export Monitors"
-	}
+	"save": "Save",
+	"selectAll": "Select all",
+	"sendTestNotifications": "Send test notifications",
+	"seperateEmails": "You can separate multiple emails with a comma",
+	"settingURLDisabled": "Disabled",
+	"settingsAbout": "About",
+	"settingsAddDemoMonitorsButton": "Add demo monitors",
+	"settingsAppearance": "Appearance",
+	"settingsAppearanceDescription": "Switch between light and dark mode, or change user interface language",
+	"settingsClearAllStats": "Clear all stats. This is irreversible.",
+	"settingsClearAllStatsButton": "Clear all stats",
+	"settingsClearAllStatsDialogCancel": "Cancel",
+	"settingsClearAllStatsDialogConfirm": "Yes, clear all stats",
+	"settingsClearAllStatsDialogDescription": "Once removed, the monitoring history and stats cannot be retrieved.",
+	"settingsClearAllStatsDialogTitle": "Do you want to clear all stats?",
+	"settingsDemoMonitors": "Demo monitors",
+	"settingsDemoMonitorsAdded": "Successfully added demo monitors",
+	"settingsDemoMonitorsDescription": "Add sample monitors for demonstration purposes.",
+	"settingsDevelopedBy": "Developed by Bluewave Labs.",
+	"settingsDisabled": "Disabled",
+	"settingsDisplayTimezone": "Display timezone",
+	"settingsDisplayTimezoneDescription": "Select the timezone used to display dates and times throughout the application.",
+	"settingsEmail": "Email",
+	"settingsEmailAddress": "Email address - Used for authentication",
+	"settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting",
+	"settingsEmailDescription": "Configure the email settings for your system. This is used to send notifications and alerts.",
+	"settingsEmailFieldResetLabel": "Password is set. Click Reset to change it.",
+	"settingsEmailHost": "Email host - Hostname or IP address to connect to",
+	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
+	"settingsEmailPassword": "Email password - Password for authentication",
+	"settingsEmailPool": "Pool - Enable connection pooling",
+	"settingsEmailPort": "Email port - Port to connect to",
+	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
+	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
+	"settingsEmailRequiredFields": "Email address, host, port and password are required",
+	"settingsEmailSecure": "Secure - Use SSL",
+	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
+	"settingsEmailTransportLinkDescription": "This builds an SMTP transport for NodeMailer",
+	"settingsEmailTransportLinkText": "See specifications here",
+	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
+	"settingsEnabled": "Enabled",
+	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
+	"settingsFailedToClearStats": "Failed to clear stats",
+	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
+	"settingsFailedToSave": "Failed to save settings",
+	"settingsGeneralSettings": "General settings",
+	"settingsHistoryAndMonitoring": "History of monitoring",
+	"settingsHistoryAndMonitoringDescription": "Define how long you want to retain historical data. You can also clear all existing data.",
+	"settingsLanguage": "Language",
+	"settingsMonitorsDeleted": "Successfully deleted all monitors",
+	"settingsRemoveAllMonitorsButton": "Remove all monitors",
+	"settingsRemoveAllMonitorsDialogConfirm": "Yes, remove all monitors",
+	"settingsRemoveAllMonitorsDialogTitle": "Do you want to remove all monitors?",
+	"settingsSave": "Save",
+	"settingsStatsCleared": "Stats cleared successfully",
+	"settingsSuccessSaved": "Settings saved successfully",
+	"settingsSystemReset": "System reset",
+	"settingsSystemResetDescription": "Remove all monitors from your system.",
+	"settingsTTLLabel": "The days you want to keep monitoring history.",
+	"settingsTTLOptionalLabel": "0 for infinite",
+	"settingsTestEmail": "Send test e-mail",
+	"settingsTestEmailFailed": "Failed to send test email",
+	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
+	"settingsTestEmailSuccess": "Test email sent successfully",
+	"settingsTestEmailUnknownError": "Unknown error",
+	"settingsThemeMode": "Theme Mode",
+	"settingsThemeModeDark": "Dark",
+	"settingsThemeModeLight": "Light",
+	"settingsURLDescription": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
+	"settingsURLEnabled": "Enabled",
+	"settingsURLSelectTitle": "Display IP/URL on status page",
+	"settingsURLTitle": "Monitor IP/URL on Status Page",
+	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
+	"showCharts": "Show charts",
+	"showUptimePercentage": "Show uptime percentage",
+	"shown": "Shown",
+	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
+	"starPromptTitle": "Star Checkmate",
+	"startTime": "Start time",
+	"state": "State",
+	"status": "Status",
+	"statusBreadCrumbsDetails": "Details",
+	"statusBreadCrumbsStatusPages": "Status Pages",
+	"statusCode": "Status code",
+	"statusMsg": {
+		"down": "Your site is down.",
+		"paused": "Monitoring is paused.",
+		"pending": "Pending...",
+		"up": "Your site is up."
+	},
+	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
+	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
+	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
+	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
+	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
+	"statusPageCreateTabsContent": "Status page servers",
+	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
+	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
+	"statusPageName": "Status page name",
+	"statusPageStatus": "A public status page is not set up.",
+	"statusPageStatusContactAdmin": "Please contact to your administrator",
+	"statusPageStatusNoPage": "There's no status page here.",
+	"statusPageStatusNotPublic": "This status page is not public.",
+	"statusPageStatusServiceStatus": "Service status",
+	"submit": "Submit",
+	"teamPanel": {
+		"cancel": "Cancel",
+		"email": "Email",
+		"emailToken": "E-mail token",
+		"filter": {
+			"all": "All",
+			"member": "Member"
+		},
+		"getToken": "Get token",
+		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
+		"inviteLink": "Invite link",
+		"inviteNewTeamMember": "Invite new team member",
+		"inviteTeamMember": "Invite a team member",
+		"noMembers": "There are no team members with this role",
+		"selectRole": "Select role",
+		"table": {
+			"created": "Created",
+			"email": "Email",
+			"name": "Name",
+			"role": "Role"
+		},
+		"teamMembers": "Team members"
+	},
+	"testLocale": "testLocale",
+	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
+	"timezone": "Timezone",
+	"title": "Title",
+	"tlsErrorIgnored": "TLS/SSL errors ignored",
+	"total": "Total",
+	"type": "Type",
+	"update": "Update",
+	"uptime": "Uptime",
+	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
+	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
+	"uptimeCreateJsonPathQuery": "for query language documentation.",
+	"uptimeGeneralInstructions": {
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
+		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
+		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+	},
+	"url": "URL",
+	"urlMonitor": "URL to monitor",
+	"used": "Used",
+	"webhookSendError": "Error sending webhook notification to {platform}",
+	"webhookSendSuccess": "Webhook notification sent successfully",
+	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
+	"websiteMonitoring": "Website monitoring",
+	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
+	"whenNewIncident": "When there is a new incident,",
+	"window": "window"
 }

From 563cc8d03dec2037c5ec1ad35712472275f053a9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 14:45:04 +0800
Subject: [PATCH 308/319] fix label

---
 client/src/Pages/Settings/SettingsPagespeed.jsx | 2 +-
 client/src/locales/en.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsPagespeed.jsx b/client/src/Pages/Settings/SettingsPagespeed.jsx
index e9eff79b5..157c75dac 100644
--- a/client/src/Pages/Settings/SettingsPagespeed.jsx
+++ b/client/src/Pages/Settings/SettingsPagespeed.jsx
@@ -67,7 +67,7 @@ const SettingsPagespeed = ({
 
 				{isApiKeySet === true && apiKeyHasBeenReset === false && (
 					<Box>
-						<Typography>{t("settingsPage.pageSpeedSettings.labelAPiKeySet")}</Typography>
+						<Typography>{t("settingsPage.pageSpeedSettings.labelApiKeySet")}</Typography>
 						<Button
 							onClick={() => {
 								setApiKey("");
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 8324bd5d7..b3cc23dca 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -701,7 +701,7 @@
 		},
 		"pageSpeedSettings": {
 			"description": "Enter your Google PageSpeed API key to enable Google PageSpeed monitoring. Click Reset to update the key.",
-			"labelAPiKeySet": "API key is set. Click Reset to change it.",
+			"labelApiKeySet": "API key is set. Click Reset to change it.",
 			"labelApiKey": "PageSpeed API key",
 			"title": "Google PageSpeed API key"
 		},

From 4f17e8424762bd354204dc48decf9fd27bd016b2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 15:40:50 +0800
Subject: [PATCH 309/319] extract version from git tag

---
 client/.eslintrc.cjs                        |  4 ++++
 client/src/Pages/Settings/SettingsAbout.jsx |  2 +-
 client/vite.config.js                       | 24 ++++++++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/client/.eslintrc.cjs b/client/.eslintrc.cjs
index 7d6029d4b..86d523a6f 100644
--- a/client/.eslintrc.cjs
+++ b/client/.eslintrc.cjs
@@ -16,4 +16,8 @@ module.exports = {
 		"react-refresh/only-export-components": ["warn", { allowConstantExport: true }],
 		"react/no-unescaped-entities": "off",
 	},
+	globals: {
+		__APP_VERSION__: "readonly",
+		process: "readonly",
+	},
 };
diff --git a/client/src/Pages/Settings/SettingsAbout.jsx b/client/src/Pages/Settings/SettingsAbout.jsx
index 6acadd444..42647e706 100644
--- a/client/src/Pages/Settings/SettingsAbout.jsx
+++ b/client/src/Pages/Settings/SettingsAbout.jsx
@@ -21,7 +21,7 @@ const SettingsAbout = () => {
 			</Box>
 			<Box>
 				<Typography component="h2">
-					{t("common.appName")} {2.1}
+					{t("common.appName")} {__APP_VERSION__}
 				</Typography>
 				<Typography sx={{ mt: theme.spacing(2), mb: theme.spacing(6), opacity: 0.6 }}>
 					{t("settingsDevelopedBy")}
diff --git a/client/vite.config.js b/client/vite.config.js
index dc84ce055..033704c00 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -1,12 +1,20 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
+import { execSync } from "child_process";
 
-// https://vitejs.dev/config/
-export default defineConfig({
-	base: "/",
-	plugins: [svgr(), react()],
-	optimizeDeps: {
-		include: ["@mui/material/Tooltip", "@emotion/styled"],
-	},
+export default defineConfig(({ mode }) => {
+	const env = loadEnv(mode, process.cwd(), "");
+	const version =
+		env.VITE_APP_VERSION || execSync("git describe --tags --abbrev=0").toString().trim();
+	return {
+		base: "/",
+		plugins: [svgr(), react()],
+		optimizeDeps: {
+			include: ["@mui/material/Tooltip", "@emotion/styled"],
+		},
+		define: {
+			__APP_VERSION__: JSON.stringify(version),
+		},
+	};
 });

From 8d6078e2c1363a12c466248dd5d3dfce8bf77839 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 24 Jun 2025 16:31:18 +0800
Subject: [PATCH 310/319] safely extract version

---
 client/vite.config.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/vite.config.js b/client/vite.config.js
index 033704c00..96151c0b3 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -5,8 +5,15 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	const version =
-		env.VITE_APP_VERSION || execSync("git describe --tags --abbrev=0").toString().trim();
+	let version;
+	try {
+		version =
+			env.VITE_APP_VERSION ||
+			execSync("git describe --tags --abbrev=0").toString().trim();
+	} catch (error) {
+		version = "unknown";
+	}
+
 	return {
 		base: "/",
 		plugins: [svgr(), react()],

From 915d2e06ae4d0b65a5d42c23ed25f85ff182ad87 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 09:34:07 +0800
Subject: [PATCH 311/319] verify transport before sending email

---
 client/src/Components/TabPanels/Account/TeamPanel.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/TabPanels/Account/TeamPanel.jsx b/client/src/Components/TabPanels/Account/TeamPanel.jsx
index 341f84ba7..45578cc6c 100644
--- a/client/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -168,7 +168,7 @@ const TeamPanel = () => {
 			});
 		} catch (error) {
 			createToast({
-				body: error.message || "Unknown error.",
+				body: error?.response?.data?.msg || error.message || "Unknown error.",
 			});
 		} finally {
 			setIsSendingInvite(false);
@@ -268,7 +268,7 @@ const TeamPanel = () => {
 					value={toInvite.email}
 					onChange={handleChange}
 					error={errors.email ? true : false}
-					helperText={errors.email}
+					helperText={t(errors.email)}
 				/>
 				<Select
 					id="team-member-role"

From 4cc3765e0db18e2b6fc28dfc9e170e12edf908c7 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 09:35:41 +0800
Subject: [PATCH 312/319] verify transport before sending email

---
 server/controllers/inviteController.js |  7 ++++++-
 server/service/emailService.js         | 11 +++++++++++
 server/utils/logger.js                 |  8 ++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/controllers/inviteController.js b/server/controllers/inviteController.js
index 3b2212769..3799c58b9 100755
--- a/server/controllers/inviteController.js
+++ b/server/controllers/inviteController.js
@@ -77,11 +77,16 @@ class InviteController {
 					name: firstname,
 					link: `${clientHost}/register/${inviteToken.token}`,
 				});
-				await this.emailService.sendEmail(
+				const result = await this.emailService.sendEmail(
 					req.body.email,
 					"Welcome to Uptime Monitor",
 					html
 				);
+				if (!result) {
+					return res.error({
+						msg: "Failed to send invite e-mail... Please verify your settings.",
+					});
+				}
 			} catch (error) {
 				logger.warn({
 					message: error.message,
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 89bd4d50f..433fd0871 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -137,6 +137,17 @@ class EmailService {
 		};
 		this.transporter = this.nodemailer.createTransport(emailConfig);
 
+		try {
+			await this.transporter.verify();
+		} catch (error) {
+			this.logger.warn({
+				message: "Email transporter verification failed",
+				service: SERVICE_NAME,
+				method: "verifyTransporter",
+			});
+			return false;
+		}
+
 		try {
 			const info = await this.transporter.sendMail({
 				to: to,
diff --git a/server/utils/logger.js b/server/utils/logger.js
index 0864176c5..49b875d96 100755
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -76,7 +76,7 @@ class Logger {
 	info(config) {
 		const logEntry = this.buildLogEntry("info", config);
 		this.cacheLog(logEntry);
-		this.logger.info(config.message, logEntry);
+		this.logger.info(logEntry);
 	}
 
 	/**
@@ -90,7 +90,7 @@ class Logger {
 	warn(config) {
 		const logEntry = this.buildLogEntry("warn", config);
 		this.cacheLog(logEntry);
-		this.logger.warn(config.message, logEntry);
+		this.logger.warn(logEntry);
 	}
 
 	/**
@@ -104,7 +104,7 @@ class Logger {
 	error(config) {
 		const logEntry = this.buildLogEntry("error", config);
 		this.cacheLog(logEntry);
-		this.logger.error(config.message, logEntry);
+		this.logger.error(logEntry);
 	}
 	/**
 	 * Logs a debug message.
@@ -117,7 +117,7 @@ class Logger {
 	debug(config) {
 		const logEntry = this.buildLogEntry("debug", config);
 		this.cacheLog(logEntry);
-		this.logger.debug(config.message, logEntry);
+		this.logger.debug(logEntry);
 	}
 
 	cacheLog(entry) {

From 9bb5362c5f6acf66c40905911108920854b42be8 Mon Sep 17 00:00:00 2001
From: GitHub Action <github-actions[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 02:44:18 +0000
Subject: [PATCH 313/319] feat: translations updated from POEditor

---
 client/src/locales/ar.json    |  203 +++--
 client/src/locales/cs.json    |  203 +++--
 client/src/locales/de.json    |  269 ++++---
 client/src/locales/en.json    | 1362 ++++++++++++++++-----------------
 client/src/locales/es.json    |  203 +++--
 client/src/locales/fi.json    |  203 +++--
 client/src/locales/fr.json    |  203 +++--
 client/src/locales/pt-BR.json |  204 +++--
 client/src/locales/ru.json    |  203 +++--
 client/src/locales/tr.json    |  203 +++--
 client/src/locales/zh-TW.json |  203 +++--
 11 files changed, 2154 insertions(+), 1305 deletions(-)

diff --git a/client/src/locales/ar.json b/client/src/locales/ar.json
index 81a2bb05f..a7b64dd80 100644
--- a/client/src/locales/ar.json
+++ b/client/src/locales/ar.json
@@ -3,38 +3,11 @@
 	"title": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "",
-	"settingsDisplayTimezone": "",
-	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsEnabled": "",
 	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
 	"settingsSuccessSaved": "",
 	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
 	"commonSaving": "",
 	"navControls": "",
 	"incidentsPageTitle": "",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/cs.json b/client/src/locales/cs.json
index 4e1170ee7..a5249ebbd 100644
--- a/client/src/locales/cs.json
+++ b/client/src/locales/cs.json
@@ -3,38 +3,11 @@
 	"title": "",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "Obecná nastavení",
-	"settingsDisplayTimezone": "",
-	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "Vzhled",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "Jazyk",
-	"settingsEnabled": "Zapnuto",
 	"settingsDisabled": "Vypnuto",
-	"settingsHistoryAndMonitoring": "Historie a monitorování",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "Vyvinuto společností Bluewave Labs.",
-	"settingsSave": "Uložit",
 	"settingsSuccessSaved": "Nastavení bylo úspěšně uloženo",
 	"settingsFailedToSave": "Nepodařilo se uložit nastavení",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
 	"commonSaving": "",
 	"navControls": "",
 	"incidentsPageTitle": "",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index e33adab68..948c384d8 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -3,57 +3,30 @@
 	"title": "Titel",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "Einstellungen",
-	"settingsDisplayTimezone": "Zeitzone anzeigen",
-	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "Theme modus",
-	"settingsLanguage": "Sprache",
-	"settingsEnabled": "Aktiv",
-	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
-	"settingsSuccessSaved": "",
-	"settingsFailedToSave": "",
-	"settingsStatsCleared": "",
-	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
+	"settingsDisabled": "Inaktiv",
+	"settingsSuccessSaved": "Einstellungen erfolgreich gespeichert",
+	"settingsFailedToSave": "Fehler beim Speichern der Einstellungen",
+	"settingsStatsCleared": "Statistiken gelöscht",
+	"settingsFailedToClearStats": "Fehler beim löschen der Statistiken",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
 	"starPromptTitle": "",
 	"starPromptDescription": "",
-	"https": "",
-	"http": "",
+	"https": "HTTPS",
+	"http": "HTTP",
 	"monitor": "",
-	"aboutus": "",
-	"now": "",
-	"delete": "",
-	"configure": "",
-	"responseTime": "",
-	"ms": "",
+	"aboutus": "Über uns",
+	"now": "Jetzt",
+	"delete": "Löschen",
+	"configure": "Einstellungen",
+	"responseTime": "Antwortzeit",
+	"ms": "ms",
 	"bar": "",
 	"area": "",
-	"country": "",
-	"city": "",
-	"response": "",
+	"country": "Land",
+	"city": "Stadt",
+	"response": "Antwort",
 	"monitorStatusUp": "",
 	"monitorStatusDown": "",
 	"webhookSendSuccess": "",
@@ -67,7 +40,7 @@
 	"distributedUptimeCreateChecksDescription": "",
 	"distributedUptimeCreateIncidentNotification": "",
 	"distributedUptimeCreateIncidentDescription": "",
-	"distributedUptimeCreateAdvancedSettings": "",
+	"distributedUptimeCreateAdvancedSettings": "Erweiterte Einstellungen",
 	"distributedUptimeDetailsNoMonitorHistory": "",
 	"distributedUptimeDetailsStatusHeaderUptime": "",
 	"distributedUptimeDetailsStatusHeaderLastUpdate": "",
@@ -76,33 +49,33 @@
 		"testNotification": "",
 		"addOrEditNotifications": "",
 		"slack": {
-			"label": "",
+			"label": "Slack",
 			"description": "",
-			"webhookLabel": "",
+			"webhookLabel": "Webhook URL",
 			"webhookPlaceholder": "",
 			"webhookRequired": ""
 		},
 		"discord": {
-			"label": "",
+			"label": "Discord",
 			"description": "",
-			"webhookLabel": "",
+			"webhookLabel": "Discord Webhook URL",
 			"webhookPlaceholder": "",
 			"webhookRequired": ""
 		},
 		"telegram": {
-			"label": "",
+			"label": "Telegram",
 			"description": "",
 			"tokenLabel": "",
-			"tokenPlaceholder": "",
+			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11",
 			"chatIdLabel": "",
-			"chatIdPlaceholder": "",
+			"chatIdPlaceholder": "-1001234567890",
 			"fieldsRequired": ""
 		},
 		"webhook": {
-			"label": "",
+			"label": "Webhooks",
 			"description": "",
-			"urlLabel": "",
-			"urlPlaceholder": "",
+			"urlLabel": "Webhook URL",
+			"urlPlaceholder": "https://your-server.com/webhook",
 			"urlRequired": ""
 		},
 		"testNotificationDevelop": "",
@@ -151,14 +124,14 @@
 	"distributedUptimeStatusLogoUploadButton": "",
 	"distributedUptimeStatusStandardMonitorsHeader": "",
 	"distributedUptimeStatusStandardMonitorsDescription": "",
-	"distributedUptimeStatusCreateYour": "",
-	"distributedUptimeStatusEditYour": "",
+	"distributedUptimeStatusCreateYour": "Erstelle Dein",
+	"distributedUptimeStatusEditYour": "Ändere Dein",
 	"distributedUptimeStatusPublishedLabel": "",
-	"distributedUptimeStatusCompanyNameLabel": "",
+	"distributedUptimeStatusCompanyNameLabel": "Firmenname",
 	"distributedUptimeStatusPageAddressLabel": "",
-	"distributedUptimeStatus30Days": "",
-	"distributedUptimeStatus60Days": "",
-	"distributedUptimeStatus90Days": "",
+	"distributedUptimeStatus30Days": "30 Tage",
+	"distributedUptimeStatus60Days": "60 Tage",
+	"distributedUptimeStatus90Days": "90 Tage",
 	"distributedUptimeStatusPageNotSetUp": "",
 	"distributedUptimeStatusContactAdmin": "",
 	"distributedUptimeStatusPageNotPublic": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
 	"commonSaving": "",
 	"navControls": "",
 	"incidentsPageTitle": "",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index b3cc23dca..fe4b1fa55 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -1,29 +1,538 @@
 {
+	"submit": "Submit",
+	"title": "Title",
+	"distributedStatusHeaderText": "Real-time, real-device coverage",
+	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
+	"settingsDisabled": "Disabled",
+	"settingsSuccessSaved": "Settings saved successfully",
+	"settingsFailedToSave": "Failed to save settings",
+	"settingsStatsCleared": "Stats cleared successfully",
+	"settingsFailedToClearStats": "Failed to clear stats",
+	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
+	"settingsMonitorsDeleted": "Successfully deleted all monitors",
+	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
+	"starPromptTitle": "Star Checkmate",
+	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
+	"https": "HTTPS",
+	"http": "HTTP",
+	"monitor": "monitor",
+	"aboutus": "About Us",
+	"now": "Now",
+	"delete": "Delete",
+	"configure": "Configure",
+	"responseTime": "Response time",
+	"ms": "ms",
+	"bar": "Bar",
+	"area": "Area",
+	"country": "COUNTRY",
+	"city": "CITY",
+	"response": "RESPONSE",
+	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
+	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
+	"webhookSendSuccess": "Webhook notification sent successfully",
+	"webhookSendError": "Error sending webhook notification to {platform}",
+	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
+	"distributedRightCategoryTitle": "Monitor",
+	"distributedStatusServerMonitors": "Server Monitors",
+	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
+	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
+	"distributedUptimeCreateChecks": "Checks to perform",
+	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
+	"distributedUptimeCreateIncidentNotification": "Incident notifications",
+	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
+	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
+	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
+	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
+	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
+	"notifications": {
+		"enableNotifications": "Enable {{platform}} notifications",
+		"testNotification": "Test notification",
+		"addOrEditNotifications": "Add or edit notifications",
+		"slack": {
+			"label": "Slack",
+			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/...",
+			"webhookRequired": "Slack webhook URL is required"
+		},
+		"discord": {
+			"label": "Discord",
+			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
+			"webhookRequired": "Discord webhook URL is required"
+		},
+		"telegram": {
+			"label": "Telegram",
+			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
+			"tokenLabel": "Your bot token",
+			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11",
+			"chatIdLabel": "Your Chat ID",
+			"chatIdPlaceholder": "-1001234567890",
+			"fieldsRequired": "Telegram token and chat ID are required"
+		},
+		"webhook": {
+			"label": "Webhooks",
+			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
+			"urlLabel": "Webhook URL",
+			"urlPlaceholder": "https://your-server.com/webhook",
+			"urlRequired": "Webhook URL is required"
+		},
+		"testNotificationDevelop": "Test notification 2",
+		"integrationButton": "Notification Integration",
+		"testSuccess": "Test notification sent successfully!",
+		"testFailed": "Failed to send test notification",
+		"unsupportedType": "Unsupported notification type",
+		"networkError": "Network error occurred",
+		"fallback": {
+			"title": "notification channel",
+			"checks": [
+				"Alert teams about downtime or performance issues",
+				"Let engineers know when incidents happen",
+				"Keep administrators informed of system changes"
+			]
+		},
+		"createButton": "Create notification channel",
+		"createTitle": "Notification channel",
+		"create": {
+			"success": "Notification created successfully",
+			"failed": "Failed to create notification"
+		},
+		"fetch": {
+			"success": "Notifications fetched successfully",
+			"failed": "Failed to fetch notifications"
+		},
+		"delete": {
+			"success": "Notification deleted successfully",
+			"failed": "Failed to delete notification"
+		},
+		"edit": {
+			"success": "Notification updated successfully",
+			"failed": "Failed to update notification"
+		},
+		"test": {
+			"success": "Test notification sent successfully",
+			"failed": "Failed to send test notification"
+		}
+	},
+	"testLocale": "testLocale",
+	"add": "Add",
+	"monitors": "monitors",
+	"distributedUptimeStatusCreateStatusPage": "status page",
+	"distributedUptimeStatusCreateStatusPageAccess": "Access",
+	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
+	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
+	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"distributedUptimeStatusLogoHeader": "Logo",
+	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
+	"distributedUptimeStatusLogoUploadButton": "Upload logo",
+	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
+	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
+	"distributedUptimeStatusCreateYour": "Create your",
+	"distributedUptimeStatusEditYour": "Edit your",
+	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
+	"distributedUptimeStatusCompanyNameLabel": "Company name",
+	"distributedUptimeStatusPageAddressLabel": "Your status page address",
+	"distributedUptimeStatus30Days": "30 days",
+	"distributedUptimeStatus60Days": "60 days",
+	"distributedUptimeStatus90Days": "90 days",
+	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
+	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
+	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
+	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
+	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
+	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
+	"distributedUptimeStatusDevices": "Devices",
+	"distributedUptimeStatusUpt": "UPT",
+	"distributedUptimeStatusUptBurned": "UPT Burned",
+	"distributedUptimeStatusUptLogo": "Upt Logo",
+	"incidentsTableNoIncidents": "No incidents recorded",
+	"incidentsTablePaginationLabel": "incidents",
+	"incidentsTableMonitorName": "Monitor Name",
+	"incidentsTableStatus": "Status",
+	"incidentsTableDateTime": "Date & Time",
+	"incidentsTableStatusCode": "Status Code",
+	"incidentsTableMessage": "Message",
+	"incidentsOptionsHeader": "Incidents for:",
+	"incidentsOptionsHeaderFilterBy": "Filter by:",
+	"incidentsOptionsHeaderFilterAll": "All",
+	"incidentsOptionsHeaderFilterDown": "Down",
+	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
+	"incidentsOptionsHeaderShow": "Show:",
+	"incidentsOptionsHeaderLastHour": "Last hour",
+	"incidentsOptionsHeaderLastDay": "Last day",
+	"incidentsOptionsHeaderLastWeek": "Last week",
+	"incidentsOptionsPlaceholderAllServers": "All servers",
+	"infrastructureCreateYour": "Create your",
+	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
+	"infrastructureServerRequirement": "The server you are monitoring must be running the",
+	"infrastructureCustomizeAlerts": "Customize alerts",
+	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
+	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
+	"infrastructureProtocol": "Protocol",
+	"infrastructureServerUrlLabel": "Server URL",
+	"infrastructureDisplayNameLabel": "Display name",
+	"infrastructureAuthorizationSecretLabel": "Authorization secret",
+	"gb": "GB",
+	"mb": "MB",
+	"mem": "Mem",
+	"memoryUsage": "Memory usage",
+	"cpu": "CPU",
+	"cpuUsage": "CPU usage",
+	"cpuTemperature": "CPU Temperature",
+	"diskUsage": "Disk Usage",
+	"used": "Used",
+	"total": "Total",
+	"cores": "Cores",
+	"frequency": "Frequency",
+	"status": "Status",
+	"cpuPhysical": "CPU (Physical)",
+	"cpuLogical": "CPU (Logical)",
+	"cpuFrequency": "CPU Frequency",
+	"avgCpuTemperature": "Average CPU Temperature",
+	"memory": "Memory",
+	"disk": "Disk",
+	"uptime": "Uptime",
+	"os": "OS",
+	"host": "Host",
+	"actions": "Actions",
+	"integrations": "Integrations",
+	"integrationsPrism": "Connect Prism to your favorite service.",
+	"integrationsSlack": "Slack",
+	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
+	"integrationsDiscord": "Discord",
+	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
+	"integrationsZapier": "Zapier",
+	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
+	"commonSave": "Save",
+	"createYour": "Create your",
+	"createMonitor": "Create monitor",
+	"pause": "Pause",
+	"resume": "Resume",
+	"editing": "Editing...",
+	"url": "URL",
+	"access": "Access",
+	"timezone": "Timezone",
+	"features": "Features",
+	"administrator": "Administrator?",
+	"loginHere": "Login here",
+	"displayName": "Display name",
+	"urlMonitor": "URL to monitor",
+	"portToMonitor": "Port to monitor",
+	"websiteMonitoring": "Website monitoring",
+	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
+	"pingMonitoring": "Ping monitoring",
+	"pingMonitoringDescription": "Check whether your server is available or not.",
+	"dockerContainerMonitoring": "Docker container monitoring",
+	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
+	"portMonitoring": "Port monitoring",
+	"portMonitoringDescription": "Check whether your port is open or not.",
+	"createMaintenanceWindow": "Create maintenance window",
+	"createMaintenance": "Create maintenance",
+	"editMaintenance": "Edit maintenance",
+	"maintenanceWindowName": "Maintenance Window Name",
+	"friendlyNameInput": "Friendly name",
+	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
+	"maintenanceRepeat": "Maintenance Repeat",
+	"maintenance": "maintenance",
+	"duration": "Duration",
+	"addMonitors": "Add monitors",
+	"window": "window",
+	"cancel": "Cancel",
+	"message": "Message",
+	"low": "low",
+	"high": "high",
+	"statusCode": "Status code",
+	"date&Time": "Date & Time",
+	"type": "Type",
+	"statusPageName": "Status page name",
+	"publicURL": "Public URL",
+	"repeat": "Repeat",
+	"edit": "Edit",
+	"createA": "Create a",
+	"remove": "Remove",
+	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
+	"startTime": "Start time",
+	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
+	"monitorsToApply": "Monitors to apply maintenance window to",
+	"nextWindow": "Next window",
+	"notFoundButton": "Go to the main dashboard",
+	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
+	"monitorDisplayName": "Monitor display name",
+	"whenNewIncident": "When there is a new incident,",
+	"notifySMS": "Notify via SMS (coming soon)",
+	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
+	"seperateEmails": "You can separate multiple emails with a comma",
+	"checkFrequency": "Check frequency",
+	"matchMethod": "Match Method",
+	"expectedValue": "Expected value",
+	"deleteDialogTitle": "Do you really want to delete this monitor?",
+	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
+	"pageSpeedMonitor": "PageSpeed monitor",
+	"shown": "Shown",
+	"ago": "ago",
+	"companyName": "Company name",
+	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
+	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
+	"checkingEvery": "Checking every",
+	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
+	"basicInformation": "Basic Information",
+	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
+	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
+	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
+	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
+	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
+	"statusPageCreateTabsContent": "Status page servers",
+	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
+	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
+	"showCharts": "Show charts",
+	"showUptimePercentage": "Show uptime percentage",
+	"removeLogo": "Remove Logo",
+	"statusPageStatus": "A public status page is not set up.",
+	"statusPageStatusContactAdmin": "Please contact to your administrator",
+	"statusPageStatusNotPublic": "This status page is not public.",
+	"statusPageStatusNoPage": "There's no status page here.",
+	"statusPageStatusServiceStatus": "Service status",
+	"deleteStatusPage": "Do you want to delete this status page?",
+	"deleteStatusPageConfirm": "Yes, delete status page",
+	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
+	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
+	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
+	"uptimeCreateJsonPathQuery": "for query language documentation.",
+	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
+	"infrastructureEditYour": "Edit your",
+	"infrastructureEditMonitor": "Save Infrastructure Monitor",
+	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
+	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
+	"errorInvalidTypeId": "Invalid notification type provided",
+	"errorInvalidFieldId": "Invalid field ID provided",
+	"inviteNoTokenFound": "No invite token found",
+	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
+	"pageSpeedLearnMoreLink": "Click here",
+	"pageSpeedAddApiKey": "to add your API key.",
+	"update": "Update",
+	"invalidFileFormat": "Unsupported file format!",
+	"invalidFileSize": "File size is too large!",
 	"ClickUpload": "Click to upload",
-	"DeleteAccountButton": "Remove account",
-	"DeleteAccountTitle": "Remove account",
-	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
-	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
-	"DeleteWarningTitle": "Really remove this account?",
 	"DragandDrop": "drag and drop",
-	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
+	"MaxSize": "Maximum Size",
+	"SupportedFormats": "Supported formats",
 	"FirstName": "First name",
 	"LastName": "Last name",
-	"MaxSize": "Maximum Size",
-	"PhotoDescriptionText": "This photo will be displayed in your profile page.",
-	"SupportedFormats": "Supported formats",
+	"EmailDescriptionText": "This is your current email address — it cannot be changed.",
 	"YourPhoto": "Profile photo",
-	"aboutus": "About Us",
-	"access": "Access",
-	"actions": "Actions",
-	"add": "Add",
-	"addMonitors": "Add monitors",
-	"administrator": "Administrator?",
-	"advancedMatching": "Advanced matching",
-	"ago": "ago",
-	"area": "Area",
+	"PhotoDescriptionText": "This photo will be displayed in your profile page.",
+	"save": "Save",
+	"DeleteDescriptionText": "This will remove the account and all associated data from the server. This isn't reversible.",
+	"DeleteAccountWarning": "Removing your account means you won't be able to sign in again and all your data will be removed. This isn't reversible.",
+	"DeleteWarningTitle": "Really remove this account?",
+	"bulkImport": {
+		"title": "Bulk Import",
+		"selectFileTips": "Select CSV file to upload",
+		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
+		"selectFile": "Select File",
+		"parsingFailed": "Parsing failed",
+		"uploadSuccess": "Monitors created successfully!",
+		"validationFailed": "Validation failed",
+		"noFileSelected": "No file selected",
+		"fallbackPage": "Import a file to upload a list of servers in bulk"
+	},
+	"DeleteAccountTitle": "Remove account",
+	"DeleteAccountButton": "Remove account",
+	"publicLink": "Public link",
+	"maskedPageSpeedKeyPlaceholder": "*************************************",
+	"reset": "Reset",
+	"ignoreTLSError": "Ignore TLS/SSL error",
+	"tlsErrorIgnored": "TLS/SSL errors ignored",
+	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
+	"createNew": "Create new",
+	"greeting": {
+		"prepend": "Hey there",
+		"append": "The afternoon is your playground—let's make it epic!",
+		"overview": "Here's an overview of your {{type}} monitors."
+	},
+	"roles": {
+		"superAdmin": "Super admin",
+		"admin": "Admin",
+		"teamMember": "Team member",
+		"demoUser": "Demo user"
+	},
+	"teamPanel": {
+		"teamMembers": "Team members",
+		"filter": {
+			"all": "All",
+			"member": "Member"
+		},
+		"inviteTeamMember": "Invite a team member",
+		"inviteNewTeamMember": "Invite new team member",
+		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
+		"email": "Email",
+		"selectRole": "Select role",
+		"inviteLink": "Invite link",
+		"cancel": "Cancel",
+		"noMembers": "There are no team members with this role",
+		"getToken": "Get token",
+		"emailToken": "E-mail token",
+		"table": {
+			"name": "Name",
+			"email": "Email",
+			"role": "Role",
+			"created": "Created"
+		}
+	},
+	"monitorState": {
+		"paused": "Paused",
+		"resumed": "Resumed",
+		"active": "Active"
+	},
+	"menu": {
+		"uptime": "Uptime",
+		"pagespeed": "Pagespeed",
+		"infrastructure": "Infrastructure",
+		"incidents": "Incidents",
+		"statusPages": "Status pages",
+		"maintenance": "Maintenance",
+		"integrations": "Integrations",
+		"settings": "Settings",
+		"support": "Support",
+		"discussions": "Discussions",
+		"docs": "Docs",
+		"changelog": "Changelog",
+		"profile": "Profile",
+		"password": "Password",
+		"team": "Team",
+		"logOut": "Log out",
+		"notifications": "Notifications",
+		"logs": "Logs"
+	},
+	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
+	"state": "State",
+	"statusBreadCrumbsStatusPages": "Status Pages",
+	"statusBreadCrumbsDetails": "Details",
+	"commonSaving": "Saving...",
+	"navControls": "Controls",
+	"incidentsPageTitle": "Incidents",
+	"passwordPanel": {
+		"passwordChangedSuccess": "Your password was changed successfully.",
+		"passwordInputIncorrect": "Your password input was incorrect.",
+		"currentPassword": "Current password",
+		"enterCurrentPassword": "Enter your current password",
+		"newPassword": "New password",
+		"enterNewPassword": "Enter your new password",
+		"confirmNewPassword": "Confirm new password",
+		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
+		"saving": "Saving..."
+	},
+	"emailSent": "Email sent successfully",
+	"failedToSendEmail": "Failed to send email",
+	"settingsTestEmailSuccess": "Test email sent successfully",
+	"settingsTestEmailFailed": "Failed to send test email",
+	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
+	"settingsTestEmailUnknownError": "Unknown error",
+	"statusMsg": {
+		"paused": "Monitoring is paused.",
+		"up": "Your site is up.",
+		"down": "Your site is down.",
+		"pending": "Pending..."
+	},
+	"uptimeGeneralInstructions": {
+		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
+		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
+		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
+	},
+	"common": {
+		"appName": "Checkmate",
+		"monitoringAgentName": "Capture",
+		"buttons": {
+			"toggleTheme": "Toggles light & dark"
+		},
+		"toasts": {
+			"networkError": "Network error",
+			"checkConnection": "Please check your connection",
+			"unknownError": "Unknown error"
+		}
+	},
 	"auth": {
 		"common": {
+			"navigation": {
+				"continue": "Continue",
+				"back": "Back"
+			},
+			"inputs": {
+				"email": {
+					"label": "Email",
+					"placeholder": "jordan.ellis@domain.com",
+					"errors": {
+						"empty": "To continue, please enter your email address",
+						"invalid": "Please recheck validity of entered email address"
+					}
+				},
+				"password": {
+					"label": "Password",
+					"rules": {
+						"length": {
+							"beginning": "Must be at least",
+							"highlighted": "8 characters long"
+						},
+						"special": {
+							"beginning": "Must contain at least",
+							"highlighted": "one special character"
+						},
+						"number": {
+							"beginning": "Must contain at least",
+							"highlighted": "one number"
+						},
+						"uppercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one upper character"
+						},
+						"lowercase": {
+							"beginning": "Must contain at least",
+							"highlighted": "one lower character"
+						},
+						"match": {
+							"beginning": "Confirm password and password",
+							"highlighted": "must match"
+						}
+					},
+					"errors": {
+						"empty": "Please enter your password",
+						"length": "Password must be at least 8 characters long",
+						"uppercase": "Password must contain at least 1 uppercase letter",
+						"lowercase": "Password must contain at least 1 lowercase letter",
+						"number": "Password must contain at least 1 number",
+						"special": "Password must contain at least 1 special character",
+						"incorrect": "The password you provided does not match our records"
+					}
+				},
+				"passwordConfirm": {
+					"label": "Confirm password",
+					"placeholder": "Re-enter password to confirm",
+					"errors": {
+						"empty": "Please enter your password again for confirmation (helps with typos)",
+						"different": "Entered passwords don't match, so one of them is probably mistyped"
+					}
+				},
+				"firstName": {
+					"label": "Name",
+					"placeholder": "Jordan",
+					"errors": {
+						"empty": "Please enter your name",
+						"length": "Name must be less than 50 characters",
+						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				},
+				"lastName": {
+					"label": "Surname",
+					"placeholder": "Ellis",
+					"errors": {
+						"empty": "Please enter your surname",
+						"length": "Surname must be less than 50 characters",
+						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+					}
+				}
+			},
 			"errors": {
 				"validation": "Error validating data."
 			},
@@ -33,139 +542,40 @@
 						"incorrect": "The password you provided does not match our records"
 					}
 				}
-			},
-			"inputs": {
-				"email": {
-					"errors": {
-						"empty": "To continue, please enter your email address",
-						"invalid": "Please recheck validity of entered email address"
-					},
-					"label": "Email",
-					"placeholder": "jordan.ellis@domain.com"
-				},
-				"firstName": {
-					"errors": {
-						"empty": "Please enter your name",
-						"length": "Name must be less than 50 characters",
-						"pattern": "Name must contain only letters, spaces, apostrophes, or hyphens"
-					},
-					"label": "Name",
-					"placeholder": "Jordan"
-				},
-				"lastName": {
-					"errors": {
-						"empty": "Please enter your surname",
-						"length": "Surname must be less than 50 characters",
-						"pattern": "Surname must contain only letters, spaces, apostrophes, or hyphens"
-					},
-					"label": "Surname",
-					"placeholder": "Ellis"
-				},
-				"password": {
-					"errors": {
-						"empty": "Please enter your password",
-						"incorrect": "The password you provided does not match our records",
-						"length": "Password must be at least 8 characters long",
-						"lowercase": "Password must contain at least 1 lowercase letter",
-						"number": "Password must contain at least 1 number",
-						"special": "Password must contain at least 1 special character",
-						"uppercase": "Password must contain at least 1 uppercase letter"
-					},
-					"label": "Password",
-					"rules": {
-						"length": {
-							"beginning": "Must be at least",
-							"highlighted": "8 characters long"
-						},
-						"lowercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one lower character"
-						},
-						"match": {
-							"beginning": "Confirm password and password",
-							"highlighted": "must match"
-						},
-						"number": {
-							"beginning": "Must contain at least",
-							"highlighted": "one number"
-						},
-						"special": {
-							"beginning": "Must contain at least",
-							"highlighted": "one special character"
-						},
-						"uppercase": {
-							"beginning": "Must contain at least",
-							"highlighted": "one upper character"
-						}
-					}
-				},
-				"passwordConfirm": {
-					"errors": {
-						"different": "Entered passwords don't match, so one of them is probably mistyped",
-						"empty": "Please enter your password again for confirmation (helps with typos)"
-					},
-					"label": "Confirm password",
-					"placeholder": "Re-enter password to confirm"
-				}
-			},
-			"navigation": {
-				"back": "Back",
-				"continue": "Continue"
-			}
-		},
-		"forgotPassword": {
-			"buttons": {
-				"openEmail": "Open email app",
-				"resetPassword": "Reset password"
-			},
-			"heading": "Forgot password?",
-			"imageAlts": {
-				"email": "Email icon",
-				"lock": "Lock icon",
-				"passwordConfirm": "Password confirm icon",
-				"passwordKey": "Password key icon"
-			},
-			"links": {
-				"login": "Go back to <a>Log In</a>",
-				"resend": "Didn't receive the email? <a>Click to resend</a>"
-			},
-			"subheadings": {
-				"stepFour": "Your password has been successfully reset. Click below to log in magically.",
-				"stepOne": "No worries, we'll send you reset instructions.",
-				"stepThree": "Your new password must be different from previously used passwords.",
-				"stepTwo": "We sent a password reset link to <email/>"
-			},
-			"toasts": {
-				"emailNotFound": "Email not found.",
-				"error": "Unable to reset password. Please try again later or contact support.",
-				"redirect": "Redirecting in <seconds/>...",
-				"sent": "Instructions sent to <email/>.",
-				"success": "Your password was reset successfully."
 			}
 		},
 		"login": {
-			"errors": {
-				"password": {
-					"incorrect": "The password you provided does not match our records"
-				}
-			},
 			"heading": "Log In",
-			"links": {
-				"forgotPassword": "Forgot password?",
-				"forgotPasswordLink": "Reset password",
-				"register": "Do not have an account?",
-				"registerLink": "Register here"
-			},
 			"subheadings": {
 				"stepOne": "Enter your email",
 				"stepTwo": "Enter your password"
 			},
+			"links": {
+				"forgotPassword": "Forgot password?",
+				"register": "Do not have an account?",
+				"forgotPasswordLink": "Reset password",
+				"registerLink": "Register here"
+			},
 			"toasts": {
-				"incorrectPassword": "Incorrect password",
-				"success": "Welcome back! You're successfully logged in."
+				"success": "Welcome back! You're successfully logged in.",
+				"incorrectPassword": "Incorrect password"
+			},
+			"errors": {
+				"password": {
+					"incorrect": "The password you provided does not match our records"
+				}
 			}
 		},
 		"registration": {
+			"heading": {
+				"superAdmin": "Create super admin",
+				"user": "Sign Up"
+			},
+			"subheadings": {
+				"stepOne": "Enter your personal details",
+				"stepTwo": "Enter your email",
+				"stepThree": "Create your password"
+			},
 			"description": {
 				"superAdmin": "Create your super admin account to get started",
 				"user": "Sign up as a user and ask super admin for access to your monitors"
@@ -174,499 +584,180 @@
 				"superAdmin": "Create super admin account",
 				"user": "Sign up regular user"
 			},
-			"heading": {
-				"superAdmin": "Create super admin",
-				"user": "Sign Up"
-			},
+			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
 			"links": {
 				"login": "Already have an account? <a>Log In</a>"
 			},
-			"subheadings": {
-				"stepOne": "Enter your personal details",
-				"stepThree": "Create your password",
-				"stepTwo": "Enter your email"
-			},
-			"termsAndPolicies": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
 			"toasts": {
 				"success": "Welcome! Your account was created successfully."
 			}
+		},
+		"forgotPassword": {
+			"heading": "Forgot password?",
+			"subheadings": {
+				"stepOne": "No worries, we'll send you reset instructions.",
+				"stepTwo": "We sent a password reset link to <email/>",
+				"stepThree": "Your new password must be different from previously used passwords.",
+				"stepFour": "Your password has been successfully reset. Click below to log in magically."
+			},
+			"buttons": {
+				"openEmail": "Open email app",
+				"resetPassword": "Reset password"
+			},
+			"imageAlts": {
+				"passwordKey": "Password key icon",
+				"email": "Email icon",
+				"lock": "Lock icon",
+				"passwordConfirm": "Password confirm icon"
+			},
+			"links": {
+				"login": "Go back to <a>Log In</a>",
+				"resend": "Didn't receive the email? <a>Click to resend</a>"
+			},
+			"toasts": {
+				"sent": "Instructions sent to <email/>.",
+				"emailNotFound": "Email not found.",
+				"redirect": "Redirecting in <seconds/>...",
+				"success": "Your password was reset successfully.",
+				"error": "Unable to reset password. Please try again later or contact support."
+			}
 		}
 	},
-	"avgCpuTemperature": "Average CPU Temperature",
-	"bar": "Bar",
-	"basicInformation": "Basic Information",
-	"bulkImport": {
-		"fallbackPage": "Import a file to upload a list of servers in bulk",
-		"noFileSelected": "No file selected",
-		"parsingFailed": "Parsing failed",
-		"selectFile": "Select File",
-		"selectFileDescription": "You can download our <template>template</template> or <sample>sample</sample>",
-		"selectFileTips": "Select CSV file to upload",
-		"title": "Bulk Import",
-		"uploadSuccess": "Monitors created successfully!",
-		"validationFailed": "Validation failed"
-	},
-	"cancel": "Cancel",
-	"checkFrequency": "Check frequency",
-	"checkingEvery": "Checking every",
-	"city": "CITY",
-	"common": {
-		"appName": "Checkmate",
-		"buttons": {
-			"toggleTheme": "Toggles light & dark"
-		},
-		"monitoringAgentName": "Capture",
-		"toasts": {
-			"checkConnection": "Please check your connection",
-			"networkError": "Network error",
-			"unknownError": "Unknown error"
-		}
-	},
-	"commonSave": "Save",
-	"commonSaving": "Saving...",
-	"companyName": "Company name",
-	"configure": "Configure",
-	"cores": "Cores",
-	"country": "COUNTRY",
-	"cpu": "CPU",
-	"cpuFrequency": "CPU Frequency",
-	"cpuLogical": "CPU (Logical)",
-	"cpuPhysical": "CPU (Physical)",
-	"cpuTemperature": "CPU Temperature",
-	"cpuUsage": "CPU usage",
-	"createA": "Create a",
-	"createMaintenance": "Create maintenance",
-	"createMaintenanceWindow": "Create maintenance window",
-	"createMonitor": "Create monitor",
-	"createNew": "Create new",
-	"createNotifications": {
-		"discordSettings": {
-			"description": "Configure your Discord webhook here",
-			"title": "Discord",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		},
-		"emailSettings": {
-			"description": "Destination email addresses.",
-			"emailLabel": "Email address",
-			"emailPlaceholder": "e.g. john@example.com",
-			"title": "Email"
-		},
-		"nameSettings": {
-			"description": "A descriptive name for your integration.",
-			"nameLabel": "Name",
-			"namePlaceholder": "e.g. Slack notifications",
-			"title": "Name"
-		},
-		"pagerdutySettings": {
-			"description": "Configure your PagerDuty integration here",
-			"integrationKeyLabel": "Integration key",
-			"integrationKeyPlaceholder": "1234567890",
-			"title": "PagerDuty"
-		},
-		"slackSettings": {
-			"description": "Configure your Slack webhook here",
-			"title": "Slack",
-			"webhookLabel": "Slack webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/..."
-		},
-		"title": "Create notification channel",
-		"typeSettings": {
-			"description": "Select the type of notification channel you want to create.",
-			"title": "Type",
-			"typeLabel": "Type"
-		},
-		"webhookSettings": {
-			"description": "Configure your webhook here",
-			"title": "Webhook",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://your-server.com/webhook"
-		}
-	},
-	"createYour": "Create your",
-	"date&Time": "Date & Time",
-	"delete": "Delete",
-	"deleteDialogDescription": "Once deleted, this monitor cannot be retrieved.",
-	"deleteDialogTitle": "Do you really want to delete this monitor?",
-	"deleteStatusPage": "Do you want to delete this status page?",
-	"deleteStatusPageConfirm": "Yes, delete status page",
-	"deleteStatusPageDescription": "Once deleted, your status page cannot be retrieved.",
-	"disk": "Disk",
-	"diskUsage": "Disk Usage",
-	"displayName": "Display name",
-	"distributedRightCategoryTitle": "Monitor",
-	"distributedStatusHeaderText": "Real-time, real-device coverage",
-	"distributedStatusServerMonitors": "Server Monitors",
-	"distributedStatusServerMonitorsDescription": "Monitor status of related servers",
-	"distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
-	"distributedUptimeCreateAdvancedSettings": "Advanced settings",
-	"distributedUptimeCreateChecks": "Checks to perform",
-	"distributedUptimeCreateChecksDescription": "You can always add or remove checks after adding your site.",
-	"distributedUptimeCreateIncidentDescription": "When there is an incident, notify users.",
-	"distributedUptimeCreateIncidentNotification": "Incident notifications",
-	"distributedUptimeCreateSelectURL": "Here you can select the URL of the host, together with the type of monitor.",
-	"distributedUptimeDetailsNoMonitorHistory": "There is no check history for this monitor yet.",
-	"distributedUptimeDetailsStatusHeaderLastUpdate": "Last updated",
-	"distributedUptimeDetailsStatusHeaderUptime": "Uptime:",
-	"distributedUptimeStatus30Days": "30 days",
-	"distributedUptimeStatus60Days": "60 days",
-	"distributedUptimeStatus90Days": "90 days",
-	"distributedUptimeStatusBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"distributedUptimeStatusBasicInfoHeader": "Basic Information",
-	"distributedUptimeStatusCompanyNameLabel": "Company name",
-	"distributedUptimeStatusContactAdmin": "Please contact your administrator",
-	"distributedUptimeStatusCreateStatusPage": "status page",
-	"distributedUptimeStatusCreateStatusPageAccess": "Access",
-	"distributedUptimeStatusCreateStatusPageReady": "If your status page is ready, you can mark it as published.",
-	"distributedUptimeStatusCreateYour": "Create your",
-	"distributedUptimeStatusDevices": "Devices",
-	"distributedUptimeStatusEditYour": "Edit your",
-	"distributedUptimeStatusLogoDescription": "Upload a logo for your status page",
-	"distributedUptimeStatusLogoHeader": "Logo",
-	"distributedUptimeStatusLogoUploadButton": "Upload logo",
-	"distributedUptimeStatusPageAddressLabel": "Your status page address",
-	"distributedUptimeStatusPageDeleteConfirm": "Yes, delete status page",
-	"distributedUptimeStatusPageDeleteDescription": "Once deleted, your status page cannot be retrieved.",
-	"distributedUptimeStatusPageDeleteDialog": "Do you want to delete this status page?",
-	"distributedUptimeStatusPageNotPublic": "This status page is not public.",
-	"distributedUptimeStatusPageNotSetUp": "A status page is not set up.",
-	"distributedUptimeStatusPublishedLabel": "Published and visible to the public",
-	"distributedUptimeStatusStandardMonitorsDescription": "Attach standard monitors to your status page.",
-	"distributedUptimeStatusStandardMonitorsHeader": "Standard Monitors",
-	"distributedUptimeStatusUpt": "UPT",
-	"distributedUptimeStatusUptBurned": "UPT Burned",
-	"distributedUptimeStatusUptLogo": "Upt Logo",
-	"dockerContainerMonitoring": "Docker container monitoring",
-	"dockerContainerMonitoringDescription": "Check whether your Docker container is running or not.",
-	"duration": "Duration",
-	"edit": "Edit",
-	"editMaintenance": "Edit maintenance",
-	"editing": "Editing...",
-	"emailSent": "Email sent successfully",
-	"errorInvalidFieldId": "Invalid field ID provided",
-	"errorInvalidTypeId": "Invalid notification type provided",
 	"errorPages": {
 		"serverUnreachable": {
+			"toasts": {
+				"reconnected": "Successfully reconnected to the server.",
+				"stillUnreachable": "Server is still unreachable. Please try again later."
+			},
 			"alertBox": "Server Connection Error",
 			"description": "We're unable to connect to the server. Please check your internet connection or verify your deployment configuration if the problem persists.",
 			"retryButton": {
 				"default": "Retry connection",
 				"processing": "Connecting..."
-			},
-			"toasts": {
-				"reconnected": "Successfully reconnected to the server.",
-				"stillUnreachable": "Server is still unreachable. Please try again later."
 			}
 		}
 	},
-	"expectedValue": "Expected value",
-	"export": {
-		"failed": "Failed to export monitors",
-		"success": "Monitors exported successfully!",
-		"title": "Export Monitors"
+	"createNotifications": {
+		"title": "Create notification channel",
+		"nameSettings": {
+			"title": "Name",
+			"description": "A descriptive name for your integration.",
+			"nameLabel": "Name",
+			"namePlaceholder": "e.g. Slack notifications"
+		},
+		"typeSettings": {
+			"title": "Type",
+			"description": "Select the type of notification channel you want to create.",
+			"typeLabel": "Type"
+		},
+		"emailSettings": {
+			"title": "Email",
+			"description": "Destination email addresses.",
+			"emailLabel": "Email address",
+			"emailPlaceholder": "e.g. john@example.com"
+		},
+		"slackSettings": {
+			"title": "Slack",
+			"description": "Configure your Slack webhook here",
+			"webhookLabel": "Slack webhook URL",
+			"webhookPlaceholder": "https://hooks.slack.com/services/..."
+		},
+		"pagerdutySettings": {
+			"title": "PagerDuty",
+			"description": "Configure your PagerDuty integration here",
+			"integrationKeyLabel": "Integration key",
+			"integrationKeyPlaceholder": "1234567890"
+		},
+		"discordSettings": {
+			"title": "Discord",
+			"description": "Configure your Discord webhook here",
+			"webhookLabel": "Discord Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		},
+		"webhookSettings": {
+			"title": "Webhook",
+			"description": "Configure your webhook here",
+			"webhookLabel": "Webhook URL",
+			"webhookPlaceholder": "https://your-server.com/webhook"
+		}
 	},
-	"failedToSendEmail": "Failed to send email",
-	"features": "Features",
-	"frequency": "Frequency",
-	"friendlyNameInput": "Friendly name",
-	"friendlyNamePlaceholder": "Maintenance at __ : __ for ___ minutes",
-	"gb": "GB",
-	"greeting": {
-		"append": "The afternoon is your playground—let's make it epic!",
-		"overview": "Here's an overview of your {{type}} monitors.",
-		"prepend": "Hey there"
+	"notificationConfig": {
+		"title": "Notifications",
+		"description": "Select the notifications channels you want to use"
 	},
-	"high": "high",
-	"host": "Host",
-	"http": "HTTP",
-	"https": "HTTPS",
-	"ignoreTLSError": "Ignore TLS/SSL error",
-	"ignoreTLSErrorDescription": "Ignore TLS/SSL errors and continue checking the website's availability",
-	"incidentsOptionsHeader": "Incidents for:",
-	"incidentsOptionsHeaderFilterAll": "All",
-	"incidentsOptionsHeaderFilterBy": "Filter by:",
-	"incidentsOptionsHeaderFilterCannotResolve": "Cannot resolve",
-	"incidentsOptionsHeaderFilterDown": "Down",
-	"incidentsOptionsHeaderLastDay": "Last day",
-	"incidentsOptionsHeaderLastHour": "Last hour",
-	"incidentsOptionsHeaderLastWeek": "Last week",
-	"incidentsOptionsHeaderShow": "Show:",
-	"incidentsOptionsPlaceholderAllServers": "All servers",
-	"incidentsPageTitle": "Incidents",
-	"incidentsTableDateTime": "Date & Time",
-	"incidentsTableMessage": "Message",
-	"incidentsTableMonitorName": "Monitor Name",
-	"incidentsTableNoIncidents": "No incidents recorded",
-	"incidentsTablePaginationLabel": "incidents",
-	"incidentsTableStatus": "Status",
-	"incidentsTableStatusCode": "Status Code",
-	"infrastructureAlertNotificationDescription": "Send a notification to user(s) when thresholds exceed a specified percentage.",
-	"infrastructureAuthorizationSecretLabel": "Authorization secret",
-	"infrastructureCreateGeneralSettingsDescription": "Here you can select the URL of the host, together with the friendly name and authorization secret to connect to the server agent.",
-	"infrastructureCreateMonitor": "Create Infrastructure Monitor",
-	"infrastructureCreateYour": "Create your",
-	"infrastructureCustomizeAlerts": "Customize alerts",
-	"infrastructureDisplayNameLabel": "Display name",
-	"infrastructureEditMonitor": "Save Infrastructure Monitor",
-	"infrastructureEditYour": "Edit your",
-	"infrastructureMonitorCreated": "Infrastructure monitor created successfully!",
-	"infrastructureMonitorUpdated": "Infrastructure monitor updated successfully!",
-	"infrastructureProtocol": "Protocol",
-	"infrastructureServerRequirement": "The server you are monitoring must be running the",
-	"infrastructureServerUrlLabel": "Server URL",
-	"integrations": "Integrations",
-	"integrationsDiscord": "Discord",
-	"integrationsDiscordInfo": "Connect with Discord and view incidents directly in a channel",
-	"integrationsPrism": "Connect Prism to your favorite service.",
-	"integrationsSlack": "Slack",
-	"integrationsSlackInfo": "Connect with Slack and see incidents in a channel",
-	"integrationsZapier": "Zapier",
-	"integrationsZapierInfo": "Send all incidents to Zapier, and then see them everywhere",
-	"invalidFileFormat": "Unsupported file format!",
-	"invalidFileSize": "File size is too large!",
-	"inviteNoTokenFound": "No invite token found",
-	"loginHere": "Login here",
+	"monitorStatus": {
+		"checkingEvery": "Checking every {{interval}}",
+		"withCaptureAgent": "with Capture agent {{version}}",
+		"up": "up",
+		"down": "down",
+		"paused": "paused"
+	},
+	"advancedMatching": "Advanced matching",
+	"sendTestNotifications": "Send test notifications",
+	"selectAll": "Select all",
+	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
 	"logsPage": {
+		"title": "Logs",
 		"description": "This page shows the latest 1000 lines of logs from the Checkmate server",
+		"tabs": {
+			"queue": "Job queue",
+			"logs": "Server logs"
+		},
+		"toast": {
+			"fetchLogsSuccess": "Logs fetched successfully"
+		},
 		"logLevelSelect": {
 			"title": "Log level",
 			"values": {
 				"all": "All",
-				"debug": "Debug",
-				"error": "Error",
 				"info": "Info",
-				"warn": "Warn"
+				"warn": "Warn",
+				"error": "Error",
+				"debug": "Debug"
 			}
-		},
-		"tabs": {
-			"logs": "Server logs",
-			"queue": "Job queue"
-		},
-		"title": "Logs",
-		"toast": {
-			"fetchLogsSuccess": "Logs fetched successfully"
 		}
 	},
-	"low": "low",
-	"maintenance": "maintenance",
-	"maintenanceRepeat": "Maintenance Repeat",
-	"maintenanceTableActionMenuDialogTitle": "Do you really want to remove this maintenance window?",
-	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
-	"maintenanceWindowName": "Maintenance Window Name",
-	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"matchMethod": "Match Method",
-	"mb": "MB",
-	"mem": "Mem",
-	"memory": "Memory",
-	"memoryUsage": "Memory usage",
-	"menu": {
-		"changelog": "Changelog",
-		"discussions": "Discussions",
-		"docs": "Docs",
-		"incidents": "Incidents",
-		"infrastructure": "Infrastructure",
-		"integrations": "Integrations",
-		"logOut": "Log out",
-		"logs": "Logs",
-		"maintenance": "Maintenance",
-		"notifications": "Notifications",
-		"pagespeed": "Pagespeed",
-		"password": "Password",
-		"profile": "Profile",
-		"settings": "Settings",
-		"statusPages": "Status pages",
-		"support": "Support",
-		"team": "Team",
-		"uptime": "Uptime"
-	},
-	"message": "Message",
-	"monitor": "monitor",
-	"monitorActions": {
-		"export": "Export Monitors",
-		"import": "Import Monitors",
-		"title": "Export/Import"
-	},
-	"monitorDisplayName": "Monitor display name",
-	"monitorState": {
-		"active": "Active",
-		"paused": "Paused",
-		"resumed": "Resumed"
-	},
-	"monitorStatus": {
-		"checkingEvery": "Checking every {{interval}}",
-		"down": "down",
-		"paused": "paused",
-		"up": "up",
-		"withCaptureAgent": "with Capture agent {{version}}"
-	},
-	"monitorStatusDown": "Monitor {name} ({url}) is DOWN and not responding",
-	"monitorStatusUp": "Monitor {name} ({url}) is now UP and responding",
-	"monitors": "monitors",
-	"monitorsToApply": "Monitors to apply maintenance window to",
-	"ms": "ms",
-	"navControls": "Controls",
-	"nextWindow": "Next window",
-	"notFoundButton": "Go to the main dashboard",
-	"notificationConfig": {
-		"description": "Select the notifications channels you want to use",
-		"title": "Notifications"
-	},
-	"notifications": {
-		"addOrEditNotifications": "Add or edit notifications",
-		"create": {
-			"failed": "Failed to create notification",
-			"success": "Notification created successfully"
-		},
-		"createButton": "Create notification channel",
-		"createTitle": "Notification channel",
-		"delete": {
-			"failed": "Failed to delete notification",
-			"success": "Notification deleted successfully"
-		},
-		"discord": {
-			"description": "To send data to a Discord channel from Checkmate via Discord notifications using webhooks, you can use Discord's incoming Webhooks feature.",
-			"label": "Discord",
-			"webhookLabel": "Discord Webhook URL",
-			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
-			"webhookRequired": "Discord webhook URL is required"
-		},
-		"edit": {
-			"failed": "Failed to update notification",
-			"success": "Notification updated successfully"
-		},
-		"enableNotifications": "Enable {{platform}} notifications",
-		"fallback": {
-			"checks": [
-				"Alert teams about downtime or performance issues",
-				"Let engineers know when incidents happen",
-				"Keep administrators informed of system changes"
-			],
-			"title": "notification channel"
-		},
-		"fetch": {
-			"failed": "Failed to fetch notifications",
-			"success": "Notifications fetched successfully"
-		},
-		"integrationButton": "Notification Integration",
-		"networkError": "Network error occurred",
-		"slack": {
-			"description": "To enable Slack notifications, create a Slack app and enable incoming webhooks. After that, simply provide the webhook URL here.",
-			"label": "Slack",
-			"webhookLabel": "Webhook URL",
-			"webhookPlaceholder": "https://hooks.slack.com/services/...",
-			"webhookRequired": "Slack webhook URL is required"
-		},
-		"telegram": {
-			"chatIdLabel": "Your Chat ID",
-			"chatIdPlaceholder": "-1001234567890",
-			"description": "To enable Telegram notifications, create a Telegram bot using BotFather, an official bot for creating and managing Telegram bots. Then, get the API token and chat ID and write them down here.",
-			"fieldsRequired": "Telegram token and chat ID are required",
-			"label": "Telegram",
-			"tokenLabel": "Your bot token",
-			"tokenPlaceholder": "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"
-		},
-		"test": {
-			"failed": "Failed to send test notification",
-			"success": "Test notification sent successfully"
-		},
-		"testFailed": "Failed to send test notification",
-		"testNotification": "Test notification",
-		"testNotificationDevelop": "Test notification 2",
-		"testSuccess": "Test notification sent successfully!",
-		"unsupportedType": "Unsupported notification type",
-		"webhook": {
-			"description": "You can set up a custom webhook to receive notifications when incidents occur.",
-			"label": "Webhooks",
-			"urlLabel": "Webhook URL",
-			"urlPlaceholder": "https://your-server.com/webhook",
-			"urlRequired": "Webhook URL is required"
-		}
-	},
-	"notifyEmails": "Also notify via email to multiple addresses (coming soon)",
-	"notifySMS": "Notify via SMS (coming soon)",
-	"now": "Now",
-	"os": "OS",
-	"pageSpeedAddApiKey": "to add your API key.",
-	"pageSpeedConfigureSettingsDescription": "Here you can select the URL of the host, together with the type of monitor.",
-	"pageSpeedDetailsPerformanceReport": "Values are estimated and may vary.",
-	"pageSpeedDetailsPerformanceReportCalculator": "See calculator",
-	"pageSpeedLearnMoreLink": "Click here",
-	"pageSpeedMonitor": "PageSpeed monitor",
-	"pageSpeedWarning": "Warning: You haven't added a Google PageSpeed API key yet. Without it, the PageSpeed monitor won't function.",
-	"passwordPanel": {
-		"confirmNewPassword": "Confirm new password",
-		"currentPassword": "Current password",
-		"enterCurrentPassword": "Enter your current password",
-		"enterNewPassword": "Enter your new password",
-		"newPassword": "New password",
-		"passwordChangedSuccess": "Your password was changed successfully.",
-		"passwordInputIncorrect": "Your password input was incorrect.",
-		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
-		"saving": "Saving..."
-	},
-	"pause": "Pause",
-	"pingMonitoring": "Ping monitoring",
-	"pingMonitoringDescription": "Check whether your server is available or not.",
-	"portMonitoring": "Port monitoring",
-	"portMonitoringDescription": "Check whether your port is open or not.",
-	"portToMonitor": "Port to monitor",
-	"publicLink": "Public link",
-	"publicURL": "Public URL",
 	"queuePage": {
-		"failedJobTable": {
-			"failCountHeader": "Fail count",
-			"failReasonHeader": "Fail reason",
-			"failedAtHeader": "Last failed at",
-			"monitorIdHeader": "Monitor ID",
-			"monitorUrlHeader": "Monitor URL",
-			"title": "Failed jobs"
-		},
+		"title": "Queue",
+		"refreshButton": "Refresh",
 		"flushButton": "Flush queue",
 		"jobTable": {
-			"activeHeader": "Active",
-			"failCountHeader": "Fail count",
+			"title": "Jobs currently in queue",
 			"idHeader": "Monitor ID",
-			"lastFinishedAtHeader": "Last finished at",
-			"lastRunHeader": "Last run at",
-			"lastRunTookHeader": "Last run took",
+			"urlHeader": "URL",
+			"typeHeader": "Type",
+			"activeHeader": "Active",
 			"lockedAtHeader": "Locked at",
 			"runCountHeader": "Run count",
-			"title": "Jobs currently in queue",
-			"typeHeader": "Type",
-			"urlHeader": "URL"
+			"failCountHeader": "Fail count",
+			"lastRunHeader": "Last run at",
+			"lastFinishedAtHeader": "Last finished at",
+			"lastRunTookHeader": "Last run took"
 		},
 		"metricsTable": {
-			"metricHeader": "Metric",
 			"title": "Queue metrics",
+			"metricHeader": "Metric",
 			"valueHeader": "Value"
 		},
-		"refreshButton": "Refresh",
-		"title": "Queue"
+		"failedJobTable": {
+			"title": "Failed jobs",
+			"monitorIdHeader": "Monitor ID",
+			"monitorUrlHeader": "Monitor URL",
+			"failCountHeader": "Fail count",
+			"failedAtHeader": "Last failed at",
+			"failReasonHeader": "Fail reason"
+		}
 	},
-	"remove": "Remove",
-	"removeLogo": "Remove Logo",
-	"repeat": "Repeat",
-	"reset": "Reset",
-	"response": "RESPONSE",
-	"responseTime": "Response time",
-	"resume": "Resume",
-	"roles": {
-		"admin": "Admin",
-		"demoUser": "Demo user",
-		"superAdmin": "Super admin",
-		"teamMember": "Team member"
+	"export": {
+		"title": "Export Monitors",
+		"success": "Monitors exported successfully!",
+		"failed": "Failed to export monitors"
+	},
+	"monitorActions": {
+		"title": "Export/Import",
+		"import": "Import Monitors",
+		"export": "Export Monitors"
 	},
-	"save": "Save",
-	"selectAll": "Select all",
-	"sendTestNotifications": "Send test notifications",
-	"seperateEmails": "You can separate multiple emails with a comma",
-	"settingsDisabled": "Disabled",
-	"settingsEmailUser": "Email user - Username for authentication, overrides email address if specified",
-	"settingsFailedToAddDemoMonitors": "Failed to add demo monitors",
-	"settingsFailedToClearStats": "Failed to clear stats",
-	"settingsFailedToDeleteMonitors": "Failed to delete all monitors",
-	"settingsFailedToSave": "Failed to save settings",
-	"settingsMonitorsDeleted": "Successfully deleted all monitors",
 	"settingsPage": {
 		"aboutSettings": {
 			"labelDevelopedBy": "Developed by Bluewave Labs",
@@ -744,96 +835,5 @@
 			"selectEnabled": "Enabled",
 			"title": "Monitor IP/URL on Status Page"
 		}
-	},
-	"settingsStatsCleared": "Stats cleared successfully",
-	"settingsSuccessSaved": "Settings saved successfully",
-	"settingsTestEmailFailed": "Failed to send test email",
-	"settingsTestEmailFailedWithReason": "Failed to send test email: {{reason}}",
-	"settingsTestEmailSuccess": "Test email sent successfully",
-	"settingsTestEmailUnknownError": "Unknown error",
-	"showAdminLoginLink": "Show \"Administrator? Login Here\" link on the status page",
-	"showCharts": "Show charts",
-	"showUptimePercentage": "Show uptime percentage",
-	"shown": "Shown",
-	"starPromptDescription": "See the latest releases and help grow the community on GitHub",
-	"starPromptTitle": "Star Checkmate",
-	"startTime": "Start time",
-	"state": "State",
-	"status": "Status",
-	"statusBreadCrumbsDetails": "Details",
-	"statusBreadCrumbsStatusPages": "Status Pages",
-	"statusCode": "Status code",
-	"statusMsg": {
-		"down": "Your site is down.",
-		"paused": "Monitoring is paused.",
-		"pending": "Pending...",
-		"up": "Your site is up."
-	},
-	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
-	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
-	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
-	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
-	"statusPageCreateSettings": "If your status page is ready, you can mark it as published.",
-	"statusPageCreateSettingsCheckboxLabel": "Published and visible to the public",
-	"statusPageCreateTabsContent": "Status page servers",
-	"statusPageCreateTabsContentDescription": "You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience.",
-	"statusPageCreateTabsContentFeaturesDescription": "Show more details on the status page",
-	"statusPageName": "Status page name",
-	"statusPageStatus": "A public status page is not set up.",
-	"statusPageStatusContactAdmin": "Please contact to your administrator",
-	"statusPageStatusNoPage": "There's no status page here.",
-	"statusPageStatusNotPublic": "This status page is not public.",
-	"statusPageStatusServiceStatus": "Service status",
-	"submit": "Submit",
-	"teamPanel": {
-		"cancel": "Cancel",
-		"email": "Email",
-		"emailToken": "E-mail token",
-		"filter": {
-			"all": "All",
-			"member": "Member"
-		},
-		"getToken": "Get token",
-		"inviteDescription": "When you add a new team member, they will get access to all monitors.",
-		"inviteLink": "Invite link",
-		"inviteNewTeamMember": "Invite new team member",
-		"inviteTeamMember": "Invite a team member",
-		"noMembers": "There are no team members with this role",
-		"selectRole": "Select role",
-		"table": {
-			"created": "Created",
-			"email": "Email",
-			"name": "Name",
-			"role": "Role"
-		},
-		"teamMembers": "Team members"
-	},
-	"testLocale": "testLocale",
-	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
-	"timezone": "Timezone",
-	"title": "Title",
-	"tlsErrorIgnored": "TLS/SSL errors ignored",
-	"total": "Total",
-	"type": "Type",
-	"update": "Update",
-	"uptime": "Uptime",
-	"uptimeCreate": "The expected value is used to match against response result, and the match determines the status.",
-	"uptimeCreateJsonPath": "This expression will be evaluated against the reponse JSON data and the result will be used to match against the expected value. See",
-	"uptimeCreateJsonPathQuery": "for query language documentation.",
-	"uptimeGeneralInstructions": {
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
-		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
-		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard."
-	},
-	"url": "URL",
-	"urlMonitor": "URL to monitor",
-	"used": "Used",
-	"webhookSendError": "Error sending webhook notification to {platform}",
-	"webhookSendSuccess": "Webhook notification sent successfully",
-	"webhookUnsupportedPlatform": "Unsupported platform: {platform}",
-	"websiteMonitoring": "Website monitoring",
-	"websiteMonitoringDescription": "Use HTTP(s) to monitor your website or API endpoint.",
-	"whenNewIncident": "When there is a new incident,",
-	"window": "window"
+	}
 }
diff --git a/client/src/locales/es.json b/client/src/locales/es.json
index 3579117ae..4cbd91336 100644
--- a/client/src/locales/es.json
+++ b/client/src/locales/es.json
@@ -3,38 +3,11 @@
 	"title": "Titulo",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "",
-	"settingsDisplayTimezone": "",
-	"settingsDisplayTimezoneDescription": "",
-	"settingsAppearance": "",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "",
-	"settingsEnabled": "",
 	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
 	"settingsSuccessSaved": "",
 	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
 	"commonSaving": "",
 	"navControls": "",
 	"incidentsPageTitle": "",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/fi.json b/client/src/locales/fi.json
index d92fcf8db..1783f8a07 100644
--- a/client/src/locales/fi.json
+++ b/client/src/locales/fi.json
@@ -3,38 +3,11 @@
 	"title": "Otsikko",
 	"distributedStatusHeaderText": "Reaaliaikainen kattavuus oikeilla laitteilla",
 	"distributedStatusSubHeaderText": "Miljoonien laitteiden voimin ympäri maailman näet järjestelmän suorituskyvyn maailman alueittain, maittain tai kaupungeittain",
-	"settingsGeneralSettings": "Yleiset asetukset",
-	"settingsDisplayTimezone": "Näytä aikavyöhyke",
-	"settingsDisplayTimezoneDescription": "Valitse sovelluksessa käytettävä aikavyöhyke päivämäärien ja aikojen näyttämiseen.",
-	"settingsAppearance": "Ulkonäkö",
-	"settingsAppearanceDescription": "Vaihda teema vaaleaksi tai tummaksi tai vaihda käyttöliittymän kieli",
-	"settingsThemeMode": "Teematila",
-	"settingsLanguage": "Kieli",
-	"settingsEnabled": "Käytössä",
 	"settingsDisabled": "Poistettu käytöstä",
-	"settingsHistoryAndMonitoring": "Valvonnan historia",
-	"settingsHistoryAndMonitoringDescription": "Määritä, kuinka pitkään haluat säilyttää historiallisia tietoja. Voit myös tyhjentää kaikki olemassa olevat tiedot.",
-	"settingsTTLLabel": "Kuinka monta päivää haluat säilyttää valvontahistorian.",
-	"settingsTTLOptionalLabel": "0 on ääretön",
-	"settingsClearAllStats": "Tyhjennä kaikki tilastot. Tämä on peruuttamaton.",
-	"settingsClearAllStatsButton": "Tyhjennä kaikki tilastot",
-	"settingsClearAllStatsDialogTitle": "Haluatko tyhjentää kaikki tilastot?",
-	"settingsClearAllStatsDialogDescription": "Kun valvontahistoria ja tilastot on poistettu, niitä ei voi palauttaa.",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "Tietoja",
-	"settingsDevelopedBy": "Kehittänyt Bluewave Labs.",
-	"settingsSave": "Tallenna",
 	"settingsSuccessSaved": "",
 	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "Ei valittua tiedostoa",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "Järjestelmän palautus",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Poista tili",
 	"DeleteAccountButton": "Poista tili",
 	"publicLink": "Julkinen linkki",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API-avain",
-	"pageSpeedApiKeyFieldLabel": "PageSpeed API-avain",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "Palauta",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "Salasana",
 		"team": "Tiimi",
 		"logOut": "Kirjaudu ulos",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "Sähköpostiasetukset",
-	"settingsEmailDescription": "Määritä sähköpostiasetukset",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "Sähköpostin portti - Portti johon yhdistetään",
-	"settingsEmailAddress": "Sähköpostiosoite - Käytetään tunnistautumiseen",
-	"settingsEmailPassword": "Sähköpostin salasana - Salasana tunnistautumiseen",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "Salasana on asetettu. Paina Palauta vaihtaaksesi sen.",
 	"state": "Tila",
 	"statusBreadCrumbsStatusPages": "Tilasivut",
 	"statusBreadCrumbsDetails": "Tiedot",
-	"settingsThemeModeLight": "Vaalea",
-	"settingsThemeModeDark": "Tumma",
-	"settingsClearAllStatsDialogCancel": "Peruuta",
 	"commonSaving": "Tallennetaan...",
 	"navControls": "Ohjaimet",
 	"incidentsPageTitle": "Häiriöt",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "Uuden salasanan on oltava vähintään 8 merkkiä pitkä ja sen on sisältävä vähintään yksi iso kirjain, yksi pieni kirjain, yksi numero sekä yksi erikoismerkki.",
 		"saving": "Tallennetaan..."
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "Sähköpostin lähetys onnistui",
 	"failedToSendEmail": "Sähköpostin lähetys epäonnistui",
-	"settingsTestEmail": "Lähetä testi sähköposti",
 	"settingsTestEmailSuccess": "Testisähköpostin lähetys onnistui",
 	"settingsTestEmailFailed": "Testisähköpostin lähetys epäonnistui",
 	"settingsTestEmailFailedWithReason": "Testisähköpostin lähetys epäonnistui: {{reason}}",
 	"settingsTestEmailUnknownError": "Tuntematon virhe",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "Valvonta on keskeytetty.",
 		"up": "Sivusi on ylhäällä.",
 		"down": "Sivusi on alhaalla.",
 		"pending": "Odottaa..."
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 729296216..5aabeb6e3 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -3,38 +3,11 @@
 	"title": "Titre",
 	"distributedStatusHeaderText": "",
 	"distributedStatusSubHeaderText": "",
-	"settingsGeneralSettings": "Paramètres généraux",
-	"settingsDisplayTimezone": "Fuseau horaire d'affichage",
-	"settingsDisplayTimezoneDescription": "Le fuseau horaire du tableau de bord que vous affichez publiquement.",
-	"settingsAppearance": "Apparence",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "",
-	"settingsLanguage": "Langue",
-	"settingsEnabled": "Activé",
 	"settingsDisabled": "Désactivé",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "0 pour infini",
-	"settingsClearAllStats": "Effacer les stats. C'est irréversible.",
-	"settingsClearAllStatsButton": "Effacer les stats",
-	"settingsClearAllStatsDialogTitle": "Voulez-vous effacer toutes les stats ?",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "Oui, effacer les stats",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
 	"settingsSuccessSaved": "",
 	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "Supprimer le compte",
 	"DeleteAccountButton": "Supprimer le compte",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "Déconnexion",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "Email",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "Clair",
-	"settingsThemeModeDark": "Sombre",
-	"settingsClearAllStatsDialogCancel": "Annuler",
 	"commonSaving": "Sauvegarde...",
 	"navControls": "",
 	"incidentsPageTitle": "Incidents",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "Le nouveau mot de passe doit contenir au moins 8 caractères et au moins une lettre majuscule, une lettre minuscule, un chiffre et un caractère spécial.",
 		"saving": "Sauvegarde..."
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "Erreur inconnue",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json
index fa6197bb3..37604b53b 100644
--- a/client/src/locales/pt-BR.json
+++ b/client/src/locales/pt-BR.json
@@ -3,38 +3,11 @@
 	"title": "Título",
 	"distributedStatusHeaderText": "Cobertura em tempo real e em dispositivos reais",
 	"distributedStatusSubHeaderText": "Impulsionado por milhões de dispositivos em todo o mundo, visualize o desempenho do sistema por região global, país ou cidade",
-	"settingsGeneralSettings": "Configurações gerais",
-	"settingsDisplayTimezone": "Fuso horário",
-	"settingsDisplayTimezoneDescription": "Selecione o fuso horário usado para exibir datas e horas em todo o aplicativo.",
-	"settingsAppearance": "Aparência",
-	"settingsAppearanceDescription": "Alterne entre o modo claro e escuro ou altere o idioma da interface do usuário",
-	"settingsThemeMode": "Tema",
-	"settingsLanguage": "Linguagem",
-	"settingsEnabled": "Habilitado",
 	"settingsDisabled": "Desabilitado",
-	"settingsHistoryAndMonitoring": "Histórico de monitoramento",
-	"settingsHistoryAndMonitoringDescription": "Defina por quanto tempo você deseja manter os dados de histórico. Você também pode limpar todos os dados existentes.",
-	"settingsTTLLabel": "Os dias em que você deseja manter os dados de histórico.",
-	"settingsTTLOptionalLabel": "0 para infinito",
-	"settingsClearAllStats": "Limpe todas as estatísticas. Isso é irreversível.",
-	"settingsClearAllStatsButton": "Limpar todas as estatísticas",
-	"settingsClearAllStatsDialogTitle": "Você quer limpar todas as estatísticas?",
-	"settingsClearAllStatsDialogDescription": "Uma vez limpo, o histórico de monitoramento e as estatísticas não podem ser recuperados.",
-	"settingsClearAllStatsDialogConfirm": "Sim, limpar todas as estatísticas",
-	"settingsDemoMonitors": "Monitores de demonstração",
-	"settingsDemoMonitorsDescription": "Adicione monitores de genéricos para fins de demonstração.",
-	"settingsAddDemoMonitorsButton": "Adicionar monitores de demonstração",
-	"settingsRemoveAllMonitorsButton": "Remover todos os monitores",
-	"settingsRemoveAllMonitorsDialogTitle": "Você deseja remover todos os monitores?",
-	"settingsRemoveAllMonitorsDialogConfirm": "Sim, remova todos os monitores",
-	"settingsAbout": "Sobre",
-	"settingsDevelopedBy": "Desenvolvido pela Bluewave Labs.",
-	"settingsSave": "Salvar",
 	"settingsSuccessSaved": "Configurações salvas com sucesso",
 	"settingsFailedToSave": "Falha ao salvar as configurações",
 	"settingsStatsCleared": "Estatísticas limpas com sucesso",
 	"settingsFailedToClearStats": "Falha ao limpar estatísticas",
-	"settingsDemoMonitorsAdded": "Monitores de demonstração adicionados com sucesso",
 	"settingsFailedToAddDemoMonitors": "Falha ao adicionar monitores de demonstração",
 	"settingsMonitorsDeleted": "Todos os monitores foram excluídos com sucesso",
 	"settingsFailedToDeleteMonitors": "Falha ao excluir todos os monitores",
@@ -310,7 +283,6 @@
 	"statusPageCreateTabsContentFeaturesDescription": "Mostrar mais detalhes na página de status",
 	"showCharts": "Mostrar gráficos",
 	"showUptimePercentage": "Mostrar porcentagem de Uptime",
-	"showAdminLoginLink": "Mostrar o link \"Administrador? Efetue login aqui\" na página de status",
 	"removeLogo": "Remover logo",
 	"statusPageStatus": "Uma página de status pública não está configurada.",
 	"statusPageStatusContactAdmin": "Entre em contato com seu administrador",
@@ -361,16 +333,10 @@
 		"noFileSelected": "Nenhum arquivo selecionado",
 		"fallbackPage": "Importe um arquivo para enviar uma lista de servidores em massa"
 	},
-	"settingsSystemReset": "Resetar sistema",
-	"settingsSystemResetDescription": "Remova todos os monitores do seu sistema.",
 	"DeleteAccountTitle": "Remover conta",
 	"DeleteAccountButton": "Remover conta",
 	"publicLink": "Link publico",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API key",
-	"pageSpeedApiKeyFieldLabel": "PageSpeed API key",
-	"pageSpeedApiKeyFieldDescription": "Insira sua chave da API do Google PageSpeed ​​para ativar o monitoramento de velocidade de página. Clique em Resetar para atualizar a chave.",
-	"pageSpeedApiKeyFieldResetLabel": "A chave de API está definida. Clique em Resetar para alterá-la.",
 	"reset": "Resetar",
 	"ignoreTLSError": "Ignorar erro TLS/SSL",
 	"tlsErrorIgnored": "Erros TLS/SSL ignorados",
@@ -432,22 +398,13 @@
 		"password": "Senha",
 		"team": "Equipe",
 		"logOut": "Sair",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "E-mail",
-	"settingsEmailDescription": "Configurações de e-mail do seu sistema. Elas são usadas para enviar notificações e alertas.",
-	"settingsEmailHost": "Host de e-mail - Nome do host ou endereço IP do servidor SMTP",
-	"settingsEmailPort": "Porta de e-mail - Porta para conectar",
-	"settingsEmailAddress": "Endereço de e-mail - Usado para autenticação",
-	"settingsEmailPassword": "Senha de e-mail - Senha para autenticação",
 	"settingsEmailUser": "Usuário de e-mail - Nome de usuário para autenticação, substitui o endereço de e-mail, se especificado",
-	"settingsEmailFieldResetLabel": "A senha foi definida. Clique em Redefinir para alterá-la.",
 	"state": "Estado",
 	"statusBreadCrumbsStatusPages": "Pagina de status",
 	"statusBreadCrumbsDetails": "Detalhes",
-	"settingsThemeModeLight": "Claro",
-	"settingsThemeModeDark": "Escuro",
-	"settingsClearAllStatsDialogCancel": "Cancelar",
 	"commonSaving": "Salvando...",
 	"navControls": "Controles",
 	"incidentsPageTitle": "Incidentes",
@@ -462,26 +419,18 @@
 		"passwordRequirements": "A nova senha deve conter pelo menos 8 caracteres e deve ter pelo menos uma letra maiúscula, uma letra minúscula, um número e um caractere especial.",
 		"saving": "Salvando..."
 	},
-	"settingsEmailConnectionHost": "Host de conexão de e-mail - Nome do host a ser usado na saudação HELO/EHLO",
 	"emailSent": "E-mail enviado com sucesso",
 	"failedToSendEmail": "Falha ao enviar e-mail",
-	"settingsTestEmail": "Enviar e-mail de teste",
 	"settingsTestEmailSuccess": "E-mail de teste enviado com sucesso",
 	"settingsTestEmailFailed": "Falha ao enviar e-mail de teste",
 	"settingsTestEmailFailedWithReason": "Falha ao enviar e-mail de teste: {{reason}}",
 	"settingsTestEmailUnknownError": "Erro desconhecido",
-	"settingsEmailRequiredFields": "O host e a porta do e-mail são obrigatórios",
 	"statusMsg": {
 		"paused": "O monitoramento está pausado.",
 		"up": "Seu site está no ar.",
 		"down": "Seu site está fora do ar.",
 		"pending": "Pendente..."
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -740,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 908bc73e7..a4ec3290f 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -3,38 +3,11 @@
 	"title": "Название",
 	"distributedStatusHeaderText": "Охват реального времени и реального устройства",
 	"distributedStatusSubHeaderText": "Работает на миллионах устройств по всему миру, просматривайте производительность системы по глобальному региону, стране или городу",
-	"settingsGeneralSettings": "Общие настройки",
-	"settingsDisplayTimezone": "Отображать часовой пояс",
-	"settingsDisplayTimezoneDescription": "Часовой пояс панели мониторинга, которую вы публично отображаете.",
-	"settingsAppearance": "Внешний вид",
-	"settingsAppearanceDescription": "Переключение между светлым и темным режимом или изменение языка пользовательского интерфейса",
-	"settingsThemeMode": "Тема",
-	"settingsLanguage": "Язык",
-	"settingsEnabled": "Включено",
 	"settingsDisabled": "Выключено",
-	"settingsHistoryAndMonitoring": "История и мониторинг",
-	"settingsHistoryAndMonitoringDescription": "Определите здесь, как долго вы хотите хранить данные. Вы также можете удалить все прошлые данные.",
-	"settingsTTLLabel": "Дни, за которыми вы хотите следить.",
-	"settingsTTLOptionalLabel": "0 для бесконечности",
-	"settingsClearAllStats": "Очистить всю статистику. Это необратимо.",
-	"settingsClearAllStatsButton": "Очистить всю статистику",
-	"settingsClearAllStatsDialogTitle": "Хотите очистить всю статистику?",
-	"settingsClearAllStatsDialogDescription": "После удаления ваши мониторы не могут быть восстановлены.",
-	"settingsClearAllStatsDialogConfirm": "Да, очистить всю статистику",
-	"settingsDemoMonitors": "Демо мониторы",
-	"settingsDemoMonitorsDescription": "Здесь вы можете добавлять и удалять демонстрационные мониторы.",
-	"settingsAddDemoMonitorsButton": "Добавьте демонстрационные мониторы",
-	"settingsRemoveAllMonitorsButton": "Удалить все демонстрационные мониторы",
-	"settingsRemoveAllMonitorsDialogTitle": "Хотите удалить все мониторы?",
-	"settingsRemoveAllMonitorsDialogConfirm": "Да, очистить все мониторы",
-	"settingsAbout": "О",
-	"settingsDevelopedBy": "Developed by Bluewave Labs.",
-	"settingsSave": "Сохранить",
 	"settingsSuccessSaved": "Настройки успешно сохранены",
 	"settingsFailedToSave": "Не удалось сохранить настройки",
 	"settingsStatsCleared": "Статистика успешно очищена",
 	"settingsFailedToClearStats": "Не удалось очистить статистику",
-	"settingsDemoMonitorsAdded": "Успешно добавлены демонстрационные мониторы",
 	"settingsFailedToAddDemoMonitors": "Не удалось добавить демонстрационные мониторы",
 	"settingsMonitorsDeleted": "Успешно удалены все мониторы",
 	"settingsFailedToDeleteMonitors": "Не удалось удалить все мониторы",
@@ -360,16 +333,10 @@
 		"noFileSelected": "Файл не выбран",
 		"fallbackPage": "Импортируйте файл для массовой загрузки списка серверов"
 	},
-	"settingsSystemReset": "Сброс системы",
-	"settingsSystemResetDescription": "Удалите все мониторы из вашей системы.",
 	"DeleteAccountTitle": "Удалить аккаунт",
 	"DeleteAccountButton": "Удалить аккаунт",
 	"publicLink": "Публичная ссылка",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Ключ API Google PageSpeed",
-	"pageSpeedApiKeyFieldLabel": "Ключ API PageSpeed",
-	"pageSpeedApiKeyFieldDescription": "Введите свой API-ключ Google PageSpeed, чтобы включить мониторинг скорости страницы. Нажмите \"Сброс\", чтобы обновить ключ.",
-	"pageSpeedApiKeyFieldResetLabel": "Установлен ключ API. Нажмите \"Сброс\", чтобы изменить его.",
 	"reset": "Сброс",
 	"ignoreTLSError": "Игнорировать ошибку TLS/SSL",
 	"tlsErrorIgnored": "Ошибки TLS/SSL игнорируются",
@@ -431,22 +398,13 @@
 		"password": "Пароль",
 		"team": "Команда",
 		"logOut": "Выйти",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "Настройки Email",
-	"settingsEmailDescription": "Настройка параметров email",
-	"settingsEmailHost": "Email host",
-	"settingsEmailPort": "Email port",
-	"settingsEmailAddress": "Email address",
-	"settingsEmailPassword": "Email пароль",
 	"settingsEmailUser": "Email пользователь",
-	"settingsEmailFieldResetLabel": "Пароль установлен. Нажмите \"Сброс\", чтобы изменить его.",
 	"state": "Состояние",
 	"statusBreadCrumbsStatusPages": "Страницы статуса",
 	"statusBreadCrumbsDetails": "Подробности",
-	"settingsThemeModeLight": "Светлая",
-	"settingsThemeModeDark": "Тёмная",
-	"settingsClearAllStatsDialogCancel": "Отменить",
 	"commonSaving": "Сохранение...",
 	"navControls": "Управления",
 	"incidentsPageTitle": "Инциденты",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "Новый пароль должен содержать не менее 8 символов и содержать как минимум одну заглавную букву, одну строчную букву, одну цифру и один специальный символ.",
 		"saving": "Сохранение..."
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index c9e224d63..e9b8f0850 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -3,38 +3,11 @@
 	"title": "Başlık",
 	"distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
 	"distributedStatusSubHeaderText": "Dünya çapında milyonlarca cihaz tarafından desteklenen sistem performansını küresel bölgeye, ülkeye veya şehre göre görüntüleyin",
-	"settingsGeneralSettings": "Genel ayarlar",
-	"settingsDisplayTimezone": "Görüntüleme saat dilimi",
-	"settingsDisplayTimezoneDescription": "Herkese açık olarak görüntülediğiniz kontrol panelinin saat dilimi.",
-	"settingsAppearance": "Görünüm",
-	"settingsAppearanceDescription": "Açık ve koyu mod arasında geçiş yapın veya kullanıcı arayüzü dilini değiştirin",
-	"settingsThemeMode": "Tema",
-	"settingsLanguage": "Dil",
-	"settingsEnabled": "Etkin",
 	"settingsDisabled": "Devre dışı",
-	"settingsHistoryAndMonitoring": "Geçmiş ve izleme",
-	"settingsHistoryAndMonitoringDescription": "Verileri ne kadar süreyle saklamak istediğinizi burada tanımlayın. Ayrıca tüm geçmiş verileri kaldırabilirsiniz.",
-	"settingsTTLLabel": "İzleme geçmişini saklamak istediğiniz gün sayısı.",
-	"settingsTTLOptionalLabel": "Sınırsız için 0",
-	"settingsClearAllStats": "Tüm istatistikleri temizle. Bu geri alınamaz.",
-	"settingsClearAllStatsButton": "Tüm istatistikleri temizle",
-	"settingsClearAllStatsDialogTitle": "Tüm istatistikleri temizlemek istiyor musunuz?",
-	"settingsClearAllStatsDialogDescription": "Silindikten sonra, monitörleriniz geri alınamaz.",
-	"settingsClearAllStatsDialogConfirm": "Evet, tüm istatistikleri temizle",
-	"settingsDemoMonitors": "Demo monitörler",
-	"settingsDemoMonitorsDescription": "Burada demo monitörler ekleyebilir ve kaldırabilirsiniz.",
-	"settingsAddDemoMonitorsButton": "Demo monitörler ekle",
-	"settingsRemoveAllMonitorsButton": "Tüm monitörleri kaldır",
-	"settingsRemoveAllMonitorsDialogTitle": "Tüm monitörleri kaldırmak istiyor musunuz?",
-	"settingsRemoveAllMonitorsDialogConfirm": "Evet, tüm monitörleri temizle",
-	"settingsAbout": "Hakkında",
-	"settingsDevelopedBy": "Bluewave Labs tarafından geliştirilmiştir.",
-	"settingsSave": "Kaydet",
 	"settingsSuccessSaved": "Ayarlar başarıyla kaydedildi",
 	"settingsFailedToSave": "Ayarlar kaydedilemedi",
 	"settingsStatsCleared": "İstatistikler başarıyla temizlendi",
 	"settingsFailedToClearStats": "İstatistikler temizlenemedi",
-	"settingsDemoMonitorsAdded": "Demo monitörler başarıyla eklendi",
 	"settingsFailedToAddDemoMonitors": "Demo monitörler eklenemedi",
 	"settingsMonitorsDeleted": "Tüm monitörler başarıyla silindi",
 	"settingsFailedToDeleteMonitors": "Monitörler silinemedi",
@@ -360,16 +333,10 @@
 		"noFileSelected": "Hiçbir dosya seçilmedi",
 		"fallbackPage": "Toplu olarak sunucu listesini yüklemek için bir dosyayı içe aktarın"
 	},
-	"settingsSystemReset": "Sistem sıfırla",
-	"settingsSystemResetDescription": "Sistemdeki tüm monitörleri silin",
 	"DeleteAccountTitle": "Hesabı sil",
 	"DeleteAccountButton": "Hesabı sil",
 	"publicLink": "Herkese açık bağlantı",
 	"maskedPageSpeedKeyPlaceholder": "*************************************",
-	"pageSpeedApiKeyFieldTitle": "Google PageSpeed API anahtarı",
-	"pageSpeedApiKeyFieldLabel": "PageSpeed API anahtarı",
-	"pageSpeedApiKeyFieldDescription": "Sayfa hızı izlemeyi etkinleştirmek için Google PageSpeed API anahtarınızı girin. Anahtarı güncellemek için Sıfırla'ya tıklayın.",
-	"pageSpeedApiKeyFieldResetLabel": "API anahtarı ayarlandı. Değiştirmek için Sıfırla'ya tıklayın.",
 	"reset": "Sıfırla",
 	"ignoreTLSError": "TLS/SSL hatalarını gözardı et",
 	"tlsErrorIgnored": "TLS/SSL hataları gözardı ediliyor",
@@ -431,22 +398,13 @@
 		"password": "Parola",
 		"team": "Ekip",
 		"logOut": "Çıkış yap",
-		"notifications": "Bildirimler"
+		"notifications": "Bildirimler",
+		"logs": ""
 	},
-	"settingsEmail": "Eposta",
-	"settingsEmailDescription": "Sistem için eposta ayarlarını düzenleyin. Bu işlem eposta üzerinden bildirim ve alarm almak için gereklidir.",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "E-posta şifresi - Kimlik doğrulama şifresi.",
 	"settingsEmailUser": "E-posta kullanıcısı – Kimlik doğrulama için kullanıcı adı; belirtilirse e-posta adresinin yerine geçer.",
-	"settingsEmailFieldResetLabel": "Şifre ayarlandı. Değiştirmek için \"Sıfırla\"ya tıklayın.",
 	"state": "Durum",
 	"statusBreadCrumbsStatusPages": "Durum sayfası",
 	"statusBreadCrumbsDetails": "Detaylar",
-	"settingsThemeModeLight": "Aydınlat",
-	"settingsThemeModeDark": "Karart",
-	"settingsClearAllStatsDialogCancel": "İptal",
 	"commonSaving": "Kaydediliyor.",
 	"navControls": "Kontroller",
 	"incidentsPageTitle": "Olaylar",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "Yeni şifreniz en az 8 karakterden oluşmalı ve en az bir büyük harf, bir küçük harf, bir rakam ve bir özel karakter içermelidir.",
 		"saving": "Kaydediliyor..."
 	},
-	"settingsEmailConnectionHost": "E-posta bağlantı ana bilgisayarı - HELO/EHLO selamlamasında kullanılacak ana bilgisayar adı",
 	"emailSent": "E-posta başarı ile gönderildi.",
 	"failedToSendEmail": "E-posta gönderimi başarısız.",
-	"settingsTestEmail": "Test  E-postası gönder.",
 	"settingsTestEmailSuccess": "Test E-postası başarı ile gönderildi.",
 	"settingsTestEmailFailed": "Test E-postası gönderimi başarısız.",
 	"settingsTestEmailFailedWithReason": "Test E-postası gönderimi başarısız: {{reason}}",
 	"settingsTestEmailUnknownError": "Bilinmeyen hata.",
-	"settingsEmailRequiredFields": "E-posta sunucusu ve portu gereklidir.",
 	"statusMsg": {
 		"paused": "İzleme duraklatıldı.",
 		"up": "Siteniz yayında.",
 		"down": "Siteniz kapalı.",
 		"pending": "Sırada.."
 	},
-	"settingsURLTitle": "Durum Sayfasında IP/URL'yi İzle",
-	"settingsURLDescription": "Genel Durum sayfasında monitörün IP adresini veya URL'sini görüntüleyin. Devre dışı bırakılırsa, hassas bilgileri korumak için yalnızca monitör adı gösterilecektir.",
-	"settingsURLSelectTitle": "Durum sayfasında IP/URL'yi görüntüle",
-	"settingsURLEnabled": "Etkinleştirilmiş",
-	"settingURLDisabled": "Devre dışı bırakılmış",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": "beklemede"
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "Güvenli - SSL kullan",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "Bildirimleri dene",
-	"selectAll": "Tümünü seç"
+	"selectAll": "Tümünü seç",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }
diff --git a/client/src/locales/zh-TW.json b/client/src/locales/zh-TW.json
index 9dfd6effb..21f53a7bf 100644
--- a/client/src/locales/zh-TW.json
+++ b/client/src/locales/zh-TW.json
@@ -3,38 +3,11 @@
 	"title": "名稱",
 	"distributedStatusHeaderText": "實時、真實設備覆蓋",
 	"distributedStatusSubHeaderText": "由全球數百萬個設備提供支持，您可以按全球區域、國家或城市查看系統效能",
-	"settingsGeneralSettings": "一般設定",
-	"settingsDisplayTimezone": "顯示時區",
-	"settingsDisplayTimezoneDescription": "您公開顯示的儀表板的時區。",
-	"settingsAppearance": "外觀",
-	"settingsAppearanceDescription": "",
-	"settingsThemeMode": "主題",
-	"settingsLanguage": "語言",
-	"settingsEnabled": "啟動",
 	"settingsDisabled": "",
-	"settingsHistoryAndMonitoring": "",
-	"settingsHistoryAndMonitoringDescription": "",
-	"settingsTTLLabel": "",
-	"settingsTTLOptionalLabel": "",
-	"settingsClearAllStats": "",
-	"settingsClearAllStatsButton": "",
-	"settingsClearAllStatsDialogTitle": "",
-	"settingsClearAllStatsDialogDescription": "",
-	"settingsClearAllStatsDialogConfirm": "",
-	"settingsDemoMonitors": "",
-	"settingsDemoMonitorsDescription": "",
-	"settingsAddDemoMonitorsButton": "",
-	"settingsRemoveAllMonitorsButton": "",
-	"settingsRemoveAllMonitorsDialogTitle": "",
-	"settingsRemoveAllMonitorsDialogConfirm": "",
-	"settingsAbout": "",
-	"settingsDevelopedBy": "",
-	"settingsSave": "",
 	"settingsSuccessSaved": "",
 	"settingsFailedToSave": "",
 	"settingsStatsCleared": "",
 	"settingsFailedToClearStats": "",
-	"settingsDemoMonitorsAdded": "",
 	"settingsFailedToAddDemoMonitors": "",
 	"settingsMonitorsDeleted": "",
 	"settingsFailedToDeleteMonitors": "",
@@ -360,16 +333,10 @@
 		"noFileSelected": "",
 		"fallbackPage": ""
 	},
-	"settingsSystemReset": "",
-	"settingsSystemResetDescription": "",
 	"DeleteAccountTitle": "",
 	"DeleteAccountButton": "",
 	"publicLink": "",
 	"maskedPageSpeedKeyPlaceholder": "",
-	"pageSpeedApiKeyFieldTitle": "",
-	"pageSpeedApiKeyFieldLabel": "",
-	"pageSpeedApiKeyFieldDescription": "",
-	"pageSpeedApiKeyFieldResetLabel": "",
 	"reset": "",
 	"ignoreTLSError": "",
 	"tlsErrorIgnored": "",
@@ -431,22 +398,13 @@
 		"password": "",
 		"team": "",
 		"logOut": "",
-		"notifications": ""
+		"notifications": "",
+		"logs": ""
 	},
-	"settingsEmail": "",
-	"settingsEmailDescription": "",
-	"settingsEmailHost": "",
-	"settingsEmailPort": "",
-	"settingsEmailAddress": "",
-	"settingsEmailPassword": "",
 	"settingsEmailUser": "",
-	"settingsEmailFieldResetLabel": "",
 	"state": "",
 	"statusBreadCrumbsStatusPages": "",
 	"statusBreadCrumbsDetails": "",
-	"settingsThemeModeLight": "",
-	"settingsThemeModeDark": "",
-	"settingsClearAllStatsDialogCancel": "",
 	"commonSaving": "",
 	"navControls": "",
 	"incidentsPageTitle": "",
@@ -461,26 +419,18 @@
 		"passwordRequirements": "",
 		"saving": ""
 	},
-	"settingsEmailConnectionHost": "",
 	"emailSent": "",
 	"failedToSendEmail": "",
-	"settingsTestEmail": "",
 	"settingsTestEmailSuccess": "",
 	"settingsTestEmailFailed": "",
 	"settingsTestEmailFailedWithReason": "",
 	"settingsTestEmailUnknownError": "",
-	"settingsEmailRequiredFields": "",
 	"statusMsg": {
 		"paused": "",
 		"up": "",
 		"down": "",
 		"pending": ""
 	},
-	"settingsURLTitle": "",
-	"settingsURLDescription": "",
-	"settingsURLSelectTitle": "",
-	"settingsURLEnabled": "",
-	"settingURLDisabled": "",
 	"uptimeGeneralInstructions": {
 		"http": "",
 		"ping": "",
@@ -739,12 +689,147 @@
 		"paused": ""
 	},
 	"advancedMatching": "",
-	"settingsEmailTLSServername": "",
-	"settingsEmailIgnoreTLS": "",
-	"settingsEmailRequireTLS": "",
-	"settingsEmailRejectUnauthorized": "",
-	"settingsEmailSecure": "",
-	"settingsEmailPool": "",
 	"sendTestNotifications": "",
-	"selectAll": ""
+	"selectAll": "",
+	"showAdminLoginLink": "",
+	"logsPage": {
+		"title": "",
+		"description": "",
+		"tabs": {
+			"queue": "",
+			"logs": ""
+		},
+		"toast": {
+			"fetchLogsSuccess": ""
+		},
+		"logLevelSelect": {
+			"title": "",
+			"values": {
+				"all": "",
+				"info": "",
+				"warn": "",
+				"error": "",
+				"debug": ""
+			}
+		}
+	},
+	"queuePage": {
+		"title": "",
+		"refreshButton": "",
+		"flushButton": "",
+		"jobTable": {
+			"title": "",
+			"idHeader": "",
+			"urlHeader": "",
+			"typeHeader": "",
+			"activeHeader": "",
+			"lockedAtHeader": "",
+			"runCountHeader": "",
+			"failCountHeader": "",
+			"lastRunHeader": "",
+			"lastFinishedAtHeader": "",
+			"lastRunTookHeader": ""
+		},
+		"metricsTable": {
+			"title": "",
+			"metricHeader": "",
+			"valueHeader": ""
+		},
+		"failedJobTable": {
+			"title": "",
+			"monitorIdHeader": "",
+			"monitorUrlHeader": "",
+			"failCountHeader": "",
+			"failedAtHeader": "",
+			"failReasonHeader": ""
+		}
+	},
+	"export": {
+		"title": "",
+		"success": "",
+		"failed": ""
+	},
+	"monitorActions": {
+		"title": "",
+		"import": "",
+		"export": ""
+	},
+	"settingsPage": {
+		"aboutSettings": {
+			"labelDevelopedBy": "",
+			"labelVersion": "",
+			"title": ""
+		},
+		"demoMonitorsSettings": {
+			"buttonAddMonitors": "",
+			"description": "",
+			"title": ""
+		},
+		"emailSettings": {
+			"buttonSendTestEmail": "",
+			"description": "",
+			"descriptionTransport": "",
+			"labelAddress": "",
+			"labelConnectionHost": "",
+			"labelHost": "",
+			"labelIgnoreTLS": "",
+			"labelPassword": "",
+			"labelPasswordSet": "",
+			"labelPool": "",
+			"labelPort": "",
+			"labelRejectUnauthorized": "",
+			"labelRequireTLS": "",
+			"labelSecure": "",
+			"labelTLSServername": "",
+			"labelUser": "",
+			"linkTransport": "",
+			"placeholderUser": "",
+			"title": ""
+		},
+		"pageSpeedSettings": {
+			"description": "",
+			"labelApiKeySet": "",
+			"labelApiKey": "",
+			"title": ""
+		},
+		"saveButtonLabel": "",
+		"statsSettings": {
+			"clearAllStatsButton": "",
+			"clearAllStatsDescription": "",
+			"clearAllStatsDialogConfirm": "",
+			"clearAllStatsDialogDescription": "",
+			"clearAllStatsDialogTitle": "",
+			"description": "",
+			"labelTTL": "",
+			"labelTTLOptional": "",
+			"title": ""
+		},
+		"systemResetSettings": {
+			"buttonRemoveAllMonitors": "",
+			"description": "",
+			"dialogConfirm": "",
+			"dialogDescription": "",
+			"dialogTitle": "",
+			"title": ""
+		},
+		"timezoneSettings": {
+			"description": "",
+			"label": "",
+			"title": ""
+		},
+		"title": "",
+		"uiSettings": {
+			"description": "",
+			"labelLanguage": "",
+			"labelTheme": "",
+			"title": ""
+		},
+		"urlSettings": {
+			"description": "",
+			"label": "",
+			"selectDisabled": "",
+			"selectEnabled": "",
+			"title": ""
+		}
+	}
 }

From 8606b5e5ded9715a278146534ca06d6c9a37280c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 11:39:05 +0800
Subject: [PATCH 314/319] donwgrade mongo functoins

---
 server/db/mongo/modules/checkModule.js        |  4 ++--
 server/db/mongo/modules/diagnosticModule.js   |  2 +-
 server/db/mongo/modules/monitorModule.js      |  8 +++----
 .../db/mongo/modules/monitorModuleQueries.js  | 21 ++++++++++++-------
 server/db/mongo/modules/statusPageModule.js   | 18 ++++------------
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/server/db/mongo/modules/checkModule.js b/server/db/mongo/modules/checkModule.js
index f409fd3d2..a53384d1a 100755
--- a/server/db/mongo/modules/checkModule.js
+++ b/server/db/mongo/modules/checkModule.js
@@ -73,7 +73,7 @@ const getChecksByMonitor = async ({
 		rowsPerPage = parseInt(rowsPerPage);
 		// Match
 		const matchStage = {
-			monitorId: ObjectId.createFromHexString(monitorId),
+			monitorId: new ObjectId(monitorId),
 			...(typeof status !== "undefined" && { status }),
 			...(dateRangeLookup[dateRange] && {
 				createdAt: {
@@ -161,7 +161,7 @@ const getChecksByTeam = async ({
 		page = parseInt(page);
 		rowsPerPage = parseInt(rowsPerPage);
 		const matchStage = {
-			teamId: ObjectId.createFromHexString(teamId),
+			teamId: new ObjectId(teamId),
 			status: false,
 			...(dateRangeLookup[dateRange] && {
 				createdAt: {
diff --git a/server/db/mongo/modules/diagnosticModule.js b/server/db/mongo/modules/diagnosticModule.js
index 7a51ad193..e59830518 100755
--- a/server/db/mongo/modules/diagnosticModule.js
+++ b/server/db/mongo/modules/diagnosticModule.js
@@ -19,7 +19,7 @@ const getMonitorsByTeamIdExecutionStats = async (req) => {
 			order = "asc";
 		}
 		// Build match stage
-		const matchStage = { teamId: ObjectId.createFromHexString(req.params.teamId) };
+		const matchStage = { teamId: new ObjectId(req.params.teamId) };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
 		}
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
index 32ed8b146..bc31915c2 100755
--- a/server/db/mongo/modules/monitorModule.js
+++ b/server/db/mongo/modules/monitorModule.js
@@ -523,7 +523,7 @@ const getMonitorsByTeamId = async ({
 		order = "asc";
 	}
 	// Build match stage
-	const matchStage = { teamId: ObjectId.createFromHexString(teamId) };
+	const matchStage = { teamId: new ObjectId(teamId) };
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
@@ -563,8 +563,7 @@ const getMonitorsByTeamId = async ({
 
 const getMonitorsAndSummaryByTeamId = async ({ type, explain, teamId }) => {
 	try {
-		const parsedTeamId = ObjectId.createFromHexString(teamId);
-		const matchStage = { teamId: parsedTeamId };
+		const matchStage = { teamId: new ObjectId(teamId) };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
 		}
@@ -606,9 +605,8 @@ const getMonitorsWithChecksByTeamId = async ({
 			field = "name";
 			order = "asc";
 		}
-		const parsedTeamId = ObjectId.createFromHexString(teamId);
 		// Build match stage
-		const matchStage = { teamId: parsedTeamId };
+		const matchStage = { teamId: new ObjectId(teamId) };
 		if (type !== undefined) {
 			matchStage.type = Array.isArray(type) ? { $in: type } : type;
 		}
diff --git a/server/db/mongo/modules/monitorModuleQueries.js b/server/db/mongo/modules/monitorModuleQueries.js
index 35ddb8478..ab45eebb6 100755
--- a/server/db/mongo/modules/monitorModuleQueries.js
+++ b/server/db/mongo/modules/monitorModuleQueries.js
@@ -4,7 +4,7 @@ const buildUptimeDetailsPipeline = (monitorId, dates, dateString) => {
 	return [
 		{
 			$match: {
-				monitorId: ObjectId.createFromHexString(monitorId),
+				monitorId: new ObjectId(monitorId),
 				createdAt: { $gte: dates.start, $lte: dates.end },
 			},
 		},
@@ -407,6 +407,16 @@ const buildHardwareDetailsPipeline = (monitor, dates, dateString) => {
 				],
 			},
 		},
+		{ $unwind: "$checks" },
+		{ $sort: { "checks._id": 1 } },
+		{
+			$group: {
+				_id: "$_id",
+				checks: { $push: "$checks" },
+				aggregateData: { $first: "$aggregateData" },
+				upChecks: { $first: "$upChecks" },
+			},
+		},
 		{
 			$project: {
 				aggregateData: {
@@ -415,12 +425,7 @@ const buildHardwareDetailsPipeline = (monitor, dates, dateString) => {
 				upChecks: {
 					$arrayElemAt: ["$upChecks", 0],
 				},
-				checks: {
-					$sortArray: {
-						input: "$checks",
-						sortBy: { _id: 1 },
-					},
-				},
+				checks: 1,
 			},
 		},
 	];
@@ -734,7 +739,7 @@ const buildGetMonitorsByTeamIdPipeline = (req) => {
 		order = "asc";
 	}
 	// Build the match stage
-	const matchStage = { teamId: ObjectId.createFromHexString(req.params.teamId) };
+	const matchStage = { teamId: new ObjectId(req.params.teamId) };
 	if (type !== undefined) {
 		matchStage.type = Array.isArray(type) ? { $in: type } : type;
 	}
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index e94ffbd55..f0f2fa762 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -134,6 +134,9 @@ const getStatusPage = async (url) => {
 					},
 				},
 			},
+			{ $match: { "monitors.orderIndex": { $ne: -1 } } },
+			{ $sort: { "monitors.orderIndex": 1 } },
+
 			{
 				$group: {
 					_id: "$_id",
@@ -156,20 +159,7 @@ const getStatusPage = async (url) => {
 						showAdminLoginLink: 1,
 						url: 1,
 					},
-					monitors: {
-						$filter: {
-							input: {
-								$sortArray: {
-									input: "$monitors",
-									sortBy: { orderIndex: 1 },
-								},
-							},
-							as: "monitor",
-							cond: {
-								$ne: ["$$monitor.orderIndex", -1],
-							},
-						},
-					},
+					monitors: 1,
 				},
 			},
 		]);

From b03f9513526b10aba3f0ef15e10231860c512e2f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 11:56:04 +0800
Subject: [PATCH 315/319] version fix

---
 .github/workflows/deploy-images.yml     | 10 ++++++++++
 .github/workflows/production-deploy.yml |  4 ++++
 .github/workflows/staging-deploy.yml    |  4 ++++
 client/vite.config.js                   | 15 ++++++++-------
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-images.yml b/.github/workflows/deploy-images.yml
index d3d70b90b..ccc2104bc 100644
--- a/.github/workflows/deploy-images.yml
+++ b/.github/workflows/deploy-images.yml
@@ -18,12 +18,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
       - name: Build Client Docker image
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate-client:latest \
             -f ./docker/dist/client.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push Client Docker image
@@ -96,6 +100,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
       - name: Build and push multi-arch Docker image
         uses: docker/build-push-action@v5
         with:
@@ -107,6 +115,8 @@ jobs:
           platforms: linux/amd64,linux/arm64
           labels: |
             org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ env.VERSION }}
 
   docker-build-and-push-server-mono:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/production-deploy.yml b/.github/workflows/production-deploy.yml
index 6956f5caa..4275b4a00 100644
--- a/.github/workflows/production-deploy.yml
+++ b/.github/workflows/production-deploy.yml
@@ -18,12 +18,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
       - name: Build Client Docker image
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate:frontend-demo \
             -f ./docker/prod/client.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push Client Docker image
diff --git a/.github/workflows/staging-deploy.yml b/.github/workflows/staging-deploy.yml
index 34fa243c6..de0dbfed4 100644
--- a/.github/workflows/staging-deploy.yml
+++ b/.github/workflows/staging-deploy.yml
@@ -18,12 +18,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
       - name: Build Client Docker image
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate:frontend-staging \
             -f ./docker/staging/client.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push Client Docker image
diff --git a/client/vite.config.js b/client/vite.config.js
index 96151c0b3..e930a20e9 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -5,13 +5,14 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version;
-	try {
-		version =
-			env.VITE_APP_VERSION ||
-			execSync("git describe --tags --abbrev=0").toString().trim();
-	} catch (error) {
-		version = "unknown";
+	let version = env.VITE_APP_VERSION;
+
+	if (!version) {
+		try {
+			version = execSync("git describe --tags --abbrev=0").toString().trim();
+		} catch {
+			version = "unknown";
+		}
 	}
 
 	return {

From 4fa0e085748b60c389edaaebc37693247c937e1c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 12:07:12 +0800
Subject: [PATCH 316/319] update workflows

---
 .github/workflows/deploy-images-on-release.yml | 10 ++++++++++
 .github/workflows/deploy-images.yml            | 11 +++++++++++
 .github/workflows/production-deploy.yml        |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/.github/workflows/deploy-images-on-release.yml b/.github/workflows/deploy-images-on-release.yml
index f1d0dd7ce..cf06f7840 100644
--- a/.github/workflows/deploy-images-on-release.yml
+++ b/.github/workflows/deploy-images-on-release.yml
@@ -11,6 +11,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
       - name: Extract version from tag
         id: extract_tag
         run: echo "version=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
@@ -93,6 +96,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -119,12 +124,16 @@ jobs:
           platforms: linux/amd64,linux/arm64
           labels: |
             org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate
+          build-args: |
+            VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }}
 
   docker-build-and-push-server-mono:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Extract version
         id: extract_tag
@@ -143,6 +152,7 @@ jobs:
             -t ghcr.io/bluewave-labs/checkmate-backend-mono:${{ steps.extract_tag.outputs.version }} \
             -f ./docker/dist-mono/server.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ steps.extract_tag.outputs.version }} \
             .
 
       - name: Push Server Docker image
diff --git a/.github/workflows/deploy-images.yml b/.github/workflows/deploy-images.yml
index ccc2104bc..fa39fed85 100644
--- a/.github/workflows/deploy-images.yml
+++ b/.github/workflows/deploy-images.yml
@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -89,6 +91,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -123,6 +127,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -131,12 +137,17 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get version
+        id: vars
+        run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
       - name: Build Server Docker image
         run: |
           docker build \
             -t ghcr.io/bluewave-labs/checkmate-backend-mono:latest \
             -f ./docker/dist-mono/server.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
+            --build-arg VITE_APP_VERSION=${{ env.VERSION }} \
             .
 
       - name: Push Server Docker image
diff --git a/.github/workflows/production-deploy.yml b/.github/workflows/production-deploy.yml
index 4275b4a00..7764c488b 100644
--- a/.github/workflows/production-deploy.yml
+++ b/.github/workflows/production-deploy.yml
@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3

From b718c02787a48d6bbc6db7e4f2d4382ce4876198 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 12:07:31 +0800
Subject: [PATCH 317/319] update workflows

---
 .github/workflows/staging-deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/staging-deploy.yml b/.github/workflows/staging-deploy.yml
index de0dbfed4..ea5477815 100644
--- a/.github/workflows/staging-deploy.yml
+++ b/.github/workflows/staging-deploy.yml
@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3

From ba8011a22ec60fafe91e67fb252f34c7e0c9f45f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 12:17:16 +0800
Subject: [PATCH 318/319] use process.env

---
 client/vite.config.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/vite.config.js b/client/vite.config.js
index e930a20e9..20943eeb4 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -4,10 +4,8 @@ import svgr from "vite-plugin-svgr";
 import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
-	const env = loadEnv(mode, process.cwd(), "");
-	let version = env.VITE_APP_VERSION;
-
-	if (!version) {
+	let version = process.env.VITE_APP_VERSION;
+	if (!version || version === "unknown") {
 		try {
 			version = execSync("git describe --tags --abbrev=0").toString().trim();
 		} catch {

From 549044f973f908fcafe9559b69ce8bf1e87e75a1 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 25 Jun 2025 12:38:57 +0800
Subject: [PATCH 319/319] fix sidebar logs

---
 .../Components/RoleProtectedRoute/index.jsx   | 35 +++++++++++++++++++
 client/src/Components/Sidebar/index.jsx       | 10 +++++-
 client/src/Routes/index.jsx                   |  7 +++-
 client/vite.config.js                         |  9 +----
 4 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 client/src/Components/RoleProtectedRoute/index.jsx

diff --git a/client/src/Components/RoleProtectedRoute/index.jsx b/client/src/Components/RoleProtectedRoute/index.jsx
new file mode 100644
index 000000000..c7b7dfc12
--- /dev/null
+++ b/client/src/Components/RoleProtectedRoute/index.jsx
@@ -0,0 +1,35 @@
+import { Navigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import PropTypes from "prop-types";
+
+/**
+ * ProtectedRoute is a wrapper component that ensures only authenticated users
+ * can access the wrapped content. It checks authentication status (e.g., from Redux or Context).
+ * If the user is authenticated, it renders the children; otherwise, it redirects to the login page.
+ *
+ * @param {Object} props - The props passed to the ProtectedRoute component.
+ * @param {React.ReactNode} props.children - The children to render if the user is authenticated.
+ * @returns {React.ReactElement} The children wrapped in a protected route or a redirect to the login page.
+ */
+
+const RoleProtectedRoute = ({ roles, children }) => {
+	const authState = useSelector((state) => state.auth);
+	const userRoles = authState?.user?.role || [];
+	const canAccess = userRoles.some((role) => roles.includes(role));
+
+	return canAccess ? (
+		children
+	) : (
+		<Navigate
+			to="/uptime"
+			replace
+		/>
+	);
+};
+
+RoleProtectedRoute.propTypes = {
+	children: PropTypes.element.isRequired,
+	roles: PropTypes.array,
+};
+
+export default RoleProtectedRoute;
diff --git a/client/src/Components/Sidebar/index.jsx b/client/src/Components/Sidebar/index.jsx
index e9f0d3ad7..219ceff1e 100644
--- a/client/src/Components/Sidebar/index.jsx
+++ b/client/src/Components/Sidebar/index.jsx
@@ -49,6 +49,8 @@ import { useDispatch, useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import { toggleSidebar } from "../../Features/UI/uiSlice";
+import { TurnedIn } from "@mui/icons-material";
+import { rules } from "eslint-plugin-react-refresh";
 
 const getMenu = (t) => [
 	{ name: t("menu.uptime"), path: "uptime", icon: <Monitors /> },
@@ -121,7 +123,6 @@ function Sidebar() {
 	const { t } = useTranslation();
 	const authState = useSelector((state) => state.auth);
 
-	const menu = getMenu(t);
 	const otherMenuItems = getOtherMenuItems(t);
 	const accountMenuItems = getAccountMenuItems(t);
 	const collapsed = useSelector((state) => state.ui.sidebar.collapsed);
@@ -133,6 +134,13 @@ function Sidebar() {
 	const sidebarRef = useRef(null);
 	const [sidebarReady, setSidebarReady] = useState(false);
 	const TRANSITION_DURATION = 200;
+	let menu = getMenu(t);
+	menu = menu.filter((item) => {
+		if (item.path === "logs") {
+			return user.role?.includes("admin") || user.role?.includes("superadmin");
+		}
+		return true;
+	});
 
 	useEffect(() => {
 		if (!collapsed) {
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index 60df27211..965ed2676 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -48,6 +48,7 @@ import Settings from "../Pages/Settings";
 import Maintenance from "../Pages/Maintenance";
 
 import ProtectedRoute from "../Components/ProtectedRoute";
+import RoleProtectedRoute from "../Components/RoleProtectedRoute";
 import CreateNewMaintenanceWindow from "../Pages/Maintenance/CreateMaintenance";
 import withAdminCheck from "../Components/HOC/withAdminCheck";
 import BulkImport from "../Pages/Uptime/BulkImport";
@@ -190,7 +191,11 @@ const Routes = () => {
 
 				<Route
 					path="logs"
-					element={<Logs />}
+					element={
+						<RoleProtectedRoute roles={["admin", "superadmin"]}>
+							<Logs />
+						</RoleProtectedRoute>
+					}
 				/>
 			</Route>
 
diff --git a/client/vite.config.js b/client/vite.config.js
index 96151c0b3..838cc5142 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -5,14 +5,7 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version;
-	try {
-		version =
-			env.VITE_APP_VERSION ||
-			execSync("git describe --tags --abbrev=0").toString().trim();
-	} catch (error) {
-		version = "unknown";
-	}
+	let version = 2.2;
 
 	return {
 		base: "/",