Fullstack docker image

2025-12-25 08:37:09 +00:00 · 2025-05-01 08:55:26 +08:00
237 changed files with 7151 additions and 21181 deletions
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -1,64 +0,0 @@
-name: Build Fleetbase Binaries
-
-on:
-  workflow_dispatch:
-  workflow_run:
-    workflows: ["Create Release"]
-    types: [completed]
-
-permissions:
-  contents: write
-
-env:
-  DIST_DIR: builds/dist
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  build-linux:
-    name: Linux Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build Linux binary
-        run: |
-          chmod +x ./builds/linux/build-linux.sh
-          ./builds/linux/build-linux.sh
-      - name: Upload Linux binary
-        if: github.event_name == 'workflow_run'  
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ github.event.workflow_run.head_branch }}
-          files: |
-            ${{ env.DIST_DIR }}/fleetbase-linux-x86_64
-          draft: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  build-macos:
-    name: macOS (ARM64) Build
-    needs: build-linux
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install build dependencies
-        run: |
-          brew update
-          brew install autoconf automake coreutils asdf php@8.4
-          source "$(brew --prefix asdf)/libexec/asdf.sh"
-          asdf plugin add php https://github.com/asdf-community/asdf-php.git
-      - name: Build macOS binary
-        run: |
-          chmod +x ./builds/osx/build-osx.sh
-          ./builds/osx/build-osx.sh
-      - name: Upload Linux binary
-        if: github.event_name == 'workflow_run'
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ github.event.workflow_run.head_branch }}
-          files: |
-            ${{ env.DIST_DIR }}/fleetbase-darwin-arm64
-          draft: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -58,43 +58,6 @@ jobs:
          files: |
            ./docker-bake.hcl

-      - name: Resolve ECS Targets
-        run: |
-          set -euo pipefail
-
-          # Detect naming scheme by checking if new cluster exists
-          NEW_CLUSTER="${PROJECT}-${STACK}-cluster"
-          if aws ecs describe-clusters --region "${AWS_REGION}" --clusters "${NEW_CLUSTER}" \
-              --query "clusters[?status=='ACTIVE'].clusterArn" --output text 2>/dev/null | grep -q .; then
-            # New scheme: use cluster suffix and service prefixes
-            CLUSTER="${NEW_CLUSTER}"
-            SERVICE_PREFIX="${PROJECT}-${STACK}-"
-            SERVICE_BASE="api"
-          else
-            # Legacy scheme: no suffixes/prefixes
-            CLUSTER="${PROJECT}-${STACK}"
-            SERVICE_PREFIX=""
-            SERVICE_BASE="app"
-          fi
-
-          # Build service names
-          API_SERVICE="${SERVICE_PREFIX}${SERVICE_BASE}"
-          SCHEDULER_SERVICE="${SERVICE_PREFIX}scheduler"
-          EVENTS_SERVICE="${SERVICE_PREFIX}events"
-          TASK_DEF="${PROJECT}-${STACK}-${SERVICE_BASE}"
-          
-          # Get container name from task definition
-          CONTAINER_NAME="$(aws ecs describe-task-definition --task-definition "$TASK_DEF" \
-              --query 'taskDefinition.containerDefinitions[0].name' --output text 2>/dev/null || echo "$SERVICE_BASE")"
-
-          {
-            echo "CLUSTER=$CLUSTER"
-            echo "API_SERVICE=$API_SERVICE"
-            echo "SCHEDULER_SERVICE=$SCHEDULER_SERVICE"
-            echo "EVENTS_SERVICE=$EVENTS_SERVICE"
-            echo "TASK_DEF=$TASK_DEF"
-            echo "CONTAINER_NAME=$CONTAINER_NAME"
-          } >> "$GITHUB_ENV"
      - name: Download ecs-tool
        run: |
          wget -O ecs-tool.tar.gz https://github.com/springload/ecs-tool/releases/download/1.9.6/ecs-tool_1.9.6_linux_amd64.tar.gz && tar -xvf ecs-tool.tar.gz ecs-tool
@@ -102,21 +65,9 @@ jobs:
      - name: Deploy the images 🚀
        run: |-
          set -eu
-          
-          # Run deploy.sh script before deployments
-          env "ECS_RUN.SERVICE=${API_SERVICE}" "ECS_RUN.LAUNCH_TYPE=FARGATE" \
-            ./ecs-tool run -l "ecs-tool" \
-              --image_tag '{container_name}-${{ env.VERSION }}' \
-              --cluster "${CLUSTER}" \
-              --task_definition "${TASK_DEF}" \
-              --container_name "${CONTAINER_NAME}" \
-              ./deploy.sh
-
-          # Deploy services
-          ./ecs-tool deploy \
-              --image_tag '{container_name}-${{ env.VERSION }}' \
-              --cluster "${CLUSTER}" \
-              -s "${API_SERVICE}" -s "${SCHEDULER_SERVICE}" -s "${EVENTS_SERVICE}"
+          # run deploy.sh script before deployments
+          env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ./ecs-tool run -l "ecs-tool" --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} --task_definition ${{ env.PROJECT }}-${{ env.STACK }}-app --container_name app ./deploy.sh
+          ./ecs-tool deploy --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} -s app -s scheduler -s events

  build_frontend:
    name: Build and Deploy the Console
@@ -197,7 +148,7 @@ jobs:
        run: |
          echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./environments/.env.production
          echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine,@fleetbase/aws-marketplace" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
        working-directory: ./console

      - name: Set Env Variables for Production
@@ -205,8 +156,7 @@ jobs:
        run: |
          echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production
          echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine,@fleetbase/aws-marketplace" >> ./environments/.env.production
-          echo "DISABLE_RUNTIME_CONFIG=true" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
        working-directory: ./console

      - name: Install dependencies
@@ -225,11 +175,6 @@ jobs:
          set -u

          DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}
-          NEW_BUCKET="${PROJECT}-${STACK}-console"
-          if aws s3api head-bucket --bucket "$NEW_BUCKET" 2>/dev/null; then
-            DEPLOY_BUCKET="$NEW_BUCKET"
-          fi
-
          # this value will come from the dotenv above
          echo "Deploying to $DEPLOY_BUCKET"
          wget -O- https://github.com/bep/s3deploy/releases/download/v2.11.0/s3deploy_2.11.0_linux-amd64.tar.gz | tar xzv -f - s3deploy
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -1,21 +0,0 @@
-name: Create Release
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  create:
-    runs-on: ubuntu-latest
-    steps:
-        - uses: actions/checkout@v4
-        - name: Publish GitHub Release
-          uses: softprops/action-gh-release@v2
-          with:
-            tag_name: ${{ github.ref_name }}
-            name: ${{ github.ref_name }}
-            body_path: RELEASE.md
-            draft: false
-            prerelease: false
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/discord-announcement.yml
+++ b/.github/workflows/discord-announcement.yml
@@ -1,61 +0,0 @@
-name: Discord Announcement
-
-on:
-  workflow_run:
-    workflows: ["Create Release"]
-    types: [completed]
-
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "Release tag to announce (e.g. v0.7.1)"
-        required: true
-
-jobs:
-  discord_announcement:
-    runs-on: ubuntu-latest
-
-    steps:
-    # 1️⃣  Figure out which tag we’re talking about
-    - id: vars
-      shell: bash
-      run: |
-        if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-          TAG="${{ github.event.inputs.tag }}"
-        else
-          TAG="${{ github.event.workflow_run.head_branch }}"
-        fi
-        echo "TAG=$TAG"   >> "$GITHUB_ENV"
-
-    # 2️⃣  Check out the exact commit for that tag
-    - uses: actions/checkout@v3
-      with:
-        ref: ${{ env.TAG }}
-        fetch-depth: 1
-
-    # 3️⃣  Stash RELEASE.md in an env var (one atomic write → no EOF error)
-    - id: prep-body
-      shell: bash
-      run: |
-          body=$(<RELEASE.md)
-          max=4000
-          [[ ${#body} -gt $max ]] && body="${body:0:$max}…"   # add ellipsis if trimmed
-          {
-            echo "body<<EOF"
-            echo "$body"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
-
-    # 4️⃣  Fire the webhook
-    - uses: tsickert/discord-webhook@v5.3.0
-      with:
-        webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        username: Fleetbase
-        content: |
-          @everyone
-          📦 **Fleetbase ${{ env.TAG }} released!**
-          <https://github.com/${{ github.repository }}/releases/tag/${{ env.TAG }}>
-        embed-title: "Fleetbase ${{ env.TAG }} — release notes"
-        embed-url: "https://github.com/fleetbase/fleetbase/releases/tag/${{ env.TAG }}"
-        embed-description: ${{ steps.prep-body.outputs.body }}
-        embed-color: 4362730        # 0x4291EA (Fleetbase Blue)
--- a/.github/workflows/discord_announcement.yml
+++ b/.github/workflows/discord_announcement.yml
@@ -0,0 +1,48 @@
+name: Discord Announcement
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  discord_announcement:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Get tag message
+        id: tag
+        run: |
+          echo "::set-output name=version::$(git describe --tags --abbrev=0)"
+          if [[ "${ACT}" == "true" ]]; then
+            # If running with act, use an environment variable for the tag message
+            echo "::set-output name=message::$(echo -e "${TAG_MESSAGE}" | base64)"
+          else
+            # If running on GitHub, use git to get the tag message
+            echo "::set-output name=message::$(git tag -l --format='%(contents)' $(git describe --tags --abbrev=0) | base64)"
+          fi
+
+      - name: Print tag message
+        run: echo "${{ steps.tag.outputs.message }}"
+      
+      - name: Get tag name
+        id: get_tag
+        run: echo "::set-output name=tag::${GITHUB_REF/refs\/tags\//}"
+
+      - name: Decode message
+        id: decode
+        run: |
+          echo "Decoding message..."
+          echo "::set-output name=message::$(echo '${{ steps.tag.outputs.message }}' | base64 --decode)"
+
+      - name: Send message to Discord
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: "@everyone \n📦 New Fleetbase Version ${{ steps.get_tag.outputs.tag }} Released!\n${{ steps.decode.outputs.message }} \nVersion: ${{ steps.get_tag.outputs.tag }} \n[Release Notes for ${{ steps.get_tag.outputs.tag }}](https://github.com/fleetbase/fleetbase/releases/tag/${{ steps.get_tag.outputs.tag }})"
+          username: Fleetbase
--- a/.github/workflows/gcp-cd.yml
+++ b/.github/workflows/gcp-cd.yml
@@ -1,4 +1,4 @@
-name: Fleetbase GCP CI/CD
+name: Fleetbase CI/CD

 on:
  push:
--- a/.github/workflows/publish-docker-images.yml
+++ b/.github/workflows/publish-docker-images.yml
@@ -1,50 +0,0 @@
-name: Fleetbase Docker Images
-
-on:
-    push:
-        tags:
-            - 'v*'
-    workflow_dispatch:
-        inputs:
-            branch:
-                description: 'Branch to build from'
-                required: false
-                default: 'main'
-            version:
-                description: 'Image version tag (e.g., v0.7.1-beta)'
-                required: false
-
-jobs:
-    docker-release:
-        name: Build and Push Docker Images
-        runs-on: ubuntu-latest
-
-        env:
-            REGISTRY: fleetbase
-            VERSION: ${{ github.event.inputs.version || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && github.ref_name) || 'manual' }}
-
-        steps:
-            - name: Checkout Repo
-              uses: actions/checkout@v3
-              with:
-                  ref: ${{ github.event.inputs.branch || github.ref_name }}
-                  submodules: recursive
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-
-            - name: Log in to Docker Hub
-              uses: docker/login-action@v3
-              with:
-                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
-                  password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-            - name: Build and Push Console & API Images
-              uses: docker/bake-action@v2
-              with:
-                  push: true
-                  targets: |
-                      fleetbase-console
-                      fleetbase-api
-                  files: |
-                      ./docker-bake.hcl
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 .env.backup
 .phpunit.result.cache
 .pnpm-store
-.tool-versions
 docker-compose.override.yml
 npm-debug.log
 yarn-error.log
@@ -17,8 +16,6 @@ api/composer.dev.json
 api/composer-install-dev.sh
 api/auth.json
 api/crontab
-api/go-crond
-api/.fleetbase-id
 act.sh
 composer-auth.json
 docker/database/*
@@ -34,24 +31,7 @@ packages/loconav
 packages/internals
 packages/projectargus-engine
 packages/customer-portal
+# wip
 packages/solid
-packages/aws-marketplace
-packages/countries
-packages/fliit
-packages/samsara
-packages/solid*
-packages/valhalla
-packages/vroom
 solid
-verdaccio
-# asdf
-.tools-versions
-# binary build resources
-builds/osx/frankenphp
-# build artifacts
-/builds/dist/
-/builds/linux/spc/downloads/*
-*.exe
-*.dll
-*.so
-*.dylib
+verdaccio
--- a/1
+++ b/1
@@ -8,7 +8,6 @@
 http://:8000 {
 	root * /fleetbase/api/public
 	encode zstd br gzip
-	
 	php_server {
 		resolve_root_symlink
 	}
--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@
    <p align="center" dir="auto">
      Modular logistics and supply chain operating system
      <br>
-      <a href="https://docs.fleetbase.io/" rel="nofollow" target="_fleetbase_docs">Documentation</a>
+      <a href="https://docs.fleetbase.io/" rel="nofollow">Documentation</a>
      ·
-      <a href="https://console.fleetbase.io" rel="nofollow" target="_fleetbase_console">Cloud Version</a>
+      <a href="https://console.fleetbase.io" rel="nofollow">Cloud Version</a>
      ·
-      <a href="https://console.fleetbase.io/aws-marketplace" rel="nofollow" target="_aws_marketplace">Deploy on AWS</a>
+      <a href="https://fleetbase.apichecker.com" target="_api_status" rel="nofollow">API Status</a>
      ·
      <a href="https://tally.so/r/3NBpAW" rel="nofollow">Book a Demo</a>
      ·
@@ -25,48 +25,23 @@
 Fleetbase is a modular logistics and supply chain operating system designed to streamline management, planning, optimization, and operational control across various sectors of the supply chain industry.

 <p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/fleetbase_overview.png" alt="Fleetbase Console" width="1200" style="max-width: 100%;" />
-</p>
-
-## Visual Feature Showcase
-
-<p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/order-board-kanban.png" alt="Fleetbase Order Board" width="1200" style="max-width: 100%;" />
-  <em>Visualize and manage your orders with a dynamic Kanban board.</em>
-</p>
-
-<p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/order-workflow-config.png" alt="Fleetbase Order Workflow Configuration" width="1200" style="max-width: 100%;" />
-  <em>Create custom order flows and automation with the intuitive workflow builder.</em>
-</p>
-
-<p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/order-map-view.png" alt="Fleetbase Order Map View" width="1200" style="max-width: 100%;" />
-  <em>Track individual orders in real-time on an interactive map.</em>
-</p>
-
-<p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/live-map-tracking.png" alt="Fleetbase Live Map Tracking" width="1200" style="max-width: 100%;" />
-  <em>Get a complete overview of your fleet and active orders on a live map.</em>
-</p>
-
-<p align="center" dir="auto">
-  <img src="https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/fleet-map-zones.png" alt="Fleetbase Fleet Map with Zones" width="1200" style="max-width: 100%;" />
-  <em>Define and manage service areas and zones for your fleet.</em>
+  <img src="https://github.com/fleetbase/fleetbase/assets/816371/125348c9-c88a-49fe-b098-9abec9d7dff8" alt="Fleetbase Console" width="1200" style="max-width: 100%;" />
 </p>

 **Quickstart**

 ```bash
 git clone git@github.com:fleetbase/fleetbase.git  
-cd fleetbase && ./scripts/docker-install.sh
+cd fleetbase  
+docker-compose up -d  
+docker exec -ti fleetbase-application-1 bash  
+sh deploy.sh
 ```

 ## 📖 Table of contents

  - [Features](#-features)
  - [Install](#-install)
-  - [Deploy on AWS](#-deploy-on-aws-in-one-click)
  - [Extensions](#-extensions)
  - [Apps](#-apps)
  - [Roadmap](#-roadmap)
@@ -100,7 +75,10 @@ Make sure you have both the latest versions of docker and docker-compose install

 ```bash
 git clone git@github.com:fleetbase/fleetbase.git  
-cd fleetbase && ./scripts/docker-install.sh
+cd fleetbase  
+docker-compose up -d  
+docker exec -ti fleetbase-application-1 bash  
+sh deploy.sh
 ```

 ### Accessing Fleetbase
@@ -111,28 +89,17 @@ Fleetbase API: http://localhost:8000

 ### Additional Configurations

-**CORS:** If you’re installing directly on a server you will need to configure the environment variables to the application container:
-```
-CONSOLE_HOST=http://{yourhost}:4200
-```
-If you have additional applications or frontends you can use the environment variable `FRONTEND_HOSTS` to add a comma delimited list of additioal frontend hosts.
-
-**Application Key** If you get an issue about a missing application key just run:
-```bash
-docker compose exec application bash -c "php artisan key:generate --show"
-```
-Next copy this value to the `APP_KEY` environment variable in the application container and restart.
+**CORS:** If you’re installing directly on a server you may need to add your IP address or domain to the `api/config/cors.php` file in the `allowed_hosts` array.  
  
 **Routing:** Fleetbase ships with a default OSRM server hosted by `[router.project-osrm.org](https://router.project-osrm.org)` but you’re able to use your own or any other OSRM compatible server. You can modify this in the `console/environments` directory by modifying the .env file of the environment you’re deploying and setting the `OSRM_HOST` to the OSRM server for Fleetbase to use.  
  
-**Services:** There are a few environment variables which need to be set for Fleetbase to function with full features. If you're deploying with docker then it's easiest to just create a `docker-compose.override.yml` and supply the environment variables in this file.
+**Services:** There are a few environment variables which need to be set for Fleetbase to function with full features. If you’re deploying with docker then it’s easiest to just create a `docker-compose.override.yml` and supply the environment variables in this file.

 ```yaml
-version: "3.8"
+version: “3.8”
 services:  
  application:  
    environment:  
-      CONSOLE_HOST: http://localhost:4200
      MAIL_MAILER: (ses, smtp, mailgun, postmark, sendgrid)
      OSRM_HOST: https://router.project-osrm.org
      IPINFO_API_KEY:
@@ -141,50 +108,11 @@ services:
      TWILIO_SID:  
      TWILIO_TOKEN:
      TWILIO_FROM:
-
-  socket:
-    environment:
-      # IMPORTANT: Configure WebSocket origins for security
-      # Development (localhost only - include WebSocket protocols):
-      SOCKETCLUSTER_OPTIONS: '{"origins":"http://localhost:*,https://localhost:*,ws://localhost:*,wss://localhost:*"}'
-      # Production (replace with your actual domain):
-      # SOCKETCLUSTER_OPTIONS: '{"origins":"https://yourdomain.com:*,wss://yourdomain.com:*"}'
+      CONSOLE_HOST: http://localhost:4200
 ```

-**WebSocket Security:** The `SOCKETCLUSTER_OPTIONS` environment variable controls which domains can connect to the WebSocket server. Always restrict origins to your specific domains in production to prevent security vulnerabilities.
-
 You can learn more about full installation, and configuration in the [official documentation](https://docs.fleetbase.io/getting-started/install).

-## 🚀 Deploy on AWS in One Click
-
-Deploy your complete Fleetbase logistics platform on AWS with enterprise-grade security, scalability, and reliability. No DevOps expertise required!
-
-[![Deploy to AWS](https://img.shields.io/badge/Deploy%20to%20AWS-FF9900?style=for-the-badge&logo=amazon-aws&logoColor=white)](https://console.fleetbase.io/aws-marketplace)
-
-### ✨ What You Get
-
- **Complete AWS Infrastructure**: ECS Fargate, RDS MySQL, ElastiCache Redis, S3, CloudFront, and more  
- **25-Minute Setup**: From zero to production-ready logistics platform  
- **Enterprise Security**: VPC isolation, encrypted storage, secrets management  
- **Auto-Scaling**: Handle traffic spikes with ECS Fargate auto-scaling  
- **High Availability**: Multi-AZ deployment with 99.9% uptime SLA  
- **Cost Optimized**: Pay-as-you-use with optimized resource allocation  
-
-### 🏗️ Infrastructure Included
-
-Your AWS deployment includes a complete, production-ready infrastructure stack:
-
- **Compute**: ECS Fargate cluster with auto-scaling services  
- **Database**: RDS MySQL 8.0 with automated backups and Multi-AZ support  
- **Cache**: ElastiCache Redis for high-performance caching  
- **Storage**: S3 object storage with CloudFront CDN for global distribution  
- **Networking**: VPC with private subnets, NAT gateways, and security groups  
- **Load Balancing**: Application Load Balancer with SSL certificates  
- **Monitoring**: CloudWatch logs, container insights, and health monitoring  
- **Messaging**: SQS message queues for background job processing  
-
-[**🚀 Deploy Now**](https://console.fleetbase.io/aws-marketplace) | [**📖 Learn More**](https://docs.fleetbase.io/category/deploying/aws)
-
 # 🧩 Extensions 

 Extensions are modular components that enhance the functionality of your Fleetbase instance. They allow you to add new features, customize existing behavior, or integrate with external systems.
@@ -217,8 +145,9 @@ Fleetbase offers a few open sourced apps which are built on Fleetbase which can
 ## 🛣️ Roadmap
 1.  **Inventory and Warehouse Management** ~ Pallet will be Fleetbase’s first official extension for WMS & Inventory.
 2.  **Accounting and Invoicing** ~ Ledger will be Fleetbase’s first official extension accounting and invoicing.
-3.  **AI** ~ AI Agent intrgation for system and workflows.
-4. **Dynamic Rules System** ~ Trigger events, tasks jobs from a rule builder on resources.
+3.  **Binary Builds** ~ Run Fleetbase from a single binary.
+4.  **Fleetbase for Desktop** ~ Desktop builds for OSX and Windows.
+5. **Custom Maps and Routing Engines** ~ Feature to enable easy integrations with custom maps and routing engines like Google Maps or Mapbox etc…

 ## 🪲 Bugs and 💡 Feature Requests

@@ -254,4 +183,3 @@ Get updates on Fleetbase's development and chat with the project maintainers and
 # License & Copyright

 Fleetbase is made available under the terms of the <a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank">GNU Affero General Public License 3.0 (AGPL 3.0)</a>. For other licenses <a href="mailto:hello@fleetbase.io" target="_blank">contact us</a>.
-
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,40 +0,0 @@
-# 🚀 Fleetbase v0.7.24 — 2025-12-21
-
-> "Critical core-api patches for cache key generation"
-
---
-
-## ✨ Highlights
-
-### Bug Fixes
- **Fixed cache key collision bug** - Different filter parameters (e.g., `type=customer` vs `type=contact`) now generate unique cache keys instead of returning wrong cached results
- **Fixed BadMethodCallException** - Models without soft deletes (like Permission) no longer crash when calling `getDeletedAtColumn()`
-
-### Improvements
- **Added caching to Permission model** - Permission queries now benefit from Redis caching for improved performance
-
---
-
-## ⚠️ Breaking Changes
- None 🙂
-
---
-
-## 🔧 Upgrade Steps
-
-```bash
-# Pull latest version
-git pull origin main --no-rebase
-
-# Update docker
-docker compose pull
-docker compose down && docker compose up -d
-
-# Run deploy script
-docker compose exec application bash -c "./deploy.sh"
-```
-
---
-
-## Need help? 
-Join the discussion on [GitHub Discussions](https://github.com/fleetbase/ember-ui/discussions) or drop by [#fleetbase on Discord](https://discord.com/invite/HnTqQ6zAVn)
--- a/TRANSLATING.md
+++ b/TRANSLATING.md
@@ -1,100 +0,0 @@
-# Contributing to Fleetbase Translations
-
-First off, thank you for considering contributing to Fleetbase translations! Your efforts help make Fleetbase accessible to a global audience. This guide will walk you through the process of adding or updating language translations for the Fleetbase platform and its various extensions.
-
-## Understanding the Structure
-
-Fleetbase is a modular system. The main application, known as Fleetbase Console, has its own set of translations. Additionally, each extension (like FleetOps or Storefront) also contains its own translation files. This means that to provide a complete translation for a specific language, you may need to contribute to multiple repositories.
-
- **Main Application (`fleetbase/fleetbase`)**: Contains the core translation files for the Fleetbase Console.
- **Extensions/Modules**: Each extension has its own repository and its own set of translation files.
-
-## File Format and Location
-
-All translation files are in the **YAML** format (`.yaml` or `.yml`). The base language for all translations is American English (`en-us.yaml`).
-
- In the main `fleetbase/fleetbase` repository, the translation files are located at `./console/translations/`.
- In each extension repository, the translation files are located at `./translations/`.
-
-Translation files are named using the language and region code, for example:
-
- `en-us.yaml` (American English)
- `fr-fr.yaml` (French, France)
- `zh-cn.yaml` (Chinese, Simplified)
-
-## How to Contribute Translations
-
-Follow these steps to contribute a new translation or update an existing one.
-
-### Step 1: Fork and Clone the Repository
-
-First, you need to fork the repository you want to contribute to. This could be the main `fleetbase/fleetbase` repository or one of the extension repositories. After forking, clone it to your local machine.
-
-### Step 2: Create or Update a Language File
-
-Navigate to the appropriate translations directory (`./console/translations/` or `./translations/`).
-
- **To add a new language**: Copy the `en-us.yaml` file and rename it to your target language code (e.g., `es-es.yaml`).
- **To update an existing language**: Open the existing language file. You can compare it with `en-us.yaml` to find missing keys or phrases that need updating.
-
-### Step 3: Translate the Content
-
-Open the YAML file in a text editor. You will see a structure of nested keys and values.
-
-```yaml
-# Example from en-us.yaml
-common:
-  new: New
-  create: Create
-  delete-selected-count: Delete {count} Selected
-```
-
-When translating, you should:
-
- **Only translate the values**, not the keys. For example, in `new: New`, you would only translate `New`.
- **Keep placeholders intact**. Some phrases contain placeholders like `{count}` or `{resource}`. These should not be translated. They are used by the application to insert dynamic values.
-
-Here is an example of the French translation for the keys above:
-
-```yaml
-# Example from fr-fr.yaml
-common:
-  new: Nouveau
-  create: Créer
-  delete-selected-count: Supprimer {count} sélectionné(s)
-```
-
-### Step 4: Submit a Pull Request
-
-Once you have finished translating, commit your changes and push them to your forked repository. Then, open a pull request to the original Fleetbase repository.
-
- Make sure your pull request has a clear title and description of the changes you made.
- If you are translating an extension, you may need to submit a pull request to the extension's repository. If your changes also affect the main console, a separate PR to the `fleetbase/fleetbase` repository might be necessary.
-
-Your contribution will be reviewed by the Fleetbase team, and once approved, it will be merged into the project.
-
-## Translation Repositories
-
-Here is a list of the primary repositories that accept translation contributions:
-
-| Repository                               | Translation Path              |
-| ---------------------------------------- | ----------------------------- |
-| [fleetbase/fleetbase][1]                 | `./console/translations/`     |
-| [fleetbase/fleetops][2]                  | `./translations/`             |
-| [fleetbase/storefront][3]                | `./translations/`             |
-| [fleetbase/dev-engine][4]                | `./translations/`             |
-| [fleetbase/iam-engine][5]                | `./translations/`             |
-| [fleetbase/pallet][6]                    | `./translations/`             |
-| [fleetbase/ledger][7]                    | `./translations/`             |
-| [fleetbase/registry-bridge][8]           | `./translations/`             |
-
-[1]: https://github.com/fleetbase/fleetbase
-[2]: https://github.com/fleetbase/fleetops
-[3]: https://github.com/fleetbase/storefront
-[4]: https://github.com/fleetbase/dev-engine
-[5]: https://github.com/fleetbase/iam-engine
-[6]: https://github.com/fleetbase/pallet
-[7]: https://github.com/fleetbase/ledger
-[8]: https://github.com/fleetbase/registry-bridge
-
-Thank you again for your contribution to the Fleetbase community!
--- a/api/app/Http/Kernel.php
+++ b/api/app/Http/Kernel.php
@@ -40,6 +40,8 @@ class Kernel extends HttpKernel
        ],

        'api' => [
+            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
+            'throttle:api',
            \Illuminate\Routing\Middleware\SubstituteBindings::class,
        ],
    ];
--- a/api/app/Providers/RouteServiceProvider.php
+++ b/api/app/Providers/RouteServiceProvider.php
@@ -2,8 +2,10 @@

 namespace App\Providers;

+use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;

 class RouteServiceProvider extends ServiceProvider
@@ -15,15 +17,17 @@ class RouteServiceProvider extends ServiceProvider
     */
    public function boot()
    {
+        $this->configureRateLimiting();
+
        $this->routes(
            function () {
                Route::get(
-                    '/health',
-                    function (Request $request) {
+                    '/status',
+                    function () {
                        return response()->json(
                            [
                                'status' => 'ok',
-                                'time' => microtime(true) - $request->attributes->get('request_start_time')
+                                'time' => microtime(true) - LARAVEL_START
                            ]
                        );
                    }
@@ -31,4 +35,19 @@ class RouteServiceProvider extends ServiceProvider
            }
        );
    }
+
+    /**
+     * Configure the rate limiters for the application.
+     *
+     * @return void
+     */
+    protected function configureRateLimiting()
+    {
+        RateLimiter::for(
+            'api',
+            function (Request $request) {
+                return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+            }
+        );
+    }
 }
--- a/api/composer.json
+++ b/api/composer.json
@@ -7,50 +7,31 @@
        "laravel"
    ],
    "license": "AGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Fleetbase Pte Ltd.",
-            "email": "hello@fleetbase.io"
-        },
-        {
-            "name": "Ronald A. Richardson",
-            "email": "ron@fleetbase.io"
-        }
-    ],
    "require": {
-        "php": ">=8.0 <=8.2.28",
+        "php": "^8.0",
        "appstract/laravel-opcache": "^4.0",
-        "fleetbase/core-api": "^1.6.30",
-        "fleetbase/fleetops-api": "^0.6.31",
-        "fleetbase/registry-bridge": "^0.1.2",
-        "fleetbase/storefront-api": "^0.4.10",
-        "fleetbase/billing-api": "^0.1.12",
-        "fleetbase/internals-api": "^0.0.23",
-        "fleetbase/aws-marketplace": "^0.0.8",
-        "fleetbase/flespi-integration": "^0.1.16",
-        "fleetbase/samsara-api": "^0.0.3",
-        "fleetbase/customer-portal-api": "^0.0.10",
-        "fleetbase/valhalla-api": "^0.0.3",
-        "fleetbase/vroom-api": "^0.0.3",
+        "fleetbase/core-api": "^1.6.2",
+        "fleetbase/fleetops-api": "^0.6.5",
+        "fleetbase/registry-bridge": "^0.0.18",
+        "fleetbase/storefront-api": "^0.3.30",
        "guzzlehttp/guzzle": "^7.0.1",
        "laravel/framework": "^10.0",
        "laravel/octane": "^2.3",
        "laravel/tinker": "^2.9",
        "league/flysystem-aws-s3-v3": "^3.0",
        "maatwebsite/excel": "^3.1",
-        "maennchen/zipstream-php": "3.1.2",
        "phpoffice/phpspreadsheet": "^1.28",
        "predis/predis": "^2.1",
        "psr/http-factory-implementation": "*",
        "resend/resend-php": "^0.14.0",
        "s-ichikawa/laravel-sendgrid-driver": "^4.0",
-        "stripe/stripe-php": "13.13.0",
        "symfony/mailgun-mailer": "^7.1",
        "symfony/postmark-mailer": "^7.1"
    },
    "require-dev": {
        "spatie/laravel-ignition": "^2.0",
        "fakerphp/faker": "^1.9.1",
+        "kitloong/laravel-migrations-generator": "^6.10",
        "laravel/sail": "^1.0.1",
        "mockery/mockery": "^1.4.4",
        "nunomaduro/collision": "^7.0",
@@ -60,14 +41,6 @@
        {
            "type": "composer",
            "url": "https://registry.fleetbase.io"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/fleetbase/aws-marketplace"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/fleetbase/internals"
        }
    ],
    "autoload": {
@@ -105,6 +78,15 @@
        ],
        "clean-logs": [
            "composer run-script clear-logs"
+        ],
+        "dock": [
+            "docker exec -it fleetbase_os_application_1 /usr/bin/tmux -u new"
+        ],
+        "dock-server": [
+            "docker exec -it fleetbase_os_httpd_1 /bin/sh"
+        ],
+        "tunnel": [
+            "ngrok http --region=ap --hostname=fleetbase.ap.ngrok.io 8000"
        ]
    },
    "extra": {
--- a/api/composer.lock
+++ b/api/composer.lock
--- a/api/config/app.php
+++ b/api/config/app.php
@@ -26,7 +26,7 @@ return [
    |
    */

-    'env' => env('APP_ENV', env('ENVIRONMENT', 'production')),
+    'env' => env('APP_ENV', 'production'),

    /*
    |--------------------------------------------------------------------------
--- a/api/config/cors.php
+++ b/api/config/cors.php
@@ -17,11 +17,11 @@ return [
    |
    */

-    'paths' => ['*', 'sanctum/csrf-cookie'],
+    'paths' => ['/*', 'sanctum/csrf-cookie'],

    'allowed_methods' => ['*'],

-    'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST')), ...Utils::arrayFrom(env('FRONTEND_HOSTS', ''))]),
+    'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST'))]),

    'allowed_origins_patterns' => [],

