feat: add HTTP basic authentication support for monitors (#3033)

## Changes
- Add basicAuthUser and basicAuthPassword fields to Monitor model, types, and validation (server + client)
- Update networkService to send Authorization: Basic header when credentials are provided
- Add basic auth form fields (username/password) to the create/edit monitor page for HTTP monitors
- Add i18n strings for the new basic authentication section

## Benefits
- Users can monitor endpoints protected by HTTP basic authentication
- Credentials are sent as standard Authorization: Basic base64-encoded header
- Basic auth is only used when bearer token (secret) is not configured

.gitattributes

@@ -1,2 +0,0 @@
-* text=auto
-* text eol=lf

.github/pull_request_template.md

@@ -11,18 +11,17 @@ Fixes #123
 ## Please ensure all items are checked off before requesting a review. "Checked off" means you need to add an "x" character between brackets so they turn into checkmarks.
 
 - [ ] (Do not skip this or your PR will be closed) I deployed the application locally.
-- [ ] (Do not skip this or your PR will be closed) I have performed a self-reviewing and testing of my code.
+- [ ] (Do not skip this or your PR will be closed) I have performed a self-review and testing of my code.
 - [ ] I have included the issue # in the PR.
 - [ ] I have added i18n support to visible strings (instead of `<div>Add</div>`, use): 
-
 ```Javascript
 const { t } = useTranslation();
 <div>{t('add')}</div>
 ```
-
 - [ ] I have **not** included any files that are not related to my pull request, including package-lock and package-json if dependencies have not changed
 - [ ] I didn't use any hardcoded values (otherwise it will not scale, and will make it difficult to maintain consistency across the application).
 - [ ] I made sure font sizes, color choices etc are all referenced from the theme. I don't have any hardcoded dimensions.
 - [ ] My PR is granular and targeted to one specific feature.
 - [ ] I ran `npm run format` in server and client directories, which automatically formats your code.
 - [ ] I took a screenshot or a video and attached to this PR if there is a UI change.
+

.github/workflows/check-tests.yml

@@ -1,23 +0,0 @@
-name: Test Check (Server)
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test-server:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Install server dependencies
-        working-directory: server
-        run: npm install
-
-      - name: Run server tests
-        working-directory: server
-        run: npm test

.github/workflows/poeditor-sync.yml

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

.github/workflows/production-deploy.yml

@@ -84,8 +84,7 @@ jobs:
           script: |
             cd checkmate
             git pull
-            cd docker/unified
+            cd docker/prod
             docker compose down
             docker compose pull
             docker compose up -d
-            docker system prune -af

.github/workflows/staging-deploy.yml

@@ -78,13 +78,13 @@ jobs:
       - name: SSH into server and restart container using Docker Compose
         uses: appleboy/ssh-action@v1.2.2
         with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
+          host: ${{ secrets.STAGING_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
+          username: ${{ secrets.STAGING_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          key: ${{ secrets.STAGING_SERVER_SSH_KEY }}
           script: |
             cd checkmate
             git pull
-            cd docker/unified
+            cd docker/staging
             docker compose down
             docker compose pull
             docker compose up -d

CLAUDE.md

@@ -105,56 +105,6 @@ client/src/
 - **Queue/Cache**: Redis + BullMQ + Pulse (cron scheduling)
 - **i18n**: i18next + react-i18next (translations via PoEditor)
 
----
-
-## Backend Architecture Patterns
-
-### Repository Pattern & Separation of Concerns
-
-The backend enforces a strict three-layer separation between HTTP handling, business logic, and data access:
-
-```
-Request → Controller → Service → Repository → MongoDB (Mongoose)
-```
-
-- **Controllers** (`/controllers`) handle HTTP concerns only: parsing request params, calling the appropriate service, and returning a response via the `responseHandler` middleware. They contain no business logic.
-- **Services** (`/service/business`) contain all business logic: deciding whether an incident should be created, whether a notification should fire, what state a monitor is in, etc.
-- **Repositories** (`/repositories`) are the sole layer that talks to MongoDB through Mongoose. They expose clean, reusable query methods (e.g. `findByMonitorId`, `createCheck`) so that services never construct raw DB queries directly.
-
-This separation makes each layer independently testable and keeps Mongoose-specific code out of business logic. When adding a new feature, the pattern to follow is: add a repository method for any new DB query, call it from a service, and expose it via a controller route.
-
-### Monitoring Flow: From Check to Notification
-
-Background monitoring runs on a scheduled queue, not on the HTTP request cycle. The high-level flow for uptime monitoring is:
-
-```
-Pulse (cron) → BullMQ Job → StatusService
-                                 ├── performs HTTP/port/ping check
-                                 ├── saves Check via CheckRepository
-                                 ├── evaluates monitor state change
-                                 │     └── calls IncidentService (create / resolve incident)
-                                 └── calls NotificationService (email, Slack, Discord, webhook)
-```
-
-1. **Pulse** (cron scheduler) enqueues a job into a **BullMQ** queue for each active monitor at its configured interval.
-2. A **BullMQ worker** picks up the job and calls `StatusService`, which performs the actual check (HTTP request, TCP port probe, ping, etc.).
-3. The result is persisted as a `Check` document via the repository layer.
-4. `StatusService` compares the new result against the monitor's previous state. If the monitor transitions from up → down (or down → up), it delegates to `IncidentService` to open or resolve an `Incident` document.
-5. On a state change, `NotificationService` reads the monitor's configured `Notification` documents and dispatches alerts to all enabled channels (email, Discord, Slack, webhooks).
-
-### Queue System (BullMQ + Redis)
-
-Redis serves two roles: job queue storage for BullMQ and ephemeral caching. BullMQ manages concurrency, retries, and backpressure for monitoring jobs, ensuring checks are processed reliably even under load.
-
-- Each monitor type (HTTP, port, ping, infrastructure) maps to its own queue worker so failures in one type don't block others.
-- Job scheduling interval is driven by the `interval` field on the `Monitor` model.
-- Failed jobs are retried with configurable backoff before being moved to a dead-letter state.
-- Redis is also used to cache frequently read data (e.g. aggregated stats) to reduce MongoDB query pressure.
-
-When working on anything related to check scheduling, incident lifecycle, or notifications, trace the flow starting from the relevant BullMQ worker rather than from the controller layer.
-
----
-
 ## Code Conventions
 
 ### Internationalization

CODE_OF_CONDUCT.md

@@ -2,7 +2,7 @@
 
 ## Our Pledge
 
-We as members, contributors, and leaders pledge to make participation in the **checkmate** project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in the **bluewave-uptime** project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
 
 We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community, especially during Hacktoberfest, where we encourage new contributors to join and feel supported.
 
@@ -66,4 +66,4 @@ This Code of Conduct is adapted from the [Contributor Covenant](https://www.cont
 
 ---
 
-By following this Code of Conduct, we can ensure a welcoming and inclusive environment, encouraging new contributors to engage with the project and the community. Thank you for helping make **checkmate** a positive space for all!
+By following this Code of Conduct, we can ensure a welcoming and inclusive environment, encouraging new contributors to engage with the project and the community. Thank you for helping make **bluewave-uptime** a positive space for all!

CONTRIBUTING.md

@@ -16,7 +16,7 @@ PS: **We work closely with contributors on our [Discord channel](https://discord
 Before you dive in, make sure you have these installed:
 
 ```bash
-# Check Node.js (v20+ required)
+# Check Node.js (v16+ required)
 node --version
 
 # Check npm
@@ -96,16 +96,10 @@ cd docker/dev
 
 Build the Docker images:
 
-Linux:
 ```bash
 ./build_images.sh
 ```
 
-Windows:
-```bash
-./build_images.bat
-```
-
 Run MongoDB container:
 
 ```bash

PULLREQUESTS.md

@@ -33,4 +33,4 @@ Ensure you execute `npm run format` before submitting your pull requests in both
 
 ### Keep PRs focused
 
-It may be tempting to address a bug you suddenly remembered or make some tiny adjustments in some component that bothers you, but don’t!  Keep all commits in your pull request fully focused on the specific feature you are working on.  Open up another PR if you want to fix a bug or work on another feature.
+It may be tempting to address a bug you suddenly remembered or make some tiny adjustments in some component that bothers you, but don’t!  Keep all commits in your pull request fully focused on the specific feature you are working on.  Open up another PR if you want to fix a big or work on another feature.

README.es.md

@@ -76,7 +76,7 @@ También puedes ver el consumo de memoria de MongoDB y Redis en el mismo servido
 Si tienes alguna pregunta, sugerencia o comentario, tienes varias opciones:
 
 - [Canal de Discord](https://discord.gg/NAb6H3UTjK)
-- [Discusiones en GitHub](https://github.com/bluewave-labs/checkmate/discussions)
+- [Discusiones en GitHub](https://github.com/bluewave-labs/bluewave-uptime/discussions)
 - [Grupo en Reddit](https://www.reddit.com/r/CheckmateMonitoring/)
 
 ¡No dudes en hacer preguntas o compartir tus ideas, nos encantaría saber de ti!

README.md

@@ -14,8 +14,6 @@
 
 <p align="center"><strong>An open source uptime and infrastructure monitoring application</strong></p>
 
-[![Run on PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=checkmate)
-
 <img width="1660" alt="image" src="https://github.com/user-attachments/assets/b748f36d-a271-4965-ad0a-18bf153bbee7" />
 
 This repository contains both the frontend and the backend of Checkmate, an open-source, self-hosted monitoring tool for tracking server hardware, uptime, response times, and incidents in real-time with beautiful visualizations. Checkmate regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
@@ -31,6 +29,7 @@ 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)  
@@ -43,23 +42,17 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 ## Demo
 
-You can see the latest build of [Checkmate](https://demo.checkmate.so/) in action. 
+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).
-
-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://checkmate.so/docs). 
+Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :)
-
-## Prerequisites
-- [Docker](https://www.docker.com/) installed
-- [Git](https://git-scm.com/) installed
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
+See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
 
-Alternatively, you can also use [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.
+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.
 
 ### Using a Custom CA
 
@@ -67,6 +60,11 @@ 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:
@@ -82,7 +80,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/Checkmate/discussions) (we check here from time to time)
+- [GitHub Discussions](https://github.com/bluewave-labs/bluewave-uptime/discussions) (we check here from time to time)
 
 Feel free to ask questions or share your ideas - we'd love to hear from you!
 
@@ -114,15 +112,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 
 If you would like to sponsor an additional feature, [see this page](https://checkmate.so/sponsored-features).
 
-## Monitor Lifecycle
-
-1. A monitor executes a check (HTTP / ping / port / hardware via Capture agent)
-2. The result is stored (success/failure + response time)
-3. Recent check results are evaluated against the monitor's configured status change threshold
-4. If the monitor's status change threshold is met and the current status is not equal to the previous status, the monitor's state changes (e.g. `initializing`, `up`, `down`, `breached`)
-5. Upon a state change: an incident is either created or resolved, depending on the monitor's current status
-6. Notifications are triggered based on configuration
-
 ## Screenshots
 
 <p>
@@ -168,20 +157,27 @@ Here's how you can contribute:
 
 0. Star this repo :)
 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag.
-2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview).
-3. Open an issue if you believe you've encountered a bug.
+3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-4. Check for good-first-issue's if you are a newcomer.
+4. Open an issue if you believe you've encountered a bug.
-5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+5. Check for good-first-issue's if you are a newcomer.
-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).
+6. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+7. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
 
 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
 </a>
 
-[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/Checkmate&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
 
 ## Our sponsors
 
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
 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/package-lock.json

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

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"private": true,
-	"version": "3.6.1",
+	"version": "0.0.0",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -13,7 +13,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "npm run format"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
@@ -52,7 +52,7 @@
 		"redux-persist": "6.0.0",
 		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
-		"zod": "^4.3.6"
+		"zod": "^4.1.11"
 	},
 	"devDependencies": {
 		"@types/node": "24.5.2",
@@ -66,6 +66,6 @@
 		"lint-staged": "^16.2.7",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "6.4.1"
+		"vite": "6.3.6"
 	}
 }

client/scripts/migrate-locales.ts

@@ -1,258 +0,0 @@
-/**
- * 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/Components/common/charts/HeatmapResponseTime.tsx

@@ -32,7 +32,7 @@ export const HeatmapResponseTime = ({
 
 	if (!checks || checks.length === 0) return null;
 
-	const latestChecks = checks.slice(-25);
+	const latestChecks = checks.slice(-25).reverse();
 
 	let data: Array<CheckSnapshot | PlaceholderCheck>;
 	if (latestChecks.length !== 25) {

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

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

client/src/Components/inputs/Slider.tsx

@@ -11,26 +11,20 @@ import type { ResponsiveStyleValue } from "@mui/system";
 interface SliderInputProps extends SliderProps {
 	sx?: SliderProps["sx"];
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 }
 
 export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
-	({ sx, showValue = false, formatDisplayValue, ...props }, ref) => {
+	({ sx, showValue = false, ...props }, ref) => {
 		const theme = useTheme();
 		const additionalSx = Array.isArray(sx) ? sx : sx ? [sx] : [];
 
-		const displayValue =
-			showValue && formatDisplayValue && typeof props.value === "number"
-				? formatDisplayValue(props.value)
-				: props.value;
-
 		return (
 			<Stack
 				gap={theme.spacing(8)}
 				direction={"row"}
 				alignItems={"center"}
 			>
-				{showValue && <Typography>{displayValue}</Typography>}
+				{showValue && <Typography>{props.value}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -69,21 +63,12 @@ interface SliderWithLabelProps extends SliderProps {
 	fieldLabel?: string;
 	required?: boolean;
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 	sliderMaxWidth?: ResponsiveStyleValue<number | string>;
 }
 
 export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>(
 	(
-		{
+		{ fieldLabel, required, showValue = true, value, sliderMaxWidth = "100%", ...props },
-			fieldLabel,
-			required,
-			showValue = true,
-			formatDisplayValue,
-			value,
-			sliderMaxWidth = "100%",
-			...props
-		},
 		ref
 	) => {
 		const theme = useTheme();
@@ -97,7 +82,6 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
-						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Components/layout/AppLayout.tsx

@@ -1,6 +1,9 @@
 import Box from "@mui/material/Box";
 import { useState, useEffect, useRef } from "react";
 import { useTheme } from "@mui/material/styles";
+import { useSelector } from "react-redux";
+import BackgroundSVG from "@/assets/Images/background.svg";
+import type { RootState } from "@/Types/state";
 import { OfflineBanner } from "@/Components/design-elements";
 import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";
 
@@ -10,6 +13,7 @@ interface AppLayoutProps {
 
 const AppLayout = ({ children }: AppLayoutProps) => {
 	const theme = useTheme();
+	const mode = useSelector((state: RootState) => state.ui.mode);
 	const [serverUnreachable, setServerUnreachable] = useState(false);
 	const retryIntervalRef = useRef<number | null>(null);
 
@@ -43,6 +47,10 @@ const AppLayout = ({ children }: AppLayoutProps) => {
 			sx={{
 				minHeight: "100vh",
 				backgroundColor: theme.palette.background.default,
+				backgroundImage: mode === "dark" ? `url("${BackgroundSVG}")` : "none",
+				backgroundSize: "100% 100%",
+				backgroundPosition: "center",
+				backgroundRepeat: "no-repeat",
 			}}
 		>
 			<OfflineBanner visible={serverUnreachable} />

client/src/Components/monitors/ControlsFilter.tsx

@@ -7,7 +7,7 @@ import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
+const types = ["http", "ping", "port", "docker", "game", "grpc"];
 const typeDisplayNames: Record<string, string> = {
 	http: "HTTP",
 	ping: "Ping",
@@ -15,7 +15,6 @@ const typeDisplayNames: Record<string, string> = {
 	docker: "Docker",
 	game: "Game",
 	grpc: "gRPC",
-	websocket: "WebSocket",
 };
 const statuses = ["up", "down"];
 const states = ["active", "paused"];

client/src/Components/monitors/MonitorStatBoxes.tsx

@@ -25,7 +25,10 @@ export const MonitorStatBoxes = ({
 	}
 
 	const timeOfLastFailure = monitorStats?.timeOfLastFailure || 0;
-	const timeSinceLastFailure = timeOfLastFailure > 0 ? Date.now() - timeOfLastFailure : 0;
+	const timeSinceLastFailure =
+		timeOfLastFailure > 0
+			? Date.now() - timeOfLastFailure
+			: Date.now() - new Date(monitorStats?.createdAt || 0).getTime();
 
 	// Determine time since last check
 	const timeOfLastCheck = monitorStats?.lastCheckTimestamp || 0;
@@ -39,12 +42,6 @@ export const MonitorStatBoxes = ({
 	const streakTime = prettyMilliseconds(timeSinceLastFailure, options);
 
 	const lastCheckTime = prettyMilliseconds(timeSinceLastCheck, options);
-	const isActive =
-		monitor?.status === "up" ||
-		monitor?.status === "paused" ||
-		monitor?.status === "maintenance" ||
-		monitor?.status === "initializing" ||
-		monitor?.status === "breached";
 	const palette = getStatusPalette(monitor?.status);
 
 	return (
@@ -54,12 +51,8 @@ export const MonitorStatBoxes = ({
 		>
 			<StatBox
 				palette={palette}
-				title={
+				title={t("pages.common.monitors.statBoxes.activeFor")}
-					isActive
+				subtitle={streakTime}
-						? t("pages.common.monitors.statBoxes.activeFor")
-						: t("pages.common.monitors.statBoxes.serviceIsDown")
-				}
-				subtitle={isActive ? streakTime : ""}
 			/>
 			<StatBox
 				title={t("pages.common.monitors.statBoxes.lastCheck")}

client/src/Hooks/useMonitorForm.ts

@@ -40,6 +40,8 @@ export const useMonitorForm = ({
 					matchMethod: data?.matchMethod || "",
 					expectedValue: data?.expectedValue || "",
 					jsonPath: data?.jsonPath || "",
+					basicAuthUser: data?.basicAuthUser || "",
+					basicAuthPassword: data?.basicAuthPassword || "",
 				};
 				break;
 			case "ping":
@@ -103,14 +105,6 @@ export const useMonitorForm = ({
 					selectedDisks: data?.selectedDisks || [],
 				};
 				break;
-			case "websocket":
-				defaults = {
-					...base,
-					type: "websocket",
-					url: data?.url || "",
-					ignoreTlsErrors: data?.ignoreTlsErrors || false,
-				};
-				break;
 			default:
 				defaults = {
 					...base,
@@ -121,6 +115,8 @@ export const useMonitorForm = ({
 					matchMethod: "",
 					expectedValue: "",
 					jsonPath: "",
+					basicAuthUser: "",
+					basicAuthPassword: "",
 				};
 		}
 

client/src/Hooks/useNotificationForm.ts

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

client/src/Hooks/useSettingsForm.ts

@@ -1,14 +1,14 @@
 import { useMemo } from "react";
 import { settingsSchema } from "@/Validation/settings";
 import type { Settings } from "@/Types/Settings";
-import type { SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 
 interface UseSettingsFormOptions {
 	data?: Settings | null;
 }
 export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults: SettingsFormInput = {
+		const defaults: SettingsFormData = {
 			systemEmailIgnoreTLS: data?.systemEmailIgnoreTLS ?? false,
 			systemEmailRequireTLS: data?.systemEmailRequireTLS ?? false,
 			systemEmailRejectUnauthorized: data?.systemEmailRejectUnauthorized ?? true,

client/src/Hooks/useStatusPageForm.ts

@@ -27,14 +27,12 @@ export const useStatusPageForm = ({
 			companyName: data?.companyName || "",
 			url: data?.url || generateDefaultUrl(),
 			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
-			type: data?.type || ["uptime"],
 			color: data?.color || "#4169E1",
 			monitors: data?.monitors || [],
 			isPublished: data?.isPublished ?? false,
 			showCharts: data?.showCharts ?? true,
 			showUptimePercentage: data?.showUptimePercentage ?? true,
 			showAdminLoginLink: data?.showAdminLoginLink ?? false,
-			showInfrastructure: data?.showInfrastructure ?? false,
 			customCSS: data?.customCSS || "",
 			logo: transformLogo(data?.logo),
 		};

client/src/Pages/Account/EditUser/index.tsx

@@ -11,17 +11,12 @@ import { ConfigBox, BasePage } from "@/Components/design-elements";
 import { UserRoles } from "@/Types/User";
 import { useTranslation } from "react-i18next";
 import type { UserRole, User } from "@/Types/User";
-import { useParams, useNavigate } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { useTheme } from "@mui/material";
 import { useEditUserForm } from "@/Hooks/useEditUserForm";
-import { useGet, usePatch, useDelete } from "@/Hooks/UseApi";
+import { useGet, usePatch } from "@/Hooks/UseApi";
 import type { EditUserFormData } from "@/Validation/editUser";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
-import { DialogInput } from "@/Components/inputs/Dialog";
-import { useSelector } from "react-redux";
-import type { RootState } from "@/Types/state";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { useIsAdmin, useIsSuperAdmin } from "@/Hooks/useIsAdmin";
 
 interface RoleOption {
 	id: UserRole;
@@ -34,12 +29,6 @@ const EditUserPage = () => {
 	const { userId } = useParams<{ userId: string }>();
 	const { resolver, defaults } = useEditUserForm();
 	const { patch, loading: isSaving } = usePatch();
-	const { deleteFn, loading: isDeleting } = useDelete();
-	const navigate = useNavigate();
-	const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-	const currentUser = useSelector((state: RootState) => state.auth.user);
-	const isSuperAdmin = useIsSuperAdmin();
-	const isAdmin = useIsAdmin();
 
 	const { data: user, isLoading } = useGet<User>(`/auth/users/${userId}`);
 
@@ -71,20 +60,6 @@ const EditUserPage = () => {
 		setValue("role", newRoles, { shouldValidate: true });
 	};
 
-	const canDeleteUser =
-		isAdmin &&
-		userId !== currentUser?.id &&
-		!user?.role?.includes("demo") &&
-		(isSuperAdmin || user?.role?.every((r) => r !== "admin" && r !== "superadmin"));
-
-	const handleDeleteUser = async () => {
-		const result = await deleteFn(`/auth/users/${userId}`);
-		setShowDeleteDialog(false);
-		if (result) {
-			navigate("/account", { state: { tab: "team" } });
-		}
-	};
-
 	const onSubmit = async (data: EditUserFormData) => {
 		await patch(`/auth/users/${userId}`, data);
 	};
@@ -190,45 +165,17 @@ const EditUserPage = () => {
 							</Stack>
 						}
 					/>
-					<Stack
-						gap={LAYOUT.XS}
-						direction="row"
-						justifyContent={"flex-end"}
-						width="100%"
-					>
-						{canDeleteUser && (
-							<Button
-								variant="contained"
-								color="error"
-								onClick={() => setShowDeleteDialog(true)}
-								sx={{ minWidth: 100 }}
-							>
-								{t("common.buttons.removeUser")}
-							</Button>
-						)}
 					<Button
 						type="submit"
 						variant="contained"
 						color="primary"
 						loading={isSaving}
-							sx={{ minWidth: 100 }}
+						sx={{ alignSelf: "flex-end", minWidth: 100 }}
 					>
 						{t("common.buttons.save")}
 					</Button>
 				</Stack>
-				</Stack>
 			</form>
-			<DialogInput
-				open={showDeleteDialog}
-				title={t("pages.editUser.dialog.removeUser.title")}
-				content={t("pages.editUser.dialog.removeUser.content", {
-					name: `${user?.firstName} ${user?.lastName}`,
-				})}
-				onCancel={() => setShowDeleteDialog(false)}
-				onConfirm={handleDeleteUser}
-				confirmText={t("common.buttons.removeUser")}
-				loading={isDeleting}
-			/>
 		</BasePage>
 	);
 };

client/src/Pages/Account/components/AddTeamMemberDialog.tsx

@@ -43,7 +43,6 @@ export const AddTeamMemberDialog = ({
 	const roleOptions: { value: UserRole; label: string }[] = [
 		{ value: "admin", label: t("common.auth.roles.admin") },
 		{ value: "user", label: t("common.auth.roles.user") },
-		{ value: "demo", label: t("common.auth.roles.demo") },
 	];
 
 	const handleClose = () => {

client/src/Pages/Account/components/InviteTeamMemberDialog.tsx

@@ -48,7 +48,6 @@ export const InviteTeamMemberDialog = ({
 	const roleOptions: { value: UserRole; label: string }[] = [
 		{ value: "admin", label: t("common.auth.roles.admin") },
 		{ value: "user", label: t("common.auth.roles.user") },
-		{ value: "demo", label: t("common.auth.roles.demo") },
 	];
 
 	const handleGenerateToken = async (data: InviteFormData) => {

client/src/Pages/Account/components/TeamTable.tsx

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { Table } from "@/Components/design-elements";
 import type { Header } from "@/Components/design-elements/Table";
-import { useIsAdmin } from "@/Hooks/useIsAdmin";
+import { useIsSuperAdmin } from "@/Hooks/useIsAdmin";
 import type { User } from "@/Types/User";
 
 interface TeamTableProps {
@@ -13,7 +13,7 @@ interface TeamTableProps {
 export const TeamTable = ({ users }: TeamTableProps) => {
 	const { t } = useTranslation();
 	const navigate = useNavigate();
-	const isAdmin = useIsAdmin();
+	const isSuperAdmin = useIsSuperAdmin();
 
 	const headers: Header<User>[] = [
 		{
@@ -45,7 +45,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 	];
 
 	const handleRowClick = (row: User) => {
-		if (isAdmin) {
+		if (isSuperAdmin) {
 			navigate(`/account/team/${row.id}`);
 		}
 	};
@@ -54,7 +54,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 		<Table
 			headers={headers}
 			data={users}
-			onRowClick={isAdmin ? handleRowClick : undefined}
+			onRowClick={isSuperAdmin ? handleRowClick : undefined}
 		/>
 	);
 };

client/src/Pages/Auth/Login/index.tsx

@@ -1,7 +1,6 @@
 import { BaseAuthPage, TextLink } from "@/Components/design-elements";
 import { Button, TextField } from "@/Components/inputs";
 
-import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
@@ -10,7 +9,7 @@ import type { LoginFormData } from "@/Validation/login";
 import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { setAuthState } from "@/Features/Auth/authSlice";
-import { useLazyGet, usePost } from "@/Hooks/UseApi";
+import { usePost } from "@/Hooks/UseApi";
 
 const LoginPage = () => {
 	const { t } = useTranslation();
@@ -18,17 +17,6 @@ const LoginPage = () => {
 	const navigate = useNavigate();
 	const { post, loading } = usePost();
 
-	const [isCheckingAdmin, setIsCheckingAdmin] = useState(true);
-	const { get } = useLazyGet<boolean>();
-
-	useEffect(() => {
-		get("/auth/users/superadmin").then((res) => {
-			if (res?.data === false) navigate("/register", { replace: true });
-			else setIsCheckingAdmin(false);
-		});
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
-
 	const { schema, defaults } = useLoginForm();
 
 	const { control, handleSubmit } = useForm<LoginFormData>({
@@ -36,8 +24,6 @@ const LoginPage = () => {
 		defaultValues: defaults,
 	});
 
-	if (isCheckingAdmin) return null;
-
 	const onSubmit = async (data: LoginFormData) => {
 		if (loading) return;
 
@@ -96,6 +82,12 @@ const LoginPage = () => {
 				linkText={t("pages.auth.login.links.forgotPassword.linkText")}
 				href="/forgot-password"
 			/>
+			<TextLink
+				alignSelf={"center"}
+				text={t("pages.auth.login.links.register.text")}
+				linkText={t("pages.auth.login.links.register.linkText")}
+				href="/register"
+			/>
 		</BaseAuthPage>
 	);
 };

client/src/Pages/Auth/Register/index.tsx

@@ -1,17 +1,16 @@
 import { BaseAuthPage } from "@/Components/design-elements";
 import { Button, TextField } from "@/Components/inputs";
-import Alert from "@mui/material/Alert";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
 import { useRegisterForm } from "@/Hooks/useRegisterForm";
 import type { RegisterFormData } from "@/Validation/register";
 import { useTranslation } from "react-i18next";
-import { useLazyGet, usePost } from "@/Hooks/UseApi";
+import { usePost, useGet } from "@/Hooks/UseApi";
 import { setAuthState } from "@/Features/Auth/authSlice";
 import { useDispatch } from "react-redux";
 import { useNavigate, useParams } from "react-router-dom";
 import type { AuthResponse } from "@/Types/User";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } from "react";
 
 interface RegisterPayload {
 	user: Omit<RegisterFormData, "confirm">;
@@ -33,23 +32,21 @@ const RegisterPage = () => {
 	const { post: verifyToken } = usePost<{ token: string }, InviteVerifyResponse>();
 	const hasVerified = useRef(false);
 
-	const [isCheckingAdmin, setIsCheckingAdmin] = useState(!token);
+	const { data: superAdminExists, isLoading: isCheckingAdmin } = useGet<boolean>(
-	const { get } = useLazyGet<boolean>();
+		token ? null : "/auth/users/superadmin"
-
+	);
-	useEffect(() => {
-		if (token) return;
-		get("/auth/users/superadmin").then((res) => {
-			if (res?.data === true) navigate("/login", { replace: true });
-			else setIsCheckingAdmin(false);
-		});
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
 
 	const { control, handleSubmit, setError, reset } = useForm<RegisterFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 	});
 
+	useEffect(() => {
+		if (superAdminExists === true) {
+			navigate("/login", { replace: true });
+		}
+	}, [superAdminExists, navigate]);
+
 	useEffect(() => {
 		if (!token || hasVerified.current) return;
 		hasVerified.current = true;
@@ -95,7 +92,6 @@ const RegisterPage = () => {
 			title={t("pages.auth.register.title")}
 			subtitle={t("pages.auth.register.subtitle")}
 		>
-			{!token && <Alert severity="info">{t("pages.auth.register.setupNotice")}</Alert>}
 			<Controller
 				name="firstName"
 				control={control}

client/src/Pages/CreateMonitor/index.tsx

@@ -32,12 +32,7 @@ import {
 import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { useGet, usePost, usePatch, useDelete } from "@/Hooks/UseApi";
 import { useMonitorForm } from "@/Hooks/useMonitorForm";
-import {
+import type { Monitor, MonitorType, GamesMap } from "@/Types/Monitor";
-	type Monitor,
-	type MonitorType,
-	type GamesMap,
-	supportsGeoCheck,
-} from "@/Types/Monitor";
 import type { Notification } from "@/Types/Notification";
 import type { MonitorFormData } from "@/Validation/monitor";
 
@@ -146,17 +141,6 @@ const getGeneralSettingsConfig = (
 			showGrpcServiceName: false,
 			showIgnoreTls: false,
 		},
-		websocket: {
-			urlLabel: t("pages.createMonitor.form.general.option.wsUrl.label"),
-			urlPlaceholder: t("pages.createMonitor.form.general.option.wsUrl.placeholder"),
-			namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
-			showUrl: true,
-			showPort: false,
-			showGameSelect: false,
-			showSecret: false,
-			showGrpcServiceName: false,
-			showIgnoreTls: true,
-		},
 	};
 	return configs[type] || configs.http;
 };
@@ -302,53 +286,46 @@ const CreateMonitorPage = () => {
 									>
 										<RadioWithDescription
 											value="http"
-											label={t("pages.common.monitors.monitorTypes.optionHttp")}
+											label={t("pages.createMonitor.form.type.optionHttp")}
 											description={t(
 												"pages.createMonitor.form.type.optionHttpDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="ping"
-											label={t("pages.common.monitors.monitorTypes.optionPing")}
+											label={t("pages.createMonitor.form.type.optionPing")}
 											description={t(
 												"pages.createMonitor.form.type.optionPingDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="docker"
-											label={t("pages.common.monitors.monitorTypes.optionDocker")}
+											label={t("pages.createMonitor.form.type.optionDocker")}
 											description={t(
 												"pages.createMonitor.form.type.optionDockerDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="port"
-											label={t("pages.common.monitors.monitorTypes.optionPort")}
+											label={t("pages.createMonitor.form.type.optionPort")}
 											description={t(
 												"pages.createMonitor.form.type.optionPortDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="game"
-											label={t("pages.common.monitors.monitorTypes.optionGame")}
+											label={t("pages.createMonitor.form.type.optionGame")}
 											description={t(
 												"pages.createMonitor.form.type.optionGameDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="grpc"
-											label={t("pages.common.monitors.monitorTypes.optionGrpc")}
+											label={t("pages.createMonitor.form.type.optionGrpc")}
 											description={t(
 												"pages.createMonitor.form.type.optionGrpcDescription"
 											)}
 										/>
-										<RadioWithDescription
-											value="websocket"
-											label={t("pages.common.monitors.monitorTypes.optionWebSocket")}
-											description={t(
-												"pages.createMonitor.form.type.optionWebSocketDescription"
-											)}
-										/>
 									</RadioGroup>
 								</FormControl>
 							)}
@@ -765,9 +742,7 @@ const CreateMonitorPage = () => {
 				}
 			/>
 
-			{(watchedType === "http" ||
+			{(watchedType === "http" || watchedType === "grpc") && (
-				watchedType === "grpc" ||
-				watchedType === "websocket") && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.ignoreTls.title")}
 					subtitle={t("pages.createMonitor.form.ignoreTls.description")}
@@ -795,6 +770,50 @@ const CreateMonitorPage = () => {
 				/>
 			)}
 
+			{watchedType === "http" && (
+				<ConfigBox
+					title={t("pages.createMonitor.form.basicAuth.title")}
+					subtitle={t("pages.createMonitor.form.basicAuth.description")}
+					rightContent={
+						<Stack spacing={theme.spacing(LAYOUT.MD)}>
+							<Controller
+								name="basicAuthUser"
+								control={control}
+								render={({ field, fieldState }) => (
+									<TextField
+										{...field}
+										value={field.value ?? ""}
+										fieldLabel={t(
+											"pages.createMonitor.form.basicAuth.option.username.label"
+										)}
+										fullWidth
+										error={!!fieldState.error}
+										helperText={fieldState.error?.message ?? ""}
+									/>
+								)}
+							/>
+							<Controller
+								name="basicAuthPassword"
+								control={control}
+								render={({ field, fieldState }) => (
+									<TextField
+										{...field}
+										value={field.value ?? ""}
+										type="password"
+										fieldLabel={t(
+											"pages.createMonitor.form.basicAuth.option.password.label"
+										)}
+										fullWidth
+										error={!!fieldState.error}
+										helperText={fieldState.error?.message ?? ""}
+									/>
+								)}
+							/>
+						</Stack>
+					}
+				/>
+			)}
+
 			{watchedType === "http" && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.advanced.title")}
@@ -910,7 +929,7 @@ const CreateMonitorPage = () => {
 				/>
 			)}
 
-			{supportsGeoCheck(watchedType) && (
+			{watchedType === "http" && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.geoChecks.title")}
 					subtitle={t("pages.createMonitor.form.geoChecks.description")}

client/src/Pages/Notifications/create/index.tsx

@@ -147,10 +147,7 @@ const NotificationsCreatePage = () => {
 					/>
 				}
 			/>
-			{watchedType !== "matrix" &&
+			{watchedType !== "matrix" && (
-				watchedType !== "telegram" &&
-				watchedType !== "pushover" &&
-				watchedType !== "twilio" && (
 				<ConfigBox
 					title={addressConfig.title}
 					subtitle={addressConfig.description}
@@ -158,7 +155,7 @@ const NotificationsCreatePage = () => {
 						<Controller
 							name="address"
 							control={control}
-								defaultValue={"address" in defaults ? defaults.address : ""}
+							defaultValue={defaults.address}
 							render={({ field, fieldState }) => (
 								<TextField
 									{...field}
@@ -174,177 +171,6 @@ const NotificationsCreatePage = () => {
 					}
 				/>
 			)}
-			{watchedType === "telegram" && (
-				<ConfigBox
-					title={t("pages.notifications.form.telegram.title")}
-					subtitle={t("pages.notifications.form.telegram.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionBotToken")}
-										placeholder={t(
-											"pages.notifications.form.telegram.placeholderBotToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="address"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionChatId")}
-										placeholder={t("pages.notifications.form.telegram.placeholderChatId")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{watchedType === "pushover" && (
-				<ConfigBox
-					title={t("pages.notifications.form.pushover.title")}
-					subtitle={t("pages.notifications.form.pushover.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.pushover.optionAppToken")}
-										placeholder={t(
-											"pages.notifications.form.pushover.placeholderAppToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="address"
-								control={control}
-								defaultValue={"address" in defaults ? defaults.address : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.pushover.optionUserKey")}
-										placeholder={t(
-											"pages.notifications.form.pushover.placeholderUserKey"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{watchedType === "twilio" && (
-				<ConfigBox
-					title={t("pages.notifications.form.twilio.title")}
-					subtitle={t("pages.notifications.form.twilio.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accountSid"
-								control={control}
-								defaultValue={"accountSid" in defaults ? defaults.accountSid : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionAccountSid")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderAccountSid"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionAuthToken")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderAuthToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="twilioPhoneNumber"
-								control={control}
-								defaultValue={
-									"twilioPhoneNumber" in defaults ? defaults.twilioPhoneNumber : ""
-								}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionFromNumber")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderFromNumber"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="phone"
-								control={control}
-								defaultValue={"phone" in defaults ? defaults.phone : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionToNumber")}
-										placeholder={t("pages.notifications.form.twilio.placeholderToNumber")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
 			{watchedType === "matrix" && (
 				<ConfigBox
 					title={t("pages.notifications.form.matrix.title")}
@@ -354,7 +180,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="homeserverUrl"
 								control={control}
-								defaultValue={"homeserverUrl" in defaults ? defaults.homeserverUrl : ""}
+								defaultValue={defaults.homeserverUrl}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -370,7 +196,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="roomId"
 								control={control}
-								defaultValue={"roomId" in defaults ? defaults.roomId : ""}
+								defaultValue={defaults.roomId}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -386,7 +212,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="accessToken"
 								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
+								defaultValue={defaults.accessToken}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}

client/src/Pages/Settings/index.tsx

@@ -20,7 +20,7 @@ import { useGet, usePatch, usePost, useLazyGet } from "@/Hooks/UseApi";
 import { useToast } from "@/Hooks/UseToast";
 import { useSettingsForm } from "@/Hooks/useSettingsForm";
 import { useIsAdmin } from "@/Hooks/useIsAdmin.js";
-import type { SettingsFormData, SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 import { useState } from "react";
 import { Controller } from "react-hook-form";
 import { TextField, Button, FieldLabel, SliderWithLabel } from "@/Components/inputs";
@@ -37,7 +37,6 @@ import {
 } from "@/Features/UI/uiSlice.js";
 import timezones from "@/Utils/timezones.json";
 import type { RootState } from "@/Types/state";
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 
 interface Timezone {
 	id: string;
@@ -89,7 +88,7 @@ export const SettingsPage = () => {
 	// Initialize form with schema and defaults
 	const { schema, defaults } = useSettingsForm({ data: fetchedSettings?.settings });
 
-	const form = useForm<SettingsFormInput, unknown, SettingsFormData>({
+	const form = useForm<SettingsFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 		mode: "onChange",
@@ -256,7 +255,28 @@ export const SettingsPage = () => {
 			delete (dataToSend as any).systemEmailPassword;
 		}
 
-		const result = await patch("/settings", dataToSend as SettingsFormData);
+		// Convert undefined to empty string for backend unsetting
+		const processedData = Object.entries(dataToSend).reduce((acc, [key, value]) => {
+			const typedKey = key as keyof SettingsFormData;
+			if (value === undefined) {
+				(acc as any)[typedKey] = "";
+			} else if (typeof value === "object" && value !== null) {
+				// Handle nested objects like globalThresholds
+				// Convert 0 to "" for unsetting thresholds
+				(acc as any)[typedKey] = Object.entries(value).reduce(
+					(nested, [nestedKey, nestedValue]) => ({
+						...nested,
+						[nestedKey]: nestedValue === undefined ? "" : nestedValue,
+					}),
+					{}
+				);
+			} else {
+				(acc as any)[typedKey] = value;
+			}
+			return acc;
+		}, {} as Partial<SettingsFormData>);
+
+		const result = await patch("/settings", processedData as SettingsFormData);
 
 		if (result?.success) {
 			// Update API key state from response
@@ -442,43 +462,6 @@ export const SettingsPage = () => {
 					/>
 				)}
 
-				{/* Check Retention */}
-				{isAdmin && (
-					<ConfigBox
-						title={t("pages.settings.form.retention.title")}
-						subtitle={t("pages.settings.form.retention.description")}
-						rightContent={
-							<Controller
-								name="checkTTL"
-								control={form.control}
-								defaultValue={defaults.checkTTL}
-								render={({ field }) => (
-									<SliderWithLabel
-										{...field}
-										fieldLabel={t("pages.settings.form.retention.option.days.label")}
-										min={1}
-										max={CHECK_TTL_SENTINEL}
-										sliderMaxWidth={{ xs: "100%", md: "50%" }}
-										value={field.value || 30}
-										onChange={(_, value) => field.onChange(value)}
-										valueLabelDisplay="auto"
-										valueLabelFormat={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-										formatDisplayValue={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-									/>
-								)}
-							/>
-						}
-					/>
-				)}
-
 				{/* Global Thresholds */}
 				{isAdmin && (
 					<ConfigBox

client/src/Pages/StatusPage/Create/index.tsx

@@ -21,28 +21,19 @@ import {
 
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useStatusPageForm } from "@/Hooks/useStatusPageForm";
 import type { StatusPageFormData } from "@/Validation/statusPage";
 import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
-import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
+import type { StatusPageResponse } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
 import axios from "axios";
 import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
 
-const monitorsUrl = (() => {
-	const params = new URLSearchParams();
-	["http", "ping", "port", "docker", "game", "grpc", "websocket", "hardware"].forEach(
-		(type) => params.append("type", type)
-	);
-	return `/monitors/team?${params.toString()}`;
-})();
-
 interface TimezoneOption {
 	_id: string;
 	name: string;
@@ -58,11 +49,11 @@ const CreateStatusPage = () => {
 
 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(
+		useGet<StatusPageResponse>(isCreate ? null : `/status-page/${url}?type=uptime`);
-			isCreate ? null : `/status-page/${url}?type=uptime&type=infrastructure`
-		);
 
-	const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
+	const { data: monitorsResponse } = useGet<Monitor[]>(
+		"/monitors/team?type=http&type=ping&type=port&type=docker"
+	);
 	const monitors = monitorsResponse ?? [];
 
 	const { post, loading: isSubmittingPost } = usePost();
@@ -90,24 +81,6 @@ const CreateStatusPage = () => {
 		reset(defaults);
 	}, [defaults, reset]);
 
-	const watchedMonitorIds: string[] = form.watch("monitors") ?? [];
-	const computedTypes: MonitorDisplayType[] = useMemo(() => {
-		const selectedMonitors = (watchedMonitorIds ?? [])
-			.map((id) => monitors.find((m) => m.id === id))
-			.filter((m): m is Monitor => m !== undefined);
-
-		const typesSet = new Set<MonitorDisplayType>();
-		selectedMonitors.forEach((m) => {
-			typesSet.add(m.type === "hardware" ? "infrastructure" : "uptime");
-		});
-
-		return typesSet.size ? Array.from(typesSet) : ["uptime"];
-	}, [watchedMonitorIds, monitors]);
-
-	useEffect(() => {
-		form.setValue("type", computedTypes);
-	}, [computedTypes]);
-
 	const onError = (errors: any) => {
 		logger.debug("Status page validation errors", errors);
 	};
@@ -130,6 +103,7 @@ const CreateStatusPage = () => {
 
 	const onSubmit = async (data: StatusPageFormData) => {
 		const fd = new FormData();
+		fd.append("type", "uptime");
 		fd.append("isPublished", String(data.isPublished));
 		if (data.companyName) fd.append("companyName", data.companyName);
 		if (data.url) fd.append("url", data.url);
@@ -138,16 +112,11 @@ const CreateStatusPage = () => {
 		fd.append("showCharts", String(data.showCharts));
 		fd.append("showUptimePercentage", String(data.showUptimePercentage));
 		fd.append("showAdminLoginLink", String(data.showAdminLoginLink));
-		fd.append("showInfrastructure", String(data.showInfrastructure));
 
 		data.monitors.forEach((monitorId) => {
 			fd.append("monitors[]", monitorId);
 		});
 
-		data.type.forEach((type) => {
-			fd.append("type[]", type);
-		});
-
 		// Handle logo upload
 		if (data.logo === null) {
 			// Signal to remove the logo
@@ -334,9 +303,7 @@ const CreateStatusPage = () => {
 																		}}
 																	>
 																		<GripVertical size={20} />
-																		<Typography
+																		<Typography flexGrow={1}>{monitor.name}</Typography>
-																			flexGrow={1}
-																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
 																		<IconButton
 																			size="small"
 																			onClick={() => {
@@ -458,23 +425,6 @@ const CreateStatusPage = () => {
 								/>
 							)}
 						/>
-						<Controller
-							name="showInfrastructure"
-							control={control}
-							render={({ field }) => (
-								<FormControlLabel
-									control={
-										<Checkbox
-											checked={field.value}
-											onChange={field.onChange}
-										/>
-									}
-									label={t(
-										"pages.statusPages.form.features.option.showInfrastructure.label"
-									)}
-								/>
-							)}
-						/>
 						{/* <Controller
 							name="showUptimePercentage"
 							control={control}

client/src/Pages/StatusPage/Status/Components/InfrastructureMetrics.tsx

@@ -1,246 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { Gauge } from "@/Components/design-elements";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import type { Monitor } from "@/Types/Monitor";
-import Grid from "@mui/material/Grid";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import Box from "@mui/material/Box";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-
-const GAUGE_RADIUS = 60;
-const GAUGE_STROKE_WIDTH = 12;
-const PERCENTAGE_MULTIPLIER = 100;
-
-interface StatusPageMonitor extends Monitor {
-	checks?: Monitor["recentChecks"];
-}
-
-interface MetricDetail {
-	label: string;
-	value: string;
-}
-
-interface MetricConfig {
-	key: string;
-	label: string;
-	hasData: boolean;
-	progress: number;
-	details: MetricDetail[];
-}
-
-const MetricDetailRow = ({ label, value }: MetricDetail) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{label}
-			</Typography>
-			<Typography variant="body2">{value}</Typography>
-		</Stack>
-	);
-};
-
-interface MetricItemProps {
-	label: string;
-	progress: number;
-	details?: MetricDetail[];
-}
-
-const MetricItem = ({ label, progress, details }: MetricItemProps) => {
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	return (
-		<Grid
-			size={isSmall ? 12 : 4}
-			sx={{
-				display: "flex",
-				flexDirection: "column",
-				alignItems: "center",
-				textAlign: "center",
-				gap: theme.spacing(SPACING.LG),
-				padding: theme.spacing(LAYOUT.XS),
-				borderRight: isSmall ? "none" : `1px solid ${theme.palette.divider}`,
-				borderBottom: isSmall ? `1px solid ${theme.palette.divider}` : "none",
-				"&:last-child": {
-					borderRight: "none",
-					borderBottom: "none",
-					paddingBottom: theme.spacing(SPACING.LG),
-				},
-			}}
-		>
-			<Box
-				display="flex"
-				flexDirection="column"
-				alignItems="center"
-			>
-				<Gauge
-					progress={progress}
-					radius={GAUGE_RADIUS}
-					strokeWidth={GAUGE_STROKE_WIDTH}
-				/>
-				<Typography variant="body2">{label}</Typography>
-			</Box>
-			{details && details.length > 0 && (
-				<Box
-					width="100%"
-					paddingX={theme.spacing(LAYOUT.LG)}
-				>
-					{details.map((detail) => (
-						<MetricDetailRow
-							key={detail.label}
-							label={detail.label}
-							value={detail.value}
-						/>
-					))}
-				</Box>
-			)}
-		</Grid>
-	);
-};
-
-type LatestCheck = NonNullable<Monitor["recentChecks"]>[number];
-
-const buildCpuMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.cpu || typeof check.cpu.usage_percent !== "number") {
-		return null;
-	}
-	const usagePercent = (check.cpu.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER;
-	return {
-		key: "cpu",
-		label: t("pages.statusPages.monitorsList.infrastructure.cpu"),
-		hasData: true,
-		progress: usagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.usage"),
-				value: `${usagePercent.toFixed(2)}%`,
-			},
-		],
-	};
-};
-
-const buildMemoryMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (
-		!check.memory ||
-		typeof check.memory.usage_percent !== "number" ||
-		typeof check.memory.used_bytes !== "number" ||
-		typeof check.memory.total_bytes !== "number"
-	) {
-		return null;
-	}
-	return {
-		key: "memory",
-		label: t("pages.statusPages.monitorsList.infrastructure.memory"),
-		hasData: true,
-		progress: (check.memory.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(check.memory.used_bytes ?? 0),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(check.memory.total_bytes ?? 0),
-			},
-		],
-	};
-};
-
-const buildDiskMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.disk || check.disk.length === 0) {
-		return null;
-	}
-	const disks = check.disk;
-	const avgUsagePercent =
-		(disks.reduce((acc, disk) => acc + (disk?.usage_percent ?? 0), 0) / disks.length) *
-		PERCENTAGE_MULTIPLIER;
-	const totalUsedBytes = disks.reduce((acc, disk) => acc + (disk?.used_bytes ?? 0), 0);
-	const totalTotalBytes = disks.reduce((acc, disk) => acc + (disk?.total_bytes ?? 0), 0);
-
-	return {
-		key: "disk",
-		label: t("pages.statusPages.monitorsList.infrastructure.disk"),
-		hasData: true,
-		progress: avgUsagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(totalUsedBytes),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(totalTotalBytes),
-			},
-		],
-	};
-};
-
-export const InfrastructureMetrics = ({ monitor }: { monitor: StatusPageMonitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const latestCheck = monitor.recentChecks?.[0] ?? monitor.checks?.[0];
-
-	if (!latestCheck) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	const metrics: MetricConfig[] = [
-		buildCpuMetric(latestCheck, t),
-		buildMemoryMetric(latestCheck, t),
-		buildDiskMetric(latestCheck, t),
-	].filter((m): m is MetricConfig => m !== null);
-
-	if (metrics.length === 0) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	return (
-		<Grid
-			container
-			alignItems="center"
-			padding={theme.spacing(LAYOUT.XS)}
-		>
-			{metrics.map(({ key, label, progress, details }) => (
-				<MetricItem
-					key={key}
-					label={label}
-					progress={progress}
-					details={details}
-				/>
-			))}
-		</Grid>
-	);
-};

client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx

@@ -5,16 +5,13 @@ import Typography from "@mui/material/Typography";
 import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/common";
 import { StatusLabel, BaseBox } from "@/Components/design-elements";
 import { SwitchComponent } from "@/Components/inputs";
-import { InfrastructureMetrics } from "@/Pages/StatusPage/Status/Components/InfrastructureMetrics";
 
-import { useTheme, type Theme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { useState } from "react";
 import type { Monitor } from "@/Types/Monitor";
 import type { StatusPage } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import type { RootState } from "@/Types/state";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 
 interface StatusPageMonitor extends Monitor {
 	checks?: Monitor["recentChecks"];
@@ -25,124 +22,29 @@ interface MonitorsListProps {
 	monitors: StatusPageMonitor[];
 }
 
-const getMonitorBadgeStyles = (monitorType: string, theme: Theme) => {
-	const bg =
-		monitorType === "hardware" ? theme.palette.info.light : theme.palette.success.light;
-	return {
-		backgroundColor: bg,
-		color: theme.palette.background.paper,
-		padding: `${theme.spacing(SPACING.SM)} ${theme.spacing(SPACING.LG)}`,
-		borderRadius: theme.shape.borderRadius,
-	};
-};
-
-const MonitorHeader = ({
-	monitor,
-	showURL,
-}: {
-	monitor: StatusPageMonitor;
-	showURL: boolean;
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			justifyContent="space-between"
-			gap={theme.spacing(LAYOUT.XS)}
-			mb={theme.spacing(LAYOUT.XS)}
-		>
-			<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
-				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(SPACING.LG)}
-					mb={theme.spacing(SPACING.SM)}
-				>
-					<Typography
-						variant="h6"
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.name}
-					</Typography>
-					<Typography
-						variant="caption"
-						sx={getMonitorBadgeStyles(monitor.type ?? "", theme)}
-					>
-						{getMonitorTypeLabel(monitor.type, t)}
-					</Typography>
-				</Stack>
-				{showURL && monitor.url && (
-					<Typography
-						variant="body2"
-						color={theme.palette.text.secondary}
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.url}
-					</Typography>
-				)}
-			</Box>
-			<StatusLabel status={monitor.status} />
-		</Stack>
-	);
-};
-
-const MonitorContent = ({
-	monitor,
-	statusPage,
-	chartType,
-}: {
-	monitor: StatusPageMonitor;
-	statusPage: StatusPage;
-	chartType: string;
-}) => {
-	const theme = useTheme();
-
-	if (monitor.type === "hardware") {
-		if (statusPage.showInfrastructure === false) return null;
-		return <InfrastructureMetrics monitor={monitor} />;
-	}
-
-	if (statusPage.showCharts === false) return null;
-
-	const checks = monitor.checks?.slice().reverse() ?? [];
-	return (
-		<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1, mb: theme.spacing(SPACING.LG) }}>
-			{chartType === "histogram" ? (
-				<HistogramResponseTime
-					height={{ xs: 50, md: 100 }}
-					gap={{ xs: theme.spacing(SPACING.SM), md: theme.spacing(LAYOUT.SM) }}
-					checks={checks}
-				/>
-			) : (
-				<HeatmapResponseTime checks={checks} />
-			)}
-		</Box>
-	);
-};
-
 export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
+
 	const showURL = useSelector((state: RootState) => state.ui?.showURL);
+
 	const [chartType, setChartType] = useState<"histogram" | "heatmap">("histogram");
 
 	return (
-		<Stack gap={theme.spacing(LAYOUT.MD)}>
+		<Stack gap={theme.spacing(8)}>
-			{statusPage.showCharts && (
+			{statusPage.showCharts !== false && (
 				<Stack
-					direction="row"
+					direction={"row"}
-					alignItems="center"
+					alignItems={"center"}
-					gap={theme.spacing(LAYOUT.SM)}
 				>
 					<Typography>{t("pages.statusPages.monitorsList.chartTypeHeatmap")}</Typography>
 					<SwitchComponent
 						dualOption
 						value={chartType}
 						checked={chartType === "histogram"}
-						onChange={(e) => setChartType(e.target.checked ? "histogram" : "heatmap")}
+						onChange={(e) => {
+							setChartType(e.target.checked ? "histogram" : "heatmap");
+						}}
 					/>
 					<Typography>
 						{t("pages.statusPages.monitorsList.chartTypeHistogram")}
@@ -150,22 +52,59 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 				</Stack>
 			)}
 
-			{monitors.map((monitor) => (
+			{monitors?.map((monitor) => {
+				return (
 					<BaseBox
 						key={monitor.id}
-					padding={theme.spacing(LAYOUT.MD)}
+						padding={theme.spacing(4)}
 					>
-					<MonitorHeader
+						<Stack
-						monitor={monitor}
+							direction="row"
-						showURL={showURL}
+							alignItems="center"
+							justifyContent="space-between"
+							gap={theme.spacing(4)}
+							mb={statusPage.showCharts !== false ? theme.spacing(4) : 0}
+						>
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								<Typography
+									variant="h6"
+									sx={{
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
+								>
+									{monitor.name}
+								</Typography>
+								{showURL && (
+									<Typography
+										variant="body2"
+										color="text.secondary"
+									>
+										{monitor.url}
+									</Typography>
+								)}
+							</Box>
+							<StatusLabel status={monitor.status} />
+						</Stack>
+						{statusPage.showCharts !== false && (
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								{chartType === "histogram" ? (
+									<HistogramResponseTime
+										height={{ xs: 50, md: 100 }}
+										gap={{ xs: theme.spacing(0.5), md: theme.spacing(5) }}
+										checks={monitor?.checks?.slice().reverse() ?? []}
 									/>
-					<MonitorContent
+								) : (
-						monitor={monitor}
+									<HeatmapResponseTime
-						statusPage={statusPage}
+										checks={monitor?.checks?.slice().reverse() ?? []}
-						chartType={chartType}
 									/>
+								)}
+							</Box>
+						)}
 					</BaseBox>
-			))}
+				);
+			})}
 		</Stack>
 	);
 };

client/src/Pages/StatusPage/Status/Components/StatusBar.tsx

@@ -1,115 +1,35 @@
-import {
+import { AlertTriangle, CircleCheck } from "lucide-react";
-	AlertTriangle,
-	CircleCheck,
-	CircleX,
-	Loader,
-	PauseCircle,
-	ShieldAlert,
-	Wrench,
-} from "lucide-react";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 
 import { useTranslation } from "react-i18next";
-import { useTheme } from "@mui/material";
 import type { Theme } from "@mui/material";
-import type { Monitor, MonitorStatus } from "@/Types/Monitor";
+import { useTheme } from "@mui/material";
-
+import type { Monitor } from "@/Types/Monitor";
-interface StatusDisplay {
-	icon: JSX.Element;
-	msg?: string;
-	color?: string;
-}
 
 const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => {
-	const monitorsStatus: StatusDisplay = {
+	const monitorsStatus: Record<string, any> = {
 		icon: <AlertTriangle size={24} />,
 	};
 
-	// Handle empty monitors array
+	if (monitors.every((monitor) => monitor.status === "up")) {
-	if (monitors.length === 0) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.noMonitors");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <CircleX size={24} />;
-		return monitorsStatus;
-	}
-
-	const allOf = (...statuses: MonitorStatus[]) =>
-		monitors.every((m) => statuses.includes(m.status));
-	const someOf = (...statuses: MonitorStatus[]) =>
-		monitors.some((m) => statuses.includes(m.status));
-	const noneOf = (...statuses: MonitorStatus[]) =>
-		monitors.every((m) => !statuses.includes(m.status));
-
-	// All monitors in a single state
-	if (allOf("up")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.allUp");
 		monitorsStatus.color = theme.palette.success.main;
 		monitorsStatus.icon = <CircleCheck size={24} />;
-	} else if (allOf("breached")) {
+		return monitorsStatus;
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allBreached");
+	} else if (monitors.every((monitor) => monitor.status === "down")) {
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-	} else if (allOf("maintenance")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allMaintenance");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-	} else if (allOf("down")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.allDown");
 		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <CircleX size={24} />;
+		return monitorsStatus;
-	} else if (allOf("paused")) {
+	} else if (monitors.some((monitor) => monitor.status === "down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allPaused");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <PauseCircle size={24} />;
-	} else if (allOf("initializing")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allInitializing");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Loader size={24} />;
-
-		// Breached takes highest priority in mixed states
-	} else if (someOf("breached") && someOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.breachedAndDown");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-	} else if (someOf("breached")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.breached");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-
-		// Maintenance combinations
-	} else if (someOf("maintenance") && someOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.maintenanceAndDown");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-	} else if (someOf("maintenance") && noneOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.maintenance");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-
-		// Degraded (some down, no maintenance/breached)
-	} else if (someOf("down")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.degraded");
 		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <AlertTriangle size={24} />;
+		return monitorsStatus;
-
-		// Some Paused
-	} else if (someOf("paused")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.partiallyPaused");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <PauseCircle size={24} />;
-
-		// Initializing
-	} else if (someOf("initializing")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.initializing");
-		monitorsStatus.color = theme.palette.info.main;
-		monitorsStatus.icon = <Loader size={24} />;
 	} else {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.unknown");
 		monitorsStatus.color = theme.palette.warning.main;
-	}
-
 		return monitorsStatus;
+	}
 };
 
 interface StatusBarProps {

client/src/Pages/StatusPage/Status/index.tsx

@@ -23,22 +23,16 @@ const StatusPageView = () => {
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isPublic = location.pathname.startsWith("/status/public");
 
-	const apiUrl = url ? `/status-page/${url}?type=uptime&type=infrastructure` : null;
+	const apiUrl = url ? `/status-page/${url}?type=uptime` : null;
 
-	const { data, isLoading, error } = useGet<StatusPageResponse>(
+	const { data, isLoading, error } = useGet<StatusPageResponse>(apiUrl);
-		apiUrl,
-		{},
-		{
-			refreshInterval: 10000,
-		}
-	);
 
 	const statusPage = data?.statusPage;
 	const monitors = data?.monitors ?? [];
 
 	if (!statusPage) return null;
 
-	if (monitors.length === 0) {
+	if (monitors?.length === 0) {
 		return (
 			<BasePage
 				loading={isLoading}

client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx

@@ -97,7 +97,7 @@ export const StatusPagesTable = ({
 			{
 				id: "type",
 				content: t("common.table.headers.type"),
-				render: (row) => row.type.join(", "),
+				render: (row) => row.type,
 			},
 			{
 				id: "status",

client/src/Pages/Uptime/Details/index.tsx

@@ -20,7 +20,7 @@ import { useState, useMemo } from "react";
 import { useParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useGet } from "@/Hooks/UseApi";
-import { type MonitorDetailsResponse, supportsGeoCheck } from "@/Types/Monitor";
+import type { MonitorDetailsResponse } from "@/Types/Monitor";
 import type { ChecksResponse } from "@/Types/Check";
 import type {
 	GeoChecksResult,
@@ -122,7 +122,7 @@ const UptimeDetailsPage = () => {
 	);
 
 	const geoChecksUrl = useMemo(() => {
-		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();
@@ -141,7 +141,7 @@ const UptimeDetailsPage = () => {
 
 	// Fetch paginated geo checks for the table
 	const geoChecksTableUrl = useMemo(() => {
-		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();

client/src/Pages/Uptime/Monitors/index.tsx

@@ -70,7 +70,7 @@ const UptimeMonitorsPage = () => {
 	const effectiveTypes =
 		selectedTypes.length > 0
 			? selectedTypes
-			: ["http", "ping", "docker", "port", "game", "grpc", "websocket"];
+			: ["http", "ping", "docker", "port", "game", "grpc"];
 
 	// Build URL for monitors with checks
 	const monitorsWithChecksUrl = useMemo(() => {

client/src/Types/Check.ts

@@ -1,5 +1,3 @@
-export const CHECK_TTL_SENTINEL = 366;
-
 export interface CheckMetadata {
 	monitorId: string;
 	teamId: string;
@@ -127,6 +125,9 @@ export interface Check {
 	timings?: CheckTimings;
 	statusCode: number;
 	message: string;
+	ack: boolean;
+	ackAt?: string | null;
+	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -139,6 +140,7 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
+	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -241,7 +243,10 @@ export interface ChecksSummary {
 	downChecks: number;
 }
 
-export type CheckSnapshot = Omit<Check, "metadata" | "__v" | "updatedAt"> & {
+export type CheckSnapshot = Omit<
+	Check,
+	"metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt"
+> & {
 	originalResponseTime: number;
 };
 

client/src/Types/Monitor.ts

@@ -12,20 +12,10 @@ export const MonitorTypes = [
 	"port",
 	"game",
 	"grpc",
-	"websocket",
 	"unknown",
 ] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
-export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
-
-export const supportsGeoCheck = (type: MonitorType | undefined): boolean => {
-	if (!type) {
-		return false;
-	}
-	return GeoCheckSupportedTypes.includes(type);
-};
-
 export const MonitorStatuses = [
 	"up",
 	"down",
@@ -54,6 +44,8 @@ export interface Monitor {
 	jsonPath?: string;
 	expectedValue?: string;
 	matchMethod?: MonitorMatchMethod;
+	basicAuthUser?: string;
+	basicAuthPassword?: string;
 	url: string;
 	port?: number;
 	isActive: boolean;

client/src/Types/Notification.ts

@@ -5,10 +5,6 @@ export const NotificationChannels = [
 	"webhook",
 	"pager_duty",
 	"matrix",
-	"teams",
-	"telegram",
-	"pushover",
-	"twilio",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 
@@ -23,8 +19,6 @@ export interface Notification {
 	homeserverUrl?: string;
 	roomId?: string;
 	accessToken?: string;
-	accountSid?: string;
-	twilioPhoneNumber?: string;
 	createdAt: string;
 	updatedAt: string;
 }

client/src/Types/StatusPage.ts

@@ -1,31 +1,10 @@
-import type { Monitor, MonitorType } from "@/Types/Monitor";
+import type { Monitor } from "@/Types/Monitor";
-export type MonitorDisplayType = "uptime" | "infrastructure";
-
-export const MONITOR_TYPE_KEYS: Partial<Record<MonitorType, string>> = {
-	http: "pages.common.monitors.monitorTypes.optionHttp",
-	ping: "pages.common.monitors.monitorTypes.optionPing",
-	docker: "pages.common.monitors.monitorTypes.optionDocker",
-	port: "pages.common.monitors.monitorTypes.optionPort",
-	game: "pages.common.monitors.monitorTypes.optionGame",
-	grpc: "pages.common.monitors.monitorTypes.optionGrpc",
-	websocket: "pages.common.monitors.monitorTypes.optionWebSocket",
-	hardware: "pages.common.monitors.monitorTypes.optionHardware",
-	pagespeed: "pages.common.monitors.monitorTypes.optionPagespeed",
-};
-
-export const getMonitorTypeLabel = (
-	type: MonitorType,
-	t: (key: string) => string
-): string => {
-	const key = MONITOR_TYPE_KEYS[type];
-	return key ? t(key) : type;
-};
 
 export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: MonitorDisplayType[];
+	type: string;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -41,7 +20,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;

client/src/Utils/MonitorUtils.ts

@@ -9,7 +9,6 @@ export const getMonitorPath = (type: MonitorType): string => {
 		ping: "uptime",
 		game: "uptime",
 		grpc: "uptime",
-		websocket: "uptime",
 		unknown: "uptime",
 		docker: "uptime",
 		hardware: "infrastructure",

client/src/Utils/Theme/Palette.ts

@@ -12,8 +12,6 @@ export const typographyLevels = {
 export const colors = {
 	gray200: "#EFEFEF",
 	gray700: "#313131",
-	gray900: "#151518",
-	gray850: "#1c1c21",
 	blueBlueWave: "#1570EF",
 };
 
@@ -33,8 +31,4 @@ export const darkPalette = {
 	secondary: {
 		main: colors.gray700,
 	},
-	background: {
-		default: colors.gray900,
-		paper: colors.gray850,
-	},
 };

client/src/Validation/monitor.ts

@@ -38,6 +38,8 @@ const httpSchema = baseSchema.extend({
 	matchMethod: z.enum(["equal", "include", "regex", ""]).optional(),
 	expectedValue: z.string().optional(),
 	jsonPath: z.string().optional(),
+	basicAuthUser: z.string().optional(),
+	basicAuthPassword: z.string().optional(),
 });
 
 // Ping monitor schema
@@ -115,13 +117,6 @@ const hardwareSchema = baseSchema.extend({
 	selectedDisks: z.array(z.string()),
 });
 
-// WebSocket monitor schema
-const websocketSchema = baseSchema.extend({
-	type: z.literal("websocket"),
-	url: z.string().min(1, "WebSocket URL is required"),
-	ignoreTlsErrors: z.boolean(),
-});
-
 // Discriminated union of all monitor types
 export const monitorSchema = z.discriminatedUnion("type", [
 	httpSchema,
@@ -132,7 +127,6 @@ export const monitorSchema = z.discriminatedUnion("type", [
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
-	websocketSchema,
 ]);
 
 export type MonitorFormData = z.infer<typeof monitorSchema>;
@@ -147,5 +141,4 @@ export {
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
-	websocketSchema,
 };

client/src/Validation/notifications.ts

@@ -45,31 +45,6 @@ const matrixSchema = baseSchema.extend({
 	accessToken: z.string().min(1, "Access token is required"),
 });
 
-const teamsSchema = baseSchema.extend({
-	type: z.literal("teams"),
-	address: z.string().min(1, "Webhook URL is required").url("Please enter a valid URL"),
-});
-
-const telegramSchema = baseSchema.extend({
-	type: z.literal("telegram"),
-	address: z.string().min(1, "Chat ID is required"),
-	accessToken: z.string().min(1, "Bot token is required"),
-});
-
-const pushoverSchema = baseSchema.extend({
-	type: z.literal("pushover"),
-	address: z.string().min(1, "User key is required"),
-	accessToken: z.string().min(1, "App token is required"),
-});
-
-const twilioSchema = baseSchema.extend({
-	type: z.literal("twilio"),
-	accountSid: z.string().min(1, "Account SID is required"),
-	accessToken: z.string().min(1, "Auth token is required"),
-	phone: z.string().min(1, "Recipient phone number is required"),
-	twilioPhoneNumber: z.string().min(1, "Twilio phone number is required"),
-});
-
 export const notificationSchema = z.discriminatedUnion("type", [
 	emailSchema,
 	slackSchema,
@@ -77,10 +52,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 	webhookSchema,
 	pagerDutySchema,
 	matrixSchema,
-	teamsSchema,
-	telegramSchema,
-	pushoverSchema,
-	twilioSchema,
 ]);
 
 export type NotificationFormData = z.infer<typeof notificationSchema>;

client/src/Validation/settings.ts

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

client/src/Validation/statusPage.ts

@@ -14,16 +14,12 @@ export const statusPageSchema = z.object({
 			"URL can only contain lowercase letters, numbers, and hyphens"
 		),
 	timezone: z.string().optional(),
-	type: z
-		.array(z.enum(["uptime", "infrastructure"]))
-		.min(1, "At least one type is required"),
 	color: z.string().min(1, "Color is required"),
 	monitors: z.array(z.string()).min(1, "At least one monitor is required"),
 	isPublished: z.boolean(),
 	showCharts: z.boolean(),
 	showUptimePercentage: z.boolean(),
 	showAdminLoginLink: z.boolean(),
-	showInfrastructure: z.boolean(),
 	customCSS: z.string().optional(),
 	logo: z
 		.object({

client/src/Validation/validation.js

@@ -288,13 +288,7 @@ const logoImageValidation = joi
 	.optional(); // Make entire object optional
 
 const statusPageValidation = joi.object({
-	type: joi
+	type: joi.string().valid("uptime").required(),
-		.alternatives()
-		.try(
-			joi.string().valid("uptime", "infrastructure"),
-			joi.array().items(joi.string().valid("uptime", "infrastructure"))
-		)
-		.required(),
 	isPublished: joi.bool(),
 	companyName: joi
 		.string()
@@ -323,7 +317,6 @@ const statusPageValidation = joi.object({
 	showUptimePercentage: joi.boolean(),
 	showCharts: joi.boolean(),
 	showAdminLoginLink: joi.boolean(),
-	showInfrastructure: joi.boolean(),
 });
 
 const settingsValidation = joi.object({

client/src/locales/en.json

@@ -46,8 +46,7 @@
 			"sendTestEmail": "Send test email",
 			"exportToJSON": "Export to JSON",
 			"importFromJSON": "Import from JSON",
-			"clearFilters": "Clear filters",
+			"clearFilters": "Clear filters"
-			"removeUser": "Remove user"
 		},
 		"charts": {
 			"labels": {
@@ -343,7 +342,6 @@
 			"register": {
 				"title": "Welcome back to Checkmate!",
 				"subtitle": "Sign up to get started",
-				"setupNotice": "This page is only available during initial setup. Once a super admin is registered, additional users can be invited from team settings.",
 				"submit": "Register"
 			},
 			"forgotPassword": {
@@ -398,28 +396,16 @@
 					"activeFor": "Active for",
 					"certificateExpiry": "Certificate expiry",
 					"lastCheck": "Last check",
-					"lastResponseTime": "Last response time",
+					"lastResponseTime": "Last response time"
-					"serviceIsDown": "Service is down"
 				},
 				"status": {
 					"down": "down",
-					"breached": "threshold exceeded",
+					"breached": "breached",
 					"initializing": "initializing",
 					"maintenance": "maintenance",
 					"paused": "paused",
 					"total": "total",
 					"up": "up"
-				},
-				"monitorTypes": {
-					"optionDocker": "Docker",
-					"optionGame": "Game",
-					"optionHttp": "HTTP(S)",
-					"optionPing": "Ping",
-					"optionPort": "Port",
-					"optionPagespeed": "PageSpeed",
-					"optionHardware": "Infrastructure",
-					"optionGrpc": "gRPC",
-					"optionWebSocket": "WebSocket"
 				}
 			}
 		},
@@ -501,10 +487,6 @@
 						"grpcServiceName": {
 							"label": "Service name",
 							"placeholder": "e.g. my.service.v1 (leave empty for overall health)"
-						},
-						"wsUrl": {
-							"label": "WebSocket URL",
-							"placeholder": "wss://example.com/socket"
 						}
 					},
 					"title": "General settings",
@@ -516,10 +498,21 @@
 						"game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type.",
 						"pagespeed": "Track page load performance, Core Web Vitals, and optimization scores for your website.",
 						"grpc": "Enter the hostname and port of the gRPC server, optionally specify a service name for the health check, and add a display name.",
-						"websocket": "Enter the WebSocket URL to monitor (e.g., wss://example.com/socket) and add a display name.",
 						"hardware": "Monitor CPU, memory, disk usage, and temperature for your infrastructure."
 					}
 				},
+				"basicAuth": {
+					"description": "Configure HTTP basic authentication credentials for this monitor.",
+					"option": {
+						"username": {
+							"label": "Username"
+						},
+						"password": {
+							"label": "Password"
+						}
+					},
+					"title": "Basic authentication"
+				},
 				"ignoreTls": {
 					"description": "Configure TLS/SSL certificate validation for HTTPS connections.",
 					"option": {
@@ -547,12 +540,17 @@
 				},
 				"type": {
 					"description": "Select the type of check to perform",
+					"optionDocker": "Docker",
 					"optionDockerDescription": "Use Docker to monitor if a container is running.",
+					"optionGame": "Game",
 					"optionGameDescription": "Monitor if a specific game server is online.",
+					"optionGrpc": "gRPC",
 					"optionGrpcDescription": "Monitor gRPC services using the standard Health Checking Protocol.",
-					"optionWebSocketDescription": "Monitor WebSocket endpoints for connection health and response time.",
+					"optionHttp": "HTTP(S)",
 					"optionHttpDescription": "Use HTTP(S) to monitor your website or API endpoint.",
+					"optionPing": "Ping",
 					"optionPingDescription": "Use ICMP Ping to monitor if a server is online.",
+					"optionPort": "Port",
 					"optionPortDescription": "Monitor if a specific port on a server is open.",
 					"title": "Type"
 				},
@@ -633,12 +631,6 @@
 					"title": "Roles",
 					"description": "Assign roles to the user. Multiple roles can be selected."
 				}
-			},
-			"dialog": {
-				"removeUser": {
-					"title": "Remove user",
-					"content": "Are you sure you want to remove {{name}} from your team? This action cannot be undone."
-				}
 			}
 		},
 		"incidents": {
@@ -953,34 +945,6 @@
 					"description": "Select the type of notification channel to create.",
 					"optionType": "Type",
 					"title": "Channel type"
-				},
-				"telegram": {
-					"title": "Telegram configuration",
-					"description": "Configure your Telegram bot to send notifications.",
-					"optionBotToken": "Bot token",
-					"placeholderBotToken": "123456789:ABCdefGhIJKlmNoPQRsTUVwxyZ",
-					"optionChatId": "Chat ID",
-					"placeholderChatId": "-1001234567890"
-				},
-				"pushover": {
-					"title": "Pushover configuration",
-					"description": "Configure Pushover to receive push notifications on your devices.",
-					"optionAppToken": "Application API token",
-					"placeholderAppToken": "azGDORePK8gMaC0QOYAMyEEuzJnyUi",
-					"optionUserKey": "User key",
-					"placeholderUserKey": "uQiRzpo4DXghDmr9QzzfQu27cmVRsG"
-				},
-				"twilio": {
-					"title": "Twilio SMS configuration",
-					"description": "Configure Twilio to send SMS notifications to a phone number.",
-					"optionAccountSid": "Account SID",
-					"placeholderAccountSid": "ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-					"optionAuthToken": "Auth token",
-					"placeholderAuthToken": "your_auth_token",
-					"optionFromNumber": "From number (Twilio)",
-					"placeholderFromNumber": "+15551234567",
-					"optionToNumber": "To number (recipient)",
-					"placeholderToNumber": "+15559876543"
 				}
 			},
 			"table": {
@@ -1075,7 +1039,7 @@
 				},
 				"stats": {
 					"title": "Monitor history",
-					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
+					"description": "Define how long you want to retain historical data. You can also clear all existing data.",
 					"option": {
 						"clear": {
 							"label": "Clear all stats. This is irreversible."
@@ -1086,16 +1050,6 @@
 						"description": "This cannot be undone"
 					}
 				},
-				"retention": {
-					"title": "Check retention",
-					"description": "Set how long check data is retained before being automatically cleaned up.",
-					"option": {
-						"days": {
-							"label": "Retention period (days)",
-							"unlimited": "Unlimited"
-						}
-					}
-				},
 				"thresholds": {
 					"title": "Global Thresholds",
 					"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
@@ -1212,38 +1166,12 @@
 			},
 			"monitorsList": {
 				"chartTypeHeatmap": "Heatmap",
-				"chartTypeHistogram": "Histogram",
+				"chartTypeHistogram": "Histogram"
-				"noData": "No data available",
-				"infrastructure": {
-					"title": "Infrastructure",
-					"cpu": "CPU",
-					"memory": "RAM",
-					"memoryText": "Memory",
-					"disk": "Disk",
-					"usage": "Usage",
-					"used": "Used",
-					"total": "Total"
-				},
-				"uptime": {
-					"title": "Uptime",
-					"responseTime": "Response time"
-				}
 			},
 			"statusBar": {
-				"allUp": "All systems operational",
-				"allBreached": "All systems have exceeded thresholds",
-				"allMaintenance": "All systems are under maintenance",
 				"allDown": "All systems are down",
-				"allPaused": "All systems are paused",
+				"allUp": "All systems operational",
-				"allInitializing": "All systems are initializing",
-				"breachedAndDown": "Some systems have exceeded thresholds and are down",
-				"breached": "Some systems have exceeded thresholds",
 				"degraded": "Some systems are experiencing issues",
-				"maintenanceAndDown": "Some systems are down during maintenance",
-				"maintenance": "Some systems are under maintenance",
-				"partiallyPaused": "Some systems are paused",
-				"initializing": "Some systems are initializing",
-				"noMonitors": "No monitors have been configured",
 				"unknown": "Unable to determine system status"
 			},
 			"table": {
@@ -1330,9 +1258,6 @@
 						},
 						"showAdminLoginLink": {
 							"label": "Show admin login link"
-						},
-						"showInfrastructure": {
-							"label": "Show infrastructure metrics"
 						}
 					}
 				}

client/vite.config.ts

@@ -3,13 +3,11 @@ import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
 import path from "path";
 import { fileURLToPath } from "url";
-import { readFileSync } from "fs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export default defineConfig(({}) => {
-	const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "package.json"), "utf-8"));
+	let version = "3.5.0";
-	const version = pkg.version;
 
 	return {
 		base: "/",

docker/coolify/build_images.bat

@@ -1,36 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=bluewaveuptime/uptime_client
-set dockerfiles[0]=.\docker\coolify\client.Dockerfile
-
-set services[1]=bluewaveuptime/uptime_database_mongo
-set dockerfiles[1]=.\docker\coolify\mongoDB.Dockerfile
-
-set services[2]=bluewaveuptime/uptime_redis
-set dockerfiles[2]=.\docker\coolify\redis.Dockerfile
-
-set services[3]=bluewaveuptime/uptime_server
-set dockerfiles[3]=.\docker\coolify\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2,3) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/coolify/build_images.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 # Change directory to root Server directory for correct Docker Context
 cd "$(dirname "$0")"
-cd ../../
+cd ../../../
 
 # Define an array of services and their Dockerfiles
 declare -A services=(
-  ["bluewaveuptime/uptime_client"]="./docker/coolify/client.Dockerfile"
+  ["bluewaveuptime/uptime_client"]="./server/docker/dist/client.Dockerfile"
-  ["bluewaveuptime/uptime_database_mongo"]="./docker/coolify/mongoDB.Dockerfile"
+  ["bluewaveuptime/uptime_database_mongo"]="./server/docker/dist/mongoDB.Dockerfile"
-  ["bluewaveuptime/uptime_redis"]="./docker/coolify/redis.Dockerfile"
+  ["bluewaveuptime/uptime_redis"]="./server/docker/dist/redis.Dockerfile"
-  ["bluewaveuptime/uptime_server"]="./docker/coolify/server.Dockerfile"
+  ["bluewaveuptime/uptime_server"]="./server/docker/dist/server.Dockerfile"
 )
 
 # Loop through each service and build the corresponding image

docker/dev/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\dev\client.Dockerfile
-
-set services[1]=uptime_mongo
-set dockerfiles[1]=.\docker\dev\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\dev\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/dist-arm/server.Dockerfile

@@ -1,16 +1,17 @@
 # ---------------------
 # Frontend build stage
 # ---------------------
-# Build on the host arch (BUILDPLATFORM) rather than under QEMU — the output is
+FROM node:20-slim AS frontend-build
-# pure JS so it's arch-independent, and this avoids the esbuild host/native
+
-# binary version mismatch under emulation.
+
-FROM --platform=$BUILDPLATFORM node:20-slim AS frontend-build
 
 WORKDIR /app/client
 
-COPY client/package*.json ./
+COPY client/package.json ./
 
-RUN npm ci
+RUN npm install
+
+RUN npm install esbuild@0.25.5 --build-from-source
 
 COPY client ./
 

docker/dist-mono/build_images.bat

@@ -1,30 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_database_mongo
-set dockerfiles[0]=.\docker\dist-mono\mongoDB.Dockerfile
-
-set services[1]=uptime_server
-set dockerfiles[1]=.\docker\dist-mono\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/dist-mono/server.Dockerfile

@@ -19,10 +19,10 @@ WORKDIR /app/server
 
 COPY server ./
 
+
 RUN npm install
 
 RUN npm run build
-RUN cp -r src/templates dist/templates
 
 COPY --from=frontend-build /app/client/dist ./public
 

docker/dist/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=bluewaveuptime/uptime_client
-set dockerfiles[0]=.\docker\dist\client.Dockerfile
-
-set services[1]=bluewaveuptime/uptime_database_mongo
-set dockerfiles[1]=.\docker\dist\mongoDB.Dockerfile
-
-set services[2]=bluewaveuptime/uptime_server
-set dockerfiles[2]=.\docker\dist\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/prod/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\prod\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\prod\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\prod\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/prod/docker-compose.yaml

@@ -3,8 +3,8 @@ services:
     image: ghcr.io/bluewave-labs/checkmate:frontend-demo
     restart: always
     environment:
-      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
+      UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
+      UPTIME_APP_CLIENT_HOST: "https://checkmate-demo.bluewavelabs.ca"
     ports:
       - "80:80"
       - "443:443"
@@ -12,7 +12,16 @@ services:
       - server
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d/:ro
-      - /etc/letsencrypt:/etc/nginx/ssl:ro
+      - ./certbot/www:/var/www/certbot/:ro
+      - ./certbot/conf/:/etc/nginx/ssl/:ro
+
+  certbot:
+    image: certbot/certbot:latest
+    restart: always
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew --webroot -w /var/www/certbot; sleep 12h & wait $${!}; done;'"
 
   server:
     image: ghcr.io/bluewave-labs/checkmate:backend-demo

docker/prod/nginx/conf.d/default.conf

@@ -40,8 +40,8 @@ server {
 
     server_name checkmate-demo.bluewavelabs.ca;
 
-    ssl_certificate /etc/nginx/ssl/live/demo.checkmate.so/fullchain.pem;
+    ssl_certificate /etc/nginx/ssl/live/checkmate-demo.bluewavelabs.ca/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/demo.checkmate.so/privkey.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/checkmate-demo.bluewavelabs.ca/privkey.pem;
     
     location / {
         root   /usr/share/nginx/html;

docker/prod/server.Dockerfile

@@ -17,8 +17,6 @@ COPY ./server ./
 
 RUN npm run build
 
-RUN cp -r src/templates dist/templates
-
 EXPOSE 52345
 
 CMD ["node", "dist/index.js"]

docker/staging/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\staging\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\staging\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\staging\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/staging/server.Dockerfile

@@ -17,8 +17,6 @@ COPY ./server ./
 
 RUN npm run build
 
-RUN cp -r src/templates dist/templates
-
 EXPOSE 52345
 
 CMD ["node", "dist/index.js"]

docker/unified/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\unified\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\unified\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\unified\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/unified/build_images.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Change directory to root directory for correct Docker Context
-cd "$(dirname "$0")"
-cd ../../
-
-# Define an array of services and their Dockerfiles
-declare -A services=(
-  ["uptime_client"]="./docker/unified/client.Dockerfile"
-  ["uptime_database_mongo"]="./docker/unified/mongoDB.Dockerfile"
-  ["uptime_server"]="./docker/unified/server.Dockerfile"
-)
-
-# Loop through each service and build the corresponding image
-for service in "${!services[@]}"; do
-  docker build -f "${services[$service]}" -t "$service" .
-  
-  # Check if the build succeeded
-  if [ $? -ne 0 ]; then
-    echo "Error building $service image. Exiting..."
-    exit 1
-  fi
-done
-
-echo "All images built successfully"

docker/unified/certbot-compose.yaml

@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-  webserver:
-    image: nginx:latest
-    ports:
-      - 80:80
-      - 443:443
-    restart: always
-    volumes:
-      - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
-      - ./certbot/www/:/var/www/certbot/:ro
-  certbot:
-    image: certbot/certbot:latest
-    volumes:
-      - ./certbot/www/:/var/www/certbot/:rw
-      - ./certbot/conf/:/etc/letsencrypt/:rw
-    depends_on:
-      - webserver

docker/unified/client.Dockerfile

@@ -1,20 +0,0 @@
-FROM node:20-slim AS build
-
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-
-WORKDIR /app
-
-COPY ./client/package*.json ./
-
-RUN npm install
-
-COPY ./client .
-
-RUN npm run build
-
-FROM nginx:1.27.1-alpine
-
-COPY --from=build /app/dist /usr/share/nginx/html
-COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
-RUN chmod +x /docker-entrypoint.d/env.sh
-CMD ["nginx", "-g", "daemon off;"]

docker/unified/docker-compose.yaml

@@ -1,114 +0,0 @@
-# sudo certbot certonly --standalone --http-01-port 8080
-# cerbot needs to run on 8080 since port 80 is used by the gateway
-
-services:
-  # Gateway (Single Entry Point)
-  gateway:
-    image: nginx:1.27.1-alpine
-    container_name: checkmate-gateway
-    restart: always
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /etc/letsencrypt:/etc/nginx/ssl:ro
-      - ./gateway/nginx.conf:/etc/nginx/conf.d/default.conf:ro
-
-  # Production Stack ----- 
-  client-prod:
-    image: ghcr.io/bluewave-labs/checkmate:frontend-demo
-    container_name: client-prod
-    restart: always
-    environment:
-      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
-    expose:
-      - "80"
-    depends_on:
-      - server-prod
-    volumes:
-      - ./nginx/conf.d/prod.conf:/etc/nginx/conf.d/default.conf:ro
-
-  server-prod:
-    image: ghcr.io/bluewave-labs/checkmate:backend-demo
-    container_name: server-prod
-    restart: always
-    env_file:
-      - server-prod.env
-    depends_on:
-      - mongodb-prod
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-prod:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-demo
-    container_name: mongodb-prod
-    restart: always
-    command: [ "mongod", "--quiet", "--bind_ip_all" ]
-    volumes:
-      - ./mongo/data-prod:/data/db
-    env_file:
-      - mongo-prod.env
-    healthcheck:
-      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Staging Stack -----
-  client-staging:
-    image: ghcr.io/bluewave-labs/checkmate:frontend-staging
-    container_name: client-staging
-    restart: always
-    environment:
-      UPTIME_APP_API_BASE_URL: "https://staging.checkmate.so/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://staging.checkmate.so"
-    expose:
-      - "80"
-    depends_on:
-      - server-staging
-    volumes:
-      - ./nginx/conf.d/staging.conf:/etc/nginx/conf.d/default.conf:ro
-
-  server-staging:
-    image: ghcr.io/bluewave-labs/checkmate:backend-staging
-    container_name: server-staging
-    restart: always
-    env_file:
-      - server-staging.env
-    depends_on:
-      - mongodb-staging
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-staging:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-staging
-    container_name: mongodb-staging
-    restart: always
-    command: [ "mongod", "--quiet", "--bind_ip_all" ]
-    volumes:
-      - ./mongo/data-staging:/data/db
-    env_file:
-      - mongo-staging.env
-    healthcheck:
-      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Shared Utils
-  capture:
-    image: ghcr.io/bluewave-labs/capture:latest
-    container_name: capture
-    restart: unless-stopped
-    ports:
-      - "59232:59232"
-    environment:
-      - API_SECRET=my_secret
-      - GIN_MODE=release
-    volumes:
-      - /etc/os-release:/etc/os-release:ro

docker/unified/gateway/nginx.conf

@@ -1,55 +0,0 @@
-proxy_set_header Host $host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-
-
-server {
-    listen 80;
-    server_name demo.checkmate.so staging.checkmate.so;
-
-    location /.well-known/acme-challenge/ {
-        # Forward the challenge to Certbot listening on 8080
-        proxy_pass http://172.17.0.1:8080;
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-
-# --- PRODUCTION: demo.checkmate.so ---
-server {
-    listen 443 ssl;
-    server_name demo.checkmate.so;
-
-    ssl_certificate     /etc/nginx/ssl/live/demo.checkmate.so/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/demo.checkmate.so/privkey.pem;
-
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_ciphers         HIGH:!aNULL:!MD5;
-
-    location / {
-        # Passes traffic to the prod client on port 80
-        proxy_pass http://client-prod:80;
-    }
-}
-
-# --- STAGING: staging.checkmate.so ---
-
- server {
-     listen 443 ssl;
-     server_name staging.checkmate.so;
-
-     ssl_certificate     /etc/nginx/ssl/live/staging.checkmate.so/fullchain.pem;
-     ssl_certificate_key /etc/nginx/ssl/live/staging.checkmate.so/privkey.pem;
-
-     ssl_protocols       TLSv1.2 TLSv1.3;
-     ssl_ciphers         HIGH:!aNULL:!MD5;
-
-     location / {
-         # Passes traffic to the staging client on port 80
-         proxy_pass http://client-staging:80;
-     }
- }

docker/unified/mongoDB.Dockerfile

@@ -1,3 +0,0 @@
-FROM mongo
-EXPOSE 27017
-CMD ["mongod"]

docker/unified/nginx/conf.d/prod.conf

@@ -1,31 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-
-    server_name _; 
-    server_tokens off;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html;
-    }
-    
-    location /api/ {
-        proxy_pass http://server-prod:52345/api/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /api-docs/ {
-        proxy_pass http://server-prod:52345/api-docs/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}

docker/unified/nginx/conf.d/staging.conf

@@ -1,31 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-
-    server_name _; 
-    server_tokens off;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html;
-    }
-    
-    location /api/ {
-        proxy_pass http://server-staging:52345/api/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /api-docs/ {
-        proxy_pass http://server-staging:52345/api-docs/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}

docker/unified/server.Dockerfile

@@ -1,22 +0,0 @@
-FROM node:20-slim
-
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV NODE_OPTIONS="--max-old-space-size=2048"
-
-WORKDIR /app
-
-COPY ./server/package*.json ./
-
-RUN npm install
-
-COPY ./server ./
-
-RUN npm run build
-
-EXPOSE 52345
-
-CMD ["node", "dist/index.js"]

docs/i18n-contribution.md

@@ -1,31 +0,0 @@
-# Contributing Translations
-
-Checkmate supports multiple languages. This guide explains how to contribute translations.
-
-## How to Add a New Language
-
-1. Create a new JSON file in `client/src/locales/` named with the language code (e.g., `it.json` for Italian)
-
-2. Copy the structure from `en.json` and translate all values
-
-3. Add the language to the language selector in the UI
-
-## Translation Guidelines
-
-- en.json is the reference localization file, all keys should be declared here and mirrored in other localization files
-- Translate only the values
-- Use formal/informal tone consistently
-- Test your translations in the UI
-
-## File Structure
-client/src/locales/
-├── en.json      # Source language
-├── es.json      # Spanish
-├── de.json      # German
-└── [lang].json  # Your language
-## Testing Translations
-
-1. Start the development server: `npm run dev`
-2. Go to Settings → Language
-3. Select your language
-4. Verify all strings display correctly

server/README.md

@@ -8,7 +8,7 @@ Checkmate's backend is designed to be lightweight and scalable, ensuring reliabl
 
 ## Installation & documentation
 
-For setup instructions, configuration details, and deployment guidelines, please visit our official documentation at [docs.checkmate.so](https://checkmate.so/docs).
+For setup instructions, configuration details, and deployment guidelines, please visit our official documentation at [docs.checkmate.so](https://docs.checkmate.so).
 
 ## Related repositories
 

server/eslint.config.js

@@ -32,14 +32,11 @@ export default [
 		languageOptions: {
 			parser: tseslint.parser,
 			parserOptions: {
-				projectService: {
+				projectService: true,
-					allowDefaultProject: ["jest.config.ts"],
-				},
 				tsconfigRootDir: import.meta.dirname,
 			},
 		},
 		rules: {
-			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
 			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},

server/jest.config.ts

@@ -9,7 +9,8 @@ const config: Config = {
 	},
 	moduleNameMapper: {
 		"^@/validation/(.*)\\.js$": "<rootDir>/src/validation/$1.js",
-		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.ts",
+		"^@/utils/(AppError)\\.js$": "<rootDir>/src/utils/$1.ts",
+		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.js",
 		"^@/(.*)\\.ts$": "<rootDir>/src/$1.ts",
 		"^@/(.*)\\.js$": "<rootDir>/src/$1.ts",
 		"^@/(.*)$": "<rootDir>/src/$1",

server/openapi.json

@@ -510,24 +510,42 @@
 				"summary": "Get monitors by team",
 				"description": "Get monitors filtered by team with optional parameters",
 				"parameters": [
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Filter by monitor status (up/down)",
+						"schema": {
+							"type": "boolean"
+						}
+					},
 					{
 						"name": "type",
 						"in": "query",
 						"description": "Filter by monitor type",
 						"schema": {
-							"oneOf": [
-								{
 							"type": "string",
-									"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
+							"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"]
+						}
 					},
 					{
-									"type": "array",
+						"name": "page",
-									"items": {
+						"in": "query",
-										"type": "string",
+						"description": "Page number for pagination",
-										"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"default": 1
 						}
-								}
+					},
-							]
+					{
+						"name": "rowsPerPage",
+						"in": "query",
+						"description": "Number of monitors per page",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"maximum": 100,
+							"default": 10
 						}
 					},
 					{
@@ -537,6 +555,15 @@
 						"schema": {
 							"type": "string"
 						}
+					},
+					{
+						"name": "field",
+						"in": "query",
+						"description": "Field to filter on",
+						"schema": {
+							"type": "string",
+							"enum": ["name", "url", "description"]
+						}
 					}
 				],
 				"responses": {
@@ -729,7 +756,7 @@
 					}
 				]
 			},
-			"patch": {
+			"put": {
 				"tags": ["monitors"],
 				"summary": "Update monitor",
 				"description": "Update an existing monitor",
@@ -3541,19 +3568,22 @@
 			},
 			"CreateMonitorRequest": {
 				"type": "object",
-				"required": ["name", "type", "url"],
+				"required": ["name", "description", "type", "url", "interval"],
 				"properties": {
 					"name": {
 						"type": "string",
+						"minLength": 1,
+						"maxLength": 100,
 						"example": "My Website Monitor"
 					},
 					"description": {
 						"type": "string",
+						"maxLength": 500,
 						"example": "Monitors the main website homepage"
 					},
 					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"],
+						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"],
 						"example": "http"
 					},
 					"url": {
@@ -3563,34 +3593,14 @@
 					},
 					"interval": {
 						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600,
 						"example": 300,
 						"description": "Check interval in seconds"
 					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
-					},
 					"isActive": {
-						"type": "boolean"
-					},
-					"ignoreTlsErrors": {
 						"type": "boolean",
-						"default": false
+						"default": true
-					},
-					"useAdvancedMatching": {
-						"type": "boolean",
-						"default": false
-					},
-					"port": {
-						"type": "integer"
 					},
 					"notifications": {
 						"type": "array",
@@ -3599,62 +3609,51 @@
 						},
 						"description": "Array of notification IDs to associate with this monitor"
 					},
-					"secret": {
+					"httpOptions": {
-						"type": "string"
+						"type": "object",
-					},
+						"properties": {
-					"jsonPath": {
+							"method": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
 								"type": "string",
-						"enum": ["equal", "include", "regex", ""]
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"],
+								"default": "GET"
 							},
-					"cpuAlertThreshold": {
+							"headers": {
-						"type": "number"
+								"type": "object",
-					},
+								"additionalProperties": {
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string",
-						"default": ""
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
 									"type": "string"
 								}
 							},
-					"group": {
+							"body": {
 								"type": "string",
-						"nullable": true,
+								"description": "Request body for POST/PUT requests"
-						"maxLength": 50
 							},
-					"geoCheckEnabled": {
+							"timeout": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
-						"type": "array",
-						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
-						}
-					},
-					"geoCheckInterval": {
 								"type": "integer",
-						"minimum": 300000
+								"minimum": 1000,
+								"maximum": 30000,
+								"default": 5000,
+								"description": "Request timeout in milliseconds"
+							}
+						}
+					},
+					"assertions": {
+						"type": "array",
+						"items": {
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
+						}
 					}
 				}
 			},
@@ -3662,32 +3661,21 @@
 				"type": "object",
 				"properties": {
 					"name": {
-						"type": "string"
-					},
-					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"]
+						"minLength": 1,
-					},
+						"maxLength": 100
-					"url": {
-						"type": "string"
-					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
 					},
 					"description": {
-						"type": "string"
+						"type": "string",
+						"maxLength": 500
 					},
 					"interval": {
-						"type": "integer"
+						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600
+					},
+					"isActive": {
+						"type": "boolean"
 					},
 					"notifications": {
 						"type": "array",
@@ -3695,72 +3683,47 @@
 							"type": "string"
 						}
 					},
-					"secret": {
+					"httpOptions": {
-						"type": "string"
+						"type": "object",
-					},
+						"properties": {
-					"ignoreTlsErrors": {
+							"method": {
-						"type": "boolean"
-					},
-					"useAdvancedMatching": {
-						"type": "boolean"
-					},
-					"jsonPath": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
 								"type": "string",
-						"enum": ["equal", "include", "regex", ""]
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"]
 							},
-					"port": {
+							"headers": {
-						"type": "integer",
+								"type": "object",
-						"minimum": 1,
+								"additionalProperties": {
-						"maximum": 65535
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string"
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
 									"type": "string"
 								}
 							},
-					"group": {
+							"body": {
-						"type": "string",
+								"type": "string"
-						"nullable": true,
-						"maxLength": 50
 							},
-					"geoCheckEnabled": {
+							"timeout": {
-						"type": "boolean"
+								"type": "integer",
-					},
+								"minimum": 1000,
-					"geoCheckLocations": {
+								"maximum": 30000
-						"type": "array",
+							}
-						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
 						}
 					},
-					"geoCheckInterval": {
+					"assertions": {
-						"type": "integer",
+						"type": "array",
-						"minimum": 300000
+						"items": {
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
+						}
 					}
 				}
 			},

server/package.json

@@ -5,20 +5,17 @@
 	"main": "index.js",
 	"type": "module",
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
+		"test": "NODE_OPTIONS=--experimental-vm-modules c8 jest --runInBand",
-		"test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --coverage --collectCoverageFrom='src/**/*.ts' test/unit",
-		"test:unit:services": "NODE_OPTIONS=--experimental-vm-modules jest --coverage --collectCoverageFrom='src/service/**/*.ts' test/unit/services test/unit/providers/network test/unit/providers/notifications",
-		"test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --no-coverage test/integration",
 		"dev": "nodemon --exec tsx src/index.js",
 		"start": "node --watch ./dist/index.js",
-		"build": "tsc && tsc-alias && cp -r src/templates dist/templates",
+		"build": "tsc && tsc-alias",
 		"lint": "eslint .",
 		"lint-fix": "eslint --fix .",
 		"format": "prettier --write .",
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "npm run format"
 	},
 	"keywords": [],
 	"author": "",
@@ -32,6 +29,7 @@
 		"@pulsecron/pulse": "1.6.8",
 		"axios": "^1.7.2",
 		"bcryptjs": "3.0.2",
+		"bullmq": "5.41.2",
 		"cacheable-lookup": "7.0.0",
 		"compression": "1.8.1",
 		"cookie-parser": "^1.4.7",
@@ -39,8 +37,8 @@
 		"dockerode": "4.0.6",
 		"dotenv": "^16.4.5",
 		"express": "^4.19.2",
-		"express-rate-limit": "8.3.2",
+		"express-rate-limit": "8.0.1",
-		"gamedig": "5.2.0",
+		"gamedig": "^5.3.1",
 		"got": "14.4.7",
 		"handlebars": "^4.7.8",
 		"helmet": "^8.0.0",
@@ -53,14 +51,13 @@
 		"mjml": "^5.0.0-alpha.4",
 		"mongoose": "^8.3.3",
 		"multer": "^1.4.5-lts.1",
-		"nodemailer": "8.0.5",
+		"nodemailer": "^6.9.14",
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
-		"super-simple-scheduler": "1.9.1",
+		"super-simple-scheduler": "1.4.5",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0",
-		"ws": "^8.19.0",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
@@ -81,9 +78,9 @@
 		"@types/papaparse": "^5.5.2",
 		"@types/ping": "0.4.4",
 		"@types/swagger-ui-express": "4.1.8",
-		"@types/ws": "^8.18.1",
 		"@typescript-eslint/eslint-plugin": "^8.56.1",
 		"@typescript-eslint/parser": "^8.56.1",
+		"c8": "10.1.3",
 		"eslint": "^9.17.0",
 		"eslint-plugin-mocha": "^10.5.0",
 		"esm": "3.2.25",