initialize timeOfLastFailure

feat: integration tests

.github/workflows/deploy-images-on-release.yml

@@ -107,6 +107,7 @@ jobs:
           context: .
           file: ./docker/dist-arm/server.Dockerfile
           push: true
+          no-cache: true
           tags: |
             ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ steps.extract_tag.outputs.version }}
           platforms: linux/amd64,linux/arm64

.github/workflows/deploy-images.yml

@@ -102,6 +102,7 @@ jobs:
           context: .
           file: ./docker/dist-arm/server.Dockerfile
           push: true
+          no-cache: true
           tags: |
             ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
           platforms: linux/amd64,linux/arm64

.github/workflows/poeditor-sync.yml

@@ -1,120 +1,120 @@
-name: POEditor Translation Synchronization
+# name: POEditor Translation Synchronization
 
-on:
+# on:
-  # For manual triggering
+#   # For manual triggering
-  workflow_dispatch:
+#   workflow_dispatch:
-    inputs:
+#     inputs:
-      languages:
+#       languages:
-        description: "Languages to synchronize (comma separated, e.g.: tr,en,es)"
+#         description: "Languages to synchronize (comma separated, e.g.: tr,en,es)"
-        required: false
+#         required: false
-        default: "ar,zh-tw,cs,en,fi,fr,de,pt-br,ru,es,tr,ja,zh-cn,th"
+#         default: "ar,zh-tw,cs,en,fi,fr,de,pt-br,ru,es,tr,ja,zh-cn,th"
-      format:
+#       format:
-        description: "Export format (key_value_json or json)"
+#         description: "Export format (key_value_json or json)"
-        required: false
+#         required: false
-        default: "key_value_json"
+#         default: "key_value_json"
 
-permissions:
+# permissions:
-  contents: write
+#   contents: write
-  pull-requests: write
+#   pull-requests: write
 
-jobs:
+# jobs:
-  sync-translations:
+#   sync-translations:
-    runs-on: ubuntu-latest
+#     runs-on: ubuntu-latest
-    permissions:
+#     permissions:
-      contents: write
+#       contents: write
-      issues: write
+#       issues: write
-      pull-requests: write
+#       pull-requests: write
 
-    steps:
+#     steps:
-      - name: Checkout code
+#       - name: Checkout code
-        uses: actions/checkout@v3
+#         uses: actions/checkout@v3
-        with:
+#         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+#           token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
+#           fetch-depth: 0
 
-      - name: Setup Node.js
+#       - name: Setup Node.js
-        uses: actions/setup-node@v3
+#         uses: actions/setup-node@v3
-        with:
+#         with:
-          node-version: "22"
+#           node-version: "22"
 
-      - name: Create package.json for scripts
+#       - name: Create package.json for scripts
-        run: |
+#         run: |
-          mkdir -p .github/scripts
+#           mkdir -p .github/scripts
-          cat > .github/scripts/package.json << EOF
+#           cat > .github/scripts/package.json << EOF
-          {
+#           {
-            "name": "poeditor-scripts",
+#             "name": "poeditor-scripts",
-            "version": "1.0.0",
+#             "version": "1.0.0",
-            "private": true,
+#             "private": true,
-            "type": "module",
+#             "type": "module",
-            "dependencies": {
+#             "dependencies": {
-              "axios": "^1.6.0",
+#               "axios": "^1.6.0",
-              "fs-extra": "^11.1.1"
+#               "fs-extra": "^11.1.1"
-            }
+#             }
-          }
+#           }
-          EOF
+#           EOF
 
-      - name: Install dependencies
+#       - name: Install dependencies
-        run: |
+#         run: |
-          cd .github/scripts
+#           cd .github/scripts
-          npm install
+#           npm install
 
-      - name: Download translations from POEditor
+#       - name: Download translations from POEditor
-        env:
+#         env:
-          POEDITOR_API: ${{ secrets.POEDITOR_API }}
+#           POEDITOR_API: ${{ secrets.POEDITOR_API }}
-          POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
+#           POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
-          LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }}
+#           LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }}
-          EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }}
+#           EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }}
-        run: |
+#         run: |
-          mkdir -p temp
+#           mkdir -p temp
-          node .github/scripts/download-translations.js
+#           node .github/scripts/download-translations.js
 
-      - name: Verify translation files
+#       - name: Verify translation files
-        run: |
+#         run: |
-          echo "Verifying translation files..."
+#           echo "Verifying translation files..."
-          for file in temp/*.json; do
+#           for file in temp/*.json; do
-            echo "Checking $file"
+#             echo "Checking $file"
-            if [ ! -s "$file" ]; then
+#             if [ ! -s "$file" ]; then
-              echo "Error: $file is empty or does not exist"
+#               echo "Error: $file is empty or does not exist"
-              exit 1
+#               exit 1
-            fi
+#             fi
-            # Validate JSON format
+#             # Validate JSON format
-            cat "$file" | jq . > /dev/null || { echo "Error: $file is not valid JSON"; exit 1; }
+#             cat "$file" | jq . > /dev/null || { echo "Error: $file is not valid JSON"; exit 1; }
-          done
+#           done
-          echo "All translation files are valid"
+#           echo "All translation files are valid"
 
-      - name: Copy translations to project
+#       - name: Copy translations to project
-        run: |
+#         run: |
-          mkdir -p client/src/locales
+#           mkdir -p client/src/locales
-          cp -r temp/* client/src/locales/
+#           cp -r temp/* client/src/locales/
-          echo "Translation files copied to client/src/locales/"
+#           echo "Translation files copied to client/src/locales/"
 
-      - name: Get current date
+#       - name: Get current date
-        id: date
+#         id: date
-        run: echo "date=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
+#         run: echo "date=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
 
-      - name: Format client code
+#       - name: Format client code
-        run: |
+#         run: |
-          cd client
+#           cd client
-          npm ci
+#           npm ci
-          npm run format
+#           npm run format
 
-      - name: Create Pull Request
+#       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+#         uses: peter-evans/create-pull-request@v7
-        with:
+#         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+#           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "feat: translations updated from POEditor"
+#           commit-message: "feat: translations updated from POEditor"
-          title: "🌐 Updated Translations from POEditor"
+#           title: "🌐 Updated Translations from POEditor"
-          body: |
+#           body: |
-            This PR contains the latest translations from POEditor.
+#             This PR contains the latest translations from POEditor.
 
-            📅 Update Date: ${{ steps.date.outputs.date }}
+#             📅 Update Date: ${{ steps.date.outputs.date }}
-            🔄 Updated Languages: ${{ github.event.inputs.languages || 'tr,en' }}
+#             🔄 Updated Languages: ${{ github.event.inputs.languages || 'tr,en' }}
 
-            ⚠️ Please review the translations and approve the PR if everything looks correct.
+#             ⚠️ Please review the translations and approve the PR if everything looks correct.
-          branch: translation-update-${{ github.run_number }}
+#           branch: translation-update-${{ github.run_number }}
-          delete-branch: true
+#           delete-branch: true
-          base: develop
+#           base: develop
-          add-paths: |
+#           add-paths: |
-            client/src/locales/*.json
+#             client/src/locales/*.json
-          committer: GitHub Action <github-actions[bot]@users.noreply.github.com>
+#           committer: GitHub Action <github-actions[bot]@users.noreply.github.com>
-          author: GitHub Action <github-actions[bot]@users.noreply.github.com>
+#           author: GitHub Action <github-actions[bot]@users.noreply.github.com>

.gitignore

@@ -3,3 +3,10 @@
 .VSCodeCounter
 *.sh
 mongo
+timescaledb
+node_modules/
+docs/architecture
+docs/reviews
+docs/todo
+docs/frontend
+docs/timescale

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Running lint-staged..."
+cd client && npx lint-staged && cd ..
+cd server && npx lint-staged && cd ..

README.md

@@ -29,7 +29,6 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 - [📦 Demo](#demo)  
 - [🔗 User's guide](#users-guide)  
 - [🛠️ Installation](#installation)
-- [🏁 Translations](#translations)  
 - [🚀 Performance](#performance)  
 - [💚 Questions & Ideas](#questions--ideas)  
 - [🧩 Features](#features)  
@@ -42,17 +41,21 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 ## Demo
 
-You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is uptimedemo@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
+You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
 
 ## User's guide
 
-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! :)
+Usage instructions can be found [here](https://checkmate.so/docs). 
+
+## Prerequisites
+- [Docker](https://www.docker.com/) installed
+- [Git](https://git-scm.com/) installed
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
+See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
 
-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.
+Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) 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.
 
 ### Using a Custom CA
 
@@ -60,11 +63,6 @@ If you need to monitor internal HTTPS endpoints with certificates from private C
 
 For more documentation, see the [docs directory](./docs/).
 
-
-## Translations
-
-If you would like to use Checkmate in your language, please [go to this page](https://poeditor.com/join/project/lRUoGZFCsJ) and register for the language you would like to translate Checkmate to. 
-
 ## Performance
 
 Thanks to extensive optimizations, Checkmate operates with an exceptionally small memory footprint, requiring minimal memory and CPU resources. Here’s the memory usage of a Node.js instance running on a server that monitors 323 servers every minute:
@@ -80,7 +78,7 @@ You can see the memory footprint of MongoDB and Redis on the same server (398Mb
 If you have any questions, suggestions or comments, you have several options: 
 
 - [Discord channel](https://discord.gg/NAb6H3UTjK) (preferred)
-- [GitHub Discussions](https://github.com/bluewave-labs/bluewave-uptime/discussions) (we check here from time to time)
+- [GitHub Discussions](https://github.com/bluewave-labs/Checkmate/discussions) (we check here from time to time)
 
 Feel free to ask questions or share your ideas - we'd love to hear from you!
 
@@ -147,7 +145,7 @@ If you would like to sponsor an additional feature, [see this page](https://chec
 
 ## Contributing
 
-We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Owaise](http://github.com/Owaiseimdad), [Aryaman](https://github.com/Br0wnHammer), [Mert](https://github.com/mertssmnoglu) and [Karen](https://github.com/karenvicent) helping individuals and businesses monitor their infra and servers.
+We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer), [Mert](https://github.com/mertssmnoglu) and [Karen](https://github.com/karenvicent) helping individuals and businesses monitor their infra and servers.
 
 We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned 7000+ stars and attracted 90+ contributors from around the globe.
 
@@ -157,27 +155,20 @@ 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. 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).
+2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-3. 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. Open an issue if you believe you've encountered a bug.
+4. Check for good-first-issue's if you are a newcomer.
-5. 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. 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).
-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" />
 </a>
 
-[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/Checkmate&Date)
 
 ## Our sponsors
 
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
 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.

client/index.html

@@ -18,7 +18,7 @@
 		<div id="root"></div>
 		<script
 			type="module"
-			src="/src/main.jsx"
+			src="/src/main.tsx"
 		></script>
 	</body>
 </html>

client/package.json

@@ -12,6 +12,9 @@
 		"format": "prettier --write .",
 		"format-check": "prettier --check ."
 	},
+	"lint-staged": {
+		"**/*": "prettier --write"
+	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
 		"@emotion/styled": "^11.13.0",
@@ -22,6 +25,7 @@
 		"@mui/x-charts": "7.29.1",
 		"@mui/x-date-pickers": "7.29.4",
 		"@reduxjs/toolkit": "2.7.0",
+		"@types/maplibre-gl": "^1.13.2",
 		"axios": "^1.7.4",
 		"dayjs": "1.11.13",
 		"flag-icons": "7.3.2",
@@ -30,13 +34,16 @@
 		"i18next": "25.4.2",
 		"joi": "17.13.3",
 		"lucide-react": "^0.562.0",
+		"maplibre-gl": "^5.19.0",
 		"mui-color-input": "^7.0.0",
+		"pretty-bytes": "^7.1.0",
 		"pretty-ms": "^9.3.0",
 		"react": "18.3.1",
 		"react-dom": "^18.2.0",
 		"react-hook-form": "^7.63.0",
 		"react-i18next": "^15.4.0",
 		"react-icons": "5.5.0",
+		"react-map-gl": "^8.1.0",
 		"react-redux": "9.2.0",
 		"react-router": "^6.23.0",
 		"react-router-dom": "^6.23.1",
@@ -45,7 +52,7 @@
 		"redux-persist": "6.0.0",
 		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
-		"zod": "^4.1.11"
+		"zod": "^4.3.6"
 	},
 	"devDependencies": {
 		"@types/node": "24.5.2",
@@ -56,8 +63,9 @@
 		"eslint-plugin-react": "^7.34.1",
 		"eslint-plugin-react-hooks": "^5.0.0",
 		"eslint-plugin-react-refresh": "^0.4.6",
+		"lint-staged": "^16.2.7",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "6.3.6"
+		"vite": "6.4.1"
 	}
 }

client/scripts/migrate-locales.ts

@@ -0,0 +1,258 @@
+/**
+ * Locale Migration Script
+ *
+ * Restructures all non-English locale files to match en.json's nested key structure.
+ * Recovers translations via safe key-matching strategies, uses English placeholders
+ * for unmatched keys.
+ *
+ * Usage: npx tsx client/scripts/migrate-locales.ts
+ *
+ * SAFETY: en.json is NEVER modified. Originals are backed up before overwriting.
+ */
+
+import fs from "fs";
+import path from "path";
+
+const LOCALES_DIR = path.resolve(import.meta.dirname, "../src/locales");
+const BACKUP_DIR = path.join(LOCALES_DIR, "backup");
+const REPORT_PATH = path.join(LOCALES_DIR, "migration-report.json");
+
+// ── Helpers ──────────────────────────────────────────────────────────────────
+
+/** Flatten a nested object into { "a.b.c": value } pairs */
+function flattenKeys(obj: Record<string, unknown>, prefix = ""): Record<string, string> {
+	const result: Record<string, string> = {};
+	for (const [key, value] of Object.entries(obj)) {
+		const fullPath = prefix ? `${prefix}.${key}` : key;
+		if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+			Object.assign(result, flattenKeys(value as Record<string, unknown>, fullPath));
+		} else {
+			result[fullPath] = String(value);
+		}
+	}
+	return result;
+}
+
+/** Set a value at a dot-separated path in a nested object */
+function setNestedValue(
+	obj: Record<string, unknown>,
+	keyPath: string,
+	value: string
+): void {
+	const parts = keyPath.split(".");
+	let current = obj;
+	for (let i = 0; i < parts.length - 1; i++) {
+		const part = parts[i];
+		if (!(part in current) || typeof current[part] !== "object") {
+			current[part] = {};
+		}
+		current = current[part] as Record<string, unknown>;
+	}
+	current[parts[parts.length - 1]] = value;
+}
+
+// ── Build mapping indexes from en.json ───────────────────────────────────────
+
+function buildIndexes(enFlat: Record<string, string>) {
+	const enKeys = Object.keys(enFlat);
+
+	// last segment -> en key paths
+	const lastSegIndex: Record<string, string[]> = {};
+	// last 2 segments -> en key paths
+	const suffixIndex: Record<string, string[]> = {};
+
+	for (const keyPath of enKeys) {
+		const parts = keyPath.split(".");
+		const lastSeg = parts[parts.length - 1].toLowerCase();
+		if (!lastSegIndex[lastSeg]) lastSegIndex[lastSeg] = [];
+		lastSegIndex[lastSeg].push(keyPath);
+
+		if (parts.length >= 2) {
+			const suffix = parts.slice(-2).join(".").toLowerCase();
+			if (!suffixIndex[suffix]) suffixIndex[suffix] = [];
+			suffixIndex[suffix].push(keyPath);
+		}
+	}
+
+	return { lastSegIndex, suffixIndex };
+}
+
+// ── Mapping logic ────────────────────────────────────────────────────────────
+
+type MatchStrategy = "exact" | "suffix-2" | "unique-name" | "english-placeholder";
+
+interface KeyMatch {
+	enKey: string;
+	value: string;
+	strategy: MatchStrategy;
+}
+
+function buildMigratedLocale(
+	enFlat: Record<string, string>,
+	langFlat: Record<string, string>,
+	indexes: ReturnType<typeof buildIndexes>
+): { matches: KeyMatch[]; result: Record<string, unknown> } {
+	const { lastSegIndex, suffixIndex } = indexes;
+	const matches: KeyMatch[] = [];
+	const result: Record<string, unknown> = {};
+
+	// Build reverse lookup: for each orphan key in lang, index by last segment and suffix
+	const langByLastSeg: Record<string, { key: string; value: string }[]> = {};
+	const langBySuffix: Record<string, { key: string; value: string }[]> = {};
+
+	for (const [langKey, langValue] of Object.entries(langFlat)) {
+		const parts = langKey.split(".");
+		const lastSeg = parts[parts.length - 1].toLowerCase();
+		if (!langByLastSeg[lastSeg]) langByLastSeg[lastSeg] = [];
+		langByLastSeg[lastSeg].push({ key: langKey, value: langValue });
+
+		if (parts.length >= 2) {
+			const suffix = parts.slice(-2).join(".").toLowerCase();
+			if (!langBySuffix[suffix]) langBySuffix[suffix] = [];
+			langBySuffix[suffix].push({ key: langKey, value: langValue });
+		}
+	}
+
+	for (const enKey of Object.keys(enFlat)) {
+		const enValue = enFlat[enKey];
+		const parts = enKey.split(".");
+		const lastSeg = parts[parts.length - 1].toLowerCase();
+		const suffix = parts.length >= 2 ? parts.slice(-2).join(".").toLowerCase() : null;
+
+		// Strategy 1: Exact path match
+		if (langFlat[enKey] !== undefined) {
+			const value = langFlat[enKey];
+			setNestedValue(result, enKey, value);
+			matches.push({ enKey, value, strategy: "exact" });
+			continue;
+		}
+
+		// Strategy 2: 2-segment suffix match (lang key suffix matches en key suffix, both unique)
+		if (suffix) {
+			const enCandidates = suffixIndex[suffix];
+			const langCandidates = langBySuffix[suffix];
+			if (
+				enCandidates &&
+				enCandidates.length === 1 &&
+				langCandidates &&
+				langCandidates.length === 1
+			) {
+				const value = langCandidates[0].value;
+				setNestedValue(result, enKey, value);
+				matches.push({ enKey, value, strategy: "suffix-2" });
+				continue;
+			}
+		}
+
+		// Strategy 3: Unique last-segment match
+		const enCandidates = lastSegIndex[lastSeg];
+		const langCandidates = langByLastSeg[lastSeg];
+		if (
+			enCandidates &&
+			enCandidates.length === 1 &&
+			langCandidates &&
+			langCandidates.length === 1
+		) {
+			const value = langCandidates[0].value;
+			setNestedValue(result, enKey, value);
+			matches.push({ enKey, value, strategy: "unique-name" });
+			continue;
+		}
+
+		// No match — use English placeholder
+		setNestedValue(result, enKey, enValue);
+		matches.push({ enKey, value: enValue, strategy: "english-placeholder" });
+	}
+
+	return { matches, result };
+}
+
+// ── Main ─────────────────────────────────────────────────────────────────────
+
+function main() {
+	// Load en.json
+	const enPath = path.join(LOCALES_DIR, "en.json");
+	const en = JSON.parse(fs.readFileSync(enPath, "utf8"));
+	const enFlat = flattenKeys(en);
+	const enKeyCount = Object.keys(enFlat).length;
+	const indexes = buildIndexes(enFlat);
+
+	console.log(`English: ${enKeyCount} keys (source of truth — NOT modified)\n`);
+
+	// Find all non-English locale files
+	const localeFiles = fs
+		.readdirSync(LOCALES_DIR)
+		.filter(
+			(f: string) =>
+				f.endsWith(".json") && f !== "en.json" && f !== "migration-report.json"
+		);
+
+	if (localeFiles.length === 0) {
+		console.log("No locale files to migrate.");
+		return;
+	}
+
+	// Create backup directory
+	if (!fs.existsSync(BACKUP_DIR)) {
+		fs.mkdirSync(BACKUP_DIR, { recursive: true });
+	}
+
+	const report: Record<
+		string,
+		{
+			total: number;
+			exact: number;
+			suffix: number;
+			uniqueName: number;
+			placeholder: number;
+		}
+	> = {};
+
+	for (const file of localeFiles) {
+		const lang = file.replace(".json", "");
+		const filePath = path.join(LOCALES_DIR, file);
+
+		// Backup original
+		const backupPath = path.join(BACKUP_DIR, file);
+		fs.copyFileSync(filePath, backupPath);
+
+		// Load and flatten
+		const langData = JSON.parse(fs.readFileSync(filePath, "utf8"));
+		const langFlat = flattenKeys(langData);
+
+		// Migrate
+		const { matches, result } = buildMigratedLocale(enFlat, langFlat, indexes);
+
+		// Write migrated file
+		fs.writeFileSync(filePath, JSON.stringify(result, null, "\t") + "\n", "utf8");
+
+		// Compute stats
+		const stats = {
+			total: enKeyCount,
+			exact: matches.filter((m) => m.strategy === "exact").length,
+			suffix: matches.filter((m) => m.strategy === "suffix-2").length,
+			uniqueName: matches.filter((m) => m.strategy === "unique-name").length,
+			placeholder: matches.filter((m) => m.strategy === "english-placeholder").length,
+		};
+		report[lang] = stats;
+
+		const translated = stats.exact + stats.suffix + stats.uniqueName;
+		const pct = ((translated / enKeyCount) * 100).toFixed(1);
+		console.log(
+			`${lang.padEnd(8)} ${String(translated).padStart(4)} translated (${pct}%)  |  ` +
+				`exact: ${stats.exact}  suffix: ${stats.suffix}  name: ${stats.uniqueName}  ` +
+				`placeholder: ${stats.placeholder}`
+		);
+	}
+
+	// Write report
+	fs.writeFileSync(REPORT_PATH, JSON.stringify(report, null, "\t") + "\n", "utf8");
+
+	const totalLangs = localeFiles.length;
+	console.log(
+		`\nMigrated ${totalLangs} locale files. Originals backed up to locales/backup/`
+	);
+	console.log(`Report written to ${REPORT_PATH}`);
+}
+
+main();

