Merge pull request #3368 from bluewave-labs/develop

Develop -> master (3.5.0)
Merge pull request #3323 from bluewave-labs/develop
2026-03-04 10:41:02 -08:00 · 2026-02-20 12:38:33 -08:00 · 2026-02-20 12:20:49 -08:00 · 2026-02-20 12:07:29 -08:00 · 2026-01-27 13:58:48 -08:00 · 2026-01-27 13:40:25 -08:00
207 changed files with 3250 additions and 11633 deletions
@@ -3,10 +3,8 @@
 .VSCodeCounter
 *.sh
 mongo
-timescaledb
 node_modules/
 docs/architecture
 docs/reviews
 docs/todo
-docs/frontend
-docs/timescale
+docs/frontend
@@ -46,11 +46,11 @@ You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.

 ## User's guide

-Usage instructions can be found [here](https://checkmate.so/docs). 
+Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :)

 ## Installation

-See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
+See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 

 Alternatively, you can also use [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.

@@ -157,11 +157,12 @@ Here's how you can contribute:

 0. Star this repo :)
 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag.
-2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-3. Open an issue if you believe you've encountered a bug.
-4. Check for good-first-issue's if you are a newcomer.
-5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
-6. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
+2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview).
+3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+4. Open an issue if you believe you've encountered a bug.
+5. Check for good-first-issue's if you are a newcomer.
+6. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+7. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).

 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
@@ -174,3 +175,9 @@ Here's how you can contribute:
 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

 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:
