Hotfix: patch dropdown menu item isComponent

feat: New SMS service to support multiple SMS providers + framework improvements

.github/workflows/build-binaries.yml

@@ -0,0 +1,64 @@
+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 }}

.github/workflows/cd.yml

@@ -58,6 +58,43 @@ 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
@@ -65,9 +102,21 @@ jobs:
       - name: Deploy the images 🚀
         run: |-
           set -eu
-          # 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
+          
+          # 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}"
 
   build_frontend:
     name: Build and Deploy the Console
@@ -132,25 +181,32 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+      - name: Create and Setup .npmrc
         run: |
           if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
             echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
           fi
+          if [[ -n "${{ secrets.FLEETBASE_REGISTRY_TOKEN }}" ]]; then
+            echo "//registry.fleetbase.io/:_authToken=${{ secrets.FLEETBASE_REGISTRY_TOKEN }}" >> .npmrc
+            echo "@fleetbase:registry=https://registry.fleetbase.io" >> .npmrc
+          fi
         working-directory: ./console
 
       - name: Set Env Variables for QA
         if: startsWith(github.ref, 'refs/heads/deploy/qa')
         run: |
           echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./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
         working-directory: ./console
 
       - name: Set Env Variables for Production
         if: startsWith(github.ref, 'refs/heads/deploy/production')
         run: |
           echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./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
         working-directory: ./console
 
       - name: Install dependencies
@@ -169,6 +225,11 @@ 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

.github/workflows/create-release.yml

@@ -0,0 +1,21 @@
+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 }}

.github/workflows/discord-announcement.yml

@@ -0,0 +1,61 @@
+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)

.github/workflows/discord_announcement.yml

@@ -1,48 +0,0 @@
-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

.github/workflows/gcp-cd.yml

@@ -1,4 +1,4 @@
-name: Fleetbase CI/CD
+name: Fleetbase GCP CI/CD
 
 on:
   push:

.github/workflows/publish-docker-images.yml

@@ -0,0 +1,50 @@
+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

.gitignore

@@ -3,6 +3,7 @@
 .env.backup
 .phpunit.result.cache
 .pnpm-store
+.tool-versions
 docker-compose.override.yml
 npm-debug.log
 yarn-error.log
@@ -16,6 +17,8 @@ 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/*
@@ -30,7 +33,25 @@ packages/flespi
 packages/loconav
 packages/internals
 packages/projectargus-engine
-# wip
+packages/customer-portal
 packages/solid
+packages/aws-marketplace
+packages/countries
+packages/fliit
+packages/samsara
+packages/solid*
+packages/valhalla
+packages/vroom
 solid
-verdaccio
+verdaccio
+# asdf
+.tools-versions
+# binary build resources
+builds/osx/frankenphp
+# build artifacts
+/builds/dist/
+/builds/linux/spc/downloads/*
+*.exe
+*.dll
+*.so
+*.dylib

Caddyfile

@@ -8,6 +8,7 @@
 http://:8000 {
 	root * /fleetbase/api/public
 	encode zstd br gzip
+	
 	php_server {
 		resolve_root_symlink
 	}

README.md

@@ -7,13 +7,13 @@
     <p align="center" dir="auto">
       Modular logistics and supply chain operating system
       <br>
-      <a href="https://docs.fleetbase.io/" rel="nofollow">Documentation</a>
+      <a href="https://docs.fleetbase.io/" rel="nofollow" target="_fleetbase_docs">Documentation</a>
       ·
-      <a href="https://console.fleetbase.io" rel="nofollow">Cloud Version</a>
+      <a href="https://console.fleetbase.io" rel="nofollow" target="_fleetbase_console">Cloud Version</a>
       ·
-      <a href="https://fleetbase.apichecker.com" target="_api_status" rel="nofollow">API Status</a>
+      <a href="https://console.fleetbase.io/aws-marketplace" rel="nofollow" target="_aws_marketplace">Deploy on AWS</a>
       ·
-      <a href="https://meetings.hubspot.com/shiv-thakker" rel="nofollow">Book a Demo</a>
+      <a href="https://tally.so/r/3NBpAW" rel="nofollow">Book a Demo</a>
       ·
       <a href="https://discord.gg/V7RVWRQ2Wm" target="discord" rel="nofollow">Discord</a>
     </p>
@@ -25,23 +25,49 @@
 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://github.com/fleetbase/fleetbase/assets/816371/125348c9-c88a-49fe-b098-9abec9d7dff8" alt="Fleetbase Console" width="1200" style="max-width: 100%;" />
+  <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>
 </p>
 
 **Quickstart**
 
 ```bash
 git clone git@github.com:fleetbase/fleetbase.git  
-cd fleetbase  
-docker-compose up -d  
-docker exec -ti fleetbase-application-1 bash  
-sh deploy.sh
+cd fleetbase && ./scripts/docker-install.sh
 ```
 
 ## 📖 Table of contents
 
   - [Features](#-features)
   - [Install](#-install)
+  - [Deploy on AWS](#-deploy-on-aws-in-one-click)
+  - [Extensions](#-extensions)
   - [Apps](#-apps)
   - [Roadmap](#-roadmap)
   - [Bugs and Feature Requests](#-bugs-and--feature-requests)
@@ -74,10 +100,7 @@ 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  
-docker-compose up -d  
-docker exec -ti fleetbase-application-1 bash  
-sh deploy.sh
+cd fleetbase && ./scripts/docker-install.sh
 ```
 
 ### Accessing Fleetbase
@@ -88,30 +111,100 @@ Fleetbase API: http://localhost:8000
 
 ### Additional Configurations
 
-**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.  
+**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.
   
-**Routing:** Fleetbase ships with its own OSRM server hosted at `[bundle.routing.fleetbase.io](https://bundle.routing.fleetbase.io)` 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.  
+**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://bundle.routing.fleetbase.io
+      OSRM_HOST: https://router.project-osrm.org
       IPINFO_API_KEY:
       GOOGLE_MAPS_API_KEY:  
       GOOGLE_MAPS_LOCALE: us
       TWILIO_SID:  
       TWILIO_TOKEN:
       TWILIO_FROM:
-      CONSOLE_HOST: http://localhost:4200
+
+  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:*"}'
 ```
 
+**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.
+
+You can find extensions available from the official [Fleetbase Console](https://console.fleetbase.io), here you will also be able get your registry token to install extensions to a self-hosted Fleetbase instance. 
+
+Additionally you're able to develop and publish your own extensions as well which you can read more about developing extensions via the [extension building guide](https://docs.fleetbase.io/developers/building-an-extension).
+
+## ⌨️ Fleetbase CLI 
+
+The Fleetbase CLI is a powerful tool designed to simplify the management of extensions for your Fleetbase instance. With the CLI, you can effortlessly handle authentication, install and uninstall extensions, and scaffold new extensions if you are developing your own.
+
+Get started with the CLI with npm:
+
+```bash
+npm i -g @fleetbase/cli
+```
+
+Once installed, you can access a variety of commands to manage your Fleetbase extensions.
+
 # 📱 Apps
 
 Fleetbase offers a few open sourced apps which are built on Fleetbase which can be cloned and customized. Every app is built so that the Fleetbase instance can be switched out whether on-premise install or cloud hosted.
@@ -122,13 +215,10 @@ Fleetbase offers a few open sourced apps which are built on Fleetbase which can
 </ul>
 
 ## 🛣️ Roadmap
-1.  **Extensions Registry and Marketplace** ~ Allows users to publish and sell installable extensions on Fleetbase instances.
-2.  **Inventory and Warehouse Management** ~ Pallet will be Fleetbase’s first official extension for WMS & Inventory.
-3.  **Customer Facing Views** ~ Extensions will be able to create public/customer facing views tracking and management from outside of the console UI.
-4.  **Binary Builds** ~ Run Fleetbase from a single binary.
-5.  **Fleetbase CLI** ~ Official CLI for publishing and managing extensions, as well as scaffolding extensions.
-6.  **Fleetbase for Desktop** ~ Desktop builds for OSX and Windows.
-7. **Custom Maps and Routing Engines** ~ Feature to enable easy integrations with custom maps and routing engines like Google Maps or Mapbox etc…
+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.
 
 ## 🪲 Bugs and 💡 Feature Requests
 
@@ -164,3 +254,4 @@ 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>.
+

RELEASE.md

@@ -0,0 +1,36 @@
+# 🚀 Fleetbase v0.7.25 — 2025-12-29
+
+> "New SMS service to support multiple SMS providers + framework improvements"
+
+---
+
+## ✨ Highlights
+- Removed `window.Fleetbase` for improved frontend security
+- Improved query optimizations
+- Added new SMS service to support multiple SMS providers
+
+---
+
+## ⚠️ 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)

TRANSLATING.md

@@ -0,0 +1,100 @@
+# 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!

api/app/Http/Kernel.php

@@ -40,8 +40,6 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
-            'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];

api/app/Providers/RouteServiceProvider.php

@@ -2,10 +2,8 @@
 
 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
@@ -17,17 +15,15 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->configureRateLimiting();
-
         $this->routes(
             function () {
                 Route::get(
-                    '/status',
-                    function () {
+                    '/health',
+                    function (Request $request) {
                         return response()->json(
                             [
                                 'status' => 'ok',
-                                'time' => microtime(true) - LARAVEL_START
+                                'time' => microtime(true) - $request->attributes->get('request_start_time')
                             ]
                         );
                     }
@@ -35,19 +31,4 @@ 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());
-            }
-        );
-    }
 }

api/composer.json

@@ -7,40 +7,68 @@
         "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",
-        "fleetbase/core-api": "^1.5.1",
-        "fleetbase/fleetops-api": "^0.5.5",
-        "fleetbase/registry-bridge": "^0.0.11",
-        "fleetbase/storefront-api": "^0.3.13",
+        "php": ">=8.0 <=8.2.28",
+        "appstract/laravel-opcache": "^4.0",
+        "fleetbase/aws-marketplace": "^0.0.8",
+        "fleetbase/billing-api": "^0.1.12",
+        "fleetbase/core-api": "^1.6.32",
+        "fleetbase/customer-portal-api": "^0.0.10",
+        "fleetbase/fleetops-api": "^0.6.32",
+        "fleetbase/flespi-integration": "^0.1.16",
+        "fleetbase/internals-api": "^0.0.23",
+        "fleetbase/registry-bridge": "^0.1.2",
+        "fleetbase/samsara-api": "^0.0.3",
+        "fleetbase/solid-api": "^0.0.7",
+        "fleetbase/storefront-api": "^0.4.10",
+        "fleetbase/valhalla-api": "^0.0.3",
+        "fleetbase/vroom-api": "^0.0.3",
         "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": "*",
-        "s-ichikawa/laravel-sendgrid-driver": "^4.0"
+        "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",
         "phpunit/phpunit": "^10.0"
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/fleetbase/laravel-model-caching"
-        },
         {
             "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": {
@@ -78,15 +106,6 @@
         ],
         "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": {

api/config/app.php

@@ -26,7 +26,7 @@ return [
     |
     */
 