client/src/App.jsx

@@ -1,52 +0,0 @@
-import { useEffect } from "react";
-import { useSelector } from "react-redux";
-import "react-toastify/dist/ReactToastify.css";
-import { ToastContainer } from "react-toastify";
-import { ThemeProvider } from "@emotion/react";
-import lightTheme from "./Utils/Theme/lightTheme";
-import darkTheme from "./Utils/Theme/darkTheme";
-import { CssBaseline, GlobalStyles } from "@mui/material";
-import { logger } from "./Utils/Logger"; // Import the logger
-import { networkService } from "./main";
-import { Routes } from "./Routes";
-import AppLayout from "@/Components/v1/Layouts/AppLayout";
-
-function App() {
-	const mode = useSelector((state) => state.ui.mode);
-
-	// Cleanup
-	useEffect(() => {
-		return () => {
-			logger.cleanup();
-			networkService.cleanup();
-		};
-	}, []);
-
-	const theme = mode === "light" ? lightTheme : darkTheme;
-
-	return (
-		<ThemeProvider theme={theme}>
-			<CssBaseline />
-			<GlobalStyles
-				styles={{
-					body: {
-						backgroundColor: theme.palette.background.main,
-					},
-				}}
-			/>
-			<AppLayout>
-				<Routes />
-			</AppLayout>
-			<ToastContainer
-				newestOnTop={true}
-				theme={mode}
-				style={{
-					"--toastify-color-progress-light": "#7C8BA1",
-					"--toastify-color-progress-dark": "#7C8BA1",
-				}}
-			/>
-		</ThemeProvider>
-	);
-}
-
-export default App;

client/src/App.tsx

@@ -0,0 +1,56 @@
+import { type CSSProperties } from "react";
+import { useSelector } from "react-redux";
+import "react-toastify/dist/ReactToastify.css";
+import { ToastContainer } from "react-toastify";
+import { ThemeProvider } from "@emotion/react";
+import { CssBaseline, GlobalStyles } from "@mui/material";
+import { SWRConfig } from "swr";
+import { Routes } from "./Routes";
+import AppLayout from "@/Components/layout/AppLayout";
+import type { RootState } from "@/Types/state";
+import { lightTheme, darkTheme } from "@/Utils/Theme/Theme";
+
+const swrConfig = {
+	dedupingInterval: 5000,
+	revalidateOnFocus: false,
+	revalidateOnReconnect: true,
+	shouldRetryOnError: false,
+	errorRetryCount: 2,
+	errorRetryInterval: 1000,
+	focusThrottleInterval: 5000,
+};
+
+function App() {
+	const mode = useSelector((state: RootState) => state.ui.mode);
+	const theme = mode === "light" ? lightTheme : darkTheme;
+
+	return (
+		<SWRConfig value={swrConfig}>
+			<ThemeProvider theme={theme}>
+				<CssBaseline />
+				<GlobalStyles
+					styles={{
+						body: {
+							backgroundColor: theme.palette.background.default,
+						},
+					}}
+				/>
+				<AppLayout>
+					<Routes />
+				</AppLayout>
+				<ToastContainer
+					newestOnTop={true}
+					theme={mode}
+					style={
+						{
+							"--toastify-color-progress-light": "#7C8BA1",
+							"--toastify-color-progress-dark": "#7C8BA1",
+						} as CSSProperties
+					}
+				/>
+			</ThemeProvider>
+		</SWRConfig>
+	);
+}
+
+export default App;

client/src/Components/WalletProvider/index.css

@@ -1,53 +0,0 @@
-.wallet-adapter-dropdown {
-	width: 100%;
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: center;
-	align-items: center;
-	gap: var(--env-var-spacing-1);
-}
-
-.wallet-adapter-button {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: auto;
-	height: var(--env-var-height-2) !important;
-	font-size: var(--env-var-font-size-medium-plus) !important;
-	font-weight: 500 !important;
-	margin: 0;
-	padding: calc(
-			(var(--env-var-height-2) - var(--env-var-font-size-medium-plus) * 1.2) / 2
-		)
-		var(--env-var-spacing-1);
-	white-space: nowrap;
-}
-
-.wallet-adapter-modal-title {
-	font-size: var(--font-size-h5) !important;
-}
-
-/* Separator styling */
-.wallet-adapter-modal-divider {
-	background-color: var(--border-color) !important;
-	margin: var(--spacing-md) 0 !important;
-}
-
-/* Responsive fixes */
-@media (max-width: 1200px) {
-	.wallet-adapter-button {
-		font-size: var(--env-var-font-size-medium) !important;
-		padding: calc((var(--env-var-height-2) - var(--env-var-font-size-medium) * 1.2) / 2)
-			var(--env-var-spacing-1-minus) !important;
-	}
-}
-
-@media (max-width: 900px) {
-	.wallet-adapter-modal-wrapper {
-		flex-direction: column !important;
-	}
-
-	.wallet-adapter-modal-divider {
-		margin: var(--spacing-sm) 0 !important;
-	}
-}

client/src/Components/WalletProvider/index.jsx

@@ -1,50 +0,0 @@
-// import { useMemo } from "react";
-// import { ConnectionProvider, WalletProvider } from "@solana/wallet-adapter-react";
-// import { WalletAdapterNetwork } from "@solana/wallet-adapter-base";
-// import {
-// 	UnsafeBurnerWalletAdapter,
-// 	PhantomWalletAdapter,
-// } from "@solana/wallet-adapter-wallets";
-
-// import { WalletModalProvider } from "@solana/wallet-adapter-react-ui";
-// import { clusterApiUrl } from "@solana/web3.js";
-// import PropTypes from "prop-types";
-// import "./index.css";
-
-// // Default styles that can be overridden by your app
-// import "@solana/wallet-adapter-react-ui/styles.css";
-
-// export const Wallet = ({ children }) => {
-// 	// The network can be set to 'devnet', 'testnet', or 'mainnet-beta'.
-// 	const network = WalletAdapterNetwork.Mainnet;
-
-// 	// You can also provide a custom RPC endpoint.
-// 	const endpoint = useMemo(() => clusterApiUrl(network), [network]);
-
-// 	const wallets = useMemo(
-// 		() => [new PhantomWalletAdapter()],
-// 		// eslint-disable-next-line react-hooks/exhaustive-deps
-// 		[network]
-// 	);
-
-// 	return (
-// 		<ConnectionProvider endpoint={endpoint}>
-// 			<WalletProvider
-// 				wallets={wallets}
-// 				autoConnect
-// 			>
-// 				<WalletModalProvider>{children}</WalletModalProvider>
-// 			</WalletProvider>
-// 		</ConnectionProvider>
-// 	);
-// };
-
-// Wallet.propTypes = {
-// 	children: PropTypes.node,
-// };
-
-const Wallet = ({ children }) => {
-	return children;
-};
-
-export default Wallet;

client/src/Components/common/charts/HeatmapResponseTime.tsx

@@ -2,7 +2,7 @@ import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import { getResponseColor } from "@/Utils/DataUtils";
-import { HeatmapResponseTimeTooltip } from "@/Components/v2/common/charts/HeatmapResponseTimeTooltip";
+import { HeatmapResponseTimeTooltip } from "@/Components/common/charts/HeatmapResponseTimeTooltip";
 import type { SxProps } from "@mui/material/styles";
 import type { ResponsiveStyleValue } from "@mui/system";
 