--- a/api/config/logging.php
+++ b/api/config/logging.php
@@ -51,7 +51,7 @@ return [
    'channels' => [
        'stack' => [
            'driver' => 'stack',
-            'channels' => ['single', 'stdout'],
+            'channels' => ['single'],
            'ignore_exceptions' => false,
        ],

--- a/api/config/mail.php
+++ b/api/config/mail.php
@@ -66,18 +66,6 @@ return [

        'resend' => [],

-        'microsoft-graph' => [
-            'transport' => 'microsoft-graph',
-            'client_id' => env('MICROSOFT_GRAPH_CLIENT_ID'),
-            'client_secret' => env('MICROSOFT_GRAPH_CLIENT_SECRET'),
-            'tenant_id' => env('MICROSOFT_GRAPH_TENANT_ID'),
-            'from' => [
-                'address' => env('MAIL_FROM_ADDRESS', 'hello@fleetbase.io'),
-                'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Fleetbase')),
-            ],
-            'save_to_sent_items' =>  env('MAIL_SAVE_TO_SENT_ITEMS', false),
-        ],
-
        'sendmail' => [
            'transport' => 'sendmail',
            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
--- a/api/config/octane.php
+++ b/api/config/octane.php
@@ -1,6 +1,5 @@
 <?php

-use Fleetbase\Support\Utils;
 use Laravel\Octane\Contracts\OperationTerminated;
 use Laravel\Octane\Events\RequestHandled;
 use Laravel\Octane\Events\RequestReceived;
@@ -105,8 +104,8 @@ return [
        OperationTerminated::class => [
            FlushOnce::class,
            FlushTemporaryContainerInstances::class,
-            DisconnectFromDatabases::class,
-            CollectGarbage::class,    
+            // DisconnectFromDatabases::class,
+            // CollectGarbage::class,
        ],

        WorkerErrorOccurred::class => [
@@ -193,7 +192,6 @@ return [
        'routes',
        'composer.lock',
        '.env',
-        ...Utils::arrayFrom(env('OCTANE_WATCH_DIRS'))
    ],

    /*
--- a/api/resources/lang/ar/auth.php
+++ b/api/resources/lang/ar/auth.php
@@ -1,19 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | أسطر لغة المصادقة
-    |--------------------------------------------------------------------------
-    |
-    | تحتوي الأسطر التالية على رسائل المصادقة التي نعرضها للمستخدم أثناء 
-    | عمليات تسجيل الدخول أو غيرها. يمكنك تعديل هذه الرسائل حسب متطلباتك.
-    |
-    */
-
-    'failed'   => 'بيانات الاعتماد هذه غير متطابقة مع سجلاتنا.',
-    'password' => 'كلمة المرور التي تم إدخالها غير صحيحة.',
-    'throttle' => 'عدد كبير جداً من محاولات الدخول. يرجى المحاولة مرة أخرى خلال :seconds ثانية.',
-
-];
--- a/api/resources/lang/ar/pagination.php
+++ b/api/resources/lang/ar/pagination.php
@@ -1,19 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | أسطر لغة الترقيم الصفحي
-    |--------------------------------------------------------------------------
-    |
-    | تُستخدم الأسطر التالية من قبل مكتبة الترقيم الصفحي لبناء روابط
-    | الترقيم البسيطة. يمكنك تعديلها كما تشاء لتخصيص العرض بما يناسب
-    | تطبيقك بشكل أفضل.
-    |
-    */
-
-    'previous' => '&laquo; السابق',
-    'next'     => 'التالي &raquo;',
-
-];
--- a/api/resources/lang/ar/passwords.php
+++ b/api/resources/lang/ar/passwords.php
@@ -1,21 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | أسطر لغة إعادة تعيين كلمة المرور
-    |--------------------------------------------------------------------------
-    |
-    | الأسطر التالية هي الرسائل الافتراضية التي يقدمها نظام إعادة تعيين
-    | كلمة المرور عند فشل المحاولة، مثل رمز التحقق غير صالح أو كلمة مرور جديدة غير صحيحة.
-    |
-    */
-
-    'reset'     => 'تم إعادة تعيين كلمة المرور الخاصة بك!',
-    'sent'      => 'لقد أرسلنا رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني!',
-    'throttled' => 'يرجى الانتظار قبل المحاولة مرة أخرى.',
-    'token'     => 'رمز إعادة تعيين كلمة المرور هذا غير صالح.',
-    'user'      => 'لا يمكننا العثور على مستخدم بهذا العنوان الإلكتروني.',
-
-];
--- a/api/resources/lang/ar/validation.php
+++ b/api/resources/lang/ar/validation.php
@@ -1,168 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted' => 'يجب قبول :attribute.',
-    'accepted_if' => 'يجب قبول :attribute عندما يكون :other يساوي :value.',
-    'active_url' => ':attribute ليس عنوان URL صالحًا.',
-    'after' => 'يجب أن يكون :attribute تاريخًا بعد :date.',
-    'after_or_equal' => 'يجب أن يكون :attribute تاريخًا بعد أو يساوي :date.',
-    'alpha' => 'يجب أن يحتوي :attribute على أحرف فقط.',
-    'alpha_dash' => 'يجب أن يحتوي :attribute على أحرف وأرقام وشرطات فقط.',
-    'alpha_num' => 'يجب أن يحتوي :attribute على أحرف وأرقام فقط.',
-    'array' => 'يجب أن يكون :attribute مصفوفة.',
-    'before' => 'يجب أن يكون :attribute تاريخًا قبل :date.',
-    'before_or_equal' => 'يجب أن يكون :attribute تاريخًا قبل أو يساوي :date.',
-    'between' => [
-        'numeric' => 'يجب أن يكون :attribute بين :min و :max.',
-        'file' => 'يجب أن يكون :attribute بين :min و :max كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute بين :min و :max حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على عدد عناصر بين :min و :max.',
-    ],
-    'boolean' => 'يجب أن يكون حقل :attribute صحيحًا أو خاطئًا.',
-    'confirmed' => 'تأكيد :attribute غير متطابق.',
-    'current_password' => 'كلمة المرور غير صحيحة.',
-    'date' => ':attribute ليس تاريخًا صالحًا.',
-    'date_equals' => 'يجب أن يكون :attribute تاريخًا يساوي :date.',
-    'date_format' => 'لا يتطابق :attribute مع الصيغة :format.',
-    'declined' => 'يجب رفض :attribute.',
-    'declined_if' => 'يجب رفض :attribute عندما يكون :other يساوي :value.',
-    'different' => 'يجب أن يكون :attribute و :other مختلفين.',
-    'digits' => 'يجب أن يتكون :attribute من :digits أرقام.',
-    'digits_between' => 'يجب أن يتكون :attribute من :min إلى :max أرقام.',
-    'dimensions' => ':attribute يحتوي على أبعاد صورة غير صالحة.',
-    'distinct' => 'حقل :attribute يحتوي على قيمة مكررة.',
-    'email' => 'يجب أن يكون :attribute عنوان بريد إلكتروني صالحًا.',
-    'ends_with' => 'يجب أن ينتهي :attribute بأحد القيم التالية: :values.',
-    'enum' => ':attribute المحدد غير صالح.',
-    'exists' => ':attribute المحدد غير صالح.',
-    'file' => 'يجب أن يكون :attribute ملفًا.',
-    'filled' => 'يجب أن يحتوي حقل :attribute على قيمة.',
-    'gt' => [
-        'numeric' => 'يجب أن يكون :attribute أكبر من :value.',
-        'file' => 'يجب أن يكون :attribute أكبر من :value كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute أكبر من :value حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على أكثر من :value عنصر.',
-    ],
-    'gte' => [
-        'numeric' => 'يجب أن يكون :attribute أكبر من أو يساوي :value.',
-        'file' => 'يجب أن يكون :attribute أكبر من أو يساوي :value كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute أكبر من أو يساوي :value حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على :value عنصر أو أكثر.',
-    ],
-    'image' => 'يجب أن يكون :attribute صورة.',
-    'in' => ':attribute المحدد غير صالح.',
-    'in_array' => 'حقل :attribute غير موجود في :other.',
-    'integer' => 'يجب أن يكون :attribute عددًا صحيحًا.',
-    'ip' => 'يجب أن يكون :attribute عنوان IP صالحًا.',
-    'ipv4' => 'يجب أن يكون :attribute عنوان IPv4 صالحًا.',
-    'ipv6' => 'يجب أن يكون :attribute عنوان IPv6 صالحًا.',
-    'json' => 'يجب أن يكون :attribute نصًا بصيغة JSON صالحة.',
-    'lt' => [
-        'numeric' => 'يجب أن يكون :attribute أقل من :value.',
-        'file' => 'يجب أن يكون :attribute أقل من :value كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute أقل من :value حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على أقل من :value عنصر.',
-    ],
-    'lte' => [
-        'numeric' => 'يجب أن يكون :attribute أقل من أو يساوي :value.',
-        'file' => 'يجب أن يكون :attribute أقل من أو يساوي :value كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute أقل من أو يساوي :value حرفًا.',
-        'array' => 'يجب ألا يحتوي :attribute على أكثر من :value عنصر.',
-    ],
-    'mac_address' => 'يجب أن يكون :attribute عنوان MAC صالحًا.',
-    'max' => [
-        'numeric' => 'يجب ألا يتجاوز :attribute :max.',
-        'file' => 'يجب ألا يتجاوز :attribute :max كيلوبايت.',
-        'string' => 'يجب ألا يتجاوز :attribute :max حرفًا.',
-        'array' => 'يجب ألا يحتوي :attribute على أكثر من :max عنصر.',
-    ],
-    'mimes' => 'يجب أن يكون :attribute ملفًا من النوع: :values.',
-    'mimetypes' => 'يجب أن يكون :attribute ملفًا من النوع: :values.',
-    'min' => [
-        'numeric' => 'يجب أن يكون :attribute على الأقل :min.',
-        'file' => 'يجب أن يكون :attribute على الأقل :min كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute على الأقل :min حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على الأقل على :min عنصر.',
-    ],
-    'multiple_of' => 'يجب أن يكون :attribute مضاعفًا لـ :value.',
-    'not_in' => ':attribute المحدد غير صالح.',
-    'not_regex' => 'صيغة :attribute غير صالحة.',
-    'numeric' => 'يجب أن يكون :attribute رقمًا.',
-    'password' => 'كلمة المرور غير صحيحة.',
-    'present' => 'يجب أن يكون حقل :attribute موجودًا.',
-    'prohibited' => 'حقل :attribute محظور.',
-    'prohibited_if' => 'حقل :attribute محظور عندما يكون :other يساوي :value.',
-    'prohibited_unless' => 'حقل :attribute محظور إلا إذا كان :other ضمن :values.',
-    'prohibits' => 'حقل :attribute يحظر وجود :other.',
-    'regex' => 'صيغة :attribute غير صالحة.',
-    'required' => 'حقل :attribute مطلوب.',
-    'required_array_keys' => 'يجب أن يحتوي حقل :attribute على إدخالات لـ: :values.',
-    'required_if' => 'حقل :attribute مطلوب عندما يكون :other يساوي :value.',
-    'required_unless' => 'حقل :attribute مطلوب إلا إذا كان :other ضمن :values.',
-    'required_with' => 'حقل :attribute مطلوب عند وجود :values.',
-    'required_with_all' => 'حقل :attribute مطلوب عند وجود جميع القيم :values.',
-    'required_without' => 'حقل :attribute مطلوب عند عدم وجود :values.',
-    'required_without_all' => 'حقل :attribute مطلوب عند عدم وجود أي من القيم :values.',
-    'same' => 'يجب أن يتطابق :attribute مع :other.',
-    'size' => [
-        'numeric' => 'يجب أن يكون :attribute مساويًا لـ :size.',
-        'file' => 'يجب أن يكون :attribute مساويًا لـ :size كيلوبايت.',
-        'string' => 'يجب أن يكون :attribute مساويًا لـ :size حرفًا.',
-        'array' => 'يجب أن يحتوي :attribute على :size عنصر.',
-    ],
-    'starts_with' => 'يجب أن يبدأ :attribute بأحد القيم التالية: :values.',
-    'string' => 'يجب أن يكون :attribute نصًا.',
-    'timezone' => 'يجب أن يكون :attribute منطقة زمنية صالحة.',
-    'unique' => 'تم استخدام :attribute مسبقًا.',
-    'uploaded' => 'فشل تحميل :attribute.',
-    'url' => 'يجب أن يكون :attribute عنوان URL صالحًا.',
-    'uuid' => 'يجب أن يكون :attribute UUID صالحًا.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'رسالة مخصصة',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap our attribute placeholder
-    | with something more reader friendly such as "E-Mail Address" instead
-    | of "email". This simply helps us make our message more expressive.
-    |
-    */
-
-    'attributes' => [],
-
-];
--- a/api/resources/lang/es-mx/auth.php
+++ b/api/resources/lang/es-mx/auth.php
@@ -1,20 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used during authentication for various
-    | messages that we need to display to the user. You are free to modify
-    | these language lines according to your application's requirements.
-    |
-    */
-
-    'failed' => 'Estas credenciales no coinciden con nuestros registros.',
-    'password' => 'La contraseña proporcionada es incorrecta.',
-    'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, intenta de nuevo en :seconds segundos.',
-
-];
--- a/api/resources/lang/es-mx/pagination.php
+++ b/api/resources/lang/es-mx/pagination.php
@@ -1,19 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Pagination Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used by the paginator library to build
-    | the simple pagination links. You are free to change them to anything
-    | you want to customize your views to better match your application.
-    |
-    */
-
-    'previous' => '&laquo; Anterior',
-    'next' => 'Siguiente &raquo;',
-
-];
--- a/api/resources/lang/es-mx/passwords.php
+++ b/api/resources/lang/es-mx/passwords.php
@@ -1,22 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are the default lines which match reasons
-    | that are given by the password broker for a password update attempt
-    | has failed, such as for an invalid token or invalid new password.
-    |
-    */
-
-    'reset' => '¡Tu contraseña ha sido restablecida!',
-    'sent' => '¡Te hemos enviado por correo el enlace para restablecer tu contraseña!',
-    'throttled' => 'Por favor espera antes de volver a intentar.',
-    'token' => 'Este token de restablecimiento de contraseña es inválido.',
-    'user' => "No podemos encontrar un usuario con esa dirección de correo electrónico.",
-
-];
--- a/api/resources/lang/es-mx/validation.php
+++ b/api/resources/lang/es-mx/validation.php
@@ -1,163 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted' => 'El campo :attribute debe ser aceptado.',
-    'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other sea :value.',
-    'active_url' => 'El campo :attribute no es una URL válida.',
-    'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
-    'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
-    'alpha' => 'El campo :attribute solo debe contener letras.',
-    'alpha_dash' => 'El campo :attribute solo debe contener letras, números, guiones y guiones bajos.',
-    'alpha_num' => 'El campo :attribute solo debe contener letras y números.',
-    'array' => 'El campo :attribute debe ser un arreglo.',
-    'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
-    'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
-    'between' => [
-        'numeric' => 'El campo :attribute debe estar entre :min y :max.',
-        'file' => 'El campo :attribute debe estar entre :min y :max kilobytes.',
-        'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
-        'array' => 'El campo :attribute debe tener entre :min y :max elementos.',
-    ],
-    'boolean' => 'El campo :attribute debe ser verdadero o falso.',
-    'confirmed' => 'La confirmación de :attribute no coincide.',
-    'current_password' => 'La contraseña es incorrecta.',
-    'date' => 'El campo :attribute no es una fecha válida.',
-    'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
-    'date_format' => 'El campo :attribute no coincide con el formato :format.',
-    'declined' => 'El campo :attribute debe ser rechazado.',
-    'declined_if' => 'El campo :attribute debe ser rechazado cuando :other sea :value.',
-    'different' => 'El campo :attribute y :other deben ser diferentes.',
-    'digits' => 'El campo :attribute debe tener :digits dígitos.',
-    'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
-    'dimensions' => 'El campo :attribute tiene dimensiones de imagen inválidas.',
-    'distinct' => 'El campo :attribute tiene un valor duplicado.',
-    'email' => 'El campo :attribute debe ser una dirección de correo electrónico válida.',
-    'ends_with' => 'El campo :attribute debe terminar con uno de los siguientes: :values.',
-    'enum' => 'El :attribute seleccionado es inválido.',
-    'exists' => 'El :attribute seleccionado es inválido.',
-    'file' => 'El campo :attribute debe ser un archivo.',
-    'filled' => 'El campo :attribute debe tener un valor.',
-    'gt' => [
-        'numeric' => 'El campo :attribute debe ser mayor que :value.',
-        'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
-        'string' => 'El campo :attribute debe ser mayor que :value caracteres.',
-        'array' => 'El campo :attribute debe tener más de :value elementos.',
-    ],
-    'gte' => [
-        'numeric' => 'El campo :attribute debe ser mayor o igual a :value.',
-        'file' => 'El campo :attribute debe ser mayor o igual a :value kilobytes.',
-        'string' => 'El campo :attribute debe ser mayor o igual a :value caracteres.',
-        'array' => 'El campo :attribute debe tener :value elementos o más.',
-    ],
-    'image' => 'El campo :attribute debe ser una imagen.',
-    'in' => 'El :attribute seleccionado es inválido.',
-    'in_array' => 'El campo :attribute no existe en :other.',
-    'integer' => 'El campo :attribute debe ser un número entero.',
-    'ip' => 'El campo :attribute debe ser una dirección IP válida.',
-    'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
-    'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
-    'json' => 'El campo :attribute debe ser una cadena JSON válida.',
-    'lt' => [
-        'numeric' => 'El campo :attribute debe ser menor que :value.',
-        'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
-        'string' => 'El campo :attribute debe ser menor que :value caracteres.',
-        'array' => 'El campo :attribute debe tener menos de :value elementos.',
-    ],
-    'lte' => [
-        'numeric' => 'El campo :attribute debe ser menor o igual a :value.',
-        'file' => 'El campo :attribute debe ser menor o igual a :value kilobytes.',
-        'string' => 'El campo :attribute debe ser menor o igual a :value caracteres.',
-        'array' => 'El campo :attribute no debe tener más de :value elementos.',
-    ],
-    'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
-    'max' => [
-        'numeric' => 'El campo :attribute no debe ser mayor que :max.',
-        'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
-        'string' => 'El campo :attribute no debe ser mayor que :max caracteres.',
-        'array' => 'El campo :attribute no debe tener más de :max elementos.',
-    ],
-    'mimes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
-    'mimetypes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
-    'min' => [
-        'numeric' => 'El campo :attribute debe ser al menos :min.',
-        'file' => 'El campo :attribute debe ser al menos :min kilobytes.',
-        'string' => 'El campo :attribute debe tener al menos :min caracteres.',
-        'array' => 'El campo :attribute debe tener al menos :min elementos.',
-    ],
-    'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
-    'not_in' => 'El :attribute seleccionado es inválido.',
-    'not_regex' => 'El formato del campo :attribute es inválido.',
-    'numeric' => 'El campo :attribute debe ser un número.',
-    'password' => 'La contraseña es incorrecta.',
-    'present' => 'El campo :attribute debe estar presente.',
-    'prohibited' => 'El campo :attribute está prohibido.',
-    'prohibited_if' => 'El campo :attribute está prohibido cuando :other sea :value.',
-    'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
-    'prohibits' => 'El campo :attribute prohíbe que :other esté presente.',
-    'regex' => 'El formato del campo :attribute es inválido.',
-    'required' => 'El campo :attribute es obligatorio.',
-    'required_array_keys' => 'El campo :attribute debe contener entradas para: :values.',
-    'required_if' => 'El campo :attribute es obligatorio cuando :other sea :value.',
-    'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
-    'required_with_all' => 'El campo :attribute es obligatorio cuando :values están presentes.',
-    'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.',
-    'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values están presentes.',
-    'same' => 'El campo :attribute y :other deben coincidir.',
-    'size' => [
-        'numeric' => 'El campo :attribute debe ser :size.',
-        'file' => 'El campo :attribute debe ser :size kilobytes.',
-        'string' => 'El campo :attribute debe tener :size caracteres.',
-        'array' => 'El campo :attribute debe contener :size elementos.',
-    ],
-    'starts_with' => 'El campo :attribute debe comenzar con uno de los siguientes: :values.',
-    'string' => 'El campo :attribute debe ser una cadena de texto.',
-    'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
-    'unique' => 'El campo :attribute ya ha sido tomado.',
-    'uploaded' => 'El campo :attribute falló al subir.',
-    'url' => 'El campo :attribute debe ser una URL válida.',
-    'uuid' => 'El campo :attribute debe ser un UUID válido.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap our attribute placeholder
-    | with something more reader friendly such as "E-Mail Address" instead
-    | of "email". This simply helps us make our message more expressive.
-    |
-    */
-
-    'attributes' => [],
-
-];
--- a/api/resources/lang/fa/auth.php
+++ b/api/resources/lang/fa/auth.php
@@ -1,15 +0,0 @@
-<?php
-return [
-    /*
-    |--------------------------------------------------------------------------
-    | خطوط زبان احراز هویت
-    |--------------------------------------------------------------------------
-    |
-    | خطوط زبان زیر در طول احراز هویت برای پیام‌های مختلفی که باید به کاربر نمایش دهیم استفاده می‌شوند.
-    | شما می‌توانید این خطوط زبان را بر اساس نیازهای برنامه خود تغییر دهید.
-    |
-    */
-    'failed' => 'این اطلاعات ورود با سوابق ما مطابقت ندارد.',
-    'password' => 'رمز عبور ارائه‌شده نادرست است.',
-    'throttle' => 'تعداد تلاش‌های ورود بیش از حد زیاد است. لطفاً پس از :seconds ثانیه دوباره تلاش کنید.',
-];
--- a/api/resources/lang/fa/pagination.php
+++ b/api/resources/lang/fa/pagination.php
@@ -1,18 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | خطوط زبان صفحه‌بندی
-    |--------------------------------------------------------------------------
-    |
-    | خطوط زبان زیر توسط کتابخانه صفحه‌بندی برای ساخت لینک‌های صفحه‌بندی ساده استفاده می‌شوند.
-    | شما می‌توانید این خطوط را به دلخواه تغییر دهید تا با نیازهای برنامه خود سازگار شوند.
-    |
-    */
-
-    'previous' => '&laquo; قبلی',
-    'next' => 'بعدی &raquo;',
-
-];
--- a/api/resources/lang/fa/passwords.php
+++ b/api/resources/lang/fa/passwords.php
@@ -1,22 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | خطوط زبان بازنشانی رمز عبور
-    |--------------------------------------------------------------------------
-    |
-    | خطوط زبان زیر خطوط پیش‌فرضی هستند که با دلایلی که توسط کارگزار رمز عبور
-    | برای تلاش‌های ناموفق به‌روزرسانی رمز عبور ارائه می‌شوند، مطابقت دارند،
-    | مانند توکن نامعتبر یا رمز عبور جدید نامعتبر.
-    |
-    */
-
-    'reset' => 'رمز عبور شما بازنشانی شد!',
-    'sent' => 'لینک بازنشانی رمز عبور به ایمیل شما ارسال شد!',
-    'throttled' => 'لطفاً قبل از تلاش مجدد صبر کنید.',
-    'token' => 'این توکن بازنشانی رمز عبور نامعتبر است.',
-    'user' => 'کاربری با این آدرس ایمیل یافت نشد.',
-
-];
--- a/api/resources/lang/fa/validation.php
+++ b/api/resources/lang/fa/validation.php
@@ -1,163 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | خطوط زبان اعتبارسنجی
-    |--------------------------------------------------------------------------
-    |
-    | خطوط زبان زیر شامل پیام‌های خطای پیش‌فرض استفاده‌شده توسط کلاس اعتبارسنجی هستند.
-    | برخی از این قوانین نسخه‌های متعددی دارند، مانند قوانین مربوط به اندازه.
-    | شما می‌توانید این پیام‌ها را در اینجا به دلخواه تنظیم کنید.
-    |
-    */
-
-    'accepted' => 'فیلد :attribute باید پذیرفته شود.',
-    'accepted_if' => 'فیلد :attribute باید پذیرفته شود وقتی :other برابر با :value باشد.',
-    'active_url' => 'فیلد :attribute یک URL معتبر نیست.',
-    'after' => 'فیلد :attribute باید تاریخی پس از :date باشد.',
-    'after_or_equal' => 'فیلد :attribute باید تاریخی پس از یا برابر با :date باشد.',
-    'alpha' => 'فیلد :attribute فقط باید شامل حروف باشد.',
-    'alpha_dash' => 'فیلد :attribute فقط باید شامل حروف، اعداد، خط تیره و زیرخط باشد.',
-    'alpha_num' => 'فیلد :attribute فقط باید شامل حروف و اعداد باشد.',
-    'array' => 'فیلد :attribute باید یک آرایه باشد.',
-    'before' => 'فیلد :attribute باید تاریخی قبل از :date باشد.',
-    'before_or_equal' => 'فیلد :attribute باید تاریخی قبل از یا برابر با :date باشد.',
-    'between' => [
-        'numeric' => 'فیلد :attribute باید بین :min و :max باشد.',
-        'file' => 'فیلد :attribute باید بین :min و :max کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید بین :min و :max کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید بین :min و :max آیتم داشته باشد.',
-    ],
-    'boolean' => 'فیلد :attribute باید true یا false باشد.',
-    'confirmed' => 'تأیید فیلد :attribute مطابقت ندارد.',
-    'current_password' => 'رمز عبور نادرست است.',
-    'date' => 'فیلد :attribute یک تاریخ معتبر نیست.',
-    'date_equals' => 'فیلد :attribute باید تاریخی برابر با :date باشد.',
-    'date_format' => 'فیلد :attribute با فرمت :format مطابقت ندارد.',
-    'declined' => 'فیلد :attribute باید رد شود.',
-    'declined_if' => 'فیلد :attribute باید رد شود وقتی :other برابر با :value باشد.',
-    'different' => 'فیلد :attribute و :other باید متفاوت باشند.',
-    'digits' => 'فیلد :attribute باید :digits رقم باشد.',
-    'digits_between' => 'فیلد :attribute باید بین :min و :max رقم باشد.',
-    'dimensions' => 'فیلد :attribute دارای ابعاد تصویر نامعتبر است.',
-    'distinct' => 'فیلد :attribute دارای مقدار تکراری است.',
-    'email' => 'فیلد :attribute باید یک آدرس ایمیل معتبر باشد.',
-    'ends_with' => 'فیلد :attribute باید با یکی از مقادیر زیر پایان یابد: :values.',
-    'enum' => 'مقدار انتخاب‌شده برای :attribute نامعتبر است.',
-    'exists' => 'مقدار انتخاب‌شده برای :attribute نامعتبر است.',
-    'file' => 'فیلد :attribute باید یک فایل باشد.',
-    'filled' => 'فیلد :attribute باید دارای مقدار باشد.',
-    'gt' => [
-        'numeric' => 'فیلد :attribute باید بزرگ‌تر از :value باشد.',
-        'file' => 'فیلد :attribute باید بزرگ‌تر از :value کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید بیش از :value کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید بیش از :value آیتم داشته باشد.',
-    ],
-    'gte' => [
-        'numeric' => 'فیلد :attribute باید بزرگ‌تر یا برابر با :value باشد.',
-        'file' => 'فیلد :attribute باید بزرگ‌تر یا برابر با :value کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید بیش از یا برابر با :value کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید :value آیتم یا بیشتر داشته باشد.',
-    ],
-    'image' => 'فیلد :attribute باید یک تصویر باشد.',
-    'in' => 'مقدار انتخاب‌شده برای :attribute نامعتبر است.',
-    'in_array' => 'فیلد :attribute در :other وجود ندارد.',
-    'integer' => 'فیلد :attribute باید یک عدد صحیح باشد.',
-    'ip' => 'فیلد :attribute باید یک آدرس IP معتبر باشد.',
-    'ipv4' => 'فیلد :attribute باید یک آدرس IPv4 معتبر باشد.',
-    'ipv6' => 'فیلد :attribute باید یک آدرس IPv6 معتبر باشد.',
-    'json' => 'فیلد :attribute باید یک رشته JSON معتبر باشد.',
-    'lt' => [
-        'numeric' => 'فیلد :attribute باید کمتر از :value باشد.',
-        'file' => 'فیلد :attribute باید کمتر از :value کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید کمتر از :value کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید کمتر از :value آیتم داشته باشد.',
-    ],
-    'lte' => [
-        'numeric' => 'فیلد :attribute باید کمتر یا برابر با :value باشد.',
-        'file' => 'فیلد :attribute باید کمتر یا برابر با :value کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید کمتر یا برابر با :value کاراکتر باشد.',
-        'array' => 'فیلد :attribute نباید بیش از :value آیتم داشته باشد.',
-    ],
-    'mac_address' => 'فیلد :attribute باید یک آدرس MAC معتبر باشد.',
-    'max' => [
-        'numeric' => 'فیلد :attribute نباید بزرگ‌تر از :max باشد.',
-        'file' => 'فیلد :attribute نباید بزرگ‌تر از :max کیلوبایت باشد.',
-        'string' => 'فیلد :attribute نباید بیش از :max کاراکتر باشد.',
-        'array' => 'فیلد :attribute نباید بیش از :max آیتم داشته باشد.',
-    ],
-    'mimes' => 'فیلد :attribute باید یک فایل از نوع: :values باشد.',
-    'mimetypes' => 'فیلد :attribute باید یک فایل از نوع: :values باشد.',
-    'min' => [
-        'numeric' => 'فیلد :attribute باید حداقل :min باشد.',
-        'file' => 'فیلد :attribute باید حداقل :min کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید حداقل :min کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید حداقل :min آیتم داشته باشد.',
-    ],
-    'multiple_of' => 'فیلد :attribute باید مضربی از :value باشد.',
-    'not_in' => 'مقدار انتخاب‌شده برای :attribute نامعتبر است.',
-    'not_regex' => 'فرمت فیلد :attribute نامعتبر است.',
-    'numeric' => 'فیلد :attribute باید یک عدد باشد.',
-    'password' => 'رمز عبور نادرست است.',
-    'present' => 'فیلد :attribute باید وجود داشته باشد.',
-    'prohibited' => 'فیلد :attribute ممنوع است.',
-    'prohibited_if' => 'فیلد :attribute وقتی :other برابر با :value باشد ممنوع است.',
-    'prohibited_unless' => 'فیلد :attribute ممنوع است مگر اینکه :other در :values باشد.',
-    'prohibits' => 'فیلد :attribute مانع حضور :other می‌شود.',
-    'regex' => 'فرمت فیلد :attribute نامعتبر است.',
-    'required' => 'فیلد :attribute الزامی است.',
-    'required_array_keys' => 'فیلد :attribute باید شامل ورودی‌هایی برای: :values باشد.',
-    'required_if' => 'فیلد :attribute وقتی :other برابر با :value باشد الزامی است.',
-    'required_unless' => 'فیلد :attribute الزامی است مگر اینکه :other در :values باشد.',
-    'required_with' => 'فیلد :attribute وقتی :values وجود دارد الزامی است.',
-    'required_with_all' => 'فیلد :attribute وقتی همه :values وجود دارند الزامی است.',
-    'required_without' => 'فیلد :attribute وقتی :values وجود ندارد الزامی است.',
-    'required_without_all' => 'فیلد :attribute وقتی هیچ‌کدام از :values وجود ندارند الزامی است.',
-    'same' => 'فیلد :attribute و :other باید یکسان باشند.',
-    'size' => [
-        'numeric' => 'فیلد :attribute باید :size باشد.',
-        'file' => 'فیلد :attribute باید :size کیلوبایت باشد.',
-        'string' => 'فیلد :attribute باید :size کاراکتر باشد.',
-        'array' => 'فیلد :attribute باید شامل :size آیتم باشد.',
-    ],
-    'starts_with' => 'فیلد :attribute باید با یکی از مقادیر زیر شروع شود: :values.',
-    'string' => 'فیلد :attribute باید یک رشته باشد.',
-    'timezone' => 'فیلد :attribute باید یک منطقه زمانی معتبر باشد.',
-    'unique' => 'فیلد :attribute قبلاً استفاده شده است.',
-    'uploaded' => 'فیلد :attribute در آپلود ناموفق بود.',
-    'url' => 'فیلد :attribute باید یک URL معتبر باشد.',
-    'uuid' => 'فیلد :attribute باید یک UUID معتبر باشد.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | خطوط زبان اعتبارسنجی سفارشی
-    |--------------------------------------------------------------------------
-    |
-    | در اینجا می‌توانید پیام‌های اعتبارسنجی سفارشی برای ویژگی‌ها را با استفاده از
-    | قرارداد "attribute.rule" برای نام‌گذاری خطوط مشخص کنید. این کار امکان
-    | تعیین سریع یک خط زبان سفارشی برای یک قانون خاص ویژگی را فراهم می‌کند.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'پیام سفارشی',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | ویژگی‌های اعتبارسنجی سفارشی
-    |--------------------------------------------------------------------------
-    |
-    | خطوط زبان زیر برای جایگزینی placeholder ویژگی‌های ما با چیزی کاربرپسندتر
-    | مانند "آدرس ایمیل" به جای "email" استفاده می‌شوند. این کار به ما کمک می‌کند
-    | پیام‌هایمان را گویاتر کنیم.
-    |
-    */
-
-    'attributes' => [],
-
-];
--- a/builds/linux/build-linux.sh
+++ b/builds/linux/build-linux.sh
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Resolve the directory the script is located in
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
-
-APP_NAME="Fleetbase"
-IMAGE_NAME="fleetbase-linux-static"
-CONTAINER_NAME="fleetbase-linux-build"
-DIST_DIR="$ROOT_DIR/builds/dist"
-BINARY_NAME="fleetbase-linux-x86_64"
-DOCKERFILE="$ROOT_DIR/builds/linux/static-build.Dockerfile"
-
-# Ensure pkg-config archive is available
-SPC_DOWNLOADS_DIR="$SCRIPT_DIR/spc/downloads"
-PKG_TAR="pkg-config-0.29.2.tar.gz"
-PKG_URL="https://static-php-cli.fra1.digitaloceanspaces.com/static-php-cli/deps/pkg-config/${PKG_TAR}"
-
-if [[ ! -f "${SPC_DOWNLOADS_DIR}/${PKG_TAR}" ]]; then
-  echo "📥  pkg-config archive missing – downloading..."
-  mkdir -p "${SPC_DOWNLOADS_DIR}"
-  curl -L --retry 3 -o "${SPC_DOWNLOADS_DIR}/${PKG_TAR}" "${PKG_URL}"
-else
-  echo "✅  pkg-config archive already present."
-fi
-
-# Build the image
-echo "📦 Building static Linux binary for ${APP_NAME}..."
-docker build -f "$DOCKERFILE" -t "$IMAGE_NAME" .
-
-# Create a container from the built image
-echo "📦 Creating container to extract binary..."
-docker create --name "$CONTAINER_NAME" "$IMAGE_NAME"
-
-# Make sure dist folder exist
-mkdir -p "$DIST_DIR"
-
-# Copy binary from container to local dist folder
-echo "📂 Extracting binary..."
-docker cp "$CONTAINER_NAME:/go/src/app/dist/frankenphp-linux-x86_64" "$DIST_DIR/$BINARY_NAME"
-
-# Cleanup the temp container
-docker rm "$CONTAINER_NAME"
-
-echo "✅ Build complete! Binary is located at: $DIST_DIR/$BINARY_NAME"
--- a/builds/linux/spc/libgeos-linux.php
+++ b/builds/linux/spc/libgeos-linux.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class libgeos extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\libgeos;
-
-    public const NAME = 'libgeos';
-}
--- a/builds/linux/spc/libgeos-unix.php
+++ b/builds/linux/spc/libgeos-unix.php
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\store\FileSystem;
-
-trait libgeos
-{
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        FileSystem::resetDir($this->source_dir . '/build');
-
-        shell()->cd($this->source_dir . '/build')
-            ->setEnv([
-                'CFLAGS'   => $this->getLibExtraCFlags(),
-                'LDFLAGS'  => $this->getLibExtraLdFlags(),
-                'LIBS'     => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF ..")
-            ->execWithEnv("make -j{$this->builder->concurrency}")
-            ->execWithEnv('make install');
-
-        $this->patchPkgconfPrefix(['geos.pc']);
-    }
-}
--- a/builds/linux/static-build.Dockerfile
+++ b/builds/linux/static-build.Dockerfile
@@ -1,93 +0,0 @@
-# FROM --platform=linux/amd64 dunglas/frankenphp:static-builder
-FROM --platform=linux/amd64 docker.io/dunglas/frankenphp:static-builder@sha256:821526b776a26502735d83890cc0a0d579348c510ba6c777df0762cb1c50d967
-
-WORKDIR /go/src/app
-
-# Copy Fleetbase app
-COPY ../../api ./dist/app
-
-# Set working directory to the embedded Fleetbase app
-WORKDIR /go/src/app/dist/app
-
-# Setup for production environment
-ENV APP_ENV=production
-ENV APP_DEBUG=false
-ENV BROADCAST_DRIVER=socketcluster
-ENV OSRM_HOST="https://router.project-osrm.org"
-ENV REGISTRY_PREINSTALLED_EXTENSIONS=true
-
-# Optional: Ensure writable storage
-RUN chmod -R 775 bootstrap/cache storage
-
-# Set permissions for deploy script
-RUN chmod +x ./deploy.sh
-
-# Move back to main app directory before running build-static.sh
-WORKDIR /go/src/app
-
-# Install geos lib
-RUN apk add --no-cache geos geos-dev
-
-# Inject the libgeos library handlers
-COPY ./builds/linux/spc/libgeos-linux.php ./dist/static-php-cli/src/SPC/builder/linux/library/libgeos.php
-COPY ./builds/linux/spc/libgeos-unix.php ./dist/static-php-cli/src/SPC/builder/unix/library/libgeos.php
-
-# Patch source.json to add geos extension source
-RUN jq '. + {"php-geos": {"type": "url", "url": "https://github.com/libgeos/php-geos/archive/dfe1ab17b0f155cc315bc13c75689371676e02e1.zip", "license": [{"type": "file", "path": "php-geos-dfe1ab17b0f155cc315bc13c75689371676e02e1/MIT-LICENSE"}, {"type": "file", "path": "php-geos-dfe1ab17b0f155cc315bc13c75689371676e02e1/LGPL-2"}]}}' \
-  ./dist/static-php-cli/config/source.json > ./dist/static-php-cli/config/source.tmp.json && \
-  mv ./dist/static-php-cli/config/source.tmp.json ./dist/static-php-cli/config/source.json
-
-# Pathc source.json to add libgeos library
-RUN jq '. + {"libgeos": {"type": "url", "url": "https://download.osgeo.org/geos/geos-3.12.1.tar.bz2", "filename": "geos-3.12.1.tar.bz2", "extract": "geos-3.12.1", "build-dir": "build", "license": [{"type": "file", "path": "COPYING"}]}}' \
-  ./dist/static-php-cli/config/source.json > ./dist/static-php-cli/config/source.tmp.json && \
-  mv ./dist/static-php-cli/config/source.tmp.json ./dist/static-php-cli/config/source.json
-
-# Patch ext.json to add geos extension dynamically
-RUN jq '. + {"geos": {"type": "external", "arg-type": "enable", "source": "php-geos", "lib-depends": ["libgeos"]}}' \
-  ./dist/static-php-cli/config/ext.json > ./dist/static-php-cli/config/ext.tmp.json && \
-  mv ./dist/static-php-cli/config/ext.tmp.json ./dist/static-php-cli/config/ext.json
-
-# Patch lib.json to add libgeos
-RUN jq '. + {"libgeos": {"source": "libgeos", "static-libs-unix": ["libgeos.a", "libgeos_c.a"]}}' \
-  ./dist/static-php-cli/config/lib.json > ./dist/static-php-cli/config/lib.tmp.json && \
-  mv ./dist/static-php-cli/config/lib.tmp.json ./dist/static-php-cli/config/lib.json
-
-# Install dependencies for SPC CLI
-WORKDIR /go/src/app/dist/static-php-cli
-RUN composer install --no-dev -a
-
-# Set PHP extensions to be built (including geos!)
-ENV PHP_EXTENSIONS="pdo_mysql,gd,bcmath,redis,intl,zip,gmp,apcu,opcache,imagick,sockets,pcntl,geos,iconv,mbstring,fileinfo,ctype,tokenizer,simplexml,dom,filter,session"
-ENV PHP_EXTENSION_LIBS="libgeos,libzip,bzip2,libxml2,openssl,zlib"
-
-# Force SPC to use the local source version (not download binary)
-ENV SPC_REL_TYPE=source
-
-# Debug build
-ENV SPC_LOG_LEVEL=debug
-
-# Skip compression
-ENV NO_COMPRESS=1
-
-# set PHP version
-ENV PHP_VERSION=8.2
-
-# Move to the app directory
-WORKDIR /go/src/app
-
-# Make sure pkg-config is available within the static build container
-COPY ./builds/linux/spc/downloads/pkg-config-0.29.2.tar.gz ./dist/static-php-cli/downloads/pkg-config-0.29.2.tar.gz
-
-# Pre-build pkg-config using the existing tarball
-RUN apk add --no-cache build-base && \
-    tar -xzf ./dist/static-php-cli/downloads/pkg-config-0.29.2.tar.gz -C /tmp && \
-    cd /tmp/pkg-config-0.29.2 && \
-    ./configure --with-internal-glib --prefix=/go/src/app/dist/static-php-cli/build/bin && \
-    make && make install && \
-    rm -rf /tmp/pkg-config-0.29.2
-
-# Do not run git pull
-RUN sed -i 's/^[ \t]*git pull/# git pull/' ./build-static.sh
-
-# Build the FrankenPHP static binary
-RUN EMBED=dist/app ./build-static.sh
--- a/builds/osx/build-osx.sh
+++ b/builds/osx/build-osx.sh
@@ -1,188 +0,0 @@
-#!/bin/bash
-
-set -e
-
-log() {
-    echo -e "\033[1;34m[🔧 $1]\033[0m"
-}
-
-log_success() {
-    echo -e "\033[1;32m[✅ $1]\033[0m"
-}
-
-log_warn() {
-    echo -e "\033[1;33m[⚠️  $1]\033[0m"
-}
-
-log_error() {
-    echo -e "\033[1;31m[❌ $1]\033[0m"
-}
-
-# Define base paths
-log "Resolving directories..."
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
-OSX_DIR="$ROOT_DIR/builds/osx"
-DIST_DIR="$ROOT_DIR/builds/dist"
-APP_DIR="$ROOT_DIR/api"
-BREW_PREFIX="/opt/homebrew"
-
-OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
-ARCH="$(uname -m)"
-BINARY_NAME="fleetbase-$OS-$ARCH"
-
-log "Binary will be: $BINARY_NAME"
-
-# Setup PHP 8.4
-log "Detecting current PHP version..."
-ORIGINAL_PHP_PATH="$(which php)"
-ORIGINAL_PHP_VERSION="$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION.".".PHP_RELEASE_VERSION;' 2>/dev/null)"
-IS_ASDF_MANAGED=false
-
-if [[ "$ORIGINAL_PHP_PATH" == *".asdf"* ]]; then
-    IS_ASDF_MANAGED=true
-fi
-
-# 🔁 Trap to restore PHP when script exits
-trap 'if [ "$IS_ASDF_MANAGED" = true ]; then
-          log "Restoring asdf-managed PHP version: $ORIGINAL_PHP_VERSION"
-          asdf set php "$ORIGINAL_PHP_VERSION" || true
-          log "Reverted to PHP $(php -v | head -n 1)"
-      else
-          log "Unsetting asdf set to restore system PHP"
-          asdf set php system || true
-          log "Reverted to PHP $(php -v | head -n 1)"
-      fi' EXIT
-
-log "Detected PHP version: $ORIGINAL_PHP_VERSION"
-log "Detected PHP binary: $ORIGINAL_PHP_PATH"
-
-# ───────────────────────────────────────────────────────────────────────────────
-# If the *current* php is already 8.4.x, we skip the entire asdf install step
-# ───────────────────────────────────────────────────────────────────────────────
-if [[ "$ORIGINAL_PHP_PATH" == "$BREW_PREFIX/bin/php" && "$ORIGINAL_PHP_VERSION" =~ ^8\.4\. ]]; then
-    log "Homebrew PHP $ORIGINAL_PHP_VERSION detected at $ORIGINAL_PHP_PATH — skipping asdf build/install."
-else
-    # Only install under asdf if we don’t already have 8.4.0 installed
-    log "No Homebrew PHP 8.4 detected (found $ORIGINAL_PHP_PATH $ORIGINAL_PHP_VERSION), using asdf to build/install."
-    if ! asdf list php | grep -q "8.4.0"; then
-        # Use brew to install required dependencies for asdf php management
-        log "Checking and installing Homebrew packages required for PHP 8.4 build..."
-
-        for pkg in autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip pkg-config re2c zlib sqlite3 libsodium oniguruma openssl@3 nasm; do
-            if ! brew list "$pkg" &>/dev/null; then
-                log_warn "$pkg not found. Installing..."
-                arch -arm64 brew install "$pkg"
-            else
-                log "$pkg already installed. Skipping."
-            fi
-        done
-
-        # Set necessary env flags/paths for PHP build on OSX ARM64
-        export CPPFLAGS="-I$BREW_PREFIX/opt/oniguruma/include -I$BREW_PREFIX/opt/libsodium/include -I$BREW_PREFIX/opt/bzip2/include -I$BREW_PREFIX/opt/zlib/include -I$BREW_PREFIX/opt/openssl@3/include -I$BREW_PREFIX/opt/libxml2/include -I$BREW_PREFIX/opt/libedit/include -I$BREW_PREFIX/opt/curl/include -I$BREW_PREFIX/opt/sqlite3/include -I$BREW_PREFIX/opt/freetype/include -I$BREW_PREFIX/opt/jpeg/include -I$BREW_PREFIX/opt/libpng/include -I$BREW_PREFIX/opt/libzip/include"
-        export LDFLAGS="-L$BREW_PREFIX/opt/openssl@3/lib -lssl -lcrypto -lz -L$BREW_PREFIX/opt/oniguruma/lib -lonig -L$BREW_PREFIX/opt/libsodium/lib -lsodium -L$BREW_PREFIX/opt/bzip2/lib -Wl,-rpath,$BREW_PREFIX/opt/bzip2/lib -lbz2 -L$BREW_PREFIX/opt/zlib/lib -L$BREW_PREFIX/opt/openssl@3/lib -L$BREW_PREFIX/opt/libxml2/lib -L$BREW_PREFIX/opt/libedit/lib -L$BREW_PREFIX/opt/sqlite3/lib -lsqlite3 -L$BREW_PREFIX/opt/curl/lib -lcurl -L$BREW_PREFIX/opt/freetype/lib -L$BREW_PREFIX/opt/jpeg/lib -L$BREW_PREFIX/opt/libpng/lib -L$BREW_PREFIX/opt/libzip/lib -lzip -lz"
-        export PKG_CONFIG_PATH="$BREW_PREFIX/opt/openssl/lib/pkgconfig:$BREW_PREFIX/opt/oniguruma/lib/pkgconfig:$BREW_PREFIX/opt/libsodium/lib/pkgconfig:$BREW_PREFIX/opt/libzip/lib/pkgconfig:$BREW_PREFIX/opt/gd/lib/pkgconfig:$BREW_PREFIX/opt/zlib/lib/pkgconfig:$BREW_PREFIX/opt/openssl@3/lib/pkgconfig:$BREW_PREFIX/opt/libxml2/lib/pkgconfig:$BREW_PREFIX/opt/curl/lib/pkgconfig:$BREW_PREFIX/opt/sqlite3/lib/pkgconfig:$BREW_PREFIX/opt/freetype/lib/pkgconfig:$BREW_PREFIX/opt/jpeg/lib/pkgconfig:$BREW_PREFIX/opt/libpng/lib/pkgconfig"
-        export PHP_CONFIGURE_OPTIONS="--with-openssl=$(brew --prefix openssl) --with-iconv=$(brew --prefix libiconv)"
-
-        log "Installing PHP 8.4.0 with asdf..."
-        asdf install php 8.4.0 --verbose
-    else
-        log "asdf already has PHP 8.4.0 installed, skipping"
-    fi
-
-    log "Switching to PHP 8.4.0 with asdf set..."
-    asdf set php 8.4.0 --home 
-fi
-
-# Clone FrankenPHP
-if [ ! -d "$OSX_DIR/frankenphp" ]; then
-    log "Cloning FrankenPHP..."
-    git clone https://github.com/dunglas/frankenphp "$OSX_DIR/frankenphp"
-else
-    log_warn "FrankenPHP already cloned. Skipping."
-fi
-
-cd "$OSX_DIR/frankenphp"
-
-# Patch build script
-log "Patching build-static.sh to skip git pull..."
-sed -i '' 's/^[ \t]*git pull/# git pull/' ./build-static.sh
-
-# Set environment variables
-log "Exporting build environment variables..."
-export PHP_VERSION=8.2
-export PHP_EXTENSIONS="pdo_mysql,gd,bcmath,redis,intl,zip,gmp,apcu,opcache,imagick,sockets,pcntl,geos,iconv,mbstring,fileinfo,ctype,tokenizer,simplexml,dom,filter,session"
-export PHP_EXTENSION_LIBS="libgeos,libzip,bzip2,libxml2,openssl,zlib"
-export SPC_REL_TYPE=source
-export NO_COMPRESS=1
-export SPC_OPT_BUILD_ARGS="--debug"
-export CMAKE_OSX_ARCHITECTURES=arm64
-
-# Clone and prepare static-php-cli in dist/
-STATIC_PHP_CLI_DIR="$OSX_DIR/frankenphp/dist/static-php-cli"
-if [ ! -d "$STATIC_PHP_CLI_DIR" ]; then
-    log "Cloning static-php-cli into dist/..."
-    git clone --depth 1 --branch 2.5.2 https://github.com/crazywhalecc/static-php-cli.git "$STATIC_PHP_CLI_DIR"
-else
-    log_warn "static-php-cli already exists in dist/. Skipping clone."
-fi
-
-# Inject libgeos support
-log "Injecting libgeos patch files..."
-cp "$ROOT_DIR/builds/osx/spc/libgeos-unix.php" "$STATIC_PHP_CLI_DIR/src/SPC/builder/unix/library/libgeos.php"
-cp "$ROOT_DIR/builds/osx/spc/libgeos-macos.php" "$STATIC_PHP_CLI_DIR/src/SPC/builder/macos/library/libgeos.php"
-cp "$ROOT_DIR/builds/osx/spc/UnixBuilderBase-macos.php" "$STATIC_PHP_CLI_DIR/src/SPC/builder/unix/UnixBuilderBase.php"
-
-# Patch SPC config
-log "Patching SPC config files (source.json, ext.json, lib.json)..."
-jq '. + {"php-geos": {"type": "url", "url": "https://github.com/libgeos/php-geos/archive/dfe1ab17b0f155cc315bc13c75689371676e02e1.zip", "license": [{"type": "file", "path": "php-geos-dfe1ab17b0f155cc315bc13c75689371676e02e1/MIT-LICENSE"}, {"type": "file", "path": "php-geos-dfe1ab17b0f155cc315bc13c75689371676e02e1/LGPL-2"}]}}' \
-  "$STATIC_PHP_CLI_DIR/config/source.json" > "$STATIC_PHP_CLI_DIR/config/source.tmp.json" && \
-  mv "$STATIC_PHP_CLI_DIR/config/source.tmp.json" "$STATIC_PHP_CLI_DIR/config/source.json"
-
-jq '. + {"libgeos": {"type": "url", "url": "https://download.osgeo.org/geos/geos-3.12.1.tar.bz2", "filename": "geos-3.12.1.tar.bz2", "extract": "geos-3.12.1", "build-dir": "build", "license": [{"type": "file", "path": "COPYING"}]}}' \
-  "$STATIC_PHP_CLI_DIR/config/source.json" > "$STATIC_PHP_CLI_DIR/config/source.tmp.json" && \
-  mv "$STATIC_PHP_CLI_DIR/config/source.tmp.json" "$STATIC_PHP_CLI_DIR/config/source.json"
-
-jq '. + {"libgeos": {"source": "libgeos", "static-libs-unix": ["libgeos.a", "libgeos_c.a"]}}' \
-  "$STATIC_PHP_CLI_DIR/config/lib.json" > "$STATIC_PHP_CLI_DIR/config/lib.tmp.json" && \
-  mv "$STATIC_PHP_CLI_DIR/config/lib.tmp.json" "$STATIC_PHP_CLI_DIR/config/lib.json"
-
-jq '. + {"geos": {"type": "external", "arg-type": "enable", "source": "php-geos", "lib-depends": ["libgeos"]}}' \
-  "$STATIC_PHP_CLI_DIR/config/ext.json" > "$STATIC_PHP_CLI_DIR/config/ext.tmp.json" && \
-  mv "$STATIC_PHP_CLI_DIR/config/ext.tmp.json" "$STATIC_PHP_CLI_DIR/config/ext.json"
-
-# Prepare app embed folder
-log "📦 Preparing embedded app directory..."
-rm -rf ./dist/app
-mkdir -p ./dist/app
-cp -R "$APP_DIR"/* ./dist/app/
-
-log "Patching build-static.sh to skip git pull and composer install..."
-
-# Skip `git pull`
-sed -i '' 's/^[[:space:]]*git pull/# git pull/' "$OSX_DIR/frankenphp/build-static.sh"
-
-# Patch add CoreServices framework for Caddy build on OSX
-sed -i '' 's/-framework CoreFoundation -framework SystemConfiguration/& -framework CoreServices/' "$OSX_DIR/frankenphp/build-static.sh"
-
-# ── work around 403 on GH macOS runners ────────────────────────────────────────
-log "Patching curl to use a browser-like User-Agent (to avoid 403s)…"
-curl() {
-  command curl -sSL -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.6 Safari/605.1.15" "$@"
-}
-export -f curl
-
-# Build the binary
-log "⚙️ Running FrankenPHP build-static.sh..."
-EMBED=dist/app ./build-static.sh
-
-# Move built binary to dist
-log "Moving built binary to output folder..."
-mkdir -p "$DIST_DIR"
-mv dist/frankenphp-mac-$ARCH "$DIST_DIR/$BINARY_NAME"
-
-log_success "✅ macOS binary built at: $DIST_DIR/$BINARY_NAME"
-
-# Clean up frankenphp build and app embed folder
-log "🧹 Cleaning temporary app directory..."
-rm -rf "$OSX_DIR/frankenphp"
--- a/builds/osx/spc/UnixBuilderBase-macos.php
+++ b/builds/osx/spc/UnixBuilderBase-macos.php
@@ -1,271 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix;
-
-use SPC\builder\BuilderBase;
-use SPC\builder\linux\LinuxBuilder;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
-use SPC\store\Config;
-use SPC\store\FileSystem;
-use SPC\util\DependencyUtil;
-use SPC\util\SPCConfigUtil;
-
-abstract class UnixBuilderBase extends BuilderBase
-{
-    /** @var string cflags */
-    public string $arch_c_flags;
-
-    /** @var string C++ flags */
-    public string $arch_cxx_flags;
-
-    /** @var string cmake toolchain file */
-    public string $cmake_toolchain_file;
-
-    /**
-     * @throws WrongUsageException
-     * @throws FileSystemException
-     */
-    public function getAllStaticLibFiles(): array
-    {
-        $libs = [];
-
-        // reorder libs
-        foreach ($this->libs as $lib) {
-            foreach ($lib->getDependencies() as $dep) {
-                $libs[] = $dep;
-            }
-            $libs[] = $lib;
-        }
-
-        $libFiles = [];
-        $libNames = [];
-        // merge libs
-        foreach ($libs as $lib) {
-            if (!in_array($lib::NAME, $libNames, true)) {
-                $libNames[] = $lib::NAME;
-                array_unshift($libFiles, ...$lib->getStaticLibs());
-            }
-        }
-        return array_map(fn ($x) => realpath(BUILD_LIB_PATH . "/{$x}"), $libFiles);
-    }
-
-    /**
-     * Return generic cmake options when configuring cmake projects
-     */
-    public function makeCmakeArgs(): string
-    {
-        $extra = $this instanceof LinuxBuilder ? '-DCMAKE_C_COMPILER=' . getenv('CC') . ' ' : '';
-
-        // NEW: allow env-variable override
-        $arch  = getenv('CMAKE_OSX_ARCHITECTURES') ?: 'arm64';
-
-        return $extra .
-            '-DCMAKE_BUILD_TYPE=Release ' .
-            '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
-            '-DCMAKE_INSTALL_BINDIR=bin ' .
-            '-DCMAKE_INSTALL_LIBDIR=lib ' .
-            '-DCMAKE_INSTALL_INCLUDEDIR=include ' .
-            "-DCMAKE_OSX_ARCHITECTURES={$arch} " . 
-            "-DCMAKE_TOOLCHAIN_FILE={$this->cmake_toolchain_file}";
-    }
-
-    /**
-     * Generate configure flags
-     */
-    public function makeAutoconfFlags(int $flag = AUTOCONF_ALL): string
-    {
-        $extra = '';
-        // TODO: add auto pkg-config support
-        if (($flag & AUTOCONF_LIBS) === AUTOCONF_LIBS) {
-            $extra .= 'LIBS="' . BUILD_LIB_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_CFLAGS) === AUTOCONF_CFLAGS) {
-            $extra .= 'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_CPPFLAGS) === AUTOCONF_CPPFLAGS) {
-            $extra .= 'CPPFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
-        }
-        if (($flag & AUTOCONF_LDFLAGS) === AUTOCONF_LDFLAGS) {
-            $extra .= 'LDFLAGS="-L' . BUILD_LIB_PATH . '" ';
-        }
-        return $extra;
-    }
-
-    public function proveLibs(array $sorted_libraries): void
-    {
-        // search all supported libs
-        $support_lib_list = [];
-        $classes = FileSystem::getClassesPsr4(
-            ROOT_DIR . '/src/SPC/builder/' . osfamily2dir() . '/library',
-            'SPC\builder\\' . osfamily2dir() . '\library'
-        );
-        foreach ($classes as $class) {
-            if (defined($class . '::NAME') && $class::NAME !== 'unknown' && Config::getLib($class::NAME) !== null) {
-                $support_lib_list[$class::NAME] = $class;
-            }
-        }
-
-        // if no libs specified, compile all supported libs
-        if ($sorted_libraries === [] && $this->isLibsOnly()) {
-            $libraries = array_keys($support_lib_list);
-            $sorted_libraries = DependencyUtil::getLibs($libraries);
-        }
-
-        // add lib object for builder
-        foreach ($sorted_libraries as $library) {
-            if (!in_array(Config::getLib($library, 'type', 'lib'), ['lib', 'package'])) {
-                continue;
-            }
-            // if some libs are not supported (but in config "lib.json", throw exception)
-            if (!isset($support_lib_list[$library])) {
-                throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
-            }
-            $lib = new ($support_lib_list[$library])($this);
-            $this->addLib($lib);
-        }
-
-        // calculate and check dependencies
-        foreach ($this->libs as $lib) {
-            $lib->calcDependency();
-        }
-        $this->lib_list = $sorted_libraries;
-    }
-
-    /**
-     * Sanity check after build complete
-     *
-     * @throws RuntimeException
-     */
-    protected function sanityCheck(int $build_target): void
-    {
-        // sanity check for php-cli
-        if (($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI) {
-            logger()->info('running cli sanity check');
-            [$ret, $output] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -n -r "echo \"hello\";"');
-            $raw_output = implode('', $output);
-            if ($ret !== 0 || trim($raw_output) !== 'hello') {
-                throw new RuntimeException("cli failed sanity check: ret[{$ret}]. out[{$raw_output}]");
-            }
-
-            foreach ($this->getExts(false) as $ext) {
-                logger()->debug('testing ext: ' . $ext->getName());
-                $ext->runCliCheckUnix();
-            }
-        }
-
-        // sanity check for phpmicro
-        if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
-            $test_task = $this->getMicroTestTasks();
-            foreach ($test_task as $task_name => $task) {
-                $test_file = SOURCE_PATH . '/' . $task_name . '.exe';
-                if (file_exists($test_file)) {
-                    @unlink($test_file);
-                }
-                file_put_contents($test_file, file_get_contents(SOURCE_PATH . '/php-src/sapi/micro/micro.sfx') . $task['content']);
-                chmod($test_file, 0755);
-                [$ret, $out] = shell()->execWithResult($test_file);
-                foreach ($task['conditions'] as $condition => $closure) {
-                    if (!$closure($ret, $out)) {
-                        $raw_out = trim(implode('', $out));
-                        throw new RuntimeException("micro failed sanity check: {$task_name}, condition [{$condition}], ret[{$ret}], out[{$raw_out}]");
-                    }
-                }
-            }
-        }
-
-        // sanity check for embed
-        if (($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED) {
-            logger()->info('running embed sanity check');
-            $sample_file_path = SOURCE_PATH . '/embed-test';
-            if (!is_dir($sample_file_path)) {
-                @mkdir($sample_file_path);
-            }
-            // copy embed test files
-            copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c');
-            copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php');
-            $util = new SPCConfigUtil($this);
-            $config = $util->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
-            $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
-            if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
-                $lens .= ' -static';
-            }
-            [$ret, $out] = shell()->cd($sample_file_path)->execWithResult(getenv('CC') . ' -o embed embed.c ' . $lens);
-            if ($ret !== 0) {
-                throw new RuntimeException('embed failed sanity check: build failed. Error message: ' . implode("\n", $out));
-            }
-            // if someone changed to --enable-embed=shared, we need to add LD_LIBRARY_PATH
-            if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
-                $ext_path = 'LD_LIBRARY_PATH=' . BUILD_ROOT_PATH . '/lib:$LD_LIBRARY_PATH ';
-                FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.a');
-            } else {
-                $ext_path = '';
-                FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.so');
-            }
-            [$ret, $output] = shell()->cd($sample_file_path)->execWithResult($ext_path . './embed');
-            if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
-                throw new RuntimeException('embed failed sanity check: run failed. Error message: ' . implode("\n", $output));
-            }
-        }
-    }
-
-    /**
-     * 将编译好的二进制文件发布到 buildroot
-     *
-     * @param  int                 $type 发布类型
-     * @throws RuntimeException
-     * @throws FileSystemException
-     */
-    protected function deployBinary(int $type): bool
-    {
-        $src = match ($type) {
-            BUILD_TARGET_CLI => SOURCE_PATH . '/php-src/sapi/cli/php',
-            BUILD_TARGET_MICRO => SOURCE_PATH . '/php-src/sapi/micro/micro.sfx',
-            BUILD_TARGET_FPM => SOURCE_PATH . '/php-src/sapi/fpm/php-fpm',
-            default => throw new RuntimeException('Deployment does not accept type ' . $type),
-        };
-        logger()->info('Deploying ' . $this->getBuildTypeName($type) . ' file');
-        FileSystem::createDir(BUILD_ROOT_PATH . '/bin');
-        shell()->exec('cp ' . escapeshellarg($src) . ' ' . escapeshellarg(BUILD_ROOT_PATH . '/bin/'));
-        return true;
-    }
-
-    /**
-     * Run php clean
-     *
-     * @throws RuntimeException
-     */
-    protected function cleanMake(): void
-    {
-        logger()->info('cleaning up');
-        shell()->cd(SOURCE_PATH . '/php-src')->exec('make clean');
-    }
-
-    /**
-     * Patch phpize and php-config if needed
-     * @throws FileSystemException
-     */
-    protected function patchPhpScripts(): void
-    {
-        // patch phpize
-        if (file_exists(BUILD_BIN_PATH . '/phpize')) {
-            logger()->debug('Patching phpize prefix');
-            FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', "prefix=''", "prefix='" . BUILD_ROOT_PATH . "'");
-            FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', 's##', 's#/usr/local#');
-        }
-        // patch php-config
-        if (file_exists(BUILD_BIN_PATH . '/php-config')) {
-            logger()->debug('Patching php-config prefix and libs order');
-            $php_config_str = FileSystem::readFile(BUILD_BIN_PATH . '/php-config');
-            $php_config_str = str_replace('prefix=""', 'prefix="' . BUILD_ROOT_PATH . '"', $php_config_str);
-            // move mimalloc to the beginning of libs
-            $php_config_str = preg_replace('/(libs=")(.*?)\s*(' . preg_quote(BUILD_LIB_PATH, '/') . '\/mimalloc\.o)\s*(.*?)"/', '$1$3 $2 $4"', $php_config_str);
-            // move lstdc++ to the end of libs
-            $php_config_str = preg_replace('/(libs=")(.*?)\s*(-lstdc\+\+)\s*(.*?)"/', '$1$2 $4 $3"', $php_config_str);
-            FileSystem::writeFile(BUILD_BIN_PATH . '/php-config', $php_config_str);
-        }
-    }
-}
--- a/builds/osx/spc/libgeos-macos.php
+++ b/builds/osx/spc/libgeos-macos.php
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class libgeos extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\libgeos;
-
-    public const NAME = 'libgeos';
-}
--- a/builds/osx/spc/libgeos-unix.php
+++ b/builds/osx/spc/libgeos-unix.php
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\store\FileSystem;
-
-trait libgeos
-{
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        FileSystem::resetDir($this->source_dir . '/build');
-
-        shell()->cd($this->source_dir . '/build')
-            ->setEnv([
-                'CFLAGS'   => $this->getLibExtraCFlags(),
-                'LDFLAGS'  => $this->getLibExtraLdFlags(),
-                'LIBS'     => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF ..")
-            ->execWithEnv("make -j{$this->builder->concurrency}")
-            ->execWithEnv('make install');
-
-        $this->patchPkgconfPrefix(['geos.pc']);
-    }
-}
--- a/console/.gitignore
+++ b/console/.gitignore
@@ -26,7 +26,3 @@

 # broccoli-debug
 /DEBUG/
-
-# Auto-generated extension files
-/app/extensions/
-/app/utils/extension-loaders.js
--- a/console/Dockerfile.server-build
+++ b/console/Dockerfile.server-build
@@ -6,19 +6,19 @@ WORKDIR /console

 # Create the pnpm directory and set the PNPM_HOME environment variable
 RUN mkdir -p ~/.pnpm
-ENV PNPM_HOME=/root/.pnpm
+ENV PNPM_HOME /root/.pnpm

 # Set environment
 ARG ENVIRONMENT=production

 # Add the pnpm global bin to the PATH
-ENV PATH=/root/.pnpm/bin:$PATH
+ENV PATH /root/.pnpm/bin:$PATH

 # Copy pnpm-lock.yaml (or package.json) into the directory /console in the container
-COPY package.json pnpm-lock.yaml ./
+COPY console/package.json console/pnpm-lock.yaml ./

 # Copy over .npmrc if applicable
-COPY .npmr[c] ./
+COPY console/.npmr[c] ./

 # Install global dependencies
 RUN npm install -g ember-cli pnpm 
@@ -33,7 +33,7 @@ RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 RUN pnpm install

 # Copy the console directory contents into the container at /console
-COPY . .
+COPY console .

 # Build the application
 RUN pnpm build --environment $ENVIRONMENT
@@ -48,7 +48,7 @@ COPY --from=builder /console/dist /usr/share/nginx/html
 EXPOSE 4200

 # Use custom nginx.conf
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY console/nginx.conf /etc/nginx/conf.d/default.conf

 # Start Nginx server
 CMD ["nginx", "-g", "daemon off;"]
--- a/console/Dockerfile.static-build
+++ b/console/Dockerfile.static-build
@@ -0,0 +1,57 @@
+# ---- Build Stage ----
+FROM node:18.15.0-alpine
+
+# Set the working directory in the container to /console
+WORKDIR /console
+
+# Create the pnpm directory and set the PNPM_HOME environment variable
+RUN mkdir -p ~/.pnpm
+ENV PNPM_HOME /root/.pnpm
+
+# Set environment
+ARG ENVIRONMENT=production
+
+# Add the pnpm global bin to the PATH
+ENV PATH /root/.pnpm/bin:$PATH
+
+# Copy pnpm-lock.yaml (or package.json) into the directory /console in the container
+COPY console/package.json console/pnpm-lock.yaml ./
+
+# Copy over .npmrc if applicable
+COPY console/.npmr[c] ./
+
+# Install global dependencies
+RUN npm install -g ember-cli pnpm 
+
+# Install git
+RUN apk update && apk add git openssh-client
+
+# Trust GitHub's RSA host key
+RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+# Install app dependencies
+RUN pnpm install
+
+# Copy the console directory contents into the container at /console
+COPY console .
+
+# Build the application
+RUN pnpm build --environment $ENVIRONMENT
+
+# # Make sure the build output is available in /console/dist
+# RUN ls -la /console/dist
+
+# # ---- Serve Stage ----
+# FROM nginx:alpine
+
+# # Copy the built app to our served directory
+# COPY --from=builder /console/dist /usr/share/nginx/html
+
+# # Expose the port nginx is bound to
+# EXPOSE 4201
+
+# # Use custom nginx.conf
+# COPY console/nginx.conf /etc/nginx/conf.d/default.conf
+
+# # Start Nginx server
+# CMD ["nginx", "-g", "daemon off;"]
--- a/console/app/app.js
+++ b/console/app/app.js
@@ -2,7 +2,8 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from '@fleetbase/console/config/environment';
-import './deprecation-workflow';
+import loadExtensions from '@fleetbase/ember-core/utils/load-extensions';
+import mapEngines from '@fleetbase/ember-core/utils/map-engines';

 export default class App extends Application {
    modulePrefix = config.modulePrefix;
@@ -10,6 +11,13 @@ export default class App extends Application {
    Resolver = Resolver;
    extensions = [];
    engines = {};
+
+    async ready() {
+        const extensions = await loadExtensions();
+
+        this.extensions = extensions;
+        this.engines = mapEngines(extensions);
+    }
 }

 loadInitializers(App, config.modulePrefix);
--- a/console/app/components/configure/filesystem.hbs
+++ b/console/app/components/configure/filesystem.hbs
@@ -1,4 +1,4 @@
-<ContentPanel @title="Filesystem" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Filesystem" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Driver" @helpText="Select the default filesystem driver for Fleetbase to use.">
        <Select @options={{this.disks}} @value={{this.driver}} @onSelect={{this.setDriver}} @placeholder="Select filesystem driver" class="w-full" disabled={{this.isLoading}} />
    </InputGroup>
--- a/console/app/components/configure/mail.hbs
+++ b/console/app/components/configure/mail.hbs
@@ -1,4 +1,4 @@
-<ContentPanel @title="Mail" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Mail" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Mailer" @helpText="Select the default mailer for Fleetbase to use.">
        <Select @options={{this.mailers}} @value={{this.mailer}} @onSelect={{this.setMailer}} @placeholder="Select mailer" class="w-full" />
    </InputGroup>
@@ -13,14 +13,6 @@
        <InputGroup @name="SMTP Timeout" @value={{this.smtpTimeout}} disabled={{this.loadConfigValues.isRunning}} />
        <InputGroup @name="SMTP Auth Mode" @value={{this.smtpAuth_mode}} disabled={{this.loadConfigValues.isRunning}} />
    {{/if}}
-    {{#if (eq this.mailer "microsoft-graph")}}
-        <InputGroup @name="Client ID" @value={{this.microsoftGraphClient_id}} disabled={{this.loadConfigValues.isRunning}} />
-        <InputGroup @name="Client Secret" @value={{this.microsoftGraphClient_secret}} disabled={{this.loadConfigValues.isRunning}} />
-        <InputGroup @name="Tenant ID" @value={{this.microsoftGraphTenant_id}} disabled={{this.loadConfigValues.isRunning}} />
-        <InputGroup>
-            <Toggle @isToggled={{this.microsoftGraphSave_to_sent_items}} @onToggle={{fn (mut this.microsoftGraphSave_to_sent_items)}} @label="Save to sent items"  />
-        </InputGroup>
-    {{/if}}
    {{#if (eq this.mailer "mailgun")}}
        <InputGroup @name="Mailgun Domain" @value={{this.mailgunDomain}} disabled={{this.loadConfigValues.isRunning}} />
        <InputGroup @name="Mailgun Endpoint" @value={{this.mailgunEndpoint}} disabled={{this.loadConfigValues.isRunning}} />
--- a/console/app/components/configure/mail.js
+++ b/console/app/components/configure/mail.js
@@ -26,10 +26,6 @@ export default class ConfigureMailComponent extends Component {
    @tracked postmarkToken = null;
    @tracked sendgridApi_key = null;
    @tracked resendKey = null;
-    @tracked microsoftGraphClient_id = null;
-    @tracked microsoftGraphClient_secret = null;
-    @tracked microsoftGraphTenant_id = null;
-    @tracked microsoftGraphSave_to_sent_items = false;

    /**
     * Creates an instance of ConfigureFilesystemComponent.
@@ -68,19 +64,6 @@ export default class ConfigureMailComponent extends Component {
        };
    }

-    @action serializeMicrosoftGraphConfig() {
-        return {
-            client_id: this.microsoftGraphClient_id,
-            client_secret: this.microsoftGraphClient_secret,
-            tenant_id: this.microsoftGraphTenant_id,
-            save_to_sent_items: this.microsoftGraphSave_to_sent_items,
-            from: {
-                address: this.fromAddress,
-                name: this.fromName,
-            },
-        };
-    }
-
    @action serializeMailgunConfig() {
        return {
            domain: this.mailgunDomain,
@@ -129,7 +112,6 @@ export default class ConfigureMailComponent extends Component {
                postmark: this.serializePostmarkConfig(),
                sendgrid: this.serializeSendgridConfig(),
                resend: this.serializeResendConfig(),
-                microsoftGraph: this.serializeMicrosoftGraphConfig(),
            });
        } catch (error) {
            this.notifications.serverError(error);
@@ -149,7 +131,6 @@ export default class ConfigureMailComponent extends Component {
                postmark: this.serializePostmarkConfig(),
                sendgrid: this.serializeSendgridConfig(),
                resend: this.serializeResendConfig(),
-                microsoftGraph: this.serializeMicrosoftGraphConfig(),
            });
            this.notifications.success('Mail configuration saved.');
        } catch (error) {
--- a/console/app/components/configure/notification-channels.hbs
+++ b/console/app/components/configure/notification-channels.hbs
@@ -1,4 +1,4 @@
-<ContentPanel @title="APN Configutation" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="APN Configutation" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="APN Key ID" @value={{this.apn.key_id}} disabled={{this.isLoading}} />
    <InputGroup @name="APN Team ID" @value={{this.apn.team_id}} disabled={{this.isLoading}} />
    <InputGroup @name="APN App Bundle ID" @value={{this.apn.app_bundle_id}} disabled={{this.isLoading}} />
@@ -20,7 +20,7 @@
    </InputGroup>
 </ContentPanel>

-<ContentPanel @title="Firebase Configutation" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Firebase Configutation" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @wrapperClass="flex flex-row items-center mb-0i">
        <UploadButton @name="firebase-service-account" @accept="text/plain,text/javascript,application/json" @onFileAdded={{this.uploadFirebaseCredentials}} @buttonText="Upload Service Account JSON" @icon="upload" class="w-auto m-0i mt-0i" />
        {{#if this.firebase.credentials_file}}
@@ -33,7 +33,7 @@
    </InputGroup>
 </ContentPanel>

-<ContentPanel @title="Test Push Notification" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Test Push Notification" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-900">
    {{#if this.testResponse}}
        <div class="flex flex-row items-center rounded-lg border {{if (eq this.testResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
            <FaIcon @icon={{if (eq this.testResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.testResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
--- a/console/app/components/configure/queue.hbs
+++ b/console/app/components/configure/queue.hbs
@@ -1,4 +1,4 @@
-<ContentPanel @title="Queue" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Queue" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Driver" @helpText="Select the default queue driver for Fleetbase to use.">
        <Select @options={{this.connections}} @value={{this.driver}} @onSelect={{this.setDriver}} @placeholder="Select queue driver" disabled={{this.isLoading}} class="w-full" />
    </InputGroup>
--- a/console/app/components/configure/services.hbs
+++ b/console/app/components/configure/services.hbs
@@ -1,15 +1,15 @@
-<ContentPanel @title="AWS" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="AWS" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="AWS Access Key" @value={{this.awsKey}} disabled={{this.isLoading}} />
    <InputGroup @name="AWS Access Secret" @value={{this.awsSecret}} disabled={{this.isLoading}} />
    <InputGroup @name="AWS Region" @value={{this.awsRegion}} disabled={{this.isLoading}} />
 </ContentPanel>

-<ContentPanel @title="Google Maps" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Google Maps" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Google Maps API Key" @value={{this.googleMapsApiKey}} disabled={{this.isLoading}} />
    <InputGroup @name="Google Maps Locale" @value={{this.googleMapsLocale}} disabled={{this.isLoading}} />
 </ContentPanel>

-<ContentPanel @title="Twilio" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Twilio" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Twilio SID" @value={{this.twilioSid}} disabled={{this.isLoading}} />
    <InputGroup @name="Twilio Token" @value={{this.twilioToken}} disabled={{this.isLoading}} />
    <InputGroup @name="Twilio From" @value={{this.twilioFrom}} disabled={{this.isLoading}} />
@@ -25,7 +25,7 @@
    </div>
 </ContentPanel>

-<ContentPanel @title="Sentry" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="Sentry" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="Sentry DSN" @value={{this.sentryDsn}} disabled={{this.isLoading}} />
    {{#if this.sentryTestResponse}}
        <div class="flex flex-row items-center rounded-lg border {{if (eq this.sentryTestResponse.status 'error') 'border-red-900 bg-red-800 text-red-100' 'border-green-900 bg-green-800 text-green-100'}} shadow-sm my-2 px-4 py-2">
@@ -36,7 +36,7 @@
    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Sentry Config" @onClick={{perform this.testSentry}} @isLoading={{this.testSentry.isRunning}} @disabled={{not this.sentryDsn}} />
 </ContentPanel>

-<ContentPanel @title="IP Info" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="IP Info" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <InputGroup @name="IP Info API Key" @value={{this.ipinfoApiKey}} disabled={{this.isLoading}} />
 </ContentPanel>

--- a/console/app/components/configure/socket.hbs
+++ b/console/app/components/configure/socket.hbs
@@ -1,4 +1,4 @@
-<ContentPanel @title="SocketCluster Connection" @open={{true}} @wrapperClass="bordered-classic">
+<ContentPanel @title="SocketCluster Connection" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
    <p class="mb-4">The SocketCluster configuration cannot be changed at this time.</p>
    <div id="output" class="font-mono rounded-lg max-h-full px-6 py-4 overflow-y-scroll bg-black shadow-inner dark:shadow-none">
        <div class="flex items-center justify-between mb-4">
--- a/console/app/components/dashboard/metric.js
+++ b/console/app/components/dashboard/metric.js
@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';

 export default class MetricComponent extends Component {
    @service fetch;
--- a/console/app/components/dashboard/widget-panel.hbs
+++ b/console/app/components/dashboard/widget-panel.hbs
@@ -0,0 +1,31 @@
+<Overlay @isOpen={{@isOpen}} @onLoad={{this.setOverlayContext}} @position="right" @noBackdrop={{true}} @fullHeight={{true}} @width={{or this.width @width "400px"}}>
+    <Overlay::Header @title={{t "component.dashboard-widget-panel.select-widgets"}} @hideStatusDot={{true}} @titleWrapperClass="leading-5">
+        <div class="flex flex-1 justify-end">
+            <Button @type="default" @icon="times" @helpText={{t "component.dashboard-widget-panel.close-and-save"}} @onClick={{this.onPressClose}} />
+        </div>
+    </Overlay::Header>
+
+    <Overlay::Body @wrapperClass="new-service-rate-overlay-body px-4 space-y-4 pt-4">
+        <div class="grid grid-cols-1 gap-4 text-xs dark:text-gray-100">
+            {{#each this.availableWidgets as |widget|}}
+                <div
+                    class="rounded-lg border border-gray-300 bg-white dark:border-gray-700 dark:bg-gray-800 hover:bg-gray-100 dark:hover:bg-gray-700 transition-all duration-300 ease-in-out shadow-md px-4 py-2 cursor-pointer"
+                    {{on "click" (fn this.addWidgetToDashboard widget)}}
+                >
+                    <div class="flex flex-row items-center leading-6 mb-2.5">
+                        <div class="w-8 flex items-center justify-start">
+                            <FaIcon @icon={{widget.icon}} class="text-lg text-gray-600 dark:text-gray-300" />
+                        </div>
+                        <p class="text-sm truncate font-semibold dark:text-gray-100 text-gray-800">
+                            {{t "component.dashboard-widget-panel.widget-name" widgetName=widget.name}}
+                        </p>
+                    </div>
+                    <div>
+                        <p class="text-xs dark:text-gray-100 text-gray-800">{{widget.description}}</p>
+                    </div>
+                </div>
+            {{/each}}
+        </div>
+        <Spacer @height="300px" />
+    </Overlay::Body>
+</Overlay>
--- a/console/app/components/dashboard/widget-panel.js
+++ b/console/app/components/dashboard/widget-panel.js
@@ -0,0 +1,60 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class DashboardWidgetPanelComponent extends Component {
+    @service universe;
+    @tracked availableWidgets = [];
+    @tracked dashboard;
+    @tracked isOpen = true;
+    @service notifications;
+
+    /**
+     * Constructs the component and applies initial state.
+     */
+    constructor(owner, { dashboard }) {
+        super(...arguments);
+
+        this.availableWidgets = this.universe.getDashboardWidgets();
+        this.dashboard = dashboard;
+    }
+
+    /**
+     * Sets the overlay context.
+     *
+     * @action
+     * @param {OverlayContextObject} overlayContext
+     */
+    @action setOverlayContext(overlayContext) {
+        this.context = overlayContext;
+
+        if (typeof this.args.onLoad === 'function') {
+            this.args.onLoad(...arguments);
+        }
+    }
+
+    @action addWidgetToDashboard(widget) {
+        // If widget is a component definition/class
+        if (typeof widget.component === 'function') {
+            widget.component = widget.component.name;
+        }
+
+        this.args.dashboard.addWidget(widget).catch((error) => {
+            this.notifications.serverError(error);
+        });
+    }
+
+    /**
+     * Handles cancel button press.
+     *
+     * @action
+     */
+    @action onPressClose() {
+        this.isOpen = false;
+
+        if (typeof this.args.onClose === 'function') {
+            this.args.onClose();
+        }
+    }
+}
--- a/console/app/components/fleetbase-blog.hbs
+++ b/console/app/components/fleetbase-blog.hbs
@@ -8,7 +8,7 @@
            </a>
        </div>
        <div class="px-4 py-2.5">
-            {{#if this.loadBlogPosts.isRunning}}
+            {{#if this.isLoading}}
                <Spinner />
            {{else}}
                <ul class="space-y-2">
--- a/console/app/components/fleetbase-blog.js
+++ b/console/app/components/fleetbase-blog.js
@@ -1,42 +1,28 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { isArray } from '@ember/array';
-import { storageFor } from 'ember-local-storage';
-import { add, isPast } from 'date-fns';
-import { task } from 'ember-concurrency';
+import { action } from '@ember/object';

 export default class FleetbaseBlogComponent extends Component {
-    @storageFor('local-cache') localCache;
    @service fetch;
    @tracked posts = [];
+    @tracked isLoading = false;

    constructor() {
        super(...arguments);
-        this.loadBlogPosts.perform();
+        this.loadBlogPosts();
    }

-    @task *loadBlogPosts() {
-        // Check if cached data and expiration are available
-        const cachedData = this.localCache.get('fleetbase-blog-data');
-        const expiration = this.localCache.get('fleetbase-blog-data-expiration');
+    @action loadBlogPosts() {
+        this.isLoading = true;

-        // Check if the cached data is still valid
-        if (cachedData && isArray(cachedData) && expiration && !isPast(new Date(expiration))) {
-            // Use cached data
-            this.posts = cachedData;
-        } else {
-            // Fetch new data
-            try {
-                const data = yield this.fetch.get('lookup/fleetbase-blog');
-                this.posts = isArray(data) ? data : [];
-                if (data) {
-                    this.localCache.set('fleetbase-blog-data', data);
-                    this.localCache.set('fleetbase-blog-data-expiration', add(new Date(), { hours: 6 }));
-                }
-            } catch (err) {
-                debug('Failed to load blog: ' + err.message);
-            }
-        }
+        return this.fetch
+            .get('lookup/fleetbase-blog')
+            .then((response) => {
+                this.posts = response;
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
    }
 }
--- a/console/app/components/github-card.js
+++ b/console/app/components/github-card.js
@@ -52,7 +52,7 @@ export default class GithubCardComponent extends Component {
            this.data = cachedData;
        } else {
            // Fetch new data
-            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase', { cache: 'default' });
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase');
            if (response.ok) {
                this.data = yield response.json();
                this.localCache.set('fleetbase-github-data', this.data);
@@ -72,7 +72,7 @@ export default class GithubCardComponent extends Component {
            this.tags = cachedTags;
        } else {
            // Fetch new tags
-            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase/tags', { cache: 'default' });
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase/tags');
            if (response.ok) {
                this.tags = yield response.json();
                this.localCache.set('fleetbase-github-tags', this.tags);
--- a/console/app/components/onboarding/form.hbs
+++ b/console/app/components/onboarding/form.hbs
@@ -1,61 +0,0 @@
-<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
-    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
-        <div class="bg-white dark:bg-gray-800 py-5 px-4 shadow rounded-lg w-full">
-            <div class="mb-4">
-                <Image src={{@brand.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} height="56" class="h-10 object-contain mx-auto" />
-                <div class="mt-2">
-                    <h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
-                        {{t "onboard.index.title"}}
-                    </h2>
-                </div>
-            </div>
-
-            <div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-blue-200">
-                <div>
-                    <FaIcon @icon="hand-spock" @size="lg" class="text-blue-900 mr-4" />
-                </div>
-                <p class="flex-1 text-sm text-blue-900 dark:text-blue-900">
-                    {{t "onboard.index.welcome-title" htmlSafe=true companyName=(t "app.name")}}
-                    {{t "onboard.index.welcome-text"}}
-                </p>
-            </div>
-
-            <form {{on "submit" (perform this.onboard)}}>
-                {{#if this.error}}
-                    <InfoBlock @icon="exclamation-triangle" @text={{this.error}} class="mb-6 px-3 py-2 bg-red-300 text-red-900" @textClass="text-red-900" />
-                {{/if}}
-                <InputGroup @name={{t "onboard.index.full-name"}} @value={{this.name}} @helpText={{t "onboard.index.full-name-help-text"}} @inputClass="input-lg" />
-                <InputGroup @name={{t "onboard.index.your-email"}} @type="email" @value={{this.email}} @helpText={{t "onboard.index.your-email-help-text"}} @inputClass="input-lg" />
-                <InputGroup @name={{t "onboard.index.phone"}} @helpText={{t "onboard.index.phone-help-text"}}>
-                    <PhoneInput @onInput={{fn (mut this.phone)}} class="form-input input-lg w-full" />
-                </InputGroup>
-                <InputGroup @name={{t "onboard.index.organization-name"}} @value={{this.organization_name}} @helpText={{t "onboard.index.organization-help-text"}} @inputClass="input-lg" />
-                <InputGroup @name={{t "onboard.index.password"}} @value={{this.password}} @type="password" @helpText={{t "onboard.index.password-help-text"}} @inputClass="input-lg" />
-                <InputGroup
-                    @name={{t "onboard.index.confirm-password"}}
-                    @value={{this.password_confirmation}}
-                    @type="password"
-                    @helpText={{t "onboard.index.confirm-password-help-text"}}
-                    @inputClass="input-lg"
-                />
-
-                <div class="flex items-center justify-end mt-5">
-                    <Button
-                        @buttonType="submit"
-                        @icon="check"
-                        @iconPrefix="fas"
-                        @type="primary"
-                        @size="lg"
-                        @text={{t "onboard.index.continue-button-text"}}
-                        @isLoading={{this.onboard.isRunning}}
-                        @disabled={{not this.filled}}
-                    />
-                </div>
-            </form>
-
-            <RegistryYield @registry="onboard" as |YieldedComponent ctx|>
-                <YieldedComponent @context={{ctx}} />
-            </RegistryYield>
-        </div>
-    </div>
-</div>
--- a/console/app/components/onboarding/form.js
+++ b/console/app/components/onboarding/form.js
@@ -1,77 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action, getProperties } from '@ember/object';
-import { isBlank } from '@ember/utils';
-import { task } from 'ember-concurrency';
-import OnboardValidations from '../../validations/onboard';
-import lookupValidator from 'ember-changeset-validations';
-import Changeset from 'ember-changeset';
-
-export default class OnboardingFormComponent extends Component {
-    @service fetch;
-    @service session;
-    @service router;
-    @service notifications;
-    @service urlSearchParams;
-    @tracked name;
-    @tracked email;
-    @tracked phone;
-    @tracked organization_name;
-    @tracked password;
-    @tracked password_confirmation;
-    @tracked error;
-
-    get filled() {
-        // eslint-disable-next-line ember/no-get
-        const input = getProperties(this, 'name', 'email', 'phone', 'organization_name', 'password', 'password_confirmation');
-        return Object.values(input).every((val) => !isBlank(val));
-    }
-
-    @task *onboard(event) {
-        event?.preventDefault?.();
-
-        // eslint-disable-next-line ember/no-get
-        const input = getProperties(this, 'name', 'email', 'phone', 'organization_name', 'password', 'password_confirmation');
-        const changeset = new Changeset(input, lookupValidator(OnboardValidations), OnboardValidations);
-
-        yield changeset.validate();
-
-        if (changeset.get('isInvalid')) {
-            const errorMessage = changeset.errors.firstObject.validation.firstObject;
-
-            this.notifications.error(errorMessage);
-            return;
-        }
-
-        // Set user timezone
-        input.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-        try {
-            const { status, skipVerification, token, session } = yield this.fetch.post('onboard/create-account', input);
-            if (status !== 'success') {
-                this.notifications.error('Onboard failed');
-                return;
-            }
-
-            // save session
-            this.args.context.persist('session', session);
-
-            if (skipVerification === true && token) {
-                // only manually authenticate if skip verification
-                this.session.isOnboarding().manuallyAuthenticate(token);
-
-                yield this.router.transitionTo('console');
-                return this.notifications.success('Welcome to Fleetbase!');
-            } else {
-                this.args.orchestrator.next();
-                this.urlSearchParams.setParamsToCurrentUrl({
-                    step: this.args.orchestrator?.current?.id,
-                    session,
-                });
-            }
-        } catch (err) {
-            this.notifications.serverError(err);
-        }
-    }
-}
--- a/console/app/components/onboarding/verify-email.hbs
+++ b/console/app/components/onboarding/verify-email.hbs
@@ -1,82 +0,0 @@
-{{page-title (t "onboard.verify-email.header-title")}}
-
-<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
-    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
-        {{#if this.initialized}}
-            <div class="bg-white dark:bg-gray-800 py-8 px-4 shadow rounded-lg w-full">
-                <div class="mb-6">
-                    <LinkTo @route="console" class="flex items-center justify-center">
-                        <LogoIcon @size="12" class="rounded-md" />
-                    </LinkTo>
-                    <h2 class="mt-6 text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
-                        {{t "onboard.verify-email.title"}}
-                    </h2>
-                </div>
-
-                <InfoBlock @type="info" @icon="shield-halved" @iconSize="lg">
-                    {{t "onboard.verify-email.message-text" htmlSafe=true}}
-                </InfoBlock>
-
-                <form class="mt-8 space-y-6" {{on "submit" (perform this.verify)}}>
-                    <InputGroup
-                        @type="tel"
-                        @name={{t "onboard.verify-email.verification-input-label"}}
-                        @value={{this.code}}
-                        @helpText={{t "onboard.verify-email.verification-code-text"}}
-                        @inputClass="input-lg"
-                        {{on "input" this.verification.validateInput}}
-                        {{did-insert this.verification.validateInput}}
-                    />
-
-                    <div class="flex flex-row items-center space-x-4">
-                        <Button
-                            @icon="check"
-                            @iconPrefix="fas"
-                            @buttonType="submit"
-                            @type="primary"
-                            @size="lg"
-                            @text="Verify & Continue"
-                            @isLoading={{this.verify.isRunning}}
-                            @disabled={{not this.verification.ready}}
-                        />
-                        <a href="#" {{on "click" this.verification.didntReceiveCode}} class="text-sm text-blue-400 hover:text-blue-300">{{t "onboard.verify-email.didnt-receive-a-code"}}</a>
-                    </div>
-
-                    {{#if this.verification.waiting}}
-                        <div class="flex flex-col flex-grow-0 flex-shrink-0 text-sm bg-yellow-800 border border-yellow-600 px-2 py-2 rounded-md text-yellow-100 my-4 transition-all">
-                            <div class="flex flex-row items-start mb-2">
-                                <div class="w-8 flex-grow-0 flex-shrink-0">
-                                    <FaIcon @icon="triangle-exclamation" @size="xl" class="pt-1" />
-                                </div>
-                                <div class="flex-1">
-                                    <div class="flex-1 text-sm text-yellow-100">
-                                        <div>{{t "auth.verification.didnt-receive-a-code" htmlSafe=true}}</div>
-                                        <div>{{t "auth.verification.not-sent.alternative-choice" htmlSafe=true}}</div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="flex items-center space-x-2">
-                                <Button
-                                    @text={{t "auth.verification.not-sent.resend-email"}}
-                                    @buttonType="button"
-                                    @type="link"
-                                    class="text-yellow-100"
-                                    @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
-                                    @onClick={{this.verification.resendEmail}}
-                                />
-                                <Button
-                                    @text={{t "auth.verification.not-sent.send-by-sms"}}
-                                    @buttonType="button"
-                                    @type="link"
-                                    class="text-yellow-100"
-                                    @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
-                                    @onClick={{this.verification.resendBySms}}
-                                />
-                            </div>
-                        </div>
-                    {{/if}}
-                </form>
-            </div>
-        {{/if}}
-    </div>
-</div>
--- a/console/app/components/onboarding/verify-email.js
+++ b/console/app/components/onboarding/verify-email.js
@@ -1,53 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { later, next } from '@ember/runloop';
-import { not } from '@ember/object/computed';
-import { task } from 'ember-concurrency';
-
-export default class OnboardingVerifyEmailComponent extends Component {
-    @service('session') authSession;
-    @service('user-verification') verification;
-    @service fetch;
-    @service notifications;
-    @service router;
-    @service urlSearchParams;
-    @tracked code;
-    @tracked session;
-    @tracked initialized = false;
-
-    constructor() {
-        super(...arguments);
-        next(() => this.#initialize());
-    }
-
-    #initialize() {
-        this.code = this.urlSearchParams.get('code');
-        this.session = this.args.context.get('session') ?? this.urlSearchParams.get('session');
-        this.initialized = true;
-        this.verification.start();
-    }
-
-    @task *verify(event) {
-        event?.preventDefault?.();
-
-        try {
-            const { status, token } = yield this.fetch.post('onboard/verify-email', { session: this.session, code: this.code });
-            if (status === 'ok') {
-                this.notifications.success('Email successfully verified!');
-
-                if (token) {
-                    this.notifications.info('Welcome to Fleetbase!');
-                    this.authSession.manuallyAuthenticate(token);
-
-                    return this.router.transitionTo('console');
-                }
-
-                return this.router.transitionTo('auth.login');
-            }
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-}
--- a/console/app/components/onboarding/yield.hbs
+++ b/console/app/components/onboarding/yield.hbs
@@ -1,13 +0,0 @@
-<section class="onboarding step-host">
-    {{#if this.initialized}}
-        {{#if this.orchestrator.wrapper}}
-            {{component (lazy-engine-component this.orchestrator.wrapper) currentStepComponent=this.currentComponent context=this.context orchestrator=this.orchestrator brand=@brand}}
-        {{else if this.currentComponent}}
-            {{component (lazy-engine-component this.currentComponent) context=this.context orchestrator=this.orchestrator brand=@brand}}
-        {{/if}}
-    {{else}}
-        <div class="flex items-center justify-center min-h-24">
-            <Spinner />
-        </div>
-    {{/if}}
-</section>
--- a/console/app/components/onboarding/yield.js
+++ b/console/app/components/onboarding/yield.js
@@ -1,27 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
-import { next } from '@ember/runloop';
-
-export default class OnboardingYieldComponent extends Component {
-    @service('onboarding-orchestrator') orchestrator;
-    @service('onboarding-context') context;
-    @tracked initialized = false;
-
-    get currentComponent() {
-        return this.orchestrator.current && this.orchestrator.current.component;
-    }
-
-    constructor(owner, { step, session, code }) {
-        super(...arguments);
-        next(() => this.#initialize(step, session, code));
-    }
-
-    #initialize(step, session, code) {
-        if (step) this.orchestrator.goto(step);
-        if (session) this.context.persist('session', session);
-        if (code) this.context.set('code', code);
-
-        this.initialized = true;
-    }
-}
--- a/console/app/components/two-fa-enforcement-alert.js
+++ b/console/app/components/two-fa-enforcement-alert.js
@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';

--- a/console/app/controllers/console.js
+++ b/console/app/controllers/console.js
@@ -4,7 +4,6 @@ import { inject as service } from '@ember/service';
 import { later } from '@ember/runloop';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
-import { dasherize } from '@ember/string';
 import first from '@fleetbase/ember-core/utils/first';

 export default class ConsoleController extends Controller {
@@ -17,19 +16,67 @@ export default class ConsoleController extends Controller {
    @service intl;
    @service universe;
    @service abilities;
-    @service sidebar;
+
+    /**
+     * Authenticated user organizations.
+     *
+     * @var {Array}
+     */
    @tracked organizations = [];
+
+    /**
+     * Sidebar Context Controls
+     *
+     * @var {SidebarContext}
+     */
    @tracked sidebarContext;
+
+    /**
+     * State of sidebar toggle icon
+     *
+     * @var {SidebarContext}
+     */
+    @tracked sidebarToggleEnabled = true;
+
+    /**
+     * The sidebar toggle state.
+     *
+     * @var {SidebarContext}
+     */
    @tracked sidebarToggleState = {};
+
+    /**
+     * Routes which should hide the sidebar menu.
+     *
+     * @var {Array}
+     */
    @tracked hiddenSidebarRoutes = ['console.home', 'console.notifications', 'console.virtual'];
+
+    /**
+     * Menu items to be added to the main header navigation bar.
+     *
+     * @memberof ConsoleController
+     */
    @tracked menuItems = [];
+
+    /**
+     * Menu items to be added to the user dropdown menu located in the header.
+     *
+     * @memberof ConsoleController
+     */
    @tracked userMenuItems = [];
+
+    /**
+     * Menu items to be added to the organization dropdown menu located in the header.
+     *
+     * @memberof ConsoleController
+     */
    @tracked organizationMenuItems = [];

-    get currentRouteClass() {
-        return dasherize(this.router.currentRouteName.replace(/\./g, ' '));
-    }
-
+    /**
+     * Creates an instance of ConsoleController.
+     * @memberof ConsoleController
+     */
    constructor() {
        super(...arguments);
        this.router.on('routeDidChange', (transition) => {
@@ -42,17 +89,17 @@ export default class ConsoleController extends Controller {

                // Hide the sidebar if the current route is in hiddenSidebarRoutes
                if (shouldHideSidebar) {
-                    this.sidebar.hideNow();
+                    this.sidebarContext.hideNow();
                    this.sidebarToggleEnabled = false;
                    return; // Exit early as no further action is required
                }

                // If the sidebar was manually closed and not on a hidden route, keep it closed
                if (isSidebarManuallyClosed) {
-                    this.sidebar.hideNow();
+                    this.sidebarContext.hideNow();
                } else {
                    // Otherwise, show the sidebar
-                    this.sidebar.show();
+                    this.sidebarContext.show();
                }

                // Ensure toggle is enabled unless on a hidden route
@@ -87,7 +134,7 @@ export default class ConsoleController extends Controller {
        this.universe.trigger('sidebarContext.available', sidebarContext);

        if (this.hiddenSidebarRoutes.includes(this.router.currentRouteName)) {
-            this.sidebar.hideNow();
+            this.sidebarContext.hideNow();
            this.sidebarToggleEnabled = false;
        }
    }
--- a/console/app/controllers/console/account.js
+++ b/console/app/controllers/console/account.js
@@ -2,6 +2,10 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';

 export default class ConsoleAccountController extends Controller {
-    @service('universe/menu-service') menuService;
+    /**
+     * Inject the `universe` service.
+     *
+     * @memberof ConsoleAdminController
+     */
    @service universe;
 }
--- a/console/app/controllers/console/account/auth.js
+++ b/console/app/controllers/console/account/auth.js
@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';
 import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';

 /**
--- a/console/app/controllers/console/account/index.js
+++ b/console/app/controllers/console/account/index.js
@@ -1,9 +1,7 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { alias } from '@ember/object/computed';
-import { debug } from '@ember/debug';
 import { task } from 'ember-concurrency';

 export default class ConsoleAccountIndexController extends Controller {
@@ -42,18 +40,6 @@ export default class ConsoleAccountIndexController extends Controller {
     */
    @alias('currentUser.user') user;

-    /**
-     * Available timezones for selection.
-     *
-     * @memberof ConsoleAccountIndexController
-     */
-    @tracked timezones = [];
-
-    constructor() {
-        super(...arguments);
-        this.loadTimezones.perform();
-    }
-
    /**
     * Handle upload of new photo
     *
@@ -68,7 +54,6 @@ export default class ConsoleAccountIndexController extends Controller {
                subject_uuid: this.user.id,
                subject_type: 'user',
                type: 'user_avatar',
-                resize: 'md'
            },
            (uploadedFile) => {
                this.user.setProperties({
@@ -131,19 +116,6 @@ export default class ConsoleAccountIndexController extends Controller {
        return isPasswordValid;
    }

-    /**
-     * Load all available timezones from lookup.
-     *
-     * @memberof ConsoleAccountIndexController
-     */
-    @task *loadTimezones() {
-        try {
-            this.timezones = yield this.fetch.get('lookup/timezones');
-        } catch (error) {
-            debug(`Unable to load timezones : ${error.message}`);
-        }
-    }
-
    /**
     * Checks if any user attribute has been changed
     *
--- a/console/app/controllers/console/admin.js
+++ b/console/app/controllers/console/admin.js
@@ -2,6 +2,10 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';

 export default class ConsoleAdminController extends Controller {
-    @service('universe/menu-service') menuService;
+    /**
+     * Inject the `universe` service.
+     *
+     * @memberof ConsoleAdminController
+     */
    @service universe;
 }
--- a/console/app/controllers/console/admin/notifications.js
+++ b/console/app/controllers/console/admin/notifications.js
@@ -0,0 +1,136 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import createNotificationKey from '../../../utils/create-notification-key';
+
+export default class ConsoleAdminNotificationsController extends Controller {
+    /**
+     * Inject the notifications service.
+     *
+     * @memberof ConsoleAdminNotificationsController
+     */
+    @service notifications;
+
+    /**
+     * Inject the fetch service.
+     *
+     * @memberof ConsoleAdminNotificationsController
+     */
+    @service fetch;
+
+    /**
+     * The notification settings value JSON.
+     *
+     * @memberof ConsoleAdminNotificationsController
+     * @var {Object}
+     */
+    @tracked notificationSettings = {};
+
+    /**
+     * Notification transport methods enabled.
+     *
+     * @memberof ConsoleAdminNotificationsController
+     * @var {Array}
+     */
+    @tracked notificationTransportMethods = ['email', 'sms'];
+
+    /**
+     * Tracked property for the loading state
+     *
+     * @memberof ConsoleAdminNotificationsController
+     * @var {Boolean}
+     */
+    @tracked isLoading = false;
+
+    /**
+     * Creates an instance of ConsoleAdminNotificationsController.
+     * @memberof ConsoleAdminNotificationsController
+     */
+    constructor() {
+        super(...arguments);
+        this.getSettings();
+    }
+
+    /**
+     * Selectes notifiables for settings.
+     *
+     * @param {Object} notification
+     * @param {Array} notifiables
+     * @memberof ConsoleAdminNotificationsController
+     */
+    @action onSelectNotifiable(notification, notifiables) {
+        const notificationKey = createNotificationKey(notification.definition, notification.name);
+        const _notificationSettings = { ...this.notificationSettings };
+
+        if (!_notificationSettings[notificationKey]) {
+            _notificationSettings[notificationKey] = {};
+        }
+
+        _notificationSettings[notificationKey].notifiables = notifiables;
+        _notificationSettings[notificationKey].definition = notification.definition;
+        _notificationSettings[notificationKey].via = notifiables.map((notifiable) => {
+            return {
+                identifier: notifiable.value,
+                methods: this.notificationTransportMethods,
+            };
+        });
+
+        this.mutateNotificationSettings(_notificationSettings);
+    }
+
+    /**
+     * Mutates the notification settings property.
+     *
+     * @param {Object} [_notificationSettings={}]
+     * @memberof ConsoleAdminNotificationsController
+     */
+    mutateNotificationSettings(_notificationSettings = {}) {
+        this.notificationSettings = {
+            ...this.notificationSettings,
+            ..._notificationSettings,
+        };
+    }
+
+    /**
+     * Save notification settings to the server.
+     *
+     * @action
+     * @method saveSettings
+     * @returns {Promise}
+     * @memberof ConsoleAdminNotificationsController
+     */
+    @action saveSettings() {
+        const { notificationSettings } = this;
+
+        this.isLoading = true;
+
+        return this.fetch
+            .post('notifications/save-settings', { notificationSettings })
+            .then(() => {
+                this.notifications.success('Notification settings successfully saved.');
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
+
+    /**
+     * Fetches and updates notification settings asynchronously.
+     *
+     * @returns {Promise<void>} A promise for successful retrieval and update, or an error on failure.
+     */
+    getSettings() {
+        return this.fetch
+            .get('notifications/get-settings')
+            .then(({ notificationSettings }) => {
+                this.notificationSettings = notificationSettings;
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            });
+    }
+}
--- a/console/app/controllers/console/admin/two-fa-settings.js
+++ b/console/app/controllers/console/admin/two-fa-settings.js
@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';
 import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';

 /**
--- a/console/app/controllers/console/settings.js
+++ b/console/app/controllers/console/settings.js
@@ -2,6 +2,10 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';

 export default class ConsoleSettingsController extends Controller {
-    @service('universe/menu-service') menuService;
+    /**
+     * INject the `universe` service
+     *
+     * @memberof ConsoleSettingsController
+     */
    @service universe;
 }
--- a/console/app/controllers/console/settings/index.js
+++ b/console/app/controllers/console/settings/index.js
@@ -2,8 +2,6 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { debug } from '@ember/debug';
-import { task } from 'ember-concurrency';

 export default class ConsoleSettingsIndexController extends Controller {
    /**
@@ -27,6 +25,13 @@ export default class ConsoleSettingsIndexController extends Controller {
     */
    @service fetch;

+    /**
+     * The request loading state.
+     *
+     * @memberof ConsoleSettingsIndexController
+     */
+    @tracked isLoading = false;
+
    /**
     * the upload queue.
     *
@@ -41,32 +46,23 @@ export default class ConsoleSettingsIndexController extends Controller {
     */
    @tracked uploadedFiles = [];

-    /**
-     * Available timezones for selection.
-     *
-     * @memberof ConsoleAccountIndexController
-     */
-    @tracked timezones = [];
-
-    constructor() {
-        super(...arguments);
-        this.loadTimezones.perform();
-    }
-
    /**
     * Save the organization settings.
     *
     * @memberof ConsoleSettingsIndexController
     */
-    @task *saveSettings(event) {
-        event?.preventDefault();
+    @action saveSettings(event) {
+        event.preventDefault();
+        this.isLoading = true;

-        try {
-            yield this.model.save();
-            this.notifications.success('Organization changes successfully saved.');
-        } catch (error) {
-            debug(`Unable to save organization settings : ${error.message}`);
-        }
+        this.model
+            .save()
+            .then(() => {
+                this.notifications.success('Organization changes successfully saved.');
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
    }

    /**
@@ -95,17 +91,4 @@ export default class ConsoleSettingsIndexController extends Controller {
            }
        );
    }
-
-    /**
-     * Load all available timezones from lookup.
-     *
-     * @memberof ConsoleAccountIndexController
-     */
-    @task *loadTimezones() {
-        try {
-            this.timezones = yield this.fetch.get('lookup/timezones');
-        } catch (error) {
-            debug(`Unable to load timezones : ${error.message}`);
-        }
-    }
 }
--- a/console/app/controllers/console/settings/notifications.js
+++ b/console/app/controllers/console/settings/notifications.js
@@ -1,152 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import createNotificationKey from '@fleetbase/ember-core/utils/create-notification-key';
-import { task } from 'ember-concurrency';
-
-export default class ConsoleSettingsNotificationsController extends Controller {
-    @service notifications;
-    @service fetch;
-    @service store;
-    @service currentUser;
-    @tracked notificationSettings = {};
-    @tracked notificationTransportMethods = ['email', 'sms'];
-    @tracked company;
-
-    /**
-     * Creates an instance of ConsoleSettingsNotificationsController.
-     * @memberof ConsoleSettingsNotificationsController
-     */
-    constructor() {
-        super(...arguments);
-        this.getSettings.perform();
-    }
-
-    /**
-     * Toggles the "Alphanumeric Sender ID" feature for the current company.
-     *
-     * Updates the company's `options` object by setting the
-     * `alpha_numeric_sender_id_enabled` flag. This controls whether the
-     * organization uses a custom alphanumeric sender ID when sending SMS.
-     *
-     * @action
-     * @param {boolean} enabled - Whether the feature should be enabled or disabled.
-     * @returns {void}
-     */
-    @action toggleAlphaNumericSenderId(enabled) {
-        const currentOptions = this.company.options ?? {};
-        this.company.set('options', { ...currentOptions, alpha_numeric_sender_id_enabled: enabled });
-    }
-
-    /**
-     * Sets the Alphanumeric Sender ID string for the current company.
-     *
-     * Reads the input's value from the event and updates the company's `options`
-     * object by setting the `alpha_numeric_sender_id` field. This value represents
-     * the sender name that will appear in outbound SMS messages (subject to carrier
-     * support and restrictions).
-     *
-     * @action
-     * @param {Event} event - Input event containing the alphanumeric sender ID value.
-     * @returns {void}
-     */
-    @action setAlphaNumericSenderId(event) {
-        const value = event.target.value;
-        const currentOptions = this.company.options ?? {};
-        this.company.set('options', { ...currentOptions, alpha_numeric_sender_id: value });
-    }
-
-    /**
-     * Selectes notifiables for settings.
-     *
-     * @param {Object} notification
-     * @param {Array} notifiables
-     * @memberof ConsoleSettingsNotificationsController
-     */
-    @action onSelectNotifiable(notification, notifiables) {
-        const notificationKey = createNotificationKey(notification.definition, notification.name);
-        const _notificationSettings = { ...this.notificationSettings };
-
-        if (!_notificationSettings[notificationKey]) {
-            _notificationSettings[notificationKey] = {};
-        }
-
-        _notificationSettings[notificationKey].notifiables = notifiables;
-        _notificationSettings[notificationKey].definition = notification.definition;
-        _notificationSettings[notificationKey].via = notifiables.map((notifiable) => {
-            return {
-                identifier: notifiable.value,
-                methods: this.notificationTransportMethods,
-            };
-        });
-
-        this.mutateNotificationSettings(_notificationSettings);
-    }
-
-    /**
-     * Mutates the notification settings property.
-     *
-     * @param {Object} [_notificationSettings={}]
-     * @memberof ConsoleSettingsNotificationsController
-     */
-    mutateNotificationSettings(_notificationSettings = {}) {
-        this.notificationSettings = {
-            ...this.notificationSettings,
-            ..._notificationSettings,
-        };
-    }
-
-    /**
-     * Save notification settings.
-     *
-     * @memberof ConsoleSettingsNotificationsController
-     */
-    @task *saveSettings() {
-        const { notificationSettings } = this;
-
-        try {
-            yield this.fetch.post('notifications/save-settings', { notificationSettings: notificationSettings ?? {} });
-            yield this.saveCompanyOptions.perform();
-            this.notifications.success('Notification settings successfully saved.');
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-
-    /**
-     * Get notification settings.
-     *
-     * @memberof ConsoleSettingsNotificationsController
-     */
-    @task *getSettings() {
-        try {
-            const { notificationSettings } = yield this.fetch.get('notifications/get-settings');
-            this.notificationSettings = notificationSettings;
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-
-    /**
-     * Saves the updated company options to the backend.
-     *
-     * This ember-concurrency task attempts to persist the company's modified
-     * `options` object by calling `company.save()`. If the request fails, a server
-     * error notification is displayed. No action is taken if no company is loaded.
-     *
-     * @task
-     * @generator
-     * @yields {Promise} Resolves when the save request completes.
-     * @returns {Promise<void>} Task completion state.
-     */
-    @task *saveCompanyOptions() {
-        if (!this.company) return;
-
-        try {
-            yield this.company.save();
-        } catch (error) {
-            this.notifications.serverError(error);
-        }
-    }
-}
--- a/console/app/controllers/console/settings/two-fa.js
+++ b/console/app/controllers/console/settings/two-fa.js
@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';
 import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';

 export default class ConsoleSettingsTwoFaController extends Controller {
--- a/console/app/controllers/install.js
+++ b/console/app/controllers/install.js
@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';

 export default class InstallController extends Controller {
    @service fetch;
--- a/console/app/controllers/onboard/index.js
+++ b/console/app/controllers/onboard/index.js
@@ -1,8 +1,151 @@
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { action, getProperties } from '@ember/object';
+import OnboardValidations from '../../validations/onboard';
+import lookupValidator from 'ember-changeset-validations';
+import Changeset from 'ember-changeset';

 export default class OnboardIndexController extends Controller {
-    @tracked step;
-    @tracked session;
-    @tracked code;
+    /**
+     * Inject the `fetch` service
+     *
+     * @memberof OnboardIndexController
+     */
+    @service fetch;
+
+    /**
+     * Inject the `session` service
+     *
+     * @memberof OnboardIndexController
+     */
+    @service session;
+
+    /**
+     * Inject the `router` service
+     *
+     * @memberof OnboardIndexController
+     */
+    @service router;
+
+    /**
+     * Inject the `notifications` service
+     *
+     * @memberof OnboardIndexController
+     */
+    @service notifications;
+
+    /**
+     * The name input field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked name;
+
+    /**
+     * The email input field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked email;
+
+    /**
+     * The phone input field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked phone;
+
+    /**
+     * The organization_name input field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked organization_name;
+
+    /**
+     * The password input field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked password;
+
+    /**
+     * The name password confirmation field.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked password_confirmation;
+
+    /**
+     * The property for error message.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked error;
+
+    /**
+     * The loading state of the onboard request.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked isLoading = false;
+
+    /**
+     * The ready state for the form.
+     *
+     * @memberof OnboardIndexController
+     */
+    @tracked readyToSubmit = false;
+
+    /**
+     * Start the onboard process.
+     *
+     * @return {Promise}
+     * @memberof OnboardIndexController
+     */
+    @action async startOnboard(event) {
+        event.preventDefault();
+
+        // eslint-disable-next-line ember/no-get
+        const input = getProperties(this, 'name', 'email', 'phone', 'organization_name', 'password', 'password_confirmation');
+        const changeset = new Changeset(input, lookupValidator(OnboardValidations), OnboardValidations);
+
+        await changeset.validate();
+
+        if (changeset.get('isInvalid')) {
+            const errorMessage = changeset.errors.firstObject.validation.firstObject;
+
+            this.notifications.error(errorMessage);
+            return;
+        }
+
+        // Set user timezone
+        input.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+        this.isLoading = true;
+
+        return this.fetch
+            .post('onboard/create-account', input)
+            .then(({ status, skipVerification, token, session }) => {
+                if (status === 'success') {
+                    if (skipVerification === true && token) {
+                        // only manually authenticate if skip verification
+                        this.session.isOnboarding().manuallyAuthenticate(token);
+
+                        return this.router.transitionTo('console').then(() => {
+                            this.notifications.success('Welcome to Fleetbase!');
+                        });
+                    }
+
+                    return this.router.transitionTo('onboard.verify-email', { queryParams: { hello: session } });
+                }
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isLoading = false;
+            });
+    }
 }
--- a/console/app/controllers/virtual.js
+++ b/console/app/controllers/virtual.js
@@ -1,7 +0,0 @@
-import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
-
-export default class VirtualController extends Controller {
-    @tracked view;
-    queryParams = ['view'];
-}
--- a/console/app/deprecation-workflow.js
+++ b/console/app/deprecation-workflow.js
@@ -1,9 +0,0 @@
-import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
-
-setupDeprecationWorkflow({
-    workflow: [
-        { handler: 'silence', matchId: 'ember-concurrency.deprecate-decorator-task' },
-        { handler: 'silence', matchId: 'new-helper-names' },
-        { handler: 'silence', matchId: 'ember-data:deprecate-non-strict-relationships' },
-    ],
-});
--- a/console/app/helpers/get-notification-key.js
+++ b/console/app/helpers/get-notification-key.js
@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import createNotificationKey from '../utils/create-notification-key';
+
+export default helper(function getNotificationKey([definition, name]) {
+    return createNotificationKey(definition, name);
+});
--- a/console/app/index.html
+++ b/console/app/index.html
@@ -10,11 +10,9 @@

    {{content-for "head"}}

+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="192x192" href="/favicon/android-chrome-192x192.png" />
-    <link rel="icon" type="image/png" sizes="256x256" href="/favicon/android-chrome-256x256.png" />
    <link rel="manifest" href="/favicon/site.webmanifest" />
    <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5" />
    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
--- a/console/app/initializers/load-intl-polyfills.js
+++ b/console/app/initializers/load-intl-polyfills.js
@@ -1,44 +0,0 @@
-import translations from 'ember-intl/translations';
-import { all } from 'rsvp';
-
-const isBrowser = typeof window !== 'undefined';
-
-function langOf(tag = 'en') {
-    return String(tag).toLowerCase().split('-')[0];
-}
-
-async function loadBasePolyfills() {
-    await import('@formatjs/intl-numberformat/polyfill-force');
-    await import('@formatjs/intl-pluralrules/polyfill-force');
-    await import('@formatjs/intl-datetimeformat/polyfill-force');
-    await import('@formatjs/intl-relativetimeformat/polyfill-force');
-}
-
-async function loadLocaleData(lang) {
-    return all([
-        import(`@formatjs/intl-numberformat/locale-data/${lang}.js`),
-        import(`@formatjs/intl-pluralrules/locale-data/${lang}.js`),
-        import(`@formatjs/intl-datetimeformat/locale-data/${lang}.js`),
-        import(`@formatjs/intl-relativetimeformat/locale-data/${lang}.js`),
-    ]);
-}
-
-export function initialize(application) {
-    if (!isBrowser) return;
-
-    // Build-time list of locales from the generated module
-    const locales = translations.map(([locale]) => String(locale));
-    const langs = [...new Set(locales.map(langOf))];
-
-    application.deferReadiness();
-    (async () => {
-        await loadBasePolyfills();
-        await all(langs.map(loadLocaleData));
-        application.advanceReadiness();
-    })();
-}
-
-export default {
-    name: 'load-intl-polyfills',
-    initialize,
-};
--- a/console/app/initializers/load-runtime-config.js
+++ b/console/app/initializers/load-runtime-config.js
@@ -1,41 +0,0 @@
-import loadRuntimeConfig from '@fleetbase/console/utils/runtime-config';
-import { debug } from '@ember/debug';
-
-/**
- * Load Runtime Config Initializer
- *
- * Loads runtime configuration from fleetbase.config.json before the application boots.
- * This must run first to ensure all config is available for other initializers.
- *
- * Uses `before` to ensure it runs before any other initializers.
- *
- * @export
- * @param {Application} application
- */
-export function initialize(application) {
-    const startTime = performance.now();
-    debug('[Runtime Config] Loading runtime configuration...');
-
-    // Defer readiness until config is loaded
-    application.deferReadiness();
-    (async () => {
-        try {
-            await loadRuntimeConfig();
-            const endTime = performance.now();
-            debug(`[Runtime Config] Runtime config loaded in ${(endTime - startTime).toFixed(2)}ms`);
-            application.advanceReadiness();
-        } catch (error) {
-            console.error('[Runtime Config] Failed to load runtime config:', error);
-            // Still advance readiness to prevent hanging
-            application.advanceReadiness();
-        }
-    })();
-}
-
-export default {
-    name: 'load-runtime-config',
-    initialize,
-    // Run after intl polyfills are loaded, before socketcluster
-    after: 'load-intl-polyfills',
-    before: 'load-socketcluster-client',
-};
--- a/console/app/instance-initializers/apply-router-fix.js
+++ b/console/app/instance-initializers/apply-router-fix.js
@@ -1,38 +0,0 @@
-import applyRouterFix from '@fleetbase/console/utils/router-refresh-patch';
-import { debug } from '@ember/debug';
-
-/**
- * Apply Router Fix Instance Initializer
- *
- * Applies the Fleetbase router refresh bug fix patch.
- * This patches the Ember router to handle dynamic segments correctly
- * when refreshing routes with query parameters.
- *
- * Runs as an instance-initializer because it needs access to the
- * application instance and router service.
- *
- * Bug: https://github.com/emberjs/ember.js/issues/19260
- *
- * @export
- * @param {ApplicationInstance} appInstance
- */
-export function initialize(appInstance) {
-    const startTime = performance.now();
-    debug('[Initializing Router Patch] Applying router refresh bug fix...');
-
-    try {
-        applyRouterFix(appInstance);
-
-        const endTime = performance.now();
-        debug(`[Initializing Router Patch] Router fix applied in ${(endTime - startTime).toFixed(2)}ms`);
-    } catch (error) {
-        console.error('[Initializing Router Patch] Failed to apply router fix:', error);
-    }
-}
-
-export default {
-    name: 'apply-router-fix',
-    initialize,
-    // Run before extension loading to ensure router is patched early
-    before: 'load-extensions',
-};
--- a/console/app/instance-initializers/initialize-registries.js
+++ b/console/app/instance-initializers/initialize-registries.js
@@ -1,20 +0,0 @@
-import { debug } from '@ember/debug';
-
-/**
- * Create console-specific registries
- * Runs after extensions are loaded
- */
-export function initialize(appInstance) {
-    const registryService = appInstance.lookup('service:universe/registry-service');
-
-    debug('[Initializing Registries] Creating console registries...');
-
-    // Create console-specific registries
-    registryService.createRegistries(['@fleetbase/console', 'auth:login']);
-}
-
-export default {
-    name: 'initialize-registries',
-    after: 'load-extensions',
-    initialize,
-};
--- a/console/app/instance-initializers/initialize-widgets.js
+++ b/console/app/instance-initializers/initialize-widgets.js
@@ -1,47 +1,36 @@
-import { Widget } from '@fleetbase/ember-core/contracts';
 import { faGithub } from '@fortawesome/free-brands-svg-icons';
-import { debug } from '@ember/debug';

-/**
- * Register dashboard and widgets for FleetbaseConsole
- * Runs after extensions are loaded
- */
-export function initialize(appInstance) {
-    const widgetService = appInstance.lookup('service:universe/widget-service');
-
-    debug('[Initializing Widgets] Registering console dashboard and widgets...');
-
-    // Register the console dashboard
-    widgetService.registerDashboard('dashboard');
-
-    // Create widget definitions
-    const widgets = [
-        new Widget({
-            id: 'fleetbase-blog',
+export function initialize(application) {
+    const universe = application.lookup('service:universe');
+    const defaultWidgets = [
+        {
+            widgetId: 'fleetbase-blog',
            name: 'Fleetbase Blog',
            description: 'Lists latest news and events from the Fleetbase official team.',
            icon: 'newspaper',
            component: 'fleetbase-blog',
            grid_options: { w: 8, h: 9, minW: 8, minH: 9 },
-            default: true,
-        }),
-        new Widget({
-            id: 'fleetbase-github-card',
+            options: {
+                title: 'Fleetbase Blog',
+            },
+        },
+        {
+            widgetId: 'fleetbase-github-card',
            name: 'Github Card',
            description: 'Displays current Github stats from the official Fleetbase repo.',
            icon: faGithub,
            component: 'github-card',
            grid_options: { w: 4, h: 8, minW: 4, minH: 8 },
-            default: true,
-        }),
+            options: {
+                title: 'Github Card',
+            },
+        },
    ];

-    // Register widgets
-    widgetService.registerWidgets('dashboard', widgets);
+    universe.registerDefaultDashboardWidgets(defaultWidgets);
+    universe.registerDashboardWidgets(defaultWidgets);
 }

 export default {
-    name: 'initialize-widgets',
-    after: 'load-extensions',
    initialize,
 };
--- a/console/app/instance-initializers/load-extensions.js
+++ b/console/app/instance-initializers/load-extensions.js
@@ -1,19 +1,11 @@
-/**
- * Load extensions from the API using ExtensionManager
- * This must run before other initializers that depend on extensions
- */
-export async function initialize(appInstance) {
-    const application = appInstance.application;
-    const extensionManager = appInstance.lookup('service:universe/extension-manager');
-
-    try {
-        await extensionManager.loadExtensions(application);
-    } catch (error) {
-        console.error('[load-extensions] Error:', error);
+export function initialize(application) {
+    const universe = application.lookup('service:universe');
+    if (universe) {
+        universe.createRegistries(['@fleetbase/console', 'auth:login']);
+        universe.bootEngines(application);
    }
 }

 export default {
-    name: 'load-extensions',
    initialize,
 };
--- a/console/app/instance-initializers/load-leaflet.js
+++ b/console/app/instance-initializers/load-leaflet.js
@@ -14,6 +14,5 @@ export function initialize(application) {
 }

 export default {
-    name: 'load-leaflet',
    initialize,
 };
--- a/console/app/instance-initializers/register-default-onboarding-flow.js
+++ b/console/app/instance-initializers/register-default-onboarding-flow.js
@@ -1,19 +0,0 @@
-export function initialize(owner) {
-    const registry = owner.lookup('service:onboarding-registry');
-    if (registry) {
-        const defaultFlow = {
-            id: 'default@v1',
-            entry: 'signup',
-            steps: [
-                { id: 'signup', component: 'onboarding/form', next: 'verify-email' },
-                { id: 'verify-email', component: 'onboarding/verify-email' },
-            ],
-        };
-
-        registry.registerFlow(defaultFlow);
-    }
-}
-
-export default {
-    initialize,
-};
--- a/console/app/instance-initializers/set-application-instance.js
+++ b/console/app/instance-initializers/set-application-instance.js
@@ -1,17 +0,0 @@
-export function initialize(appInstance) {
-    // Set window.Fleetbase to the application instance for global access
-    // This is used by services and engines to access the root application instance
-    if (typeof window !== 'undefined') {
-        window.Fleetbase = appInstance;
-    }
-
-    // Look up UniverseService and set the application instance
-    const universeService = appInstance.lookup('service:universe');
-    if (universeService) {
-        universeService.setApplicationInstance(appInstance);
-    }
-}
-
-export default {
-    initialize
-};
--- a/console/app/instance-initializers/setup-extensions.js
+++ b/console/app/instance-initializers/setup-extensions.js
@@ -1,16 +0,0 @@
-/**
- * Setup extensions by loading and executing their extension.js files
- * Runs after extensions are loaded from API
- */
-export async function initialize(appInstance) {
-    const universe = appInstance.lookup('service:universe');
-    const extensionManager = appInstance.lookup('service:universe/extension-manager');
-
-    await extensionManager.setupExtensions(appInstance, universe);
-}
-
-export default {
-    name: 'setup-extensions',
-    after: ['load-extensions', 'initialize-registries', 'initialize-widgets'],
-    initialize,
-};
--- a/console/app/models/activity.js
+++ b/console/app/models/activity.js
@@ -1,20 +0,0 @@
-import Model, { attr } from '@ember-data/model';
-
-export default class ActivityModel extends Model {
-    @attr('string') uuid;
-    @attr('string') log_name;
-    @attr('string') description;
-    @attr('string') company_id;
-    @attr('string') subject_id;
-    @attr('string') subject_type;
-    @attr('string') humanized_subject_type;
-    @attr('string') event;
-    @attr('string') causer_id;
-    @attr('string') causer_type;
-    @attr('string') humanized_causer_type;
-    @attr('object') properties;
-    @attr('object') causer;
-    @attr('object') subject;
-    @attr('date') created_at;
-    @attr('date') updated_at;
-}
--- a/console/app/models/alert.js
+++ b/console/app/models/alert.js
@@ -1,311 +0,0 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
-import { computed } from '@ember/object';
-import { format, formatDistanceToNow, differenceInMinutes } from 'date-fns';
-
-export default class AlertModel extends Model {
-    /** @attributes */
-    @attr('string') type;
-    @attr('string') severity;
-    @attr('string') status;
-    @attr('string') subject_type;
-    @attr('string') subject_uuid;
-    @attr('string') message;
-
-    /** @json attributes */
-    @attr() rule;
-    @attr() context;
-    @attr() meta;
-
-    /** @dates */
-    @attr('date') triggered_at;
-    @attr('date') acknowledged_at;
-    @attr('date') resolved_at;
-    @attr('date') created_at;
-    @attr('date') updated_at;
-    @attr('date') deleted_at;
-
-    /** @relationships */
-    @belongsTo('company') company;
-    @belongsTo('user', { inverse: null }) acknowledgedBy;
-    @belongsTo('user', { inverse: null }) resolvedBy;
-
-    /** @computed - Date formatting */
-    @computed('triggered_at') get triggeredAgo() {
-        if (!this.triggered_at) return 'Unknown';
-        return formatDistanceToNow(this.triggered_at) + ' ago';
-    }
-
-    @computed('triggered_at') get triggeredAt() {
-        if (!this.triggered_at) return 'Unknown';
-        return format(this.triggered_at, 'yyyy-MM-dd HH:mm');
-    }
-
-    @computed('acknowledged_at') get acknowledgedAgo() {
-        if (!this.acknowledged_at) return null;
-        return formatDistanceToNow(this.acknowledged_at) + ' ago';
-    }
-
-    @computed('acknowledged_at') get acknowledgedAt() {
-        if (!this.acknowledged_at) return 'Not acknowledged';
-        return format(this.acknowledged_at, 'yyyy-MM-dd HH:mm');
-    }
-
-    @computed('resolved_at') get resolvedAgo() {
-        if (!this.resolved_at) return null;
-        return formatDistanceToNow(this.resolved_at) + ' ago';
-    }
-
-    @computed('resolved_at') get resolvedAt() {
-        if (!this.resolved_at) return 'Not resolved';
-        return format(this.resolved_at, 'yyyy-MM-dd HH:mm');
-    }
-
-    @computed('updated_at') get updatedAgo() {
-        return formatDistanceToNow(this.updated_at) + ' ago';
-    }
-
-    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
-    }
-
-    @computed('created_at') get createdAgo() {
-        return formatDistanceToNow(this.created_at) + ' ago';
-    }
-
-    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
-    }
-
-    /** @computed - Status checks */
-    @computed('acknowledged_at') get isAcknowledged() {
-        return !!this.acknowledged_at;
-    }
-
-    @computed('resolved_at') get isResolved() {
-        return !!this.resolved_at;
-    }
-
-    @computed('isAcknowledged', 'isResolved') get isPending() {
-        return !this.isAcknowledged && !this.isResolved;
-    }
-
-    @computed('isAcknowledged', 'isResolved') get isActive() {
-        return this.isAcknowledged && !this.isResolved;
-    }
-
-    /** @computed - Duration calculations */
-    @computed('triggered_at', 'acknowledged_at') get acknowledgmentDurationMinutes() {
-        if (!this.triggered_at || !this.acknowledged_at) return null;
-        return differenceInMinutes(new Date(this.acknowledged_at), new Date(this.triggered_at));
-    }
-
-    @computed('triggered_at', 'resolved_at') get resolutionDurationMinutes() {
-        if (!this.triggered_at || !this.resolved_at) return null;
-        return differenceInMinutes(new Date(this.resolved_at), new Date(this.triggered_at));
-    }
-
-    @computed('triggered_at') get ageMinutes() {
-        if (!this.triggered_at) return 0;
-        return differenceInMinutes(new Date(), new Date(this.triggered_at));
-    }
-
-    @computed('acknowledgmentDurationMinutes') get acknowledgmentDurationFormatted() {
-        if (!this.acknowledgmentDurationMinutes) return null;
-
-        const minutes = this.acknowledgmentDurationMinutes;
-        if (minutes < 60) return `${minutes}m`;
-        if (minutes < 1440) return `${Math.floor(minutes / 60)}h ${minutes % 60}m`;
-        return `${Math.floor(minutes / 1440)}d ${Math.floor((minutes % 1440) / 60)}h`;
-    }
-
-    @computed('resolutionDurationMinutes') get resolutionDurationFormatted() {
-        if (!this.resolutionDurationMinutes) return null;
-
-        const minutes = this.resolutionDurationMinutes;
-        if (minutes < 60) return `${minutes}m`;
-        if (minutes < 1440) return `${Math.floor(minutes / 60)}h ${minutes % 60}m`;
-        return `${Math.floor(minutes / 1440)}d ${Math.floor((minutes % 1440) / 60)}h`;
-    }
-
-    @computed('ageMinutes') get ageFormatted() {
-        const minutes = this.ageMinutes;
-        if (minutes < 60) return `${minutes}m`;
-        if (minutes < 1440) return `${Math.floor(minutes / 60)}h ${minutes % 60}m`;
-        return `${Math.floor(minutes / 1440)}d ${Math.floor((minutes % 1440) / 60)}h`;
-    }
-
-    /** @computed - Severity styling */
-    @computed('severity') get severityBadgeClass() {
-        const severityClasses = {
-            critical: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-300',
-            high: 'bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-300',
-            medium: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300',
-            low: 'bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300',
-            info: 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300',
-        };
-        return severityClasses[this.severity] || severityClasses['info'];
-    }
-
-    @computed('severity') get severityIcon() {
-        const severityIcons = {
-            critical: 'fas fa-exclamation-circle',
-            high: 'fas fa-exclamation-triangle',
-            medium: 'fas fa-exclamation',
-            low: 'fas fa-info-circle',
-            info: 'fas fa-info',
-        };
-        return severityIcons[this.severity] || severityIcons['info'];
-    }
-
-    @computed('severity') get severityColor() {
-        const severityColors = {
-            critical: 'text-red-600 dark:text-red-400',
-            high: 'text-orange-600 dark:text-orange-400',
-            medium: 'text-yellow-600 dark:text-yellow-400',
-            low: 'text-blue-600 dark:text-blue-400',
-            info: 'text-gray-600 dark:text-gray-400',
-        };
-        return severityColors[this.severity] || severityColors['info'];
-    }
-
-    /** @computed - Status styling */
-    @computed('status', 'isAcknowledged', 'isResolved') get statusBadgeClass() {
-        if (this.isResolved) {
-            return 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300';
-        }
-        if (this.isAcknowledged) {
-            return 'bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300';
-        }
-        return 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-300';
-    }
-
-    @computed('status', 'isAcknowledged', 'isResolved') get statusText() {
-        if (this.isResolved) return 'Resolved';
-        if (this.isAcknowledged) return 'Acknowledged';
-        return 'Pending';
-    }
-
-    @computed('status', 'isAcknowledged', 'isResolved') get statusIcon() {
-        if (this.isResolved) return 'fas fa-check-circle';
-        if (this.isAcknowledged) return 'fas fa-eye';
-        return 'fas fa-bell';
-    }
-
-    /** @computed - Type styling */
-    @computed('type') get typeIcon() {
-        const typeIcons = {
-            maintenance: 'fas fa-wrench',
-            temperature: 'fas fa-thermometer-half',
-            fuel: 'fas fa-gas-pump',
-            speed: 'fas fa-tachometer-alt',
-            location: 'fas fa-map-marker-alt',
-            system: 'fas fa-cog',
-            security: 'fas fa-shield-alt',
-            performance: 'fas fa-chart-line',
-            compliance: 'fas fa-clipboard-check',
-        };
-        return typeIcons[this.type] || 'fas fa-bell';
-    }
-
-    @computed('type') get typeBadgeClass() {
-        const typeClasses = {
-            maintenance: 'bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-300',
-            temperature: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-300',
-            fuel: 'bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300',
-            speed: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300',
-            location: 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300',
-            system: 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300',
-            security: 'bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-300',
-            performance: 'bg-indigo-100 text-indigo-800 dark:bg-indigo-900 dark:text-indigo-300',
-            compliance: 'bg-pink-100 text-pink-800 dark:bg-pink-900 dark:text-pink-300',
-        };
-        return typeClasses[this.type] || 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300';
-    }
-
-    /** @computed - Subject information */
-    @computed('subject_type') get subjectTypeFormatted() {
-        if (!this.subject_type) return 'Unknown';
-
-        // Convert from model class name to human readable
-        const typeMap = {
-            vehicle: 'Vehicle',
-            driver: 'Driver',
-            order: 'Order',
-            device: 'Device',
-            asset: 'Asset',
-            maintenance: 'Maintenance',
-            fuel_report: 'Fuel Report',
-        };
-
-        return typeMap[this.subject_type] || this.subject_type.replace(/_/g, ' ').replace(/\b\w/g, (l) => l.toUpperCase());
-    }
-
-    /** @computed - Priority and urgency */
-    @computed('severity', 'ageMinutes') get urgencyLevel() {
-        const severityWeight = {
-            critical: 4,
-            high: 3,
-            medium: 2,
-            low: 1,
-            info: 0,
-        };
-
-        const weight = severityWeight[this.severity] || 0;
-        const ageHours = this.ageMinutes / 60;
-
-        // Calculate urgency based on severity and age
-        if (weight >= 3 && ageHours > 1) return 'urgent';
-        if (weight >= 2 && ageHours > 4) return 'urgent';
-        if (weight >= 3) return 'high';
-        if (weight >= 2) return 'medium';
-        return 'low';
-    }
-
-    @computed('urgencyLevel') get urgencyBadgeClass() {
-        const urgencyClasses = {
-            urgent: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-300 animate-pulse',
-            high: 'bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-300',
-            medium: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300',
-            low: 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300',
-        };
-        return urgencyClasses[this.urgencyLevel] || urgencyClasses['low'];
-    }
-
-    /** @computed - Context information */
-    @computed('context') get hasContext() {
-        return !!(this.context && Object.keys(this.context).length > 0);
-    }
-
-    @computed('rule') get hasRule() {
-        return !!(this.rule && Object.keys(this.rule).length > 0);
-    }
-
-    @computed('context.location') get hasLocation() {
-        return !!this.context?.location;
-    }
-
-    @computed('context.value', 'rule.{operator,threshold}') get thresholdExceeded() {
-        if (!this.context?.value || !this.rule?.threshold) return null;
-
-        const value = parseFloat(this.context.value);
-        const threshold = parseFloat(this.rule.threshold);
-        const operator = this.rule.operator || '>';
-
-        switch (operator) {
-            case '>':
-                return value > threshold;
-            case '<':
-                return value < threshold;
-            case '>=':
-                return value >= threshold;
-            case '<=':
-                return value <= threshold;
-            case '==':
-                return value === threshold;
-            case '!=':
-                return value !== threshold;
-            default:
-                return null;
-        }
-    }
-}
--- a/console/app/models/category.js
+++ b/console/app/models/category.js
@@ -18,10 +18,6 @@ export default class CategoryModel extends Model {
    @hasMany('category', { inverse: 'parent' }) subcategories;
    @tracked parent_category;

-    /** Array<CustomFieldModel> attached at runtime for rendering */
-    @tracked customFields = [];
-    @tracked isEditing = false;
-
    /** @attributes */
    @attr('string') owner_type;
    @attr('string') name;
@@ -50,7 +46,7 @@ export default class CategoryModel extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }

    @computed('updated_at') get updatedAtShort() {
@@ -62,7 +58,7 @@ export default class CategoryModel extends Model {
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('created_at') get createdAtShort() {
--- a/console/app/models/comment.js
+++ b/console/app/models/comment.js
@@ -31,7 +31,7 @@ export default class CommentModel extends Model {
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('updated_at') get updatedAgo() {
@@ -39,6 +39,6 @@ export default class CommentModel extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }
 }
--- a/console/app/models/company.js
+++ b/console/app/models/company.js
@@ -24,7 +24,7 @@ export default class Company extends Model {
    @attr('string') logo_url;
    @attr('string') backdrop_url;
    @attr('string') description;
-    @attr('object') options;
+    @attr('raw') options;
    @attr('number') users_count;
    @attr('string') type;
    @attr('string') currency;
@@ -50,7 +50,7 @@ export default class Company extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }

    @computed('updated_at') get updatedAtShort() {
@@ -62,7 +62,7 @@ export default class Company extends Model {
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('created_at') get createdAtShort() {
--- a/console/app/models/custom-field-value.js
+++ b/console/app/models/custom-field-value.js
@@ -41,7 +41,7 @@ export default class CustomFieldValueModel extends Model {
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('updated_at') get updatedAgo() {
@@ -49,6 +49,6 @@ export default class CustomFieldValueModel extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }
 }
--- a/console/app/models/custom-field.js
+++ b/console/app/models/custom-field.js
@@ -12,7 +12,6 @@ export default class CustomFieldModel extends Model {
    /** @attributes */
    @attr('string') name;
    @attr('string') description;
-    @attr('string') for;
    @attr('string') help_text;
    @attr('string') label;
    @attr('string') type;
@@ -31,20 +30,12 @@ export default class CustomFieldModel extends Model {
    @attr('date') deleted_at;

    /** @computed */
-    @computed('type') get valueType() {
-        if (this.type === 'file-upload') return 'file';
-        if (this.type === 'date-time-input') return 'date';
-        if (this.type === 'model-select') return 'model';
-
-        return 'text';
-    }
-
    @computed('created_at') get createdAgo() {
        return formatDistanceToNow(this.created_at);
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('updated_at') get updatedAgo() {
@@ -52,6 +43,6 @@ export default class CustomFieldModel extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }
 }
--- a/console/app/models/dashboard-widget.js
+++ b/console/app/models/dashboard-widget.js
@@ -25,7 +25,7 @@ export default class DashboardWidgetModel extends Model {
    }

    @computed('updated_at') get updatedAt() {
-        return format(this.updated_at, 'yyyy-MM-dd HH:mm');
+        return format(this.updated_at, 'PPP p');
    }

    @computed('updated_at') get updatedAtShort() {
@@ -37,7 +37,7 @@ export default class DashboardWidgetModel extends Model {
    }

    @computed('created_at') get createdAt() {
-        return format(this.created_at, 'yyyy-MM-dd HH:mm');
+        return format(this.created_at, 'PPP p');
    }

    @computed('created_at') get createdAtShort() {
--- a/Show More
+++ b/Show More