-    'env' => env('APP_ENV', 'production'),
+    'env' => env('APP_ENV', env('ENVIRONMENT', 'production')),
 
     /*
     |--------------------------------------------------------------------------

api/config/cors.php

@@ -17,17 +17,17 @@ 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'))]),
+    'allowed_origins' => array_filter(['http://localhost:4200', env('CONSOLE_HOST'), Utils::addWwwToUrl(env('CONSOLE_HOST')), ...Utils::arrayFrom(env('FRONTEND_HOSTS', ''))]),
 
     'allowed_origins_patterns' => [],
 
     'allowed_headers' => ['*'],
 
-    'exposed_headers' => ['x-compressed-json', 'access-console-sandbox', 'access-console-sandbox-key'],
+    'exposed_headers' => ['x-compressed-json', 'access-console-sandbox', 'access-console-sandbox-key', 'content-disposition'],
 
     'max_age' => 0,
 

api/config/logging.php

@@ -51,7 +51,7 @@ return [
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['single'],
+            'channels' => ['single', 'stdout'],
             'ignore_exceptions' => false,
         ],
 

api/config/mail.php

@@ -64,6 +64,20 @@ return [
             'transport' => 'sendgrid',
         ],
 
+        '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'),

api/config/octane.php

@@ -1,5 +1,6 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Laravel\Octane\Contracts\OperationTerminated;
 use Laravel\Octane\Events\RequestHandled;
 use Laravel\Octane\Events\RequestReceived;
@@ -104,8 +105,8 @@ return [
         OperationTerminated::class => [
             FlushOnce::class,
             FlushTemporaryContainerInstances::class,
-            // DisconnectFromDatabases::class,
-            // CollectGarbage::class,
+            DisconnectFromDatabases::class,
+            CollectGarbage::class,    
         ],
 
         WorkerErrorOccurred::class => [
@@ -192,6 +193,7 @@ return [
         'routes',
         'composer.lock',
         '.env',
+        ...Utils::arrayFrom(env('OCTANE_WATCH_DIRS'))
     ],
 
     /*

api/config/opcache.php

@@ -0,0 +1,30 @@
+<?php
+
+return [
+    'url' => env('OPCACHE_URL', config('app.url')),
+    'prefix' => 'opcache-api',
+    'verify' => true,
+    'headers' => [],
+    'directories' => [
+        base_path('app'),
+        base_path('bootstrap'),
+        base_path('public'),
+        base_path('resources'),
+        base_path('routes'),
+        base_path('storage'),
+        base_path('vendor'),
+    ],
+    'exclude' => [
+        'test',
+        'Test',
+        'tests',
+        'Tests',
+        'stub',
+        'Stub',
+        'stubs',
+        'Stubs',
+        'dumper',
+        'Dumper',
+        'Autoload',
+    ],
+];

api/config/services.php

@@ -34,4 +34,19 @@ return [
         'api_key' => env('SENDGRID_API_KEY'),
     ],
 
+    'resend' => [
+        'key' => env('RESEND_KEY'),
+    ],
+
+    'stripe' => [
+        'key' => env('STRIPE_KEY', env('STRIPE_API_KEY')),
+        'secret' => env('STRIPE_SECRET', env('STRIPE_API_SECRET')),
+        'webhook_secret' => env('STRIPE_WEBHOOK_SECRET'),
+    ],
+
+    'callpromn' => [
+        'api_key' => env('CALLPROMN_API_KEY', ''),
+        'from' => env('CALLPROMN_FROM', ''),
+        'base_url' => env('CALLPROMN_BASE_URL', 'https://api.messagepro.mn' ),
+    ],
 ];

api/deploy.sh

@@ -15,6 +15,9 @@ php artisan sandbox:migrate --force
 # Seed database
 php artisan fleetbase:seed
 
+# Create permissions, policies, and roles
+php artisan fleetbase:create-permissions
+
 # Restart queue
 php artisan queue:restart
 
@@ -23,6 +26,14 @@ php artisan schedule-monitor:sync
 
 # Clear cache
 php artisan cache:clear
+php artisan route:clear
+
+# Optimize
+php artisan config:cache
+php artisan route:cache
 
 # Initialize registry
 php artisan registry:init
+
+# Restart octane
+# php artisan octane:reload

api/resources/lang/ar/auth.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | أسطر لغة المصادقة
+    |--------------------------------------------------------------------------
+    |
+    | تحتوي الأسطر التالية على رسائل المصادقة التي نعرضها للمستخدم أثناء 
+    | عمليات تسجيل الدخول أو غيرها. يمكنك تعديل هذه الرسائل حسب متطلباتك.
+    |
+    */
+
+    'failed'   => 'بيانات الاعتماد هذه غير متطابقة مع سجلاتنا.',
+    'password' => 'كلمة المرور التي تم إدخالها غير صحيحة.',
+    'throttle' => 'عدد كبير جداً من محاولات الدخول. يرجى المحاولة مرة أخرى خلال :seconds ثانية.',
+
+];

api/resources/lang/ar/pagination.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | أسطر لغة الترقيم الصفحي
+    |--------------------------------------------------------------------------
+    |
+    | تُستخدم الأسطر التالية من قبل مكتبة الترقيم الصفحي لبناء روابط
+    | الترقيم البسيطة. يمكنك تعديلها كما تشاء لتخصيص العرض بما يناسب
+    | تطبيقك بشكل أفضل.
+    |
+    */
+
+    'previous' => '&laquo; السابق',
+    'next'     => 'التالي &raquo;',
+
+];

api/resources/lang/ar/passwords.php

@@ -0,0 +1,21 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | أسطر لغة إعادة تعيين كلمة المرور
+    |--------------------------------------------------------------------------
+    |
+    | الأسطر التالية هي الرسائل الافتراضية التي يقدمها نظام إعادة تعيين
+    | كلمة المرور عند فشل المحاولة، مثل رمز التحقق غير صالح أو كلمة مرور جديدة غير صحيحة.
+    |
+    */
+
+    'reset'     => 'تم إعادة تعيين كلمة المرور الخاصة بك!',
+    'sent'      => 'لقد أرسلنا رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني!',
+    'throttled' => 'يرجى الانتظار قبل المحاولة مرة أخرى.',
+    'token'     => 'رمز إعادة تعيين كلمة المرور هذا غير صالح.',
+    'user'      => 'لا يمكننا العثور على مستخدم بهذا العنوان الإلكتروني.',
+
+];

api/resources/lang/ar/validation.php

@@ -0,0 +1,168 @@
+<?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' => [],
+
+];

api/resources/lang/es-mx/auth.php

@@ -0,0 +1,20 @@
+<?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.',
+
+];

api/resources/lang/es-mx/pagination.php

@@ -0,0 +1,19 @@
+<?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;',
+
+];

api/resources/lang/es-mx/passwords.php

@@ -0,0 +1,22 @@
+<?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.",
+
+];

api/resources/lang/es-mx/validation.php

@@ -0,0 +1,163 @@
+<?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' => [],
+
+];

api/resources/lang/fa/auth.php

@@ -0,0 +1,15 @@
+<?php
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | خطوط زبان احراز هویت
+    |--------------------------------------------------------------------------
+    |
+    | خطوط زبان زیر در طول احراز هویت برای پیام‌های مختلفی که باید به کاربر نمایش دهیم استفاده می‌شوند.
+    | شما می‌توانید این خطوط زبان را بر اساس نیازهای برنامه خود تغییر دهید.
+    |
+    */
+    'failed' => 'این اطلاعات ورود با سوابق ما مطابقت ندارد.',
+    'password' => 'رمز عبور ارائه‌شده نادرست است.',
+    'throttle' => 'تعداد تلاش‌های ورود بیش از حد زیاد است. لطفاً پس از :seconds ثانیه دوباره تلاش کنید.',
+];

api/resources/lang/fa/pagination.php

@@ -0,0 +1,18 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | خطوط زبان صفحه‌بندی
+    |--------------------------------------------------------------------------
+    |
+    | خطوط زبان زیر توسط کتابخانه صفحه‌بندی برای ساخت لینک‌های صفحه‌بندی ساده استفاده می‌شوند.
+    | شما می‌توانید این خطوط را به دلخواه تغییر دهید تا با نیازهای برنامه خود سازگار شوند.
+    |
+    */
+
+    'previous' => '&laquo; قبلی',
+    'next' => 'بعدی &raquo;',
+
+];

api/resources/lang/fa/passwords.php

@@ -0,0 +1,22 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | خطوط زبان بازنشانی رمز عبور
+    |--------------------------------------------------------------------------
+    |
+    | خطوط زبان زیر خطوط پیش‌فرضی هستند که با دلایلی که توسط کارگزار رمز عبور
+    | برای تلاش‌های ناموفق به‌روزرسانی رمز عبور ارائه می‌شوند، مطابقت دارند،
+    | مانند توکن نامعتبر یا رمز عبور جدید نامعتبر.
+    |
+    */
+
+    'reset' => 'رمز عبور شما بازنشانی شد!',
+    'sent' => 'لینک بازنشانی رمز عبور به ایمیل شما ارسال شد!',
+    'throttled' => 'لطفاً قبل از تلاش مجدد صبر کنید.',
+    'token' => 'این توکن بازنشانی رمز عبور نامعتبر است.',
+    'user' => 'کاربری با این آدرس ایمیل یافت نشد.',
+
+];

api/resources/lang/fa/validation.php

@@ -0,0 +1,163 @@
+<?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' => [],
+
+];

builds/linux/build-linux.sh

@@ -0,0 +1,47 @@
+#!/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"

builds/linux/spc/libgeos-linux.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libgeos extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libgeos;
+
+    public const NAME = 'libgeos';
+}

builds/linux/spc/libgeos-unix.php

@@ -0,0 +1,33 @@
+<?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']);
+    }
+}

builds/linux/static-build.Dockerfile

@@ -0,0 +1,93 @@
+# 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

builds/osx/build-osx.sh

@@ -0,0 +1,188 @@
+#!/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"

builds/osx/spc/UnixBuilderBase-macos.php

@@ -0,0 +1,271 @@
+<?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);
+        }
+    }
+}

builds/osx/spc/libgeos-macos.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libgeos extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libgeos;
+
+    public const NAME = 'libgeos';
+}

builds/osx/spc/libgeos-unix.php

@@ -0,0 +1,33 @@
+<?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']);
+    }
+}

console/.gitignore

@@ -26,3 +26,7 @@
 
 # broccoli-debug
 /DEBUG/
+
+# Auto-generated extension files
+/app/extensions/
+/app/utils/extension-loaders.js

console/Dockerfile

@@ -1,24 +1,24 @@
 # ---- Build Stage ----
-FROM node:18.15.0-alpine
+FROM node:18.15.0-alpine as builder
 
 # 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
+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 console/package.json console/pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml ./
 
 # Copy over .npmrc if applicable
-COPY console/.npmr[c] ./
+COPY .npmr[c] ./
 
 # Install global dependencies
 RUN npm install -g ember-cli pnpm 
@@ -33,25 +33,22 @@ 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 console .
+COPY . .
 
 # 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
 
-# # ---- Serve Stage ----
-# FROM nginx:alpine
+# Copy the built app to our served directory
+COPY --from=builder /console/dist /usr/share/nginx/html
 
-# # 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 4200
 
-# # Expose the port nginx is bound to
-# EXPOSE 4201
+# Use custom nginx.conf
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 
-# # Use custom nginx.conf
-# COPY console/nginx.conf /etc/nginx/conf.d/default.conf
-
-# # Start Nginx server
-# CMD ["nginx", "-g", "daemon off;"]
+# Start Nginx server
+CMD ["nginx", "-g", "daemon off;"]

console/Dockerfile.server-build

@@ -1,54 +0,0 @@
-# ---- Build Stage ----
-    FROM node:18.15.0-alpine as builder
-
-    # 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
-    
-    # ---- 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 4200
-    
-    # Use custom nginx.conf
-    COPY console/nginx.conf /etc/nginx/conf.d/default.conf
-    
-    # Start Nginx server
-    CMD ["nginx", "-g", "daemon off;"]

console/app/app.js