@@ -32,7 +32,7 @@ export const HeatmapResponseTime = ({
 
 	if (!checks || checks.length === 0) return null;
 
-	const latestChecks = checks.slice(-25).reverse();
+	const latestChecks = checks.slice(-25);
 
 	let data: Array<CheckSnapshot | PlaceholderCheck>;
 	if (latestChecks.length !== 25) {

client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx

@@ -57,7 +57,8 @@ export const HeatmapResponseTimeTooltip = ({
 						{formatDateWithTz(check?.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone)}
 					</Typography>
 					<Typography>
-						{t("common.labels.responseTime")}: {check.originalResponseTime.toFixed()} ms
+						{t("common.labels.responseTime")}:{" "}
+						{check?.originalResponseTime?.toFixed() ?? "N/A"} ms
 					</Typography>
 					<Typography textTransform={"capitalize"}>
 						Status:{" "}

client/src/Components/common/charts/HistogramResponseTime.tsx

@@ -0,0 +1,155 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
+import type { ResponsiveStyleValue } from "@mui/system";
+import type { CheckSnapshot } from "@/Types/Check";
+import { HeatmapResponseTimeTooltip } from "./HeatmapResponseTimeTooltip";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+
+interface HistogramResponseTimeProps {
+	checks: CheckSnapshot[];
+	height?: ResponsiveStyleValue<number | string>;
+	gap?: ResponsiveStyleValue<number | string>;
+	showStats?: boolean;
+	statsPosition?: "left" | "right";
+}
+
+interface ResponseTimeStats {
+	max: number | string;
+	avg: number | string;
+}
+
+const DEFAULT_HEIGHT = 50;
+
+const calculateResponseTimeStats = (checks: CheckSnapshot[]): ResponseTimeStats => {
+	if (!Array.isArray(checks) || checks.length === 0) {
+		return { max: "-", avg: "-" };
+	}
+
+	const validChecks = checks.filter((check) => check.originalResponseTime != null);
+	if (validChecks.length === 0) {
+		return { max: "-", avg: "-" };
+	}
+
+	const responseTimes = validChecks.map((check) => check.originalResponseTime);
+	const max = Math.max(...responseTimes);
+	const avg = Math.round(
+		responseTimes.reduce((sum, time) => sum + time, 0) / responseTimes.length
+	);
+
+	return { max, avg };
+};
+
+export const HistogramResponseTime = ({
+	checks,
+	height = DEFAULT_HEIGHT,
+	gap,
+	showStats = true,
+	statsPosition = "right",
+}: HistogramResponseTimeProps) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+
+	const stats = useMemo(() => calculateResponseTimeStats(checks), [checks]);
+
+	if (!Array.isArray(checks) || checks.length === 0) return null;
+
+	const data =
+		checks.length !== 25
+			? [...checks, ...Array(25 - checks.length).fill({ status: "placeholder" })]
+			: checks;
+
+	const chartHeight = typeof height === "number" ? `${height}px` : height;
+	const gridGap = gap ?? theme.spacing(0.5);
+
+	const statsContent = showStats &&
+		(typeof stats.max === "number" || typeof stats.avg === "number") && (
+			<Stack
+				justifyContent="center"
+				alignItems={statsPosition === "left" ? "flex-end" : "flex-start"}
+				minWidth={70}
+				pr={statsPosition === "left" ? theme.spacing(8) : 0}
+				pl={statsPosition === "right" ? theme.spacing(8) : 0}
+			>
+				<Typography variant="body2">
+					{t("common.charts.histogram.avg", { value: stats.avg })}
+				</Typography>
+				<Typography variant="body2">
+					{t("common.charts.histogram.max", { value: stats.max })}
+				</Typography>
+			</Stack>
+		);
+
+	return (
+		<Stack
+			direction={statsPosition === "left" ? "row-reverse" : "row"}
+			alignItems="center"
+			sx={{ width: "100%" }}
+		>
+			<Box sx={{ flex: 1 }}>
+				<Box
+					sx={{
+						width: "100%",
+						display: "grid",
+						gridTemplateColumns: "repeat(25, 1fr)",
+						gap: gridGap,
+						alignItems: "end",
+						height: chartHeight,
+					}}
+				>
+					{data.map((check, index) => {
+						const isPlaceholder = (check as any).status === "placeholder";
+						const heightPct = `${Math.max(0, Math.min(100, (check as any).responseTime ?? 0))}%`;
+						const barColor =
+							check.status === true
+								? theme.palette.success.light
+								: theme.palette.error.light;
+						const bar = (
+							<Box
+								sx={{
+									position: "relative",
+									width: "100%",
+									height: "100%",
+									borderRadius: theme.spacing(1),
+									bgcolor: theme.palette.action.hover,
+									overflow: "hidden",
+								}}
+							>
+								<Box
+									sx={{
+										position: "absolute",
+										bottom: 0,
+										left: 0,
+										width: "100%",
+										height: isPlaceholder ? 0 : heightPct,
+										bgcolor: barColor,
+										transition: "height 500ms cubic-bezier(0.4, 0, 0.2, 1)",
+									}}
+								/>
+							</Box>
+						);
+
+						return isPlaceholder ? (
+							<Box
+								key={index}
+								sx={{ height: "100%" }}
+							>
+								{bar}
+							</Box>
+						) : (
+							<HeatmapResponseTimeTooltip
+								key={index}
+								check={check}
+							>
+								{bar}
+							</HeatmapResponseTimeTooltip>
+						);
+					})}
+				</Box>
+			</Box>
+			{statsContent}
+		</Stack>
+	);
+};

client/src/Components/common/controls/HeaderTimeRange.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
-import { ToggleButtonGroup, ToggleButton } from "@/Components/v2/inputs";
+import { ToggleButtonGroup, ToggleButton } from "@/Components/inputs";
 import { useTheme } from "@mui/material/styles";
 import CircularProgress from "@mui/material/CircularProgress";
 import { useTranslation } from "react-i18next";

client/src/Components/common/index.ts

@@ -0,0 +1,5 @@
+export * from "./charts/HistogramResponseTime";
+export * from "./charts/HeatmapResponseTime";
+export * from "./charts/HeatmapResponseTimeTooltip";
+export * from "./controls/HeaderCreate";
+export * from "./controls/HeaderTimeRange";

client/src/Components/design-elements/Avatar.tsx

@@ -0,0 +1,48 @@
+import { Avatar as MuiAvatar } from "@mui/material";
+import { useSelector } from "react-redux";
+import { useEffect, useState } from "react";
+import { useTheme } from "@mui/material";
+import type { RootState } from "@/Types/state";
+
+interface AvatarProps {
+	src?: string;
+	small?: boolean;
+	sx?: object;
+	onClick?: (event: React.MouseEvent<HTMLDivElement>) => void;
+}
+
+export const Avatar = ({ src, small, sx, onClick = () => {} }: AvatarProps) => {
+	const { user } = useSelector((state: RootState) => state.auth);
+	const theme = useTheme();
+	if (!user) return null;
+
+	const style = small ? { width: 32, height: 32 } : { width: 64, height: 64 };
+
+	const [image, setImage] = useState<string>();
+	useEffect(() => {
+		if (user.avatarImage) {
+			setImage(`data:image/png;base64,${user.avatarImage}`);
+		}
+	}, [user?.avatarImage]);
+
+	return (
+		<MuiAvatar
+			onClick={onClick}
+			alt={`${user?.firstName} ${user?.lastName}`}
+			src={src ? src : user?.avatarImage ? image : undefined}
+			sx={{
+				color: theme.palette.primary.contrastText,
+				fontSize: small ? "16px" : "22px",
+				fontWeight: 400,
+				backgroundColor: theme.palette.primary.main,
+				display: "inline-flex",
+
+				...style,
+				...sx,
+			}}
+		>
+			{user.firstName?.charAt(0)}
+			{user.lastName?.charAt(0) || ""}
+		</MuiAvatar>
+	);
+};

client/src/Components/design-elements/BaseChart.tsx

@@ -1,7 +1,8 @@
-import { BaseBox } from "../design-elements";
+import { BaseBox } from ".";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import type { ResponsiveStyleValue } from "@mui/system";
 
 import { useTheme } from "@mui/material/styles";
@@ -26,7 +27,7 @@ export const BaseChart = ({
 	return (
 		<BaseBox
 			sx={{
-				padding: padding ?? theme.spacing(8),
+				padding: padding ?? theme.spacing(LAYOUT.MD),
 				display: "flex",
 				flex: 1,
 				width: width,
@@ -34,13 +35,13 @@ export const BaseChart = ({
 			}}
 		>
 			<Stack
-				gap={theme.spacing(8)}
+				gap={theme.spacing(LAYOUT.MD)}
 				flex={1}
 			>
 				<Stack
 					direction="row"
 					alignItems={"center"}
-					gap={theme.spacing(4)}
+					gap={theme.spacing(LAYOUT.XS)}
 				>
 					{icon && (
 						<BaseBox

client/src/Components/design-elements/BasePage.tsx

@@ -1,14 +1,18 @@
+import Logo from "@/assets/icons/checkmate-icon.svg?react";
 import Stack from "@mui/material/Stack";
+import Box from "@mui/material/Box";
 import Alert from "@mui/material/Alert";
 import Link from "@mui/material/Link";
+import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 import {
 	ErrorFallback,
 	EmptyFallback,
 	EmptyMonitorFallback,
 	BaseFallback,
-} from "@/Components/v2/design-elements/Fallback";
+} from "@/Components/design-elements/Fallback";
-import { Breadcrumb } from "@/Components/v2/design-elements/Breadcrumb";
+import { Breadcrumb } from "@/Components/design-elements/Breadcrumb";
 import CircularProgress from "@mui/material/CircularProgress";
+import { HeaderAuthControls } from "@/Pages/Auth/components/HeaderAuthControls";
 
 import type { StackProps } from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";
@@ -88,7 +92,7 @@ export const BasePage = ({
 
 	return (
 		<Stack
-			spacing={theme.spacing(10)}
+			spacing={theme.spacing(LAYOUT.LG)}
 			{...props}
 		>
 			<Breadcrumb breadcrumbOverride={breadcrumbOverride} />
@@ -100,7 +104,7 @@ export const BasePage = ({
 interface BasePageWithStatesProps extends StackProps {
 	loading: boolean;
 	error: any;
-	items: any[];
+	totalCount: number;
 	bullets: string[] | unknown;
 	page: string;
 	actionButtonText: string;
@@ -111,7 +115,7 @@ interface BasePageWithStatesProps extends StackProps {
 export const BasePageWithStates = ({
 	loading,
 	error,
-	items,
+	totalCount,
 	page,
 	bullets,
 	actionButtonText,
@@ -119,9 +123,9 @@ export const BasePageWithStates = ({
 	children,
 	...props
 }: BasePageWithStatesProps) => {
-	const showLoading = loading && (!items || items.length === 0);
+	const showLoading = loading && totalCount === 0;
 
-	if (isEmpty(items)) {
+	if (!loading && totalCount === 0) {
 		return (
 			<EmptyFallback
 				bullets={bullets}
@@ -146,23 +150,17 @@ export const BasePageWithStates = ({
 interface MonitorBasePageWithStatesProps extends StackProps {
 	loading: boolean;
 	error: any;
-	items: any[];
+	totalCount: number;
 	page: string;
 	actionLink?: string;
 	children: React.ReactNode;
 	priorityFallback?: React.ReactNode;
 }
 
-const isEmpty = (items: any[]) => {
-	if (!items) return true;
-	if (Array.isArray(items) && items.length === 0) return true;
-	return false;
-};
-
 export const MonitorBasePageWithStates = ({
 	loading,
 	error,
-	items,
+	totalCount,
 	page,
 	actionLink,
 	children,
@@ -171,7 +169,7 @@ export const MonitorBasePageWithStates = ({
 }: MonitorBasePageWithStatesProps) => {
 	const { t } = useTranslation();
 
-	const showLoading = loading && (!items || items.length === 0);
+	const showLoading = loading && totalCount === 0;
 
 	if (priorityFallback) {
 		return (
@@ -180,12 +178,12 @@ export const MonitorBasePageWithStates = ({
 				error={error}
 				{...props}
 			>
-				{priorityFallback}
+				<Stack height={"100%"}>{priorityFallback}</Stack>
 			</BasePage>
 		);
 	}
 
-	if (!loading && isEmpty(items)) {
+	if (!loading && totalCount === 0) {
 		return (
 			<EmptyMonitorFallback
 				page={page}
@@ -207,3 +205,61 @@ export const MonitorBasePageWithStates = ({
 		</BasePage>
 	);
 };
+
+interface BaseAuthPageProps extends React.PropsWithChildren, StackProps {
+	title: string;
+	subtitle: string;
+}
+
+export const BaseAuthPage = ({
+	title,
+	subtitle,
+	children,
+	...props
+}: BaseAuthPageProps) => {
+	const theme = useTheme();
+	return (
+		<BasePage
+			breadcrumbOverride={[]}
+			gap={theme.spacing(LAYOUT.MD)}
+			alignItems={"center"}
+			justifyContent={"center"}
+			minHeight="100vh"
+			position={"relative"}
+			{...props}
+		>
+			<HeaderAuthControls
+				hideLogo
+				py={theme.spacing(LAYOUT.XS)}
+				position={"absolute"}
+				top={0}
+				left={0}
+			/>
+			<Box width={{ xs: 60, sm: 70, md: 80 }}>
+				<Logo
+					width={"100%"}
+					height={"100%"}
+				/>
+			</Box>
+			<Stack alignItems={"center"}>
+				<Typography
+					variant="h1"
+					mb={theme.spacing(SPACING.LG)}
+				>
+					{title}
+				</Typography>
+				<Typography variant="h2">{subtitle}</Typography>
+			</Stack>
+			<Stack
+				gap={theme.spacing(LAYOUT.MD)}
+				width={{
+					xs: "80%",
+					md: "25%",
+					lg: "15%",
+				}}
+			>
+				{children}
+			</Stack>
+		</BasePage>
+	);
+};

client/src/Components/design-elements/BulletPointCheck.tsx

@@ -2,6 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Check } from "lucide-react";
 import { useTheme } from "@mui/material/styles";
+import { LAYOUT } from "@/Utils/Theme/constants";
 
 export const BulletPointCheck = ({
 	text,
@@ -21,12 +22,13 @@ export const BulletPointCheck = ({
 	return (
 		<Stack
 			direction="row"
-			gap={theme.spacing(6)}
+			gap={theme.spacing(LAYOUT.SM)}
 			alignItems="center"
 		>
 			<Check
 				size={16}
 				strokeWidth={1.5}
+				color={variant === "info" ? theme.palette.text.secondary : colors[variant]}
 				style={{
 					flexShrink: 0,
 				}}

client/src/Components/design-elements/Fallback.tsx

@@ -1,7 +1,8 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BulletPointCheck, SkeletonCard } from "@/Components/v2/design-elements";
+import { BulletPointCheck, SkeletonCard } from "@/Components/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { Button } from "@/Components/inputs";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 
 import { useNavigate } from "react-router";
 import useMediaQuery from "@mui/material/useMediaQuery";
@@ -27,7 +28,7 @@ export const BaseFallback = ({ children, ...props }: BaseFallbackProps) => {
 				lg: "50%",
 				xl: "40%",
 			}}
-			padding={{ xs: theme.spacing(8), md: theme.spacing(16) }}
+			padding={{ xs: theme.spacing(LAYOUT.MD), md: theme.spacing(LAYOUT.XXL) }}
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
@@ -55,7 +56,7 @@ export const ErrorFallback = ({
 		<BaseFallback>
 			<Typography
 				variant="h1"
-				marginY={theme.spacing(4)}
+				marginY={theme.spacing(LAYOUT.XS)}
 				color={theme.palette.text.secondary}
 			>
 				{title}
@@ -81,20 +82,15 @@ export const EmptyFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
-				<Typography
+				<Typography component="h1">{title}</Typography>
-					component="h1"
-					color={theme.palette.primary.contrastText}
-				>
-					{title}
-				</Typography>
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}
@@ -139,7 +135,7 @@ export const EmptyMonitorFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
@@ -152,7 +148,7 @@ export const EmptyMonitorFallback = ({
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}

client/src/Components/design-elements/Gauge.tsx

@@ -1,3 +1,5 @@
+import { BaseChart } from "@/Components/design-elements";
+import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 
@@ -104,3 +106,50 @@ export const Gauge = ({
 		</Box>
 	);
 };
+
+export const DetailGauge = ({
+	title,
+	progress,
+	upperLabel,
+	upperValue,
+	lowerLabel,
+	lowerValue,
+}: {
+	title: string;
+	progress: number;
+	upperLabel?: string;
+	upperValue?: string | number;
+	lowerLabel?: string;
+	lowerValue?: string | number;
+}) => {
+	const theme = useTheme();
+	return (
+		<BaseChart
+			icon={null}
+			title={title}
+			maxWidth={225}
+		>
+			<Stack
+				alignItems={"center"}
+				mb={theme.spacing(4)}
+				gap={theme.spacing(4)}
+			>
+				<Gauge progress={progress} />
+			</Stack>
+			<Stack
+				direction={"row"}
+				justifyContent={"space-between"}
+			>
+				<Typography>{upperLabel}</Typography>
+				<Typography>{upperValue}</Typography>
+			</Stack>
+			<Stack
+				direction={"row"}
+				justifyContent={"space-between"}
+			>
+				<Typography>{lowerLabel}</Typography>
+				<Typography>{lowerValue}</Typography>
+			</Stack>
+		</BaseChart>
+	);
+};

client/src/Components/design-elements/Icon.tsx

@@ -4,6 +4,7 @@ interface IconProps {
 	icon: LucideIcon;
 	size?: number;
 	strokeWidth?: number;
+	stroke?: string;
 }
 
 const Icon = ({ icon: Icon, size = 20, strokeWidth = 1.5 }: IconProps) => {

client/src/Components/design-elements/MonitorStatus.tsx

@@ -1,11 +1,11 @@
 import type { Monitor } from "@/Types/Monitor";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { PulseDot, Dot } from "@/Components/v2/design-elements";
+import { PulseDot, Dot } from "@/Components/design-elements";
 import { getStatusColor, formatUrl } from "@/Utils/MonitorUtils";
 import { useTheme } from "@mui/material/styles";
 import prettyMilliseconds from "pretty-ms";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import useMediaQuery from "@mui/material/useMediaQuery";
 export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 	const theme = useTheme();
@@ -19,11 +19,9 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 			<Typography
 				fontSize={typographyLevels.xl}
 				fontWeight={500}
-				color={theme.palette.primary.contrastText}
 				overflow={"hidden"}
 				textOverflow={"ellipsis"}
 				whiteSpace={"nowrap"}
-				maxWidth={isSmall ? "100%" : "calc((100vw - var(--env-var-width-2)) / 2)"}
 			>
 				{monitor.name}
 			</Typography>
@@ -40,7 +38,6 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 					overflow={"hidden"}
 					textOverflow={"ellipsis"}
 					whiteSpace={"nowrap"}
-					maxWidth={isSmall ? "100%" : "calc((100vw - var(--env-var-width-2)) / 2)"}
 				>
 					{formatUrl(monitor?.url)}
 				</Typography>

client/src/Components/design-elements/OfflineBanner.tsx

@@ -0,0 +1,63 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import { WifiOff } from "lucide-react";
+import { useState, useEffect } from "react";
+
+interface OfflineBannerProps {
+	visible: boolean;
+}
+
+export const OfflineBanner = ({ visible }: OfflineBannerProps) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	const [shouldRender, setShouldRender] = useState(visible);
+	const [isAnimating, setIsAnimating] = useState(false);
+
+	useEffect(() => {
+		if (visible) {
+			setShouldRender(true);
+			requestAnimationFrame(() => setIsAnimating(true));
+		} else {
+			setIsAnimating(false);
+			const timer = setTimeout(() => setShouldRender(false), 1000);
+			return () => clearTimeout(timer);
+		}
+	}, [visible]);
+
+	if (!shouldRender) return null;
+
+	return (
+		<Box
+			sx={{
+				position: "fixed",
+				top: isAnimating ? 0 : "-100%",
+				left: 0,
+				right: 0,
+				zIndex: theme.zIndex.snackbar,
+				backgroundColor: theme.palette.error.main,
+				color: theme.palette.error.contrastText,
+				px: theme.spacing(8),
+				py: theme.spacing(4),
+				transition: "top 1s ease-in-out",
+			}}
+		>
+			<Stack
+				direction="row"
+				alignItems="center"
+				justifyContent="center"
+				gap={theme.spacing(4)}
+			>
+				<WifiOff size={20} />
+				<Typography
+					variant="body2"
+					fontWeight={500}
+				>
+					{t("components.offlineBanner.serverUnreachable")}
+				</Typography>
+			</Stack>
+		</Box>
+	);
+};

client/src/Components/design-elements/PulseDot.tsx

@@ -1,4 +1,17 @@
-import { Box, Stack, useTheme } from "@mui/material";
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import { useTheme, keyframes } from "@mui/material";
+
+const ripple = keyframes`
+	from {
+		opacity: 1;
+		transform: scale(0);
+	}
+	to {
+		opacity: 0;
+		transform: scale(2);
+	}
+`;
 
 interface PulseDotProps {
 	color: string;
@@ -28,7 +41,7 @@ export const PulseDot = ({ color }: PulseDotProps) => {
 						height: "100%",
 						backgroundColor: "inherit",
 						borderRadius: "50%",
-						animation: "ripple 1.8s ease-out infinite",
+						animation: `${ripple} 1.8s ease-out infinite`,
 					},
 					"&::after": {
 						content: `""`,

client/src/Components/design-elements/SplitBox.tsx

@@ -3,6 +3,7 @@ import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
+import { LAYOUT } from "@/Utils/Theme/constants";
 export const SplitBox = ({
 	left,
 	right,
@@ -18,10 +19,10 @@ export const SplitBox = ({
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
-			borderRadius={theme.spacing(2)}
+			borderRadius={theme.shape.borderRadius}
 		>
 			<Box
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 				borderRight={isSmall ? 0 : 1}
 				borderBottom={isSmall ? 1 : 0}
 				borderColor={theme.palette.divider}
@@ -37,7 +38,7 @@ export const SplitBox = ({
 			</Box>
 			<Box
 				flex={1}
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 			>
 				{right}
 			</Box>
@@ -60,7 +61,7 @@ export const ConfigBox = ({
 	return (
 		<SplitBox
 			left={
-				<Stack spacing={theme.spacing(4)}>
+				<Stack spacing={theme.spacing(LAYOUT.XS)}>
 					<Typography
 						textTransform={"capitalize"}
 						component="h2"

client/src/Components/design-elements/StatBox.tsx

@@ -4,8 +4,8 @@ import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import { lighten } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
-import type { PaletteKey } from "@/Utils/Theme/v2Theme";
+import type { PaletteKey } from "@/Utils/Theme/Theme";
-import { BaseBox, TooltipWithInfo } from "@/Components/v2/design-elements";
+import { BaseBox, TooltipWithInfo } from "@/Components/design-elements";
 import type { SxProps } from "@mui/material";
 
 type GradientBox = React.PropsWithChildren<{

client/src/Components/design-elements/StatusBox.tsx

@@ -1,8 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
-import Background from "@/assets/Images/background-grid.svg?react";
 import { useTranslation } from "react-i18next";
 import type { SxProps } from "@mui/material";
 
@@ -18,6 +17,7 @@ export const BGBox = ({ children, sx }: StatusBoxProps) => {
 	return (
 		<BaseBox
 			sx={{
+				backgroundColor: theme.palette.background.default,
 				overflow: "hidden",
 				position: "relative",
 				flex: 1,
@@ -27,11 +27,23 @@ export const BGBox = ({ children, sx }: StatusBoxProps) => {
 		>
 			<Box
 				position="absolute"
-				top="-10%"
+				top={0}
-				left="5%"
+				left={0}
-			>
+				right={0}
-				<Background />
+				bottom={0}
-			</Box>
+				sx={{
+					pointerEvents: "none",
+					backgroundImage: `
+						linear-gradient(${theme.palette.divider} 1px, transparent 1px),
+						linear-gradient(90deg, ${theme.palette.divider} 1px, transparent 1px)
+					`,
+					backgroundSize: "24px 24px",
+					maskImage:
+						"linear-gradient(135deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 30%, rgba(0,0,0,0.4) 100%)",
+					WebkitMaskImage:
+						"linear-gradient(135deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 30%, rgba(0,0,0,0.4) 100%)",
+				}}
+			/>
 			{children}
 		</BaseBox>
 	);
@@ -105,6 +117,40 @@ export const PausedStatusBox = ({ n }: { n: number }) => {
 		/>
 	);
 };
+export const MaintenanceStatusBox = ({ n }: { n: number }) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	return (
+		<StatusBox
+			label={t("pages.common.monitors.status.maintenance")}
+			n={n}
+			color={theme.palette.warning.light}
+		/>
+	);
+};
+export const InitializingStatusBox = ({ n }: { n: number }) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	return (
+		<StatusBox
+			label={t("pages.common.monitors.status.initializing")}
+			n={n}
+			color={theme.palette.warning.light}
+		/>
+	);
+};
+export const BreachedStatusBox = ({ n }: { n: number }) => {
+	const theme = useTheme();
+	const { t } = useTranslation();
+	return (
+		<StatusBox
+			label={t("pages.common.monitors.status.breached")}
+			n={n}
+			color={theme.palette.warning.main}
+		/>
+	);
+};
+
 export const TotalChecksBox = ({ n }: { n: number }) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -138,15 +184,3 @@ export const UpChecksBox = ({ n }: { n: number }) => {
 		/>
 	);
 };
-
-export const InitializingStatusBox = ({ n }: { n: number }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	return (
-		<StatusBox
-			label={t("pages.common.monitors.status.initializing")}
-			n={n}
-			color={theme.palette.warning.light}
-		/>
-	);
-};

client/src/Components/design-elements/StatusLabel.tsx

@@ -1,5 +1,5 @@
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { MonitorStatus } from "@/Types/Monitor";
@@ -11,33 +11,26 @@ import { useTranslation } from "react-i18next";
 export const ValueTypes = ["positive", "negative", "neutral"] as const;
 export type ValueType = (typeof ValueTypes)[number];
 
-export const StatusLabel = ({
+export const StatusLabel = ({ status, sx }: { status: MonitorStatus; sx?: SxProps }) => {
-	status,
-	isActive,
-	sx,
-}: {
-	status: MonitorStatus;
-	isActive?: boolean;
-	sx?: SxProps;
-}) => {
 	const { t } = useTranslation();
 	const theme = useTheme();
 	const palette = getStatusPalette(status);
 
-	const determineStatus = (
+	const determineStatus = (status: MonitorStatus): string => {
-		isActive: boolean | undefined,
+		if (status === "up") {
-		status: MonitorStatus
+			return t("pages.common.monitors.status.up");
-	): string => {
+		} else if (status === "down") {
-		if (isActive === false) {
+			return t("pages.common.monitors.status.down");
+		} else if (status === "breached") {
+			return t("pages.common.monitors.status.breached");
+		} else if (status === "maintenance") {
+			return t("pages.common.monitors.status.maintenance");
+		} else if (status === "paused") {
 			return t("pages.common.monitors.status.paused");
+		} else if (status === "initializing") {
+			return t("pages.common.monitors.status.initializing");
 		}
 
-		if (status === true) {
-			return t("pages.common.monitors.status.up");
-		}
-		if (status === false) {
-			return t("pages.common.monitors.status.down");
-		}
 		return t("pages.common.monitors.status.initializing");
 	};
 
@@ -64,9 +57,7 @@ export const StatusLabel = ({
 				borderRadius="50%"
 				marginRight="5px"
 			/>
-			<Typography textTransform={"capitalize"}>
+			<Typography textTransform={"capitalize"}>{determineStatus(status)}</Typography>
-				{determineStatus(isActive, status)}
-			</Typography>
 		</BaseBox>
 	);
 };

client/src/Components/design-elements/Table.tsx

@@ -27,8 +27,10 @@ import TablePagination from "@mui/material/TablePagination";
 import type { TablePaginationOwnProps } from "@mui/material/TablePagination";
 
 import { useTranslation } from "react-i18next";
-import { useState, Fragment } from "react";
+import { useState, Fragment, useEffect } from "react";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
+import type { SxProps, Theme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
 
 export type Header<T> = {
@@ -47,6 +49,7 @@ type DataTableProps<T extends { id?: string | number; _id?: string | number }> =
 	renderExpandedContent?: (row: T) => React.ReactNode;
 	emptyViewText?: string;
 	emptyViewPositive?: boolean;
+	getRowSx?: (row: T) => SxProps<Theme>;
 };
 
 export function DataTable<
@@ -64,6 +67,7 @@ export function DataTable<
 	renderExpandedContent,
 	emptyViewText,
 	emptyViewPositive,
+	getRowSx,
 }: DataTableProps<T>) {
 	const theme = useTheme();
 	const [expanded, setExpanded] = useState<(string | number) | null>(null);
@@ -87,20 +91,20 @@ export function DataTable<
 	// Return stack of cards for small screens
 	if (isSmall && cardsOnSmallScreens) {
 		return (
-			<Stack spacing={theme.spacing(4)}>
+			<Stack spacing={theme.spacing(LAYOUT.XS)}>
 				{data.map((row) => {
 					const key = row.id || row._id || Math.random();
 					keys.push(key);
 					return (
 						<Stack
 							onClick={() => (onRowClick ? onRowClick(row) : null)}
-							spacing={theme.spacing(4)}
+							spacing={theme.spacing(LAYOUT.XS)}
 							sx={{
 								borderStyle: "solid",
 								borderWidth: 1,
 								borderColor: theme.palette.divider,
 								borderRadius: theme.shape.borderRadius,
-								padding: theme.spacing(4),
+								padding: theme.spacing(LAYOUT.XS),
 								cursor: onRowClick ? "pointer" : "default",
 							}}
 							key={key}
@@ -152,7 +156,7 @@ export function DataTable<
 			<Table
 				sx={{
 					"&.MuiTable-root  :is(.MuiTableHead-root, .MuiTableBody-root) :is(th, td)": {
-						paddingLeft: theme.spacing(8),
+						paddingLeft: theme.spacing(LAYOUT.MD),
 					},
 					"& .MuiTableCell-root": {
 						borderBottom: `1px solid ${theme.palette.divider}`,
@@ -165,13 +169,13 @@ export function DataTable<
 						color: theme.palette.text.secondary,
 						fontWeight: 500,
 						textTransform: "uppercase",
-						padding: `${theme.spacing(2)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(SPACING.LG)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 					},
 					"& :is(td)": {
 						backgroundColor: theme.palette.background.paper,
 						color: theme.palette.text.secondary,
-						padding: `${theme.spacing(7)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(LAYOUT.MD)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 						overflowX: "hidden",
 					},
@@ -204,6 +208,7 @@ export function DataTable<
 								<TableRow
 									sx={{
 										cursor: onRowClick ? "pointer" : "default",
+										...(getRowSx?.(row) as object),
 									}}
 									onClick={() => {
 										if (expandableRows) handleExpand(row);
@@ -454,12 +459,26 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
 interface PaginationProps extends TablePaginationOwnProps {
 	component?: React.ElementType;
 	hasMore?: boolean;
+	itemsOnPage?: number;
 }
 
 export const Pagination = ({ ...props }: PaginationProps) => {
-	const { hasMore, ...rest } = props;
+	const { hasMore, itemsOnPage, ...rest } = props;
 	const isSmall = useMediaQuery((theme: any) => theme.breakpoints.down("sm"));
 	const theme = useTheme();
+
+	useEffect(() => {
+		if (
+			typeof itemsOnPage === "number" &&
+			itemsOnPage === 0 &&
+			rest.count > 0 &&
+			rest.page > 0 &&
+			rest.onPageChange
+		) {
+			rest.onPageChange(null, rest.page - 1);
+		}
+	}, [itemsOnPage, rest.count, rest.page, rest.onPageChange]);
+
 	const labelDisplayedRows = ({
 		from,
 		to,
@@ -496,7 +515,7 @@ export const Pagination = ({ ...props }: PaginationProps) => {
 							display: "grid",
 							gridTemplateColumns: "1fr 1fr",
 							gridAutoRows: "auto",
-							rowGap: theme.spacing(1),
+							rowGap: theme.spacing(SPACING.SM),
 							alignItems: "center",
 							justifyItems: "center",
 							paddingLeft: 0,
@@ -538,8 +557,8 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 			alignItems={"center"}
 			justifyContent={"center"}
 			sx={{
-				py: theme.spacing(12),
+				py: theme.spacing(LAYOUT.XL),
-				px: theme.spacing(4),
+				px: theme.spacing(LAYOUT.XS),
 				borderWidth: 1,
 				borderStyle: "solid",
 				borderColor: theme.palette.divider,
@@ -556,7 +575,7 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 					display: "flex",
 					alignItems: "center",
 					justifyContent: "center",
-					mb: theme.spacing(2),
+					mb: theme.spacing(SPACING.LG),
 				}}
 			>
 				<Icon

client/src/Components/design-elements/TextLink.tsx

@@ -0,0 +1,43 @@
+import Typography from "@mui/material/Typography";
+import Stack from "@mui/material/Stack";
+import type { StackProps } from "@mui/material/Stack";
+import Link from "@mui/material/Link";
+import { Link as RouterLink } from "react-router-dom";
+
+import { useTheme } from "@mui/material/styles";
+
+interface TextLinkProps extends StackProps {
+	text: string;
+	linkText: string;
+	href: string;
+	target?: "_self" | "_blank" | "_parent" | "_top";
+}
+
+export const TextLink = ({
+	text,
+	linkText,
+	href,
+	target = "_self",
+	...props
+}: TextLinkProps) => {
+	const theme = useTheme();
+
+	return (
+		<Stack
+			direction="row"
+			gap={theme.spacing(4)}
+			{...props}
+		>
+			<Typography>{text}</Typography>
+			<Link
+				color="primary"
+				to={href}
+				component={RouterLink}
+				target={target}
+				{...(target === "_blank" && { rel: "noopener noreferrer" })}
+			>
+				{linkText}
+			</Link>
+		</Stack>
+	);
+};

client/src/Components/design-elements/index.tsx

@@ -18,3 +18,6 @@ export * from "./BaseChart";
 export * from "./Gauge";
 export * from "./Tabs";
 export * from "./SplitBox";
+export * from "./TextLink";
+export * from "./OfflineBanner";
+export * from "./Avatar";

client/src/Components/i18nLoader/index.tsx

@@ -1,8 +1,9 @@
-import i18n from "../../../Utils/i18n.js";
+import i18n from "@/Utils/i18n.js";
 import { useSelector } from "react-redux";
 import { useEffect } from "react";
+import type { RootState } from "@/store";
 const I18nLoader = () => {
-	const language = useSelector((state) => state.ui.language ?? "en");
+	const language = useSelector((state: RootState) => state.ui.language ?? "en");
 
 	useEffect(() => {
 		if (language && i18n.language !== language) {

client/src/Components/inputs/AutoComplete.tsx

@@ -1,6 +1,6 @@
 import Autocomplete from "@mui/material/Autocomplete";
 import type { AutocompleteProps } from "@mui/material/Autocomplete";
-import { TextField, Checkbox } from "@/Components/v2/inputs";
+import { TextField, Checkbox } from "@/Components/inputs";
 import ListItem from "@mui/material/ListItem";
 import Stack from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";

client/src/Components/inputs/ColorPicker.tsx

@@ -1,9 +1,9 @@
 import { MuiColorInput } from "mui-color-input";
 import type { MuiColorInputProps } from "mui-color-input";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material";
 import Stack from "@mui/material/Stack";
-import { FieldLabel } from "@/Components/v2/inputs/FieldLabel";
+import { FieldLabel } from "@/Components/inputs/FieldLabel";
 
 interface ColorPickerProps extends MuiColorInputProps {
 	fieldLabel?: string;

client/src/Components/inputs/DatePicker.tsx

@@ -0,0 +1,100 @@
+import { DatePicker } from "@mui/x-date-pickers/DatePicker";
+import type { DatePickerProps } from "@mui/x-date-pickers/DatePicker";
+import type { Dayjs } from "dayjs";
+import { useTheme } from "@mui/material/styles";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import { FieldLabel } from "./FieldLabel";
+import { Calendar } from "lucide-react";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
+import { LocalizationProvider } from "@mui/x-date-pickers";
+
+interface DatePickerComponentProps extends Omit<DatePickerProps<Dayjs>, "label"> {
+	fieldLabel?: string;
+	required?: boolean;
+	error?: boolean;
+	helperText?: string;
+}
+
+export const DatePickerComponent = ({
+	fieldLabel,
+	required,
+	error,
+	helperText,
+	...props
+}: DatePickerComponentProps) => {
+	const theme = useTheme();
+
+	const picker = (
+		<LocalizationProvider dateAdapter={AdapterDayjs}>
+			<DatePicker
+				{...props}
+				slots={{
+					openPickerIcon: () => (
+						<Calendar
+							size={20}
+							stroke={theme.palette.text.secondary}
+						/>
+					),
+					...props.slots,
+				}}
+				slotProps={{
+					switchViewButton: { sx: { display: "none" } },
+					nextIconButton: { sx: { ml: theme.spacing(2) } },
+					day: {
+						sx: {
+							"&.MuiPickersDay-root.Mui-disabled": {
+								color: theme.palette.text.disabled,
+							},
+						},
+					},
+					field: {
+						sx: {
+							width: "fit-content",
+							"& > .MuiOutlinedInput-root": {
+								flexDirection: "row-reverse",
+							},
+							"& input": {
+								minHeight: 34,
+								p: 0,
+								pl: theme.spacing(3),
+								pr: theme.spacing(5),
+							},
+							"& fieldset": {
+								borderColor: error ? theme.palette.error.main : theme.palette.divider,
+								borderRadius: theme.shape.borderRadius,
+							},
+							"&:not(:has(.Mui-disabled)):not(:has(.Mui-error)) .MuiOutlinedInput-root:not(:has(input:focus)):hover fieldset":
+								{
+									borderColor: error ? theme.palette.error.main : theme.palette.divider,
+								},
+						},
+					},
+					inputAdornment: { sx: { ml: 0 } },
+					openPickerButton: {
+						sx: {
+							py: 0,
+							mr: 0,
+						},
+					},
+					...props.slotProps,
+				}}
+			/>
+		</LocalizationProvider>
+	);
+
+	return (
+		<Stack spacing={theme.spacing(2)}>
+			{fieldLabel && <FieldLabel required={required}>{fieldLabel}</FieldLabel>}
+			{picker}
+			{helperText && (
+				<Typography
+					variant="caption"
+					color={error ? "error" : "text.secondary"}
+				>
+					{helperText}
+				</Typography>
+			)}
+		</Stack>
+	);
+};

client/src/Components/inputs/Dialog.tsx

@@ -4,8 +4,8 @@ import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogContentText from "@mui/material/DialogContentText";
 import DialogTitle from "@mui/material/DialogTitle";
-import { Button } from "@/Components/v2/inputs";
+import { Button } from "@/Components/inputs";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTranslation } from "react-i18next";
 import type { ReactNode } from "react";
 
@@ -23,6 +23,7 @@ export const DialogInput = ({
 	children,
 	maxWidth,
 	fullWidth = false,
+	additionalButtons,
 }: {
 	open: boolean;
 	title?: string;
@@ -37,6 +38,7 @@ export const DialogInput = ({
 	children?: ReactNode;
 	maxWidth?: DialogProps["maxWidth"];
 	fullWidth?: boolean;
+	additionalButtons?: ReactNode;
 }) => {
 	const { t } = useTranslation();
 	return (
@@ -59,14 +61,17 @@ export const DialogInput = ({
 				>
 					{cancelText ?? t("common.buttons.cancel")}
 				</Button>
-				<Button
+				{additionalButtons}
-					loading={loading}
+				{onConfirm && (
-					variant="contained"
+					<Button
-					color={confirmColor}
+						loading={loading}
-					onClick={onConfirm}
+						variant="contained"
-				>
+						color={confirmColor}
-					{confirmText ?? t("common.buttons.confirm")}
+						onClick={onConfirm}
-				</Button>
+					>
+						{confirmText ?? t("common.buttons.confirm")}
+					</Button>
+				)}
 			</DialogActions>
 		</Dialog>
 	);

client/src/Components/inputs/FieldLabel.tsx

@@ -9,7 +9,9 @@ interface FieldLabelProps {
 
 export const FieldLabel = ({ children, required = false, htmlFor }: FieldLabelProps) => {
 	const theme = useTheme();
-
+	if (children === " ") {
+		children = "\u00A0";
+	}
 	return (
 		<Typography
 			component="label"

client/src/Components/inputs/ImageUpload.tsx

@@ -38,11 +38,11 @@ export const ImageUpload = ({
 			const isValidType = accept.some((type) => file.type.includes(type));
 			const isValidSize = file.size <= maxSize;
 			if (!isValidType) {
-				setLocalError(t("common.errors.invalidFileFormat"));
+				setLocalError(t("components.imageUpload.errors.invalidFileFormat"));
 				return;
 			}
 			if (!isValidSize) {
-				setLocalError(t("common.errors.invalidFileSize"));
+				setLocalError(t("components.imageUpload.errors.invalidFileSize"));
 				return;
 			}
 			setLocalError(null);
@@ -137,15 +137,15 @@ export const ImageUpload = ({
 							color="primary"
 							fontWeight={500}
 						>
-							{t("common.imageUpload.clickToUpload")}
+							{t("components.imageUpload.clickToUpload")}
 						</Typography>{" "}
-						{t("common.imageUpload.orDragAndDrop")}
+						{t("components.imageUpload.orDragAndDrop")}
 					</Typography>
 					<Typography
 						variant="caption"
 						color="text.disabled"
 					>
-						{accept.join(", ").toUpperCase()} • {t("common.imageUpload.maxSize")}{" "}
+						{accept.join(", ").toUpperCase()} • {t("components.imageUpload.maxSize")}{" "}
 						{Math.round(maxSize / 1024 / 1024)}MB
 					</Typography>
 				</Stack>

client/src/Components/inputs/LanguageSelector.tsx

@@ -0,0 +1,100 @@
+import Stack from "@mui/material/Stack";
+import Box from "@mui/material/Box";
+import MenuItem from "@mui/material/MenuItem";
+import { Select } from "@/Components/inputs";
+import "flag-icons/css/flag-icons.min.css";
+
+import { useTranslation } from "react-i18next";
+import { useTheme } from "@mui/material";
+import { useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
+import { setLanguage } from "@/Features/UI/uiSlice";
+import type { RootState } from "@/Types/state";
+
+const langMap: Record<string, string> = {
+	cs: "cz",
+	ja: "jp",
+	uk: "ua",
+	vi: "vn",
+};
+
+export const LanguageSelector = () => {
+	const { i18n } = useTranslation();
+	const theme = useTheme();
+	const { language = "en" } = useSelector((state: RootState) => state.ui);
+	const dispatch = useDispatch();
+	const handleChange = (event: any) => {
+		const newLang = event.target.value;
+		dispatch(setLanguage(newLang));
+	};
+
+	const languages = Object.keys(i18n.options.resources || {});
+
+	return (
+		<Select
+			value={language}
+			onChange={handleChange}
+			size="small"
+			// sx={{
+			// 	minWidth: 80,
+			// 	"& .MuiSelect-select": {
+			// 		display: "flex",
+			// 		alignItems: "center",
+			// 		justifyContent: "center",
+			// 	},
+			// 	"& .MuiSelect-icon": {
+			// 		alignSelf: "center",
+			// 	},
+			// }}
+		>
+			{languages.map((lang) => {
+				let parsedLang = lang === "en" ? "gb" : lang;
+
+				if (parsedLang.includes("-")) {
+					parsedLang = parsedLang.split("-")[1].toLowerCase();
+				}
+
+				parsedLang = langMap[parsedLang] || parsedLang;
+
+				const flag = parsedLang ? `fi fi-${parsedLang}` : null;
+
+				return (
+					<MenuItem
+						key={lang}
+						value={lang}
+						sx={{
+							display: "flex",
+							justifyContent: "center",
+							alignItems: "center",
+						}}
+					>
+						<Stack
+							direction="row"
+							spacing={theme.spacing(2)}
+							alignItems="center"
+							justifyContent="center"
+						>
+							<Box
+								component="span"
+								sx={{
+									display: "flex",
+									alignItems: "center",
+								}}
+							>
+								{flag && <span className={flag} />}
+							</Box>
+							<Box
+								component="span"
+								sx={{ textTransform: "uppercase" }}
+							>
+								{lang}
+							</Box>
+						</Stack>
+					</MenuItem>
+				);
+			})}
+		</Select>
+	);
+};
+
+export default LanguageSelector;

client/src/Components/inputs/Select.tsx

@@ -72,6 +72,12 @@ const SelectInputInner = <T,>(
 			)}
 			sx={{
 				height: "34px",
+				"& .MuiSelect-select": {
+					display: "flex",
+					alignItems: "center",
+					height: "100%",
+					boxSizing: "border-box",
+				},
 				"& .MuiSelect-icon": {
 					right: theme.spacing(3),
 				},

client/src/Components/inputs/Slider.tsx

@@ -11,20 +11,26 @@ 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, ...props }, ref) => {
+	({ sx, showValue = false, formatDisplayValue, ...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>{props.value}</Typography>}
+				{showValue && <Typography>{displayValue}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -41,7 +47,10 @@ export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
 							"& .MuiSlider-thumb": {
 								backgroundColor: "#fff",
 								"&:hover, &.Mui-focusVisible": {
-									boxShadow: `0 0 0 8px ${theme.palette.primary.main}20`,
+									boxShadow: "none",
+								},
+								"&:active": {
+									boxShadow: "none",
 								},
 							},
 							"& .MuiSlider-valueLabel": {
@@ -60,12 +69,21 @@ 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, value, sliderMaxWidth = "100%", ...props },
+		{
+			fieldLabel,
+			required,
+			showValue = true,
+			formatDisplayValue,
+			value,
+			sliderMaxWidth = "100%",
+			...props
+		},
 		ref
 	) => {
 		const theme = useTheme();
@@ -79,6 +97,7 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
+						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Components/inputs/SwitchTheme.tsx

@@ -0,0 +1,48 @@
+import IconButton from "@mui/material/IconButton";
+
+import { Moon, Sun } from "lucide-react";
+
+import { setMode } from "@/Features/UI/uiSlice.js";
+import { useTheme } from "@mui/material";
+import { useDispatch, useSelector } from "react-redux";
+import type { RootState } from "@/Types/state";
+
+export const SwitchTheme = () => {
+	const mode = useSelector((state: RootState) => state.ui.mode);
+	const dispatch = useDispatch();
+	const theme = useTheme();
+
+	const handleChange = () => {
+		dispatch(setMode(mode === "light" ? "dark" : "light"));
+	};
+	return (
+		<IconButton
+			id="theme-toggle"
+			onClick={handleChange}
+			sx={{
+				display: "flex",
+				alignItems: "center",
+				justifyContent: "center",
+				"& svg": {
+					transition: "stroke 0.2s ease",
+				},
+				"&:hover svg path, &:hover svg line, &:hover svg polyline, &:hover svg rect, &:hover svg circle":
+					{
+						stroke: theme.palette.primary.main,
+					},
+			}}
+		>
+			{mode === "light" ? (
+				<Moon
+					size={16}
+					strokeWidth={1.5}
+				/>
+			) : (
+				<Sun
+					size={16}
+					strokeWidth={1.5}
+				/>
+			)}
+		</IconButton>
+	);
+};

client/src/Components/inputs/TextInput.tsx

@@ -1,7 +1,7 @@
 import { forwardRef } from "react";
 import TextField from "@mui/material/TextField";
 import type { TextFieldProps } from "@mui/material";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material/styles";
 import Stack from "@mui/material/Stack";
 import { FieldLabel } from "./FieldLabel";

client/src/Components/inputs/TimePicker.tsx

@@ -0,0 +1,61 @@
+import { MobileTimePicker } from "@mui/x-date-pickers/MobileTimePicker";
+import type { MobileTimePickerProps } from "@mui/x-date-pickers/MobileTimePicker";
+import type { Dayjs } from "dayjs";
+import { useTheme } from "@mui/material/styles";
+import Stack from "@mui/material/Stack";
+import { FieldLabel } from "./FieldLabel";
+import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
+import { LocalizationProvider } from "@mui/x-date-pickers";
+
+interface TimePickerComponentProps extends Omit<MobileTimePickerProps<Dayjs>, "label"> {
+	fieldLabel?: string;
+	required?: boolean;
+}
+
+export const TimePickerComponent = ({
+	fieldLabel,
+	required,
+	...props
+}: TimePickerComponentProps) => {
+	const theme = useTheme();
+
+	const picker = (
+		<LocalizationProvider dateAdapter={AdapterDayjs}>
+			<MobileTimePicker
+				{...props}
+				slotProps={{
+					field: {
+						sx: {
+							width: "fit-content",
+							"& input": {
+								minHeight: 34,
+								p: 0,
+								px: theme.spacing(5),
+							},
+							"& fieldset": {
+								borderColor: theme.palette.divider,
+								borderRadius: theme.shape.borderRadius,
+							},
+							"&:not(:has(.Mui-disabled)):not(:has(.Mui-error)) .MuiOutlinedInput-root:not(:has(input:focus)):hover fieldset":
+								{
+									borderColor: theme.palette.divider,
+								},
+						},
+					},
+					...props.slotProps,
+				}}
+			/>
+		</LocalizationProvider>
+	);
+
+	if (fieldLabel) {
+		return (
+			<Stack spacing={theme.spacing(2)}>
+				<FieldLabel required={required}>{fieldLabel}</FieldLabel>
+				{picker}
+			</Stack>
+		);
+	}
+
+	return picker;
+};

client/src/Components/inputs/index.tsx

@@ -14,3 +14,7 @@ export * from "./Switch";
 export * from "./Slider";
 export * from "./ImageUpload";
 export * from "./ColorPicker";
+export { DatePickerComponent as DatePicker } from "./DatePicker";
+export { TimePickerComponent as TimePicker } from "./TimePicker";
+export * from "./LanguageSelector";
+export * from "./SwitchTheme";

client/src/Components/layout/AppLayout.tsx

@@ -0,0 +1,54 @@
+import Box from "@mui/material/Box";
+import { useState, useEffect, useRef } from "react";
+import { useTheme } from "@mui/material/styles";
+import { OfflineBanner } from "@/Components/design-elements";
+import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";
+
+interface AppLayoutProps {
+	children: React.ReactNode;
+}
+
+const AppLayout = ({ children }: AppLayoutProps) => {
+	const theme = useTheme();
+	const [serverUnreachable, setServerUnreachable] = useState(false);
+	const retryIntervalRef = useRef<number | null>(null);
+
+	useEffect(() => {
+		setServerUnreachableCallback(setServerUnreachable);
+	}, []);
+
+	useEffect(() => {
+		if (serverUnreachable) {
+			retryIntervalRef.current = window.setInterval(async () => {
+				try {
+					await get("/health", { timeout: 5000 });
+				} catch {
+					// NO_OP
+				}
+			}, 5000);
+		} else if (retryIntervalRef.current) {
+			clearInterval(retryIntervalRef.current);
+			retryIntervalRef.current = null;
+		}
+
+		return () => {
+			if (retryIntervalRef.current) {
+				clearInterval(retryIntervalRef.current);
+			}
+		};
+	}, [serverUnreachable]);
+
+	return (
+		<Box
+			sx={{
+				minHeight: "100vh",
+				backgroundColor: theme.palette.background.default,
+			}}
+		>
+			<OfflineBanner visible={serverUnreachable} />
+			{children}
+		</Box>
+	);
+};
+
+export default AppLayout;

client/src/Components/layout/RootLayout.tsx

@@ -0,0 +1,44 @@
+import { Sidebar } from "@/Components/sidebar";
+import { Outlet } from "react-router";
+import Stack from "@mui/material/Stack";
+import { useMediaQuery } from "@mui/material";
+import { useSidebar } from "@/Hooks/useSidebar";
+
+import { useTheme } from "@mui/material";
+
+const RootLayout = () => {
+	const theme = useTheme();
+	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
+	const { collapsedWidth } = useSidebar();
+
+	return (
+		<Stack flexDirection="row">
+			<Sidebar />
+			<Stack
+				flex={1}
+				padding={6}
+				overflow={"hidden"}
+				sx={{
+					backgroundColor:
+						theme.palette.mode === "dark"
+							? "rgba(255, 255, 255, 0.01)"
+							: "rgba(0, 0, 0, 0.01)",
+					display: "flex",
+					alignItems: "center",
+					paddingLeft: isSmall ? `${collapsedWidth + 12}px` : 12,
+				}}
+			>
+				<Stack
+					maxWidth={1280}
+					width="100%"
+					paddingY={theme.spacing(6)}
+					flex={1}
+				>
+					<Outlet />
+				</Stack>
+			</Stack>
+		</Stack>
+	);
+};
+
+export default RootLayout;

client/src/Components/monitors/ControlsFilter.tsx

@@ -1,12 +1,22 @@
 import Stack from "@mui/material/Stack";
-import { Select, Button } from "@/Components/v2/inputs";
+import { Select, Button } from "@/Components/inputs";
 import MenuItem from "@mui/material/MenuItem";
 import useMediaQuery from "@mui/material/useMediaQuery";
 
 import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
+import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "docker", "game"];
+const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
+const typeDisplayNames: Record<string, string> = {
+	http: "HTTP",
+	ping: "Ping",
+	port: "Port",
+	docker: "Docker",
+	game: "Game",
+	grpc: "gRPC",
+	websocket: "WebSocket",
+};
 const statuses = ["up", "down"];
 const states = ["active", "paused"];
 
@@ -30,6 +40,7 @@ export const ControlsFilter = ({
 	onClearFilters: () => void;
 }) => {
 	const theme = useTheme();
+	const { t } = useTranslation();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isFilterActive =
 		(selectedTypes?.length ?? 0) > 0 || selectedStatus !== "" || selectedState !== "";
@@ -50,7 +61,7 @@ export const ControlsFilter = ({
 							key={type}
 							value={type}
 						>
-							<Typography textTransform={"capitalize"}>{type}</Typography>
+							<Typography>{typeDisplayNames[type] ?? type}</Typography>
 						</MenuItem>
 					))}
 				</Select>
@@ -88,7 +99,7 @@ export const ControlsFilter = ({
 					variant="contained"
 					onClick={onClearFilters}
 				>
-					Clear Filters
+					{t("common.buttons.clearFilters")}
 				</Button>
 			)}
 		</Stack>

client/src/Components/monitors/GeoChecksMap.tsx

@@ -0,0 +1,203 @@
+import { useRef, useEffect, useState } from "react";
+import { Box, Typography, Stack, useTheme, GlobalStyles } from "@mui/material";
+import Map, { Marker, Popup } from "react-map-gl/maplibre";
+import type { MapRef } from "react-map-gl/maplibre";
+import type { FlatGeoCheck } from "@/Types/GeoCheck";
+import "maplibre-gl/dist/maplibre-gl.css";
+
+interface GeoChecksMapProps {
+	geoChecks: FlatGeoCheck[];
+}
+
+export const GeoChecksMap = ({ geoChecks }: GeoChecksMapProps) => {
+	const mapRef = useRef<MapRef>(null);
+	const [selectedCheck, setSelectedCheck] = useState<FlatGeoCheck | null>(null);
+	const theme = useTheme();
+	const isDarkMode = theme.palette.mode === "dark";
+
+	const mapPopupStyles = (
+		<GlobalStyles
+			styles={{
+				".maplibregl-popup-content": {
+					background: "transparent !important",
+					padding: "0 !important",
+					boxShadow: "none !important",
+				},
+				".maplibregl-popup-tip": {
+					display: "none",
+				},
+				".maplibregl-ctrl-attrib": {
+					display: "none",
+				},
+				".maplibregl-ctrl-logo": {
+					display: "none",
+				},
+				".maplibregl-popup-close-button": {
+					color: theme.palette.text.primary,
+					background: "transparent",
+					fontSize: "20px",
+					padding: "4px",
+					"&:hover": {
+						backgroundColor: theme.palette.action.hover,
+					},
+				},
+			}}
+		/>
+	);
+
+	useEffect(() => {
+		if (geoChecks.length === 0 || !mapRef.current) return;
+
+		const bounds = geoChecks.reduce(
+			(acc, check) => {
+				return {
+					minLng: Math.min(acc.minLng, check.location.longitude),
+					maxLng: Math.max(acc.maxLng, check.location.longitude),
+					minLat: Math.min(acc.minLat, check.location.latitude),
+					maxLat: Math.max(acc.maxLat, check.location.latitude),
+				};
+			},
+			{
+				minLng: Infinity,
+				maxLng: -Infinity,
+				minLat: Infinity,
+				maxLat: -Infinity,
+			}
+		);
+
+		if (bounds.minLng !== Infinity) {
+			mapRef.current.fitBounds(
+				[
+					[bounds.minLng, bounds.minLat],
+					[bounds.maxLng, bounds.maxLat],
+				],
+				{ padding: 50, duration: 1000 }
+			);
+		}
+	}, [geoChecks]);
+
+	const getMarkerColor = (status: boolean): string => {
+		return status ? theme.palette.success.main : theme.palette.error.main;
+	};
+
+	const formatResponseTime = (timing: number): string => {
+		return `${timing.toFixed(0)}ms`;
+	};
+
+	return (
+		<>
+			{mapPopupStyles}
+			<Box
+				height={500}
+				width={"100%"}
+				borderRadius={theme.shape.borderRadius}
+				overflow={"hidden"}
+			>
+				<Map
+					ref={mapRef}
+					initialViewState={{
+						longitude: 0,
+						latitude: 20,
+						zoom: 1.5,
+					}}
+					style={{ height: "100%", width: "100%" }}
+					mapStyle={
+						isDarkMode
+							? "https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"
+							: "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+					}
+				>
+					{geoChecks.map((check, index) => (
+						<Marker
+							key={`${check.id}-${index}`}
+							longitude={check.location.longitude}
+							latitude={check.location.latitude}
+							anchor="bottom"
+							onClick={(e: any) => {
+								e.originalEvent.stopPropagation();
+								setSelectedCheck(check);
+							}}
+						>
+							<div
+								style={{
+									width: "10px",
+									height: "10px",
+									borderRadius: "50%",
+									backgroundColor: getMarkerColor(check.status),
+									boxShadow: "0 2px 4px rgba(0,0,0,0.3)",
+									cursor: "pointer",
+								}}
+							/>
+						</Marker>
+					))}
+
+					{selectedCheck && (
+						<Popup
+							longitude={selectedCheck.location.longitude}
+							latitude={selectedCheck.location.latitude}
+							anchor="top"
+							onClose={() => setSelectedCheck(null)}
+							closeOnClick={false}
+						>
+							<Box
+								sx={{
+									minWidth: 200,
+									p: theme.spacing(4),
+									bgcolor: theme.palette.background.paper,
+									borderWidth: 1,
+									borderStyle: "solid",
+									borderColor: theme.palette.divider,
+									borderRadius: 1,
+								}}
+							>
+								<Typography
+									variant="subtitle1"
+									fontWeight="bold"
+									gutterBottom
+								>
+									{selectedCheck.location.city}, {selectedCheck.location.country}
+								</Typography>
+								<Stack spacing={0.5}>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status:
+										</Typography>{" "}
+										{selectedCheck.status ? "Up" : "Down"}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status Code:
+										</Typography>{" "}
+										{selectedCheck.statusCode}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Response Time:
+										</Typography>{" "}
+										{formatResponseTime(selectedCheck.timings.total)}
+									</Typography>
+									<Typography
+										variant="caption"
+										color="text.secondary"
+										sx={{ mt: 0.5 }}
+									>
+										{new Date(selectedCheck.createdAt).toLocaleString()}
+									</Typography>
+								</Stack>
+							</Box>
+						</Popup>
+					)}
+				</Map>
+			</Box>
+		</>
+	);
+};

client/src/Components/monitors/HeaderGeoTabs.tsx

@@ -0,0 +1,54 @@
+import Stack from "@mui/material/Stack";
+import { Tabs, Tab } from "@/Components/design-elements";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import type { GeoContinent } from "@/Types/GeoCheck";
+
+interface HeaderGeoTabsProps {
+	geoCheckEnabled: boolean;
+	locations: GeoContinent[] | undefined;
+	selectedLocation: GeoContinent;
+	onLocationChange: (location: GeoContinent) => void;
+}
+
+export const HeaderGeoTabs = ({
+	geoCheckEnabled,
+	locations,
+	selectedLocation,
+	onLocationChange,
+}: HeaderGeoTabsProps) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+
+	if (!geoCheckEnabled || !locations || locations.length === 0) {
+		return null;
+	}
+
+	const handleChange = (_event: React.SyntheticEvent, newValue: GeoContinent) => {
+		onLocationChange(newValue);
+	};
+
+	return (
+		<Stack
+			spacing={{ xs: theme.spacing(8), md: 0 }}
+			direction={{ xs: "column", md: "row" }}
+			alignItems={"center"}
+			justifyContent={"flex-start"}
+		>
+			<Tabs
+				value={selectedLocation}
+				onChange={handleChange}
+			>
+				{locations.map((location) => (
+					<Tab
+						key={location}
+						label={t(
+							`pages.createMonitor.form.geoChecks.option.locations.options.${location}`
+						)}
+						value={location}
+					/>
+				))}
+			</Tabs>
+		</Stack>
+	);
+};

client/src/Components/monitors/HeaderMonitorControls.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
-import { Icon, MonitorStatus } from "@/Components/v2/design-elements";
+import { Icon, MonitorStatus } from "@/Components/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { Button } from "@/Components/inputs";
 import { Settings, Pause, Play, Mail, Bug, Trash } from "lucide-react";
 
 import { useTranslation } from "react-i18next";

client/src/Components/monitors/HeaderMonitorsSummary.tsx

@@ -0,0 +1,35 @@
+import {
+	UpStatusBox,
+	DownStatusBox,
+	PausedStatusBox,
+	InitializingStatusBox,
+	BreachedStatusBox,
+} from "@/Components/design-elements";
+import Stack from "@mui/material/Stack";
+
+import type { MonitorsSummary } from "@/Types/Monitor";
+import { useTheme } from "@mui/material";
+
+interface MonitorsSummaryProps {
+	summary: MonitorsSummary | null;
+	showBreached?: boolean;
+}
+
+export const HeaderMonitorsSummary = ({
+	summary,
+	showBreached = false,
+}: MonitorsSummaryProps) => {
+	const theme = useTheme();
+	return (
+		<Stack
+			direction={{ xs: "column", md: "row" }}
+			gap={theme.spacing(8)}
+		>
+			<UpStatusBox n={summary?.upMonitors || 0} />
+			<DownStatusBox n={summary?.downMonitors || 0} />
+			{showBreached && <BreachedStatusBox n={summary?.breachedMonitors || 0} />}
+			<PausedStatusBox n={summary?.pausedMonitors || 0} />
+			<InitializingStatusBox n={summary?.initializingMonitors || 0} />
+		</Stack>
+	);
+};

client/src/Components/monitors/MonitorStatBoxes.tsx

@@ -1,9 +1,9 @@
 import Stack from "@mui/material/Stack";
-import { StatBox } from "@/Components/v2/design-elements";
+import { StatBox } from "@/Components/design-elements";
 
+import prettyMilliseconds from "pretty-ms";
 import { useTheme } from "@mui/material/styles";
 import type { MonitorStats, Monitor } from "@/Types/Monitor";
-import { getHumanReadableDuration } from "@/Utils/timeUtilsLegacy.js";
 import { getStatusPalette } from "@/Utils/MonitorUtils";
 import { useTranslation } from "react-i18next";
 
@@ -32,11 +32,16 @@ export const MonitorStatBoxes = ({
 
 	// Determine time since last check
 	const timeOfLastCheck = monitorStats?.lastCheckTimestamp || 0;
-	const timeSinceLastCheck = Date.now() - timeOfLastCheck;
+	const timeSinceLastCheck = Date.now() - timeOfLastCheck || 0;
 
-	const streakTime = getHumanReadableDuration(timeSinceLastFailure);
+	const options = {
+		secondsDecimalDigits: 0,
+		millisecondsDecimalDigits: 0,
+	};
 
-	const lastCheckTime = getHumanReadableDuration(timeSinceLastCheck);
+	const streakTime = prettyMilliseconds(timeSinceLastFailure, options);
+
+	const lastCheckTime = prettyMilliseconds(timeSinceLastCheck, options);
 	const palette = getStatusPalette(monitor?.status);
 
 	return (
@@ -55,7 +60,7 @@ export const MonitorStatBoxes = ({
 			/>
 			<StatBox
 				title={t("pages.common.monitors.statBoxes.lastResponseTime")}
-				subtitle={monitorStats?.lastResponseTime + " ms"}
+				subtitle={prettyMilliseconds(monitorStats?.lastResponseTime ?? 0)}
 			/>
 
 			{monitor?.type === "http" && (

client/src/Components/monitors/charts/HistogramDetails.tsx

@@ -1,4 +1,4 @@
-import { BaseChart, BaseBox } from "@/Components/v2/design-elements";
+import { BaseChart, BaseBox } from "@/Components/design-elements";
 import { Clock } from "lucide-react";
 import {
 	AreaChart,

client/src/Components/monitors/charts/HistogramInfrastructure.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import {
 	AreaChart,
 	Area,
@@ -8,7 +8,7 @@ import {
 	ResponsiveContainer,
 } from "recharts";
 import { Fragment, useId } from "react";
-import { XTick } from "@/Components/v2/monitors";
+import { XTick } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
 import type { HardwareCheckStats } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeed.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
-import { HistogramPageSpeedTooltip } from "@/Components/v2/monitors/charts/HistogramPageSpeedTooltip";
+import { HistogramPageSpeedTooltip } from "@/Components/monitors/charts/HistogramPageSpeedTooltip";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import type { MonitorStatus } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeedDetails.tsx

@@ -1,6 +1,6 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { TrendingUp } from "lucide-react";
-import { XTick } from "@/Components/v2/monitors/";
+import { XTick } from "@/Components/monitors";
 import {
 	XAxis,
 	AreaChart,
@@ -9,10 +9,10 @@ import {
 	CartesianGrid,
 	ResponsiveContainer,
 } from "recharts";
-import { HistogramPageSpeedScoresTooltip } from "@/Components/v2/monitors";
+import { HistogramPageSpeedScoresTooltip } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
-import type { CheckSnapshot } from "@/Types/Check";
+import type { PageSpeedGroupedCheck } from "@/Types/Check";
 import type { Palette } from "@mui/material/styles";
 type PaletteColorKey = Extract<
 	keyof Palette,
@@ -52,7 +52,7 @@ export const HistogramPageSpeedDetails = ({
 	checks,
 	range,
 }: {
-	checks: CheckSnapshot[];
+	checks: PageSpeedGroupedCheck[];
 	range: string;
 }) => {
 	const theme = useTheme();
@@ -73,7 +73,7 @@ export const HistogramPageSpeedDetails = ({
 			>
 				<AreaChart data={checks}>
 					<XAxis
-						dataKey={"createdAt"}
+						dataKey={"bucketDate"}
 						tick={(props) => (
 							<XTick
 								{...props}

client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx

@@ -2,8 +2,9 @@ import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
-import type { ConfigItem } from "@/Components/v2/monitors";
+import type { ConfigItem } from "@/Components/monitors";
 import type { TooltipProps } from "recharts";
 import { useSelector } from "react-redux";
 import type { RootState } from "@/Types/state";
@@ -30,8 +31,8 @@ export const HistogramPageSpeedScoresTooltip = ({
 					border: 1,
 					borderColor: theme.palette.divider,
 					borderRadius: theme.shape.borderRadius,
-					py: theme.spacing(2),
+					py: theme.spacing(SPACING.LG),
-					px: theme.spacing(4),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
 				<Typography
@@ -54,12 +55,12 @@ export const HistogramPageSpeedScoresTooltip = ({
 								key={`${key}-tooltip`}
 								direction="row"
 								alignItems="center"
-								gap={theme.spacing(3)}
+								gap={theme.spacing(SPACING.XXL)}
-								mt={theme.spacing(1)}
+								mt={theme.spacing(SPACING.SM)}
 							>
 								<Box
-									width={theme.spacing(4)}
+									width={theme.spacing(LAYOUT.XS)}
-									height={theme.spacing(4)}
+									height={theme.spacing(LAYOUT.XS)}
 									sx={{ borderRadius: "50%", backgroundColor: dotColor }}
 								/>
 								<Typography

client/src/Components/monitors/charts/HistogramStatus.tsx

@@ -1,9 +1,9 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
-import { formatDateWithTz } from "@/Utils/timeUtilsLegacy";
+import { formatDateWithTz } from "@/Utils/TimeUtils";
 import { useTranslation } from "react-i18next";
 import { ResponsiveContainer, BarChart, XAxis, Bar, Cell, Tooltip } from "recharts";
 import { getResponseTimeColor } from "@/Utils/MonitorUtils";

client/src/Components/monitors/charts/PiePageSpeed.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { FileText } from "lucide-react";
 import type { CheckAudits, CheckSnapshot } from "@/Types/Check";
 import { Pie, PieChart, ResponsiveContainer, Label } from "recharts";

client/src/Components/monitors/charts/PiePageSpeedLegend.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import { BarChart3 } from "lucide-react";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { CheckSnapshot } from "@/Types/Check";

client/src/Components/monitors/charts/RadialAvgResponse.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Gauge } from "lucide-react";

client/src/Components/monitors/index.tsx

@@ -1,6 +1,8 @@
 export * from "./ControlsFilter";
 export * from "./MonitorStatBoxes";
 export * from "./HeaderMonitorControls";
+export * from "./HeaderGeoTabs";
+export * from "./GeoChecksMap";
 export * from "./charts/HistogramStatus";
 export * from "./charts/RadialAvgResponse";
 export * from "./charts/HistogramDetails";
@@ -11,3 +13,4 @@ export * from "./charts/PiePageSpeedLegend";
 export * from "./charts/HistogramPageSpeedDetails";
 export * from "./charts/HistogramPageSpeedDetailsTooltip";
 export * from "./charts/HistogramInfrastructure";
+export * from "./HeaderMonitorsSummary";

client/src/Components/routing/RouteProtected.tsx

@@ -0,0 +1,41 @@
+import { Navigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import type { RootState } from "@/Types/state";
+import type { UserRole } from "@/Types/User";
+
+interface ProtectedRouteProps {
+	children: React.ReactNode;
+}
+
+export const ProtectedRoute = ({ children }: ProtectedRouteProps) => {
+	const authState = useSelector((state: RootState) => state.auth);
+
+	return authState.authToken ? (
+		children
+	) : (
+		<Navigate
+			to="/login"
+			replace
+		/>
+	);
+};
+
+interface RoleProtectedRouteProps {
+	roles: UserRole[];
+	children: React.ReactNode;
+}
+
+export const RoleProtectedRoute = ({ roles, children }: RoleProtectedRouteProps) => {
+	const authState = useSelector((state: RootState) => state.auth);
+	const userRoles = authState?.user?.role || [];
+	const canAccess = userRoles.some((role) => roles.includes(role));
+
+	return canAccess ? (
+		children
+	) : (
+		<Navigate
+			to="/uptime"
+			replace
+		/>
+	);
+};

client/src/Components/sidebar/Authfooter.tsx

@@ -0,0 +1,189 @@
+import Stack from "@mui/material/Stack";
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import IconButton from "@mui/material/IconButton";
+import Menu from "@mui/material/Menu";
+import MenuItem from "@mui/material/MenuItem";
+import { useTheme } from "@mui/material";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
+import { useSelector, useDispatch } from "react-redux";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+import { useNavigate } from "react-router";
+import { MoreVertical, LogOut } from "lucide-react";
+import { Avatar, Icon } from "@/Components/design-elements";
+import { clearAuthState } from "@/Features/Auth/authSlice.js";
+import type { RootState } from "@/Types/state.js";
+
+interface AuthFooterProps {
+	collapsed: boolean;
+	accountMenuItems: Array<{
+		name: string;
+		path: string;
+		icon: React.ReactNode;
+	}>;
+}
+
+export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+	const user = useSelector((state: RootState) => state.auth.user);
+	const navigate = useNavigate();
+	const dispatch = useDispatch();
+	const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+
+	const menuOpen = Boolean(anchorEl);
+	const handleMenuOpen = (e: React.MouseEvent<HTMLElement>) =>
+		setAnchorEl(e.currentTarget);
+	const handleMenuClose = () => setAnchorEl(null);
+
+	const handleNavigate = (path: string) => {
+		handleMenuClose();
+		navigate(path);
+	};
+
+	const handleLogout = () => {
+		dispatch(clearAuthState());
+		navigate("/login");
+	};
+
+	const getRoleText = () => {
+		const role = user?.role ?? "";
+		if (role.includes("superadmin"))
+			return t("components.sidebar.authFooter.roles.superAdmin");
+		if (role.includes("admin")) return t("components.sidebar.authFooter.roles.admin");
+		if (role.includes("user")) return t("components.sidebar.authFooter.roles.user");
+		if (role.includes("demo")) return t("components.sidebar.authFooter.roles.demoUser");
+		return role;
+	};
+
+	const filteredMenuItems = accountMenuItems.filter((item) => {
+		if (!user) return false;
+		if (item.name === "Password" && user.role?.includes("demo")) return false;
+		if (item.name === "Team" && !user.role?.includes("superadmin")) return false;
+		return true;
+	});
+
+	const menuItemSx = {
+		gap: theme.spacing(LAYOUT.MD),
+		borderRadius: theme.shape.borderRadius,
+		pl: theme.spacing(LAYOUT.XS),
+		"& svg": { stroke: theme.palette.text.secondary },
+	};
+
+	return (
+		<Stack
+			direction="row"
+			alignItems="center"
+			py={theme.spacing(LAYOUT.XS)}
+			px={theme.spacing(LAYOUT.MD)}
+			gap={theme.spacing(LAYOUT.MD)}
+		>
+			<Avatar
+				small
+				onClick={collapsed ? handleMenuOpen : undefined}
+				sx={{ cursor: collapsed ? "pointer" : "default" }}
+			/>
+
+			{!collapsed && (
+				<Stack
+					direction="row"
+					alignItems="center"
+					gap={theme.spacing(SPACING.MD)}
+					minWidth={0}
+					flex={1}
+				>
+					<Stack
+						minWidth={0}
+						flex={1}
+					>
+						<Typography
+							fontWeight={500}
+							noWrap
+							sx={{ color: theme.palette.text.primary }}
+						>
+							{user?.firstName} {user?.lastName}
+						</Typography>
+						<Typography
+							noWrap
+							sx={{ textTransform: "capitalize", color: theme.palette.text.secondary }}
+						>
+							{getRoleText()}
+						</Typography>
+					</Stack>
+					<IconButton
+						onClick={handleMenuOpen}
+						sx={{
+							"&:focus": { outline: "none" },
+							"& svg": { stroke: theme.palette.text.secondary },
+						}}
+					>
+						<Icon
+							icon={MoreVertical}
+							size={22}
+						/>
+					</IconButton>
+				</Stack>
+			)}
+
+			<Menu
+				anchorEl={anchorEl}
+				open={menuOpen}
+				onClose={handleMenuClose}
+				disableScrollLock
+				anchorOrigin={{ vertical: "top", horizontal: "right" }}
+				slotProps={{
+					paper: {
+						sx: {
+							mt: theme.spacing(-LAYOUT.XS),
+							ml: collapsed ? theme.spacing(SPACING.LG) : 0,
+						},
+					},
+				}}
+				MenuListProps={{ sx: { p: 2, "& li": { m: 0 } } }}
+				sx={{ ml: theme.spacing(LAYOUT.XS) }}
+			>
+				{collapsed && (
+					<Box
+						px={2}
+						pb={2}
+						sx={{ pointerEvents: "none" }}
+					>
+						<Typography
+							fontWeight={500}
+							fontSize={13}
+						>
+							{user?.firstName} {user?.lastName}
+						</Typography>
+						<Typography
+							fontSize={12}
+							sx={{ textTransform: "capitalize" }}
+						>
+							{getRoleText()}
+						</Typography>
+					</Box>
+				)}
+				{filteredMenuItems.map((item) => (
+					<MenuItem
+						key={item.name}
+						onClick={() => handleNavigate(item.path)}
+						sx={menuItemSx}
+					>
+						{item.icon}
+						{item.name}
+					</MenuItem>
+				))}
+				<MenuItem
+					onClick={handleLogout}
+					sx={menuItemSx}
+				>
+					<Icon
+						icon={LogOut}
+						size={20}
+					/>
+					{t("components.sidebar.authFooter.logOut")}
+				</MenuItem>
+			</Menu>
+		</Stack>
+	);
+};

client/src/Components/sidebar/Logo.tsx

@@ -1,37 +1,37 @@
-import Stack from "@mui/material/Stack";
+import Stack, { type StackProps } from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router";
+import { toggleSidebar } from "@/Features/UI/uiSlice.js";
+import { useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
-import PropTypes from "prop-types";
+import useSidebar from "@/Hooks/useSidebar";
 
-const Logo = ({ collapsed }) => {
+export const Logo = (props: StackProps) => {
 	const { t } = useTranslation();
 	const theme = useTheme();
-	const navigate = useNavigate();
+	const dispatch = useDispatch();
-
+	const { collapsed } = useSidebar();
 	return (
 		<Stack
-			pt={theme.spacing(6)}
-			pb={theme.spacing(12)}
-			pl={theme.spacing(8)}
 			direction="row"
 			alignItems="center"
 			gap={theme.spacing(4)}
-			onClick={() => navigate("/")}
+			onClick={() => {
+				dispatch(toggleSidebar());
+			}}
 			sx={{ cursor: "pointer" }}
+			{...props}
 		>
 			<Typography
-				pl={theme.spacing("1px")}
 				minWidth={theme.spacing(16)}
 				minHeight={theme.spacing(16)}
 				display={"flex"}
 				justifyContent={"center"}
 				alignItems={"center"}
-				backgroundColor={theme.palette.accent.main}
+				bgcolor={theme.palette.primary.main}
 				borderRadius={theme.shape.borderRadius}
-				color={theme.palette.accent.contrastText}
+				color={theme.palette.primary.contrastText}
 				fontSize={18}
 			>
 				C
@@ -49,9 +49,8 @@ const Logo = ({ collapsed }) => {
 				<Typography
 					lineHeight={1}
 					mt={theme.spacing(2)}
-					color={theme.palette.primary.contrastText}
+					variant="h2"
-					fontSize={"var(--env-var-font-size-medium-plus)"}
+					fontWeight={500}
-					sx={{ fontWeight: 500 }}
 				>
 					{t("common.appName")}
 				</Typography>
@@ -59,9 +58,3 @@ const Logo = ({ collapsed }) => {
 		</Stack>
 	);
 };
-
-Logo.propTypes = {
-	collapsed: PropTypes.bool,
-};
-
-export default Logo;

client/src/Components/sidebar/Menu.tsx

@@ -0,0 +1,120 @@
+import { Icon } from "@/Components/design-elements";
+
+import {
+	Globe,
+	Gauge,
+	Link,
+	Bell,
+	FileText,
+	AlertTriangle,
+	Wifi,
+	Wrench,
+	Database,
+	Settings,
+	HelpCircle,
+	MessageCircle,
+	Code,
+	User,
+	Lock,
+	Users,
+} from "lucide-react";
+
+export const getMenu = (t: Function) => {
+	return [
+		{
+			name: t("components.sidebar.menu.uptime"),
+			path: "uptime",
+			icon: <Icon icon={Globe} />,
+		},
+		{
+			name: t("components.sidebar.menu.pagespeed"),
+			path: "pagespeed",
+			icon: <Icon icon={Gauge} />,
+		},
+		{
+			name: t("components.sidebar.menu.infrastructure"),
+			path: "infrastructure",
+			icon: <Icon icon={Link} />,
+		},
+		{
+			name: t("components.sidebar.menu.notifications"),
+			path: "notifications",
+			icon: <Icon icon={Bell} />,
+		},
+		{
+			name: t("components.sidebar.menu.checks"),
+			path: "checks",
+			icon: <Icon icon={FileText} />,
+		},
+		{
+			name: t("components.sidebar.menu.incidents"),
+			path: "incidents",
+			icon: <Icon icon={AlertTriangle} />,
+		},
+		{
+			name: t("components.sidebar.menu.statusPages"),
+			path: "status",
+			icon: <Icon icon={Wifi} />,
+		},
+		{
+			name: t("components.sidebar.menu.maintenance"),
+			path: "maintenance",
+			icon: <Icon icon={Wrench} />,
+		},
+		{
+			name: t("components.sidebar.menu.logs"),
+			path: "logs",
+			icon: <Icon icon={Database} />,
+		},
+		{
+			name: t("components.sidebar.menu.settings"),
+			icon: <Icon icon={Settings} />,
+			path: "settings",
+		},
+	];
+};
+
+export const getBottomMenu = (t: Function) => {
+	return [
+		{
+			name: t("components.sidebar.bottomMenu.support"),
+			path: "support",
+			icon: <Icon icon={HelpCircle} />,
+		},
+		{
+			name: t("components.sidebar.bottomMenu.discussions"),
+			path: "discussions",
+			icon: <Icon icon={MessageCircle} />,
+		},
+		{
+			name: t("components.sidebar.bottomMenu.docs"),
+			path: "docs",
+			icon: <Icon icon={FileText} />,
+		},
+		{
+			name: t("components.sidebar.bottomMenu.changelog"),
+			path: "changelog",
+			icon: <Icon icon={Code} />,
+		},
+	];
+};
+
+export const getAccountMenu = (t: Function) => {
+	return [
+		{
+			name: t("components.sidebar.accountMenu.profile"),
+			path: "account/profile",
+			icon: <Icon icon={User} />,
+		},
+		{
+			name: t("components.sidebar.accountMenu.password"),
+			path: "account/password",
+			icon: <Icon icon={Lock} />,
+		},
+		{
+			name: t("components.sidebar.accountMenu.team"),
+			path: "account/team",
+			icon: <Icon icon={Users} />,
+		},
+	];
+};

client/src/Components/sidebar/NavItem.tsx

@@ -3,19 +3,31 @@ import ListItemButton from "@mui/material/ListItemButton";
 import ListItemIcon from "@mui/material/ListItemIcon";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
-import { useTheme } from "@emotion/react";
+import { useTheme } from "@mui/material/styles";
-import PropTypes from "prop-types";
+import useSidebar from "@/Hooks/useSidebar";
 
-const NavItem = ({ item, collapsed, selected, onClick }) => {
+export interface NavData {
+	name: string;
+	icon: React.ReactElement;
+}
+
+export const NavItem = ({
+	item,
+	selected,
+	onClick,
+}: {
+	item: NavData;
+	selected: boolean;
+	onClick: (event: React.MouseEvent) => void;
+}) => {
+	const { collapsed } = useSidebar();
 	const theme = useTheme();
-	const iconStroke = selected
+	const iconStroke = selected ? theme.palette.primary.main : theme.palette.text.secondary;
-		? theme.palette.primary.contrastText
-		: theme.palette.primary.contrastTextTertiary;
 
-	const buttonBgColor = selected ? theme.palette.secondary.main : "transparent";
+	const buttonBgColor = selected ? theme.palette.action.selected : "transparent";
 	const buttonBgHoverColor = selected
-		? theme.palette.secondary.main
+		? theme.palette.action.selected
-		: theme.palette.tertiary.main;
+		: theme.palette.action.hover;
 	const fontWeight = selected ? 600 : 400;
 	return (
 		<Tooltip
@@ -38,10 +50,14 @@ const NavItem = ({ item, collapsed, selected, onClick }) => {
 			<ListItemButton
 				sx={{
 					backgroundColor: buttonBgColor,
+					backgroundImage: "none",
+					border: 1,
+					borderColor: "transparent",
 					"&:hover": {
 						backgroundColor: buttonBgHoverColor,
+						backgroundImage: "none",
 					},
-					height: 37,
+					height: 32,
 					gap: theme.spacing(4),
 					borderRadius: theme.shape.borderRadius,
 					px: theme.spacing(4),
@@ -52,13 +68,20 @@ const NavItem = ({ item, collapsed, selected, onClick }) => {
 				<ListItemIcon
 					sx={{
 						minWidth: 0,
-						color: iconStroke,
 						"& svg": {
-							height: 20,
+							height: 16,
-							width: 20,
+							width: 16,
 							opacity: 0.81,
+							transition: "stroke 0.2s ease",
+						},
+						"& svg path, & svg line, & svg polyline, & svg rect, & svg circle": {
 							stroke: iconStroke,
 						},
+						".MuiListItemButton-root:hover &": {
+							"& svg path, & svg line, & svg polyline, & svg rect, & svg circle": {
+								stroke: theme.palette.primary.main,
+							},
+						},
 					}}
 				>
 					{item.icon}
@@ -73,7 +96,6 @@ const NavItem = ({ item, collapsed, selected, onClick }) => {
 				>
 					<Typography
 						variant="body1"
-						color={theme.palette.primary.contrastText}
 						sx={{
 							fontWeight: fontWeight,
 							opacity: 0.9,
@@ -86,11 +108,3 @@ const NavItem = ({ item, collapsed, selected, onClick }) => {
 		</Tooltip>
 	);
 };
-
-NavItem.propTypes = {
-	item: PropTypes.object,
-	collapsed: PropTypes.bool,
-	selected: PropTypes.bool,
-	onClick: PropTypes.func,
-};
-export default NavItem;

client/src/Components/sidebar/StarPrompt.tsx

@@ -1,18 +1,26 @@
-import React from "react";
 import { Typography, IconButton, Stack, Box } from "@mui/material";
-import Icon from "../Icon";
+import { Icon } from "@/Components/design-elements";
-import { useTheme } from "@emotion/react";
+import { X } from "lucide-react";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
+
+import { useTheme } from "@mui/material";
 import { useSelector, useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
-import { setStarPromptOpen } from "../../../Features/UI/uiSlice.js";
+import { setStarPromptOpen } from "@/Features/UI/uiSlice.js";
+import type { RootState } from "@/Types/state.js";
+import useSidebar from "@/Hooks/useSidebar.js";
 
-const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" }) => {
+export const StarPrompt = ({
+	repoUrl = "https://github.com/bluewave-labs/checkmate",
+}: {
+	repoUrl?: string;
+}) => {
 	const theme = useTheme();
 	const dispatch = useDispatch();
 	const { t } = useTranslation();
-	const isOpen = useSelector((state) => state.ui?.starPromptOpen ?? true);
+	const isOpen = useSelector((state: RootState) => state.ui?.starPromptOpen ?? true);
-	const mode = useSelector((state) => state.ui.mode);
+	const mode = useSelector((state: RootState) => state.ui.mode);
-
+	const { collapsed } = useSidebar();
 	const handleClose = () => {
 		dispatch(setStarPromptOpen(false));
 	};
@@ -21,38 +29,30 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 		window.open(repoUrl, "_blank");
 	};
 
+	if (collapsed) return null;
 	if (!isOpen) return null;
 
 	return (
 		<Stack
 			direction="column"
-			sx={{
+			gap={theme.spacing(LAYOUT.MD)}
-				width: "100%",
+			padding={theme.spacing(LAYOUT.SM)}
-				padding: `${theme.spacing(6)} ${theme.spacing(6)}`,
+			width={"100%"}
-				borderTop: `1px solid ${theme.palette.primary.lowContrast}`,
+			borderTop={`1px solid ${theme.palette.divider}`}
-				borderBottom: `1px solid ${theme.palette.primary.lowContrast}`,
+			borderBottom={`1px solid ${theme.palette.divider}`}
-				borderRadius: 0,
-				gap: theme.spacing(1.5),
-			}}
 		>
 			<Stack
 				direction="row"
 				justifyContent="space-between"
 				alignItems="center"
 				width="100%"
-				pl={theme.spacing(4)}
+				pl={theme.spacing(LAYOUT.XS)}
 			>
 				<Typography
 					variant="subtitle2"
-					sx={{
+					mt={theme.spacing(SPACING.XXL)}
-						color:
-							mode === "dark"
-								? theme.palette.primary.contrastText
-								: theme.palette.text.primary,
-						mt: theme.spacing(3),
-					}}
 				>
-					{t("starPromptTitle")}
+					{t("components.sidebar.starPrompt.title")}
 				</Typography>
 				<IconButton
 					onClick={handleClose}
@@ -60,7 +60,6 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 					sx={{
 						color: theme.palette.text.primary,
 						padding: 0,
-						marginTop: theme.spacing(-5),
 						"&:hover": {
 							backgroundColor: "transparent",
 							opacity: 0.8,
@@ -68,23 +67,19 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 					}}
 				>
 					<Icon
-						name="X"
+						icon={X}
 						size={20}
 					/>
 				</IconButton>
 			</Stack>
 
 			<Typography
-				variant="body1"
 				sx={{
-					color: theme.palette.primary.contrastTextTertiary,
-					fontSize: "0.938rem",
-					lineHeight: 1.5,
 					mb: 1,
-					px: theme.spacing(4),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
-				{t("starPromptDescription")}
+				{t("components.sidebar.starPrompt.description")}
 			</Typography>
 
 			<Box
@@ -99,12 +94,10 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 					"&:hover": {
 						opacity: 0.8,
 					},
-					pl: theme.spacing(4),
+					pl: theme.spacing(LAYOUT.XS),
 					filter: mode === "dark" ? "invert(1)" : "none",
 				}}
 			/>
 		</Stack>
 	);
 };
-
-export default StarPrompt;

client/src/Components/sidebar/index.tsx

@@ -0,0 +1,132 @@
+import { useEffect } from "react";
+import Backdrop from "@mui/material/Backdrop";
+import Stack from "@mui/material/Stack";
+import List from "@mui/material/List";
+import Divider from "@mui/material/Divider";
+import { LAYOUT } from "@/Utils/Theme/constants";
+import { useSidebar } from "@/Hooks/useSidebar.js";
+import { Logo } from "@/Components/sidebar/Logo";
+import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/sidebar/Menu";
+import { NavItem } from "@/Components/sidebar/NavItem";
+import { StarPrompt } from "@/Components/sidebar/StarPrompt";
+import { AuthFooter } from "@/Components/sidebar/Authfooter";
+
+import { useNavigate, useLocation } from "react-router";
+import { useTranslation } from "react-i18next";
+import { useTheme, useMediaQuery } from "@mui/material";
+import { useDispatch } from "react-redux";
+import { setCollapsed } from "@/Features/UI/uiSlice";
+
+const URL_MAP: Record<string, string> = {
+	support: "https://discord.com/invite/NAb6H3UTjK",
+	discussions: "https://github.com/bluewave-labs/checkmate/discussions",
+	docs: "https://bluewavelabs.gitbook.io/checkmate",
+	changelog: "https://github.com/bluewave-labs/checkmate/releases",
+};
+
+export const Sidebar = () => {
+	const dispatch = useDispatch();
+	const navigate = useNavigate();
+	const location = useLocation();
+	const { t } = useTranslation();
+	const { width, transition, collapsed } = useSidebar();
+	const theme = useTheme();
+	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
+	const menu = getMenu(t);
+	const bottomMenu = getBottomMenu(t);
+	const accountMenu = getAccountMenu(t);
+
+	useEffect(() => {
+		dispatch(setCollapsed({ collapsed: isSmall }));
+	}, [isSmall, dispatch]);
+
+	const handleNavClick = (path: string) => {
+		const url = URL_MAP[path];
+		if (url) {
+			window.open(url, "_blank", "noreferrer");
+		} else {
+			navigate(`/${path}`);
+		}
+		if (isSmall) {
+			dispatch(setCollapsed({ collapsed: true }));
+		}
+	};
+
+	return (
+		<>
+			<Backdrop
+				open={!collapsed && isSmall}
+				onClick={() => dispatch(setCollapsed({ collapsed: true }))}
+				sx={{ zIndex: 999 }}
+			/>
+			<Stack
+				component="aside"
+				position={isSmall ? "fixed" : "sticky"}
+				top={0}
+				left={0}
+				minHeight={"100vh"}
+				maxHeight={"100vh"}
+				paddingTop={theme.spacing(LAYOUT.SM)}
+				paddingBottom={theme.spacing(LAYOUT.SM)}
+				gap={theme.spacing(LAYOUT.SM)}
+				borderRight={`1px solid ${theme.palette.divider}`}
+				width={width}
+				sx={{
+					touchAction: "none",
+					transition: transition,
+					zIndex: 1000,
+					backdropFilter: "blur(8px)",
+				}}
+			>
+				<List
+					component="nav"
+					disablePadding
+					sx={{
+						px: theme.spacing(LAYOUT.SM),
+						flex: 1,
+					}}
+				>
+					<Logo
+						pt={theme.spacing(LAYOUT.MD)}
+						pb={theme.spacing(LAYOUT.MD)}
+					/>
+					{menu.map((item) => {
+						const selected = location.pathname.startsWith(`/${item.path}`);
+						return (
+							<NavItem
+								key={item.path}
+								item={item}
+								selected={selected}
+								onClick={() => handleNavClick(item.path)}
+							/>
+						);
+					})}
+				</List>
+				<StarPrompt />
+				<List
+					component="nav"
+					disablePadding
+					sx={{ px: theme.spacing(LAYOUT.SM) }}
+				>
+					{bottomMenu.map((item) => {
+						const selected = location.pathname.startsWith(`/${item.path}`);
+						return (
+							<NavItem
+								key={item.path}
+								item={item}
+								selected={selected}
+								onClick={() => handleNavClick(item.path)}
+							/>
+						);
+					})}
+				</List>
+				<Divider sx={{ borderColor: theme.palette.divider }} />
+
+				<AuthFooter
+					collapsed={collapsed}
+					accountMenuItems={accountMenu}
+				/>
+			</Stack>
+		</>
+	);
+};

client/src/Components/v1/ActionsMenu/index.jsx

@@ -1,228 +0,0 @@
-// Components
-import IconButton from "@mui/material/IconButton";
-import Menu from "@mui/material/Menu";
-import MenuItem from "@mui/material/MenuItem";
-import Icon from "../Icon";
-import Dialog from "../Dialog/index.jsx";
-
-// Utils
-import { useState } from "react";
-import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
-import { createToast } from "../../../Utils/toastUtils.jsx";
-
-import PropTypes from "prop-types";
-import { usePauseMonitor, useDeleteMonitor } from "../../../Hooks/monitorHooks.js";
-
-const ActionsMenu = ({
-	monitor,
-	isAdmin,
-	updateRowCallback,
-	pauseCallback,
-	setIsLoading = () => {},
-}) => {
-	const [anchorEl, setAnchorEl] = useState(null);
-	const [actions, setActions] = useState({});
-	const [isOpen, setIsOpen] = useState(false);
-	const theme = useTheme();
-	const [pauseMonitor, isPausing, error] = usePauseMonitor();
-	const [deleteMonitor, isDeleting] = useDeleteMonitor();
-
-	const handleRemove = async (event) => {
-		event.preventDefault();
-		event.stopPropagation();
-		let monitor = { id: actions.id };
-		await deleteMonitor({ monitor });
-		updateRowCallback();
-	};
-
-	const handlePause = async () => {
-		try {
-			setIsLoading(true);
-			await pauseMonitor({ monitorId: monitor.id });
-			pauseCallback();
-		} catch (error) {
-			createToast({ body: "Failed to pause monitor." });
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	const openMenu = (event, id, url) => {
-		event.preventDefault();
-		event.stopPropagation();
-		setAnchorEl(event.currentTarget);
-		setActions({ id: id, url: url });
-	};
-
-	const openRemove = (e) => {
-		closeMenu(e);
-		setIsOpen(true);
-	};
-
-	const closeMenu = (e) => {
-		e.stopPropagation();
-		setAnchorEl(null);
-	};
-
-	const navigate = useNavigate();
-	return (
-		<>
-			<IconButton
-				aria-label="monitor actions"
-				onClick={(event) => {
-					event.stopPropagation();
-					openMenu(event, monitor.id, monitor.type === "ping" ? null : monitor.url);
-				}}
-				sx={{
-					"&:focus": {
-						outline: "none",
-					},
-					"& svg path": {
-						stroke: theme.palette.primary.contrastTextTertiary,
-					},
-				}}
-			>
-				<Icon
-					name="Settings"
-					size={20}
-				/>
-			</IconButton>
-
-			<Menu
-				className="actions-menu"
-				anchorEl={anchorEl}
-				open={Boolean(anchorEl)}
-				onClose={(e) => closeMenu(e)}
-				disableScrollLock
-				slotProps={{
-					paper: {
-						sx: {
-							"& ul": {
-								p: theme.spacing(2.5),
-								backgroundColor: theme.palette.primary.main,
-							},
-							"& li": { m: 0, color: theme.palette.primary.contrastTextSecondary },
-							/* 
-							This should not be set automatically on the last of type
-							"& li:last-of-type": {
-								color: theme.palette.error.main,
-							}, */
-						},
-					},
-				}}
-			>
-				{actions.url !== null ? (
-					<MenuItem
-						onClick={(e) => {
-							closeMenu(e);
-							e.stopPropagation();
-							window.open(actions.url, "_blank", "noreferrer");
-						}}
-					>
-						Open site
-					</MenuItem>
-				) : (
-					""
-				)}
-				<MenuItem
-					onClick={(e) => {
-						e.stopPropagation();
-						navigate(`/uptime/${actions.id}`);
-					}}
-				>
-					Details
-				</MenuItem>
-				{/* TODO - pass monitor id to Incidents page */}
-				<MenuItem
-					onClick={(e) => {
-						e.stopPropagation();
-						navigate(`/incidents/${actions.id}`);
-					}}
-				>
-					Incidents
-				</MenuItem>
-				{isAdmin && (
-					<MenuItem
-						onClick={(e) => {
-							e.stopPropagation();
-
-							navigate(`/uptime/configure/${actions.id}`);
-						}}
-					>
-						Configure
-					</MenuItem>
-				)}
-				{isAdmin && (
-					<MenuItem
-						onClick={(e) => {
-							e.stopPropagation();
-							navigate(`/uptime/create/${actions.id}`);
-						}}
-					>
-						Clone
-					</MenuItem>
-				)}
-				{isAdmin && (
-					<MenuItem
-						onClick={(e) => {
-							closeMenu(e);
-
-							e.stopPropagation();
-							handlePause(e);
-						}}
-					>
-						{monitor?.isActive === true ? "Pause" : "Resume"}
-					</MenuItem>
-				)}
-				{isAdmin && (
-					<MenuItem
-						onClick={(e) => {
-							e.stopPropagation();
-							openRemove(e);
-						}}
-						sx={{ "&.MuiButtonBase-root": { color: theme.palette.error.main } }}
-					>
-						Remove
-					</MenuItem>
-				)}
-			</Menu>
-			<Dialog
-				open={isOpen}
-				theme={theme}
-				title="Do you really want to delete this monitor?"
-				description="Once deleted, this monitor cannot be retrieved."
-				/* Do we need stop propagation? */
-				onCancel={(e) => {
-					e.stopPropagation();
-					setIsOpen(false);
-				}}
-				confirmationButtonLabel="Delete"
-				/* Do we need stop propagation? */
-				onConfirm={(e) => {
-					console.log(e);
-					e.stopPropagation();
-					handleRemove(e);
-				}}
-				isLoading={isDeleting}
-				modelTitle="modal-delete-monitor"
-				modelDescription="delete-monitor-confirmation"
-			/>
-		</>
-	);
-};
-
-ActionsMenu.propTypes = {
-	monitor: PropTypes.shape({
-		id: PropTypes.string,
-		url: PropTypes.string,
-		type: PropTypes.string,
-		isActive: PropTypes.bool,
-	}).isRequired,
-	isAdmin: PropTypes.bool,
-	updateRowCallback: PropTypes.func,
-	pauseCallback: PropTypes.func,
-	setIsLoading: PropTypes.func,
-};
-
-export default ActionsMenu;

client/src/Components/v1/Alert/index.css

@@ -1,9 +0,0 @@
-.alert {
-	margin: 0;
-	width: fit-content;
-}
-.alert,
-.alert button,
-.alert .MuiTypography-root {
-	font-size: var(--env-var-font-size-medium);
-}

client/src/Components/v1/Alert/index.jsx

@@ -1,138 +0,0 @@
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { Box, Button, IconButton, Stack, Typography } from "@mui/material";
-import Icon from "../Icon";
-import "./index.css";
-
-/**
- * Icons mapping for different alert variants.
- * @type {Object<string, JSX.Element>}
- */
-
-const icons = {
-	info: (
-		<Icon
-			name="Info"
-			size={24}
-		/>
-	),
-	error: (
-		<Icon
-			name="AlertCircle"
-			size={24}
-		/>
-	),
-	warning: (
-		<Icon
-			name="AlertTriangle"
-			size={24}
-		/>
-	),
-};
-
-/**
- * @param {Object} props
- * @param {'info' | 'error' | 'warning'} props.variant - The type of alert.
- * @param {string} [props.title] - The title of the alert.
- * @param {string} [props.body] - The body text of the alert.
- * @param {boolean} [props.isToast] - Indicates if the alert is used as a toast notification.
- * @param {boolean} [props.hasIcon] - Whether to display an icon in the alert.
- * @param {function} props.onClick - Toast dismiss function.
- * @returns {JSX.Element}
- */
-
-const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => {
-	const theme = useTheme();
-	/* TODO 
-	Do we need other variants for alert?
-	*/
-
-	const text = theme.palette.secondary.contrastText;
-	const border = theme.palette.alert.contrastText;
-	const bg = theme.palette.alert.main;
-	const icon = icons[variant];
-
-	return (
-		<Stack
-			direction="row"
-			justifyContent="flex-start"
-			alignItems={hasIcon ? "" : "center"}
-			className="alert row-stack"
-			gap={theme.spacing(8)}
-			sx={{
-				padding: hasIcon ? theme.spacing(8) : `${theme.spacing(4)} ${theme.spacing(8)}`,
-				backgroundColor: bg,
-				border: `solid 1px ${border}`,
-				borderRadius: theme.shape.borderRadius,
-			}}
-		>
-			{hasIcon && <Box sx={{ color: text }}>{icon}</Box>}
-			<Stack
-				direction="column"
-				gap="2px"
-				sx={{ flex: 1 }}
-			>
-				{title && (
-					<Typography sx={{ fontWeight: "700", color: `${text}` }}>{title}</Typography>
-				)}
-				{body && (
-					<Typography sx={{ fontWeight: "400", color: `${text}` }}>{body}</Typography>
-				)}
-				{hasIcon && isToast && (
-					<Button
-						variant="text"
-						color="info"
-						onClick={onClick}
-						sx={{
-							fontWeight: "600",
-							width: "fit-content",
-							mt: theme.spacing(4),
-							padding: 0,
-							minWidth: 0,
-						}}
-					>
-						Dismiss
-					</Button>
-				)}
-			</Stack>
-			{isToast && (
-				<IconButton
-					onClick={onClick}
-					sx={{
-						alignSelf: "flex-start",
-						ml: "auto",
-						mr: "-5px",
-						mt: hasIcon ? "-5px" : 0,
-						padding: "5px",
-						"&:focus": {
-							outline: "none",
-						},
-					}}
-				>
-					<Icon
-						name="X"
-						size={20}
-					/>
-				</IconButton>
-			)}
-		</Stack>
-	);
-};
-
-Alert.propTypes = {
-	variant: PropTypes.oneOf(["info", "error", "warning"]).isRequired,
-	title: PropTypes.string,
-	body: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-	isToast: PropTypes.bool,
-	hasIcon: PropTypes.bool,
-	onClick: function (props, propName, componentName) {
-		if (props.isToast && !props[propName]) {
-			return new Error(
-				`Prop '${propName}' is required when 'isToast' is true in '${componentName}'.`
-			);
-		}
-		return null;
-	},
-};
-
-export default Alert;

client/src/Components/v1/Animated/PulseDot.jsx

@@ -1,68 +0,0 @@
-import PropTypes from "prop-types";
-import { Box, Stack, useTheme } from "@mui/material";
-// import useUtils from "../../Pages/Uptime/utils";
-
-/**
- * A component that renders a pulsating dot with a specified color.
- *
- * @component
- * @example
- * // Example usage:
- * <PulseDot color="#f00" />
- *
- * @param {Object} props
- * @param {string} props.color - The color of the dot.
- * @returns {JSX.Element} The PulseDot component.
- */
-
-const PulseDot = ({ color }) => {
-	const theme = useTheme();
-	// const { statusToTheme } = useUtils();
-	/* TODO refactor so it gets status and gets theme color. Then uses theme.palette.[themeColor].lowContrast  */
-	/* const themeColor = statusToTheme[status]; */
-
-	return (
-		<Stack
-			width="26px"
-			height="24px"
-			alignItems="center"
-			justifyContent="center"
-		>
-			<Box
-				minWidth="18px"
-				minHeight="18px"
-				sx={{
-					position: "relative",
-					backgroundColor: color,
-					borderRadius: "50%",
-					"&::before": {
-						content: `""`,
-						position: "absolute",
-						width: "100%",
-						height: "100%",
-						backgroundColor: "inherit",
-						borderRadius: "50%",
-						animation: "ripple 1.8s ease-out infinite",
-					},
-					"&::after": {
-						content: `""`,
-						position: "absolute",
-						width: "7px",
-						height: "7px",
-						borderRadius: "50%",
-						backgroundColor: theme.palette.accent.contrastText,
-						top: "50%",
-						left: "50%",
-						transform: "translate(-50%, -50%)",
-					},
-				}}
-			/>
-		</Stack>
-	);
-};
-
-PulseDot.propTypes = {
-	color: PropTypes.string.isRequired,
-};
-
-export default PulseDot;

client/src/Components/v1/ArrowLeft/index.jsx

@@ -1,36 +0,0 @@
-import Icon from "../Icon";
-import PropTypes from "prop-types";
-
-const ArrowLeft = ({ type, color = "#667085", ...props }) => {
-	if (type === "double") {
-		return (
-			<Icon
-				name="ChevronsLeft"
-				color={color}
-				{...props}
-			/>
-		);
-	} else if (type === "long") {
-		return (
-			<Icon
-				name="ArrowLeft"
-				color={color}
-				{...props}
-			/>
-		);
-	} else {
-		return (
-			<Icon
-				name="ChevronLeft"
-				color={color}
-				{...props}
-			/>
-		);
-	}
-};
-
-ArrowLeft.propTypes = {
-	color: PropTypes.string,
-	type: PropTypes.oneOf(["double", "long", "default"]),
-};
-export default ArrowLeft;

client/src/Components/v1/ArrowRight/index.jsx

@@ -1,29 +0,0 @@
-import Icon from "../Icon";
-import PropTypes from "prop-types";
-
-const ArrowRight = ({ type, color = "#667085", ...props }) => {
-	if (type === "double") {
-		return (
-			<Icon
-				name="ChevronsRight"
-				color={color}
-				{...props}
-			/>
-		);
-	} else {
-		return (
-			<Icon
-				name="ChevronRight"
-				color={color}
-				{...props}
-			/>
-		);
-	}
-};
-
-ArrowRight.propTypes = {
-	type: PropTypes.oneOf(["double", "default"]),
-	color: PropTypes.string,
-};
-
-export default ArrowRight;

client/src/Components/v1/Avatar/index.jsx

@@ -1,73 +0,0 @@
-import { Avatar as MuiAvatar } from "@mui/material";
-import PropTypes from "prop-types";
-import { useSelector } from "react-redux";
-import { useEffect, useState } from "react";
-import { useTheme } from "@emotion/react";
-/**
- * @component
- * @param {Object} props
- * @param {string} props.src - Path to image for avatar
- * @param {boolean} props.small - Specifies if avatar should be large
- * @param {Object} [props.sx] - Additional styles to apply to the button.
- * @returns {JSX.Element}
- * @example
- * // Render a red label
- * <Avatar src="assets/img" first="Alex" last="Holliday" small />
- */
-
-const Avatar = ({ src, small, sx, onClick = () => {} }) => {
-	const { user } = useSelector((state) => state.auth);
-	const theme = useTheme();
-
-	const style = small ? { width: 32, height: 32 } : { width: 64, height: 64 };
-	const border = small ? 1 : 3;
-
-	const [image, setImage] = useState();
-	useEffect(() => {
-		if (user.avatarImage) {
-			setImage(`data:image/png;base64,${user.avatarImage}`);
-		}
-	}, [user?.avatarImage]);
-
-	return (
-		<MuiAvatar
-			onClick={onClick}
-			alt={`${user?.firstName} ${user?.lastName}`}
-			/* TODO What is the  /static/images/avatar/2.jpg ?*/
-			src={src ? src : user?.avatarImage ? image : "/static/images/avatar/2.jpg"}
-			sx={{
-				fontSize: small ? "16px" : "22px",
-				fontWeight: 400,
-				color: theme.palette.accent.contrastText,
-				backgroundColor: theme.palette.accent.main, // Same BG color as checkmate BG in sidebar
-				display: "inline-flex",
-				/* 
-				TODO not sure what this is for*/
-				"&::before": {
-					content: `""`,
-					position: "absolute",
-					top: 0,
-					left: 0,
-					width: `100%`,
-					height: `100%`,
-					border: `${border}px solid rgba(255,255,255,0.2)`,
-					borderRadius: "50%",
-				},
-				...style,
-				...sx,
-			}}
-		>
-			{user.firstName?.charAt(0)}
-			{user.lastName?.charAt(0) || ""}
-		</MuiAvatar>
-	);
-};
-
-Avatar.propTypes = {
-	src: PropTypes.string,
-	small: PropTypes.bool,
-	sx: PropTypes.object,
-	onClick: PropTypes.func,
-};
-
-export default Avatar;

client/src/Components/v1/Breadcrumbs/index.css

@@ -1,22 +0,0 @@
-.MuiBreadcrumbs-root {
-	min-height: 34px;
-}
-.MuiBreadcrumbs-root svg {
-	width: 16px;
-	min-height: 16px;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li a {
-	font-size: var(--env-var-font-size-medium);
-	font-weight: 400;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li:not(:last-child) {
-	cursor: pointer;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li:last-child a {
-	font-weight: 500;
-	opacity: 1;
-	cursor: default;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-separator {
-	margin: 0;
-}

client/src/Components/v1/Breadcrumbs/index.jsx

@@ -1,78 +0,0 @@
-import PropTypes from "prop-types";
-import { Box, Breadcrumbs as MUIBreadcrumbs } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
-import ArrowRight from "../ArrowRight/index.jsx";
-import "./index.css";
-
-/**
- * Breadcrumbs component that displays a list of breadcrumb items.
- *
- * @param {Object} props
- * @param {Array} props.list - Array of breadcrumb items. Each item should have `name` and `path` properties.
- * @param {string} props.list.name - The name to display for the breadcrumb.
- * @param {string} props.list.path - The path to navigate to when the breadcrumb is clicked.
- *
- * @returns {JSX.Element} The rendered Breadcrumbs component.
- */
-
-const Breadcrumbs = ({ list }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-
-	return (
-		<MUIBreadcrumbs
-			separator={<ArrowRight />}
-			aria-label="breadcrumb"
-			px={theme.spacing(2)}
-			py={theme.spacing(3.5)}
-			width="fit-content"
-			backgroundColor={theme.palette.secondary.main}
-			borderRadius={theme.shape.borderRadius}
-			lineHeight="18px"
-			sx={{
-				"& .MuiBreadcrumbs-li a": {
-					transition: "background-color 0.2s ease-in-out, color 0.2s ease-in-out",
-				},
-				"& .MuiBreadcrumbs-li:not(:last-of-type):hover a": {
-					backgroundColor: theme.palette.secondary.contrastText,
-					color: theme.palette.secondary.main,
-				},
-			}}
-		>
-			{list.map((item, index) => {
-				return (
-					<Box
-						component="a"
-						key={`${item.name}-${index}`}
-						px={theme.spacing(4)}
-						pt={theme.spacing(2)}
-						pb={theme.spacing(3)}
-						borderRadius={theme.shape.borderRadius}
-						onClick={() => navigate(item.path)}
-						sx={{
-							opacity: 0.8,
-							textTransform: "capitalize",
-							"&, &:hover": {
-								color: theme.palette.secondary.contrastText,
-							},
-						}}
-					>
-						{item.name}
-					</Box>
-				);
-			})}
-		</MUIBreadcrumbs>
-	);
-};
-
-Breadcrumbs.propTypes = {
-	list: PropTypes.arrayOf(
-		PropTypes.shape({
-			name: PropTypes.string.isRequired,
-			path: PropTypes.string.isRequired,
-		}).isRequired
-	).isRequired,
-};
-
-export default Breadcrumbs;

client/src/Components/v1/Buttons/RoundGradientButton.jsx

@@ -1,30 +0,0 @@
-import React from "react";
-import Button from "@mui/material/Button";
-import { styled } from "@mui/material/styles";
-
-const RoundGradientButton = styled(Button)(({ theme }) => ({
-	position: "relative",
-	border: "5px solid transparent",
-	backgroundClip: "padding-box",
-	borderRadius: 30,
-	fontSize: "1.2rem",
-	color: theme.palette.primary.contrastText,
-	backgroundColor: theme.palette.background.main,
-
-	"&:after": {
-		position: "absolute",
-		top: -3,
-		left: -3,
-		right: -3,
-		bottom: -3,
-		background:
-			theme.palette.mode === "dark"
-				? "linear-gradient(90deg, #842bd2, #ff5451, #8c52ff)"
-				: "linear-gradient(90deg, #842bd2, #ff5451, #8c52ff)",
-		content: '""',
-		zIndex: -1,
-		borderRadius: 30,
-	},
-}));
-
-export default RoundGradientButton;