+
+- [VerifyWise](https://github.com/bluewave-labs/verifywise), the first open source AI governance platform.
+- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
+- [Guidefox](https://github.com/bluewave-labs/guidefox), an application that helps new users learn how to use your product via hints, tours, popups and banners.
@@ -44,7 +44,7 @@
 				"redux-persist": "6.0.0",
 				"swr": "^2.3.6",
 				"vite-plugin-svgr": "^4.2.0",
-				"zod": "^4.3.6"
+				"zod": "^4.1.11"
 			},
 			"devDependencies": {
 				"@types/node": "24.5.2",
@@ -58,7 +58,7 @@
 				"lint-staged": "^16.2.7",
 				"prettier": "^3.3.3",
 				"typescript": "5.9.3",
-				"vite": "6.4.1"
+				"vite": "6.3.6"
 			}
 		},
 		"node_modules/@babel/code-frame": {
@@ -434,6 +434,7 @@
 			"cpu": [
 				"ppc64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -450,6 +451,7 @@
 			"cpu": [
 				"arm"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -466,6 +468,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -482,6 +485,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -498,6 +502,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -514,6 +519,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -530,6 +536,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -546,6 +553,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -562,6 +570,7 @@
 			"cpu": [
 				"arm"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -578,6 +587,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -594,6 +604,7 @@
 			"cpu": [
 				"ia32"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -610,6 +621,7 @@
 			"cpu": [
 				"loong64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -626,6 +638,7 @@
 			"cpu": [
 				"mips64el"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -642,6 +655,7 @@
 			"cpu": [
 				"ppc64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -658,6 +672,7 @@
 			"cpu": [
 				"riscv64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -674,6 +689,7 @@
 			"cpu": [
 				"s390x"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -688,6 +704,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -704,6 +721,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -720,6 +738,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -736,6 +755,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -752,6 +772,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -768,6 +789,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -784,6 +806,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -800,6 +823,7 @@
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -816,6 +840,7 @@
 			"cpu": [
 				"ia32"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -832,6 +857,7 @@
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1634,12 +1660,13 @@
 			}
 		},
 		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
-			"integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+			"integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
 			"cpu": [
 				"arm"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1647,12 +1674,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
-			"integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+			"integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1660,12 +1688,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
-			"integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+			"integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1673,12 +1702,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
-			"integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+			"integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1686,12 +1716,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-arm64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
-			"integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+			"integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1699,12 +1730,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-x64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
-			"integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+			"integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1712,12 +1744,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
-			"integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+			"integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
 			"cpu": [
 				"arm"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1725,12 +1758,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
-			"integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+			"integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
 			"cpu": [
 				"arm"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1738,12 +1772,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
-			"integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+			"integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1751,12 +1786,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
-			"integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+			"integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1764,12 +1800,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loong64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
-			"integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+			"integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
 			"cpu": [
 				"loong64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1777,12 +1814,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loong64-musl": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
-			"integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+			"integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
 			"cpu": [
 				"loong64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1790,12 +1828,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-ppc64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
-			"integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+			"integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
 			"cpu": [
 				"ppc64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1803,12 +1842,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-ppc64-musl": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
-			"integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+			"integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
 			"cpu": [
 				"ppc64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1816,12 +1856,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
-			"integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+			"integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
 			"cpu": [
 				"riscv64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1829,12 +1870,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-musl": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
-			"integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+			"integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
 			"cpu": [
 				"riscv64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1842,12 +1884,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
-			"integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+			"integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
 			"cpu": [
 				"s390x"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1855,12 +1898,11 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
-			"integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
+			"version": "4.57.1",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1868,12 +1910,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
-			"integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+			"integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1881,12 +1924,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-openbsd-x64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
-			"integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+			"integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1894,12 +1938,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-openharmony-arm64": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
-			"integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+			"integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1907,12 +1952,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
-			"integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+			"integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
 			"cpu": [
 				"arm64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1920,12 +1966,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
-			"integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+			"integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
 			"cpu": [
 				"ia32"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1933,12 +1980,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-gnu": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
-			"integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+			"integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1946,12 +1994,13 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.59.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
-			"integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
+			"version": "4.57.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+			"integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
 			"cpu": [
 				"x64"
 			],
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -2301,7 +2350,7 @@
 		},
 		"node_modules/@types/node": {
 			"version": "24.5.2",
-			"devOptional": true,
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"undici-types": "~7.12.0"
@@ -2317,6 +2366,7 @@
 		},
 		"node_modules/@types/react": {
 			"version": "18.3.27",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/prop-types": "*",
@@ -2455,9 +2505,7 @@
 			}
 		},
 		"node_modules/ajv": {
-			"version": "6.14.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-			"integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+			"version": "6.12.6",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3518,6 +3566,7 @@
 		},
 		"node_modules/esbuild": {
 			"version": "0.25.12",
+			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
 			"bin": {
@@ -3835,6 +3884,7 @@
 		},
 		"node_modules/fdir": {
 			"version": "6.5.0",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=12.0.0"
@@ -3968,6 +4018,7 @@
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
 			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
 			"optional": true,
@@ -5200,9 +5251,7 @@
 			}
 		},
 		"node_modules/minimatch": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+			"version": "3.1.2",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5268,6 +5317,7 @@
 		},
 		"node_modules/nanoid": {
 			"version": "3.3.11",
+			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -5600,6 +5650,7 @@
 		},
 		"node_modules/postcss": {
 			"version": "8.5.6",
+			"dev": true,
 			"funding": [
 				{
 					"type": "opencollective",
@@ -6107,8 +6158,7 @@
 		},
 		"node_modules/rollup": {
 			"version": "4.57.1",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
-			"integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/estree": "1.0.8"
@@ -6121,31 +6171,31 @@
 				"npm": ">=8.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.59.0",
-				"@rollup/rollup-android-arm64": "4.59.0",
-				"@rollup/rollup-darwin-arm64": "4.59.0",
-				"@rollup/rollup-darwin-x64": "4.59.0",
-				"@rollup/rollup-freebsd-arm64": "4.59.0",
-				"@rollup/rollup-freebsd-x64": "4.59.0",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
-				"@rollup/rollup-linux-arm-musleabihf": "4.59.0",
-				"@rollup/rollup-linux-arm64-gnu": "4.59.0",
-				"@rollup/rollup-linux-arm64-musl": "4.59.0",
-				"@rollup/rollup-linux-loong64-gnu": "4.59.0",
-				"@rollup/rollup-linux-loong64-musl": "4.59.0",
-				"@rollup/rollup-linux-ppc64-gnu": "4.59.0",
-				"@rollup/rollup-linux-ppc64-musl": "4.59.0",
-				"@rollup/rollup-linux-riscv64-gnu": "4.59.0",
-				"@rollup/rollup-linux-riscv64-musl": "4.59.0",
-				"@rollup/rollup-linux-s390x-gnu": "4.59.0",
-				"@rollup/rollup-linux-x64-gnu": "4.59.0",
-				"@rollup/rollup-linux-x64-musl": "4.59.0",
-				"@rollup/rollup-openbsd-x64": "4.59.0",
-				"@rollup/rollup-openharmony-arm64": "4.59.0",
-				"@rollup/rollup-win32-arm64-msvc": "4.59.0",
-				"@rollup/rollup-win32-ia32-msvc": "4.59.0",
-				"@rollup/rollup-win32-x64-gnu": "4.59.0",
-				"@rollup/rollup-win32-x64-msvc": "4.59.0",
+				"@rollup/rollup-android-arm-eabi": "4.57.1",
+				"@rollup/rollup-android-arm64": "4.57.1",
+				"@rollup/rollup-darwin-arm64": "4.57.1",
+				"@rollup/rollup-darwin-x64": "4.57.1",
+				"@rollup/rollup-freebsd-arm64": "4.57.1",
+				"@rollup/rollup-freebsd-x64": "4.57.1",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+				"@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+				"@rollup/rollup-linux-arm64-gnu": "4.57.1",
+				"@rollup/rollup-linux-arm64-musl": "4.57.1",
+				"@rollup/rollup-linux-loong64-gnu": "4.57.1",
+				"@rollup/rollup-linux-loong64-musl": "4.57.1",
+				"@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+				"@rollup/rollup-linux-ppc64-musl": "4.57.1",
+				"@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+				"@rollup/rollup-linux-riscv64-musl": "4.57.1",
+				"@rollup/rollup-linux-s390x-gnu": "4.57.1",
+				"@rollup/rollup-linux-x64-gnu": "4.57.1",
+				"@rollup/rollup-linux-x64-musl": "4.57.1",
+				"@rollup/rollup-openbsd-x64": "4.57.1",
+				"@rollup/rollup-openharmony-arm64": "4.57.1",
+				"@rollup/rollup-win32-arm64-msvc": "4.57.1",
+				"@rollup/rollup-win32-ia32-msvc": "4.57.1",
+				"@rollup/rollup-win32-x64-gnu": "4.57.1",
+				"@rollup/rollup-win32-x64-msvc": "4.57.1",
 				"fsevents": "~2.3.2"
 			}
 		},
@@ -6480,6 +6530,7 @@
 		},
 		"node_modules/source-map-js": {
 			"version": "1.2.1",
+			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
@@ -6767,6 +6818,7 @@
 		},
 		"node_modules/tinyglobby": {
 			"version": "0.2.15",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"fdir": "^6.5.0",
@@ -6896,7 +6948,7 @@
 		},
 		"node_modules/typescript": {
 			"version": "5.9.3",
-			"devOptional": true,
+			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
@@ -6940,7 +6992,7 @@
 		},
 		"node_modules/undici-types": {
 			"version": "7.12.0",
-			"devOptional": true,
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/union-value": {
@@ -7029,9 +7081,8 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
-			"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
+			"version": "6.3.6",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"esbuild": "^0.25.0",
@@ -7315,7 +7366,7 @@
 			"version": "2.8.2",
 			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
 			"integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-			"devOptional": true,
+			"dev": true,
 			"license": "ISC",
 			"bin": {
 				"yaml": "bin.mjs"
@@ -7340,8 +7391,6 @@
 		},
 		"node_modules/zod": {
 			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
-			"integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
 			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/colinhacks"
@@ -13,7 +13,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "npm run format"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
@@ -52,7 +52,7 @@
 		"redux-persist": "6.0.0",
 		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
-		"zod": "^4.3.6"
+		"zod": "^4.1.11"
 	},
 	"devDependencies": {
 		"@types/node": "24.5.2",
@@ -66,6 +66,6 @@
 		"lint-staged": "^16.2.7",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "6.4.1"
+		"vite": "6.3.6"
 	}
 }
@@ -32,7 +32,7 @@ export const HeatmapResponseTime = ({

 	if (!checks || checks.length === 0) return null;

-	const latestChecks = checks.slice(-25);
+	const latestChecks = checks.slice(-25).reverse();

 	let data: Array<CheckSnapshot | PlaceholderCheck>;
 	if (latestChecks.length !== 25) {
@@ -57,8 +57,7 @@ export const HeatmapResponseTimeTooltip = ({
 						{formatDateWithTz(check?.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone)}
 					</Typography>
 					<Typography>
-						{t("common.labels.responseTime")}:{" "}
-						{check?.originalResponseTime?.toFixed() ?? "N/A"} ms
+						{t("common.labels.responseTime")}: {check.originalResponseTime.toFixed()} ms
 					</Typography>
 					<Typography textTransform={"capitalize"}>
 						Status:{" "}
@@ -3,7 +3,7 @@ import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

-import { useTheme, type Theme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 import { useMemo, useState, useEffect } from "react";
 import { getInfraGaugeColor } from "@/Utils/MonitorUtils";

@@ -17,10 +17,6 @@ export const Gauge = ({
 	strokeWidth = 15,
 	precision = 1,
 	unit = "%",
-	// colorFn lets callers override the default color logic.
-	// The Gauge was originally designed for metrics where higher values are worse (e.g., CPU usage).
-	// PageSpeed scores are the opposite—higher is better—so a custom colorFn can be used to invert the behavior.
-	colorFn,
 }: {
 	isLoading?: boolean;
 	progress?: number;
@@ -28,7 +24,6 @@ export const Gauge = ({
 	strokeWidth?: number;
 	precision?: number;
 	unit?: string;
-	colorFn?: (val: number, theme: Theme) => string;
 }) => {
 	const theme = useTheme();
 	const progressWithinRange = Math.max(MINIMUM_VALUE, Math.min(progress, MAXIMUM_VALUE));
@@ -53,8 +48,7 @@ export const Gauge = ({
 		return () => clearTimeout(timer);
 	}, [progress, circumference, strokeLength]);

-	const resolvedColorFn = colorFn ?? getInfraGaugeColor;
-	const fillColor = resolvedColorFn(progressWithinRange, theme);
+	const fillColor = getInfraGaugeColor(progressWithinRange, theme);

 	if (isLoading) {
 		return;
@@ -11,26 +11,20 @@ import type { ResponsiveStyleValue } from "@mui/system";
 interface SliderInputProps extends SliderProps {
 	sx?: SliderProps["sx"];
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 }

 export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
-	({ sx, showValue = false, formatDisplayValue, ...props }, ref) => {
+	({ sx, showValue = false, ...props }, ref) => {
 		const theme = useTheme();
 		const additionalSx = Array.isArray(sx) ? sx : sx ? [sx] : [];

-		const displayValue =
-			showValue && formatDisplayValue && typeof props.value === "number"
-				? formatDisplayValue(props.value)
-				: props.value;
-
 		return (
 			<Stack
 				gap={theme.spacing(8)}
 				direction={"row"}
 				alignItems={"center"}
 			>
-				{showValue && <Typography>{displayValue}</Typography>}
+				{showValue && <Typography>{props.value}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -69,21 +63,12 @@ interface SliderWithLabelProps extends SliderProps {
 	fieldLabel?: string;
 	required?: boolean;
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 	sliderMaxWidth?: ResponsiveStyleValue<number | string>;
 }

 export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>(
 	(
-		{
-			fieldLabel,
-			required,
-			showValue = true,
-			formatDisplayValue,
-			value,
-			sliderMaxWidth = "100%",
-			...props
-		},
+		{ fieldLabel, required, showValue = true, value, sliderMaxWidth = "100%", ...props },
 		ref
 	) => {
 		const theme = useTheme();
@@ -97,7 +82,6 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
-						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>
@@ -1,6 +1,9 @@
 import Box from "@mui/material/Box";
 import { useState, useEffect, useRef } from "react";
 import { useTheme } from "@mui/material/styles";
+import { useSelector } from "react-redux";
+import BackgroundSVG from "@/assets/Images/background.svg";
+import type { RootState } from "@/Types/state";
 import { OfflineBanner } from "@/Components/design-elements";
 import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";

@@ -10,6 +13,7 @@ interface AppLayoutProps {

 const AppLayout = ({ children }: AppLayoutProps) => {
 	const theme = useTheme();
+	const mode = useSelector((state: RootState) => state.ui.mode);
 	const [serverUnreachable, setServerUnreachable] = useState(false);
 	const retryIntervalRef = useRef<number | null>(null);

@@ -43,6 +47,10 @@ const AppLayout = ({ children }: AppLayoutProps) => {
 			sx={{
 				minHeight: "100vh",
 				backgroundColor: theme.palette.background.default,
+				backgroundImage: mode === "dark" ? `url("${BackgroundSVG}")` : "none",
+				backgroundSize: "100% 100%",
+				backgroundPosition: "center",
+				backgroundRepeat: "no-repeat",
 			}}
 		>
 			<OfflineBanner visible={serverUnreachable} />
@@ -7,7 +7,7 @@ import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";

-const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
+const types = ["http", "ping", "port", "docker", "game", "grpc"];
 const typeDisplayNames: Record<string, string> = {
 	http: "HTTP",
 	ping: "Ping",
@@ -15,7 +15,6 @@ const typeDisplayNames: Record<string, string> = {
 	docker: "Docker",
 	game: "Game",
 	grpc: "gRPC",
-	websocket: "WebSocket",
 };
 const statuses = ["up", "down"];
 const states = ["active", "paused"];
@@ -103,14 +103,6 @@ export const useMonitorForm = ({
 					selectedDisks: data?.selectedDisks || [],
 				};
 				break;
-			case "websocket":
-				defaults = {
-					...base,
-					type: "websocket",
-					url: data?.url || "",
-					ignoreTlsErrors: data?.ignoreTlsErrors || false,
-				};
-				break;
 			default:
 				defaults = {
 					...base,
@@ -1,76 +1,28 @@
 import { useMemo } from "react";
 import { notificationSchema } from "@/Validation/notifications";
-import type { NotificationFormData } from "@/Validation/notifications";
 import type { Notification } from "@/Types/Notification";

 interface UseNotificationFormOptions {
 	data?: Notification | null;
 }

-function buildDefaults(data: Notification | null): NotificationFormData {
-	if (data?.type === "matrix") {
-		return {
-			type: "matrix",
-			notificationName: data.notificationName || "",
-			homeserverUrl: data.homeserverUrl || "",
-			roomId: data.roomId || "",
-			accessToken: data.accessToken || "",
-		};
-	}
-	if (data?.type === "telegram") {
-		return {
-			type: "telegram",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-			accessToken: data.accessToken || "",
-		};
-	}
-	if (data?.type === "slack") {
-		return {
-			type: "slack",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "discord") {
-		return {
-			type: "discord",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "webhook") {
-		return {
-			type: "webhook",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "pager_duty") {
-		return {
-			type: "pager_duty",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "teams") {
-		return {
-			type: "teams",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	// Default: email (covers both data === null and data.type === "email")
-	return {
-		type: "email",
-		notificationName: data?.notificationName || "",
-		address: data?.address || "",
-	};
-}
-
 export const useNotificationForm = ({ data = null }: UseNotificationFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults = buildDefaults(data);
+		const defaults =
+			data?.type === "matrix"
+				? {
+						type: "matrix" as const,
+						notificationName: data.notificationName || "",
+						homeserverUrl: data.homeserverUrl || "",
+						roomId: data.roomId || "",
+						accessToken: data.accessToken || "",
+					}
+				: {
+						type: (data?.type || "email") as Exclude<Notification["type"], "matrix">,
+						notificationName: data?.notificationName || "",
+						address: data?.address || "",
+					};
+
 		return { schema: notificationSchema, defaults };
 	}, [data]);
 };
@@ -1,14 +1,14 @@
 import { useMemo } from "react";
 import { settingsSchema } from "@/Validation/settings";
 import type { Settings } from "@/Types/Settings";
-import type { SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";

 interface UseSettingsFormOptions {
 	data?: Settings | null;
 }
 export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults: SettingsFormInput = {
+		const defaults: SettingsFormData = {
 			systemEmailIgnoreTLS: data?.systemEmailIgnoreTLS ?? false,
 			systemEmailRequireTLS: data?.systemEmailRequireTLS ?? false,
 			systemEmailRejectUnauthorized: data?.systemEmailRejectUnauthorized ?? true,
@@ -27,15 +27,12 @@ export const useStatusPageForm = ({
 			companyName: data?.companyName || "",
 			url: data?.url || generateDefaultUrl(),
 			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
-			type: data?.type || ["uptime"],
 			color: data?.color || "#4169E1",
 			monitors: data?.monitors || [],
 			isPublished: data?.isPublished ?? false,
 			showCharts: data?.showCharts ?? true,
 			showUptimePercentage: data?.showUptimePercentage ?? true,
 			showAdminLoginLink: data?.showAdminLoginLink ?? false,
-			showInfrastructure: data?.showInfrastructure ?? false,
-			showPageSpeed: data?.showPageSpeed ?? false,
 			customCSS: data?.customCSS || "",
 			logo: transformLogo(data?.logo),
 		};
@@ -11,17 +11,12 @@ import { ConfigBox, BasePage } from "@/Components/design-elements";
 import { UserRoles } from "@/Types/User";
 import { useTranslation } from "react-i18next";
 import type { UserRole, User } from "@/Types/User";
-import { useParams, useNavigate } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { useTheme } from "@mui/material";
 import { useEditUserForm } from "@/Hooks/useEditUserForm";
-import { useGet, usePatch, useDelete } from "@/Hooks/UseApi";
+import { useGet, usePatch } from "@/Hooks/UseApi";
 import type { EditUserFormData } from "@/Validation/editUser";
-import { useEffect, useState } from "react";
-import { DialogInput } from "@/Components/inputs/Dialog";
-import { useSelector } from "react-redux";
-import type { RootState } from "@/Types/state";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { useIsAdmin, useIsSuperAdmin } from "@/Hooks/useIsAdmin";
+import { useEffect } from "react";

 interface RoleOption {
 	id: UserRole;
@@ -34,12 +29,6 @@ const EditUserPage = () => {
 	const { userId } = useParams<{ userId: string }>();
 	const { resolver, defaults } = useEditUserForm();
 	const { patch, loading: isSaving } = usePatch();
-	const { deleteFn, loading: isDeleting } = useDelete();
-	const navigate = useNavigate();
-	const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-	const currentUser = useSelector((state: RootState) => state.auth.user);
-	const isSuperAdmin = useIsSuperAdmin();
-	const isAdmin = useIsAdmin();

 	const { data: user, isLoading } = useGet<User>(`/auth/users/${userId}`);

@@ -71,20 +60,6 @@ const EditUserPage = () => {
 		setValue("role", newRoles, { shouldValidate: true });
 	};

-	const canDeleteUser =
-		isAdmin &&
-		userId !== currentUser?.id &&
-		!user?.role?.includes("demo") &&
-		(isSuperAdmin || user?.role?.every((r) => r !== "admin" && r !== "superadmin"));
-
-	const handleDeleteUser = async () => {
-		const result = await deleteFn(`/auth/users/${userId}`);
-		setShowDeleteDialog(false);
-		if (result) {
-			navigate("/account", { state: { tab: "team" } });
-		}
-	};
-
 	const onSubmit = async (data: EditUserFormData) => {
 		await patch(`/auth/users/${userId}`, data);
 	};
@@ -190,45 +165,17 @@ const EditUserPage = () => {
 							</Stack>
 						}
 					/>
-					<Stack
-						gap={LAYOUT.XS}
-						direction="row"
-						justifyContent={"flex-end"}
-						width="100%"
+					<Button
+						type="submit"
+						variant="contained"
+						color="primary"
+						loading={isSaving}
+						sx={{ alignSelf: "flex-end", minWidth: 100 }}
 					>
-						{canDeleteUser && (
-							<Button
-								variant="contained"
-								color="error"
-								onClick={() => setShowDeleteDialog(true)}
-								sx={{ minWidth: 100 }}
-							>
-								{t("common.buttons.removeUser")}
-							</Button>
-						)}
-						<Button
-							type="submit"
-							variant="contained"
-							color="primary"
-							loading={isSaving}
-							sx={{ minWidth: 100 }}
-						>
-							{t("common.buttons.save")}
-						</Button>
-					</Stack>
+						{t("common.buttons.save")}
+					</Button>
 				</Stack>
 			</form>
-			<DialogInput
-				open={showDeleteDialog}
-				title={t("pages.editUser.dialog.removeUser.title")}
-				content={t("pages.editUser.dialog.removeUser.content", {
-					name: `${user?.firstName} ${user?.lastName}`,
-				})}
-				onCancel={() => setShowDeleteDialog(false)}
-				onConfirm={handleDeleteUser}
-				confirmText={t("common.buttons.removeUser")}
-				loading={isDeleting}
-			/>
 		</BasePage>
 	);
 };
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { Table } from "@/Components/design-elements";
 import type { Header } from "@/Components/design-elements/Table";
-import { useIsAdmin } from "@/Hooks/useIsAdmin";
+import { useIsSuperAdmin } from "@/Hooks/useIsAdmin";
 import type { User } from "@/Types/User";

 interface TeamTableProps {
@@ -13,7 +13,7 @@ interface TeamTableProps {
 export const TeamTable = ({ users }: TeamTableProps) => {
 	const { t } = useTranslation();
 	const navigate = useNavigate();
-	const isAdmin = useIsAdmin();
+	const isSuperAdmin = useIsSuperAdmin();

 	const headers: Header<User>[] = [
 		{
@@ -45,7 +45,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 	];

 	const handleRowClick = (row: User) => {
-		if (isAdmin) {
+		if (isSuperAdmin) {
 			navigate(`/account/team/${row.id}`);
 		}
 	};
@@ -54,7 +54,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 		<Table
 			headers={headers}
 			data={users}
-			onRowClick={isAdmin ? handleRowClick : undefined}
+			onRowClick={isSuperAdmin ? handleRowClick : undefined}
 		/>
 	);
 };
@@ -32,12 +32,7 @@ import {
 import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { useGet, usePost, usePatch, useDelete } from "@/Hooks/UseApi";
 import { useMonitorForm } from "@/Hooks/useMonitorForm";
-import {
-	type Monitor,
-	type MonitorType,
-	type GamesMap,
-	supportsGeoCheck,
-} from "@/Types/Monitor";
+import type { Monitor, MonitorType, GamesMap } from "@/Types/Monitor";
 import type { Notification } from "@/Types/Notification";
 import type { MonitorFormData } from "@/Validation/monitor";

@@ -146,17 +141,6 @@ const getGeneralSettingsConfig = (
 			showGrpcServiceName: false,
 			showIgnoreTls: false,
 		},
-		websocket: {
-			urlLabel: t("pages.createMonitor.form.general.option.wsUrl.label"),
-			urlPlaceholder: t("pages.createMonitor.form.general.option.wsUrl.placeholder"),
-			namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
-			showUrl: true,
-			showPort: false,
-			showGameSelect: false,
-			showSecret: false,
-			showGrpcServiceName: false,
-			showIgnoreTls: true,
-		},
 	};
 	return configs[type] || configs.http;
 };
@@ -302,53 +286,46 @@ const CreateMonitorPage = () => {
 									>
 										<RadioWithDescription
 											value="http"
-											label={t("pages.common.monitors.monitorTypes.optionHttp")}
+											label={t("pages.createMonitor.form.type.optionHttp")}
 											description={t(
 												"pages.createMonitor.form.type.optionHttpDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="ping"
-											label={t("pages.common.monitors.monitorTypes.optionPing")}
+											label={t("pages.createMonitor.form.type.optionPing")}
 											description={t(
 												"pages.createMonitor.form.type.optionPingDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="docker"
-											label={t("pages.common.monitors.monitorTypes.optionDocker")}
+											label={t("pages.createMonitor.form.type.optionDocker")}
 											description={t(
 												"pages.createMonitor.form.type.optionDockerDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="port"
-											label={t("pages.common.monitors.monitorTypes.optionPort")}
+											label={t("pages.createMonitor.form.type.optionPort")}
 											description={t(
 												"pages.createMonitor.form.type.optionPortDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="game"
-											label={t("pages.common.monitors.monitorTypes.optionGame")}
+											label={t("pages.createMonitor.form.type.optionGame")}
 											description={t(
 												"pages.createMonitor.form.type.optionGameDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="grpc"
-											label={t("pages.common.monitors.monitorTypes.optionGrpc")}
+											label={t("pages.createMonitor.form.type.optionGrpc")}
 											description={t(
 												"pages.createMonitor.form.type.optionGrpcDescription"
 											)}
 										/>
-										<RadioWithDescription
-											value="websocket"
-											label={t("pages.common.monitors.monitorTypes.optionWebSocket")}
-											description={t(
-												"pages.createMonitor.form.type.optionWebSocketDescription"
-											)}
-										/>
 									</RadioGroup>
 								</FormControl>
 							)}
@@ -765,9 +742,7 @@ const CreateMonitorPage = () => {
 				}
 			/>

-			{(watchedType === "http" ||
-				watchedType === "grpc" ||
-				watchedType === "websocket") && (
+			{(watchedType === "http" || watchedType === "grpc") && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.ignoreTls.title")}
 					subtitle={t("pages.createMonitor.form.ignoreTls.description")}
@@ -910,7 +885,7 @@ const CreateMonitorPage = () => {
 				/>
 			)}

-			{supportsGeoCheck(watchedType) && (
+			{watchedType === "http" && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.geoChecks.title")}
 					subtitle={t("pages.createMonitor.form.geoChecks.description")}
@@ -147,7 +147,7 @@ const NotificationsCreatePage = () => {
 					/>
 				}
 			/>
-			{watchedType !== "matrix" && watchedType !== "telegram" && (
+			{watchedType !== "matrix" && (
 				<ConfigBox
 					title={addressConfig.title}
 					subtitle={addressConfig.description}
@@ -155,7 +155,7 @@ const NotificationsCreatePage = () => {
 						<Controller
 							name="address"
 							control={control}
-							defaultValue={"address" in defaults ? defaults.address : ""}
+							defaultValue={defaults.address}
 							render={({ field, fieldState }) => (
 								<TextField
 									{...field}
@@ -171,49 +171,6 @@ const NotificationsCreatePage = () => {
 					}
 				/>
 			)}
-			{watchedType === "telegram" && (
-				<ConfigBox
-					title={t("pages.notifications.form.telegram.title")}
-					subtitle={t("pages.notifications.form.telegram.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionBotToken")}
-										placeholder={t(
-											"pages.notifications.form.telegram.placeholderBotToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="address"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionChatId")}
-										placeholder={t("pages.notifications.form.telegram.placeholderChatId")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
 			{watchedType === "matrix" && (
 				<ConfigBox
 					title={t("pages.notifications.form.matrix.title")}
@@ -223,7 +180,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="homeserverUrl"
 								control={control}
-								defaultValue={"homeserverUrl" in defaults ? defaults.homeserverUrl : ""}
+								defaultValue={defaults.homeserverUrl}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -239,7 +196,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="roomId"
 								control={control}
-								defaultValue={"roomId" in defaults ? defaults.roomId : ""}
+								defaultValue={defaults.roomId}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -255,7 +212,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="accessToken"
 								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
+								defaultValue={defaults.accessToken}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -20,7 +20,7 @@ import { useGet, usePatch, usePost, useLazyGet } from "@/Hooks/UseApi";
 import { useToast } from "@/Hooks/UseToast";
 import { useSettingsForm } from "@/Hooks/useSettingsForm";
 import { useIsAdmin } from "@/Hooks/useIsAdmin.js";
-import type { SettingsFormData, SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 import { useState } from "react";
 import { Controller } from "react-hook-form";
 import { TextField, Button, FieldLabel, SliderWithLabel } from "@/Components/inputs";
@@ -37,7 +37,6 @@ import {
 } from "@/Features/UI/uiSlice.js";
 import timezones from "@/Utils/timezones.json";
 import type { RootState } from "@/Types/state";
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";

 interface Timezone {
 	id: string;
@@ -89,7 +88,7 @@ export const SettingsPage = () => {
 	// Initialize form with schema and defaults
 	const { schema, defaults } = useSettingsForm({ data: fetchedSettings?.settings });

-	const form = useForm<SettingsFormInput, unknown, SettingsFormData>({
+	const form = useForm<SettingsFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 		mode: "onChange",
@@ -256,7 +255,28 @@ export const SettingsPage = () => {
 			delete (dataToSend as any).systemEmailPassword;
 		}

-		const result = await patch("/settings", dataToSend as SettingsFormData);
+		// Convert undefined to empty string for backend unsetting
+		const processedData = Object.entries(dataToSend).reduce((acc, [key, value]) => {
+			const typedKey = key as keyof SettingsFormData;
+			if (value === undefined) {
+				(acc as any)[typedKey] = "";
+			} else if (typeof value === "object" && value !== null) {
+				// Handle nested objects like globalThresholds
+				// Convert 0 to "" for unsetting thresholds
+				(acc as any)[typedKey] = Object.entries(value).reduce(
+					(nested, [nestedKey, nestedValue]) => ({
+						...nested,
+						[nestedKey]: nestedValue === undefined ? "" : nestedValue,
+					}),
+					{}
+				);
+			} else {
+				(acc as any)[typedKey] = value;
+			}
+			return acc;
+		}, {} as Partial<SettingsFormData>);
+
+		const result = await patch("/settings", processedData as SettingsFormData);

 		if (result?.success) {
 			// Update API key state from response
@@ -442,43 +462,6 @@ export const SettingsPage = () => {
 					/>
 				)}

-				{/* Check Retention */}
-				{isAdmin && (
-					<ConfigBox
-						title={t("pages.settings.form.retention.title")}
-						subtitle={t("pages.settings.form.retention.description")}
-						rightContent={
-							<Controller
-								name="checkTTL"
-								control={form.control}
-								defaultValue={defaults.checkTTL}
-								render={({ field }) => (
-									<SliderWithLabel
-										{...field}
-										fieldLabel={t("pages.settings.form.retention.option.days.label")}
-										min={1}
-										max={CHECK_TTL_SENTINEL}
-										sliderMaxWidth={{ xs: "100%", md: "50%" }}
-										value={field.value || 30}
-										onChange={(_, value) => field.onChange(value)}
-										valueLabelDisplay="auto"
-										valueLabelFormat={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-										formatDisplayValue={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-									/>
-								)}
-							/>
-						}
-					/>
-				)}
-
 				{/* Global Thresholds */}
 				{isAdmin && (
 					<ConfigBox
@@ -21,36 +21,19 @@ import {

 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useStatusPageForm } from "@/Hooks/useStatusPageForm";
 import type { StatusPageFormData } from "@/Validation/statusPage";
 import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
-import type { StatusPageType, StatusPageResponse } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
+import type { StatusPageResponse } from "@/Types/StatusPage";
 import timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
 import axios from "axios";
 import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";

-const monitorsUrl = (() => {
-	const params = new URLSearchParams();
-	[
-		"http",
-		"ping",
-		"port",
-		"docker",
-		"game",
-		"grpc",
-		"websocket",
-		"hardware",
-		"pagespeed",
-	].forEach((type) => params.append("type", type));
-	return `/monitors/team?${params.toString()}`;
-})();
-
 interface TimezoneOption {
 	_id: string;
 	name: string;
@@ -66,13 +49,11 @@ const CreateStatusPage = () => {

 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(
-			isCreate
-				? null
-				: `/status-page/${url}?type=uptime&type=infrastructure&type=pagespeed`
-		);
+		useGet<StatusPageResponse>(isCreate ? null : `/status-page/${url}?type=uptime`);

-	const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
+	const { data: monitorsResponse } = useGet<Monitor[]>(
+		"/monitors/team?type=http&type=ping&type=port&type=docker"
+	);
 	const monitors = monitorsResponse ?? [];

 	const { post, loading: isSubmittingPost } = usePost();
@@ -100,26 +81,6 @@ const CreateStatusPage = () => {
 		reset(defaults);
 	}, [defaults, reset]);

-	const watchedMonitorIds: string[] = form.watch("monitors") ?? [];
-	const computedTypes: StatusPageType[] = useMemo(() => {
-		const selectedMonitors = (watchedMonitorIds ?? [])
-			.map((id) => monitors.find((m) => m.id === id))
-			.filter((m): m is Monitor => m !== undefined);
-
-		const typesSet = new Set<StatusPageType>();
-		selectedMonitors.forEach((m) => {
-			if (m.type === "hardware") typesSet.add("infrastructure");
-			else if (m.type === "pagespeed") typesSet.add("pagespeed");
-			else typesSet.add("uptime");
-		});
-
-		return typesSet.size ? Array.from(typesSet) : ["uptime"];
-	}, [watchedMonitorIds, monitors]);
-
-	useEffect(() => {
-		form.setValue("type", computedTypes);
-	}, [computedTypes]);
-
 	const onError = (errors: any) => {
 		logger.debug("Status page validation errors", errors);
 	};
@@ -142,6 +103,7 @@ const CreateStatusPage = () => {

 	const onSubmit = async (data: StatusPageFormData) => {
 		const fd = new FormData();
+		fd.append("type", "uptime");
 		fd.append("isPublished", String(data.isPublished));
 		if (data.companyName) fd.append("companyName", data.companyName);
 		if (data.url) fd.append("url", data.url);
@@ -150,17 +112,11 @@ const CreateStatusPage = () => {
 		fd.append("showCharts", String(data.showCharts));
 		fd.append("showUptimePercentage", String(data.showUptimePercentage));
 		fd.append("showAdminLoginLink", String(data.showAdminLoginLink));
-		fd.append("showInfrastructure", String(data.showInfrastructure));
-		fd.append("showPageSpeed", String(data.showPageSpeed));

 		data.monitors.forEach((monitorId) => {
 			fd.append("monitors[]", monitorId);
 		});

-		data.type.forEach((type) => {
-			fd.append("type[]", type);
-		});
-
 		// Handle logo upload
 		if (data.logo === null) {
 			// Signal to remove the logo
@@ -347,9 +303,7 @@ const CreateStatusPage = () => {
 																		}}
 																	>
 																		<GripVertical size={20} />
-																		<Typography
-																			flexGrow={1}
-																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
+																		<Typography flexGrow={1}>{monitor.name}</Typography>
 																		<IconButton
 																			size="small"
 																			onClick={() => {
@@ -471,38 +425,6 @@ const CreateStatusPage = () => {
 								/>
 							)}
 						/>
-						<Controller
-							name="showInfrastructure"
-							control={control}
-							render={({ field }) => (
-								<FormControlLabel
-									control={
-										<Checkbox
-											checked={field.value}
-											onChange={field.onChange}
-										/>
-									}
-									label={t(
-										"pages.statusPages.form.features.option.showInfrastructure.label"
-									)}
-								/>
-							)}
-						/>
-						<Controller
-							name="showPageSpeed"
-							control={control}
-							render={({ field }) => (
-								<FormControlLabel
-									control={
-										<Checkbox
-											checked={field.value}
-											onChange={field.onChange}
-										/>
-									}
-									label={t("pages.statusPages.form.features.option.showPageSpeed.label")}
-								/>
-							)}
-						/>
 						{/* <Controller
 							name="showUptimePercentage"
 							control={control}
@@ -1,246 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { Gauge } from "@/Components/design-elements";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import type { Monitor } from "@/Types/Monitor";
-import Grid from "@mui/material/Grid";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import Box from "@mui/material/Box";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-
-const GAUGE_RADIUS = 60;
-const GAUGE_STROKE_WIDTH = 12;
-const PERCENTAGE_MULTIPLIER = 100;
-
-interface StatusPageMonitor extends Monitor {
-	checks?: Monitor["recentChecks"];
-}
-
-interface MetricDetail {
-	label: string;
-	value: string;
-}
-
-interface MetricConfig {
-	key: string;
-	label: string;
-	hasData: boolean;
-	progress: number;
-	details: MetricDetail[];
-}
-
-const MetricDetailRow = ({ label, value }: MetricDetail) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{label}
-			</Typography>
-			<Typography variant="body2">{value}</Typography>
-		</Stack>
-	);
-};
-
-interface MetricItemProps {
-	label: string;
-	progress: number;
-	details?: MetricDetail[];
-}
-
-const MetricItem = ({ label, progress, details }: MetricItemProps) => {
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	return (
-		<Grid
-			size={isSmall ? 12 : 4}
-			sx={{
-				display: "flex",
-				flexDirection: "column",
-				alignItems: "center",
-				textAlign: "center",
-				gap: theme.spacing(SPACING.LG),
-				padding: theme.spacing(LAYOUT.XS),
-				borderRight: isSmall ? "none" : `1px solid ${theme.palette.divider}`,
-				borderBottom: isSmall ? `1px solid ${theme.palette.divider}` : "none",
-				"&:last-child": {
-					borderRight: "none",
-					borderBottom: "none",
-					paddingBottom: theme.spacing(SPACING.LG),
-				},
-			}}
-		>
-			<Box
-				display="flex"
-				flexDirection="column"
-				alignItems="center"
-			>
-				<Gauge
-					progress={progress}
-					radius={GAUGE_RADIUS}
-					strokeWidth={GAUGE_STROKE_WIDTH}
-				/>
-				<Typography variant="body2">{label}</Typography>
-			</Box>
-			{details && details.length > 0 && (
-				<Box
-					width="100%"
-					paddingX={theme.spacing(LAYOUT.LG)}
-				>
-					{details.map((detail) => (
-						<MetricDetailRow
-							key={detail.label}
-							label={detail.label}
-							value={detail.value}
-						/>
-					))}
-				</Box>
-			)}
-		</Grid>
-	);
-};
-
-type LatestCheck = NonNullable<Monitor["recentChecks"]>[number];
-
-const buildCpuMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.cpu || typeof check.cpu.usage_percent !== "number") {
-		return null;
-	}
-	const usagePercent = (check.cpu.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER;
-	return {
-		key: "cpu",
-		label: t("pages.statusPages.monitorsList.infrastructure.cpu"),
-		hasData: true,
-		progress: usagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.usage"),
-				value: `${usagePercent.toFixed(2)}%`,
-			},
-		],
-	};
-};
-
-const buildMemoryMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (
-		!check.memory ||
-		typeof check.memory.usage_percent !== "number" ||
-		typeof check.memory.used_bytes !== "number" ||
-		typeof check.memory.total_bytes !== "number"
-	) {
-		return null;
-	}
-	return {
-		key: "memory",
-		label: t("pages.statusPages.monitorsList.infrastructure.memory"),
-		hasData: true,
-		progress: (check.memory.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(check.memory.used_bytes ?? 0),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(check.memory.total_bytes ?? 0),
-			},
-		],
-	};
-};
-
-const buildDiskMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.disk || check.disk.length === 0) {
-		return null;
-	}
-	const disks = check.disk;
-	const avgUsagePercent =
-		(disks.reduce((acc, disk) => acc + (disk?.usage_percent ?? 0), 0) / disks.length) *
-		PERCENTAGE_MULTIPLIER;
-	const totalUsedBytes = disks.reduce((acc, disk) => acc + (disk?.used_bytes ?? 0), 0);
-	const totalTotalBytes = disks.reduce((acc, disk) => acc + (disk?.total_bytes ?? 0), 0);
-
-	return {
-		key: "disk",
-		label: t("pages.statusPages.monitorsList.infrastructure.disk"),
-		hasData: true,
-		progress: avgUsagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(totalUsedBytes),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(totalTotalBytes),
-			},
-		],
-	};
-};
-
-export const InfrastructureMetrics = ({ monitor }: { monitor: StatusPageMonitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const latestCheck = monitor.recentChecks?.[0] ?? monitor.checks?.[0];
-
-	if (!latestCheck) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	const metrics: MetricConfig[] = [
-		buildCpuMetric(latestCheck, t),
-		buildMemoryMetric(latestCheck, t),
-		buildDiskMetric(latestCheck, t),
-	].filter((m): m is MetricConfig => m !== null);
-
-	if (metrics.length === 0) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	return (
-		<Grid
-			container
-			alignItems="center"
-			padding={theme.spacing(LAYOUT.XS)}
-		>
-			{metrics.map(({ key, label, progress, details }) => (
-				<MetricItem
-					key={key}
-					label={label}
-					progress={progress}
-					details={details}
-				/>
-			))}
-		</Grid>
-	);
-};
@@ -5,17 +5,13 @@ import Typography from "@mui/material/Typography";
 import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/common";
 import { StatusLabel, BaseBox } from "@/Components/design-elements";
 import { SwitchComponent } from "@/Components/inputs";
-import { InfrastructureMetrics } from "@/Pages/StatusPage/Status/Components/InfrastructureMetrics";
-import { PageSpeedMetrics } from "@/Pages/StatusPage/Status/Components/PageSpeedMetrics";

-import { useTheme, type Theme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { useState } from "react";
 import type { Monitor } from "@/Types/Monitor";
 import type { StatusPage } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import type { RootState } from "@/Types/state";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";

 interface StatusPageMonitor extends Monitor {
 	checks?: Monitor["recentChecks"];
@@ -26,134 +22,29 @@ interface MonitorsListProps {
 	monitors: StatusPageMonitor[];
 }

-const getMonitorBadgeStyles = (monitorType: string, theme: Theme) => {
-	const monitorColors: Record<string, string> = {
-		hardware: theme.palette.info.light,
-		pagespeed: theme.palette.warning.light,
-	};
-
-	const bg = monitorColors[monitorType] || theme.palette.success.light;
-	return {
-		backgroundColor: bg,
-		color: theme.palette.background.paper,
-		padding: `${theme.spacing(SPACING.SM)} ${theme.spacing(SPACING.LG)}`,
-		borderRadius: theme.shape.borderRadius,
-	};
-};
-
-const MonitorHeader = ({
-	monitor,
-	showURL,
-}: {
-	monitor: StatusPageMonitor;
-	showURL: boolean;
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			justifyContent="space-between"
-			gap={theme.spacing(LAYOUT.XS)}
-			mb={theme.spacing(LAYOUT.XS)}
-		>
-			<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
-				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(SPACING.LG)}
-					mb={theme.spacing(SPACING.SM)}
-				>
-					<Typography
-						variant="h6"
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.name}
-					</Typography>
-					<Typography
-						variant="caption"
-						sx={getMonitorBadgeStyles(monitor.type ?? "", theme)}
-					>
-						{getMonitorTypeLabel(monitor.type, t)}
-					</Typography>
-				</Stack>
-				{showURL && monitor.url && (
-					<Typography
-						variant="body2"
-						color={theme.palette.text.secondary}
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.url}
-					</Typography>
-				)}
-			</Box>
-			<StatusLabel status={monitor.status} />
-		</Stack>
-	);
-};
-
-const MonitorContent = ({
-	monitor,
-	statusPage,
-	chartType,
-}: {
-	monitor: StatusPageMonitor;
-	statusPage: StatusPage;
-	chartType: string;
-}) => {
-	const theme = useTheme();
-
-	if (monitor.type === "hardware") {
-		if (statusPage.showInfrastructure === false) return null;
-		return <InfrastructureMetrics monitor={monitor} />;
-	}
-
-	if (monitor.type === "pagespeed") {
-		return statusPage.showPageSpeed === false ? null : (
-			<PageSpeedMetrics monitor={monitor} />
-		);
-	}
-
-	if (statusPage.showCharts === false) return null;
-
-	const checks = monitor.checks?.slice().reverse() ?? [];
-	return (
-		<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1, mb: theme.spacing(SPACING.LG) }}>
-			{chartType === "histogram" ? (
-				<HistogramResponseTime
-					height={{ xs: 50, md: 100 }}
-					gap={{ xs: theme.spacing(SPACING.SM), md: theme.spacing(LAYOUT.SM) }}
-					checks={checks}
-				/>
-			) : (
-				<HeatmapResponseTime checks={checks} />
-			)}
-		</Box>
-	);
-};
-
 export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
+
 	const showURL = useSelector((state: RootState) => state.ui?.showURL);
+
 	const [chartType, setChartType] = useState<"histogram" | "heatmap">("histogram");

 	return (
-		<Stack gap={theme.spacing(LAYOUT.MD)}>
-			{statusPage.showCharts && (
+		<Stack gap={theme.spacing(8)}>
+			{statusPage.showCharts !== false && (
 				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(LAYOUT.SM)}
+					direction={"row"}
+					alignItems={"center"}
 				>
 					<Typography>{t("pages.statusPages.monitorsList.chartTypeHeatmap")}</Typography>
 					<SwitchComponent
 						dualOption
 						value={chartType}
 						checked={chartType === "histogram"}
-						onChange={(e) => setChartType(e.target.checked ? "histogram" : "heatmap")}
+						onChange={(e) => {
+							setChartType(e.target.checked ? "histogram" : "heatmap");
+						}}
 					/>
 					<Typography>
 						{t("pages.statusPages.monitorsList.chartTypeHistogram")}
@@ -161,22 +52,59 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 				</Stack>
 			)}

-			{monitors.map((monitor) => (
-				<BaseBox
-					key={monitor.id}
-					padding={theme.spacing(LAYOUT.MD)}
-				>
-					<MonitorHeader
-						monitor={monitor}
-						showURL={showURL}
-					/>
-					<MonitorContent
-						monitor={monitor}
-						statusPage={statusPage}
-						chartType={chartType}
-					/>
-				</BaseBox>
-			))}
+			{monitors?.map((monitor) => {
+				return (
+					<BaseBox
+						key={monitor.id}
+						padding={theme.spacing(4)}
+					>
+						<Stack
+							direction="row"
+							alignItems="center"
+							justifyContent="space-between"
+							gap={theme.spacing(4)}
+							mb={statusPage.showCharts !== false ? theme.spacing(4) : 0}
+						>
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								<Typography
+									variant="h6"
+									sx={{
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
+								>
+									{monitor.name}
+								</Typography>
+								{showURL && (
+									<Typography
+										variant="body2"
+										color="text.secondary"
+									>
+										{monitor.url}
+									</Typography>
+								)}
+							</Box>
+							<StatusLabel status={monitor.status} />
+						</Stack>
+						{statusPage.showCharts !== false && (
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								{chartType === "histogram" ? (
+									<HistogramResponseTime
+										height={{ xs: 50, md: 100 }}
+										gap={{ xs: theme.spacing(0.5), md: theme.spacing(5) }}
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								) : (
+									<HeatmapResponseTime
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								)}
+							</Box>
+						)}
+					</BaseBox>
+				);
+			})}
 		</Stack>
 	);
 };
@@ -1,122 +0,0 @@
-import Typography from "@mui/material/Typography";
-import { Gauge } from "@/Components/design-elements";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import type { Monitor } from "@/Types/Monitor";
-import type { CheckSnapshot } from "@/Types/Check";
-import Grid from "@mui/material/Grid";
-import Box from "@mui/material/Box";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-import { getPageSpeedGaugeColor } from "@/Utils/MonitorUtils";
-
-const GAUGE_RADIUS = 60;
-const GAUGE_STROKE_WIDTH = 12;
-
-interface StatusPageMonitor extends Monitor {
-	checks?: Monitor["recentChecks"];
-}
-
-interface MetricConfig {
-	key: string;
-	label: string;
-	progress: number;
-}
-
-const MetricItem = ({ label, progress }: MetricConfig) => {
-	const theme = useTheme();
-	return (
-		<Grid
-			size={{ xs: 12, md: 3 }}
-			display="flex"
-			flexDirection="column"
-			alignItems="center"
-			textAlign="center"
-			gap={theme.spacing(SPACING.LG)}
-			padding={theme.spacing(LAYOUT.XS)}
-			sx={{
-				borderRight: { xs: "none", md: `1px solid ${theme.palette.divider}` },
-				borderBottom: { xs: `1px solid ${theme.palette.divider}`, md: "none" },
-				"&:last-child": {
-					borderRight: "none",
-					borderBottom: "none",
-					paddingBottom: theme.spacing(SPACING.LG),
-				},
-			}}
-		>
-			<Box
-				display="flex"
-				flexDirection="column"
-				alignItems="center"
-			>
-				<Gauge
-					progress={progress}
-					radius={GAUGE_RADIUS}
-					strokeWidth={GAUGE_STROKE_WIDTH}
-					colorFn={getPageSpeedGaugeColor}
-				/>
-				<Typography variant="body2">{label}</Typography>
-			</Box>
-		</Grid>
-	);
-};
-
-const buildMetrics = (check: CheckSnapshot, t: (key: string) => string): MetricConfig[] =>
-	[
-		{
-			key: "performance",
-			label: t("pages.statusPages.monitorsList.pagespeed.performance"),
-			progress: check.performance,
-		},
-		{
-			key: "accessibility",
-			label: t("pages.statusPages.monitorsList.pagespeed.accessibility"),
-			progress: check.accessibility,
-		},
-		{
-			key: "bestPractices",
-			label: t("pages.statusPages.monitorsList.pagespeed.bestPractices"),
-			progress: check.bestPractices,
-		},
-		{
-			key: "seo",
-			label: t("pages.statusPages.monitorsList.pagespeed.seo"),
-			progress: check.seo,
-		},
-	].filter((m): m is MetricConfig => m.progress !== undefined);
-
-export const PageSpeedMetrics = ({ monitor }: { monitor: StatusPageMonitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const latestCheck = monitor.recentChecks?.[0] ?? monitor.checks?.[0];
-
-	if (!latestCheck) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	const metrics = buildMetrics(latestCheck, t);
-
-	return (
-		<Grid
-			container
-			alignItems="center"
-			padding={theme.spacing(LAYOUT.LG)}
-			flex={1}
-		>
-			{metrics.map((metric) => (
-				<MetricItem
-					key={metric.key}
-					label={metric.label}
-					progress={metric.progress}
-				/>
-			))}
-		</Grid>
-	);
-};
@@ -23,24 +23,16 @@ const StatusPageView = () => {
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isPublic = location.pathname.startsWith("/status/public");

-	const apiUrl = url
-		? `/status-page/${url}?type=uptime&type=infrastructure&type=pagespeed`
-		: null;
+	const apiUrl = url ? `/status-page/${url}?type=uptime` : null;

-	const { data, isLoading, error } = useGet<StatusPageResponse>(
-		apiUrl,
-		{},
-		{
-			refreshInterval: 10000,
-		}
-	);
+	const { data, isLoading, error } = useGet<StatusPageResponse>(apiUrl);

 	const statusPage = data?.statusPage;
 	const monitors = data?.monitors ?? [];

 	if (!statusPage) return null;

-	if (monitors.length === 0) {
+	if (monitors?.length === 0) {
 		return (
 			<BasePage
 				loading={isLoading}
@@ -97,7 +97,7 @@ export const StatusPagesTable = ({
 			{
 				id: "type",
 				content: t("common.table.headers.type"),
-				render: (row) => row.type.join(", "),
+				render: (row) => row.type,
 			},
 			{
 				id: "status",
@@ -20,7 +20,7 @@ import { useState, useMemo } from "react";
 import { useParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useGet } from "@/Hooks/UseApi";
-import { type MonitorDetailsResponse, supportsGeoCheck } from "@/Types/Monitor";
+import type { MonitorDetailsResponse } from "@/Types/Monitor";
 import type { ChecksResponse } from "@/Types/Check";
 import type {
 	GeoChecksResult,
@@ -122,7 +122,7 @@ const UptimeDetailsPage = () => {
 	);

 	const geoChecksUrl = useMemo(() => {
-		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();
@@ -141,7 +141,7 @@ const UptimeDetailsPage = () => {

 	// Fetch paginated geo checks for the table
 	const geoChecksTableUrl = useMemo(() => {
-		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();
@@ -70,7 +70,7 @@ const UptimeMonitorsPage = () => {
 	const effectiveTypes =
 		selectedTypes.length > 0
 			? selectedTypes
-			: ["http", "ping", "docker", "port", "game", "grpc", "websocket"];
+			: ["http", "ping", "docker", "port", "game", "grpc"];

 	// Build URL for monitors with checks
 	const monitorsWithChecksUrl = useMemo(() => {
@@ -1,5 +1,3 @@
-export const CHECK_TTL_SENTINEL = 366;
-
 export interface CheckMetadata {
 	monitorId: string;
 	teamId: string;
@@ -127,6 +125,9 @@ export interface Check {
 	timings?: CheckTimings;
 	statusCode: number;
 	message: string;
+	ack: boolean;
+	ackAt?: string | null;
+	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -139,6 +140,7 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
+	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -241,7 +243,10 @@ export interface ChecksSummary {
 	downChecks: number;
 }

-export type CheckSnapshot = Omit<Check, "metadata" | "__v" | "updatedAt"> & {
+export type CheckSnapshot = Omit<
+	Check,
+	"metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt"
+> & {
 	originalResponseTime: number;
 };

@@ -12,20 +12,10 @@ export const MonitorTypes = [
 	"port",
 	"game",
 	"grpc",
-	"websocket",
 	"unknown",
 ] as const;
 export type MonitorType = (typeof MonitorTypes)[number];

-export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
-
-export const supportsGeoCheck = (type: MonitorType | undefined): boolean => {
-	if (!type) {
-		return false;
-	}
-	return GeoCheckSupportedTypes.includes(type);
-};
-
 export const MonitorStatuses = [
 	"up",
 	"down",
@@ -5,8 +5,6 @@ export const NotificationChannels = [
 	"webhook",
 	"pager_duty",
 	"matrix",
-	"teams",
-	"telegram",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];

@@ -1,32 +1,10 @@
-import type { Monitor, MonitorType } from "@/Types/Monitor";
-export const StatusPageTypes = ["uptime", "infrastructure", "pagespeed"] as const;
-export type StatusPageType = (typeof StatusPageTypes)[number];
-
-export const MONITOR_TYPE_KEYS: Partial<Record<MonitorType, string>> = {
-	http: "pages.common.monitors.monitorTypes.optionHttp",
-	ping: "pages.common.monitors.monitorTypes.optionPing",
-	docker: "pages.common.monitors.monitorTypes.optionDocker",
-	port: "pages.common.monitors.monitorTypes.optionPort",
-	game: "pages.common.monitors.monitorTypes.optionGame",
-	grpc: "pages.common.monitors.monitorTypes.optionGrpc",
-	websocket: "pages.common.monitors.monitorTypes.optionWebSocket",
-	hardware: "pages.common.monitors.monitorTypes.optionHardware",
-	pagespeed: "pages.common.monitors.monitorTypes.optionPagespeed",
-};
-
-export const getMonitorTypeLabel = (
-	type: MonitorType,
-	t: (key: string) => string
-): string => {
-	const key = MONITOR_TYPE_KEYS[type];
-	return key ? t(key) : type;
-};
+import type { Monitor } from "@/Types/Monitor";

 export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: StatusPageType[];
+	type: string;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -42,8 +20,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
-	showPageSpeed: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;
@@ -9,7 +9,6 @@ export const getMonitorPath = (type: MonitorType): string => {
 		ping: "uptime",
 		game: "uptime",
 		grpc: "uptime",
-		websocket: "uptime",
 		unknown: "uptime",
 		docker: "uptime",
 		hardware: "infrastructure",
@@ -78,12 +77,6 @@ export const getPageSpeedPalette = (score: number): PaletteKey => {
 	else return "error";
 };

-export const getPageSpeedGaugeColor = (val: number, theme: any) => {
-	if (val >= 90) return theme.palette.success.main;
-	else if (val >= 50) return theme.palette.warning.light;
-	else return theme.palette.error.light;
-};
-
 export const formatUrl = (url: string, maxLength: number = 55) => {
 	if (!url) return "";

@@ -12,8 +12,6 @@ export const typographyLevels = {
 export const colors = {
 	gray200: "#EFEFEF",
 	gray700: "#313131",
-	gray900: "#151518",
-	gray850: "#1c1c21",
 	blueBlueWave: "#1570EF",
 };

@@ -33,8 +31,4 @@ export const darkPalette = {
 	secondary: {
 		main: colors.gray700,
 	},
-	background: {
-		default: colors.gray900,
-		paper: colors.gray850,
-	},
 };
@@ -115,13 +115,6 @@ const hardwareSchema = baseSchema.extend({
 	selectedDisks: z.array(z.string()),
 });

-// WebSocket monitor schema
-const websocketSchema = baseSchema.extend({
-	type: z.literal("websocket"),
-	url: z.string().min(1, "WebSocket URL is required"),
-	ignoreTlsErrors: z.boolean(),
-});
-
 // Discriminated union of all monitor types
 export const monitorSchema = z.discriminatedUnion("type", [
 	httpSchema,
@@ -132,7 +125,6 @@ export const monitorSchema = z.discriminatedUnion("type", [
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
-	websocketSchema,
 ]);

 export type MonitorFormData = z.infer<typeof monitorSchema>;
@@ -147,5 +139,4 @@ export {
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
-	websocketSchema,
 };
@@ -45,17 +45,6 @@ const matrixSchema = baseSchema.extend({
 	accessToken: z.string().min(1, "Access token is required"),
 });

-const teamsSchema = baseSchema.extend({
-	type: z.literal("teams"),
-	address: z.string().min(1, "Webhook URL is required").url("Please enter a valid URL"),
-});
-
-const telegramSchema = baseSchema.extend({
-	type: z.literal("telegram"),
-	address: z.string().min(1, "Chat ID is required"),
-	accessToken: z.string().min(1, "Bot token is required"),
-});
-
 export const notificationSchema = z.discriminatedUnion("type", [
 	emailSchema,
 	slackSchema,
@@ -63,8 +52,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 	webhookSchema,
 	pagerDutySchema,
 	matrixSchema,
-	teamsSchema,
-	telegramSchema,
 ]);

 export type NotificationFormData = z.infer<typeof notificationSchema>;
@@ -1,4 +1,3 @@
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 import { z } from "zod";

 export const settingsSchema = z.object({
@@ -7,42 +6,39 @@ export const settingsSchema = z.object({
 	systemEmailRejectUnauthorized: z.boolean(),
 	systemEmailConnectionHost: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailSecure: z.boolean().optional(),
 	systemEmailPool: z.boolean().optional(),
 	showURL: z.boolean().optional(),
-	checkTTL: z
-		.number()
-		.int()
-		.min(1, "Please enter a value")
-		.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
+	checkTTL: z.number().int().min(1, "Please enter a value").max(365, "Maximum 365 days"),
 	pagespeedApiKey: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailHost: z
 		.string()
 		.regex(/^[a-zA-Z0-9.-]*$/, "Invalid hostname or IP address")
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPort: z.number().int().min(1).max(65535).optional(),
 	systemEmailAddress: z
+		.string()
 		.email("Please enter a valid email address")
 		.or(z.literal(""))
-		.transform((val) => (val === "" ? null : val.toLowerCase().trim()))
+		.transform((val) => (val === "" ? undefined : val.toLowerCase().trim()))
 		.optional(),
 	systemEmailUser: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPassword: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailTLSServername: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	globalThresholds: z.object({
 		cpu: z.number().int().min(1).max(100),
@@ -52,5 +48,4 @@ export const settingsSchema = z.object({
 	}),
 });

-export type SettingsFormInput = z.input<typeof settingsSchema>;
 export type SettingsFormData = z.infer<typeof settingsSchema>;
@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { StatusPageTypes } from "@/Types/StatusPage";

 export const statusPageSchema = z.object({
 	companyName: z
@@ -15,15 +14,12 @@ export const statusPageSchema = z.object({
 			"URL can only contain lowercase letters, numbers, and hyphens"
 		),
 	timezone: z.string().optional(),
-	type: z.array(z.enum(StatusPageTypes)).min(1, "At least one type is required"),
 	color: z.string().min(1, "Color is required"),
 	monitors: z.array(z.string()).min(1, "At least one monitor is required"),
 	isPublished: z.boolean(),
 	showCharts: z.boolean(),
 	showUptimePercentage: z.boolean(),
 	showAdminLoginLink: z.boolean(),
-	showInfrastructure: z.boolean(),
-	showPageSpeed: z.boolean(),
 	customCSS: z.string().optional(),
 	logo: z
 		.object({
@@ -288,13 +288,7 @@ const logoImageValidation = joi
 	.optional(); // Make entire object optional

 const statusPageValidation = joi.object({
-	type: joi
-		.alternatives()
-		.try(
-			joi.string().valid("uptime", "infrastructure"),
-			joi.array().items(joi.string().valid("uptime", "infrastructure"))
-		)
-		.required(),
+	type: joi.string().valid("uptime").required(),
 	isPublished: joi.bool(),
 	companyName: joi
 		.string()
@@ -323,8 +317,6 @@ const statusPageValidation = joi.object({
 	showUptimePercentage: joi.boolean(),
 	showCharts: joi.boolean(),
 	showAdminLoginLink: joi.boolean(),
-	showInfrastructure: joi.boolean(),
-	showPageSpeed: joi.boolean(),
 });

 const settingsValidation = joi.object({
@@ -46,8 +46,7 @@
 			"sendTestEmail": "Send test email",
 			"exportToJSON": "Export to JSON",
 			"importFromJSON": "Import from JSON",
-			"clearFilters": "Clear filters",
-			"removeUser": "Remove user"
+			"clearFilters": "Clear filters"
 		},
 		"charts": {
 			"labels": {
@@ -401,23 +400,12 @@
 				},
 				"status": {
 					"down": "down",
-					"breached": "threshold exceeded",
+					"breached": "breached",
 					"initializing": "initializing",
 					"maintenance": "maintenance",
 					"paused": "paused",
 					"total": "total",
 					"up": "up"
-				},
-				"monitorTypes": {
-					"optionDocker": "Docker",
-					"optionGame": "Game",
-					"optionHttp": "HTTP(S)",
-					"optionPing": "Ping",
-					"optionPort": "Port",
-					"optionPagespeed": "PageSpeed",
-					"optionHardware": "Infrastructure",
-					"optionGrpc": "gRPC",
-					"optionWebSocket": "WebSocket"
 				}
 			}
 		},
@@ -499,10 +487,6 @@
 						"grpcServiceName": {
 							"label": "Service name",
 							"placeholder": "e.g. my.service.v1 (leave empty for overall health)"
-						},
-						"wsUrl": {
-							"label": "WebSocket URL",
-							"placeholder": "wss://example.com/socket"
 						}
 					},
 					"title": "General settings",
@@ -514,7 +498,6 @@
 						"game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type.",
 						"pagespeed": "Track page load performance, Core Web Vitals, and optimization scores for your website.",
 						"grpc": "Enter the hostname and port of the gRPC server, optionally specify a service name for the health check, and add a display name.",
-						"websocket": "Enter the WebSocket URL to monitor (e.g., wss://example.com/socket) and add a display name.",
 						"hardware": "Monitor CPU, memory, disk usage, and temperature for your infrastructure."
 					}
 				},
@@ -545,12 +528,17 @@
 				},
 				"type": {
 					"description": "Select the type of check to perform",
+					"optionDocker": "Docker",
 					"optionDockerDescription": "Use Docker to monitor if a container is running.",
+					"optionGame": "Game",
 					"optionGameDescription": "Monitor if a specific game server is online.",
+					"optionGrpc": "gRPC",
 					"optionGrpcDescription": "Monitor gRPC services using the standard Health Checking Protocol.",
-					"optionWebSocketDescription": "Monitor WebSocket endpoints for connection health and response time.",
+					"optionHttp": "HTTP(S)",
 					"optionHttpDescription": "Use HTTP(S) to monitor your website or API endpoint.",
+					"optionPing": "Ping",
 					"optionPingDescription": "Use ICMP Ping to monitor if a server is online.",
+					"optionPort": "Port",
 					"optionPortDescription": "Monitor if a specific port on a server is open.",
 					"title": "Type"
 				},
@@ -631,12 +619,6 @@
 					"title": "Roles",
 					"description": "Assign roles to the user. Multiple roles can be selected."
 				}
-			},
-			"dialog": {
-				"removeUser": {
-					"title": "Remove user",
-					"content": "Are you sure you want to remove {{name}} from your team? This action cannot be undone."
-				}
 			}
 		},
 		"incidents": {
@@ -951,14 +933,6 @@
 					"description": "Select the type of notification channel to create.",
 					"optionType": "Type",
 					"title": "Channel type"
-				},
-				"telegram": {
-					"title": "Telegram configuration",
-					"description": "Configure your Telegram bot to send notifications.",
-					"optionBotToken": "Bot token",
-					"placeholderBotToken": "123456789:ABCdefGhIJKlmNoPQRsTUVwxyZ",
-					"optionChatId": "Chat ID",
-					"placeholderChatId": "-1001234567890"
 				}
 			},
 			"table": {
@@ -1053,7 +1027,7 @@
 				},
 				"stats": {
 					"title": "Monitor history",
-					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
+					"description": "Define how long you want to retain historical data. You can also clear all existing data.",
 					"option": {
 						"clear": {
 							"label": "Clear all stats. This is irreversible."
@@ -1064,16 +1038,6 @@
 						"description": "This cannot be undone"
 					}
 				},
-				"retention": {
-					"title": "Check retention",
-					"description": "Set how long check data is retained before being automatically cleaned up.",
-					"option": {
-						"days": {
-							"label": "Retention period (days)",
-							"unlimited": "Unlimited"
-						}
-					}
-				},
 				"thresholds": {
 					"title": "Global Thresholds",
 					"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
@@ -1190,29 +1154,7 @@
 			},
 			"monitorsList": {
 				"chartTypeHeatmap": "Heatmap",
-				"chartTypeHistogram": "Histogram",
-				"noData": "No data available",
-				"infrastructure": {
-					"title": "Infrastructure",
-					"cpu": "CPU",
-					"memory": "RAM",
-					"memoryText": "Memory",
-					"disk": "Disk",
-					"usage": "Usage",
-					"used": "Used",
-					"total": "Total"
-				},
-				"pagespeed": {
-					"title": "PageSpeed",
-					"performance": "Performance",
-					"accessibility": "Accessibility",
-					"bestPractices": "Best Practices",
-					"seo": "SEO"
-				},
-				"uptime": {
-					"title": "Uptime",
-					"responseTime": "Response time"
-				}
+				"chartTypeHistogram": "Histogram"
 			},
 			"statusBar": {
 				"allDown": "All systems are down",
@@ -1304,12 +1246,6 @@
 						},
 						"showAdminLoginLink": {
 							"label": "Show admin login link"
-						},
-						"showInfrastructure": {
-							"label": "Show infrastructure metrics"
-						},
-						"showPageSpeed": {
-							"label": "Show PageSpeed scores"
 						}
 					}
 				}
@@ -7,7 +7,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

 export default defineConfig(({}) => {
-	let version = "3.5.1";
+	let version = "3.5.0";

 	return {
 		base: "/",
@@ -32,14 +32,11 @@ export default [
 		languageOptions: {
 			parser: tseslint.parser,
 			parserOptions: {
-				projectService: {
-					allowDefaultProject: ["jest.config.ts"],
-				},
+				projectService: true,
 				tsconfigRootDir: import.meta.dirname,
 			},
 		},
 		rules: {
-			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
 			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},
@@ -510,24 +510,42 @@
 				"summary": "Get monitors by team",
 				"description": "Get monitors filtered by team with optional parameters",
 				"parameters": [
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Filter by monitor status (up/down)",
+						"schema": {
+							"type": "boolean"
+						}
+					},
 					{
 						"name": "type",
 						"in": "query",
 						"description": "Filter by monitor type",
 						"schema": {
-							"oneOf": [
-								{
-									"type": "string",
-									"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
-								},
-								{
-									"type": "array",
-									"items": {
-										"type": "string",
-										"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
-									}
-								}
-							]
+							"type": "string",
+							"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"]
+						}
+					},
+					{
+						"name": "page",
+						"in": "query",
+						"description": "Page number for pagination",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"default": 1
+						}
+					},
+					{
+						"name": "rowsPerPage",
+						"in": "query",
+						"description": "Number of monitors per page",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"maximum": 100,
+							"default": 10
 						}
 					},
 					{
@@ -537,6 +555,15 @@
 						"schema": {
 							"type": "string"
 						}
+					},
+					{
+						"name": "field",
+						"in": "query",
+						"description": "Field to filter on",
+						"schema": {
+							"type": "string",
+							"enum": ["name", "url", "description"]
+						}
 					}
 				],
 				"responses": {
@@ -729,7 +756,7 @@
 					}
 				]
 			},
-			"patch": {
+			"put": {
 				"tags": ["monitors"],
 				"summary": "Update monitor",
 				"description": "Update an existing monitor",
@@ -3541,19 +3568,22 @@
 			},
 			"CreateMonitorRequest": {
 				"type": "object",
-				"required": ["name", "type", "url"],
+				"required": ["name", "description", "type", "url", "interval"],
 				"properties": {
 					"name": {
 						"type": "string",
+						"minLength": 1,
+						"maxLength": 100,
 						"example": "My Website Monitor"
 					},
 					"description": {
 						"type": "string",
+						"maxLength": 500,
 						"example": "Monitors the main website homepage"
 					},
 					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"],
+						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"],
 						"example": "http"
 					},
 					"url": {
@@ -3563,34 +3593,14 @@
 					},
 					"interval": {
 						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600,
 						"example": 300,
 						"description": "Check interval in seconds"
 					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
-					},
 					"isActive": {
-						"type": "boolean"
-					},
-					"ignoreTlsErrors": {
 						"type": "boolean",
-						"default": false
-					},
-					"useAdvancedMatching": {
-						"type": "boolean",
-						"default": false
-					},
-					"port": {
-						"type": "integer"
+						"default": true
 					},
 					"notifications": {
 						"type": "array",
@@ -3599,62 +3609,51 @@
 						},
 						"description": "Array of notification IDs to associate with this monitor"
 					},
-					"secret": {
-						"type": "string"
-					},
-					"jsonPath": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
-						"type": "string",
-						"enum": ["equal", "include", "regex", ""]
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string",
-						"default": ""
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
+					"httpOptions": {
+						"type": "object",
+						"properties": {
+							"method": {
+								"type": "string",
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"],
+								"default": "GET"
+							},
+							"headers": {
+								"type": "object",
+								"additionalProperties": {
+									"type": "string"
+								}
+							},
+							"body": {
+								"type": "string",
+								"description": "Request body for POST/PUT requests"
+							},
+							"timeout": {
+								"type": "integer",
+								"minimum": 1000,
+								"maximum": 30000,
+								"default": 5000,
+								"description": "Request timeout in milliseconds"
+							}
 						}
 					},
-					"group": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
+					"assertions": {
 						"type": "array",
 						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},
@@ -3662,32 +3661,21 @@
 				"type": "object",
 				"properties": {
 					"name": {
-						"type": "string"
-					},
-					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"]
-					},
-					"url": {
-						"type": "string"
-					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
+						"minLength": 1,
+						"maxLength": 100
 					},
 					"description": {
-						"type": "string"
+						"type": "string",
+						"maxLength": 500
 					},
 					"interval": {
-						"type": "integer"
+						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600
+					},
+					"isActive": {
+						"type": "boolean"
 					},
 					"notifications": {
 						"type": "array",
@@ -3695,72 +3683,47 @@
 							"type": "string"
 						}
 					},
-					"secret": {
-						"type": "string"
-					},
-					"ignoreTlsErrors": {
-						"type": "boolean"
-					},
-					"useAdvancedMatching": {
-						"type": "boolean"
-					},
-					"jsonPath": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
-						"type": "string",
-						"enum": ["equal", "include", "regex", ""]
-					},
-					"port": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 65535
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string"
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
+					"httpOptions": {
+						"type": "object",
+						"properties": {
+							"method": {
+								"type": "string",
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"]
+							},
+							"headers": {
+								"type": "object",
+								"additionalProperties": {
+									"type": "string"
+								}
+							},
+							"body": {
+								"type": "string"
+							},
+							"timeout": {
+								"type": "integer",
+								"minimum": 1000,
+								"maximum": 30000
+							}
 						}
 					},
-					"group": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
+					"assertions": {
 						"type": "array",
 						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},
@@ -8,14 +8,14 @@
 		"test": "NODE_OPTIONS=--experimental-vm-modules c8 jest --runInBand",
 		"dev": "nodemon --exec tsx src/index.js",
 		"start": "node --watch ./dist/index.js",
-		"build": "tsc && tsc-alias && cp -r src/templates dist/templates",
+		"build": "tsc && tsc-alias",
 		"lint": "eslint .",
 		"lint-fix": "eslint --fix .",
 		"format": "prettier --write .",
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "npm run format"
 	},
 	"keywords": [],
 	"author": "",
@@ -38,7 +38,7 @@
 		"dotenv": "^16.4.5",
 		"express": "^4.19.2",
 		"express-rate-limit": "8.0.1",
-		"gamedig": "5.2.0",
+		"gamedig": "^5.3.1",
 		"got": "14.4.7",
 		"handlebars": "^4.7.8",
 		"helmet": "^8.0.0",
@@ -51,15 +51,13 @@
 		"mjml": "^5.0.0-alpha.4",
 		"mongoose": "^8.3.3",
 		"multer": "^1.4.5-lts.1",
-		"nodemailer": "8.0.1",
-		"pg": "8.20.0",
+		"nodemailer": "^6.9.14",
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
 		"super-simple-scheduler": "1.4.5",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0",
-		"ws": "^8.19.0",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
@@ -78,10 +76,8 @@
 		"@types/multer": "^2.0.0",
 		"@types/nodemailer": "7.0.1",
 		"@types/papaparse": "^5.5.2",
-		"@types/pg": "8.20.0",
 		"@types/ping": "0.4.4",
 		"@types/swagger-ui-express": "4.1.8",
-		"@types/ws": "^8.18.1",
 		"@typescript-eslint/eslint-plugin": "^8.56.1",
 		"@typescript-eslint/parser": "^8.56.1",
 		"c8": "10.1.3",
@@ -4,7 +4,7 @@ import cors from "cors";
 import helmet from "helmet";
 import compression from "compression";
 import cookieParser from "cookie-parser";
-import swaggerUi, { type JsonObject } from "swagger-ui-express";
+import swaggerUi from "swagger-ui-express";
 import { handleErrors } from "@/middleware/handleErrors.js";
 import { generalApiLimiter } from "@/middleware/rateLimiter.js";
 import { sanitizeBody, sanitizeQuery } from "@/middleware/sanitization.js";
@@ -24,7 +24,7 @@ export const createApp = ({
 	controllers: InitializedControllers;
 	envSettings: EnvConfig;
 	frontendPath: string;
-	openApiSpec: JsonObject;
+	openApiSpec: any;
 }) => {
 	const allowedOrigin = envSettings.clientHost;
 	const app = express();
@@ -74,22 +74,8 @@ export const createApp = ({
 			},
 		})
 	);
-	// Swagger UI — dynamically set server URL from request
-	app.use("/api-docs", swaggerUi.serve, (req: express.Request, res: express.Response, next: express.NextFunction) => {
-		const protocol = req.protocol;
-		const host = req.get("host");
-		const dynamicSpec = {
-			...openApiSpec,
-			servers: [
-				{
-					url: `${protocol}://${host}/api/v1`,
-					description: "Current Server",
-				},
-				...openApiSpec.servers,
-			],
-		};
-		swaggerUi.setup(dynamicSpec)(req, res, next);
-	});
+	// Swagger UI
+	app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(openApiSpec));

 	app.use("/api/v1/health", (req, res) => {
 		res.json({
@@ -31,7 +31,7 @@ export interface InitializedControllers {
 export const initializeControllers = (services: InitializedServices): InitializedControllers => {
 	return {
 		authController: new AuthController(services.userService),
-		monitorController: new MonitorController(services.monitorService, services.notificationsService),
+		monitorController: new MonitorController(services.monitorService),
 		settingsController: new SettingsController(services.settingsService, services.emailService),
 		checkController: new CheckController(services.checkService),
 		geoCheckController: new GeoCheckController(services.geoChecksService),
@@ -1,9 +1,6 @@
-import type { Application } from "express";
 import { createVerifyJWT } from "../middleware/verifyJWT.js";
 import { createVerifyStatusPageAccess } from "../middleware/verifyStatusPageAccess.js";
 import { authApiLimiter } from "../middleware/rateLimiter.js";
-import type { InitializedControllers } from "./controllers.js";
-import type { InitializedServices } from "./services.js";

 import AuthRoutes from "../routes/authRoute.js";
 import InviteRoutes from "../routes/inviteRoute.js";
@@ -20,7 +17,7 @@ import NotificationRoutes from "../routes/notificationRoute.js";

 import IncidentRoutes from "../routes/incidentRoute.js";

-export const setupRoutes = (app: Application, controllers: InitializedControllers, services: InitializedServices) => {
+export const setupRoutes = (app: any, controllers: Record<string, any>, services: Record<string, any>) => {
 	const verifyJWT = createVerifyJWT(services.settingsService);
 	const authRoutes = new AuthRoutes(controllers.authController, verifyJWT);
 	const monitorRoutes = new MonitorRoutes(controllers.monitorController);
@@ -1,72 +1,35 @@
 import MongoDB from "../db/MongoDB.js";
-import { IDb } from "@/db/IDb.js";
+import NetworkService from "../service/infrastructure/networkService.js";
+import EmailService from "../service/infrastructure/emailService.js";
+import BufferService from "../service/infrastructure/bufferService.js";
 import {
-	// Service classes
-	NetworkService,
-	EmailService,
-	BufferService,
-	GlobalPingService,
-	SuperSimpleQueue,
-	SuperSimpleQueueHelper,
 	NotificationsService,
 	StatusService,
-	NotificationMessageBuilder,
-	MonitorService,
-	StatusPageService,
-	UserService,
-	CheckService,
-	GeoChecksService,
-	DiagnosticService,
-	InviteService,
-	MaintenanceWindowService,
-	IncidentService,
-	// Notification providers
 	WebhookProvider,
 	SlackProvider,
 	EmailProvider,
 	DiscordProvider,
 	PagerDutyProvider,
 	MatrixProvider,
-	TeamsProvider,
-	TelegramProvider,
-	// Interfaces
-	INetworkService,
-	IEmailService,
-	IBufferService,
-	ISuperSimpleQueue,
 	INotificationsService,
-	IStatusService,
-	IMonitorService,
-	IUserService,
-	ICheckService,
-	IGeoChecksService,
-	IDiagnosticService,
-	IInviteService,
-	IMaintenanceWindowService,
-	IStatusPageService,
-	IIncidentService,
-	INotificationMessageBuilder,
-	ISettingsService,
-	SettingsService,
-	EnvConfig,
 } from "@/service/index.js";
-
-// Network providers
-import { PingProvider } from "@/service/infrastructure/network/PingProvider.js";
-import { HttpProvider } from "@/service/infrastructure/network/HttpProvider.js";
-import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
-import { PageSpeedProvider } from "@/service/infrastructure/network/PageSpeedProvider.js";
-import { HardwareProvider } from "@/service/infrastructure/network/HardwareProvider.js";
-import { DockerProvider } from "@/service/infrastructure/network/DockerProvider.js";
-import { PortProvider } from "@/service/infrastructure/network/PortProvider.js";
-import { GameProvider } from "@/service/infrastructure/network/GameProvider.js";
-import { GrpcProvider } from "@/service/infrastructure/network/GrpcProvider.js";
-import { WebSocketProvider } from "@/service/infrastructure/network/WebSocketProvider.js";
-
-// Third-party
+import SuperSimpleQueueHelper from "../service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
+import SuperSimpleQueue from "../service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
+import UserService from "../service/business/userService.js";
+import CheckService from "../service/business/checkService.js";
+import GeoChecksService from "../service/business/geoChecksService.js";
+import GlobalPingService from "../service/infrastructure/globalPingService.js";
+import DiagnosticService from "../service/business/diagnosticService.js";
+import InviteService from "../service/business/inviteService.js";
+import MaintenanceWindowService from "../service/business/maintenanceWindowService.js";
+import { MonitorService } from "@/service/index.js";
+import { StatusPageService, IStatusPageService } from "../service/business/statusPageService.js";
+import IncidentService from "../service/business/incidentService.js";
+import { NotificationMessageBuilder, INotificationMessageBuilder } from "../service/infrastructure/notificationMessageBuilder.js";
 import axios from "axios";
 import got from "got";
 import ping from "ping";
+import https from "https";
 import Docker from "dockerode";
 import net from "net";
 import fs from "fs";
@@ -81,9 +44,8 @@ import { games, GameDig } from "gamedig";
 import jmespath from "jmespath";
 import * as grpc from "@grpc/grpc-js";
 import * as protoLoader from "@grpc/proto-loader";
-import WebSocket from "ws";

-// Repositories
+// repositories
 import {
 	MongoMonitorsRepository,
 	MongoChecksRepository,
@@ -94,23 +56,9 @@ import {
 	MongoInvitesRepository,
 	MongoRecoveryTokensRepository,
 	MongoNotificationsRepository,
-	MongoIncidentsRepository,
+	MongoIncidentRepository,
 	MongoTeamsRepository,
 	MongoMaintenanceWindowsRepository,
-	MongoSettingsRepository,
-	TimescaleMonitorsRepository,
-	TimescaleChecksRepository,
-	TimescaleGeoChecksRepository,
-	TimescaleMonitorStatsRepository,
-	TimescaleStatusPagesRepository,
-	TimescaleUsersRepository,
-	TimescaleInvitesRepository,
-	TimescaleRecoveryTokensRepository,
-	TimescaleNotificationsRepository,
-	TimescaleIncidentsRepository,
-	TimescaleTeamsRepository,
-	TimescaleMaintenanceWindowsRepository,
-	TimescaleSettingsRepository,
 	IMonitorsRepository,
 	IChecksRepository,
 	IGeoChecksRepository,
@@ -126,25 +74,24 @@ import {
 	IMaintenanceWindowsRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
-import TimescaleDB from "@/db/TimescaleDB.js";
-import { AppError } from "@/utils/AppError.js";
+import { EnvConfig } from "@/service/system/settingsService.js";

 export type InitializedServices = {
-	settingsService: ISettingsService;
-	db: IDb;
-	networkService: INetworkService;
-	emailService: IEmailService;
-	bufferService: IBufferService;
-	statusService: IStatusService;
-	jobQueue: ISuperSimpleQueue;
-	userService: IUserService;
-	checkService: ICheckService;
-	geoChecksService: IGeoChecksService;
-	diagnosticService: IDiagnosticService;
-	inviteService: IInviteService;
-	maintenanceWindowService: IMaintenanceWindowService;
-	monitorService: IMonitorService;
-	incidentService: IIncidentService;
+	settingsService: any;
+	db: any;
+	networkService: any;
+	emailService: any;
+	bufferService: any;
+	statusService: any;
+	jobQueue: any;
+	userService: any;
+	checkService: any;
+	geoChecksService: any;
+	diagnosticService: any;
+	inviteService: any;
+	maintenanceWindowService: any;
+	monitorService: any;
+	incidentService: any;
 	logger: ILogger;
 	notificationsService: INotificationsService;
 	statusPageService: IStatusPageService;
@@ -170,104 +117,49 @@ export const initializeServices = async ({
 	logger,
 	envSettings,
 	settingsService,
+	settingsRepository,
 }: {
 	logger: ILogger;
 	envSettings: EnvConfig;
-	settingsService: ISettingsService;
+	settingsService: any;
+	settingsRepository: ISettingsRepository;
 }): Promise<InitializedServices> => {
 	// Create DB

-	const dbType = envSettings.dbType;
-
-	let db: IDb | null = null;
-
-	if (dbType === "mongodb") {
-		db = new MongoDB(logger, envSettings);
-	} else if (dbType === "timescaledb") {
-		db = new TimescaleDB(logger, envSettings);
-	}
-
-	if (!db) {
-		throw new AppError({ message: "Unsupported database type", status: 500 });
-	}
+	const db = new MongoDB(logger, envSettings);

 	await db.connect();

-	let monitorsRepository: IMonitorsRepository;
-	let checksRepository: IChecksRepository;
-	let geoChecksRepository: IGeoChecksRepository;
-	let monitorStatsRepository: IMonitorStatsRepository;
-	let statusPagesRepository: IStatusPagesRepository;
-	let usersRepository: IUsersRepository;
-	let invitesRepository: IInvitesRepository;
-	let recoveryTokensRepository: IRecoveryTokensRepository;
-	let settingsRepository: ISettingsRepository;
-	let notificationsRepository: INotificationsRepository;
-	let incidentsRepository: IIncidentsRepository;
-	let teamsRepository: ITeamsRepository;
-	let maintenanceWindowsRepository: IMaintenanceWindowsRepository;
-
 	// Repositories
+	const monitorsRepository = new MongoMonitorsRepository();
+	const checksRepository = new MongoChecksRepository(logger);
+	const geoChecksRepository = new MongoGeoChecksRepository(logger);
+	const monitorStatsRepository = new MongoMonitorStatsRepository();
+	const statusPagesRepository = new MongoStatusPagesRepository();
+	const usersRepository = new MongoUsersRepository();
+	const invitesRepository = new MongoInvitesRepository();
+	const recoveryTokensRepository = new MongoRecoveryTokensRepository();
+	const notificationsRepository = new MongoNotificationsRepository();
+	const incidentsRepository = new MongoIncidentRepository();
+	const teamsRepository = new MongoTeamsRepository();
+	const maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();

-	if (dbType === "mongodb") {
-		monitorsRepository = new MongoMonitorsRepository();
-		checksRepository = new MongoChecksRepository(logger);
-		geoChecksRepository = new MongoGeoChecksRepository(logger);
-		monitorStatsRepository = new MongoMonitorStatsRepository();
-		statusPagesRepository = new MongoStatusPagesRepository();
-		usersRepository = new MongoUsersRepository();
-		invitesRepository = new MongoInvitesRepository();
-		recoveryTokensRepository = new MongoRecoveryTokensRepository();
-		settingsRepository = new MongoSettingsRepository();
-		notificationsRepository = new MongoNotificationsRepository();
-		incidentsRepository = new MongoIncidentsRepository();
-		teamsRepository = new MongoTeamsRepository();
-		maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
-	} else {
-		const pool = db.getPool();
-		if (!pool) {
-			throw new Error("Failed to get database pool");
-		}
-		monitorsRepository = new TimescaleMonitorsRepository(pool);
-		checksRepository = new TimescaleChecksRepository(pool);
-		geoChecksRepository = new TimescaleGeoChecksRepository(pool);
-		monitorStatsRepository = new TimescaleMonitorStatsRepository(pool);
-		statusPagesRepository = new TimescaleStatusPagesRepository(pool);
-		usersRepository = new TimescaleUsersRepository(pool);
-		invitesRepository = new TimescaleInvitesRepository(pool);
-		recoveryTokensRepository = new TimescaleRecoveryTokensRepository(pool);
-		settingsRepository = new TimescaleSettingsRepository(pool);
-		notificationsRepository = new TimescaleNotificationsRepository(pool);
-		incidentsRepository = new TimescaleIncidentsRepository(pool);
-		teamsRepository = new TimescaleTeamsRepository(pool);
-		maintenanceWindowsRepository = new TimescaleMaintenanceWindowsRepository(pool);
-	}
-
-	// Inject settings repository into settings service (now that DB is connected)
-	(settingsService as SettingsService).setRepository(settingsRepository);
-
-	// Network providers
-	const pingProvider = new PingProvider(ping);
-	const httpProvider = new HttpProvider(got, new AdvancedMatcher(jmespath));
-	const pageSpeedProvider = new PageSpeedProvider(httpProvider, settingsService, logger);
-	const hardwareProvider = new HardwareProvider(httpProvider);
-	const dockerProvider = new DockerProvider(logger, Docker);
-	const portProvider = new PortProvider(net);
-	const gameProvider = new GameProvider(logger, GameDig);
-	const grpcProvider = new GrpcProvider(grpc, protoLoader);
-	const webSocketProvider = new WebSocketProvider(WebSocket);
-
-	const networkService = new NetworkService(axios, logger, [
-		pingProvider,
-		httpProvider,
-		pageSpeedProvider,
-		hardwareProvider,
-		dockerProvider,
-		portProvider,
-		gameProvider,
-		grpcProvider,
-		webSocketProvider,
-	]);
+	const networkService = new NetworkService(
+		axios,
+		got,
+		https,
+		jmespath,
+		GameDig as unknown as {
+			query: (options: { type: string; host: string; port?: number }) => Promise<{ ping?: number } & { [key: string]: unknown }>;
+		},
+		ping,
+		logger,
+		Docker,
+		net,
+		settingsService,
+		grpc,
+		protoLoader
+	);
 	const emailService = new EmailService(settingsService, fs, path, compile, mjml2html, nodemailer, logger);

 	const notificationMessageBuilder = new NotificationMessageBuilder();
@@ -289,15 +181,12 @@ export const initializeServices = async ({

 	const statusService = new StatusService(logger, bufferService, monitorsRepository, monitorStatsRepository, checksRepository);

-	// Notification providers
 	const webhookProvider = new WebhookProvider(logger);
 	const slackProvider = new SlackProvider(logger);
 	const emailProvider = new EmailProvider(emailService, logger);
 	const discordProvider = new DiscordProvider(logger);
 	const pagerDutyProvider = new PagerDutyProvider(logger);
 	const matrixProvider = new MatrixProvider(logger);
-	const teamsProvider = new TeamsProvider(logger);
-	const telegramProvider = new TelegramProvider(logger);

 	const notificationsService = new NotificationsService(
 		notificationsRepository,
@@ -308,8 +197,6 @@ export const initializeServices = async ({
 		discordProvider,
 		pagerDutyProvider,
 		matrixProvider,
-		teamsProvider,
-		telegramProvider,
 		settingsService,
 		logger,
 		notificationMessageBuilder
@@ -321,7 +208,6 @@ export const initializeServices = async ({
 		statusService,
 		notificationsService,
 		checkService,
-		settingsService,
 		bufferService,
 		incidentService,
 		maintenanceWindowsRepository,
@@ -378,6 +264,7 @@ export const initializeServices = async ({
 	const statusPageService = new StatusPageService(statusPagesRepository);

 	const services = {
+		//v1
 		settingsService,
 		db,
 		networkService,
@@ -1,6 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
+import { requireTeamId, requireUserRoles } from "./controllerUtils.js";
+import type { UserRole } from "@/types/user.js";

 import {
 	registrationBodyValidation,
@@ -19,33 +20,15 @@ import {
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
 } from "@/validation/userValidation.js";
-import { IUserService } from "@/service/index.js";

 const SERVICE_NAME = "authController";

-export interface IAuthController {
-	registerUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	createUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	loginUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	checkSuperadminExists(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	requestRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	validateRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	resetPassword(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getAllUsers(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserPasswordById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class AuthController implements IAuthController {
+class AuthController {
 	static SERVICE_NAME = SERVICE_NAME;

-	private userService: IUserService;
+	private userService: any;

-	constructor(userService: IUserService) {
+	constructor(userService: any) {
 		this.userService = userService;
 	}

@@ -58,12 +41,11 @@ class AuthController implements IAuthController {
 			const newUser = req.body.user;
 			const newUserToken = req.body.token;
 			if (newUser?.email) {
-				const newUserEmail = requireUserEmail(newUser.email);
-				newUser.email = newUserEmail.toLowerCase();
+				newUser.email = newUser.email.toLowerCase();
 			}
-			const validatedBody = registrationBodyValidation.parse(newUser);
+			registrationBodyValidation.parse(newUser);

-			const { user, token } = await this.userService.registerUser(validatedBody, newUserToken, req?.file ?? null);
+			const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
 			res.status(200).json({
 				success: true,
 				msg: "User registered successfully",
@@ -80,11 +62,11 @@ class AuthController implements IAuthController {
 			if (userData?.email) {
 				userData.email = userData.email.toLowerCase();
 			}
-			const validatedBody = createUserBodyValidation.parse(userData);
+			createUserBodyValidation.parse(userData);

 			const teamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			const newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
+			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
+			const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
 			res.status(201).json({
 				success: true,
 				msg: "User created successfully",
@@ -118,10 +100,8 @@ class AuthController implements IAuthController {

 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = editUserBodyValidation.parse(req.body);
-			const userId = requireUserId(req.user?.id);
-			const userEmail = requireUserEmail(req.user?.email);
-			const updatedUser = await this.userService.editUser(validatedBody, req?.file ?? null, userId, userEmail);
+			editUserBodyValidation.parse(req.body);
+			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);

 			res.status(200).json({
 				success: true,
@@ -190,15 +170,7 @@ class AuthController implements IAuthController {

 	deleteUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const userId = requireUserId(req.user?.id);
-			const teamId = requireTeamId(req.user?.teamId);
-			const roles = requireUserRoles(req.user?.role);
-
-			await this.userService.deleteUser({
-				userId,
-				teamId,
-				roles,
-			});
+			await this.userService.deleteUser(req.user);
 			return res.status(200).json({
 				success: true,
 				msg: "User deleted successfully",
@@ -208,23 +180,6 @@ class AuthController implements IAuthController {
 		}
 	};

-	deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
-		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const targetUserId = validatedParams.userId;
-			const actorId = requireUserId(req.user?.id);
-			const actorTeamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			await this.userService.deleteUserById({ actorId, actorTeamId, actorRoles, targetUserId });
-			return res.status(200).json({
-				success: true,
-				msg: "User removed successfully",
-			});
-		} catch (error) {
-			next(error);
-		}
-	};
-
 	getAllUsers = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const allUsers = await this.userService.getAllUsers();
@@ -240,9 +195,19 @@ class AuthController implements IAuthController {

 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const actorRoles = requireUserRoles(req.user?.role);
-			const user = await this.userService.getUserById(actorRoles, validatedParams.userId);
+			getUserByIdParamValidation.parse(req.params);
+			const userId = req?.params?.userId;
+			const roles = req?.user?.role;
+
+			if (!userId) {
+				throw new Error("No user ID in request");
+			}
+
+			if (!roles || roles.length === 0) {
+				throw new Error("No roles in request");
+			}
+
+			const user = await this.userService.getUserById(roles, userId);

 			return res.status(200).json({ success: true, msg: "ok", data: user });
 		} catch (error) {
@@ -252,19 +217,24 @@ class AuthController implements IAuthController {

 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			const actorId = requireUserId(req.user?.id);
+			const roles = req?.user?.role;

-			if (!actorRoles.includes("superadmin")) {
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}

-			const validatedParams = editUserByIdParamValidation.parse(req.params);
-			// If this is superadmin self edit, allow "superadmin" role
-			const validatedBody =
-				validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
+			const userId = req.params.userId as string;
+			const user = { ...req.body };

-			await this.userService.editUserById(validatedParams.userId, validatedBody);
+			editUserByIdParamValidation.parse(req.params);
+			// If this is superadmin self edit, allow "superadmin" role
+			if (userId === req.user?.id) {
+				editSuperadminUserByIdBodyValidation.parse(req.body);
+			} else {
+				editUserByIdBodyValidation.parse(req.body);
+			}
+
+			await this.userService.editUserById(userId, user);
 			return res.status(200).json({ success: true, msg: "ok" });
 		} catch (error) {
 			next(error);
@@ -273,14 +243,16 @@ class AuthController implements IAuthController {

 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			if (!actorRoles.includes("superadmin")) {
+			const roles = req?.user?.role;
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}

-			const validatedParams = editUserByIdParamValidation.parse(req.params);
-			const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
-			await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
+			const userId = req.params.userId as string;
+			editUserByIdParamValidation.parse(req.params);
+			editUserPasswordByIdBodyValidation.parse(req.body);
+			const updatedPassword = req.body.password;
+			await this.userService.setPasswordByUserId(userId, updatedPassword);
 			return res.status(200).json({ success: true, msg: "Password reset successfully" });
 		} catch (error) {
 			next(error);
@@ -4,28 +4,18 @@ import {
 	getChecksParamValidation,
 	getChecksQueryValidation,
 	getTeamChecksQueryValidation,
-	getChecksSummaryByTeamIdQueryValidation,
 	deleteChecksParamValidation,
+	deleteChecksByTeamIdParamValidation,
+	updateChecksTTLBodyValidation,
 } from "@/validation/checkValidation.js";
-import { ICheckService } from "@/service/index.js";
-import { requireTeamId } from "@/controllers/controllerUtils.js";

 const SERVICE_NAME = "checkController";

-export interface ICheckController {
-	serviceName: string;
-	getChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksSummaryByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecks: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecksByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class CheckController implements ICheckController {
+class CheckController {
 	static SERVICE_NAME = SERVICE_NAME;

-	private checkService: ICheckService;
-	constructor(checkService: ICheckService) {
+	private checkService: any;
+	constructor(checkService: any) {
 		this.checkService = checkService;
 	}

@@ -35,20 +25,13 @@ class CheckController implements ICheckController {

 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);

 			const result = await this.checkService.getChecksByMonitor({
-				monitorId: validatedParams.monitorId,
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				filter: validatedQuery.filter,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				status: validatedQuery.status,
+				monitorId: req?.params?.monitorId,
+				query: req?.query,
+				teamId: req?.user?.teamId,
 			});

 			return res.status(200).json({
@@ -63,16 +46,10 @@ class CheckController implements ICheckController {

 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getTeamChecksQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-
+			getTeamChecksQueryValidation.parse(req.query);
 			const checkData = await this.checkService.getChecksByTeam({
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				filter: validatedQuery.filter,
+				teamId: req?.user?.teamId,
+				query: req?.query,
 			});
 			return res.status(200).json({
 				success: true,
@@ -86,11 +63,8 @@ class CheckController implements ICheckController {

 	getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getChecksSummaryByTeamIdQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-			const dateRange = validatedQuery.dateRange ?? "hour";
-
-			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId, dateRange });
+			const dateRange = req.query?.dateRange || "hour";
+			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
 			return res.status(200).json({
 				success: true,
 				msg: "Checks summary retrieved successfully",
@@ -103,12 +77,11 @@ class CheckController implements ICheckController {

 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteChecksParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksParamValidation.parse(req.params);

 			const deletedCount = await this.checkService.deleteChecks({
-				monitorId: validatedParams.monitorId,
-				teamId,
+				monitorId: req.params.monitorId as string,
+				teamId: req?.user?.teamId,
 			});

 			return res.status(200).json({
@@ -123,9 +96,9 @@ class CheckController implements ICheckController {

 	deleteChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksByTeamIdParamValidation.parse(req.params);

-			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId });
+			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId: req?.user?.teamId });

 			return res.status(200).json({
 				success: true,
@@ -136,6 +109,24 @@ class CheckController implements ICheckController {
 			next(error);
 		}
 	};
+
+	updateChecksTTL = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			updateChecksTTLBodyValidation.parse(req.body);
+
+			await this.checkService.updateChecksTTL({
+				teamId: req?.user?.teamId,
+				ttl: req?.body?.ttl,
+			});
+
+			return res.status(200).json({
+				success: true,
+				msg: "Checks TTL updated successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
 }

 export default CheckController;
@@ -1,25 +1,24 @@
 import { AppError } from "@/utils/AppError.js";
-import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
-import sslChecker, { SSLDetails } from "ssl-checker";
-type SSLCheckerType = typeof sslChecker;
+import { type MonitorType, MonitorTypes } from "@/types/index.js";

-export const fetchMonitorCertificate = async (checker: SSLCheckerType, monitor: Monitor): Promise<SSLDetails> => {
+const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
 	const monitorUrl = new URL(monitor.url);
 	const hostname = monitorUrl.hostname;
-	const cert = await checker(hostname);
+	const cert = await sslChecker(hostname);
+	// Throw an error if no cert or if cert.validTo is not present
 	if (cert?.validTo === null || cert?.validTo === undefined) {
 		throw new Error("Certificate not found");
 	}
 	return cert;
 };
-export const requireString = (value: unknown, fieldName: string): string => {
+const requireString = (value: unknown, fieldName: string): string => {
 	if (typeof value === "string" && value.trim().length > 0) {
 		return value;
 	}
 	throw new AppError({ message: `${fieldName} is required`, status: 400 });
 };

-export const optionalString = (value: unknown, fieldName: string): string | undefined => {
+const optionalString = (value: unknown, fieldName: string): string | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -29,7 +28,7 @@ export const optionalString = (value: unknown, fieldName: string): string | unde
 	throw new AppError({ message: `${fieldName} must be a string`, status: 400 });
 };

-export const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
+const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -45,7 +44,7 @@ export const optionalNumber = (value: unknown, fieldName: string): number | unde
 	throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
 };

-export const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
+const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -63,7 +62,7 @@ export const optionalBoolean = (value: unknown, fieldName: string): boolean | un
 	throw new AppError({ message: `${fieldName} must be a boolean`, status: 400 });
 };

-export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
+const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
 	const parseSingle = (input: unknown): MonitorType => {
 		if (typeof input !== "string") {
 			throw new AppError({ message: "Monitor type must be a string", status: 400 });
@@ -83,7 +82,7 @@ export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorTyp
 	return parseSingle(value);
 };

-export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
+const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -93,36 +92,42 @@ export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	throw new AppError({ message: "order must be either 'asc' or 'desc'", status: 400 });
 };

-export const requireTeamId = (teamId?: string): string => {
+const requireTeamId = (teamId?: string): string => {
 	if (!teamId) {
 		throw new AppError({ message: "Team ID is required", status: 400 });
 	}
 	return teamId;
 };

-export const requireUserId = (userId?: string): string => {
+const requireUserId = (userId?: string): string => {
 	if (!userId) {
 		throw new AppError({ message: "User ID is required", status: 400 });
 	}
 	return userId;
 };
-export const requireUserEmail = (userEmail?: string): string => {
+const requireUserEmail = (userEmail?: string): string => {
 	if (!userEmail) {
 		throw new AppError({ message: "User email is required", status: 400 });
 	}
 	return userEmail;
 };

-export const requireFirstName = (firstName?: string): string => {
-	if (!firstName) {
-		throw new AppError({ message: "First name is required", status: 400 });
-	}
-	return firstName;
-};
-
-export const requireUserRoles = (userRoles?: UserRole[]): UserRole[] => {
+export const requireUserRoles = (userRoles?: string[]): string[] => {
 	if (!userRoles || userRoles.length === 0) {
 		throw new AppError({ message: "User roles are required", status: 400 });
 	}
 	return userRoles;
 };
+
+export {
+	fetchMonitorCertificate,
+	requireString,
+	optionalString,
+	optionalNumber,
+	optionalBoolean,
+	parseMonitorTypeFilter,
+	parseSortOrder,
+	requireTeamId,
+	requireUserId,
+	requireUserEmail,
+};
@@ -1,18 +1,12 @@
-import { IDiagnosticService } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";

 const SERVICE_NAME = "diagnosticController";
-
-export interface IDiagnosticController {
-	getSystemStats: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class DiagnosticController implements IDiagnosticController {
+class DiagnosticController {
 	static SERVICE_NAME = SERVICE_NAME;

-	private diagnosticService: IDiagnosticService;
+	private diagnosticService: any;

-	constructor(diagnosticService: IDiagnosticService) {
+	constructor(diagnosticService: any) {
 		this.diagnosticService = diagnosticService;
 	}

@@ -1,15 +1,10 @@
 import { Request, Response, NextFunction } from "express";
 import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
 import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
-import { requireTeamId } from "./controllerUtils.js";
-import { AppError } from "@/utils/AppError.js";

 const SERVICE_NAME = "geoCheckController";

-export interface IGeoCheckController {
-	getGeoChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class GeoCheckController implements IGeoCheckController {
+class GeoCheckController {
 	static SERVICE_NAME = SERVICE_NAME;

 	private geoChecksService: IGeoChecksService;
@@ -23,19 +18,13 @@ class GeoCheckController implements IGeoCheckController {

 	getGeoChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);

 			const result = await this.geoChecksService.getGeoChecksByMonitor({
-				monitorId: validatedParams.monitorId,
-				teamId: teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				continent: validatedQuery.continent,
+				monitorId: req?.params?.monitorId as string,
+				query: req?.query,
+				teamId: req?.user?.teamId as string,
 			});

 			return res.status(200).json({
@@ -1,37 +1,35 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
 import { requireTeamId, requireUserId, requireUserEmail } from "./controllerUtils.js";
-import { IIncidentService } from "@/service/index.js";
-import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";

-const SERVICE_NAME = "IncidentController";
+const SERVICE_NAME = "incidentController";

-export interface IIncidentController {
-	getIncidentsByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getIncidentSummary: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getIncidentById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	resolveIncidentManually: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class IncidentController implements IIncidentController {
-	private incidentService: IIncidentService;
-	constructor(incidentService: IIncidentService) {
+class IncidentController {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private incidentService: any;
+	constructor(incidentService: any) {
 		this.incidentService = incidentService;
 	}

+	get serviceName() {
+		return IncidentController.SERVICE_NAME;
+	}
+
 	getIncidentsByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getIncidentsByTeamQueryValidation.parse(req.query);
+			const { sortOrder, dateRange, page, rowsPerPage, status, monitorId, resolutionType } = req.query || {};

 			const teamId = requireTeamId(req.user?.teamId);
 			const result = await this.incidentService.getIncidentsByTeam(
 				teamId,
-				validatedQuery.sortOrder,
-				validatedQuery.dateRange,
-				validatedQuery.page,
-				validatedQuery.rowsPerPage,
-				validatedQuery.status,
-				validatedQuery.monitorId,
-				validatedQuery.resolutionType
+				sortOrder,
+				dateRange,
+				page,
+				rowsPerPage,
+				status,
+				monitorId,
+				resolutionType
 			);

 			return res.status(200).json({
@@ -47,9 +45,10 @@ class IncidentController implements IIncidentController {
 	getIncidentSummary = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const validatedQuery = getIncidentSummaryQueryValidation.parse(req.query);

-			const summary = await this.incidentService.getIncidentSummary(teamId, validatedQuery.limit);
+			const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : 10;
+
+			const summary = await this.incidentService.getIncidentSummary(teamId, limit);
 			return res.status(200).json({
 				success: true,
 				msg: "Incident summary retrieved successfully",
@@ -1,19 +1,12 @@
 import { Request, Response, NextFunction } from "express";
 import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
-import { requireFirstName, requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
-import { IInviteService } from "@/service/index.js";
+import { requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
 const SERVICE_NAME = "inviteController";

-export interface IInviteController {
-	getInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	sendInviteEmail: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	verifyInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class InviteController implements IInviteController {
+class InviteController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private inviteService: IInviteService;
-	constructor(inviteService: IInviteService) {
+	private inviteService: any;
+	constructor(inviteService: any) {
 		this.inviteService = inviteService;
 	}

@@ -41,9 +34,8 @@ class InviteController implements IInviteController {

 	sendInviteEmail = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
-			const userRoles = requireUserRoles(req.user?.role);
-			const firstName = requireFirstName(req.user?.firstName);
+			const teamId = requireTeamId(req?.user?.teamId);
+			const userRoles = requireUserRoles(req?.user?.role);

 			const inviteRequest = req.body;
 			inviteRequest.teamId = teamId;
@@ -51,7 +43,7 @@ class InviteController implements IInviteController {

 			const inviteToken = await this.inviteService.sendInviteEmail({
 				invite: inviteRequest,
-				firstName,
+				firstName: req?.user?.firstName,
 				userRoles,
 			});
 			return res.status(200).json({
@@ -1,16 +1,11 @@
-import { ILogger } from "@/utils/logger.js";
 import { Request, Response, NextFunction } from "express";

 const SERVICE_NAME = "LogController";

-export interface ILogController {
-	getLogs: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-}
-
 class LogController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private logger: ILogger;
-	constructor(logger: ILogger) {
+	private logger: any;
+	constructor(logger: any) {
 		this.logger = logger;
 	}
 	get serviceName() {
@@ -19,7 +14,7 @@ class LogController {

 	getLogs = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const logs = this.logger.getLogs();
+			const logs = await this.logger.getLogs();
 			res.status(200).json({
 				success: true,
 				msg: "Logs fetched successfully",
@@ -9,37 +9,26 @@ import {
 	deleteMaintenanceWindowByIdParamValidation,
 } from "@/validation/maintenanceWindowValidation.js";
 import { requireTeamId } from "@/controllers/controllerUtils.js";
-import { IMaintenanceWindowService } from "@/service/index.js";

-export interface IMaintenanceWindowController {
-	createMaintenanceWindows: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMaintenanceWindowById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMaintenanceWindowsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMaintenanceWindowsByMonitorId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteMaintenanceWindow: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	editMaintenanceWindow: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class MaintenanceWindowController implements IMaintenanceWindowController {
-	private maintenanceWindowService: IMaintenanceWindowService;
-	constructor(maintenanceWindowService: IMaintenanceWindowService) {
+const SERVICE_NAME = "maintenanceWindowController";
+
+class MaintenanceWindowController {
+	static SERVICE_NAME = SERVICE_NAME;
+	private maintenanceWindowService: any;
+	constructor(maintenanceWindowService: any) {
 		this.maintenanceWindowService = maintenanceWindowService;
 	}

+	get serviceName() {
+		return MaintenanceWindowController.SERVICE_NAME;
+	}
+
 	createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createMaintenanceWindowBodyValidation.parse(req.body);
+			createMaintenanceWindowBodyValidation.parse(req.body);
 			const teamId = requireTeamId(req?.user?.teamId);

-			const monitorIDs = validatedBody.monitors;
-			const name = validatedBody.name;
-			const active = validatedBody.active ?? true;
-			const duration = validatedBody.duration;
-			const durationUnit = validatedBody.durationUnit;
-			const repeat = validatedBody.repeat;
-			const start = validatedBody.start;
-			const end = validatedBody.end;
-
-			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, monitorIDs, name, active, duration, durationUnit, repeat, start, end });
+			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body });

 			return res.status(200).json({
 				success: true,
@@ -51,11 +40,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 	};
 	getMaintenanceWindowById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMaintenanceWindowByIdParamValidation.parse(req.params);
+			getMaintenanceWindowByIdParamValidation.parse(req.params);

 			const teamId = requireTeamId(req.user?.teamId);

-			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: validatedParams.id, teamId });
+			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: req.params.id as string, teamId });

 			return res.status(200).json({
 				success: true,
@@ -69,18 +58,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {

 	getMaintenanceWindowsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
+			getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);

 			const teamId = requireTeamId(req?.user?.teamId);

-			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({
-				teamId,
-				active: validatedQuery.active,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				field: validatedQuery.field,
-				order: validatedQuery.order,
-			});
+			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({ teamId, query: req.query });

 			return res.status(200).json({
 				success: true,
@@ -94,12 +76,12 @@ class MaintenanceWindowController implements IMaintenanceWindowController {

 	getMaintenanceWindowsByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
+			getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);

 			const teamId = requireTeamId(req?.user?.teamId);

 			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByMonitorId({
-				monitorId: validatedParams.monitorId,
+				monitorId: req.params.monitorId as string,
 				teamId,
 			});

@@ -114,11 +96,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 	};
 	deleteMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteMaintenanceWindowByIdParamValidation.parse(req.params);
+			deleteMaintenanceWindowByIdParamValidation.parse(req.params);

 			const teamId = requireTeamId(req?.user?.teamId);

-			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: validatedParams.id, teamId });
+			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: req.params.id as string, teamId });

 			return res.status(200).json({
 				success: true,
@@ -131,14 +113,14 @@ class MaintenanceWindowController implements IMaintenanceWindowController {

 	editMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = editMaintenanceWindowByIdParamValidation.parse(req.params);
-			const validatedBody = editMaintenanceByIdWindowBodyValidation.parse(req.body);
+			editMaintenanceWindowByIdParamValidation.parse(req.params);
+			editMaintenanceByIdWindowBodyValidation.parse(req.body);

 			const teamId = requireTeamId(req.user?.teamId);

 			const editedMaintenanceWindow = await this.maintenanceWindowService.editMaintenanceWindow({
-				id: validatedParams.id,
-				body: validatedBody,
+				id: req.params.id as string,
+				body: req.body,
 				teamId,
 			});
 			return res.status(200).json({
@@ -1,8 +1,9 @@
 import { Request, Response, NextFunction } from "express";
-import { updateNotificationsValidation } from "@/validation/notificationValidation.js";
+
 import {
 	getMonitorByIdParamValidation,
 	getMonitorByIdQueryValidation,
+	getMonitorsByTeamIdParamValidation,
 	getMonitorsByTeamIdQueryValidation,
 	getMonitorsWithChecksQueryValidation,
 	createMonitorBodyValidation,
@@ -11,48 +12,31 @@ import {
 	getCertificateParamValidation,
 	getHardwareDetailsByIdParamValidation,
 	getHardwareDetailsByIdQueryValidation,
-	getUptimeDetailsByIdParamValidation,
-	getUptimeDetailsByIdQueryValidation,
-	importMonitorsBodyValidation,
 } from "@/validation/monitorValidation.js";
 import sslChecker from "ssl-checker";
-import { fetchMonitorCertificate, requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
+import {
+	fetchMonitorCertificate,
+	requireString,
+	optionalString,
+	optionalNumber,
+	optionalBoolean,
+	parseMonitorTypeFilter,
+	parseSortOrder,
+	requireTeamId,
+	requireUserId,
+} from "./controllerUtils.js";
 import { AppError } from "@/utils/AppError.js";
-import { IMonitorService, INotificationsService } from "@/service/index.js";
+import { IMonitorService } from "@/service/index.js";
 import { GeoContinent } from "@/types/geoCheck.js";

 const SERVICE_NAME = "monitorController";
-
-export interface IMonitorController {
-	getMonitorCertificate: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getUptimeDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getHardwareDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getPageSpeedDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getGeoChecksByMonitorId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	createMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	importMonitorsFromJSON: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteAllMonitors: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	editMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	pauseMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	addDemoMonitors: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorsWithChecksByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	exportMonitorsToJSON: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getAllGames: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getGroupsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	updateNotifications: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class MonitorController implements IMonitorController {
+class MonitorController {
 	static SERVICE_NAME = SERVICE_NAME;

 	private monitorService: IMonitorService;
-	private notificationsService: INotificationsService;

-	constructor(monitorService: IMonitorService, notificationsService: INotificationsService) {
+	constructor(monitorService: IMonitorService) {
 		this.monitorService = monitorService;
-		this.notificationsService = notificationsService;
 	}

 	get serviceName() {
@@ -61,9 +45,10 @@ class MonitorController implements IMonitorController {

 	getMonitorCertificate = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getCertificateParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
-			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId: validatedParams.monitorId });
+			getCertificateParamValidation.parse(req.params);
+			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = requireString(req.params?.monitorId, "Monitor ID");
+			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });
 			const certificate = await fetchMonitorCertificate(sslChecker, monitor);

 			return res.status(200).json({
@@ -80,18 +65,16 @@ class MonitorController implements IMonitorController {

 	getUptimeDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUptimeDetailsByIdParamValidation.parse(req.params);
-			const validatedQuery = getUptimeDetailsByIdQueryValidation.parse(req.query);
-
-			const monitorId = validatedParams.monitorId;
-			const dateRange = validatedQuery.dateRange;
-
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
+			const normalize = optionalBoolean(req?.query?.normalize, "normalize");
+			const teamId = requireTeamId(req?.user?.teamId);

 			const data = await this.monitorService.getUptimeDetailsById({
 				teamId,
 				monitorId,
 				dateRange,
+				normalize,
 			});
 			return res.status(200).json({
 				success: true,
@@ -105,12 +88,12 @@ class MonitorController implements IMonitorController {

 	getHardwareDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
-			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);

-			const monitorId = validatedParams.monitorId;
-			const dateRange = validatedQuery.dateRange || "recent";
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const dateRange = optionalString(req?.query?.dateRange, "dateRange") || "recent";
+			const teamId = requireTeamId(req?.user?.teamId);

 			const data = await this.monitorService.getHardwareDetailsById({
 				teamId,
@@ -129,12 +112,12 @@ class MonitorController implements IMonitorController {
 	};
 	getPageSpeedDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
-			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);

-			const monitorId = validatedParams.monitorId;
-			const dateRange = validatedQuery.dateRange || "recent";
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
+			const teamId = requireTeamId(req?.user?.teamId);

 			const data = await this.monitorService.getPageSpeedDetailsById({
 				teamId,
@@ -154,14 +137,18 @@ class MonitorController implements IMonitorController {

 	getGeoChecksByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
-			const validatedQuery = getMonitorByIdQueryValidation.parse(req.query);
+			getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdQueryValidation.parse(req.query);

-			const monitorId = validatedParams.monitorId;
-			const dateRange = validatedQuery.dateRange || "recent";
-			const continentParam = validatedQuery.continent;
-			const continents = continentParam ? (Array.isArray(continentParam) ? continentParam : [continentParam]) : undefined;
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
+			const continentParam = req?.query?.continent;
+			const continents = continentParam
+				? Array.isArray(continentParam)
+					? (continentParam as GeoContinent[])
+					: [continentParam as GeoContinent]
+				: undefined;
+			const teamId = requireTeamId(req?.user?.teamId);

 			const data = await this.monitorService.getGeoChecksByMonitorId({
 				teamId,
@@ -182,10 +169,11 @@ class MonitorController implements IMonitorController {

 	getMonitorById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdQueryValidation.parse(req.query);

-			const teamId = requireTeamId(req.user?.teamId);
-			const monitorId = validatedParams.monitorId;
+			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");

 			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });

@@ -201,12 +189,12 @@ class MonitorController implements IMonitorController {

 	createMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createMonitorBodyValidation.parse(req.body);
+			createMonitorBodyValidation.parse(req.body);

-			const userId = requireUserId(req.user?.id);
-			const teamId = requireTeamId(req.user?.teamId);
+			const userId = requireString(req?.user?.id, "User ID");
+			const teamId = requireTeamId(req?.user?.teamId);

-			const monitor = await this.monitorService.createMonitor(teamId, userId, validatedBody);
+			const monitor = await this.monitorService.createMonitor(teamId, userId, req.body);

 			return res.status(200).json({
 				success: true,
@@ -220,10 +208,14 @@ class MonitorController implements IMonitorController {

 	importMonitorsFromJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
-			const userId = requireUserId(req.user?.id);
-			const validatedBody = importMonitorsBodyValidation.parse(req.body);
-			const monitors = validatedBody.monitors;
+			const teamId = requireTeamId(req?.user?.teamId);
+			const userId = requireUserId(req?.user?.id);
+
+			const { monitors } = req.body;
+
+			if (!monitors || !Array.isArray(monitors)) {
+				throw new AppError({ message: "Invalid request: monitors array is required", status: 400 });
+			}

 			const result = await this.monitorService.importMonitorsFromJSON({ teamId, userId, monitors });

@@ -239,9 +231,9 @@ class MonitorController implements IMonitorController {

 	deleteMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
-			const monitorId = validatedParams.monitorId;
+			getMonitorByIdParamValidation.parse(req.params);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const teamId = requireTeamId(req?.user?.teamId);

 			const deletedMonitor = await this.monitorService.deleteMonitor({ teamId, monitorId });

@@ -257,7 +249,8 @@ class MonitorController implements IMonitorController {

 	deleteAllMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
+
 			const deletedCount = await this.monitorService.deleteAllMonitors({ teamId });

 			return res.status(200).json({
@@ -271,12 +264,12 @@ class MonitorController implements IMonitorController {

 	editMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
-			const validatedBody = editMonitorBodyValidation.parse(req.body);
-			const monitorId = validatedParams.monitorId;
-			const teamId = requireTeamId(req.user?.teamId);
+			getMonitorByIdParamValidation.parse(req.params);
+			editMonitorBodyValidation.parse(req.body);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const teamId = requireTeamId(req?.user?.teamId);

-			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: validatedBody });
+			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: req.body });

 			return res.status(200).json({
 				success: true,
@@ -290,10 +283,10 @@ class MonitorController implements IMonitorController {

 	pauseMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = pauseMonitorParamValidation.parse(req.params);
+			pauseMonitorParamValidation.parse(req.params);

-			const monitorId = validatedParams.monitorId;
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const teamId = requireTeamId(req?.user?.teamId);

 			const monitor = await this.monitorService.pauseMonitor({ teamId, monitorId });

@@ -309,8 +302,8 @@ class MonitorController implements IMonitorController {

 	addDemoMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const id = requireUserId(req.user?.id);
-			const teamId = requireTeamId(req.user?.teamId);
+			const id = requireString(req?.user?.id, "User ID");
+			const teamId = requireTeamId(req?.user?.teamId);
 			const demoMonitors = await this.monitorService.addDemoMonitors({ userId: id, teamId });

 			return res.status(200).json({
@@ -323,13 +316,32 @@ class MonitorController implements IMonitorController {
 		}
 	};

+	sendTestEmail = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const { to } = req.body;
+			if (!to || typeof to !== "string") {
+				throw new AppError({ message: "Invalid 'to' email address", status: 400 });
+			}
+
+			const messageId = await this.monitorService.sendTestEmail({ to });
+			return res.status(200).json({
+				success: true,
+				msg: "Test email sent successfully",
+				data: { messageId },
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	getMonitorsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMonitorsByTeamIdQueryValidation.parse(req.query);
+			getMonitorsByTeamIdParamValidation.parse(req.params);
+			getMonitorsByTeamIdQueryValidation.parse(req.query);

-			const teamId = requireTeamId(req.user?.teamId);
-			const type = validatedQuery.type;
-			const filter = validatedQuery.filter;
+			const teamId = requireTeamId(req?.user?.teamId);
+			const type = parseMonitorTypeFilter(req.query?.type);
+			const filter = optionalString(req.query?.filter, "filter");

 			const monitors = await this.monitorService.getMonitorsByTeamId({ teamId, type, filter });

@@ -345,16 +357,17 @@ class MonitorController implements IMonitorController {

 	getMonitorsWithChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMonitorsWithChecksQueryValidation.parse(req.query);
-
-			const limit = validatedQuery.limit;
-			const page = validatedQuery.page;
-			const rowsPerPage = validatedQuery.rowsPerPage;
-			const filter = validatedQuery.filter;
-			const field = validatedQuery.field;
-			const order = validatedQuery.order;
-			const type = validatedQuery.type;
-			const teamId = requireTeamId(req.user?.teamId);
+			getMonitorsByTeamIdParamValidation.parse(req.params);
+			getMonitorsWithChecksQueryValidation.parse(req.query);
+			const explain = optionalBoolean(req?.query?.explain, "explain");
+			const limit = optionalNumber(req?.query?.limit, "limit");
+			const page = optionalNumber(req?.query?.page, "page");
+			const rowsPerPage = optionalNumber(req?.query?.rowsPerPage, "rowsPerPage");
+			const filter = optionalString(req?.query?.filter, "filter");
+			const field = optionalString(req?.query?.field, "field");
+			const order = parseSortOrder(req?.query?.order);
+			const type = parseMonitorTypeFilter(req?.query?.type);
+			const teamId = requireTeamId(req?.user?.teamId);

 			const monitors = await this.monitorService.getMonitorsWithChecksByTeamId({
 				teamId,
@@ -365,6 +378,7 @@ class MonitorController implements IMonitorController {
 				filter,
 				field,
 				order,
+				explain,
 			});

 			return res.status(200).json({
@@ -378,7 +392,11 @@ class MonitorController implements IMonitorController {

 	exportMonitorsToJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const json = await this.monitorService.exportMonitorsToJSON({ teamId });

 			return res.status(200).json({
@@ -406,7 +424,11 @@ class MonitorController implements IMonitorController {

 	getGroupsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const groups = await this.monitorService.getGroupsByTeamId({ teamId });

 			return res.status(200).json({
@@ -417,42 +439,6 @@ class MonitorController implements IMonitorController {
 			next(error);
 		}
 	};
-
-	updateNotifications = async (req: Request, res: Response, next: NextFunction) => {
-		try {
-			updateNotificationsValidation.parse(req.body);
-
-			const teamId = requireTeamId(req.user?.teamId);
-			const { monitorIds, notificationIds, action } = req.body;
-
-			// Verify all requested notification IDs actually belong to this team
-			const teamNotifications = await this.notificationsService.findNotificationsByTeamId(teamId);
-			const validNotificationIds = teamNotifications.map((n) => n.id);
-
-			const invalidIds = notificationIds.filter((id: string) => !validNotificationIds.includes(id));
-			if (invalidIds.length > 0) {
-				throw new AppError({
-					message: `The following notification IDs are invalid or do not belong to your team: ${invalidIds.join(", ")}`,
-					status: 403,
-				});
-			}
-
-			const modifiedCount = await this.monitorService.updateNotifications({
-				teamId,
-				monitorIds,
-				notificationIds,
-				action,
-			});
-
-			return res.status(200).json({
-				success: true,
-				msg: `Notifications updated successfully on ${modifiedCount} monitor(s)`,
-				data: { modifiedCount },
-			});
-		} catch (error) {
-			next(error);
-		}
-	};
 }

 export default MonitorController;
@@ -1,30 +1,16 @@
 import { Request, Response, NextFunction } from "express";

-import {
-	createNotificationBodyValidation,
-	deleteNotificationParamValidation,
-	getNotificationByIdParamValidation,
-	testNotificationBodyValidation,
-	editNotificationParamValidation,
-	testAllNotificationsBodyValidation,
-} from "@/validation/notificationValidation.js";
+import { Notification } from "@/types/index.js";
+import { createNotificationBodyValidation } from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { INotificationsService } from "@/service/index.js";
-import { requireTeamId, requireUserId } from "./controllerUtils.js";
 import { IMonitorsRepository } from "@/repositories/index.js";
+import { INotificationsService } from "@/service/index.js";
+import { requireTeamId } from "./controllerUtils.js";

 const SERVICE_NAME = "NotificationController";

-export interface INotificationController {
-	testNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	createNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getNotificationsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getNotificationById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	editNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	testAllNotifications: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class NotificationController implements INotificationController {
+class NotificationController {
+	static SERVICE_NAME = SERVICE_NAME;
 	private notificationsService: INotificationsService;
 	private monitorsRepository: IMonitorsRepository;
 	constructor(notificationsService: INotificationsService, monitorsRepository: IMonitorsRepository) {
@@ -32,9 +18,13 @@ class NotificationController implements INotificationController {
 		this.monitorsRepository = monitorsRepository;
 	}

+	get serviceName() {
+		return NotificationController.SERVICE_NAME;
+	}
+
 	testNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const notification = testNotificationBodyValidation.parse(req.body);
+			const notification: Notification = req.body;
 			const success = await this.notificationsService.sendTestNotification(notification);

 			if (!success) {
@@ -44,7 +34,6 @@ class NotificationController implements INotificationController {
 			return res.status(200).json({
 				success: true,
 				msg: "Notification sent successfully",
-				details: { service: SERVICE_NAME },
 			});
 		} catch (error) {
 			next(error);
@@ -53,12 +42,23 @@ class NotificationController implements INotificationController {

 	createNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createNotificationBodyValidation.parse(req.body);
+			createNotificationBodyValidation.parse(req.body);

-			const teamId = requireTeamId(req.user?.teamId);
-			const userId = requireUserId(req.user?.id);
+			const body = req.body;

-			const notification = await this.notificationsService.createNotification(validatedBody, userId, teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
+			const userId = req?.user?.id;
+			if (!userId) {
+				throw new AppError({ message: "User ID is required", status: 400 });
+			}
+			body.userId = userId;
+			body.teamId = teamId;
+
+			const notification = await this.notificationsService.createNotification(body);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification created successfully",
@@ -71,7 +71,11 @@ class NotificationController implements INotificationController {

 	getNotificationsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const notifications = await this.notificationsService.findNotificationsByTeamId(teamId);

 			return res.status(200).json({
@@ -86,10 +90,17 @@ class NotificationController implements INotificationController {

 	deleteNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
-			const validatedParams = deleteNotificationParamValidation.parse(req.params);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}

-			await this.notificationsService.deleteById(validatedParams.id, teamId);
+			const notificationId = req.params.id as string;
+			if (!notificationId) {
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}
+
+			await this.notificationsService.deleteById(notificationId, teamId);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification deleted successfully",
@@ -102,9 +113,12 @@ class NotificationController implements INotificationController {
 	getNotificationById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const validatedParams = getNotificationByIdParamValidation.parse(req.params);
+			const notificationId = req.params.id as string;
+			if (!notificationId) {
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}

-			const notification = await this.notificationsService.findById(validatedParams.id, teamId);
+			const notification = await this.notificationsService.findById(notificationId, teamId);

 			return res.status(200).json({
 				success: true,
@@ -118,13 +132,14 @@ class NotificationController implements INotificationController {

 	editNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createNotificationBodyValidation.parse(req.body);
-			const validatedParams = editNotificationParamValidation.parse(req.params);
+			createNotificationBodyValidation.parse(req.body);

 			const teamId = requireTeamId(req.user?.teamId);
-			const notificationId = validatedParams.id;
-
-			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, validatedBody);
+			const notificationId = req.params.id as string;
+			if (!notificationId) {
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}
+			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, req.body);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification updated successfully",
@@ -137,13 +152,15 @@ class NotificationController implements INotificationController {

 	testAllNotifications = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = testAllNotificationsBodyValidation.parse(req.body);
+			const monitorId = req.body.monitorId;
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}

-			const teamId = requireTeamId(req.user?.teamId);
-
-			const monitor = await this.monitorsRepository.findById(validatedBody.monitorId, teamId);
-			const notifications = monitor.notifications || [];
+			const monitor = await this.monitorsRepository.findById(monitorId, teamId);

+			const notifications = monitor.notifications;
 			if (notifications.length === 0) {
 				throw new AppError({ message: "No notifications", status: 400 });
 			}
@@ -1,19 +1,11 @@
-import { ISuperSimpleQueue } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";

 const SERVICE_NAME = "JobQueueController";

-export interface IJobQueueController {
-	getMetrics(req: Request, res: Response, next: NextFunction): Promise<void>;
-	getJobs(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getAllMetrics(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	flushQueue(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class JobQueueController implements IJobQueueController {
+class JobQueueController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private jobQueue: ISuperSimpleQueue;
-	constructor(jobQueue: ISuperSimpleQueue) {
+	private jobQueue: any;
+	constructor(jobQueue: any) {
 		this.jobQueue = jobQueue;
 	}

@@ -61,6 +53,18 @@ class JobQueueController implements IJobQueueController {
 		}
 	};

+	addJob = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			await this.jobQueue.addJob(Math.random().toString(36).substring(7));
+			return res.status(200).json({
+				success: true,
+				msg: "Job added to queue successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	flushQueue = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const result = await this.jobQueue.flushQueues();
@@ -73,5 +77,18 @@ class JobQueueController implements IJobQueueController {
 			next(error);
 		}
 	};
+
+	checkQueueHealth = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const stuckQueues = await this.jobQueue.checkQueueHealth();
+			return res.status(200).json({
+				success: true,
+				msg: "Queue health checked successfully",
+				data: stuckQueues,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
 }
 export default JobQueueController;
@@ -2,23 +2,14 @@ import { Request, Response, NextFunction } from "express";
 import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
 import { sendTestEmailBodyValidation } from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { IEmailService, ISettingsService } from "@/service/index.js";
-import { Settings } from "@/types/settings.js";

 const SERVICE_NAME = "SettingsController";

-export interface ISettingsController {
-	serviceName: string;
-	getAppSettings(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	updateAppSettings(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	sendTestEmail(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class SettingsController implements ISettingsController {
+class SettingsController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private settingsService: ISettingsService;
-	private emailService: IEmailService;
-	constructor(settingsService: ISettingsService, emailService: IEmailService) {
+	private settingsService: any;
+	private emailService: any;
+	constructor(settingsService: any, emailService: any) {
 		this.settingsService = settingsService;
 		this.emailService = emailService;
 	}
@@ -27,11 +18,11 @@ class SettingsController implements ISettingsController {
 		return SettingsController.SERVICE_NAME;
 	}

-	buildAppSettings = (dbSettings: Settings) => {
-		const sanitizedSettings: Record<string, unknown> = { ...dbSettings };
+	buildAppSettings = (dbSettings: any) => {
+		const sanitizedSettings = { ...dbSettings };
 		delete sanitizedSettings.version;
 		delete sanitizedSettings.jwtSecret;
-		const returnSettings: Record<string, unknown | null> = {
+		const returnSettings = {
 			pagespeedKeySet: false,
 			emailPasswordSet: false,
 			settings: null,
@@ -66,9 +57,9 @@ class SettingsController implements ISettingsController {

 	updateAppSettings = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = updateAppSettingsBodyValidation.parse(req.body);
+			updateAppSettingsBodyValidation.parse(req.body);

-			const updatedSettings = await this.settingsService.updateDbSettings(validatedBody);
+			const updatedSettings = await this.settingsService.updateDbSettings(req.body);
 			const returnSettings = this.buildAppSettings(updatedSettings);
 			return res.status(200).json({
 				success: true,
@@ -104,9 +95,6 @@ class SettingsController implements ISettingsController {
 			const context = { testName: "Monitoring System" };

 			const html = await this.emailService.buildEmail("testEmailTemplate", context);
-			if (!html) {
-				throw new AppError({ message: "Failed to build email template.", status: 500 });
-			}
 			const messageId = await this.emailService.sendEmail(to, subject, html, {
 				systemEmailHost,
 				systemEmailPort,
@@ -15,16 +15,7 @@ import { NormalizeData } from "@/utils/dataUtils.js";

 const SERVICE_NAME = "statusPageController";

-export interface IStatusPageController {
-	readonly serviceName: string;
-	createStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	updateStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getStatusPageByUrl(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getStatusPagesByTeamId(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class StatusPageController implements IStatusPageController {
+class StatusPageController {
 	static SERVICE_NAME = SERVICE_NAME;
 	private statusPageService: IStatusPageService;
 	private monitorsRepository: IMonitorsRepository;
@@ -75,7 +66,7 @@ class StatusPageController implements IStatusPageController {
 			if (statusPage === null) {
 				throw new AppError({ message: "Status page not found", status: 404 });
 			}
-			res.status(200).json({
+			return res.status(200).json({
 				success: true,
 				msg: "Status page updated successfully",
 				data: statusPage,
@@ -1,7 +0,0 @@
-import { Pool } from "pg";
-
-export interface IDb {
-	connect(): Promise<void>;
-	disconnect(): Promise<void>;
-	getPool(): Pool | null;
-}
@@ -1,13 +1,10 @@
 import mongoose from "mongoose";
-import AppSettings from "@/db/models/AppSettings.js";
-import { runMigrations } from "@/db/migration/index.js";
+import AppSettings from "./models/AppSettings.js";
+import { runMigrations } from "./migration/index.js";
 import { ILogger } from "@/utils/logger.js";
 import { EnvConfig } from "@/service/system/settingsService.js";
 const SERVICE_NAME = "MongoDB";
-import { IDb } from "@/db/IDb.js";
-import { Pool } from "pg";
-
-class MongoDB implements IDb {
+class MongoDB {
 	static SERVICE_NAME = SERVICE_NAME;

 	private logger: ILogger;
@@ -49,12 +46,12 @@ class MongoDB implements IDb {
 			});

 			await runMigrations();
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				service: SERVICE_NAME,
 				method: "connect",
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
@@ -66,19 +63,15 @@ class MongoDB implements IDb {
 			await mongoose.disconnect();
 			this.logger.info({ message: "Disconnected from MongoDB", service: SERVICE_NAME, method: "disconnect" });
 			return;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				service: SERVICE_NAME,
 				method: "disconnect",
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 		}
 	};
-
-	getPool = () => {
-		return null;
-	};
 }

 export default MongoDB;
@@ -1,105 +0,0 @@
-import { IDb } from "@/db/IDb.js";
-import { ILogger } from "@/utils/logger.js";
-import { EnvConfig } from "@/service/system/settingsService.js";
-import { Client, Pool } from "pg";
-import { runTimescaleDBMigrations } from "@/db/migration/timescaledb/index.js";
-
-const SERVICE_NAME = "TimescaleDB";
-
-class TimescaleDB implements IDb {
-	private pool: Pool | null = null;
-
-	constructor(
-		private logger: ILogger,
-		private envSettings: EnvConfig
-	) {}
-
-	private ensureDatabaseExists = async (connectionString: string) => {
-		const url = new URL(connectionString);
-		const dbName = url.pathname.slice(1); // Remove leading "/"
-
-		// Connect to the default "postgres" database
-		url.pathname = "/postgres";
-		const client = new Client({ connectionString: url.toString() });
-		await client.connect();
-
-		const result = await client.query("SELECT 1 FROM pg_database WHERE datname = $1", [dbName]);
-		if (result.rowCount === 0) {
-			await client.query(`CREATE DATABASE "${dbName}"`);
-			this.logger.info({
-				message: `Created database "${dbName}"`,
-				service: SERVICE_NAME,
-				method: "ensureDatabaseExists",
-			});
-		}
-		await client.end();
-	};
-
-	connect = async () => {
-		try {
-			const connectionString = this.envSettings.dbConnectionString || "postgresql://postgres:password@localhost:5432/checkmate";
-
-			await this.ensureDatabaseExists(connectionString);
-
-			this.pool = new Pool({ connectionString });
-
-			const client = await this.pool.connect();
-			client.release();
-
-			// Ensure TimescaleDB extension is enabled
-			await this.pool.query("CREATE EXTENSION IF NOT EXISTS timescaledb;");
-
-			this.logger.info({
-				message: "Connected to TimescaleDB",
-				service: SERVICE_NAME,
-				method: "connect",
-			});
-
-			await runTimescaleDBMigrations(this.pool, this.logger);
-		} catch (error: unknown) {
-			this.logger.error({
-				message: error instanceof Error ? error.message : "Unknown error",
-				service: SERVICE_NAME,
-				method: "connect",
-				stack: error instanceof Error ? error.stack : undefined,
-			});
-			throw error;
-		}
-	};
-
-	disconnect = async () => {
-		try {
-			if (this.pool === null) {
-				return;
-			}
-			this.logger.info({
-				message: "Disconnecting from TimescaleDB",
-				service: SERVICE_NAME,
-				method: "disconnect",
-			});
-			await this.pool.end();
-			this.pool = null;
-			this.logger.info({
-				message: "Disconnected from TimescaleDB",
-				service: SERVICE_NAME,
-				method: "disconnect",
-			});
-		} catch (error: unknown) {
-			this.logger.error({
-				message: error instanceof Error ? error.message : "Unknown error",
-				service: SERVICE_NAME,
-				method: "disconnect",
-				stack: error instanceof Error ? error.stack : undefined,
-			});
-		}
-	};
-
-	getPool = (): Pool => {
-		if (this.pool === null) {
-			throw new Error("TimescaleDB is not connected. Call connect() first.");
-		}
-		return this.pool;
-	};
-}
-
-export default TimescaleDB;
@@ -1,5 +1,4 @@
 import mongoose from "mongoose";
-import type { Document, AnyBulkWriteOperation } from "mongodb";

 const CHECKS_COLLECTION = "checks";
 const BACKUP_COLLECTION = "checks_backup";
@@ -86,7 +85,7 @@ const createTimeSeriesCollection = async (backedUp: boolean) => {
 	}
 };

-const validateDocument = (doc: Document): boolean => {
+const validateDocument = (doc: any): boolean => {
 	if (!doc.createdAt) {
 		return false;
 	}
@@ -96,7 +95,7 @@ const validateDocument = (doc: Document): boolean => {
 	return true;
 };

-const storeFailedDocument = async (doc: Document, reason: string) => {
+const storeFailedDocument = async (doc: any, reason: string) => {
 	const db = getDb();
 	await db.collection(FAILED_DOCS_COLLECTION).insertOne({
 		originalDoc: doc,
@@ -125,8 +124,8 @@ const migrateBackupData = async (backedUp: boolean): Promise<MigrationStats> =>
 		stats.totalSource = await source.countDocuments();

 		const cursor = source.find().addCursorFlag("noCursorTimeout", true);
-		const operations: AnyBulkWriteOperation<Document>[] = [];
-		const invalidDocs: Document[] = [];
+		const operations: any[] = [];
+		const invalidDocs: any[] = [];

 		while (await cursor.hasNext()) {
 			const doc = await cursor.next();
@@ -140,7 +139,6 @@ const migrateBackupData = async (backedUp: boolean): Promise<MigrationStats> =>
 			}

 			const { _id, monitorId, teamId, type, ...rest } = doc;
-			void _id;
 			const metadata = { monitorId, teamId, type };
 			operations.push({ insertOne: { document: { ...rest, metadata } } });

@@ -42,10 +42,10 @@ export async function cleanupDuplicateMonitorStats(): Promise<void> {
 			const monitorId = duplicate._id;
 			const { ids, updatedAts } = duplicate;

-			type DocPair = { id: string; updatedAt: Date };
+			type DocPair = { id: any; updatedAt: Date };

 			// Create array of {id, updatedAt} pairs and sort by updatedAt descending
-			const docs: DocPair[] = ids.map((id: string, index: number) => ({
+			const docs: DocPair[] = ids.map((id: any, index: number) => ({
 				id,
 				updatedAt: updatedAts[index],
 			}));
@@ -1,61 +0,0 @@
-import { MonitorModel } from "../models/Monitor.js";
-import { logger } from "@/utils/logger.js";
-
-/**
- * Fix infrastructure monitors that had thresholds incorrectly set to 0 or 5
- * due to the old default value. Updates them to 100 (disabled).
- */
-export async function fixInfrastructureThresholds(): Promise<void> {
-	const SERVICE_NAME = "Migration:FixInfrastructureThresholds";
-
-	try {
-		logger.info({ service: SERVICE_NAME, message: "Starting infrastructure threshold fix" });
-
-		const thresholdFields = ["cpuAlertThreshold", "memoryAlertThreshold", "diskAlertThreshold", "tempAlertThreshold"];
-
-		// Find hardware monitors with any threshold set to 0 or 5
-		const filter = {
-			type: "hardware",
-			$or: thresholdFields.flatMap((field) => [{ [field]: 0 }, { [field]: 5 }]),
-		};
-
-		const monitors = await MonitorModel.find(filter);
-
-		if (monitors.length === 0) {
-			logger.info({ service: SERVICE_NAME, message: "No monitors with threshold value of 0 or 5 found" });
-			return;
-		}
-
-		logger.info({
-			service: SERVICE_NAME,
-			message: `Found ${monitors.length} monitors with threshold value of 0 or 5`,
-		});
-
-		let updatedCount = 0;
-
-		for (const monitor of monitors) {
-			const update: Record<string, number> = {};
-
-			for (const field of thresholdFields) {
-				const value = monitor.get(field);
-				if (value === 0 || value === 5) {
-					update[field] = 100;
-				}
-			}
-
-			if (Object.keys(update).length > 0) {
-				await MonitorModel.updateOne({ _id: monitor._id }, { $set: update });
-				updatedCount++;
-			}
-		}
-
-		logger.info({
-			service: SERVICE_NAME,
-			message: `Fixed ${updatedCount} monitors — thresholds updated from 0/5 to 100`,
-		});
-	} catch (error) {
-		const errorMessage = error instanceof Error ? error.message : String(error);
-		logger.error({ service: SERVICE_NAME, message: `Error fixing thresholds: ${errorMessage}` });
-		throw error;
-	}
-}
@@ -1,45 +0,0 @@
-import mongoose from "mongoose";
-import { logger } from "@/utils/logger.js";
-import StatusPageModel from "../models/StatusPage.js";
-
-export async function migrateStatusPageTypeToArray(): Promise<void> {
-	const SERVICE_NAME = "Migration:MigrateStatusPageTypeToArray";
-
-	try {
-		logger.info({ service: SERVICE_NAME, message: "Starting migration of StatusPage type field from string to array" });
-
-		const db = mongoose.connection.db;
-		if (!db) {
-			throw new Error("Database connection is not initialized");
-		}
-
-		const result = await StatusPageModel.updateMany(
-			{
-				$expr: {
-					$eq: [{ $type: "$type" }, "string"], // only scalar string, not existing array
-				},
-			},
-			[
-				{
-					$set: {
-						type: ["$type"],
-					},
-				},
-			]
-		);
-
-		if (result.modifiedCount === 0) {
-			logger.info({ service: SERVICE_NAME, message: "No StatusPage documents needed migration" });
-			return;
-		}
-
-		logger.info({
-			service: SERVICE_NAME,
-			message: `Migration complete. Converted ${result.modifiedCount} StatusPage document(s) from string type to array type`,
-		});
-	} catch (error) {
-		const errorMessage = error instanceof Error ? error.message : String(error);
-		logger.error({ service: SERVICE_NAME, message: `Error during StatusPage type migration: ${errorMessage}` });
-		throw error;
-	}
-}
@@ -1,10 +1,7 @@
 import { migrateStatusWindowThreshold } from "./0001_migrateStatusWindowThreshold.js";
 import { convertChecksToTimeSeries } from "./0002_convertChecksToTimeSeries.js";
 import { cleanupDuplicateMonitorStats } from "./0003_cleanupDuplicateMonitorStats.js";
-import { fixInfrastructureThresholds } from "./0004_fixInfrastructureThresholds.js";
 import MigrationModel from "../models/Migration.js";
-import { migrateStatusPageTypeToArray } from "./0005_migrateStatusPageTypeToArray.js";
-import type { ILogger } from "@/utils/logger.js";

 type MigrationEntry = {
 	name: string;
@@ -15,11 +12,9 @@ const migrations: MigrationEntry[] = [
 	{ name: "0001_migrateStatusWindowThreshold", execute: migrateStatusWindowThreshold },
 	{ name: "0002_convertChecksToTimeSeries", execute: convertChecksToTimeSeries },
 	{ name: "0003_cleanupDuplicateMonitorStats", execute: cleanupDuplicateMonitorStats },
-	{ name: "0004_fixInfrastructureThresholds", execute: fixInfrastructureThresholds },
-	{ name: "0005_migrateStatusPageTypeToArray", execute: migrateStatusPageTypeToArray },
 ];

-const runMigrations = async (logger?: ILogger) => {
+const runMigrations = async (logger?: { info: Function; error: Function }) => {
 	try {
 		logger?.info({ message: "Running migrations", service: "Migrations" });
 		for (const migration of migrations) {
@@ -46,7 +41,7 @@ const runMigrations = async (logger?: ILogger) => {
 		logger?.info({ message: "Migrations completed", service: "Migrations" });
 	} catch (error) {
 		const err = error as Error;
-		logger?.error({ message: "Migration failed", service: "Migrations", details: { error: err?.message }, stack: err?.stack });
+		logger?.error({ message: "Migration failed", service: "Migrations", details: err?.message, stack: err?.stack });
 		throw error;
 	}
 };
@@ -1,50 +0,0 @@
-import type { Pool } from "pg";
-
-export const createEnums = async (pool: Pool) => {
-	await pool.query(`
-		DO $$ BEGIN
-			CREATE TYPE monitor_type AS ENUM ('http', 'ping', 'pagespeed', 'hardware', 'docker', 'port', 'game', 'grpc', 'websocket', 'unknown');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE monitor_status AS ENUM ('up', 'down', 'paused', 'initializing', 'maintenance', 'breached');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE notification_type AS ENUM ('email', 'slack', 'discord', 'webhook', 'pager_duty', 'matrix', 'teams');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE user_role AS ENUM ('user', 'admin', 'superadmin', 'demo');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE incident_resolution_type AS ENUM ('automatic', 'manual');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE duration_unit AS ENUM ('seconds', 'minutes', 'hours', 'days');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE status_page_type AS ENUM ('uptime', 'infrastructure');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-
-		DO $$ BEGIN
-			CREATE TYPE match_method AS ENUM ('equal', 'include', 'regex');
-		EXCEPTION WHEN duplicate_object THEN NULL; END $$;
-	`);
-};
-
-export const dropEnums = async (pool: Pool) => {
-	await pool.query(`
-		DROP TYPE IF EXISTS match_method;
-		DROP TYPE IF EXISTS status_page_type;
-		DROP TYPE IF EXISTS duration_unit;
-		DROP TYPE IF EXISTS incident_resolution_type;
-		DROP TYPE IF EXISTS user_role;
-		DROP TYPE IF EXISTS notification_type;
-		DROP TYPE IF EXISTS monitor_status;
-		DROP TYPE IF EXISTS monitor_type;
-	`);
-};
@@ -1,18 +0,0 @@
-import type { Pool } from "pg";
-
-export const createTeams = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS teams (
-			id          UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			email       TEXT NOT NULL UNIQUE,
-			created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_teams_email ON teams (email);
-	`);
-};
-
-export const dropTeams = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS teams;`);
-};
@@ -1,30 +0,0 @@
-import type { Pool } from "pg";
-
-export const createUsers = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS users (
-			id                          UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			team_id                     UUID REFERENCES teams(id) ON DELETE SET NULL,
-			first_name                  TEXT NOT NULL,
-			last_name                   TEXT NOT NULL,
-			email                       TEXT NOT NULL UNIQUE,
-			password                    TEXT NOT NULL,
-			avatar_image                TEXT,
-			profile_image               BYTEA,
-			profile_image_content_type  TEXT,
-			is_active                   BOOLEAN NOT NULL DEFAULT TRUE,
-			is_verified                 BOOLEAN NOT NULL DEFAULT FALSE,
-			roles                       user_role[] NOT NULL DEFAULT ARRAY['user']::user_role[],
-			check_ttl                   INTEGER,
-			created_at                  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at                  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_users_team_id ON users (team_id);
-		CREATE INDEX IF NOT EXISTS idx_users_email ON users (email);
-	`);
-};
-
-export const dropUsers = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS users;`);
-};
@@ -1,69 +0,0 @@
-import type { Pool } from "pg";
-
-export const createMonitors = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS monitors (
-			id                      UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			user_id                 UUID NOT NULL REFERENCES users(id),
-			team_id                 UUID NOT NULL REFERENCES teams(id),
-			name                    TEXT NOT NULL,
-			description             TEXT,
-			type                    monitor_type NOT NULL,
-			status                  monitor_status NOT NULL DEFAULT 'initializing',
-
-			-- HTTP / Website monitoring
-			url                     TEXT,
-			port                    INTEGER,
-			ignore_tls_errors       BOOLEAN DEFAULT FALSE,
-			use_advanced_matching   BOOLEAN DEFAULT FALSE,
-			json_path               TEXT,
-			expected_value          TEXT,
-			match_method            match_method,
-			secret                  TEXT,
-
-			-- Scheduling
-			interval_ms             INTEGER NOT NULL DEFAULT 60000,
-			is_active               BOOLEAN NOT NULL DEFAULT TRUE,
-
-			-- Uptime tracking
-			status_window           BOOLEAN[],
-			status_window_size      INTEGER DEFAULT 5,
-			status_window_threshold INTEGER DEFAULT 60,
-			uptime_percentage       DOUBLE PRECISION,
-
-			-- Infrastructure alert thresholds
-			cpu_alert_threshold     INTEGER,
-			cpu_alert_counter       INTEGER,
-			memory_alert_threshold  INTEGER,
-			memory_alert_counter    INTEGER,
-			disk_alert_threshold    INTEGER,
-			disk_alert_counter      INTEGER,
-			temp_alert_threshold    INTEGER,
-			temp_alert_counter      INTEGER,
-			selected_disks          TEXT[],
-
-			-- Game monitoring
-			game_id                 TEXT,
-			grpc_service_name       TEXT,
-
-			-- Grouping
-			monitor_group           TEXT,
-
-			-- Geo checks
-			geo_check_enabled       BOOLEAN DEFAULT FALSE,
-			geo_check_locations     TEXT[],
-			geo_check_interval_ms   INTEGER DEFAULT 300000,
-
-			created_at              TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at              TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_monitors_team_type ON monitors (team_id, type);
-		CREATE INDEX IF NOT EXISTS idx_monitors_user_id ON monitors (user_id);
-		CREATE INDEX IF NOT EXISTS idx_monitors_status ON monitors (status);
-	`);
-};
-
-export const dropMonitors = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS monitors;`);
-};
@@ -1,30 +0,0 @@
-import type { Pool } from "pg";
-
-export const createNotifications = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS notifications (
-			id                  UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			user_id             UUID NOT NULL REFERENCES users(id),
-			team_id             UUID NOT NULL REFERENCES teams(id),
-			type                notification_type NOT NULL,
-			notification_name   TEXT,
-			address             TEXT,
-			phone               TEXT,
-
-			-- Matrix-specific fields
-			homeserver_url      TEXT,
-			room_id             TEXT,
-			access_token        TEXT,
-
-			created_at          TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at          TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_notifications_team ON notifications (team_id);
-		CREATE INDEX IF NOT EXISTS idx_notifications_user ON notifications (user_id);
-	`);
-};
-
-export const dropNotifications = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS notifications;`);
-};
@@ -1,18 +0,0 @@
-import type { Pool } from "pg";
-
-export const createMonitorNotifications = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS monitor_notifications (
-			monitor_id      UUID NOT NULL REFERENCES monitors(id) ON DELETE CASCADE,
-			notification_id UUID NOT NULL REFERENCES notifications(id) ON DELETE CASCADE,
-			PRIMARY KEY (monitor_id, notification_id)
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_monitor_notifications_notification
-			ON monitor_notifications (notification_id);
-	`);
-};
-
-export const dropMonitorNotifications = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS monitor_notifications;`);
-};
@@ -1,34 +0,0 @@
-import type { Pool } from "pg";
-
-export const createIncidents = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS incidents (
-			id                  UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			monitor_id          UUID NOT NULL REFERENCES monitors(id) ON DELETE CASCADE,
-			team_id             UUID NOT NULL REFERENCES teams(id) ON DELETE CASCADE,
-			start_time          TIMESTAMPTZ NOT NULL,
-			end_time            TIMESTAMPTZ,
-			status              BOOLEAN,
-			message             TEXT,
-			status_code         INTEGER,
-			resolution_type     incident_resolution_type,
-			resolved_by         UUID REFERENCES users(id) ON DELETE SET NULL,
-			resolved_by_email   TEXT,
-			comment             TEXT,
-			created_at          TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at          TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_incidents_monitor_status ON incidents (monitor_id, status);
-		CREATE INDEX IF NOT EXISTS idx_incidents_team_status ON incidents (team_id, status);
-		CREATE INDEX IF NOT EXISTS idx_incidents_team_start ON incidents (team_id, start_time DESC);
-		CREATE INDEX IF NOT EXISTS idx_incidents_status_start ON incidents (status, start_time DESC);
-		CREATE INDEX IF NOT EXISTS idx_incidents_resolution ON incidents (resolution_type, status);
-		CREATE INDEX IF NOT EXISTS idx_incidents_resolved_by ON incidents (resolved_by, status);
-		CREATE INDEX IF NOT EXISTS idx_incidents_created ON incidents (created_at DESC);
-	`);
-};
-
-export const dropIncidents = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS incidents;`);
-};
@@ -1,25 +0,0 @@
-import type { Pool } from "pg";
-
-export const createMonitorStats = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS monitor_stats (
-			id                      UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			monitor_id              UUID NOT NULL UNIQUE REFERENCES monitors(id) ON DELETE CASCADE,
-			avg_response_time       DOUBLE PRECISION DEFAULT 0,
-			max_response_time       DOUBLE PRECISION DEFAULT 0,
-			total_checks            BIGINT DEFAULT 0,
-			total_up_checks         BIGINT DEFAULT 0,
-			total_down_checks       BIGINT DEFAULT 0,
-			uptime_percentage       DOUBLE PRECISION DEFAULT 0,
-			last_check_timestamp    TIMESTAMPTZ,
-			last_response_time      DOUBLE PRECISION DEFAULT 0,
-			time_of_last_failure    TIMESTAMPTZ,
-			created_at              TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at              TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-	`);
-};
-
-export const dropMonitorStats = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS monitor_stats;`);
-};
@@ -1,105 +0,0 @@
-import type { Pool } from "pg";
-
-export const createChecks = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS checks (
-			id                          UUID NOT NULL DEFAULT gen_random_uuid(),
-			monitor_id                  UUID NOT NULL,
-			team_id                     UUID NOT NULL,
-			monitor_type                monitor_type NOT NULL,
-			status                      BOOLEAN,
-			response_time               INTEGER,
-			status_code                 INTEGER,
-			message                     TEXT,
-
-			-- HTTP request timings
-			timing_start                DOUBLE PRECISION,
-			timing_socket               DOUBLE PRECISION,
-			timing_lookup               DOUBLE PRECISION,
-			timing_connect              DOUBLE PRECISION,
-			timing_secure_connect       DOUBLE PRECISION,
-			timing_upload               DOUBLE PRECISION,
-			timing_response             DOUBLE PRECISION,
-			timing_end                  DOUBLE PRECISION,
-			phase_wait                  DOUBLE PRECISION,
-			phase_dns                   DOUBLE PRECISION,
-			phase_tcp                   DOUBLE PRECISION,
-			phase_tls                   DOUBLE PRECISION,
-			phase_request               DOUBLE PRECISION,
-			phase_first_byte            DOUBLE PRECISION,
-			phase_download              DOUBLE PRECISION,
-			phase_total                 DOUBLE PRECISION,
-
-			-- CPU metrics
-			cpu_physical_core           INTEGER,
-			cpu_logical_core            INTEGER,
-			cpu_frequency               DOUBLE PRECISION,
-			cpu_current_frequency       DOUBLE PRECISION,
-			cpu_temperature             DOUBLE PRECISION[],
-			cpu_free_percent            DOUBLE PRECISION,
-			cpu_usage_percent           DOUBLE PRECISION,
-
-			-- Memory metrics
-			mem_total_bytes             BIGINT,
-			mem_available_bytes         BIGINT,
-			mem_used_bytes              BIGINT,
-			mem_usage_percent           DOUBLE PRECISION,
-
-			-- Host info
-			host_os                     TEXT,
-			host_platform               TEXT,
-			host_kernel_version         TEXT,
-			host_pretty_name            TEXT,
-
-			-- Capture agent info
-			capture_version             TEXT,
-			capture_mode                TEXT,
-
-			-- Lighthouse / PageSpeed scores
-			lighthouse_performance      DOUBLE PRECISION,
-			lighthouse_accessibility    DOUBLE PRECISION,
-			lighthouse_best_practices   DOUBLE PRECISION,
-			lighthouse_seo              DOUBLE PRECISION,
-
-			-- Lighthouse audit details
-			audit_cls_score             DOUBLE PRECISION,
-			audit_cls_value             DOUBLE PRECISION,
-			audit_cls_display           TEXT,
-			audit_si_score              DOUBLE PRECISION,
-			audit_si_value              DOUBLE PRECISION,
-			audit_si_display            TEXT,
-			audit_fcp_score             DOUBLE PRECISION,
-			audit_fcp_value             DOUBLE PRECISION,
-			audit_fcp_display           TEXT,
-			audit_lcp_score             DOUBLE PRECISION,
-			audit_lcp_value             DOUBLE PRECISION,
-			audit_lcp_display           TEXT,
-			audit_tbt_score             DOUBLE PRECISION,
-			audit_tbt_value             DOUBLE PRECISION,
-			audit_tbt_display           TEXT,
-
-			created_at                  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at                  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		SELECT create_hypertable('checks', 'created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_checks_monitor_time
-			ON checks (monitor_id, created_at DESC);
-		CREATE INDEX IF NOT EXISTS idx_checks_team_time
-			ON checks (team_id, created_at DESC);
-		CREATE INDEX IF NOT EXISTS idx_checks_monitor_type_time
-			ON checks (monitor_id, monitor_type, created_at DESC);
-		CREATE INDEX IF NOT EXISTS idx_checks_team_status_time
-			ON checks (team_id, status, created_at DESC);
-		CREATE INDEX IF NOT EXISTS idx_checks_status_code
-			ON checks (status_code, created_at DESC);
-	`);
-};
-
-export const dropChecks = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS checks;`);
-};
@@ -1,37 +0,0 @@
-import type { Pool } from "pg";
-
-export const createCheckDisks = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS check_disks (
-			id                  UUID NOT NULL DEFAULT gen_random_uuid(),
-			check_id            UUID NOT NULL,
-			check_created_at    TIMESTAMPTZ NOT NULL,
-			device              TEXT,
-			mountpoint          TEXT,
-			total_bytes         BIGINT,
-			free_bytes          BIGINT,
-			used_bytes          BIGINT,
-			usage_percent       DOUBLE PRECISION,
-			total_inodes        BIGINT,
-			free_inodes         BIGINT,
-			used_inodes         BIGINT,
-			inodes_usage_percent DOUBLE PRECISION,
-			read_bytes          BIGINT,
-			write_bytes         BIGINT,
-			read_time           BIGINT,
-			write_time          BIGINT
-		);
-
-		SELECT create_hypertable('check_disks', 'check_created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_check_disks_check
-			ON check_disks (check_id, check_created_at);
-	`);
-};
-
-export const dropCheckDisks = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS check_disks;`);
-};
@@ -1,34 +0,0 @@
-import type { Pool } from "pg";
-
-export const createCheckNetworkInterfaces = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS check_network_interfaces (
-			id                  UUID NOT NULL DEFAULT gen_random_uuid(),
-			check_id            UUID NOT NULL,
-			check_created_at    TIMESTAMPTZ NOT NULL,
-			name                TEXT,
-			bytes_sent          BIGINT,
-			bytes_recv          BIGINT,
-			packets_sent        BIGINT,
-			packets_recv        BIGINT,
-			err_in              BIGINT,
-			err_out             BIGINT,
-			drop_in             BIGINT,
-			drop_out            BIGINT,
-			fifo_in             BIGINT,
-			fifo_out            BIGINT
-		);
-
-		SELECT create_hypertable('check_network_interfaces', 'check_created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_check_net_check
-			ON check_network_interfaces (check_id, check_created_at);
-	`);
-};
-
-export const dropCheckNetworkInterfaces = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS check_network_interfaces;`);
-};
@@ -1,25 +0,0 @@
-import type { Pool } from "pg";
-
-export const createCheckErrors = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS check_errors (
-			id                  UUID NOT NULL DEFAULT gen_random_uuid(),
-			check_id            UUID NOT NULL,
-			check_created_at    TIMESTAMPTZ NOT NULL,
-			metrics             TEXT[],
-			error               TEXT
-		);
-
-		SELECT create_hypertable('check_errors', 'check_created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_check_errors_check
-			ON check_errors (check_id, check_created_at);
-	`);
-};
-
-export const dropCheckErrors = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS check_errors;`);
-};
@@ -1,29 +0,0 @@
-import type { Pool } from "pg";
-
-export const createGeoChecks = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS geo_checks (
-			id              UUID NOT NULL DEFAULT gen_random_uuid(),
-			monitor_id      UUID NOT NULL,
-			team_id         UUID NOT NULL,
-			monitor_type    monitor_type NOT NULL,
-			expiry          TIMESTAMPTZ,
-			created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		SELECT create_hypertable('geo_checks', 'created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_geo_checks_monitor_time
-			ON geo_checks (monitor_id, created_at DESC);
-		CREATE INDEX IF NOT EXISTS idx_geo_checks_team_time
-			ON geo_checks (team_id, created_at DESC);
-	`);
-};
-
-export const dropGeoChecks = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS geo_checks;`);
-};
@@ -1,46 +0,0 @@
-import type { Pool } from "pg";
-
-export const createGeoCheckResults = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS geo_check_results (
-			id                      UUID NOT NULL DEFAULT gen_random_uuid(),
-			geo_check_id            UUID NOT NULL,
-			geo_check_created_at    TIMESTAMPTZ NOT NULL,
-
-			-- Status
-			status                  BOOLEAN,
-			status_code             INTEGER,
-
-			-- Location
-			location_continent      TEXT,
-			location_region         TEXT,
-			location_country        TEXT,
-			location_state          TEXT,
-			location_city           TEXT,
-			location_longitude      DOUBLE PRECISION,
-			location_latitude       DOUBLE PRECISION,
-
-			-- Timings
-			timing_total            DOUBLE PRECISION,
-			timing_dns              DOUBLE PRECISION,
-			timing_tcp              DOUBLE PRECISION,
-			timing_tls              DOUBLE PRECISION,
-			timing_first_byte       DOUBLE PRECISION,
-			timing_download         DOUBLE PRECISION
-		);
-
-		SELECT create_hypertable('geo_check_results', 'geo_check_created_at',
-			chunk_time_interval => INTERVAL '7 days',
-			if_not_exists => TRUE
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_geo_results_check
-			ON geo_check_results (geo_check_id, geo_check_created_at);
-		CREATE INDEX IF NOT EXISTS idx_geo_results_country
-			ON geo_check_results (location_country, geo_check_created_at DESC);
-	`);
-};
-
-export const dropGeoCheckResults = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS geo_check_results;`);
-};
@@ -1,22 +0,0 @@
-import type { Pool } from "pg";
-
-export const createInvites = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS invites (
-			id          UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			email       TEXT NOT NULL UNIQUE,
-			team_id     UUID NOT NULL REFERENCES teams(id) ON DELETE CASCADE,
-			roles       user_role[] NOT NULL DEFAULT ARRAY['user']::user_role[],
-			token       TEXT NOT NULL,
-			expiry      TIMESTAMPTZ,
-			created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_invites_expiry ON invites (expiry);
-	`);
-};
-
-export const dropInvites = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS invites;`);
-};
@@ -1,20 +0,0 @@
-import type { Pool } from "pg";
-
-export const createRecoveryTokens = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS recovery_tokens (
-			id          UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			email       TEXT NOT NULL UNIQUE,
-			token       TEXT NOT NULL,
-			expiry      TIMESTAMPTZ,
-			created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_recovery_expiry ON recovery_tokens (expiry);
-	`);
-};
-
-export const dropRecoveryTokens = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS recovery_tokens;`);
-};
@@ -1,29 +0,0 @@
-import type { Pool } from "pg";
-
-export const createMaintenanceWindows = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS maintenance_windows (
-			id              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			monitor_id      UUID NOT NULL REFERENCES monitors(id) ON DELETE CASCADE,
-			team_id         UUID NOT NULL REFERENCES teams(id) ON DELETE CASCADE,
-			active          BOOLEAN NOT NULL DEFAULT TRUE,
-			name            TEXT,
-			duration        INTEGER,
-			duration_unit   duration_unit,
-			repeat          INTEGER,
-			start_time      TIMESTAMPTZ,
-			end_time        TIMESTAMPTZ,
-			expiry          TIMESTAMPTZ,
-			created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_maint_monitor ON maintenance_windows (monitor_id);
-		CREATE INDEX IF NOT EXISTS idx_maint_team ON maintenance_windows (team_id);
-		CREATE INDEX IF NOT EXISTS idx_maint_expiry ON maintenance_windows (expiry);
-	`);
-};
-
-export const dropMaintenanceWindows = async (pool: Pool) => {
-	await pool.query(`DROP TABLE IF EXISTS maintenance_windows;`);
-};
@@ -1,51 +0,0 @@
-import type { Pool } from "pg";
-
-export const createStatusPages = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS status_pages (
-			id                      UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			user_id                 UUID NOT NULL REFERENCES users(id),
-			team_id                 UUID NOT NULL REFERENCES teams(id),
-			types                   status_page_type[] NOT NULL DEFAULT ARRAY['uptime']::status_page_type[],
-			company_name            TEXT,
-			url                     TEXT NOT NULL UNIQUE,
-			timezone                TEXT,
-			color                   TEXT DEFAULT '#4169E1',
-			logo_data               BYTEA,
-			logo_content_type       TEXT,
-			is_published            BOOLEAN DEFAULT FALSE,
-			show_charts             BOOLEAN DEFAULT FALSE,
-			show_uptime_percentage  BOOLEAN DEFAULT FALSE,
-			show_admin_login_link   BOOLEAN DEFAULT FALSE,
-			show_infrastructure     BOOLEAN DEFAULT FALSE,
-			custom_css              TEXT,
-			created_at              TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at              TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		CREATE INDEX IF NOT EXISTS idx_status_pages_team ON status_pages (team_id);
-		CREATE INDEX IF NOT EXISTS idx_status_pages_url ON status_pages (url);
-
-		CREATE TABLE IF NOT EXISTS status_page_monitors (
-			status_page_id  UUID NOT NULL REFERENCES status_pages(id) ON DELETE CASCADE,
-			monitor_id      UUID NOT NULL REFERENCES monitors(id) ON DELETE CASCADE,
-			sort_order      INTEGER DEFAULT 0,
-			PRIMARY KEY (status_page_id, monitor_id)
-		);
-
-		CREATE TABLE IF NOT EXISTS status_page_sub_monitors (
-			status_page_id  UUID NOT NULL REFERENCES status_pages(id) ON DELETE CASCADE,
-			monitor_id      UUID NOT NULL REFERENCES monitors(id) ON DELETE CASCADE,
-			sort_order      INTEGER DEFAULT 0,
-			PRIMARY KEY (status_page_id, monitor_id)
-		);
-	`);
-};
-
-export const dropStatusPages = async (pool: Pool) => {
-	await pool.query(`
-		DROP TABLE IF EXISTS status_page_sub_monitors;
-		DROP TABLE IF EXISTS status_page_monitors;
-		DROP TABLE IF EXISTS status_pages;
-	`);
-};
@@ -1,62 +0,0 @@
-import type { Pool } from "pg";
-
-export const createAppSettings = async (pool: Pool) => {
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS app_settings (
-			id                              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			check_ttl                       INTEGER DEFAULT 30,
-			language                        TEXT,
-			jwt_secret                      TEXT,
-			pagespeed_api_key               TEXT,
-
-			-- SMTP / Email settings
-			system_email_host               TEXT,
-			system_email_port               INTEGER,
-			system_email_address            TEXT,
-			system_email_password           TEXT,
-			system_email_user               TEXT,
-			system_email_connection_host    TEXT,
-			system_email_tls_servername     TEXT,
-			system_email_secure             BOOLEAN,
-			system_email_pool               BOOLEAN,
-			system_email_ignore_tls         BOOLEAN,
-			system_email_require_tls        BOOLEAN,
-			system_email_reject_unauthorized BOOLEAN,
-
-			show_url                        BOOLEAN,
-			version                         TEXT,
-
-			-- Global infrastructure thresholds
-			threshold_cpu_usage             INTEGER,
-			threshold_memory_usage          INTEGER,
-			threshold_disk_usage            INTEGER,
-			threshold_temperature           INTEGER,
-
-			created_at                      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at                      TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-
-		-- Enforce singleton: only one row allowed
-		CREATE OR REPLACE FUNCTION enforce_singleton_app_settings()
-		RETURNS TRIGGER AS $$
-		BEGIN
-			IF (SELECT COUNT(*) FROM app_settings) >= 1 THEN
-				RAISE EXCEPTION 'app_settings allows only one row';
-			END IF;
-			RETURN NEW;
-		END;
-		$$ LANGUAGE plpgsql;
-
-		DROP TRIGGER IF EXISTS trg_singleton_app_settings ON app_settings;
-		CREATE TRIGGER trg_singleton_app_settings
-			BEFORE INSERT ON app_settings
-			FOR EACH ROW EXECUTE FUNCTION enforce_singleton_app_settings();
-	`);
-};
-
-export const dropAppSettings = async (pool: Pool) => {
-	await pool.query(`
-		DROP TABLE IF EXISTS app_settings;
-		DROP FUNCTION IF EXISTS enforce_singleton_app_settings();
-	`);
-};
@@ -1,127 +0,0 @@
-import type { Pool } from "pg";
-
-export const createContinuousAggregates = async (pool: Pool) => {
-	// Uptime & Response Time (Hourly)
-	await pool.query(`
-		CREATE MATERIALIZED VIEW IF NOT EXISTS checks_hourly
-		WITH (timescaledb.continuous) AS
-		SELECT
-			monitor_id,
-			time_bucket('1 hour', created_at) AS bucket,
-			COUNT(*)                                    AS total_checks,
-			COUNT(*) FILTER (WHERE status = TRUE)       AS up_checks,
-			COUNT(*) FILTER (WHERE status = FALSE)      AS down_checks,
-			AVG(response_time)                          AS avg_response_time,
-			AVG(response_time) FILTER (WHERE status = TRUE)  AS avg_up_response_time,
-			AVG(response_time) FILTER (WHERE status = FALSE) AS avg_down_response_time,
-			MAX(response_time)                          AS max_response_time,
-			MIN(response_time)                          AS min_response_time
-		FROM checks
-		GROUP BY monitor_id, bucket
-		WITH NO DATA;
-	`);
-	await pool.query(`ALTER MATERIALIZED VIEW checks_hourly SET (timescaledb.materialized_only = false);`);
-	await pool.query(`
-		SELECT add_continuous_aggregate_policy('checks_hourly',
-			start_offset    => INTERVAL '3 hours',
-			end_offset      => INTERVAL '1 hour',
-			schedule_interval => INTERVAL '1 hour',
-			if_not_exists   => TRUE
-		);
-	`);
-	await pool.query(`CALL refresh_continuous_aggregate('checks_hourly', NULL, NULL);`);
-
-	// Uptime & Response Time (Daily)
-	await pool.query(`
-		CREATE MATERIALIZED VIEW IF NOT EXISTS checks_daily
-		WITH (timescaledb.continuous) AS
-		SELECT
-			monitor_id,
-			time_bucket('1 day', created_at) AS bucket,
-			COUNT(*)                                    AS total_checks,
-			COUNT(*) FILTER (WHERE status = TRUE)       AS up_checks,
-			COUNT(*) FILTER (WHERE status = FALSE)      AS down_checks,
-			AVG(response_time)                          AS avg_response_time,
-			AVG(response_time) FILTER (WHERE status = TRUE)  AS avg_up_response_time,
-			AVG(response_time) FILTER (WHERE status = FALSE) AS avg_down_response_time,
-			MAX(response_time)                          AS max_response_time
-		FROM checks
-		GROUP BY monitor_id, bucket
-		WITH NO DATA;
-	`);
-	await pool.query(`ALTER MATERIALIZED VIEW checks_daily SET (timescaledb.materialized_only = false);`);
-	await pool.query(`
-		SELECT add_continuous_aggregate_policy('checks_daily',
-			start_offset    => INTERVAL '3 days',
-			end_offset      => INTERVAL '1 day',
-			schedule_interval => INTERVAL '1 day',
-			if_not_exists   => TRUE
-		);
-	`);
-	await pool.query(`CALL refresh_continuous_aggregate('checks_daily', NULL, NULL);`);
-
-	// Infrastructure Metrics (Hourly)
-	await pool.query(`
-		CREATE MATERIALIZED VIEW IF NOT EXISTS hardware_hourly
-		WITH (timescaledb.continuous) AS
-		SELECT
-			monitor_id,
-			time_bucket('1 hour', created_at) AS bucket,
-			AVG(cpu_usage_percent)              AS avg_cpu,
-			MAX(cpu_usage_percent)              AS max_cpu,
-			AVG(mem_usage_percent)              AS avg_memory,
-			MAX(mem_usage_percent)              AS max_memory,
-			COUNT(*)                            AS sample_count
-		FROM checks
-		WHERE monitor_type = 'hardware'
-		GROUP BY monitor_id, bucket
-		WITH NO DATA;
-	`);
-	await pool.query(`ALTER MATERIALIZED VIEW hardware_hourly SET (timescaledb.materialized_only = false);`);
-	await pool.query(`
-		SELECT add_continuous_aggregate_policy('hardware_hourly',
-			start_offset    => INTERVAL '3 hours',
-			end_offset      => INTERVAL '1 hour',
-			schedule_interval => INTERVAL '1 hour',
-			if_not_exists   => TRUE
-		);
-	`);
-	await pool.query(`CALL refresh_continuous_aggregate('hardware_hourly', NULL, NULL);`);
-
-	// PageSpeed Scores (Daily)
-	await pool.query(`
-		CREATE MATERIALIZED VIEW IF NOT EXISTS pagespeed_daily
-		WITH (timescaledb.continuous) AS
-		SELECT
-			monitor_id,
-			time_bucket('1 day', created_at) AS bucket,
-			AVG(lighthouse_performance)         AS avg_performance,
-			AVG(lighthouse_accessibility)       AS avg_accessibility,
-			AVG(lighthouse_best_practices)      AS avg_best_practices,
-			AVG(lighthouse_seo)                 AS avg_seo,
-			COUNT(*)                            AS sample_count
-		FROM checks
-		WHERE monitor_type = 'pagespeed'
-		GROUP BY monitor_id, bucket
-		WITH NO DATA;
-	`);
-	await pool.query(`ALTER MATERIALIZED VIEW pagespeed_daily SET (timescaledb.materialized_only = false);`);
-	await pool.query(`
-		SELECT add_continuous_aggregate_policy('pagespeed_daily',
-			start_offset    => INTERVAL '3 days',
-			end_offset      => INTERVAL '1 day',
-			schedule_interval => INTERVAL '1 day',
-			if_not_exists   => TRUE
-		);
-	`);
-	await pool.query(`CALL refresh_continuous_aggregate('pagespeed_daily', NULL, NULL);`);
-};
-
-export const dropContinuousAggregates = async (pool: Pool) => {
-	await pool.query(`
-		DROP MATERIALIZED VIEW IF EXISTS pagespeed_daily CASCADE;
-		DROP MATERIALIZED VIEW IF EXISTS hardware_hourly CASCADE;
-		DROP MATERIALIZED VIEW IF EXISTS checks_daily CASCADE;
-		DROP MATERIALIZED VIEW IF EXISTS checks_hourly CASCADE;
-	`);
-};
@@ -1,135 +0,0 @@
-import type { Pool } from "pg";
-
-export const createRetentionCompression = async (pool: Pool) => {
-	// -- Compression policies --
-
-	// Checks
-	await pool.query(`
-		ALTER TABLE checks SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'monitor_id',
-			timescaledb.compress_orderby = 'created_at DESC'
-		);
-		SELECT add_compression_policy('checks', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	// Check child tables
-	await pool.query(`
-		ALTER TABLE check_disks SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'check_id',
-			timescaledb.compress_orderby = 'check_created_at DESC'
-		);
-		SELECT add_compression_policy('check_disks', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	await pool.query(`
-		ALTER TABLE check_network_interfaces SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'check_id',
-			timescaledb.compress_orderby = 'check_created_at DESC'
-		);
-		SELECT add_compression_policy('check_network_interfaces', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	await pool.query(`
-		ALTER TABLE check_errors SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'check_id',
-			timescaledb.compress_orderby = 'check_created_at DESC'
-		);
-		SELECT add_compression_policy('check_errors', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	// Geo checks
-	await pool.query(`
-		ALTER TABLE geo_checks SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'monitor_id',
-			timescaledb.compress_orderby = 'created_at DESC'
-		);
-		SELECT add_compression_policy('geo_checks', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	await pool.query(`
-		ALTER TABLE geo_check_results SET (
-			timescaledb.compress,
-			timescaledb.compress_segmentby = 'geo_check_id',
-			timescaledb.compress_orderby = 'geo_check_created_at DESC'
-		);
-		SELECT add_compression_policy('geo_check_results', INTERVAL '2 days', if_not_exists => TRUE);
-	`);
-
-	// -- Retention policies (default 30 days) --
-
-	await pool.query(`
-		SELECT add_retention_policy('checks', INTERVAL '30 days', if_not_exists => TRUE);
-		SELECT add_retention_policy('check_disks', INTERVAL '30 days', if_not_exists => TRUE);
-		SELECT add_retention_policy('check_network_interfaces', INTERVAL '30 days', if_not_exists => TRUE);
-		SELECT add_retention_policy('check_errors', INTERVAL '30 days', if_not_exists => TRUE);
-		SELECT add_retention_policy('geo_checks', INTERVAL '30 days', if_not_exists => TRUE);
-		SELECT add_retention_policy('geo_check_results', INTERVAL '30 days', if_not_exists => TRUE);
-	`);
-
-	// -- Dynamic retention helper function --
-
-	await pool.query(`
-		CREATE OR REPLACE FUNCTION update_check_retention(new_ttl_days INTEGER)
-		RETURNS VOID AS $$
-		DECLARE
-			ttl_interval INTERVAL;
-		BEGIN
-			ttl_interval := (new_ttl_days || ' days')::INTERVAL;
-
-			PERFORM remove_retention_policy('checks', if_exists => true);
-			PERFORM remove_retention_policy('check_disks', if_exists => true);
-			PERFORM remove_retention_policy('check_network_interfaces', if_exists => true);
-			PERFORM remove_retention_policy('check_errors', if_exists => true);
-			PERFORM remove_retention_policy('geo_checks', if_exists => true);
-			PERFORM remove_retention_policy('geo_check_results', if_exists => true);
-
-			PERFORM add_retention_policy('checks', ttl_interval);
-			PERFORM add_retention_policy('check_disks', ttl_interval);
-			PERFORM add_retention_policy('check_network_interfaces', ttl_interval);
-			PERFORM add_retention_policy('check_errors', ttl_interval);
-			PERFORM add_retention_policy('geo_checks', ttl_interval);
-			PERFORM add_retention_policy('geo_check_results', ttl_interval);
-		END;
-		$$ LANGUAGE plpgsql;
-	`);
-};
-
-export const dropRetentionCompression = async (pool: Pool) => {
-	// Remove retention policies
-	await pool.query(`
-		SELECT remove_retention_policy('checks', if_exists => true);
-		SELECT remove_retention_policy('check_disks', if_exists => true);
-		SELECT remove_retention_policy('check_network_interfaces', if_exists => true);
-		SELECT remove_retention_policy('check_errors', if_exists => true);
-		SELECT remove_retention_policy('geo_checks', if_exists => true);
-		SELECT remove_retention_policy('geo_check_results', if_exists => true);
-	`);
-
-	// Remove compression policies
-	await pool.query(`
-		SELECT remove_compression_policy('checks', if_exists => true);
-		SELECT remove_compression_policy('check_disks', if_exists => true);
-		SELECT remove_compression_policy('check_network_interfaces', if_exists => true);
-		SELECT remove_compression_policy('check_errors', if_exists => true);
-		SELECT remove_compression_policy('geo_checks', if_exists => true);
-		SELECT remove_compression_policy('geo_check_results', if_exists => true);
-	`);
-
-	// Disable compression on tables
-	await pool.query(`
-		ALTER TABLE checks SET (timescaledb.compress = false);
-		ALTER TABLE check_disks SET (timescaledb.compress = false);
-		ALTER TABLE check_network_interfaces SET (timescaledb.compress = false);
-		ALTER TABLE check_errors SET (timescaledb.compress = false);
-		ALTER TABLE geo_checks SET (timescaledb.compress = false);
-		ALTER TABLE geo_check_results SET (timescaledb.compress = false);
-	`);
-
-	// Drop dynamic retention function
-	await pool.query(`DROP FUNCTION IF EXISTS update_check_retention(INTEGER);`);
-};
@@ -1,15 +0,0 @@
-import type { Pool } from "pg";
-
-export const addShowPageSpeedToStatusPages = async (pool: Pool) => {
-	await pool.query(`
-		ALTER TABLE status_pages
-		ADD COLUMN IF NOT EXISTS show_page_speed BOOLEAN DEFAULT FALSE;
-	`);
-};
-
-export const dropShowPageSpeedFromStatusPages = async (pool: Pool) => {
-	await pool.query(`
-		ALTER TABLE status_pages
-		DROP COLUMN IF EXISTS show_page_speed;
-	`);
-};
@@ -1,150 +0,0 @@
-import type { Pool } from "pg";
-import type { ILogger } from "@/utils/logger.js";
-import { createEnums, dropEnums } from "./0001_create_enums.js";
-import { createTeams, dropTeams } from "./0002_create_teams.js";
-import { createUsers, dropUsers } from "./0003_create_users.js";
-import { createMonitors, dropMonitors } from "./0004_create_monitors.js";
-import { createNotifications, dropNotifications } from "./0005_create_notifications.js";
-import { createMonitorNotifications, dropMonitorNotifications } from "./0006_create_monitor_notifications.js";
-import { createIncidents, dropIncidents } from "./0007_create_incidents.js";
-import { createMonitorStats, dropMonitorStats } from "./0008_create_monitor_stats.js";
-import { createChecks, dropChecks } from "./0009_create_checks.js";
-import { createCheckDisks, dropCheckDisks } from "./0010_create_check_disks.js";
-import { createCheckNetworkInterfaces, dropCheckNetworkInterfaces } from "./0011_create_check_network_interfaces.js";
-import { createCheckErrors, dropCheckErrors } from "./0012_create_check_errors.js";
-import { createGeoChecks, dropGeoChecks } from "./0013_create_geo_checks.js";
-import { createGeoCheckResults, dropGeoCheckResults } from "./0014_create_geo_check_results.js";
-import { createInvites, dropInvites } from "./0015_create_invites.js";
-import { createRecoveryTokens, dropRecoveryTokens } from "./0016_create_recovery_tokens.js";
-import { createMaintenanceWindows, dropMaintenanceWindows } from "./0017_create_maintenance_windows.js";
-import { createStatusPages, dropStatusPages } from "./0018_create_status_pages.js";
-import { createAppSettings, dropAppSettings } from "./0019_create_app_settings.js";
-import { createContinuousAggregates, dropContinuousAggregates } from "./0020_create_continuous_aggregates.js";
-import { createRetentionCompression, dropRetentionCompression } from "./0021_create_retention_compression.js";
-import { addShowPageSpeedToStatusPages, dropShowPageSpeedFromStatusPages } from "./0022_add_show_page_speed_to_status_pages.js";
-
-const SERVICE_NAME = "TimescaleDB Migrations";
-
-type MigrationEntry = {
-	name: string;
-	up: (pool: Pool) => Promise<void>;
-	down: (pool: Pool) => Promise<void>;
-};
-
-const migrations: MigrationEntry[] = [
-	{ name: "0001_create_enums", up: createEnums, down: dropEnums },
-	{ name: "0002_create_teams", up: createTeams, down: dropTeams },
-	{ name: "0003_create_users", up: createUsers, down: dropUsers },
-	{ name: "0004_create_monitors", up: createMonitors, down: dropMonitors },
-	{ name: "0005_create_notifications", up: createNotifications, down: dropNotifications },
-	{ name: "0006_create_monitor_notifications", up: createMonitorNotifications, down: dropMonitorNotifications },
-	{ name: "0007_create_incidents", up: createIncidents, down: dropIncidents },
-	{ name: "0008_create_monitor_stats", up: createMonitorStats, down: dropMonitorStats },
-	{ name: "0009_create_checks", up: createChecks, down: dropChecks },
-	{ name: "0010_create_check_disks", up: createCheckDisks, down: dropCheckDisks },
-	{ name: "0011_create_check_network_interfaces", up: createCheckNetworkInterfaces, down: dropCheckNetworkInterfaces },
-	{ name: "0012_create_check_errors", up: createCheckErrors, down: dropCheckErrors },
-	{ name: "0013_create_geo_checks", up: createGeoChecks, down: dropGeoChecks },
-	{ name: "0014_create_geo_check_results", up: createGeoCheckResults, down: dropGeoCheckResults },
-	{ name: "0015_create_invites", up: createInvites, down: dropInvites },
-	{ name: "0016_create_recovery_tokens", up: createRecoveryTokens, down: dropRecoveryTokens },
-	{ name: "0017_create_maintenance_windows", up: createMaintenanceWindows, down: dropMaintenanceWindows },
-	{ name: "0018_create_status_pages", up: createStatusPages, down: dropStatusPages },
-	{ name: "0019_create_app_settings", up: createAppSettings, down: dropAppSettings },
-	{ name: "0020_create_continuous_aggregates", up: createContinuousAggregates, down: dropContinuousAggregates },
-	{ name: "0021_create_retention_compression", up: createRetentionCompression, down: dropRetentionCompression },
-	{ name: "0022_add_show_page_speed_to_status_pages", up: addShowPageSpeedToStatusPages, down: dropShowPageSpeedFromStatusPages },
-];
-
-const ensureMigrationsTable = async (pool: Pool) => {
-	await pool.query(`
-		DO $$ BEGIN
-			CREATE TYPE migration_status AS ENUM ('completed', 'failed');
-		EXCEPTION
-			WHEN duplicate_object THEN NULL;
-		END $$;
-	`);
-	await pool.query(`
-		CREATE TABLE IF NOT EXISTS migrations (
-			id              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-			name            TEXT NOT NULL UNIQUE,
-			status          migration_status NOT NULL,
-			completed_at    TIMESTAMPTZ,
-			error           TEXT,
-			created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-			updated_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
-		);
-	`);
-};
-
-const runTimescaleDBMigrations = async (pool: Pool, logger?: ILogger) => {
-	try {
-		logger?.info({ message: "Running migrations", service: SERVICE_NAME });
-
-		await ensureMigrationsTable(pool);
-
-		for (const migration of migrations) {
-			const result = await pool.query("SELECT 1 FROM migrations WHERE name = $1 AND status = 'completed'", [migration.name]);
-			if (result.rowCount !== null && result.rowCount > 0) {
-				logger?.info({ message: `Skipping ${migration.name}`, service: SERVICE_NAME });
-				continue;
-			}
-
-			try {
-				await migration.up(pool);
-				await pool.query(
-					`INSERT INTO migrations (name, status, completed_at)
-					 VALUES ($1, 'completed', NOW())
-					 ON CONFLICT (name) DO UPDATE SET status = 'completed', completed_at = NOW(), error = NULL, updated_at = NOW()`,
-					[migration.name]
-				);
-				logger?.info({ message: `Completed ${migration.name}`, service: SERVICE_NAME });
-			} catch (error) {
-				const err = error as Error;
-				await pool.query(
-					`INSERT INTO migrations (name, status, error)
-					 VALUES ($1, 'failed', $2)
-					 ON CONFLICT (name) DO UPDATE SET status = 'failed', error = $2, updated_at = NOW()`,
-					[migration.name, err?.message]
-				);
-				throw error;
-			}
-		}
-
-		logger?.info({ message: "Migrations completed", service: SERVICE_NAME });
-	} catch (error) {
-		const err = error as Error;
-		logger?.error({ message: "Migration failed", service: SERVICE_NAME, details: { error: err?.message }, stack: err?.stack });
-		throw error;
-	}
-};
-
-const rollbackTimescaleDBMigration = async (pool: Pool, logger?: ILogger) => {
-	try {
-		await ensureMigrationsTable(pool);
-
-		// Find the last completed migration
-		const result = await pool.query("SELECT name FROM migrations WHERE status = 'completed' ORDER BY completed_at DESC LIMIT 1");
-		if (result.rowCount === 0) {
-			logger?.info({ message: "No migrations to roll back", service: SERVICE_NAME });
-			return;
-		}
-
-		const lastMigrationName = result.rows[0].name;
-		const migration = migrations.find((m) => m.name === lastMigrationName);
-		if (!migration) {
-			throw new Error(`Migration "${lastMigrationName}" not found in migration list`);
-		}
-
-		logger?.info({ message: `Rolling back ${migration.name}`, service: SERVICE_NAME });
-		await migration.down(pool);
-		await pool.query("DELETE FROM migrations WHERE name = $1", [migration.name]);
-		logger?.info({ message: `Rolled back ${migration.name}`, service: SERVICE_NAME });
-	} catch (error) {
-		const err = error as Error;
-		logger?.error({ message: "Rollback failed", service: SERVICE_NAME, details: { error: err?.message }, stack: err?.stack });
-		throw error;
-	}
-};
-
-export { runTimescaleDBMigrations, rollbackTimescaleDBMigration };
@@ -21,10 +21,13 @@ type CheckMetadataDocument = Omit<CheckMetadata, "monitorId" | "teamId"> & {
 	type: MonitorType;
 };

-type CheckDocumentBase = Omit<Check, "id" | "metadata" | "createdAt" | "updatedAt"> & {
+type CheckDocumentBase = Omit<Check, "id" | "metadata" | "expiry" | "ackAt" | "createdAt" | "updatedAt"> & {
 	metadata: CheckMetadataDocument;
+	expiry: Date;
+	ackAt?: Date | null;
 	createdAt: Date;
 	updatedAt: Date;
+	__v: number;
 };

 interface CheckDocument extends CheckDocumentBase {
@@ -222,7 +225,18 @@ const CheckSchema = new Schema<CheckDocument>(
 		message: {
 			type: String,
 		},
-
+		expiry: {
+			type: Date,
+			default: Date.now,
+		},
+		ack: {
+			type: Boolean,
+			default: false,
+		},
+		ackAt: {
+			type: Date,
+			default: undefined,
+		},
 		cpu: {
 			type: cpuSchema,
 			default: () => ({}),
@@ -1,70 +0,0 @@
-import { Schema, model, type Types } from "mongoose";
-import { DLQItemTypes, DLQItemStatuses, type DLQItem } from "@/types/dlqItem.js";
-
-export interface DLQItemDocument extends Omit<DLQItem, "id" | "monitorId" | "teamId" | "nextRetryAt" | "createdAt" | "updatedAt"> {
-	_id: Types.ObjectId;
-	monitorId: Types.ObjectId;
-	teamId: Types.ObjectId;
-	nextRetryAt: Date;
-	createdAt: Date;
-	updatedAt: Date;
-}
-
-const DLQItemSchema = new Schema<DLQItemDocument>(
-	{
-		type: {
-			type: String,
-			enum: DLQItemTypes,
-			required: true,
-		},
-		status: {
-			type: String,
-			enum: DLQItemStatuses,
-			default: "pending",
-		},
-		payload: {
-			type: Schema.Types.Mixed,
-			required: true,
-		},
-		monitorId: {
-			type: Schema.Types.ObjectId,
-			ref: "Monitor",
-			required: true,
-			immutable: true,
-			index: true,
-		},
-		teamId: {
-			type: Schema.Types.ObjectId,
-			ref: "Team",
-			required: true,
-			immutable: true,
-			index: true,
-		},
-		retryCount: {
-			type: Number,
-			default: 0,
-		},
-		maxRetries: {
-			type: Number,
-			default: 5,
-		},
-		lastError: {
-			type: String,
-			default: "",
-		},
-		nextRetryAt: {
-			type: Date,
-			required: true,
-		},
-	},
-	{ timestamps: true }
-);
-
-DLQItemSchema.index({ status: 1, nextRetryAt: 1 });
-DLQItemSchema.index({ teamId: 1, status: 1 });
-DLQItemSchema.index({ createdAt: 1 });
-
-const DLQItemModel = model<DLQItemDocument>("DLQItem", DLQItemSchema);
-
-export { DLQItemModel };
-export default DLQItemModel;
@@ -1,5 +1,5 @@
 import { Schema, model, type Types } from "mongoose";
-import type { MaintenanceWindow } from "@/types/maintenanceWindow.js";
+import type { MaintenanceWindow, DurationUnit } from "@/types/maintenanceWindow.js";

 type MaintenanceWindowDocumentBase = Omit<MaintenanceWindow, "id" | "monitorId" | "teamId" | "start" | "end" | "createdAt" | "updatedAt"> & {
 	monitorId: Types.ObjectId;
@@ -1,18 +1,6 @@
-import { Schema, model, Types } from "mongoose";
+import { Schema, model, Types, type UpdateQuery } from "mongoose";
 import type { Monitor, MonitorMatchMethod, CheckSnapshot } from "@/types/monitor.js";
 import { MonitorTypes, MonitorStatuses } from "@/types/monitor.js";
-import type {
-	CheckAudits,
-	CheckCaptureInfo,
-	CheckCpuInfo,
-	CheckDiskInfo,
-	CheckErrorInfo,
-	CheckHostInfo,
-	CheckMemoryInfo,
-	CheckNetworkInterfaceInfo,
-	GotTimings,
-	ILighthouseAudit,
-} from "@/types/check.js";

 type CheckSnapshotDocument = Omit<CheckSnapshot, "createdAt"> & { createdAt: Date };

@@ -35,167 +23,13 @@ interface MonitorDocument extends MonitorDocumentBase {
 	updatedAt: Date;
 }

-const snapshotTimingPhasesSchema = new Schema<GotTimings["phases"]>(
-	{
-		wait: { type: Number },
-		dns: { type: Number },
-		tcp: { type: Number },
-		tls: { type: Number },
-		request: { type: Number },
-		firstByte: { type: Number },
-		download: { type: Number },
-		total: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotTimingsSchema = new Schema<GotTimings>(
-	{
-		start: { type: Number },
-		socket: { type: Number },
-		lookup: { type: Number },
-		connect: { type: Number },
-		secureConnect: { type: Number },
-		upload: { type: Number },
-		response: { type: Number },
-		end: { type: Number },
-		phases: { type: snapshotTimingPhasesSchema },
-	},
-	{ _id: false }
-);
-
-const snapshotCpuSchema = new Schema<CheckCpuInfo>(
-	{
-		physical_core: { type: Number },
-		logical_core: { type: Number },
-		frequency: { type: Number },
-		current_frequency: { type: Number },
-		temperature: { type: [Number] },
-		free_percent: { type: Number },
-		usage_percent: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotMemorySchema = new Schema<CheckMemoryInfo>(
-	{
-		total_bytes: { type: Number },
-		available_bytes: { type: Number },
-		used_bytes: { type: Number },
-		usage_percent: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotDiskSchema = new Schema<CheckDiskInfo>(
-	{
-		device: { type: String },
-		mountpoint: { type: String },
-		total_bytes: { type: Number },
-		free_bytes: { type: Number },
-		used_bytes: { type: Number },
-		usage_percent: { type: Number },
-		total_inodes: { type: Number },
-		free_inodes: { type: Number },
-		used_inodes: { type: Number },
-		inodes_usage_percent: { type: Number },
-		read_bytes: { type: Number },
-		write_bytes: { type: Number },
-		read_time: { type: Number },
-		write_time: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotHostSchema = new Schema<CheckHostInfo>(
-	{
-		os: { type: String },
-		platform: { type: String },
-		kernel_version: { type: String },
-		pretty_name: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotErrorSchema = new Schema<CheckErrorInfo>(
-	{
-		metric: { type: [String] },
-		err: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotCaptureSchema = new Schema<CheckCaptureInfo>(
-	{
-		version: { type: String },
-		mode: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotNetworkInterfaceSchema = new Schema<CheckNetworkInterfaceInfo>(
-	{
-		name: { type: String },
-		bytes_sent: { type: Number },
-		bytes_recv: { type: Number },
-		packets_sent: { type: Number },
-		packets_recv: { type: Number },
-		err_in: { type: Number },
-		err_out: { type: Number },
-		drop_in: { type: Number },
-		drop_out: { type: Number },
-		fifo_in: { type: Number },
-		fifo_out: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotLighthouseAuditSchema = new Schema<ILighthouseAudit>(
-	{
-		id: { type: String },
-		title: { type: String },
-		score: { type: Number },
-		displayValue: { type: String },
-		numericValue: { type: Number },
-		numericUnit: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotAuditsSchema = new Schema<CheckAudits>(
-	{
-		cls: { type: snapshotLighthouseAuditSchema },
-		si: { type: snapshotLighthouseAuditSchema },
-		fcp: { type: snapshotLighthouseAuditSchema },
-		lcp: { type: snapshotLighthouseAuditSchema },
-		tbt: { type: snapshotLighthouseAuditSchema },
-	},
-	{ _id: false }
-);
-
 const checkSnapshotSchema = new Schema<CheckSnapshotDocument>(
 	{
 		id: { type: String, required: true },
 		status: { type: Boolean, required: true },
-		responseTime: { type: Number },
-		timings: { type: snapshotTimingsSchema },
-		statusCode: { type: Number },
-		message: { type: String },
-		cpu: { type: snapshotCpuSchema },
-		memory: { type: snapshotMemorySchema },
-		disk: { type: [snapshotDiskSchema] },
-		host: { type: snapshotHostSchema },
-		errors: { type: [snapshotErrorSchema] },
-		capture: { type: snapshotCaptureSchema },
-		net: { type: [snapshotNetworkInterfaceSchema] },
-		accessibility: { type: Number },
-		bestPractices: { type: Number },
-		seo: { type: Number },
-		performance: { type: Number },
-		audits: { type: snapshotAuditsSchema },
 		createdAt: { type: Date, required: true },
 	},
-	{ _id: false }
+	{ _id: false, strict: false }
 );

 const MonitorSchema = new Schema<MonitorDocument>(
@@ -25,7 +25,7 @@ const NotificationSchema = new Schema<NotificationDocument>(
 		},
 		type: {
 			type: String,
-			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix", "teams", "telegram"] as NotificationChannel[],
+			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix"] as NotificationChannel[],
 			required: true,
 		},
 		notificationName: {
@@ -43,9 +43,9 @@ const StatusPageSchema = new Schema<StatusPageDocument>(
 			required: true,
 		},
 		type: {
-			type: [String],
+			type: String,
 			required: true,
-			default: ["uptime"],
+			default: "uptime",
 			enum: StatusPageTypes,
 		},
 		companyName: {
@@ -100,14 +100,6 @@ const StatusPageSchema = new Schema<StatusPageDocument>(
 			type: Boolean,
 			default: false,
 		},
-		showInfrastructure: {
-			type: Boolean,
-			default: false,
-		},
-		showPageSpeed: {
-			type: Boolean,
-			default: false,
-		},
 		customCSS: {
 			type: String,
 			default: "",
@@ -36,6 +36,3 @@ export { default as MaintenanceWindowModel } from "@/db/models/MaintenanceWindow

 export * from "@/db/models/GeoCheck.js";
 export { default as GeoCheckModel } from "@/db/models/GeoCheck.js";
-
-export * from "@/db/models/DLQItem.js";
-export { default as DLQItemModel } from "@/db/models/DLQItem.js";
Author	SHA1	Message	Date
Alexander Holliday	321ca59380	Merge pull request #3368 from bluewave-labs/develop Develop -> master (3.5.0)	2026-03-04 10:41:02 -08:00
Alexander Holliday	e3ecfe6ad8	Merge pull request #3323 from bluewave-labs/develop develop -> master	2026-02-20 12:38:33 -08:00
Alexander Holliday	f4664eec16	Merge pull request #3321 from bluewave-labs/develop develop->master	2026-02-20 12:20:49 -08:00
Alexander Holliday	56f601e34b	Merge pull request #3319 from bluewave-labs/develop develop -> master	2026-02-20 12:07:29 -08:00
Alexander Holliday	1244ff6d93	Merge pull request #3212 from bluewave-labs/develop develop -> master	2026-01-27 13:58:48 -08:00
Alexander Holliday	c0ea804c98	Merge pull request #3209 from bluewave-labs/develop develop -> master	2026-01-27 13:40:25 -08:00
Alexander Holliday	c21cf29db6	Merge pull request #3207 from bluewave-labs/develop develop -> master	2026-01-27 13:20:18 -08:00
Alexander Holliday	3d0da70ce6	Merge pull request #3204 from bluewave-labs/develop develop -> master	2026-01-27 13:09:47 -08:00
Alexander Holliday	feb061240b	Merge pull request #3042 from bluewave-labs/develop develp->master	2025-10-27 12:09:00 -07:00
Alexander Holliday	a924227805	Merge pull request #2964 from bluewave-labs/develop develop -> master	2025-09-18 13:40:45 -07:00
Alexander Holliday	2144d3f8c0	Merge pull request #2962 from bluewave-labs/develop develop -> master	2025-09-18 12:04:51 -07:00
Alexander Holliday	fcd6786149	Merge pull request #2936 from bluewave-labs/develop develop -> master	2025-09-08 20:43:21 -07:00
Alexander Holliday	ea968ebf3c	Merge pull request #2933 from bluewave-labs/develop develop -> master	2025-09-08 20:33:35 -07:00
Alexander Holliday	8a7b852974	Merge pull request #2929 from bluewave-labs/develop develop -> master	2025-09-08 07:24:16 -07:00
Alexander Holliday	c8d3e3b70c	Merge pull request #2921 from bluewave-labs/develop develop -> master	2025-09-04 15:46:30 -07:00
Alexander Holliday	7a90a6f9f4	Merge pull request #2915 from bluewave-labs/develop develop->master	2025-09-01 10:33:09 -07:00