@@ -2,8 +2,7 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from '@fleetbase/console/config/environment';
-import loadExtensions from '@fleetbase/ember-core/utils/load-extensions';
-import mapEngines from '@fleetbase/ember-core/utils/map-engines';
+import './deprecation-workflow';
 
 export default class App extends Application {
     modulePrefix = config.modulePrefix;
@@ -11,13 +10,6 @@ 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);

console/app/components/configure/filesystem.hbs

@@ -1,4 +1,4 @@
-<ContentPanel @title="Filesystem" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Filesystem" @open={{true}} @wrapperClass="bordered-classic">
     <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>
@@ -33,7 +33,7 @@
         </InputGroup>
     {{/if}}
     {{#if this.testResponse}}
-        <div class="animate-pulse 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">
+        <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'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/configure/filesystem.js

@@ -106,10 +106,8 @@ export default class ConfigureFilesystemComponent extends Component {
                     type: 'gcs_credentials',
                 },
                 (uploadedFile) => {
-                    console.log('uploadedFile', uploadedFile);
                     this.gcsCredentialsFileId = uploadedFile.id;
                     this.gcsCredentialsFile = uploadedFile;
-                    console.log('this.gcsCredentialsFile', this.gcsCredentialsFile);
                 }
             );
         } catch (error) {

console/app/components/configure/mail.hbs

@@ -1,27 +1,64 @@
-<ContentPanel @title="Mail" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Mail" @open={{true}} @wrapperClass="bordered-classic">
     <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>
     {{#if (eq this.mailer "smtp")}}
-        <InputGroup @name="SMTP Host" @value={{this.smtpHost}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Port" @type="number" @value={{this.smtpPort}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Encryption" @value={{this.smtpEncryption}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Username" @value={{this.smtpUsername}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Password" @type="password" @value={{this.smtpPassword}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Timeout" @value={{this.smtpTimeout}} disabled={{this.isLoading}} />
-        <InputGroup @name="SMTP Auth Mode" @value={{this.smtpAuth_mode}} disabled={{this.isLoading}} />
+        <InputGroup @name="SMTP Host" @value={{this.smtpHost}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Port" @type="number" @value={{this.smtpPort}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup>
+            <Toggle @isToggled={{eq this.smtpEncryption "tls"}} @onToggle={{this.enableSmtpEncryption}} @label="SMTP Encryption" @helpText="Enabled TLS Encryption" />
+        </InputGroup>
+        <InputGroup @name="SMTP Username" @value={{this.smtpUsername}} disabled={{this.loadConfigValues.isRunning}} />
+        <InputGroup @name="SMTP Password" @value={{this.smtpPassword}} disabled={{this.loadConfigValues.isRunning}} />
+        <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}}
-    <InputGroup @name="From Address" @helpText="Input the email address for Fleetbase to send emails from." @value={{this.fromAddress}} @placeholder="From Address" disabled={{this.isLoading}} />
+    {{#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}} />
+        <InputGroup @name="Mailgun Secret" @value={{this.mailgunSecret}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "postmark")}}
+        <InputGroup @name="Postmark Token" @value={{this.postmarkToken}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "sendgrid")}}
+        <InputGroup @name="Sendgrid API Key" @value={{this.sendgridApi_key}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    {{#if (eq this.mailer "resend")}}
+        <InputGroup @name="Resend API Key" @value={{this.resendKey}} disabled={{this.loadConfigValues.isRunning}} />
+    {{/if}}
+    <InputGroup
+        @name="From Address"
+        @helpText="Input the email address for Fleetbase to send emails from."
+        @value={{this.fromAddress}}
+        @placeholder="From Address"
+        disabled={{this.isLoading}}
+    />
     <InputGroup @name="From Name" @helpText="Input the name for Fleetbase to send emails from." @value={{this.fromName}} @placeholder="From Name" disabled={{this.isLoading}} />
     {{#if this.testResponse}}
-        <div class="animate-pulse 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'}}" />
-            <span class="text-xs">{{this.this.testResponse.message}}</span>
+        <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'}}"
+            />
+            <span class="text-xs">{{this.testResponse.message}}</span>
         </div>
     {{/if}}
-    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Config" @onClick={{this.test}} @isLoading={{this.isLoading}} />
+    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Config" @onClick={{perform this.test}} @isLoading={{this.test.isRunning}} />
 </ContentPanel>
 
 <EmberWormhole @to="next-view-section-subheader-actions">
-    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{this.save}} @disabled={{this.isLoading}} @isLoading={{this.isLoading}} />
+    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{perform this.save}} @disabled={{this.save.isRunning}} @isLoading={{this.save.isRunning}} />
 </EmberWormhole>

console/app/components/configure/mail.js

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
 export default class ConfigureMailComponent extends Component {
     @service fetch;
@@ -14,11 +15,21 @@ export default class ConfigureMailComponent extends Component {
     @tracked fromName = null;
     @tracked smtpHost = 'smtp.mailgun.org';
     @tracked smtpPort = 587;
-    @tracked smtpEncryption = 'tls';
+    @tracked smtpEncryption = null;
     @tracked smtpUsername = null;
     @tracked smtpPassword = null;
     @tracked smtpTimeout = null;
     @tracked smtpAuth_mode = null;
+    @tracked mailgunDomain = null;
+    @tracked mailgunEndpoint = 'api.mailgun.net';
+    @tracked mailgunSecret = null;
+    @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.
@@ -26,7 +37,7 @@ export default class ConfigureMailComponent extends Component {
      */
     constructor() {
         super(...arguments);
-        this.loadConfigValues();
+        this.loadConfigValues.perform();
     }
 
     @action setConfigValues(config) {
@@ -37,6 +48,10 @@ export default class ConfigureMailComponent extends Component {
         }
     }
 
+    @action enableSmtpEncryption(enabled) {
+        this.smtpEncryption = enabled ? 'tls' : null;
+    }
+
     @action setMailer(mailer) {
         this.mailer = mailer;
     }
@@ -53,56 +68,92 @@ export default class ConfigureMailComponent extends Component {
         };
     }
 
-    @action loadConfigValues() {
-        this.isLoading = true;
-
-        this.fetch
-            .get('settings/mail-config')
-            .then((response) => {
-                this.setConfigValues(response);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+    @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 test() {
-        this.isLoading = true;
+    @action serializeMailgunConfig() {
+        return {
+            domain: this.mailgunDomain,
+            secret: this.mailgunSecret,
+            endpoint: this.mailgunEndpoint,
+        };
+    }
 
-        this.fetch
-            .post('settings/test-mail-config', {
+    @action serializePostmarkConfig() {
+        return {
+            token: this.postmarkToken,
+        };
+    }
+
+    @action serializeSendgridConfig() {
+        return {
+            api_key: this.sendgridApi_key,
+        };
+    }
+
+    @action serializeResendConfig() {
+        return {
+            key: this.resendKey,
+        };
+    }
+
+    @task *loadConfigValues() {
+        try {
+            const config = yield this.fetch.get('settings/mail-config');
+            this.setConfigValues(config);
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    @task *test() {
+        try {
+            this.testResponse = yield this.fetch.post('settings/test-mail-config', {
                 mailer: this.mailer,
                 from: {
                     address: this.fromAddress,
                     name: this.fromName,
                 },
                 smtp: this.serializeSmtpConfig(),
-            })
-            .then((response) => {
-                this.testResponse = response;
-            })
-            .finally(() => {
-                this.isLoading = false;
+                mailgun: this.serializeMailgunConfig(),
+                postmark: this.serializePostmarkConfig(),
+                sendgrid: this.serializeSendgridConfig(),
+                resend: this.serializeResendConfig(),
+                microsoftGraph: this.serializeMicrosoftGraphConfig(),
             });
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
-    @action save() {
-        this.isLoading = true;
-
-        this.fetch
-            .post('settings/mail-config', {
+    @task *save() {
+        try {
+            yield this.fetch.post('settings/mail-config', {
                 mailer: this.mailer,
                 from: {
                     address: this.fromAddress,
                     name: this.fromName,
                 },
                 smtp: this.serializeSmtpConfig(),
-            })
-            .then(() => {
-                this.notifications.success('Mail configuration saved.');
-            })
-            .finally(() => {
-                this.isLoading = false;
+                mailgun: this.serializeMailgunConfig(),
+                postmark: this.serializePostmarkConfig(),
+                sendgrid: this.serializeSendgridConfig(),
+                resend: this.serializeResendConfig(),
+                microsoftGraph: this.serializeMicrosoftGraphConfig(),
             });
+            this.notifications.success('Mail configuration saved.');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 }

console/app/components/configure/notification-channels.hbs

@@ -1,4 +1,4 @@
-<ContentPanel @title="APN Configutation" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="APN Configutation" @open={{true}} @wrapperClass="bordered-classic">
     <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}} />
@@ -16,11 +16,11 @@
         {{/if}}
     </InputGroup>
     <InputGroup @wrapperClass="mb-0i">
-        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{fn (mut this.apn.production)}} @disabled={{this.isLoading}} />
+        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{this.toggleApnProduction}} />
     </InputGroup>
 </ContentPanel>
 
-<ContentPanel @title="Firebase Configutation" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Firebase Configutation" @open={{true}} @wrapperClass="bordered-classic">
     <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,9 +33,9 @@
     </InputGroup>
 </ContentPanel>
 
-<ContentPanel @title="Test Push Notification" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-900">
+<ContentPanel @title="Test Push Notification" @open={{true}} @wrapperClass="bordered-classic">
     {{#if this.testResponse}}
-        <div class="animate-pulse 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">
+        <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'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/configure/notification-channels.js

@@ -32,6 +32,13 @@ export default class ConfigureNotificationChannelsComponent extends Component {
         this.loadConfigValues();
     }
 
+    @action toggleApnProduction(checked) {
+        this.apn = {
+            ...this.apn,
+            production: checked,
+        };
+    }
+
     @action removeApnFile() {
         const apnConfig = this.apn;
         apnConfig.private_key_file = null;

console/app/components/configure/queue.hbs

@@ -1,4 +1,4 @@
-<ContentPanel @title="Queue" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Queue" @open={{true}} @wrapperClass="bordered-classic">
     <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>
@@ -12,7 +12,7 @@
         <InputGroup @name="SQS Suffix" @value={{this.sqsSuffix}} disabled={{this.isLoading}} />
     {{/if}}
     {{#if this.testResponse}}
-        <div class="animate-pulse 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">
+        <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'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/configure/services.hbs

@@ -1,45 +1,47 @@
-<ContentPanel @title="AWS" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="AWS" @open={{true}} @wrapperClass="bordered-classic">
     <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}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Google Maps" @open={{true}} @wrapperClass="bordered-classic">
     <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}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Twilio" @open={{true}} @wrapperClass="bordered-classic">
     <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}} />
     {{#if this.twilioTestResponse}}
-        <div class="animate-pulse flex flex-row items-center rounded-lg border {{if (eq this.twilioTestResponse.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">
+        <div class="flex flex-row items-center rounded-lg border {{if (eq this.twilioTestResponse.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.twilioTestResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.twilioTestResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.twilioTestResponse.message}}</span>
         </div>
     {{/if}}
     <div class="flex flex-row items-center mt-3">
         <Input @value={{this.twilioTestPhone}} @type="tel" placeholder="Send Test SMS Here" class="form-input form-input-sm" />
-        <Button @wrapperClass="ml-2" @icon="plug" @text="Test Twilio Config" @onClick={{this.testTwilio}} @isLoading={{this.isLoading}} @disabled={{not this.twilioTestPhone}} />
+        <Button @wrapperClass="ml-2" @icon="plug" @text="Test Twilio Config" @onClick={{perform this.testTwilio}} @isLoading={{this.testTwilio.isRunning}} @disabled={{not this.twilioTestPhone}} />
     </div>
 </ContentPanel>
 
-<ContentPanel @title="Sentry" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="Sentry" @open={{true}} @wrapperClass="bordered-classic">
     <InputGroup @name="Sentry DSN" @value={{this.sentryDsn}} disabled={{this.isLoading}} />
     {{#if this.sentryTestResponse}}
-        <div class="animate-pulse 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">
+        <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">
             <FaIcon @icon={{if (eq this.sentryTestResponse.status 'error') 'triangle-exclamation' 'circle-check'}} class="mr-1.5 {{if (eq this.sentryTestResponse.status 'error') 'text-red-200' 'text-green-200'}}" />
             <span class="text-xs">{{this.this.sentryTestResponse.message}}</span>
         </div>
     {{/if}}
-    <Button @wrapperClass="mt-3" @icon="plug" @text="Test Sentry Config" @onClick={{this.testSentry}} @isLoading={{this.isLoading}} />
+    <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}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="IP Info" @open={{true}} @wrapperClass="bordered-classic">
     <InputGroup @name="IP Info API Key" @value={{this.ipinfoApiKey}} disabled={{this.isLoading}} />
 </ContentPanel>
 
+<Spacer @height="200px" />
+
 <EmberWormhole @to="next-view-section-subheader-actions">
-    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{this.save}} @disabled={{this.isLoading}} @isLoading={{this.isLoading}} />
+    <Button @type="primary" @size="sm" @icon="save" @text="Save Changes" @onClick={{perform this.save}} @disabled={{or this.save.isRunning this.loadConfigValues.isRunning}} @isLoading={{or this.save.isRunning this.loadConfigValues.isRunning}} />
 </EmberWormhole>

console/app/components/configure/services.js

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
 export default class ConfigureServicesComponent extends Component {
     @service fetch;
@@ -37,7 +38,7 @@ export default class ConfigureServicesComponent extends Component {
      */
     constructor() {
         super(...arguments);
-        this.loadConfigValues();
+        this.loadConfigValues.perform();
     }
 
     @action setConfigValues(config) {
@@ -48,24 +49,19 @@ export default class ConfigureServicesComponent extends Component {
         }
     }
 
-    @action loadConfigValues() {
-        this.isLoading = true;
-
-        this.fetch
-            .get('settings/services-config')
-            .then((response) => {
-                this.setConfigValues(response);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+    @task *loadConfigValues() {
+        try {
+            const config = yield this.fetch.get('settings/services-config');
+            this.setConfigValues(config);
+            return config;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
-    @action save() {
-        this.isLoading = true;
-
-        this.fetch
-            .post('settings/services-config', {
+    @task *save() {
+        try {
+            yield this.fetch.post('settings/services-config', {
                 aws: {
                     key: this.awsKey,
                     secret: this.awsSecret,
@@ -86,45 +82,36 @@ export default class ConfigureServicesComponent extends Component {
                 sentry: {
                     dsn: this.sentryDsn,
                 },
-            })
-            .then(() => {
-                this.notifications.success('Services configuration saved.');
-            })
-            .finally(() => {
-                this.isLoading = false;
             });
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
-    @action testTwilio() {
-        this.isLoading = true;
-
-        this.fetch
-            .post('settings/test-twilio-config', {
+    @task *testTwilio() {
+        try {
+            const twilioTestResponse = yield this.fetch.post('settings/test-twilio-config', {
                 sid: this.twilioSid,
                 token: this.twilioToken,
                 from: this.twilioFrom,
                 phone: this.twilioTestPhone,
-            })
-            .then((response) => {
-                this.twilioTestResponse = response;
-            })
-            .finally(() => {
-                this.isLoading = false;
             });
+            this.twilioTestResponse = twilioTestResponse;
+            return twilioTestResponse;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
-    @action testSentry() {
-        this.isLoading = true;
-
-        this.fetch
-            .post('settings/test-sentry-config', {
+    @task *testSentry() {
+        try {
+            const sentryTestResponse = yield this.fetch.post('settings/test-sentry-config', {
                 dsn: this.sentryDsn,
-            })
-            .then((response) => {
-                this.sentryTestResponse = response;
-            })
-            .finally(() => {
-                this.isLoading = false;
             });
+            this.sentryTestResponse = sentryTestResponse;
+            return sentryTestResponse;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 }

console/app/components/configure/socket.hbs

@@ -1,4 +1,4 @@
-<ContentPanel @title="SocketCluster Connection" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title="SocketCluster Connection" @open={{true}} @wrapperClass="bordered-classic">
     <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">
@@ -37,7 +37,7 @@
         </div>
     </div>
     {{#if this.testResponse}}
-        <div class="animate-pulse 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">
+        <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'}}" />
             <span class="text-xs">{{this.this.testResponse.message}}</span>
         </div>

console/app/components/dashboard.hbs

@@ -1,99 +0,0 @@
-<div class="fleetbase-dashboard-grid flex items-center justify-between mb-4 mt-6 px-14">
-    <div class="left-section">
-        <h1 class="text-lg font-bold">{{this.dashboard.currentDashboard.name}}</h1>
-    </div>
-    <div class="fleetbase-dashboard-actions right-section ml-4 flex items-center">
-        <div class="fleetbase-model-select fleetbase-power-select ember-model-select h-10">
-
-            <DropdownButton
-                class="h-10"
-                @text={{if this.dashboard.currentDashboard.name this.dashboard.currentDashboard.name (t "component.dashboard.select-dashboard")}}
-                @textClass="text-sm mr-2"
-                @buttonClass="flex-row-reverse w-44 justify-between"
-                @icon="caret-down"
-                @iconClass="mr-0i"
-                @size="sm"
-                @iconPrefix="fas"
-                @triggerClass="hidden md:flex"
-                as |dd|
-            >
-                <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
-                    <div class="p-1">
-                        {{#each this.dashboard.dashboards as |dashboard|}}
-                            <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.selectDashboard dashboard)}}>
-                                <div class="flex-1 flex flex-row items-center">
-                                    <div class="w-6">
-                                        <FaIcon @icon="desktop" />
-                                    </div>
-                                    <span>{{dashboard.name}}</span>
-                                </div>
-                                <div>
-                                    {{#if (eq this.dashboard.currentDashboard.id dashboard.id)}}
-                                        <FaIcon @icon="check" class="text-green-500" />
-                                    {{/if}}
-                                </div>
-                            </a>
-                        {{/each}}
-                    </div>
-                </div>
-            </DropdownButton>
-        </div>
-
-        <div class="ml-2 relative h-10">
-            <DropdownButton class="h-10" @icon="ellipsis-h" @size="sm" @iconPrefix="fas" @triggerClass="hidden md:flex" as |dd|>
-                <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
-                    <div class="p-1">
-                        <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.createDashboard)}}>
-                            <div class="w-6">
-                                <FaIcon @icon="add" />
-                            </div>
-                            <span>{{t "component.dashboard.create-new-dashboard"}}</span>
-                        </a>
-
-                        {{#unless (eq this.dashboard.currentDashboard.user_uuid "system")}}
-                            <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.onChangeEdit true)}}>
-                                <div class="w-6">
-                                    <FaIcon @icon="edit" />
-                                </div>
-                                <span>{{t "component.dashboard.edit-layout"}}</span>
-                            </a>
-                            <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.onAddingWidget true)}}>
-                                <div class="w-6">
-                                    <FaIcon @icon="add" />
-                                </div>
-                                <span>{{t "component.dashboard.add-widgets"}}</span>
-                            </a>
-
-                            <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.deleteDashboard this.dashboard.currentDashboard)}}>
-                                <div class="w-6">
-                                    <FaIcon @icon="trash" />
-                                </div>
-                                <span>{{t "component.dashboard.delete-dashboard"}}</span>
-                            </a>
-                        {{/unless}}
-
-                    </div>
-                </div>
-            </DropdownButton>
-        </div>
-        {{#if this.dashboard.isEditingDashboard}}
-            <div class="ml-2 h-10">
-                <Button @type="magic" @icon="save" @helpText={{t "component.dashboard.save-dashboard"}} @onClick={{fn this.onChangeEdit false}} class="h-10" />
-            </div>
-        {{/if}}
-    </div>
-</div>
-
-<div class="px-10">
-    <Dashboard::Create @isEdit={{this.dashboard.isEditingDashboard}} @isAddingWidget={{this.dashboard.isAddingWidget}} @dashboard={{this.dashboard.currentDashboard}} />
-    {{#if this.dashboard.isAddingWidget}}
-        <EmberWormhole @to="console-home-wormhole">
-            <Dashboard::WidgetPanel
-                @isOpen={{this.dashboard.isAddingWidget}}
-                @onLoad={{this.setWidgetSelectorPanelContext}}
-                @dashboard={{this.dashboard.currentDashboard}}
-                @onClose={{fn this.onAddingWidget false}}
-            />
-        </EmberWormhole>
-    {{/if}}
-</div>

console/app/components/dashboard.js

@@ -1,140 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-
-/**
- * DashboardComponent for managing dashboards in an Ember application.
- * This component handles actions such as selecting, creating, deleting dashboards,
- * and managing widget selectors and dashboard editing states.
- *
- * @extends Component
- */
-export default class DashboardComponent extends Component {
-    /**
-     * Ember Data store service.
-     * @type {Service}
-     */
-    @service store;
-
-    /**
-     * Internationalization service for managing translations.
-     * @type {Service}
-     */
-    @service intl;
-
-    /**
-     * Notifications service for displaying alerts or confirmations.
-     * @type {Service}
-     */
-    @service notifications;
-
-    /**
-     * Modals manager service for handling modal dialogs.
-     * @type {Service}
-     */
-    @service modalsManager;
-
-    /**
-     * Fetch service for handling HTTP requests.
-     * @type {Service}
-     */
-    @service fetch;
-
-    /**
-     * Dashboard service for business logic related to dashboards.
-     * @type {Service}
-     */
-    @service dashboard;
-
-    /**
-     * Creates an instance of DashboardComponent.
-     * @memberof DashboardComponent
-     */
-    constructor() {
-        super(...arguments);
-        this.dashboard.loadDashboards.perform();
-    }
-
-    /**
-     * Action to select a dashboard.
-     * @param {Object} dashboard - The dashboard to be selected.
-     */
-    @action selectDashboard(dashboard) {
-        this.dashboard.selectDashboard.perform(dashboard);
-    }
-
-    /**
-     * Sets the context for the widget selector panel.
-     * @param {Object} widgetSelectorContext - The context object for the widget selector.
-     */
-    @action setWidgetSelectorPanelContext(widgetSelectorContext) {
-        this.widgetSelectorContext = widgetSelectorContext;
-    }
-
-    /**
-     * Creates a new dashboard.
-     * @param {Object} dashboard - The dashboard to be created.
-     * @param {Object} [options={}] - Optional parameters for dashboard creation.
-     */
-    @action createDashboard(dashboard, options = {}) {
-        this.modalsManager.show('modals/create-dashboard', {
-            title: this.intl.t('component.dashboard.create-a-new-dashboard'),
-            acceptButtonText: this.intl.t('component.dashboard.confirm-create-dashboard'),
-            confirm: async (modal, done) => {
-                modal.startLoading();
-
-                // Get the name from the modal options
-                const { name } = modal.getOptions();
-
-                await this.dashboard.createDashboard.perform(name);
-                done();
-            },
-            ...options,
-        });
-    }
-
-    /**
-     * Deletes a dashboard.
-     * @param {Object} dashboard - The dashboard to be deleted.
-     * @param {Object} [options={}] - Optional parameters for dashboard deletion.
-     */
-    @action deleteDashboard(dashboard, options = {}) {
-        if (this.dashboard.dashboards?.length === 1) {
-            return this.notifications.error(this.intl.t('component.dashboard.you-cannot-delete-this-dashboard'));
-        }
-
-        this.modalsManager.confirm({
-            title: this.intl.t('component.dashboard.are-you-sure-you-want-delete-dashboard', { dashboardName: dashboard.name }),
-            confirm: async (modal, done) => {
-                modal.startLoading();
-                await this.dashboard.deleteDashboard.perform(dashboard);
-                done();
-            },
-            ...options,
-        });
-    }
-
-    /**
-     * Action to handle the addition of a widget.
-     * @param {boolean} [state=true] - The state to set for adding a widget.
-     */
-    @action onAddingWidget(state = true) {
-        this.dashboard.onAddingWidget(state);
-    }
-
-    /**
-     * Sets the current dashboard.
-     * @param {Object} dashboard - The dashboard to be set as current.
-     */
-    @action setCurrentDashboard(dashboard) {
-        this.dashboard.setCurrentDashboard.perform(dashboard);
-    }
-
-    /**
-     * Changes the editing state of the dashboard.
-     * @param {boolean} [state=true] - The state to set for editing the dashboard.
-     */
-    @action onChangeEdit(state = true) {
-        this.dashboard.onChangeEdit(state);
-    }
-}

console/app/components/dashboard/count.js

@@ -27,9 +27,10 @@ export default class DashboardCountComponent extends Component {
      * @param {Object} { options }
      * @memberof WidgetKeyMetricsCountComponent
      */
-    constructor(owner, { options, title }) {
+    constructor(owner, { options, title, value = null }) {
         super(...arguments);
         this.title = title;
+        this.value = value;
         this.createRenderValueFromOptions(options);
     }
 
@@ -40,6 +41,10 @@ export default class DashboardCountComponent extends Component {
      * @memberof WidgetKeyMetricsCountComponent
      */
     createRenderValueFromOptions(options = {}) {
+        if (value !== null) {
+            return;
+        }
+
         let { format, currency, dateFormat, value } = options;
 
         switch (format) {

console/app/components/dashboard/create.hbs

@@ -1,14 +0,0 @@
-<div class="fleetbase-dashboard-grid" ...attributes>
-    <GridStack @options={{this.gridOptions}} @onChange={{this.onChangeGrid}}>
-        {{#each @dashboard.widgets as |widget|}}
-            <GridStackItem id={{widget.id}} @options={{spread-widget-options (hash id=widget.id options=widget.grid_options)}} class="relative">
-                {{component widget.component options=widget.options}}
-                {{#if @isEdit}}
-                    <div class="absolute top-2 right-2">
-                        <Button @type="default" @icon="trash" @helpText={{"Remove widget from the dashboard"}} @onClick={{fn this.removeWidget widget}} />
-                    </div>
-                {{/if}}
-            </GridStackItem>
-        {{/each}}
-    </GridStack>
-</div>

console/app/components/dashboard/create.js

@@ -1,99 +0,0 @@
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
-import { inject as service } from '@ember/service';
-
-/**
- * Component responsible for creating and managing the dashboard layout.
- * Provides functionalities such as toggling widget float, changing grid layout, and removing widgets.
- *
- * @extends Component
- */
-export default class DashboardCreateComponent extends Component {
-    /**
-     * Notifications service for displaying alerts or errors.
-     * @type {Service}
-     */
-    @service notifications;
-
-    /**
-     * Tracked array to keep track of widgets that have been updated.
-     * @type {Array}
-     */
-    @tracked updatedWidgets = [];
-
-    /**
-     * Action to toggle the floating state of widgets on the grid.
-     */
-    @action toggleFloat() {
-        this.shouldFloat = !this.shouldFloat;
-    }
-
-    /**
-     * Handles changes to the grid layout, such as repositioning or resizing widgets.
-     * Iterates over each widget event detail and updates the corresponding widget's properties if necessary.
-     *
-     * @param {Event} event - Event containing details about the grid change.
-     * @action
-     */
-    @action onChangeGrid(event) {
-        const { dashboard } = this.args;
-
-        event.detail.forEach((currentWidgetEvent) => {
-            const alreadyUpdated = this.updatedWidgets.find((item) => item.id === currentWidgetEvent.id);
-            if (alreadyUpdated || !this.dashboard) {
-                return;
-            }
-
-            const changedWidget = dashboard.widgets.find((widget) => widget.id === currentWidgetEvent.id);
-            if (!changedWidget) {
-                return;
-            }
-
-            const { x, y, w, h } = currentWidgetEvent;
-            const response = changedWidget.updateProperties({
-                grid_options: { x, y, w, h },
-            });
-            if (response) {
-                this.updatedWidgets.push(changedWidget);
-            }
-        });
-    }
-
-    /**
-     * Removes a specified widget from the dashboard.
-     * Performs a removal operation on the dashboard and handles any errors that occur during the process.
-     *
-     * @param {Object} widget - The widget object to be removed.
-     * @action
-     */
-    @action removeWidget(widget) {
-        const { dashboard } = this.args;
-
-        if (dashboard) {
-            dashboard.removeWidget(widget.id).catch((error) => {
-                this.notifications.serverError(error);
-            });
-        }
-    }
-
-    /**
-     * Computed property that returns grid options based on the current edit state.
-     * Configures grid behavior such as floating, animation, and drag and resize capabilities.
-     *
-     * @computed
-     * @returns {Object} An object containing grid configuration options.
-     */
-    @computed('args.isEdit') get gridOptions() {
-        return {
-            float: true,
-            animate: true,
-            acceptWidgets: true,
-            alwaysShowResizeHandle: this.args.isEdit,
-            disableDrag: !this.args.isEdit,
-            disableResize: !this.args.isEdit,
-            resizable: { handles: 'all' },
-            cellHeight: 30,
-        };
-    }
-}

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-decorators';
+import { task } from 'ember-concurrency';
 
 export default class MetricComponent extends Component {
     @service fetch;

console/app/components/dashboard/widget-panel.hbs

@@ -1,31 +0,0 @@
-<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>

console/app/components/dashboard/widget-panel.js

@@ -1,60 +0,0 @@
-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();
-        }
-    }
-}

console/app/components/fleetbase-blog.hbs

@@ -8,7 +8,7 @@
             </a>
         </div>
         <div class="px-4 py-2.5">
-            {{#if this.isLoading}}
+            {{#if this.loadBlogPosts.isRunning}}
                 <Spinner />
             {{else}}
                 <ul class="space-y-2">

console/app/components/fleetbase-blog.js

@@ -1,28 +1,42 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { storageFor } from 'ember-local-storage';
+import { add, isPast } from 'date-fns';
+import { task } from 'ember-concurrency';
 
 export default class FleetbaseBlogComponent extends Component {
+    @storageFor('local-cache') localCache;
     @service fetch;
     @tracked posts = [];
-    @tracked isLoading = false;
 
     constructor() {
         super(...arguments);
-        this.loadBlogPosts();
+        this.loadBlogPosts.perform();
     }
 
-    @action loadBlogPosts() {
-        this.isLoading = true;
+    @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');
 
-        return this.fetch
-            .get('lookup/fleetbase-blog')
-            .then((response) => {
-                this.posts = response;
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+        // 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);
+            }
+        }
     }
 }

console/app/components/github-card.hbs

@@ -1,6 +1,6 @@
 <div class="fleetbase-github-card relative flex-1 w-full" ...attributes>
     <div class="border dark:border-gray-700 border-gray-200 dark:bg-gray-800 bg-gray-50 rounded-lg shadow-sm flex flex-col">
-        {{#if this.isLoading}}
+        {{#if this.getRepositoryData.isRunning}}
             <div class="p-4">
                 <Spinner />
             </div>

console/app/components/github-card.js

@@ -10,9 +10,12 @@ import fetch from 'fetch';
 
 export default class GithubCardComponent extends Component {
     @storageFor('local-cache') localCache;
-    @tracked data;
-    @tracked tags;
-    @tracked isLoading = false;
+    @tracked data = {
+        owner: {
+            avatar_url: 'https://avatars.githubusercontent.com/u/38091894?v=4',
+        },
+    };
+    @tracked tags = [];
 
     @computed('tags.length') get latestRelease() {
         if (isArray(this.tags) && this.tags.length) {
@@ -49,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');
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase', { cache: 'default' });
             if (response.ok) {
                 this.data = yield response.json();
                 this.localCache.set('fleetbase-github-data', this.data);
@@ -69,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');
+            const response = yield fetch('https://api.github.com/repos/fleetbase/fleetbase/tags', { cache: 'default' });
             if (response.ok) {
                 this.tags = yield response.json();
                 this.localCache.set('fleetbase-github-tags', this.tags);

console/app/components/impersonator-tray.hbs

@@ -0,0 +1,36 @@
+{{#if this.isImpersonator}}
+    <EmberWormhole @to="view-header-actions">
+        <div class="next-user-button locale-selector-tray" ...attributes>
+            <BasicDropdown
+                class={{@wrapperClass}}
+                @onOpen={{@onOpen}}
+                @onClose={{@onClose}}
+                @calculatePosition={{this.calculatePosition}}
+                @verticalPosition={{@verticalPosition}}
+                @horizontalPosition={{@horizontalPosition}}
+                @renderInPlace={{or @renderInPlace (not (media "isMobile"))}}
+                as |dd|
+            >
+                <dd.Trigger class="{{@triggerClass}} local-selector-tray-trigger {{if (media 'isMobile') 'is-mobile'}}">
+                    <div class="next-org-button-trigger flex-shrink-0 {{if dd.isOpen 'is-open'}}">
+                        <FaIcon @icon="user-secret" @size="sm" />
+                    </div>
+                </dd.Trigger>
+                <dd.Content class="{{@contentClass}} locale-selector-tray-content {{if (media 'isMobile') 'is-mobile'}}">
+                    <div class="next-dd-menu {{@dropdownMenuClass}} {{if dd.isOpen 'is-open'}}">
+                        <div class="px-1">
+                            <a href="javascript:;" class="next-dd-item" {{on "click" this.restoreSession}}>
+                                <div class="flex flex-row items-centerw-full">
+                                    <div class="w-6">
+                                        <FaIcon @icon="person-walking-arrow-loop-left" @size="sm" />
+                                    </div>
+                                    <div>End Impersonation</div>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                </dd.Content>
+            </BasicDropdown>
+        </div>
+    </EmberWormhole>
+{{/if}}

console/app/components/impersonator-tray.js

@@ -0,0 +1,39 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { later } from '@ember/runloop';
+
+export default class ImpersonatorTrayComponent extends Component {
+    @service session;
+    @service notifications;
+    @service router;
+    @service fetch;
+
+    get isImpersonator() {
+        return typeof this.session.data?.authenticated?.impersonator === 'string';
+    }
+
+    /**
+     * Restore session
+     *
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action async restoreSession() {
+        try {
+            const { token } = await this.fetch.delete('auth/impersonate');
+            await this.router.transitionTo('console');
+            this.session.manuallyAuthenticate(token);
+            this.notifications.info(`Ending impersonation session.`);
+            later(
+                this,
+                () => {
+                    window.location.reload();
+                },
+                600
+            );
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+}

console/app/components/modals/edit-organization.hbs

@@ -0,0 +1,12 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container pt-0i text-gray-900 dark:text-white">
+        <InputGroup @name="Organization name" @value={{@options.organization.name}} />
+        <InputGroup @name="Organization description" @value={{@options.organization.description}} />
+        <InputGroup @name="Organization phone number">
+            <PhoneInput @value={{@options.organization.phone}} @onInput={{fn (mut @options.organization.phone)}} class="form-input w-full" />
+        </InputGroup>
+        <InputGroup @name="Organization currency">
+            <CurrencySelect @value={{@options.organization.currency}} @onSelect={{fn (mut @options.organization.currency)}} @triggerClass="w-full form-select" />
+        </InputGroup>
+    </div>
+</Modal::Default>

console/app/components/modals/edit-organization.js

@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class ModalsEditOrganizationComponent extends Component {}

console/app/components/modals/leave-organization.hbs

@@ -0,0 +1,43 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container pt-0i text-gray-900 dark:text-white">
+        {{#if @options.isOwner}}
+            {{#if @options.hasOtherMembers}}
+                <p>
+                    <div class="text-base mb-2">
+                        As the owner of
+                        <strong>{{@options.organization.name}}</strong>, leaving the organization requires you to nominate a new owner.
+                    </div>
+                    <div>Please select a member from the dropdown below to transfer ownership before you can proceed.</div>
+                </p>
+                <InputGroup @name="Select a New Owner" @wrapperClass="mt-2 mb-0i">
+                    <Select
+                        @options={{@options.organization.users}}
+                        @value={{@options.newOwnerId}}
+                        @onSelect={{@options.selectNewOwner}}
+                        @optionLabel="name"
+                        @optionValue="id"
+                        @placeholder="Select a member"
+                    />
+                </InputGroup>
+            {{else if @options.willBeDeleted}}
+                <p>
+                    <div class="text-base mb-2">
+                        You are the sole owner of
+                        <strong>{{@options.organization.name}}</strong>.
+                    </div>
+                    <div>By leaving, the organization will be permanently deleted along with all its data.</div>
+                    <div>Are you sure you want to proceed?</div>
+                </p>
+                <p class="mt-3"><em>This action cannot be undone.</em></p>
+            {{/if}}
+        {{else}}
+            <p>
+                <div class="text-base mb-2">
+                    Are you sure you want to leave the organization
+                    <strong>{{@options.organization.name}}</strong>?
+                </div>
+                <div>You will no longer have access to its resources and settings.</div>
+            </p>
+        {{/if}}
+    </div>
+</Modal::Default>

console/app/components/modals/leave-organization.js

@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class ModalsLeaveOrganizationComponent extends Component {}

console/app/components/onboarding/form.hbs

@@ -0,0 +1,61 @@
+<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>

console/app/components/onboarding/form.js

@@ -0,0 +1,77 @@
+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);
+        }
+    }
+}

console/app/components/onboarding/verify-email.hbs

@@ -0,0 +1,82 @@
+{{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>

console/app/components/onboarding/verify-email.js

@@ -0,0 +1,53 @@
+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);
+        }
+    }
+}

console/app/components/onboarding/yield.hbs

@@ -0,0 +1,13 @@
+<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>

console/app/components/onboarding/yield.js

@@ -0,0 +1,27 @@
+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;
+    }
+}

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-decorators';
+import { task } from 'ember-concurrency';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 

console/app/controllers/auth/forgot-password.js

@@ -1,28 +1,11 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
+import { task } from 'ember-concurrency';
 
 export default class AuthForgotPasswordController extends Controller {
-    /**
-     * Inject the `fetch` service
-     *
-     * @memberof AuthForgotPasswordController
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service
-     *
-     * @memberof AuthForgotPasswordController
-     */
     @service notifications;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @memberof AuthForgotPasswordController
-     */
     @service intl;
 
     /**
@@ -32,13 +15,6 @@ export default class AuthForgotPasswordController extends Controller {
      */
     @tracked email;
 
-    /**
-     * The loading state
-     *
-     * @memberof AuthForgotPasswordController
-     */
-    @tracked isLoading;
-
     /**
      * Indicator if request has been sent.
      *
@@ -46,30 +22,27 @@ export default class AuthForgotPasswordController extends Controller {
      */
     @tracked isSent = false;
 
+    /**
+     * Query parameters.
+     *
+     * @memberof AuthForgotPasswordController
+     */
+    queryParams = ['email'];
+
     /**
      * Sends a secure magic reset link to the user provided email.
      *
      * @memberof AuthForgotPasswordController
      */
-    @action sendSecureLink(event) {
-        // firefox patch
+    @task *sendSecureLink(event) {
         event.preventDefault();
 
-        const { email } = this;
-
-        this.isLoading = true;
-
-        this.fetch
-            .post('auth/get-magic-reset-link', { email })
-            .then(() => {
-                this.notifications.success(this.intl.t('auth.forgot-password.success-message'));
-                this.isSent = true;
-            })
-            .catch((error) => {
-                this.notifications.serverError(error);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+        try {
+            yield this.fetch.post('auth/get-magic-reset-link', { email: this.email });
+            this.notifications.success(this.intl.t('auth.forgot-password.success-message'));
+            this.isSent = true;
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 }

console/app/controllers/auth/login.js

@@ -5,53 +5,12 @@ import { action } from '@ember/object';
 import pathToRoute from '@fleetbase/ember-core/utils/path-to-route';
 
 export default class AuthLoginController extends Controller {
-    /**
-     * Inject the `forgotPassword` controller
-     *
-     * @var {Controller}
-     */
     @controller('auth.forgot-password') forgotPasswordController;
-
-    /**
-     * Inject the `notifications` service
-     *
-     * @var {Service}
-     */
     @service notifications;
-
-    /**
-     * Inject the `urlSearchParams` service
-     *
-     * @var {Service}
-     */
     @service urlSearchParams;
-
-    /**
-     * Inject the `session` service
-     *
-     * @var {Service}
-     */
     @service session;
-
-    /**
-     * Inject the `router` service
-     *
-     * @var {Service}
-     */
     @service router;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `fetch` service
-     *
-     * @var {Service}
-     */
     @service fetch;
 
     /**
@@ -110,8 +69,20 @@ export default class AuthLoginController extends Controller {
      */
     @tracked failedAttempts = 0;
 
+    /**
+     * Authentication token.
+     *
+     * @memberof AuthLoginController
+     */
     @tracked token;
 
+    /**
+     * Action to login user.
+     *
+     * @param {Event} event
+     * @return {void}
+     * @memberof AuthLoginController
+     */
     @action async login(event) {
         // firefox patch
         event.preventDefault();
@@ -166,6 +137,11 @@ export default class AuthLoginController extends Controller {
                 return this.sendUserForEmailVerification(identity);
             }
 
+            // Handle password reset required
+            if (error.toString().includes('reset required')) {
+                return this.sendUserForPasswordReset(identity);
+            }
+
             return this.failure(error);
         }
 
@@ -210,6 +186,20 @@ export default class AuthLoginController extends Controller {
         });
     }
 
+    /**
+     * Sends user to forgot password flow.
+     *
+     * @param {String} email
+     * @return {Promise<Transition>}
+     * @memberof AuthLoginController
+     */
+    @action sendUserForPasswordReset(email) {
+        this.notifications.warning(this.intl.t('auth.login.password-reset-required'));
+        return this.router.transitionTo('auth.forgot-password', { queryParams: { email } }).then(() => {
+            this.reset('error');
+        });
+    }
+
     /**
      * Sets correct route to send user to after login.
      *

console/app/controllers/auth/reset-password.js

@@ -4,32 +4,9 @@ import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 
 export default class AuthResetPasswordController extends Controller {
-    /**
-     * Inject the `fetch` service
-     *
-     * @memberof AuthResetPasswordController
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service
-     *
-     * @memberof AuthResetPasswordController
-     */
     @service notifications;
-
-    /**
-     * Inject the `router` service
-     *
-     * @memberof AuthResetPasswordController
-     */
     @service router;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @memberof AuthResetPasswordController
-     */
     @service intl;
 
     /**
@@ -53,6 +30,13 @@ export default class AuthResetPasswordController extends Controller {
      */
     @tracked password_confirmation;
 
+    /**
+     * Query parameters.
+     *
+     * @memberof AuthResetPasswordController
+     */
+    queryParams = ['code'];
+
     /**
      * The reset password task.
      *

console/app/controllers/auth/verification.js

@@ -3,118 +3,27 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
-import { not } from '@ember/object/computed';
+import { task } from 'ember-concurrency';
 
 export default class AuthVerificationController extends Controller {
-    /**
-     * Inject the `fetch` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service notifications;
-
-    /**
-     * Inject the `modalsManager` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service modalsManager;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service currentUser;
-
-    /**
-     * Inject the `router` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service router;
-
-    /**
-     * Inject the `session` service
-     *
-     * @memberof OnboardIndexController
-     */
     @service session;
+    @service intl;
 
-    /**
-     * The session paramerer.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
+    /** props */
     @tracked hello;
-
-    /**
-     * The token paramerer.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
     @tracked token;
-
-    /**
-     * The loading state of the verification request.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked isLoading = false;
-
-    /**
-     * Validation state tracker.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked isReadyToSubmit = false;
-
-    /**
-     * The request timeout to trigger alternative verification options.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked waitTimeout = 1000 * 60 * 1.25;
-
-    /**
-     * Determines if Fleetbase is still awaiting verification after a certain time.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked stillWaiting = false;
-
-    /**
-     * the input code.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
     @tracked code;
+    @tracked email;
+    @tracked isReadyToSubmit = false;
+    @tracked waitTimeout = 1000 * 60 * 1.25;
+    @tracked stillWaiting = false;
+    @tracked queryParams = ['hello', 'token', 'code'];
 
-    /**
-     * The query param for the session token.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @tracked queryParams = ['hello', 'token'];
-
-    /**
-     * The boolean opposite of `isReadyToSubmit`
-     *
-     * @memberof OnboardVerifyEmailController
-     */
-    @not('isReadyToSubmit') isNotReadyToSubmit;
-
-    /**
-     * Creates an instance of OnboardVerifyEmailController.
-     * @memberof OnboardVerifyEmailController
-     */
     constructor() {
         super(...arguments);
 
@@ -127,21 +36,10 @@ export default class AuthVerificationController extends Controller {
         );
     }
 
-    /**
-     * Allow user to manually trigger no code received prompt.
-     *
-     * @memberof AuthVerificationController
-     */
     @action onDidntReceiveCode() {
         this.stillWaiting = true;
     }
 
-    /**
-     * Validates the input
-     *
-     * @param {InputEvent} { target: { value } }
-     * @memberof OnboardVerifyEmailController
-     */
     @action validateInput({ target: { value } }) {
         if (value.length > 5) {
             this.isReadyToSubmit = true;
@@ -150,12 +48,6 @@ export default class AuthVerificationController extends Controller {
         }
     }
 
-    /**
-     * Validates input on the first render
-     *
-     * @param {HTMLElement} el
-     * @memberof AuthVerificationController
-     */
     @action validateInitInput(el) {
         const value = el.value;
         if (value.length > 5) {
@@ -165,89 +57,70 @@ export default class AuthVerificationController extends Controller {
         }
     }
 
-    /**
-     * Submits to verify code.
-     *
-     * @return {Promise}
-     * @memberof OnboardVerifyEmailController
-     */
-    @action verifyCode() {
-        const { token, code, email } = this;
+    @task *verifyCode() {
+        try {
+            const { status, token } = yield this.fetch.post('auth/verify-email', { token: this.token, code: this.code, email: this.email, authenticate: true });
+            if (status === 'ok') {
+                this.notifications.success('Email successfully verified!');
 
-        this.isLoading = true;
+                if (token) {
+                    this.notifications.info(`Welcome to ${this.intl.t('app.name')}`);
+                    this.session.manuallyAuthenticate(token);
 
-        return this.fetch
-            .post('auth/verify-email', { token, code, email, authenticate: true })
-            .then(({ status, token }) => {
-                if (status === 'ok') {
-                    this.notifications.success('Email successfully verified!');
-
-                    if (token) {
-                        this.notifications.info('Welcome to Fleetbase!');
-                        this.session.manuallyAuthenticate(token);
-
-                        return this.router.transitionTo('console');
-                    }
-
-                    return this.router.transitionTo('auth.login');
+                    return this.router.transitionTo('console');
                 }
-            })
-            .catch((error) => {
-                this.notifications.serverError(error);
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+
+                return this.router.transitionTo('auth.login');
+            }
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
-    /**
-     * Action to resend verification code by SMS.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
     @action resendBySms() {
         this.modalsManager.show('modals/verify-by-sms', {
             title: 'Verify Account by Phone',
             acceptButtonText: 'Send',
             phone: this.currentUser.phone,
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
                 const phone = modal.getOption('phone');
+                if (!phone) {
+                    this.notifications.error('No phone number provided.');
+                }
 
-                return this.fetch
-                    .post('onboard/send-verification-sms', { phone, session: this.hello })
-                    .then(() => {
-                        this.notifications.success('Verification code SMS sent!');
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
-                    });
+                try {
+                    await this.fetch.post('onboard/send-verification-sms', { phone, session: this.hello });
+                    this.notifications.success('Verification code SMS sent!');
+                    modal.done();
+                } catch (error) {
+                    this.notifications.serverError(error);
+                    modal.stopLoading();
+                }
             },
         });
     }
 
-    /**
-     * Action to resend verification code by email.
-     *
-     * @memberof OnboardVerifyEmailController
-     */
     @action resendEmail() {
         this.modalsManager.show('modals/resend-verification-email', {
             title: 'Resend Verification Code',
             acceptButtonText: 'Send',
             email: this.currentUser.email,
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
                 const email = modal.getOption('email');
+                if (!email) {
+                    this.notifications.error('No email number provided.');
+                }
 
-                return this.fetch
-                    .post('onboard/send-verification-email', { email, session: this.hello })
-                    .then(() => {
-                        this.notifications.success('Verification code email sent!');
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
-                    });
+                try {
+                    await this.fetch.post('onboard/send-verification-email', { email, session: this.hello });
+                    this.notifications.success('Verification code email sent!');
+                    modal.done();
+                } catch (error) {
+                    this.notifications.serverError(error);
+                    modal.stopLoading();
+                }
             },
         });
     }

console/app/controllers/console.js

@@ -1,125 +1,35 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { getOwner } from '@ember/application';
 import { later } from '@ember/runloop';
-import { action, computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
+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 {
-    /**
-     * Inject the `currentUser` service.
-     *
-     * @var {Service}
-     */
     @service currentUser;
-
-    /**
-     * Inject the `modalsManager` service.
-     *
-     * @var {Service}
-     */
     @service modalsManager;
-
-    /**
-     * Inject the `session` service.
-     *
-     * @var {Service}
-     */
     @service session;
-
-    /**
-     * Inject the `fetch` service.
-     *
-     * @var {Service}
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service.
-     *
-     * @var {Service}
-     */
     @service notifications;
-
-    /**
-     * Inject the `router` service.
-     *
-     * @var {Service}
-     */
     @service router;
-
-    /**
-     * Inject the `intl` service.
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `universe` service.
-     *
-     * @var {Service}
-     */
     @service universe;
-
-    /**
-     * Authenticated user organizations.
-     *
-     * @var {Array}
-     */
+    @service abilities;
+    @service sidebar;
     @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 = {};
+    @tracked hiddenSidebarRoutes = ['console.home', 'console.notifications', 'console.virtual'];
+    @tracked menuItems = [];
+    @tracked userMenuItems = [];
+    @tracked organizationMenuItems = [];
 
-    /**
-     * Routes which should hide the sidebar menu.
-     *
-     * @var {Array}
-     */
-    @tracked hiddenSidebarRoutes = ['console.home', 'console.extensions', 'console.notifications'];
-
-    /**
-     * Installed extensions.
-     *
-     * @var {Array}
-     */
-    @computed() get extensions() {
-        return getOwner(this).application.extensions;
+    get currentRouteClass() {
+        return dasherize(this.router.currentRouteName.replace(/\./g, ' '));
     }
 
-    /**
-     * Get the currently authenticated user
-     *
-     * @var {Model}
-     */
-    @alias('currentUser.user') user;
-
-    /**
-     * Creates an instance of ConsoleController.
-     * @memberof ConsoleController
-     */
     constructor() {
         super(...arguments);
         this.router.on('routeDidChange', (transition) => {
@@ -132,17 +42,17 @@ export default class ConsoleController extends Controller {
 
                 // Hide the sidebar if the current route is in hiddenSidebarRoutes
                 if (shouldHideSidebar) {
-                    this.sidebarContext.hideNow();
+                    this.sidebar.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.sidebarContext.hideNow();
+                    this.sidebar.hideNow();
                 } else {
                     // Otherwise, show the sidebar
-                    this.sidebarContext.show();
+                    this.sidebar.show();
                 }
 
                 // Ensure toggle is enabled unless on a hidden route
@@ -177,7 +87,7 @@ export default class ConsoleController extends Controller {
         this.universe.trigger('sidebarContext.available', sidebarContext);
 
         if (this.hiddenSidebarRoutes.includes(this.router.currentRouteName)) {
-            this.sidebarContext.hideNow();
+            this.sidebar.hideNow();
             this.sidebarToggleEnabled = false;
         }
     }
@@ -198,13 +108,13 @@ export default class ConsoleController extends Controller {
      *
      * @void
      */
-    @action invalidateSession(noop, event) {
+    @action async invalidateSession(noop, event) {
         event.preventDefault();
-        this.session.invalidateWithLoader();
+        await this.session.invalidateWithLoader();
     }
 
     /**
-     * Action to invalidate and log user out
+     * Action to create or join an organization.
      *
      * @void
      */
@@ -228,53 +138,51 @@ export default class ConsoleController extends Controller {
             changeAction: (action) => {
                 this.modalsManager.setOption('action', action);
             },
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
 
                 const { action, next, name, description, phone, currency, country, timezone } = modal.getOptions();
 
                 if (action === 'join') {
-                    return this.fetch
-                        .post('auth/join-organization', { next })
-                        .then(() => {
-                            this.fetch.flushRequestCache('auth/organizations');
-                            this.notifications.success(this.intl.t('console.create-or-join-organization.join-success-notification'));
-                            later(
-                                this,
-                                () => {
-                                    window.location.reload();
-                                },
-                                900
-                            );
-                        })
-                        .catch((error) => {
-                            this.notifications.serverError(error);
-                        });
-                }
-
-                return this.fetch
-                    .post('auth/create-organization', {
-                        name,
-                        description,
-                        phone,
-                        currency,
-                        country,
-                        timezone,
-                    })
-                    .then(() => {
+                    try {
+                        await this.fetch.post('auth/join-organization', { next });
                         this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
-                        later(
+                        this.notifications.success(this.intl.t('console.create-or-join-organization.join-success-notification'));
+                        return later(
                             this,
                             () => {
                                 window.location.reload();
                             },
                             900
                         );
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
+                    } catch (error) {
+                        modal.stopLoading();
+                        return this.notifications.serverError(error);
+                    }
+                }
+
+                try {
+                    await this.fetch.post('auth/create-organization', {
+                        name,
+                        description,
+                        phone,
+                        currency,
+                        country,
+                        timezone,
                     });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
+                    return later(
+                        this,
+                        () => {
+                            window.location.reload();
+                        },
+                        900
+                    );
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
             },
         });
     }
@@ -294,25 +202,24 @@ export default class ConsoleController extends Controller {
             body: this.intl.t('console.switch-organization.modal-body'),
             acceptButtonText: this.intl.t('console.switch-organization.modal-accept-button-text'),
             acceptButtonScheme: 'primary',
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 modal.startLoading();
 
-                return this.fetch
-                    .post('auth/switch-organization', { next: organization.uuid })
-                    .then(() => {
-                        this.fetch.flushRequestCache('auth/organizations');
-                        this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
-                        later(
-                            this,
-                            () => {
-                                window.location.reload();
-                            },
-                            900
-                        );
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
-                    });
+                try {
+                    await this.fetch.post('auth/switch-organization', { next: organization.uuid });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
+                    return later(
+                        this,
+                        () => {
+                            window.location.reload();
+                        },
+                        900
+                    );
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
             },
         });
     }

console/app/controllers/console/account.js

@@ -2,10 +2,6 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
 export default class ConsoleAccountController extends Controller {
-    /**
-     * Inject the `universe` service.
-     *
-     * @memberof ConsoleAdminController
-     */
+    @service('universe/menu-service') menuService;
     @service universe;
 }

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-decorators';
+import { task } from 'ember-concurrency';
 import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
 
 /**
@@ -12,32 +12,9 @@ import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
  * @extends Controller
  */
 export default class ConsoleAccountAuthController extends Controller {
-    /**
-     * Service for handling data fetching.
-     *
-     * @type {fetch}
-     */
     @service fetch;
-
-    /**
-     * Service for displaying notifications.
-     *
-     * @type {notifications}
-     */
     @service notifications;
-
-    /**
-     * Service for managing application routing.
-     *
-     * @type {router}
-     */
     @service router;
-
-    /**
-     * Service for managing modals.
-     *
-     * @type {router}
-     */
     @service modalsManager;
 
     /**
@@ -187,14 +164,12 @@ export default class ConsoleAccountAuthController extends Controller {
      * @param {Object} twoFaSettings - User-specific two-factor authentication settings.
      */
     @task *saveUserTwoFaSettings(twoFaSettings = {}) {
-        yield this.fetch
-            .post('users/two-fa', { twoFaSettings })
-            .then(() => {
-                this.notifications.success('2FA Settings saved successfully.');
-            })
-            .catch((error) => {
-                this.notifications.serverError(error);
-            });
+        try {
+            yield this.fetch.post('users/two-fa', { twoFaSettings });
+            this.notifications.success('2FA Settings saved successfully.');
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
     /**
@@ -203,13 +178,17 @@ export default class ConsoleAccountAuthController extends Controller {
      * @method loadUserTwoFaSettings
      */
     @task *loadUserTwoFaSettings() {
-        const twoFaSettings = yield this.fetch.get('users/two-fa');
+        try {
+            const twoFaSettings = yield this.fetch.get('users/two-fa');
+            if (twoFaSettings) {
+                this.isUserTwoFaEnabled = twoFaSettings.enabled;
+                this.twoFaSettings = twoFaSettings;
+            }
 
-        if (twoFaSettings) {
-            this.isUserTwoFaEnabled = twoFaSettings.enabled;
-            this.twoFaSettings = twoFaSettings;
+            return twoFaSettings;
+        } catch (error) {
+            this.notifications.serverError(error);
         }
-        return twoFaSettings;
     }
 
     /**
@@ -218,12 +197,16 @@ export default class ConsoleAccountAuthController extends Controller {
      * @method loadSystemTwoFaConfig
      */
     @task *loadSystemTwoFaConfig() {
-        const twoFaConfig = yield this.fetch.get('two-fa/config');
+        try {
+            const twoFaConfig = yield this.fetch.get('two-fa/config');
+            if (twoFaConfig) {
+                this.isSystemTwoFaEnabled = twoFaConfig.enabled;
+                this.twoFaConfig = twoFaConfig;
+            }
 
-        if (twoFaConfig) {
-            this.isSystemTwoFaEnabled = twoFaConfig.enabled;
-            this.twoFaConfig = twoFaConfig;
+            return twoFaConfig;
+        } catch (error) {
+            this.notifications.serverError(error);
         }
-        return twoFaConfig;
     }
 }

console/app/controllers/console/account/index.js

@@ -1,7 +1,9 @@
 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 {
@@ -40,6 +42,18 @@ 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
      *
@@ -54,6 +68,7 @@ export default class ConsoleAccountIndexController extends Controller {
                 subject_uuid: this.user.id,
                 subject_type: 'user',
                 type: 'user_avatar',
+                resize: 'md'
             },
             (uploadedFile) => {
                 this.user.setProperties({
@@ -116,6 +131,19 @@ 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
      *

console/app/controllers/console/account/organizations.js

@@ -0,0 +1,203 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { later } from '@ember/runloop';
+import { htmlSafe } from '@ember/template';
+
+export default class ConsoleAccountOrganizationsController extends Controller {
+    @service currentUser;
+    @service modalsManager;
+    @service crud;
+    @service notifications;
+    @service intl;
+    @service fetch;
+    @service router;
+
+    @action async leaveOrganization(organization) {
+        const isOwner = this.currentUser.id === organization.owner_uuid;
+        const hasOtherMembers = organization.users_count > 1;
+        const willBeDeleted = isOwner && organization.users_count === 1;
+
+        if (this.model.length === 1) {
+            return this.notifications.warning('Unable to leave your only organization.');
+        }
+
+        if (hasOtherMembers) {
+            organization.loadUsers({ exclude: [this.currentUser.id] });
+        }
+
+        this.modalsManager.show('modals/leave-organization', {
+            title: isOwner ? (willBeDeleted ? 'Delete Organization' : 'Transfer Ownership and Leave') : 'Leave Organization',
+            acceptButtonText: isOwner ? (willBeDeleted ? 'Delete Organization' : 'Transfer Ownership and Leave') : 'Leave Organization',
+            acceptButtonScheme: 'danger',
+            acceptButtonIcon: isOwner ? (willBeDeleted ? 'trash' : 'person-walking-arrow-right') : 'person-walking-arrow-right',
+            acceptButtonDisabled: isOwner && hasOtherMembers,
+            isOwner,
+            hasOtherMembers,
+            willBeDeleted,
+            organization,
+            newOwnerId: null,
+            selectNewOwner: (newOwnerId) => {
+                this.modalsManager.setOption('newOwnerId', newOwnerId);
+                this.modalsManager.setOption('acceptButtonDisabled', false);
+            },
+            confirm: async (modal) => {
+                modal.startLoading();
+
+                if (isOwner) {
+                    if (hasOtherMembers) {
+                        const newOwnerId = this.modalsManager.getOption('newOwnerId');
+                        try {
+                            await organization.transferOwnership(newOwnerId, { leave: true });
+                        } catch (error) {
+                            this.notifications.serverError(error);
+                        }
+
+                        return this.router.refresh();
+                    }
+
+                    if (willBeDeleted) {
+                        try {
+                            await organization.destroyRecord();
+                        } catch (error) {
+                            this.notifications.serverError(error);
+                        }
+
+                        return this.router.refresh();
+                    }
+                }
+
+                try {
+                    await organization.leave();
+                } catch (error) {
+                    this.notifications.serverError(error);
+                }
+
+                return this.router.refresh();
+            },
+        });
+    }
+
+    @action switchOrganization(organization) {
+        this.modalsManager.confirm({
+            title: this.intl.t('console.switch-organization.modal-title', { organizationName: organization.name }),
+            body: this.intl.t('console.switch-organization.modal-body'),
+            acceptButtonText: this.intl.t('console.switch-organization.modal-accept-button-text'),
+            acceptButtonScheme: 'primary',
+            confirm: async (modal) => {
+                modal.startLoading();
+
+                try {
+                    await this.fetch.post('auth/switch-organization', { next: organization.uuid });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.switch-organization.success-notification'));
+                    return later(
+                        this,
+                        () => {
+                            window.location.reload();
+                        },
+                        900
+                    );
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
+            },
+        });
+    }
+
+    @action deleteOrganization(organization) {
+        const isOwner = this.currentUser.id === organization.owner_uuid;
+
+        if (this.model.length === 1) {
+            return this.notifications.warning('Unable to delete your only organization.');
+        }
+
+        if (!isOwner) {
+            return this.notifications.warning('You do not have rights to delete this organization.');
+        }
+
+        this.crud.delete(organization, {
+            title: `Are you sure you want to delete the organization ${organization.name}?`,
+            body: htmlSafe(
+                `This action will permanently remove all data, including orders, members, and settings associated with the organization. <br /><br /><strong>This action cannot be undone.</strong>`
+            ),
+            acceptButtonText: 'Delete Organization',
+            acceptButtonScheme: 'danger',
+            acceptButtonIcon: 'trash',
+            confirm: async (modal) => {
+                modal.startLoading();
+
+                try {
+                    await organization.destroyRecord();
+                    return this.router.refresh();
+                } catch (error) {
+                    this.notifications.serverError(error);
+                }
+            },
+        });
+    }
+
+    @action editOrganization(organization) {
+        this.modalsManager.show('modals/edit-organization', {
+            title: 'Edit Organization',
+            acceptButtonText: 'Save Changes',
+            acceptButtonIcon: 'save',
+            isOwner: this.currentUser.id === organization.owner_uuid,
+            organization,
+            confirm: async (modal) => {
+                modal.startLoading();
+
+                try {
+                    await organization.save();
+                    return this.router.refresh();
+                } catch (error) {
+                    this.notifications.serverError(error);
+                }
+            },
+        });
+    }
+
+    @action createOrganization() {
+        const currency = this.currentUser.currency;
+        const country = this.currentUser.country;
+
+        this.modalsManager.show('modals/edit-organization', {
+            title: 'Create Organization',
+            acceptButtonText: this.intl.t('common.confirm'),
+            acceptButtonIcon: 'check',
+            acceptButtonIconPrefix: 'fas',
+            organization: {
+                name: null,
+                decription: null,
+                phone: null,
+                currency,
+                country,
+                timezone: null,
+            },
+            confirm: async (modal) => {
+                modal.startLoading();
+
+                const organization = modal.getOption('organization');
+                const { name, description, phone, currency, country, timezone } = organization;
+
+                try {
+                    await this.fetch.post('auth/create-organization', {
+                        name,
+                        description,
+                        phone,
+                        currency,
+                        country,
+                        timezone,
+                    });
+                    this.fetch.flushRequestCache('auth/organizations');
+                    this.notifications.success(this.intl.t('console.create-or-join-organization.create-success-notification'));
+                    return this.router.refresh();
+                } catch (error) {
+                    modal.stopLoading();
+                    return this.notifications.serverError(error);
+                }
+            },
+        });
+    }
+}

console/app/controllers/console/account/virtual.js

@@ -0,0 +1,7 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+
+export default class ConsoleAccountVirtualController extends Controller {
+    @tracked view;
+    queryParams = ['view'];
+}

console/app/controllers/console/admin.js

@@ -2,10 +2,6 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
 export default class ConsoleAdminController extends Controller {
-    /**
-     * Inject the `universe` service.
-     *
-     * @memberof ConsoleAdminController
-     */
+    @service('universe/menu-service') menuService;
     @service universe;
 }

console/app/controllers/console/admin/notifications.js

@@ -1,136 +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 '../../../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);
-            });
-    }
-}

console/app/controllers/console/admin/organizations/index.js

@@ -10,41 +10,10 @@ import { action } from '@ember/object';
  * @extends Controller
  */
 export default class ConsoleAdminOrganizationsController extends Controller {
-    /**
-     * The Ember Data service for interacting with the store.
-     *
-     * @property {Service} store
-     * @type {Object}
-     */
     @service store;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * The Ember Router service for handling transitions between routes.
-     *
-     * @property {Service} router
-     * @type {Object}
-     */
     @service router;
-
-    /**
-     * Inject the `filters` service
-     *
-     * @var {Service}
-     */
     @service filters;
-
-    /**
-     * Inject the `crud` service
-     *
-     * @var {Service}
-     */
     @service crud;
 
     /**

console/app/controllers/console/admin/organizations/index/users.js

@@ -2,28 +2,16 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { later } from '@ember/runloop';
 
 export default class ConsoleAdminOrganizationsIndexUsersController extends Controller {
-    /**
-     * Inject the `filters` service
-     *
-     * @var {Service}
-     */
     @service filters;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `router` service
-     *
-     * @var {Service}
-     */
     @service router;
+    @service fetch;
+    @service notifications;
+    @service modalsManager;
+    @service session;
 
     /**
      * The current page of data being viewed
@@ -84,6 +72,10 @@ export default class ConsoleAdminOrganizationsIndexUsersController extends Contr
             label: this.intl.t('common.name'),
             valuePath: 'name',
         },
+        {
+            label: this.intl.t('common.role'),
+            valuePath: 'roleName',
+        },
         {
             label: this.intl.t('common.phone-number'),
             valuePath: 'phone',
@@ -97,8 +89,71 @@ export default class ConsoleAdminOrganizationsIndexUsersController extends Contr
             valuePath: 'status',
             cellComponent: 'table/cell/status',
         },
+        {
+            label: '',
+            cellComponent: 'table/cell/dropdown',
+            ddButtonText: false,
+            ddButtonIcon: 'ellipsis-h',
+            ddButtonIconPrefix: 'fas',
+            ddMenuLabel: 'User Actions',
+            cellClassNames: 'overflow-visible',
+            wrapperClass: 'flex items-center justify-end mx-2',
+            width: '9%',
+            actions: [
+                {
+                    label: 'Impersonate',
+                    icon: 'user-secret',
+                    fn: this.impersonateUser,
+                },
+                {
+                    label: 'Change Password',
+                    icon: 'lock-open',
+                    fn: this.changeUserPassword,
+                },
+            ],
+            sortable: false,
+            filterable: false,
+            resizable: false,
+            searchable: false,
+        },
     ];
 
+    /**
+     * Impersonate the selected user.
+     *
+     * @param {UserModel} user
+     * @memberof ConsoleAdminOrganizationsIndexUsersController
+     */
+    @action async impersonateUser(user) {
+        try {
+            const { token } = await this.fetch.post('auth/impersonate', { user: user.id });
+            await this.router.transitionTo('console');
+            this.session.manuallyAuthenticate(token);
+            this.notifications.info(`Now impersonating ${user.email}...`);
+            later(
+                this,
+                () => {
+                    window.location.reload();
+                },
+                600
+            );
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
+    /**
+     * Change password for a user
+     *
+     * @void
+     */
+    @action changeUserPassword(user) {
+        this.modalsManager.show('modals/change-user-password', {
+            keepOpen: true,
+            user,
+        });
+    }
+
     /**
      * Update search query param and reset page to 1
      *

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-decorators';
+import { task } from 'ember-concurrency';
 import getTwoFaMethods from '@fleetbase/console/utils/get-two-fa-methods';
 
 /**

console/app/controllers/console/admin/virtual.js

@@ -0,0 +1,7 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+
+export default class ConsoleAdminVirtualController extends Controller {
+    @tracked view;
+    queryParams = ['view'];
+}

console/app/controllers/console/home.js

@@ -1,3 +1,26 @@
 import Controller from '@ember/controller';
 
-export default class ConsoleHomeController extends Controller {}
+export default class ConsoleHomeController extends Controller {
+    rows = [
+        {
+            name: 'Jason',
+            age: 24,
+            vehicle: 'Honda',
+        },
+    ];
+
+    columns = [
+        {
+            label: 'Name',
+            valuePath: 'name',
+        },
+        {
+            label: 'Age',
+            valuePath: 'age',
+        },
+        {
+            label: 'Vehicle',
+            valuePath: 'vehicle',
+        },
+    ];
+}